diff --git a/bedework.iml b/bedework.iml index b12377d..94642a2 100644 --- a/bedework.iml +++ b/bedework.iml @@ -7,6 +7,7 @@ + \ No newline at end of file diff --git a/build/quickstart/linux/bw.sh b/build/quickstart/linux/bw.sh index df26acd..a73dcfe 100755 --- a/build/quickstart/linux/bw.sh +++ b/build/quickstart/linux/bw.sh @@ -139,9 +139,6 @@ usage() { echo "http://bedework.github.io/bedework/" echo "for information on configuring bedework." echo "" - echo "The location of the configuration for the deployment is set" - echo "in your maven settings.xml. The quickstart version is at" - echo " /bedework/config/wildfly.deploy.properties" echo " $PRG -cleanall Do clean on all projects" echo " $PRG -updateall Does a git update of all projects" echo " $PRG [-P PROFILE] [PROJECT] " diff --git a/build/quickstart/linux/installQS.sh b/build/quickstart/linux/installQS.sh index be3f405..28a3008 100755 --- a/build/quickstart/linux/installQS.sh +++ b/build/quickstart/linux/installQS.sh @@ -242,7 +242,6 @@ cat <> "$qs"/profile.txt $qs - $qs/bedework/config/wildfly.deploy.properties diff --git a/config/wildfly.deploy.properties b/config/wildfly.deploy.properties deleted file mode 100644 index 89e9368..0000000 --- a/config/wildfly.deploy.properties +++ /dev/null @@ -1,121 +0,0 @@ -# -# ------------------------------------------------------------- -# -# Introduction -# -# This file is the defaults for the calendar deployment properties. -# This file (or its localised form) provide properties for the deployment -#and update package. -# -# All properties defined in this file are used at deploy time only. -# -# Properties for all modules are shown below - even if they are not -# being deployed. The globals section defines which modules will be -# deployed as well as some other global properties. -# -# ------------------------------------------------------------- -# post-deployer properties -org.bedework.postdeploy.deploy=${org.bedework.global.baseDir}/wildfly/standalone/deployments - -# For the quickstart this points at a local directory which gets populated -# with required resources. -# This should be overridden by the run time script to point to a -# location into which the resources have been downloaded. -org.bedework.postdeploy.resource.base=${org.bedework.global.baseDir}/bedework/deployment - -# This causes the jboss-service.xml file to be deleted -org.bedework.for.wildfly=true - -# -------------------------------------------------------------------- -# -# Name the standalone wars we process -org.bedework.war.names=bedework,\ - bw-calendar-xsl-caladminrsrc,\ - bw-calendar-xsl-calfeedrsrc-MainCampus,\ - bw-calendar-xsl-calrsrc-MainCampus,\ - bw-calendar-xsl-calrsrc-SoEDepartmental,\ - bw-calendar-xsl-eventsubmitrsrc,\ - bw-calendar-xsl-ucalrsrc,\ - bw-calendar-xsl-common,\ - bw-calendar-notifyws,\ - bw-calendar-pubcaldav,\ - bw-calendar-publicws,\ - bw-calendar-synchws,\ - bw-calendar-ucaldav,\ - bw-calendar-userws,\ - bw-webclient-cal,\ - bw-webclient-caladmin,\ - bw-webclient-calauth,\ - bw-webclient-demosoe,\ - bw-webclient-feeder,\ - bw-webclient-submit,\ - bw-webclient-ucal,\ - bw-dotwell-known,\ - pubcalwskt,\ - ucalwskt,\ - bw-note-war,\ - bw-self-registration-war,\ - bw-synch-war,\ - bw-webcache-war,\ - bw-xml-war - -# ---------------------------------------------------------- -# -# Name the ears we process -org.bedework.ear.names=bedework,bw-carddav,\ - bw-sometime - -org.bedework.ear.template.wars.bw-carddav=bw-carddav-public,bw-carddav-user,bw-carddav-userweb - -org.bedework.ear.template.wars.bw-category=bw-category - -org.bedework.ear.template.wars.bw-event-registration=event-registration - -org.bedework.ear.template.wars.bw-self-registration=self-registration - -org.bedework.ear.template.wars.bw-sometime=sched-assist-war - -org.bedework.ear.template.wars.bw-timezone-server=bw-timezone-server - -# -# ------------------------------------------------------------ -# Application server defs - -# where the application server lives -# This you might change to point to another copy of jboss - -org.bedework.appserver.dir=${org.bedework.global.baseDir}/wildfly - -# ----------------------------------------------------------- - -# name of jboss configuration we are using -org.bedework.jboss.config=standalone - -# location of jboss configuration we are using -org.bedework.jboss.config.dir=${org.bedework.appserver.dir}/${org.bedework.jboss.config} - -# where we deploy -org.bedework.appserver.deploy.dir=${org.bedework.jboss.config.dir}/deployments - -# confusingly close name - location of jboss configuration directory -org.bedework.jboss.conf.dir=${org.bedework.jboss.config.dir}/configuration - -# where data files go -org.bedework.jboss.data.dir=${org.bedework.jboss.config.dir}/data -# where bedework data files go -org.bedework.data.dir=${org.bedework.jboss.data.dir}/bedework - -# the toplevel directory for the server static resources, relative to the application server home -org.bedework.server.resource.root.dir=${org.bedework.appserver.dir}/bedework-content - -org.bedework.global.displayname=Bedework - -# --------------------------------------------------------- -# ActiveMQ defs - -org.bedework.global.activemq.jndi-name=java:/jms/BedeworkConnectionFactory - -# ------------------------------------------------------------ -# authenticated web sockets; no ear, name pubcalwskt -# -org.bedework.app.bw-dotwell-known.context=/.well-known diff --git a/old-docs/deployers/installing.md b/old-docs/deployers/installing.md index 060f4fc..cf17db9 100644 --- a/old-docs/deployers/installing.md +++ b/old-docs/deployers/installing.md @@ -38,7 +38,6 @@ Below is the contents of that settings.xml file. This must be in place before al $qs - $qs/bedework/config/wildfly.deploy.properties @@ -54,12 +53,9 @@ In many cases it is possible to simply cd in to the appropriate directory and do will build a lot of projects eventually building the client project which deploys an ear file. ### Deploying -As part of the bedework project there is a maven plugin which uses a properties file to handle post-build deployment issues. Essentially the ear or war as built acts as a template for the deployer. +As part of the bedework project there is a maven plugin which handles post-build deployment issues. The deployment process may involve inserting filters for CAS, adding property values to web.xml files, cloning entire wars for calendar suites etc. -The file **bedework/config/wildfly.deploy.properties** is the quickstart version of that file. +When developing your own service the first thing to do is create a repository with your files. -When developing your own service the first thing to do is create a repository with your files and copy the above file into that repository. Then set the **org.bedework.deployment.properties** value in your maven settings.xml to point to that file. - -DO NOT change the **org.bedework.deployment.basedir** property - unless you move the quickstart. This property is used to locate the wildfly instance.