Changeset 3334

Timestamp:

09/07/11 15:52:20

Author:

douglm

Message:

More centralizing.

sysevents.properties is now in one place as are the global versions we use and build.

Files:

• trunk/build/loadDeployConfig.xml (modified) (1 diff)
• trunk/config/bwbuild/.defaults/sysevents.properties (added)
• trunk/config/bwbuild/.defaults/versions.properties (added)
• trunk/config/bwbuild/default/application.sysevents.properties (deleted)
• trunk/config/bwbuild/default/build.properties (modified) (2 diffs)
• trunk/config/bwbuild/default/sysevents.properties (deleted)
• trunk/config/bwbuild/derby/application.sysevents.properties (deleted)
• trunk/config/bwbuild/derby/build.properties (modified) (2 diffs)
• trunk/config/bwbuild/derby/sysevents.properties (deleted)
• trunk/config/bwbuild/jboss-h2/application.sysevents.properties (deleted)
• trunk/config/bwbuild/jboss-h2/build.properties (modified) (2 diffs)
• trunk/config/bwbuild/jboss-h2/sysevents.properties (deleted)
• trunk/config/bwbuild/jboss-mysql/application.sysevents.properties (deleted)
• trunk/config/bwbuild/jboss-mysql/build.properties (modified) (2 diffs)
• trunk/config/bwbuild/jboss-mysql/sysevents.properties (deleted)
• trunk/config/bwbuild/jboss-postgresql/application.sysevents.properties (deleted)
• trunk/config/bwbuild/jboss-postgresql/build.properties (modified) (2 diffs)
• trunk/config/bwbuild/jboss-postgresql/sysevents.properties (deleted)
• trunk/config/bwbuild/oracle10g/application.sysevents.properties (deleted)
• trunk/config/bwbuild/oracle10g/build.properties (modified) (2 diffs)
• trunk/config/bwbuild/oracle10g/sysevents.properties (deleted)

trunk/build/loadDeployConfig.xml

@@ -24 +24 @@
-      <infoMsg message="==========================================================" />
-
+      <property file="${org.bedework.configuration.versions}" />
-      <property file="${org.bedework.config.override.properties}" />
-      <property file="${org.bedework.config.properties}" />

trunk/config/bwbuild/default/build.properties

@@ -7 +7 @@
-compile.debug=yes
-
-# Version we are building and including
-org.bedework.version=3.7
-org.bedework.access.version=3.7
-org.bedework.bwtools.version=3.7
-org.bedework.bwxml.version=3.7
-org.bedework.caldav.version=3.7
-org.bedework.caldavtest.version=3.7
-org.bedework.calendarapi.version=3.7
-org.bedework.davutil.version=3.7
-org.bedework.dumprestore.version=3.7
-org.bedework.indexer.version=3.7
-org.bedework.rpiutil.version=3.7
-org.bedework.testsuite.version=3.7
-org.bedework.webapps.version=3.7
-org.bedework.webdav.version=3.7
-
-org.bedework.configurations.home=${env.BEDEWORK_CONFIGS_HOME}
-
-org.bedework.configuration.defaults=${org.bedework.configurations.home}/.defaults
+
+org.bedework.configuration.versions=${org.bedework.configuration.defaults}/versions.properties
-
-org.bedework.activemq.configurations=${org.bedework.configuration.defaults}
@@ -39 +25 @@
-org.bedework.config.options=${env.BEDEWORK_CONFIG}/cal.options.xml
-
-env.BEDEWORK_CONFIG
+org.bedework.configuration.defaults

trunk/config/bwbuild/derby/build.properties

@@ -7 +7 @@
-compile.debug=yes
-
-# Version we are building and including
-org.bedework.version=3.7
-org.bedework.access.version=3.7
-org.bedework.bwtools.version=3.7
-org.bedework.bwxml.version=3.7
-org.bedework.caldav.version=3.7
-org.bedework.caldavtest.version=3.7
-org.bedework.calendarapi.version=3.7
-org.bedework.davutil.version=3.7
-org.bedework.dumprestore.version=3.7
-org.bedework.indexer.version=3.7
-org.bedework.rpiutil.version=3.7
-org.bedework.testsuite.version=3.7
-org.bedework.webapps.version=3.7
-org.bedework.webdav.version=3.7
-
-org.bedework.configurations.home=${env.BEDEWORK_CONFIGS_HOME}
-
-org.bedework.configuration.defaults=${org.bedework.configurations.home}/.defaults
+
+org.bedework.configuration.versions=${org.bedework.configuration.defaults}/versions.properties
-
-org.bedework.activemq.configurations=${org.bedework.configuration.defaults}
@@ -39 +25 @@
-org.bedework.config.options=${env.BEDEWORK_CONFIG}/cal.options.xml
-
-env.BEDEWORK_CONFIG
+org.bedework.configuration.defaults

trunk/config/bwbuild/jboss-h2/build.properties

