Changeset 2251

Timestamp:

07/09/09 00:56:56

Author:

douglm

Message:

Fix up after move of code screwed up source.
This hopefully completes the separation of the caldav server code from the bedework core - though some build changes need to be made.

Summary of changes:

Move some filtering classes and interfaces out of the bedework core and into external libraries and the CalDAV project.

Entity type definitions:

CalFacadeDefs? and CalDAVEvent had competing definitions. Added the CalFacadeDefs? version to edu.rpi.cmt.calendar.IcalDefs?. Removed the CalDAVEvent versions.
This means the values change for CalDAV but with any luck they aren't stored anywhere.

Make PropertyInfo? separate class from PropertyInfoIndex?. Move PropertyIndex? into edu.rpi.cmt.calendar. Also move some of the infromation out of ProeprtyInfo? into PropertyInfoIndex?

MOved most filter classes into caldav.util

Copied a number of CalFacade? filter classes into caldav.util.filter, renamed the Filter class to Filterhandler

Misinterpreted tzid:

All timeranges are expressed in UTC. The optional timezone following the filter is used for local (floating) datetime values.
Requires access to timezone conversion - moved CalTimezones? and CalTimezonesImpl? into rpi util package.

Created new project caldavimpl

Moved google, domino, exchage and bedework implementations into that project

Test:

All filtering, in particular

Timerange filters -

--

Files:

• branches/douglm/build.xml (modified) (6 diffs)
• branches/douglm/deployment/publiccaldav/webapp/appjars.xml (modified) (1 diff)
• branches/douglm/deployment/usercaldav/webapp/appjars.xml (modified) (1 diff)
• branches/douglm/deployment/webpublic/webapp/appjars.xml (modified) (1 diff)
• branches/douglm/deployment/webuser/webapp/appjars.xml (modified) (1 diff)

branches/douglm/build.xml

@@ -34 +34 @@
-  <property name="org.bedework.project.caldav"
-            location="${org.bedework.projects}/caldav" />
+
+  <property name="org.bedework.project.caldavimpl"
+            location="${org.bedework.projects}/caldavimpl" />
-
-  <property name="org.bedework.project.caldavTest"
@@ -203 +206 @@
-  <target name="build" depends="init.build,build.rpiutil,build.bwtzsvr,
-                                build.access,build.davutil,
+                                build.webdav,build.caldav,
-                                build.calendarapi,build.dumprestore,
-webdav,build.caldav,build.caldavTest
+caldavTest,build.caldavimpl
-                                build.bwtools,build.webapps,
-                                build.testsuite,build.deployutil"
@@ -217 +221 @@
-                                clean.calendarapi,clean.dumprestore,
-                                clean.webdav,clean.caldav,clean.caldavTest,
+                                clean.caldavimpl,
-                                clean.bwtools,clean.webapps,
-                                clean.testsuite"
@@ -228 +233 @@
-                                           clean.calendarapi,clean.dumprestore,
-                                           clean.webdav,clean.caldav,clean.caldavTest,
+                                           clean.caldavimpl,
-                                           clean.bwtools,clean.webapps,
-                                           clean.testsuite"
@@ -350 +356 @@
-    </ant>
-
+    <ant antfile="${org.bedework.project.caldavimpl}/build.xml" inheritall="false"
+         target="javadoc" >
+      <property name="destdir"
+                location="${org.bedework.projectdocs.home}/caldavimpl/api" />
+    </ant>
+
-    <ant antfile="${org.bedework.project.caldavTest}/build.xml" inheritall="false"
-         target="javadoc" >
@@ -462 +474 @@
-  <target name="clean.build.caldav" depends="clean.caldav,build.caldav"
-          description="clean builds the caldav project"/>
+
+  <!-- .................................................................
+                          caldavimpl
+       .................................................................. -->
+  <target name="build.caldavimpl" depends="init"
+          description="builds the caldavimpl project">
+    <ant antfile="${org.bedework.project.caldavimpl}/build.xml" inheritall="false"
+       target="build-all"  >
+      <property name="org.bedework.libcache.dir"
+                location="${org.bedework.project.bedework}/libcache"/>
+    </ant>
+  </target>
+
+  <target name="clean.caldavimpl" depends="init"
+          description="clean the caldavimpl project">
+    <ant antfile="${org.bedework.project.caldavimpl}/build.xml" inheritall="false"
+         target="deep-clean" />
+  </target>
+
+  <target name="clean.build.caldavimpl" depends="clean.caldav,build.caldav"
+          description="clean builds the caldavimpl project"/>
-
-  <!-- .................................................................

branches/douglm/deployment/publiccaldav/webapp/appjars.xml

@@ -13 +13 @@
-              libcache="${org.bedework.libcache.dir}"
-              name="bw-caldav" version="3.6"
-
+impl
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"

branches/douglm/deployment/usercaldav/webapp/appjars.xml

@@ -13 +13 @@
-              libcache="${org.bedework.libcache.dir}"
-              name="bw-caldav" version="3.6"
-
+impl
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"

branches/douglm/deployment/webpublic/webapp/appjars.xml

@@ -12 +12 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
+              name="bw-cdvutil" version="3.6"
+              projecthome="${bw.project.home}/projects/caldav" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
-              name="bw-webcommon" version="3.5"
-              projecthome="${bw.project.home}/projects/webapps" />

branches/douglm/deployment/webuser/webapp/appjars.xml

@@ -12 +12 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
+              name="bw-cdvutil" version="3.6"
+              projecthome="${bw.project.home}/projects/caldav" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
-              name="bw-webcommon" version="3.5"
-              projecthome="${bw.project.home}/projects/webapps" />