[Bedework-commit] bedework r1551 - in trunk: . build lib

[svnadmin at bedework.org]

Author: douglm
Date: 2007-09-03 22:00:35 -0400 (Mon, 03 Sep 2007)
New Revision: 1551

Removed:
   trunk/lib/ical4j-1.0-beta1.jar
Modified:
   trunk/build.xml
   trunk/build/libjars.properties
   trunk/lib/ical4j-head.jar
Log:
Update ical4j to get some bug fixes

Modified: trunk/build/libjars.properties
===================================================================
--- trunk/build/libjars.properties	2007-09-02 05:02:58 UTC (rev 1550)
+++ trunk/build/libjars.properties	2007-09-04 02:00:35 UTC (rev 1551)
@@ -2,8 +2,6 @@
 # Library jar files
 #
 
-dojo.dir=dojo-0.4.1-ajax
-
 servlet.jar=${org.bedework.default.lib}/servletapi-2.4.jar
 
 servlet.jsp.jar=${org.bedework.default.lib}/servlet.jsp.jar
@@ -29,7 +27,8 @@
 
 ant.jar=${org.bedework.default.lib}/ant-1.6.5.jar
 
-p6spy.jar=${org.bedework.default.lib}/p6spy-1.3.jar
+#antlr.jar=${org.bedework.default.lib}/antlr-2.7.5.jar
+antlr.jar=${hibernate.jars.dir}/antlr-2.7.6rc1.jar
 
 hsqldb.jdbcdriver.jar=${org.bedework.default.lib}/hsqldb-1.7.3.3.jar
 # appserver.jdbcdriver.jar
@@ -45,22 +44,9 @@
 #appserver.jdbcdriver.jar=${org.bedework.default.lib}/mysql-connector-java-3.0.8-stable-bin.jar
 appserver.jdbcdriver.jar=${hsqldb.jdbcdriver.jar}
 
-# hibernate jars
-hibernate.jars.dir.name=hibernate-3.1.2
-hibernate.jars.dir=${org.bedework.default.lib}/${hibernate.jars.dir.name}
-hibernate.jar=${hibernate.jars.dir}/hibernate3.jar
-dom4j.jar=${hibernate.jars.dir}/dom4j-1.6.jar
+#      avalon.jar           Needed for fop filter compilation even if not used.
+avalon.jar=${org.bedework.default.lib}/avalon.jar
 
-#      struts.           Needed for struts based apps.
-struts.lib.dir=struts-1.2.9
-#struts.lib.dir=struts1.2.4
-struts.dir=${org.bedework.default.lib}/${struts.lib.dir}
-struts.jar=${struts.dir}/struts-1.2.9.jar
-struts.tlds.dir=${struts.dir}/tlds
-
-#antlr.jar=${org.bedework.default.lib}/antlr-2.7.5.jar
-antlr.jar=${hibernate.jars.dir}/antlr-2.7.6rc1.jar
-
 #      commons.           Needed here and there.
 commons.lib.dir=commons
 commons.dir=${org.bedework.default.lib}/${commons.lib.dir}
@@ -94,61 +80,75 @@
 #      commons-validator.jar    Used for struts.
 commons-validator.jar=${commons.dir}/commons-validator-1.3.0.jar
 
-#      jakarta.oro.               Used by struts
-jakarta-oro.jar=${org.bedework.default.lib}/jakarta-oro-2.0.8.jar
+#      jakarta digester   - used for xml parsing.
+digester.jar=${commons.dir}/commons-digester-1.7.jar
 
-#      httpclient.jar       Used when linking to other servfers via caldav
-#                           and for testing.
-httpclient.jar=${commons.dir}/commons-httpclient-3.0.jar
+dojo.dir=dojo-0.4.1-ajax
 
 #      fop.jar              Needed for fop filter compilation even if not used.
 fop.jar=${org.bedework.default.lib}/fop.jar
 
-#      avalon.jar           Needed for fop filter compilation even if not used.
-avalon.jar=${org.bedework.default.lib}/avalon.jar
+# hibernate jars
+hibernate.jars.dir.name=hibernate-3.1.2
+hibernate.jars.dir=${org.bedework.default.lib}/${hibernate.jars.dir.name}
+hibernate.jar=${hibernate.jars.dir}/hibernate3.jar
+dom4j.jar=${hibernate.jars.dir}/dom4j-1.6.jar
 
-#      jakarta digester   - used for xml parsing.
-digester.jar=${commons.dir}/commons-digester-1.7.jar
+#      httpclient.jar       Used when linking to other servfers via caldav
+#                           and for testing.
+httpclient.jar=${commons.dir}/commons-httpclient-3.0.jar
 
