Changeset 724

Timestamp:

07/08/06 00:44:25

Author:

douglm

Message:

Move caldav test program and data into separate module

Files:

• trunk/calendar3/bldfiles/defjars.properties (modified) (1 diff)
• trunk/calendar3/bldfiles/globalDefs.xml (modified) (1 diff)
• trunk/calendar3/build.xml (modified) (4 diffs)
• trunk/calendar3/caldavTest (added)
• trunk/calendar3/caldavTest/build.xml (added)
• trunk/calendar3/caldavTest/caldav-interop (moved) (moved from trunk/calendar3/test/caldav-interop)
• trunk/calendar3/caldavTest/caldavTestData (moved) (moved from trunk/calendar3/test/caldavTestData)
• trunk/calendar3/caldavTest/src (added)
• trunk/calendar3/caldavTest/src/org (added)
• trunk/calendar3/caldavTest/src/org/bedework (added)
• trunk/calendar3/caldavTest/src/org/bedework/caldav (added)
• trunk/calendar3/test/src/org/bedework/tests/caldav (deleted)

trunk/calendar3/bldfiles/defjars.properties

@@ -157 +157 @@
-org.bedework.caldavgoogle.jar=${org.bedework.temp.jars}/${org.bedework.caldavgoogle.jar.name}
-
+org.bedework.caldavtest.jar.name=bwcaldavtest-${product.version}.jar
+org.bedework.caldavtest.jar=${org.bedework.temp.jars}/${org.bedework.caldavtest.jar.name}
+
-org.bedework.calenv.jar.name=bwenv-${product.version}.jar
-org.bedework.calenv.jar=${org.bedework.temp.jars}/${org.bedework.calenv.jar.name}

trunk/calendar3/bldfiles/globalDefs.xml

@@ -78 +78 @@
-    <property name="org.bedework.caldavClientApi.base"
-              location="${org.bedework.calendar.dir}/caldavClientApi" />
+    <property name="org.bedework.caldavtest.base"
+              location="${org.bedework.calendar.dir}/caldavTest" />
-    <property name="org.bedework.calenv.base" location="${org.bedework.calendar.dir}/calEnv" />
-    <property name="org.bedework.calfacade.base" location="${org.bedework.calendar.dir}/calFacade" />

trunk/calendar3/build.xml

@@ -97 +97 @@
-                   bld.calsvci,bld.mail,bld.logging,
-                   bld.calsvc,bld.appcommon,bld.uportal,
-
-synchml,bld.caldav,bld.caldavGoogle
+bld.synchml,
+caldav,bld.caldavGoogle,bld.caldavTest
-                   bld.timers,build.tools,
-                   bld.dumprestore,
@@ -386 +386 @@
-  </target>
-
-
-
+
-       ================================================================= -->
-
@@ -394 +393 @@
-          description="Build calendar caldav client api classes jar">
-      <ant antfile="${org.bedework.caldavClientApi.base}/build.xml" inheritrefs="true"
+           target="build" />
+  </target>
+
+  <target name="bld.caldav"
+          depends="init,bld.davdefs,bld.appcommon"
+          description="Build calendar caldav suite">
+    <ant antfile="${org.bedework.caldav.base}/build.xml" inheritrefs="true"
+           target="build" />
+  </target>
+
+  <target name="bld.caldavGoogle"
+          depends="bld.caldav"
+          description="Build calendar caldav Google interface"
+          if="org.bedework.build.caldav.google">
+    <ant antfile="${org.bedework.caldavgoogle.base}/build.xml" inheritrefs="true"
+           target="build" />
+  </target>
+
+  <target name="bld.caldavTest"
+          depends="bld.caldav"
+          description="Build caldav test suite" >
+    <ant antfile="${org.bedework.caldavtest.base}/build.xml" inheritrefs="true"
-           target="build" />
-  </target>
@@ -527 +548 @@
-  </target>
-
-  <!-- ======================== caldav Targets ========================
-       ================================================================= -->
-
-  <target name="bld.caldav"
-          depends="init,bld.davdefs,bld.appcommon"
-          description="Build calendar caldav suite">
-    <ant antfile="${org.bedework.caldav.base}/build.xml" inheritrefs="true"
-           target="build" />
-  </target>
-
-  <target name="bld.caldavGoogle"
-          depends="bld.caldav"
-          description="Build calendar caldav Google interface"
-          if="org.bedework.build.caldav.google">
-    <ant antfile="${org.bedework.caldavgoogle.base}/build.xml" inheritrefs="true"
-           target="build" />
-  </target>
-
-  <!-- ======================== config Target ========================
-       This builds the config and deploy application