Changeset 3414

Timestamp:

11/30/11 13:55:52

Author:

douglm

Message:

(Partial updates as full update failed with some conflict)

Major refactoring of code to move all jar building into separate projects outside of the main bedework project which itself becomes an assembly project - that is it builds deployable components from the jars and other information.

This change is to facilitate the move to jboss 7.

Further changes are needed but probably no more major reorganization.

Files:

• releases/bedework-3.8/deployment/build.xml (modified) (5 diffs)
• releases/bedework-3.8/deployment/bw-core-appjars.xml (modified) (12 diffs)
• releases/bedework-3.8/deployment/genkeys/shellscr/appjars.xml (modified) (1 diff)
• releases/bedework-3.8/deployment/monitor/shellscr/appjars.xml (modified) (1 diff)
• releases/bedework-3.8/deployment/sysevlog/shellscr/appjars.xml (modified) (1 diff)

releases/bedework-3.8/deployment/build.xml

@@ -14 +14 @@
-     We cycle over the information we have for each application we want to 
-     build and for each application use ants property mapping to map the 
-
+f
-     name 
-         org.bedework.app.CalAdmin.deploy.dir
@@ -71 +71 @@
-        
-  <dirname property="this.build.dir" file="${ant.file}"/>
-
+
+
+
-
-  <import file="${build.dir}/buildTools/getJar.xml"/>
@@ -84 +86 @@
-
-    <loadDeployConfig />
+
+    <!-- All the projects we deploy -->
+    <property name="org.bedework.project.bwtzsvr"
+              location="${org.bedework.project.bedework}/../bwtzsvr" />
+    <property name="org.bedework.project.bwwebapps"
+              location="${org.bedework.project.bedework}/../bwwebapps" />
+    <property name="org.bedework.project.bwcaldav"
+              location="${org.bedework.project.bedework}/../bwcaldav" />
+    <property name="org.bedework.project.caldavTest"
+              location="${org.bedework.project.bedework}/../caldavTest" />
+    <property name="org.bedework.project.testsuite"
+              location="${org.bedework.project.bedework}/../testsuite" />
+    <property name="org.bedework.project.bwtools"
+              location="${org.bedework.project.bedework}/../bwtools" />
+    <property name="org.bedework.project.dumprestore"
+              location="${org.bedework.project.bedework}/../dumprestore" />
+    <property name="org.bedework.project.indexer"
+              location="${org.bedework.project.bedework}/../indexer" />
+    <property name="org.bedework.project.bwsysevents"
+              location="${org.bedework.project.bedework}/../bwsysevents" />
+    <property name="org.bedework.project.bwcalFacade"
+              location="${org.bedework.project.bedework}/../bwcalFacade" />
+    <property name="org.bedework.project.bwcalcore"
+              location="${org.bedework.project.bedework}/../bwcalcore" />
+    <property name="org.bedework.project.carddav"
+              location="${org.bedework.project.bedework}/../carddav" />
+    <property name="org.bedework.project.synch"
+              location="${org.bedework.project.bedework}/../synch" />
+
-
-    <!-- default to debug off -->
@@ -95 +126 @@
-    
-    <property name="org.bedework.sou.hibernate.properties"
-project.calendarapi}/calCore/resources
+deployment.resources}/hibernate
-    
-    <property name="org.bedework.jboss.datasource.jndiname"
@@ -173 +204 @@
-
-    <property name="org.bedework.lang.properties"
-project.calendarapi}/calFacade/resources
+deployment.resources}
-
-    <property name="org.bedework.xsllang.dir"

releases/bedework-3.8/deployment/bw-core-appjars.xml

@@ -14 +14 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-
-projects/caldavimpl
+bw
+../bwcaldav
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
@@ -32 +32 @@
-              libcache="${org.bedework.libcache.dir}"
-              name="bw-synchwsschema" version="${org.bedework.bwxml.version}"
-bw.
+
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
@@ -49 +49 @@
-              libcache="${org.bedework.libcache.dir}"
-              name="bw-tzschema" version="${org.bedework.bwxml.version}"
-bedework
+project
-
-      <!-- ================= Bedework dump/restore jars ==================== -->
@@ -56 +56 @@
-              libcache="${org.bedework.libcache.dir}"
-              name="bw-dumpres" version="${org.bedework.dumprestore.version}"
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-      <!-- ================ Bedework calendar api jars ===================== -->
@@ -69 +84 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-      <!-- ===================== Bedework dav jars ========================= -->
@@ -132 +117 @@
-              libcache="${org.bedework.libcache.dir}"
-              name="bw-davio" version="${org.bedework.davutil.version}" 
-bw.
+
-
-      <!-- =================== Bedework indexer jars ======================= -->
@@ -139 +124 @@
-              libcache="${org.bedework.libcache.dir}"
-              name="bw-indexer" version="${org.bedework.indexer.version}"
-bw.project.home}/projects
+project.home}/..
-
-      <!-- ================== Bedework webapps jars ======================== -->
@@ -146 +131 @@
-              libcache="${org.bedework.libcache.dir}"
-              name="bw-appcommon" version="${org.bedework.webapps.version}" 
-bw.project.home}/projects/
+project.home}/../bw
-
-      <!-- Only for portlet - maybe
@@ -152 +137 @@
-                libcache="${org.bedework.libcache.dir}"
-                name="bw-liferay" version="${org.bedework.webapps.version}" 
-bw.
+
-                  
-        <getJar lib="${org.bedework.temp.extrajars.dir}"
-                libcache="${org.bedework.libcache.dir}"
-                name="bw-uportal" version="${org.bedework.webapps.version}" 
-bw.
+
-                -->
-      
@@ -163 +148 @@
-              libcache="${org.bedework.libcache.dir}"
-              name="bw-webcommon" version="${org.bedework.webapps.version}"
-bw.project.home}/projects/
+project.home}/../bw
-
-      <!-- =================== Bedework webdav jars ======================== -->
@@ -170 +155 @@
-              libcache="${org.bedework.libcache.dir}"
-              name="bw-webdavserver" version="${org.bedework.webdav.version}"
-bw.
+
-
-      <!-- ==================== Bedework other jars ======================== -->
@@ -177 +162 @@
-              libcache="${org.bedework.libcache.dir}"
-              name="rpiaccess" version="${org.bedework.access.version}" 
-bw.
+
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-              name="rpiutil" version="${org.bedework.rpiutil.version}" 
-bw.
+
-      
-      <!-- ======================= Ical4j jars ============================ -->

releases/bedework-3.8/deployment/genkeys/shellscr/appjars.xml

@@ -12 +12 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-endarapi
-projects/calendarapi
+facade
+../bwcalFacade
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"

releases/bedework-3.8/deployment/monitor/shellscr/appjars.xml

@@ -12 +12 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-
-
+
+
+
+
+
+
+
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"

releases/bedework-3.8/deployment/sysevlog/shellscr/appjars.xml

@@ -12 +12 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-
-
+
+
+
+
+
+
+
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"