Changeset 925

Timestamp:

08/08/06 01:58:51

Author:

douglm

Message:

Moved dumprestore into separate project

Files:

• trunk/calendar3/appcommon/src/org/bedework/appcommon/configs (deleted)
• trunk/calendar3/bldfiles/quickstart-build.xml (modified) (7 diffs)
• trunk/calendar3/build.xml (modified) (5 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/configs (added)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/configs/DumpRestoreConfig.java (copied) (copied from trunk/calendar3/appcommon/src/org/bedework/appcommon/configs/DumpRestoreConfig.java) (1 diff)
• trunk/calendar3/config/configs/democal.options.xml (modified) (2 diffs)
• trunk/calendar3/config/configs/democal.properties (modified) (2 diffs)
• trunk/calendar3/deployment/dumprestore (deleted)
• trunk/calendar3/dumprestore (deleted)

trunk/calendar3/bldfiles/quickstart-build.xml

@@ -29 +29 @@
-  <property name="org.bedework.project.davutil"
-            location="${basedir}/davutil" />
+
+  <property name="org.bedework.project.dumprestore"
+            location="${basedir}/dumprestore" />
-
-  <property name="org.bedework.project.freebusy"
@@ -183 +186 @@
-    </copy>
-
+    <copy todir="${org.bedework.project.dumprestore}/lib" overwrite="yes">
+      <fileset dir="${org.bedework.project.access}/dist">
+        <include name="*.jar" />
+      </fileset>
+    </copy>
+
-    <copy todir="${org.bedework.project.webdav}/lib" overwrite="yes">
-      <fileset dir="${org.bedework.project.access}/dist">
@@ -243 +252 @@
-
-  <!-- .................................................................
+                          davutil
+       .................................................................. -->
+  <target name="build.davutil" depends="init"
+          description="builds the davutil project">
+    <ant antfile="${org.bedework.project.davutil}/build.xml" inheritrefs="true"
+           target="build-all" />
+
+    <antcall target="copy.davutil" inheritrefs="true" />
+  </target>
+
+  <target name="clean.build.davutil" depends="init"
+          description="builds the davutil project">
+    <ant antfile="${org.bedework.project.davutil}/build.xml" inheritrefs="true"
+           target="clean-build-all" />
+
+    <antcall target="copy.davutil" inheritrefs="true" />
+  </target>
+
+  <target name="copy.davutil" >
+    <copy todir="${org.bedework.project.caldavTest}/lib" overwrite="yes">
+      <fileset dir="${org.bedework.project.davutil}/dist">
+        <include name="*.jar" />
+      </fileset>
+    </copy>
+
+    <copy todir="${org.bedework.project.caldav}/lib" overwrite="yes">
+      <fileset dir="${org.bedework.project.davutil}/dist">
+        <include name="*.jar" />
+      </fileset>
+    </copy>
+
+    <copy todir="${org.bedework.project.calendar}/lib" overwrite="yes">
+      <fileset dir="${org.bedework.project.davutil}/dist">
+        <include name="*.jar" />
+      </fileset>
+    </copy>
+
+    <copy todir="${org.bedework.project.webdav}/lib" overwrite="yes">
+      <fileset dir="${org.bedework.project.davutil}/dist">
+        <include name="*.jar" />
+      </fileset>
+    </copy>
+  </target>
+
+  <!-- .................................................................
+                          dumprestore
+       .................................................................. -->
+  <target name="build.dumprestore" depends="init"
+          description="builds the dumprestore project">
+    <ant antfile="${org.bedework.project.dumprestore}/build.xml" inheritrefs="true"
+           target="build-all" />
+  </target>
+
+  <target name="clean.dumprestore" depends="init"
+          description="clean the dumprestore project">
+    <ant antfile="${org.bedework.project.dumprestore}/build.xml" inheritrefs="true"
+           target="clean" />
+  </target>
+
+  <target name="clean.build.dumprestore" depends="init"
+          description="builds the dumprestore project">
+    <ant antfile="${org.bedework.project.dumprestore}/build.xml" inheritrefs="true"
+           target="build-all" />
+  </target>
+
+  <!-- .................................................................
-                          freebusy
-       .................................................................. -->
@@ -264 +339 @@
-    <copy todir="${org.bedework.calendar.dist}" overwrite="yes">
-      <fileset dir="${org.bedework.project.freebusy}/dist">
-        <include name="*.jar" />
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- .................................................................
-                          davutil
-       .................................................................. -->
-  <target name="build.davutil" depends="init"
-          description="builds the davutil project">
-    <ant antfile="${org.bedework.project.davutil}/build.xml" inheritrefs="true"
-           target="build-all" />
-
-    <antcall target="copy.davutil" inheritrefs="true" />
-  </target>
-
-  <target name="clean.build.davutil" depends="init"
-          description="builds the davutil project">
-    <ant antfile="${org.bedework.project.davutil}/build.xml" inheritrefs="true"
-           target="clean-build-all" />
-
-    <antcall target="copy.davutil" inheritrefs="true" />
-  </target>
-
-  <target name="copy.davutil" >
-    <copy todir="${org.bedework.project.caldavTest}/lib" overwrite="yes">
-      <fileset dir="${org.bedework.project.davutil}/dist">
-        <include name="*.jar" />
-      </fileset>
-    </copy>
-
-    <copy todir="${org.bedework.project.caldav}/lib" overwrite="yes">
-      <fileset dir="${org.bedework.project.davutil}/dist">
-        <include name="*.jar" />
-      </fileset>
-    </copy>
-
-    <copy todir="${org.bedework.project.calendar}/lib" overwrite="yes">
-      <fileset dir="${org.bedework.project.davutil}/dist">
-        <include name="*.jar" />
-      </fileset>
-    </copy>
-
-    <copy todir="${org.bedework.project.webdav}/lib" overwrite="yes">
-      <fileset dir="${org.bedework.project.davutil}/dist">
-        <include name="*.jar" />
-      </fileset>
@@ -481 +511 @@
-       ================================================================= -->
-
-
+dumprestore,build.
-          description="builds and deploys the applications">
-    <ant antfile="${calendar.build.file}" inheritrefs="true"
@@ -487 +517 @@
-  </target>
-
-
+dumprestore,build.
-          description="builds and deploys the applications">
-    <ant antfile="${calendar.build.file}" inheritrefs="true"
@@ -501 +531 @@
-  <target name="clean.deploy.debug" depends="clean,deploy.debug" />
-
-
+dumprestore,clean.
-          description="Remove all generated files.">
-    <ant antfile="${calendar.build.file}" inheritrefs="true"

trunk/calendar3/build.xml

@@ -50 +50 @@
-  <property name="org.bedework.project.davutil"
-            location="${basedir}/../davutil" />
+
+  <property name="org.bedework.project.dumprestore"
+            location="${basedir}/../dumprestore" />
-
-  <property name="org.bedework.project.freebusy"
@@ -123 +126 @@
-                   bld.webadmin,bld.webclient,bld.synchml,
-                   bld.timers,build.tools,
-                   bld.dumprestore,
-                   bld.test,bld.config"
-          description="Build war and ear files">
@@ -269 +271 @@
-                         ${org.bedework.calsvci.base}/src:
-                         ${org.bedework.config.base}/src:
-                         ${org.bedework.dumprestore.base}/src:
-                         ${org.bedework.ical.base}/src:
-                         ${org.bedework.locale.base}/src:
@@ -559 +560 @@
-  </target>
-
-  <target name="bld.dumprestore"
-          depends="init,bld.appcommon"
-          description="Build calendar dumprestore suite">
-    <ant antfile="${org.bedework.dumprestore.base}/build.xml" inheritrefs="true"
-         target="build" />
-  </target>
-
-  <!-- ======================== tools Targets ========================
-       This builds the tools
@@ -583 +577 @@
-    <echo message="===============================================================" />
-    <echo message=" use the zipped dump/restore utility to dump, restore or initialise" />
-
-
+
+
+
-    <echo message="===============================================================" />
-  </target>

trunk/calendar3/calFacade/src/org/bedework/calfacade/configs/DumpRestoreConfig.java

@@ -52 +52 @@
-    to the maximum extent the law permits.
-*/
-appcommon
+calfacade
-
-import java.io.Serializable;

trunk/calendar3/config/configs/democal.options.xml

@@ -174 +174 @@
-                          Dump restore program dumpres
-             ================================================================== -->
-appcommon
+calfacade
-          <debug>true</debug>
-          <debugEntity>false</debugEntity>
@@ -185 +185 @@
-             Use the restore utility to convert from uwcal 2.3
-             ================================================================== -->
-appcommon
+calfacade
-          <debug>true</debug>
-          <debugEntity>false</debugEntity>

trunk/calendar3/config/configs/democal.properties

@@ -243 +243 @@
-# -------------- normal dump/restore build properties ------------------
-
-calendar
+dumprestore
-org.bedework.app.dumpres.type=dumprestore
-org.bedework.app.dumpres.shellscr.name=bwrun
@@ -258 +258 @@
-# -------------- convert from 2.3 build properties - use restore only ------------------
-
-calendar
+dumprestore
-org.bedework.app.restoreFrom2p3px.type=dumprestore
-org.bedework.app.restoreFrom2p3px.shellscr.name=bwrun