Changeset 1000

Timestamp:

09/13/06 10:56:52

Author:

douglm

Message:

--

Files:

• trunk/build.xml (modified) (2 diffs)
• trunk/build/buildwar.xml (modified) (5 diffs)
• trunk/config/configs/freebusy (added)
• trunk/config/configs/freebusy/build.properties (added)
• trunk/config/configs/freebusy/democal.options.xml (added)
• trunk/config/configs/freebusy/democal.properties (added)
• trunk/lib/google (added)
• trunk/lib/google/COPYING (added)
• trunk/lib/google/gdata-calendar-1.0.jar (added)
• trunk/lib/google/gdata-client-1.0.jar (added)

trunk/build.xml

@@ -348 +348 @@
-
-    <copy-to-bin this="${org.bedework.project.caldav}"/>
+    <copy-to-dependent this="${org.bedework.project.caldav}"
+                       target="${org.bedework.project.freebusy}"
+                       fromdir="dist" />
-  </target>
-
@@ -692 +695 @@
-    <attribute name="target"/>
-    <attribute name="this"/>
+    <attribute name="fromdir" default="libapi"/>
-    <sequential>
-      <copy todir="@{target}/lib" overwrite="yes">
-libapi
+@{fromdir}
-          <include name="*.jar" />
-        </fileset>

trunk/build/buildwar.xml

@@ -60 +60 @@
-    </condition>
-    -->
-
-    <condition property="org.bedework.war.build.freebusy">
-      <equals arg1="yes" arg2="${org.bedework.build.freebusy}"/>
-    </condition>
-
-    <!-- Destinations - where we build an unwrapped war -->
@@ -354 +350 @@
-    <antcall target="add.jdbcdriver" inheritRefs="true" />
-
-    <!-- free busy -->
-    <antcall target="add.freebusy" inheritRefs="true" />
-
-    <!-- tomcat -->
-    <antcall target="add.tomcat" inheritRefs="true" />
@@ -378 +371 @@
-    <antcall target="build.ear" inheritRefs="true" />
-    -->
-  </target>
-
-  <target name="add.freebusy" if="org.bedework.war.build.freebusy">
-    <copy todir="${app.dest.lib}" file="${org.bedework.fbclient.jar}" />
-    <copy todir="${app.dest.lib}" file="${org.bedework.fbaggregator.jar}" />
-  </target>
-
@@ -431 +419 @@
-  <target name="bexchange-stuff" if="org.bedework.build.caldav.bexchange">
-    <copy tofile="${app.dest.properties}/timezones.xml"
-resources.base}
+project.bedework}/docs
-  </target>
-
-  <target name="domino-stuff" if="org.bedework.build.caldav.domino">
-    <copy tofile="${app.dest.properties}/timezones.xml"
-resources.base}
+project.bedework}/docs
-  </target>
-
@@ -447 +435 @@
-
-    <copy tofile="${app.dest.properties}/timezones.xml"
-resources.base}
+project.bedework}/docs
-  </target>
-