[Bedework-commit] caldav r500 - releases/bedework-3.7

[svnadmin at bedework.org]

Author: douglm
Date: 2011-02-22 13:23:10 -0500 (Tue, 22 Feb 2011)
New Revision: 500

Modified:
   releases/bedework-3.7/build.properties
   releases/bedework-3.7/build.xml
Log:
Changes to introduce bwxml project - all xml schemas now located in this project built separately.

Other projects with a dependency now build this project.

Also fixed a few java warnings that surfaced from the noise.

Added an updateall action to bw

Modified: releases/bedework-3.7/build.properties
===================================================================
--- releases/bedework-3.7/build.properties	2011-02-16 20:13:30 UTC (rev 499)
+++ releases/bedework-3.7/build.properties	2011-02-22 18:23:10 UTC (rev 500)
@@ -10,6 +10,7 @@
 
 # Versions we import
 org.bedework.access.version=3.7
+org.bedework.bwxml.version=3.7
 org.bedework.davutil.version=3.7
 org.bedework.rpiutil.version=3.7
 org.bedework.webdav.version=3.7
@@ -17,5 +18,3 @@
 edu.rpi.cmt.caldav.server.jar=bw-cdvserver
 edu.rpi.cmt.caldav.util.jar=bw-cdvutil
 
-org.bedework.module.genwssrc.jar=bw-exsynch-genwssrc
-

Modified: releases/bedework-3.7/build.xml
===================================================================
--- releases/bedework-3.7/build.xml	2011-02-16 20:13:30 UTC (rev 499)
+++ releases/bedework-3.7/build.xml	2011-02-22 18:23:10 UTC (rev 500)
@@ -32,20 +32,6 @@
 
   <target name="init">
     <projectInit/>
-
-    <getJar name="commons-httpclient" version="3.0" />
-    <getJar name="ical4j" version="head-20100601" />
-    <getJar name="log4j" version="1.2.8" />
-    <getJar name="servletapi" version="2.4" />
-
-    <getJar name="bw-davio" 
-    	      version="${org.bedework.davutil.version}" project="davutil" />
-    <getJar name="rpiaccess" 
-    	      version="${org.bedework.access.version}" project="access" />
-    <getJar name="rpiutil" 
-    	      version="${org.bedework.rpiutil.version}" project="rpiutil" />
-    <getJar name="bw-webdavserver" 
-            version="${org.bedework.webdav.version}" project="webdav" />
   	
     <property name="org.bedework.module.genwssrc.base"
               location="${project.home}/genexsynchwssrc" />
@@ -53,34 +39,46 @@
     <property name="org.bedework.caldav.server.base" location="${project.home}/server" />
     <property name="org.bedework.caldav.util.base" location="${project.home}/util" />
 
-    <property name="genwssrc.jar"
-              location="${dist.home}/${org.bedework.module.genwssrc.jar}-${project.version}.jar" />
-
     <property name="server.jar"
               location="${dist.home}/${edu.rpi.cmt.caldav.server.jar}-${project.version}.jar" />
 
     <property name="util.jar"
               location="${dist.home}/${edu.rpi.cmt.caldav.util.jar}-${project.version}.jar" />
+    </target>
+    
+  <target name="build-init" depends="init">
+    <!-- Make sure bwxml is built -->
+    <ant antfile="${bedework.home}/../bwxml/build.xml" inheritall="false" />
+
+    <getJar name="commons-httpclient" version="3.0" />
+    <getJar name="ical4j" version="head-20100601" />
+    <getJar name="log4j" version="1.2.8" />
+    <getJar name="servletapi" version="2.4" />
+
+    <getJar name="bw-davio" 
+            version="${org.bedework.davutil.version}" project="davutil" />
+    <getJar name="rpiaccess" 
+            version="${org.bedework.access.version}" project="access" />
+    <getJar name="rpiutil" 
+            version="${org.bedework.rpiutil.version}" project="rpiutil" />
+    <getJar name="bw-webdavserver" 
+            version="${org.bedework.webdav.version}" project="webdav" />
+
+    <getJar name="bw-exsynchwsschema" 
+            version="${org.bedework.bwxml.version}" project="bwxml" 
+            projecthome="${bedework.home}/../bwxml" />
   </target>
 
   <!-- ===================== bld-source Target ===============================
      This target builds jar files ready for the deploy target.
      =================================================================== -->
 
-  <target name="build-source" >
-    <wsimport wsdl="${bedework.home}/resources/exsynchwsdefs/wssvc.wsdl"
-              module-base="${org.bedework.module.genwssrc.base}"
-              jar-file="${genwssrc.jar}"
-              bindingsdir="${bedework.home}/resources/exsynchwsdefs/wsdlbindings"
-    />
-
+  <target name="build-source" depends="build-init" >
     <build-jar module-base="${org.bedework.caldav.util.base}" 
-               jar-file="${util.jar}" 
-               jar-dependency="${genwssrc.jar}" />
+               jar-file="${util.jar}" />
 
     <build-jar module-base="${org.bedework.caldav.server.base}" 
-               jar-file="${server.jar}" 
-               jar-dependency="${genwssrc.jar}" />
+               jar-file="${server.jar}" />
   </target>
 
 <!-- ==================== Javadoc Target ===============================