[Bedework-commit] caldavimpl r82 - trunk

svnadmin at bedework.org svnadmin at bedework.org
Tue Feb 22 13:23:20 EST 2011


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

Modified:
   trunk/build.properties
   trunk/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: trunk/build.properties
===================================================================
--- trunk/build.properties	2011-02-14 15:21:28 UTC (rev 81)
+++ trunk/build.properties	2011-02-22 18:23:19 UTC (rev 82)
@@ -10,6 +10,7 @@
 
 # Versions we import
 org.bedework.access.version=3.7
+org.bedework.bwxml.version=3.7
 org.bedework.caldav.version=3.7
 org.bedework.calendarapi.version=3.7
 org.bedework.davutil.version=3.7

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2011-02-14 15:21:28 UTC (rev 81)
+++ trunk/build.xml	2011-02-22 18:23:19 UTC (rev 82)
@@ -47,9 +47,12 @@
     	      project="caldav" />
     <getJar name="bw-cdvutil" version="${org.bedework.caldav.version}" 
             project="caldav" />
-    <getJar name="bw-exsynch-genwssrc" version="${org.bedework.caldav.version}" 
-            project="caldav" />
 
+    <getJar name="bw-exsynchwsschema" 
+            version="${org.bedework.bwxml.version}" project="bwxml" 
+            projecthome="${bedework.home}/../bwxml" 
+            property="exsynchwsschema.jar" />
+
     <getJar name="bw-annotations" version="${org.bedework.calendarapi.version}" 
             project="calendarapi" />
     <getJar name="bw-apiutil" version="${org.bedework.calendarapi.version}" 
@@ -76,28 +79,9 @@
 
     <property name="org.bedework.caldav.bwcaldav.base"
               location="${project.home}/bwcaldav" />
-  	<!--
-    <property name="org.bedework.caldav.boeingexchange.base"
-              location="${project.home}/boeingexchange" />
-    <property name="org.bedework.caldav.domino.base"
-              location="${project.home}/domino" />
-    <property name="org.bedework.caldav.google.base"
-              location="${project.home}/google" />
-              -->
 
     <property name="bwcaldav.jar"
               location="${dist.home}/${edu.rpi.cmt.caldav.bwcaldav.jar}-${project.version}.jar" />
-
-  	<!--
-    <property name="boeingexchange.jar"
-              location="${dist.home}/${edu.rpi.cmt.caldav.boeingexchange.jar}-${project.version}.jar" />
-
-    <property name="domino.jar"
-              location="${dist.home}/${edu.rpi.cmt.caldav.domino.jar}-${project.version}.jar" />
-
-    <property name="google.jar"
-              location="${dist.home}/${edu.rpi.cmt.caldav.google.jar}-${project.version}.jar" />
-              -->
   </target>
 
   <!-- ===================== bld-source Target =========================
@@ -108,10 +92,6 @@
     <build-jar module-base="${org.bedework.caldav.bwcaldav.base}" 
                jar-file="${bwcaldav.jar}" />
   </target>
-  	<!--
-                                       bld.boeingexchange,
-                                       bld.domino,
-                                       bld.google" /> -->
 
 <!-- ==================== Javadoc Target ===============================
      The "javadoc" target creates Javadoc API documentation for the Java
@@ -125,12 +105,6 @@
     <property name="destdir" location="${dist.home}/docs/api"/>
     <mkdir dir="${destdir}"/>
 
-  	<!--
-    <javadoc sourcepath="${org.bedework.caldav.boeingexchange.base}/src:
-                         ${org.bedework.caldav.bwcaldav.base}/src:
-                         ${org.bedework.caldav.domino.base}/src:
-                         ${org.bedework.caldav.google.base}/src:"
-  	-->
     <javadoc sourcepath="${org.bedework.caldav.bwcaldav.base}/src"
            classpathref="compile.classpath"
                 destdir="${destdir}"
@@ -151,25 +125,4 @@
       <link href="${env.JAVA_HOME}/docs/api" />
     </javadoc>
   </target>
-
-  <!-- ===================== internal build targets ====================
-       ================================================================= -->
-
-	<!--
-  <target name="bld.boeingexchange" >
-    <echo message="org.bedework.build.caldav.bexchange=${org.bedework.build.caldav.bexchange}" />
-      <ant antfile="${org.bedework.caldav.boeingexchange.base}/build.xml" inheritrefs="true"
-           target="build" />
-  </target>
-
-  <target name="bld.domino" >
-      <ant antfile="${org.bedework.caldav.domino.base}/build.xml" inheritrefs="true"
-           target="build" />
-  </target>
-
-  <target name="bld.google" >
-      <ant antfile="${org.bedework.caldav.google.base}/build.xml" inheritrefs="true"
-           target="build" />
-  </target>
-  -->
 </project>



More information about the Bedework-commit mailing list