@@ -7 +7 @@
-compile.debug=yes
-
-# Version we are building and including
-org.bedework.version=3.7
-org.bedework.access.version=3.7
-org.bedework.bwtools.version=3.7
-org.bedework.bwxml.version=3.7
-org.bedework.caldav.version=3.7
-org.bedework.caldavtest.version=3.7
-org.bedework.calendarapi.version=3.7
-org.bedework.davutil.version=3.7
-org.bedework.dumprestore.version=3.7
-org.bedework.indexer.version=3.7
-org.bedework.rpiutil.version=3.7
-org.bedework.testsuite.version=3.7
-org.bedework.webapps.version=3.7
-org.bedework.webdav.version=3.7
-
-org.bedework.configurations.home=${env.BEDEWORK_CONFIGS_HOME}
-
-org.bedework.configuration.defaults=${org.bedework.configurations.home}/.defaults
+
+org.bedework.configuration.versions=${org.bedework.configuration.defaults}/versions.properties
-
-org.bedework.activemq.configurations=${org.bedework.configuration.defaults}
@@ -39 +25 @@
-org.bedework.config.options=${env.BEDEWORK_CONFIG}/cal.options.xml
-
-env.BEDEWORK_CONFIG
+org.bedework.configuration.defaults

trunk/config/bwbuild/jboss-mysql/build.properties

@@ -7 +7 @@
-compile.debug=yes
-
-# Version we are building and including
-org.bedework.version=3.7
-org.bedework.access.version=3.7
-org.bedework.bwtools.version=3.7
-org.bedework.bwxml.version=3.7
-org.bedework.caldav.version=3.7
-org.bedework.caldavtest.version=3.7
-org.bedework.calendarapi.version=3.7
-org.bedework.davutil.version=3.7
-org.bedework.dumprestore.version=3.7
-org.bedework.indexer.version=3.7
-org.bedework.rpiutil.version=3.7
-org.bedework.testsuite.version=3.7
-org.bedework.webapps.version=3.7
-org.bedework.webdav.version=3.7
-
-org.bedework.configurations.home=${env.BEDEWORK_CONFIGS_HOME}
-
-org.bedework.configuration.defaults=${org.bedework.configurations.home}/.defaults
+
+org.bedework.configuration.versions=${org.bedework.configuration.defaults}/versions.properties
-
-org.bedework.activemq.configurations=${org.bedework.configuration.defaults}
@@ -39 +25 @@
-org.bedework.config.options=${env.BEDEWORK_CONFIG}/cal.options.xml
-
-env.BEDEWORK_CONFIG
+org.bedework.configuration.defaults

trunk/config/bwbuild/jboss-postgresql/build.properties

@@ -7 +7 @@
-compile.debug=yes
-
-# Version we are building and including
-org.bedework.version=3.7
-org.bedework.access.version=3.7
-org.bedework.bwtools.version=3.7
-org.bedework.bwxml.version=3.7
-org.bedework.caldav.version=3.7
-org.bedework.caldavtest.version=3.7
-org.bedework.calendarapi.version=3.7
-org.bedework.davutil.version=3.7
-org.bedework.dumprestore.version=3.7
-org.bedework.indexer.version=3.7
-org.bedework.rpiutil.version=3.7
-org.bedework.testsuite.version=3.7
-org.bedework.webapps.version=3.7
-org.bedework.webdav.version=3.7
-
-org.bedework.configurations.home=${env.BEDEWORK_CONFIGS_HOME}
-
-org.bedework.configuration.defaults=${org.bedework.configurations.home}/.defaults
+
+org.bedework.configuration.versions=${org.bedework.configuration.defaults}/versions.properties
-
-org.bedework.activemq.configurations=${org.bedework.configuration.defaults}
@@ -39 +25 @@
-org.bedework.config.options=${env.BEDEWORK_CONFIG}/cal.options.xml
-
-env.BEDEWORK_CONFIG
+org.bedework.configuration.defaults

trunk/config/bwbuild/oracle10g/build.properties

@@ -7 +7 @@
-compile.debug=yes
-
-# Version we are building and including
-org.bedework.version=3.7
-org.bedework.access.version=3.7
-org.bedework.bwtools.version=3.7
-org.bedework.bwxml.version=3.7
-org.bedework.caldav.version=3.7
-org.bedework.caldavtest.version=3.7
-org.bedework.calendarapi.version=3.7
-org.bedework.davutil.version=3.7
-org.bedework.dumprestore.version=3.7
-org.bedework.indexer.version=3.7
-org.bedework.rpiutil.version=3.7
-org.bedework.testsuite.version=3.7
-org.bedework.webapps.version=3.7
-org.bedework.webdav.version=3.7
-
-org.bedework.configurations.home=${env.BEDEWORK_CONFIGS_HOME}
-
-org.bedework.configuration.defaults=${org.bedework.configurations.home}/.defaults
+
+org.bedework.configuration.versions=${org.bedework.configuration.defaults}/versions.properties
-
-org.bedework.activemq.configurations=${org.bedework.configuration.defaults}
@@ -39 +25 @@
-org.bedework.config.options=${env.BEDEWORK_CONFIG}/cal.options.xml
-
-env.BEDEWORK_CONFIG
+org.bedework.configuration.defaults