Changeset 531

Show
Ignore:
Timestamp:
06/05/06 09:36:10
Author:
douglm
Message:

Upgrade struts to 1.2.9

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/bldfiles/buildsh.xml

    r463 r531  
    7878        <include name="*.jar"/> 
    7979      </fileset> 
    80       <fileset dir="${digester.dir}"> 
     80      <fileset dir="${commons.dir}"> 
    8181        <include name="*.jar"/> 
    8282      </fileset> 

  • trunk/calendar3/bldfiles/buildwar.xml

    r394 r531  
    332332      </fileset> 
    333333    </copy> 
     334 
     335    <copy todir="${app.dest.lib}" file="${antlr.jar}"/> 
     336    <copy todir="${app.dest.lib}" file="${commons-beanutils.jar}"/> 
     337    <copy todir="${app.dest.lib}" file="${digester.jar}"/> 
     338    <copy todir="${app.dest.lib}" file="${commons-fileupload.jar}"/> 
     339    <copy todir="${app.dest.lib}" file="${commons-logging.jar}"/> 
     340    <copy todir="${app.dest.lib}" file="${commons-validator.jar}"/> 
     341    <copy todir="${app.dest.lib}" file="${jakarta-oro.jar}"/> 
     342 
    334343    <copy todir="${app.dest.lib}" file="${servlet.jsp.jar}"/> 
    335344  </target> 

  • trunk/calendar3/bldfiles/defjars.properties

    r369 r531  
    3131appserver.jdbcdriver.jar=${hsqldb.jdbcdriver.jar} 
    3232 
    33 #      struts.           Needed for struts based apps. 
    34 struts.lib.dir=struts1.2.4 
    35 struts.dir=${org.bedework.default.lib}/${struts.lib.dir} 
    36 struts.jar=${struts.dir}/struts.jar 
    37 struts.tlds.dir=${struts.dir}/tlds 
    38  
    39 #      commons.           Needed here and there. 
    40 commons.lib.dir=commons 
    41 commons.dir=${org.bedework.default.lib}/${commons.lib.dir} 
    42  
    43 #      httpclient.jar       Used when linking to other servfers via caldav 
    44 #                           and for testing. 
    45 httpclient.jar=${commons.dir}/commons-httpclient-3.0.jar 
    46  
    47 #      commons-codec.jar    Used for encode/decode. 
    48 commons-codec.jar=${commons.dir}/commons-codec-1.3.jar 
    49  
    50 #      fop.jar              Needed for fop filter compilation even if not used. 
    51 fop.jar=${org.bedework.default.lib}/fop.jar 
    52  
    53 #      avalon.jar           Needed for fop filter compilation even if not used. 
    54 avalon.jar=${org.bedework.default.lib}/avalon.jar 
    55  
    56 #      jakarta digester   - used for xml parsing. 
    57 digester.dir=${org.bedework.default.lib}/digester-1.7 
    58 digester.jar=${digester.dir}/commons-digester-1.7.jar 
    59  
    60 #      ical4j.jar           Used for icalendar translation. 
    61 ical4j.jar.name=ical4j-0.9.19-pre.jar 
    62 ical4j.jar=${org.bedework.default.lib}/${ical4j.jar.name} 
    63  
    64 #      lucene.jar           Used for indexing and searching 
    65 lucene.jar.name=lucene-core-1.9.1.jar 
    66 lucene.jar=${org.bedework.default.lib}/${lucene.jar.name} 
    67  
    68 #      regexp.jar           Handles regular expressions 
    69 regexp.jar=${org.bedework.default.lib}/jakarta-regexp-1.3.jar 
    70  
    71 # This should match the log4j on your target system 
    72 # 
    73 log4j.jar=${org.bedework.default.lib}/log4j-1.2.8.jar 
    74  
    75 logkit.jar=${org.bedework.default.lib}/logkit.jar 
    76  
    77 jtidy.jar=${org.bedework.default.lib}/jtidy.jar 
    78  
    79 junit.jar=${org.bedework.default.lib}/junit.jar 
    80  
    81 httpunit.jar=${org.bedework.default.lib}/httpunit.jar 
    82  
    83 webdavlib.jar.name=webdavlib.jar 
    84 webdavlib.jar=${org.bedework.default.lib}/${webdavlib.jar.name} 
    85  
    86 xalan.jar=${org.bedework.default.lib}/xalan.jar 
    87  
    88 # jetspeed2 jars 
    89 jetspeed2.jars.dir=jetspeed2-m3 
    90  
    9133# hibernate jars 
    9234hibernate.jars.dir.name=hibernate-3.1.2 
    …… 
    9537dom4j.jar=${hibernate.jars.dir}/dom4j-1.6.jar 
    9638 
     39#      struts.           Needed for struts based apps. 
     40struts.lib.dir=struts-1.2.9 
     41#struts.lib.dir=struts1.2.4 
     42struts.dir=${org.bedework.default.lib}/${struts.lib.dir} 
     43struts.jar=${struts.dir}/struts-1.2.9.jar 
     44struts.tlds.dir=${struts.dir}/tlds 
     45 
     46#antlr.jar=${org.bedework.default.lib}/antlr-2.7.5.jar 
     47antlr.jar=${hibernate.jars.dir}/antlr-2.7.6rc1.jar 
     48 
     49#      commons.           Needed here and there. 
     50commons.lib.dir=commons 
     51commons.dir=${org.bedework.default.lib}/${commons.lib.dir} 
     52 
     53#      commons-beanutils.jar    Used for struts. 
     54commons-beanutils.jar=${commons.dir}/commons-beanutils-1.7.0.jar 
     55 
     56#      commons-codec.jar    Used for encode/decode. 
     57commons-codec.jar=${commons.dir}/commons-codec-1.3.jar 
     58 
     59#      commons-fileupload.jar    Used for struts 
     60commons-fileupload.jar=${commons.dir}/commons-fileupload.jar 
     61 
     62#      commons-logging.jar    Used for struts. 
     63commons-logging.jar=${commons.dir}/commons-logging.jar 
     64 
     65#      commons-validator.jar    Used for struts. 
     66commons-validator.jar=${commons.dir}/commons-validator-1.3.0.jar 
     67 
     68#      jakarta.oro.               Used by struts 
     69jakarta-oro.jar=${org.bedework.default.lib}/jakarta-oro-2.0.8.jar 
     70 
     71#      httpclient.jar       Used when linking to other servfers via caldav 
     72#                           and for testing. 
     73httpclient.jar=${commons.dir}/commons-httpclient-3.0.jar 
     74 
     75#      fop.jar              Needed for fop filter compilation even if not used. 
     76fop.jar=${org.bedework.default.lib}/fop.jar 
     77 
     78#      avalon.jar           Needed for fop filter compilation even if not used. 
     79avalon.jar=${org.bedework.default.lib}/avalon.jar 
     80 
     81#      jakarta digester   - used for xml parsing. 
     82digester.jar=${commons.dir}/commons-digester-1.7.jar 
     83 
     84#      ical4j.jar           Used for icalendar translation. 
     85ical4j.jar.name=ical4j-0.9.19-pre.jar 
     86ical4j.jar=${org.bedework.default.lib}/${ical4j.jar.name} 
     87 
     88#      lucene.jar           Used for indexing and searching 
     89lucene.jar.name=lucene-core-1.9.1.jar 
     90lucene.jar=${org.bedework.default.lib}/${lucene.jar.name} 
     91 
     92#      regexp.jar           Handles regular expressions 
     93regexp.jar=${org.bedework.default.lib}/jakarta-regexp-1.3.jar 
     94 
     95# This should match the log4j on your target system 
     96# 
     97log4j.jar=${org.bedework.default.lib}/log4j-1.2.8.jar 
     98 
     99logkit.jar=${org.bedework.default.lib}/logkit.jar 
     100 
     101jtidy.jar=${org.bedework.default.lib}/jtidy.jar 
     102 
     103junit.jar=${org.bedework.default.lib}/junit.jar 
     104 
     105httpunit.jar=${org.bedework.default.lib}/httpunit.jar 
     106 
     107webdavlib.jar.name=webdavlib.jar 
     108webdavlib.jar=${org.bedework.default.lib}/${webdavlib.jar.name} 
     109 
     110xalan.jar=${org.bedework.default.lib}/xalan.jar 
     111 
     112# jetspeed2 jars 
     113jetspeed2.jars.dir=jetspeed2-m3 
     114 
    97115# ------------------------------------------------------------------------- 
    98116# Generated jars