+httpunit.jar=${org.bedework.default.lib}/httpunit.jar
+
 #      ical4j.jar           Used for icalendar translation.
 #ical4j.jar.name=ical4j-1.0-beta1.jar
 ical4j.jar.name=ical4j-head.jar
 ical4j.jar=${org.bedework.default.lib}/${ical4j.jar.name}
 
-#      lucene.jar           Used for indexing and searching
-lucene.core.jar.name=lucene-core-2.0.0.jar
-lucene.core.jar=${org.bedework.default.lib}/${lucene.core.jar.name}
+#      jakarta.oro.               Used by struts
+jakarta-oro.jar=${org.bedework.default.lib}/jakarta-oro-2.0.8.jar
 
-lucene.misc.jar.name=lucene-misc-2.0.0.jar
-lucene.misc.jar=${org.bedework.default.lib}/${lucene.misc.jar.name}
+# jetspeed2 jars
+jetspeed2.jars.dir=jetspeed2-m3
 
-#      regexp.jar           Handles regular expressions
-regexp.jar=${org.bedework.default.lib}/jakarta-regexp-1.3.jar
+jtidy.jar=${org.bedework.default.lib}/jtidy.jar
 
+junit.jar.name=junit.jar
+junit.jar=${org.bedework.default.lib}/${junit.jar.name}
+
+junit4.jar.name=junit-4.1.jar
+junit4.jar=${org.bedework.default.lib}/${junit4.jar.name}
+
 # This should match the log4j on your target system
 #
 log4j.jar=${org.bedework.default.lib}/log4j-1.2.8.jar
 
 logkit.jar=${org.bedework.default.lib}/logkit.jar
 
-jtidy.jar=${org.bedework.default.lib}/jtidy.jar
+#      lucene.jar           Used for indexing and searching
+lucene.core.jar.name=lucene-core-2.0.0.jar
+lucene.core.jar=${org.bedework.default.lib}/${lucene.core.jar.name}
 
-junit.jar.name=junit.jar
-junit.jar=${org.bedework.default.lib}/${junit.jar.name}
+lucene.misc.jar.name=lucene-misc-2.0.0.jar
+lucene.misc.jar=${org.bedework.default.lib}/${lucene.misc.jar.name}
 
-junit4.jar.name=junit-4.1.jar
-junit4.jar=${org.bedework.default.lib}/${junit4.jar.name}
+p6spy.jar=${org.bedework.default.lib}/p6spy-1.3.jar
 
-httpunit.jar=${org.bedework.default.lib}/httpunit.jar
+#      regexp.jar           Handles regular expressions
+regexp.jar=${org.bedework.default.lib}/jakarta-regexp-1.3.jar
 
+#      struts.           Needed for struts based apps.
+struts.lib.dir=struts-1.2.9
+#struts.lib.dir=struts1.2.4
+struts.dir=${org.bedework.default.lib}/${struts.lib.dir}
+struts.jar=${struts.dir}/struts-1.2.9.jar
+struts.tlds.dir=${struts.dir}/tlds
+
 webdavlib.jar.name=webdavlib.jar
 webdavlib.jar=${org.bedework.default.lib}/${webdavlib.jar.name}
 
 xalan.jar=${org.bedework.default.lib}/xalan-2-6-0.jar
 
-# jetspeed2 jars
-jetspeed2.jars.dir=jetspeed2-m3
-
 #
 # Put you local jdbc file here or define this property in your bedework.build.properties
 #

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2007-09-02 05:02:58 UTC (rev 1550)
+++ trunk/build.xml	2007-09-04 02:00:35 UTC (rev 1551)
@@ -877,4 +877,20 @@
       </copy>
     </sequential>
   </macrodef>
+
+  <!-- =============================================================================
+       Update a project library from the bedework lib directory.
+       ============================================================================= -->
+  <macrodef name="copy-lib-to-lib">
+    <attribute name="this"/>
+    <sequential>
+      <delete file="@{target}/lib/@{jarprefix}*.jar" />
+
+      <copy todir="@{target}/lib" >
+        <fileset dir="${org.bedework.project.bedework}/lib" >
+          <include name="@{jarprefix}*.jar" />
+        </fileset>
+      </copy>
+    </sequential>
+  </macrodef>
 </project>

Deleted: trunk/lib/ical4j-1.0-beta1.jar
===================================================================
(Binary files differ)

Modified: trunk/lib/ical4j-head.jar
===================================================================
(Binary files differ)