Changeset 1551

Show
Ignore:
Timestamp:
09/03/07 22:00:35
Author:
douglm
Message:

Update ical4j to get some bug fixes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build.xml

    r1539 r1551  
    878878    </sequential> 
    879879  </macrodef> 
     880 
     881  <!-- ============================================================================= 
     882       Update a project library from the bedework lib directory. 
     883       ============================================================================= --> 
     884  <macrodef name="copy-lib-to-lib"> 
     885    <attribute name="this"/> 
     886    <sequential> 
     887      <delete file="@{target}/lib/@{jarprefix}*.jar" /> 
     888 
     889      <copy todir="@{target}/lib" > 
     890        <fileset dir="${org.bedework.project.bedework}/lib" > 
     891          <include name="@{jarprefix}*.jar" /> 
     892        </fileset> 
     893      </copy> 
     894    </sequential> 
     895  </macrodef> 
    880896</project> 

  • trunk/build/libjars.properties

    r1465 r1551  
    22# Library jar files 
    33# 
    4  
    5 dojo.dir=dojo-0.4.1-ajax 
    64 
    75servlet.jar=${org.bedework.default.lib}/servletapi-2.4.jar 
    …… 
    3028ant.jar=${org.bedework.default.lib}/ant-1.6.5.jar 
    3129 
    32 p6spy.jar=${org.bedework.default.lib}/p6spy-1.3.jar 
     30#antlr.jar=${org.bedework.default.lib}/antlr-2.7.5.jar 
     31antlr.jar=${hibernate.jars.dir}/antlr-2.7.6rc1.jar 
    3332 
    3433hsqldb.jdbcdriver.jar=${org.bedework.default.lib}/hsqldb-1.7.3.3.jar 
    …… 
    4645appserver.jdbcdriver.jar=${hsqldb.jdbcdriver.jar} 
    4746 
    48 # hibernate jars 
    49 hibernate.jars.dir.name=hibernate-3.1.2 
    50 hibernate.jars.dir=${org.bedework.default.lib}/${hibernate.jars.dir.name} 
    51 hibernate.jar=${hibernate.jars.dir}/hibernate3.jar 
    52 dom4j.jar=${hibernate.jars.dir}/dom4j-1.6.jar 
    53  
    54 #      struts.           Needed for struts based apps. 
    55 struts.lib.dir=struts-1.2.9 
    56 #struts.lib.dir=struts1.2.4 
    57 struts.dir=${org.bedework.default.lib}/${struts.lib.dir} 
    58 struts.jar=${struts.dir}/struts-1.2.9.jar 
    59 struts.tlds.dir=${struts.dir}/tlds 
    60  
    61 #antlr.jar=${org.bedework.default.lib}/antlr-2.7.5.jar 
    62 antlr.jar=${hibernate.jars.dir}/antlr-2.7.6rc1.jar 
     47#      avalon.jar           Needed for fop filter compilation even if not used. 
     48avalon.jar=${org.bedework.default.lib}/avalon.jar 
    6349 
    6450#      commons.           Needed here and there. 
    …… 
    9581commons-validator.jar=${commons.dir}/commons-validator-1.3.0.jar 
    9682 
    97 #      jakarta.oro.               Used by struts 
    98 jakarta-oro.jar=${org.bedework.default.lib}/jakarta-oro-2.0.8.jar 
     83#      jakarta digester   - used for xml parsing. 
     84digester.jar=${commons.dir}/commons-digester-1.7.jar 
     85 
     86dojo.dir=dojo-0.4.1-ajax 
     87 
     88#      fop.jar              Needed for fop filter compilation even if not used. 
     89fop.jar=${org.bedework.default.lib}/fop.jar 
     90 
     91# hibernate jars 
     92hibernate.jars.dir.name=hibernate-3.1.2 
     93hibernate.jars.dir=${org.bedework.default.lib}/${hibernate.jars.dir.name} 
     94hibernate.jar=${hibernate.jars.dir}/hibernate3.jar 
     95dom4j.jar=${hibernate.jars.dir}/dom4j-1.6.jar 
    9996 
    10097#      httpclient.jar       Used when linking to other servfers via caldav 
    …… 
    10299httpclient.jar=${commons.dir}/commons-httpclient-3.0.jar 
    103100 
    104 #      fop.jar              Needed for fop filter compilation even if not used. 
    105 fop.jar=${org.bedework.default.lib}/fop.jar 
    106  
    107 #      avalon.jar           Needed for fop filter compilation even if not used. 
    108 avalon.jar=${org.bedework.default.lib}/avalon.jar 
    109  
    110 #      jakarta digester   - used for xml parsing. 
    111 digester.jar=${commons.dir}/commons-digester-1.7.jar 
     101httpunit.jar=${org.bedework.default.lib}/httpunit.jar 
    112102 
    113103#      ical4j.jar           Used for icalendar translation. 
    …… 
    116106ical4j.jar=${org.bedework.default.lib}/${ical4j.jar.name} 
    117107 
    118 #      lucene.jar           Used for indexing and searching 
    119 lucene.core.jar.name=lucene-core-2.0.0.jar 
    120 lucene.core.jar=${org.bedework.default.lib}/${lucene.core.jar.name} 
     108#      jakarta.oro.               Used by struts 
     109jakarta-oro.jar=${org.bedework.default.lib}/jakarta-oro-2.0.8.jar 
    121110 
    122 lucene.misc.jar.name=lucene-misc-2.0.0.jar 
    123 lucene.misc.jar=${org.bedework.default.lib}/${lucene.misc.jar.name} 
    124  
    125 #      regexp.jar           Handles regular expressions 
    126 regexp.jar=${org.bedework.default.lib}/jakarta-regexp-1.3.jar 
    127  
    128 # This should match the log4j on your target system 
    129 # 
    130 log4j.jar=${org.bedework.default.lib}/log4j-1.2.8.jar 
    131  
    132 logkit.jar=${org.bedework.default.lib}/logkit.jar 
     111# jetspeed2 jars 
     112jetspeed2.jars.dir=jetspeed2-m3 
    133113 
    134114jtidy.jar=${org.bedework.default.lib}/jtidy.jar 
    …… 
    140120junit4.jar=${org.bedework.default.lib}/${junit4.jar.name} 
    141121 
    142 httpunit.jar=${org.bedework.default.lib}/httpunit.jar 
     122# This should match the log4j on your target system 
     123# 
     124log4j.jar=${org.bedework.default.lib}/log4j-1.2.8.jar 
     125 
     126logkit.jar=${org.bedework.default.lib}/logkit.jar 
     127 
     128#      lucene.jar           Used for indexing and searching 
     129lucene.core.jar.name=lucene-core-2.0.0.jar 
     130lucene.core.jar=${org.bedework.default.lib}/${lucene.core.jar.name} 
     131 
     132lucene.misc.jar.name=lucene-misc-2.0.0.jar 
     133lucene.misc.jar=${org.bedework.default.lib}/${lucene.misc.jar.name} 
     134 
     135p6spy.jar=${org.bedework.default.lib}/p6spy-1.3.jar 
     136 
     137#      regexp.jar           Handles regular expressions 
     138regexp.jar=${org.bedework.default.lib}/jakarta-regexp-1.3.jar 
     139 
     140#      struts.           Needed for struts based apps. 
     141struts.lib.dir=struts-1.2.9 
     142#struts.lib.dir=struts1.2.4 
     143struts.dir=${org.bedework.default.lib}/${struts.lib.dir} 
     144struts.jar=${struts.dir}/struts-1.2.9.jar 
     145struts.tlds.dir=${struts.dir}/tlds 
    143146 
    144147webdavlib.jar.name=webdavlib.jar 
    …… 
    147150xalan.jar=${org.bedework.default.lib}/xalan-2-6-0.jar 
    148151 
    149 # jetspeed2 jars 
    150 jetspeed2.jars.dir=jetspeed2-m3 
    151  
    152152# 
    153153# Put you local jdbc file here or define this property in your bedework.build.properties