Changeset 1894

Show
Ignore:
Timestamp:
06/18/08 09:49:05
Author:
douglm
Message:

More changes to the build process. Main build now pulls jars out of the archive and out of each projects bin directory.

Also remove some unused ant build code.

Not yet complete but close.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk

    • Property svn:ignore changed from bin dist .settings .classpath .project .apt_generated to bin dist .settings .classpath .project .apt_generated libcache applib

  • trunk/build.xml

    r1654 r1894  
    88<project name="bedework.build" default="usage" basedir="."> 
    99  <property environment="env"/> 
     10 
     11  <!-- This affects some of the build process in the projects --> 
     12  <property name="org.bedework.quickstart.build" value="true" /> 
    1013 
    1114  <!-- this project --> 
    …… 
    125128    <property name="dist.home" location="${project.home}/dist"/> 
    126129    <property name="lib.dir" location="${project.home}/lib"/> 
     130    <property name="resources.dir" location="${project.home}/resources"/> 
    127131    <property name="bin.home" location="${project.home}/bin"/> 
    128132 
    …… 
    398402           target="build-all" /> 
    399403 
    400     <copy-to-dependent this="${org.bedework.project.access}" 
    401                        target="${org.bedework.project.caldav}" /> 
    402     <copy-to-dependent this="${org.bedework.project.access}" 
    403                        target="${org.bedework.project.calendarapi}" /> 
    404     <copy-to-dependent this="${org.bedework.project.access}" 
    405                        target="${org.bedework.project.davutil}" /> 
    406     <copy-to-dependent this="${org.bedework.project.access}" 
    407                        target="${org.bedework.project.dumprestore}" /> 
    408     <copy-to-dependent this="${org.bedework.project.access}" 
    409                        target="${org.bedework.project.webapps}" /> 
    410     <copy-to-dependent this="${org.bedework.project.access}" 
    411                        target="${org.bedework.project.webdav}" /> 
    412     <copy-to-dependent this="${org.bedework.project.access}" 
    413                        target="${org.bedework.project.testsuite}" /> 
    414  
    415404    <copy-to-bin this="${org.bedework.project.access}"/> 
    416405  </target> 
    …… 
    513502           target="build-all" /> 
    514503 
    515     <copy-to-dependent this="${org.bedework.project.calendarapi}" 
    516                        target="${org.bedework.project.caldav}" /> 
    517     <copy-to-dependent this="${org.bedework.project.calendarapi}" 
    518                        target="${org.bedework.project.dumprestore}" /> 
    519     <copy-special-to-dependent this="${org.bedework.project.calendarapi}" 
    520                        target="${org.bedework.project.dumprestore}" 
    521                        prefix="bw-calcore" /> 
    522     <copy-special-to-dependent this="${org.bedework.project.calendarapi}" 
    523                        target="${org.bedework.project.dumprestore}" 
    524                        prefix="bw-calsvc" /> 
    525     <copy-to-dependent this="${org.bedework.project.calendarapi}" 
    526                        target="${org.bedework.project.freebusy}" /> 
    527     <copy-to-dependent this="${org.bedework.project.calendarapi}" 
    528                        target="${org.bedework.project.synchml}" /> 
    529     <copy-to-dependent this="${org.bedework.project.calendarapi}" 
    530                        target="${org.bedework.project.webapps}" /> 
    531     <copy-special-to-dependent this="${org.bedework.project.calendarapi}" 
    532                        target="${org.bedework.project.webapps}" 
    533                        prefix="bw-calenv" /> 
    534     <copy-to-dependent this="${org.bedework.project.calendarapi}" 
    535                        target="${org.bedework.project.testsuite}" /> 
    536  
    537504    <copy-to-bin this="${org.bedework.project.calendarapi}"/> 
    538505  </target> 
    …… 
    555522           target="build-all" /> 
    556523 
    557     <copy-to-dependent this="${org.bedework.project.davutil}" 
    558                        target="${org.bedework.project.caldav}" /> 
    559     <copy-to-dependent this="${org.bedework.project.davutil}" 
    560                        target="${org.bedework.project.caldavTest}" /> 
    561     <copy-to-dependent this="${org.bedework.project.davutil}" 
    562                        target="${org.bedework.project.calendarapi}" /> 
    563     <copy-to-dependent this="${org.bedework.project.davutil}" 
    564                        target="${org.bedework.project.freebusy}" /> 
    565     <copy-to-dependent this="${org.bedework.project.davutil}" 
    566                        target="${org.bedework.project.webapps}" /> 
    567     <copy-to-dependent this="${org.bedework.project.davutil}" 
    568                        target="${org.bedework.project.webdav}" /> 
    569  
    570524    <copy-to-bin this="${org.bedework.project.davutil}"/> 
    571525  </target> 
    …… 
    638592           target="build-all" /> 
    639593 
    640     <copy-to-dependent this="${org.bedework.project.rpiutil}" 
    641                        target="${org.bedework.project.access}" /> 
    642     <copy-to-dependent this="${org.bedework.project.rpiutil}" 
    643                        target="${org.bedework.project.caldav}" /> 
    644     <copy-to-dependent this="${org.bedework.project.rpiutil}" 
    645                        target="${org.bedework.project.calendarapi}" /> 
    646     <copy-to-dependent this="${org.bedework.project.rpiutil}" 
    647                        target="${org.bedework.project.davutil}" /> 
    648     <copy-to-dependent this="${org.bedework.project.rpiutil}" 
    649                        target="${org.bedework.project.dumprestore}" /> 
    650     <copy-to-dependent this="${org.bedework.project.rpiutil}" 
    651                        target="${org.bedework.project.freebusy}" /> 
    652     <copy-to-dependent this="${org.bedework.project.rpiutil}" 
    653                        target="${org.bedework.project.webapps}" /> 
    654     <copy-to-dependent this="${org.bedework.project.rpiutil}" 
    655                        target="${org.bedework.project.webdav}" /> 
    656     <copy-to-dependent this="${org.bedework.project.rpiutil}" 
    657                        target="${org.bedework.project.testsuite}" /> 
    658  
    659594    <copy-to-bin this="${org.bedework.project.rpiutil}"/> 
    660595  </target> 
    …… 
    727662           target="build-all" /> 
    728663 
    729     <copy-special-to-dependent this="${org.bedework.project.webapps}" 
    730                        target="${org.bedework.project.testsuite}" 
    731                        prefix="bw-appcommon" /> 
    732  
    733664    <copy-to-bin this="${org.bedework.project.webapps}"/> 
    734665  </target> 
    …… 
    753684        <ant antfile="${org.bedework.project.webdav}/build.xml" inheritall="false" 
    754685             target="build-all" /> 
    755  
    756         <copy-to-dependent this="${org.bedework.project.webdav}" 
    757                            target="${org.bedework.project.caldav}" /> 
    758686 
    759687        <copy-to-bin this="${org.bedework.project.webdav}"/> 
    …… 
    829757           target="run.httptest" /> 
    830758  </target> 
    831  
    832   <!-- ============================================================================= 
    833        Update dependent project (target) from a project just built (this) 
    834        with a special library (i.e. not one in libapi 
    835        ============================================================================= --> 
    836   <macrodef name="copy-special-to-dependent"> 
    837     <attribute name="target"/> 
    838     <attribute name="this"/> 
    839     <attribute name="fromdir" default="dist"/> 
    840     <attribute name="prefix" /> 
    841     <sequential> 
    842       <delete> 
    843         <fileset dir="@{target}/lib" includes="@{prefix}*.jar"/> 
    844       </delete> 
    845  
    846       <copy todir="@{target}/lib" overwrite="yes"> 
    847         <fileset dir="@{this}/@{fromdir}"> 
    848           <include name="@{prefix}*.jar" /> 
    849         </fileset> 
    850       </copy> 
    851     </sequential> 
    852   </macrodef> 
    853  
    854   <!-- ============================================================================= 
    855        Update dependent project (target) from a project just built (this). 
    856        ============================================================================= --> 
    857   <macrodef name="copy-to-dependent"> 
    858     <attribute name="target"/> 
    859     <attribute name="this"/> 
    860     <attribute name="fromdir" default="libapi"/> 
    861     <sequential> 
    862       <copy todir="@{target}/lib" overwrite="yes"> 
    863         <fileset dir="@{this}/@{fromdir}"> 
    864           <include name="*.jar" /> 
    865         </fileset> 
    866       </copy> 
    867     </sequential> 
    868   </macrodef> 
    869759 
    870760  <!-- ============================================================================= 
    …… 
    881771    </sequential> 
    882772  </macrodef> 
    883  
    884   <!-- ============================================================================= 
    885        Update a project library from the bedework lib directory. 
    886        ============================================================================= --> 
    887   <macrodef name="copy-lib-to-lib"> 
    888     <attribute name="this"/> 
    889     <sequential> 
    890       <delete file="@{target}/lib/@{jarprefix}*.jar" /> 
    891  
    892       <copy todir="@{target}/lib" > 
    893         <fileset dir="${org.bedework.project.bedework}/lib" > 
    894           <include name="@{jarprefix}*.jar" /> 
    895         </fileset> 
    896       </copy> 
    897     </sequential> 
    898   </macrodef> 
    899773</project> 

  • trunk/build/buildsh.xml

    r1807 r1894  
    5151    <mkdir dir="${app.dest.lib}" /> 
    5252 
    53     <copy todir="${app.dest.lib}"> 
    54       <fileset dir="${hibernate.jars.dir}"> 
    55         <include name="*.jar"/> 
    56       </fileset> 
    57     </copy> 
    58  
    59     <copy todir="${app.dest.lib}" file="${commons-collections.jar}"/> 
    60     <copy todir="${app.dest.lib}" file="${commons-logging.jar}"/> 
     53    <!-- hibernate jars --> 
     54    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.antlr}" /> 
     55    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm-attrs}" /> 
     56    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm}" /> 
     57    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.cglib}" /> 
     58    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dom4j}" /> 
     59    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ehcache}" /> 
     60    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.hibernate}" /> 
     61    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jgroups}" /> 
     62    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jta}" /> 
     63 
     64    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-collections}"/> 
     65    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-logging}"/> 
    6166 
    6267    <!-- core files --> 
    6368 
    64     <copy todir="${app.dest.lib}" overwrite="yes"> 
    65       <fileset dir="${bin.home}"> 
    66         <!-- jars from sub-projects needed by all --> 
    67         <include name="rpiaccess*.jar"/> 
    68         <include name="rpiutil*.jar"/> 
    69         <include name="bw-davio*.jar"/> 
    70  
    71         <!-- Calendar api jars --> 
    72         <include name="bw-apiutil*.jar"/> 
    73         <include name="bw-calcore*.jar"/> 
    74         <include name="bw-calcorei*.jar"/> 
    75         <include name="bw-calenv*.jar"/> 
    76         <include name="bw-calfacade*.jar"/> 
    77         <include name="bw-calsvc*.jar"/> 
    78         <include name="bw-calsvci*.jar"/> 
    79         <include name="bw-icalendar*.jar"/> 
    80         <include name="bw-locale*.jar"/> 
    81         <include name="bw-logging*.jar"/> 
    82         <include name="bw-mail*.jar"/> 
    83       </fileset> 
    84     </copy> 
     69    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiaccess}" /> 
     70    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiutil}" /> 
     71    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-davio}" /> 
     72 
     73    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-apiutil}" /> 
     74    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcore}" /> 
     75    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcorei}" /> 
     76    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calenv}" /> 
     77    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calfacade}" /> 
     78    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvc}" /> 
     79    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvci}" /> 
     80    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-icalendar}" /> 
     81    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-logging}" /> 
     82    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-mail}" /> 
    8583 
    8684     <!-- any extra bin files--> 
    …… 
    9088 
    9189    <!-- Some more standard libs --> 
    92     <copy todir="${app.dest.lib}" file="${log4j.jar}"/> 
    93     <copy todir="${app.dest.lib}" file="${lucene.core.jar}"/> 
    94     <copy todir="${app.dest.lib}" file="${lucene.misc.jar}"/> 
    95     <copy todir="${app.dest.lib}" file="${ical4j.jar}"/> 
    96     <copy todir="${app.dest.lib}" file="${commons-digester.jar}"/> 
    97     <copy todir="${app.dest.lib}" file="${commons-httpclient.jar}"/> 
    98     <copy todir="${app.dest.lib}" file="${commons-ssl.jar}"/> 
    99     <copy todir="${app.dest.lib}" file="${commons-codec.jar}"/> 
    100     <copy todir="${app.dest.lib}" file="${commons-lang.jar}"/> 
     90    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.log4j}"/> 
     91    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-core}"/> 
     92    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-misc}"/> 
     93    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j}"/> 
     94    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-codec}"/> 
     95    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-digester}"/> 
     96    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-collections}"/> 
     97    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-httpclient}"/> 
     98    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-lang}"/> 
     99    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-ssl}"/> 
    101100 
    102101    <!-- Extra libraries specified in calling build file --> 
    103102    <copy todir="${app.dest.lib}" flatten="yes" > 
    104       <fileset refid="org.bedework.run.jars" /> 
    105103      <fileset refid="org.bedework.run.lib.jars" /> 
    106104 
    …… 
    130128 
    131129    <!-- add the jdbcdriver if defined --> 
    132     <antcall target="add.jdbcdriver" inheritRefs="true" /> 
     130    <if> 
     131      <isset property="propval.app.jdbcdriver.jar"/> 
     132      <then> 
     133        <copy todir="${app.dest.lib}" file="${propval.app.jdbcdriver.jar}"/> 
     134      </then> 
     135    </if> 
    133136 
    134137    <!-- Create the env.properties file --> 
    …… 
    211214    </zip> 
    212215  </target> 
    213  
    214   <target name="add.jdbcdriver" if="propval.app.jdbcdriver.jar"> 
    215     <copy todir="${app.dest.lib}" file="${propval.app.jdbcdriver.jar}"/> 
    216   </target> 
    217216</project> 
    218217 

  • trunk/build/buildwar.xml

    r1765 r1894  
    102102 
    103103  <target name="build" depends="init"> 
     104    <echo message="**************************************************" /> 
     105    <echo message=" * Building war ${propval.app.war.name}"/> 
     106    <echo message="**************************************************" /> 
     107 
    104108    <delete dir="${app.dest.war}" /> 
    105109 
    …… 
    187191    </copy> 
    188192 
    189     <copy todir="${app.dest.lib}"> 
    190       <fileset dir="${hibernate.jars.dir}"> 
    191         <include name="*.jar"/> 
    192       </fileset> 
    193     </copy> 
     193    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.antlr}" /> 
     194    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm-attrs}" /> 
     195    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm}" /> 
     196    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.cglib}" /> 
     197    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dom4j}" /> 
     198    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ehcache}" /> 
     199    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.hibernate}" /> 
     200    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jgroups}" /> 
     201    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jta}" /> 
    194202 
    195203    <antcall target="jboss-stuff" inheritRefs="true" /> 
    …… 
    202210         =============================================================== --> 
    203211 
    204     <copy todir="${app.dest.lib}" overwrite="yes"> 
    205       <fileset dir="${bin.home}"> 
    206         <!-- jars from sub-projects needed by all --> 
    207         <include name="rpiaccess*.jar"/> 
    208         <include name="rpiutil*.jar"/> 
    209         <include name="bw-davio*.jar"/> 
    210  
    211         <!-- Calendar api jars --> 
    212         <include name="bw-apiutil*.jar"/> 
    213         <include name="bw-calcore*.jar"/> 
    214         <include name="bw-calcorei*.jar"/> 
    215         <include name="bw-calenv*.jar"/> 
    216         <include name="bw-calfacade*.jar"/> 
    217         <include name="bw-calsvc*.jar"/> 
    218         <include name="bw-calsvci*.jar"/> 
    219         <include name="bw-client*.jar"/> 
    220         <include name="bw-icalendar*.jar"/> 
    221         <include name="bw-locale*.jar"/> 
    222         <include name="bw-logging*.jar"/> 
    223         <include name="bw-mail*.jar"/> 
    224  
    225         <!-- Common jars for web apps --> 
    226         <include name="bw-appcommon*.jar"/> 
    227       </fileset> 
    228     </copy> 
     212    <echo message="+++++++++++  bw-logging at ${org.bedework.appjar.bw-logging}" /> 
     213    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiaccess}" /> 
     214    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiutil}" /> 
     215    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-davio}" /> 
     216    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-apiutil}" /> 
     217    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcore}" /> 
     218    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcorei}" /> 
     219    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calenv}" /> 
     220    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calfacade}" /> 
     221    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvc}" /> 
     222    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvci}" /> 
     223    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-client}" /> 
     224    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-icalendar}" /> 
     225    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-logging}" /> 
     226    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-mail}" /> 
     227    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-appcommon}" /> 
    229228 
    230229     <!-- any extra bin files--> 
    …… 
    239238      </not> 
    240239      <then> 
    241         <copy todir="${app.dest.lib}" file="${log4j.jar}"/> 
     240        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.log4j}"/> 
    242241      </then> 
    243242    </if> 
    244     <copy todir="${app.dest.lib}" file="${lucene.core.jar}"/> 
    245     <copy todir="${app.dest.lib}" file="${lucene.misc.jar}"/> 
    246     <copy todir="${app.dest.lib}" file="${ical4j.jar}"/> 
    247     <copy todir="${app.dest.lib}" file="${commons-codec.jar}"/> 
    248     <copy todir="${app.dest.lib}" file="${commons-collections.jar}"/> 
    249     <copy todir="${app.dest.lib}" file="${commons-httpclient.jar}"/> 
    250     <copy todir="${app.dest.lib}" file="${commons-lang.jar}"/> 
    251     <copy todir="${app.dest.lib}" file="${commons-ssl.jar}"/> 
    252  
    253     <copy todir="${app.dest.lib}" overwrite="yes"> 
    254       <fileset dir="${javamail.dir}"> 
    255         <include name="*.jar"/> 
    256       </fileset> 
    257     </copy> 
    258  
    259     <!-- add the jdbcdriver if defined --> 
    260     <antcall target="add.jdbcdriver" inheritRefs="true" /> 
     243    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-core}"/> 
     244    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-misc}"/> 
     245    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j}"/> 
     246    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-codec}"/> 
     247    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-collections}"/> 
     248    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-httpclient}"/> 
     249    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-lang}"/> 
     250    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-ssl}"/> 
     251 
     252    <!-- Mail related stuff --> 
     253    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.activation}" /> 
     254    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dsn}" /> 
     255    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.imap}" /> 
     256    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.mailapi}" /> 
     257    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.pop3}" /> 
     258    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.smtp}" /> 
     259 
     260    <!-- add the jdbcdriver if defined 
     261         Disable this - shouldn't be adding jdbc drivers to the war file 
     262    <if> 
     263      <isset property="app.jdbcdriver.jar"/> 
     264      <then> 
     265        <copy todir="${app.dest.lib}" file="${app.jdbcdriver.jar}"/> 
     266      </then> 
     267    </if> 
     268     --> 
    261269 
    262270    <!-- tomcat --> 
    263271    <antcall target="add.tomcat" inheritRefs="true" /> 
    264  
    265      <!-- any extra lib files--> 
    266     <copy todir="${app.dest.lib}" > 
    267       <fileset refid="app.lib.files" /> 
    268       <!-- <fileset refid="app.temp.lib.files" /> --> 
    269     </copy> 
    270272 
    271273    <!-- build the war file --> 
    …… 
    277279         basedir="${app.dest.war}" 
    278280         excludes="WEB-INF/web.xml" /> 
    279   </target> 
    280  
    281   <target name="add.jdbcdriver" if="app.jdbcdriver.jar"> 
    282     <copy todir="${app.dest.lib}" file="${app.jdbcdriver.jar}"/> 
    283281  </target> 
    284282 
    …… 
    311309  </target> 
    312310 
    313   <!-- 
    314   <target name="copy.servlet.properties" if="org.bedework.servlet.properties.exists"> 
    315     <copy tofile="${app.dest.classes}/servlet.properties" file="${app.sou.properties}"> 
    316       <filterset refid="property.filters" /> 
    317     </copy> 
    318   </target> 
    319   --> 
    320311  <target name="copy.servlet.properties"> 
    321312    <copy todir="${app.dest.classes}"> 
    …… 
    369360    <mkdir  dir="${app.dest.webinf}/tlds"/> 
    370361    <copy todir="${app.dest.webinf}/tlds" > 
    371       <fileset dir="${struts.tlds.dir}"> 
    372         <include name="*"/> 
    373       </fileset> 
    374     </copy> 
    375     <copy todir="${app.dest.webinf}/tlds" > 
    376       <fileset dir="${org.bedework.default.lib}/tlds"> 
     362      <fileset dir="${org.bedework.struts.tlds}"> 
    377363        <include name="*"/> 
    378364      </fileset> 
    …… 
    393379        <!-- Add common portlet files --> 
    394380 
    395         <copy todir="${app.dest.lib}" > 
    396           <fileset dir="${portals-bridges.jars.dir}"> 
    397             <include name="*.jar"/> 
    398           </fileset> 
    399         </copy> 
     381        <copy todir="${app.dest.lib}" 
     382              file="${org.bedework.appjar.portals-bridges-common}"/> 
     383        <copy todir="${app.dest.lib}" 
     384              file="${org.bedework.appjar.portals-bridges-struts-1.2.7}"/> 
    400385 
    401386        <!-- Use generic bedework portlet tld --> 
    …… 
    434419    </if> 
    435420 
    436     <copy todir="${app.dest.lib}"> 
    437       <fileset dir="${struts.dir}"> 
    438         <include name="*.jar"/> 
    439       </fileset> 
    440     </copy> 
    441  
    442     <copy todir="${app.dest.lib}" file="${antlr.jar}"/> 
    443     <copy todir="${app.dest.lib}" file="${commons-beanutils.jar}"/> 
    444     <copy todir="${app.dest.lib}" file="${digester.jar}"/> 
    445     <copy todir="${app.dest.lib}" file="${commons-fileupload.jar}"/> 
    446     <copy todir="${app.dest.lib}" file="${commons-logging.jar}"/> 
    447     <copy todir="${app.dest.lib}" file="${commons-validator.jar}"/> 
    448     <copy todir="${app.dest.lib}" file="${jakarta-oro.jar}"/> 
     421    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.struts}"/> 
     422 
     423    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.antlr}"/> 
     424    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-beanutils}"/> 
     425    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-digester}"/> 
     426    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-fileupload}"/> 
     427    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-logging}"/> 
     428    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-validator}"/> 
     429    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jakarta-oro}"/> 
    449430  </target> 
    450431 
    …… 
    466447 
    467448  <target name="add.uportal2" if="org.bedework.build.for.uportal2" > 
    468     <copy todir="${app.dest.lib}" > 
    469       <fileset dir="${bin.home}"> 
    470         <include name="bw-uportal*.jar"/> 
    471       </fileset> 
    472     </copy> 
     449    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.uportal}"/> 
    473450 
    474451    <!-- Add the portlet servlet mapping --> 
    …… 
    497474    </copy> 
    498475 
    499     <copy todir="${app.dest.lib}" > 
    500       <fileset dir="${bin.home}"> 
    501         <include name="bw-liferay*.jar"/> 
    502       </fileset> 
    503       <fileset dir="${liferay4.lib}"> 
    504         <include name="*.jar"/> 
    505       </fileset> 
    506     </copy> 
     476    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.liferay}"/> 
     477    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.liferay.util-bridges}"/> 
     478    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.liferay.util-java}"/> 
    507479 
    508480    <!-- Add the context params --> 

  • trunk/deployment/build.xml

    r1869 r1894  
    3131    <property file="${org.bedework.project.bedework}/build/libjars.properties" /> 
    3232 
     33  <dirname property="this.build.dir" file="${ant.file}"/> 
     34 
     35  <import file="${build.dir}/getJar.xml"/> 
     36 
     37  <import file="${this.build.dir}/appjars.xml" /> 
     38 
    3339  <target name="init" > 
    34     <dirname property="this.build.dir" file="${ant.file}"/> 
     40    <getAppJars /> 
    3541 
    3642    <property name="source.home" location="${this.build.dir}/src"/> 

  • trunk/deployment/caldavTest/shellscr/build.xml

    r994 r1894  
    4343         =============================================================== --> 
    4444 
    45     <!-- from the dist directory --> 
    46     <fileset id="org.bedework.run.jars" dir="${org.bedework.empty.dir}" > 
    47     </fileset> 
    48  
    4945    <fileset id="org.bedework.run.lib.jars" dir="${org.bedework.empty.dir}" > 
    5046    </fileset> 

  • trunk/deployment/dumprestore/shellscr/build.xml

    r1651 r1894  
    4343         =============================================================== --> 
    4444 
    45     <!-- from the dist directory --> 
    46     <fileset id="org.bedework.run.jars" dir="${org.bedework.empty.dir}" > 
    47     </fileset> 
    48  
    4945    <fileset id="org.bedework.run.lib.jars" dir="${org.bedework.empty.dir}" > 
    5046    </fileset> 

  • trunk/deployment/freebusyAggregator/webapp/build.xml

    r1105 r1894  
    8080         =============================================================== --> 
    8181 
    82     <!-- from  the lib directory --> 
    83     <fileset id="app.lib.files" dir="${org.bedework.empty.dir}" > 
    84     </fileset> 
    85  
    8682    <!-- from  the bin directory --> 
    8783    <fileset id="app.bin.files" dir="${bin.home}" > 
    …… 
    8985      <include name="bw-fbaggregator*.jar" /> 
    9086      <include name="bw-fbclient*.jar" /> 
    91     </fileset> 
    92  
    93     <!-- from  the temp jars directory --> 
    94     <fileset id="app.temp.lib.files" dir="${org.bedework.empty.dir}" > 
    9587    </fileset> 
    9688 

  • trunk/deployment/publiccaldav/webapp/build.xml

    r997 r1894  
    5555         =============================================================== --> 
    5656 
    57     <!-- from  the lib directory --> 
    58     <fileset id="app.lib.files" dir="${org.bedework.empty.dir}" > 
    59     </fileset> 
    60  
    6157    <!-- from  the bin directory --> 
    6258    <fileset id="app.bin.files" dir="${bin.home}" > 
    …… 
    6460      <include name="bw-cdvserver*.jar" /> 
    6561      <include name="bw-webdavserver*.jar" /> 
    66       <include name="${propval.app.interface.jar}*.jar" /> 
    67     </fileset> 
    68  
    69     <!-- from  the temp jars directory --> 
    70     <fileset id="app.temp.lib.files" dir="${org.bedework.empty.dir}" > 
    7162    </fileset> 
    7263 

  • trunk/deployment/testsuite/shellscr/build.xml

    r1651 r1894  
    4343         =============================================================== --> 
    4444 
    45     <!-- from the dist directory --> 
    46     <fileset id="org.bedework.run.jars" dir="${org.bedework.empty.dir}" > 
    47     </fileset> 
    48  
    4945    <fileset id="org.bedework.run.lib.jars" dir="${org.bedework.default.lib}" > 
    5046      <include name="${junit4.jar.name}" /> 

  • trunk/deployment/usercaldav/webapp/build.xml

    r997 r1894  
    5454         =============================================================== --> 
    5555 
    56     <!-- from  the lib directory --> 
    57     <fileset id="app.lib.files" dir="${org.bedework.empty.dir}" > 
    58     </fileset> 
    59  
    6056    <!-- from  the bin directory --> 
    6157    <fileset id="app.bin.files" dir="${bin.home}" > 
    …… 
    6359      <include name="bw-cdvserver*.jar" /> 
    6460      <include name="bw-webdavserver*.jar" /> 
    65       <include name="${propval.app.interface.jar}*.jar" /> 
    66     </fileset> 
    67  
    68     <!-- from  the temp jars directory --> 
    69     <fileset id="app.temp.lib.files" dir="${org.bedework.empty.dir}" > 
    7061    </fileset> 
    7162 

  • trunk/deployment/webadmin/webapp/build.xml

    r1807 r1894  
    8989         =============================================================== --> 
    9090 
    91     <!-- from  the lib directory --> 
    92     <fileset id="app.lib.files" dir="${org.bedework.empty.dir}" > 
    93     </fileset> 
    94  
    9591    <!-- from  the bin directory --> 
    9692    <fileset id="app.bin.files" dir="${bin.home}" > 

  • trunk/deployment/webconfig/webapp/build.xml

    r1807 r1894  
    7979         =============================================================== --> 
    8080 
    81     <!-- from  the lib directory --> 
    82     <fileset id="app.lib.files" dir="${org.bedework.empty.dir}" > 
    83     </fileset> 
    84  
    8581    <!-- from  the bin directory --> 
    8682    <fileset id="app.bin.files" dir="${bin.home}" > 

  • trunk/deployment/webpublic/webapp/build.xml

    r1546 r1894  
    100100         =============================================================== --> 
    101101 
    102     <!-- from  the lib directory --> 
    103     <fileset id="app.lib.files" dir="${org.bedework.empty.dir}" > 
    104     </fileset> 
    105  
    106102    <!-- from  the bin directory --> 
    107103    <fileset id="app.bin.files" dir="${bin.home}" > 
    108104      <include name="bw-webcommon*.jar" /> 
    109105    </fileset> 
    110  
    111     <!-- from  the temp jars directory 
    112     <fileset id="app.temp.lib.files" dir="${org.bedework.temp.jars}" > 
    113       <include name="${org.bedework.webclient.jar.name}" /> 
    114     </fileset> 
    115     --> 
    116106 
    117107    <!-- =============================================================== 

  • trunk/deployment/websubmit/webapp/build.xml

    r1807 r1894  
    9595         =============================================================== --> 
    9696 
    97     <!-- from  the lib directory --> 
    98     <fileset id="app.lib.files" dir="${org.bedework.empty.dir}" > 
    99     </fileset> 
    100  
    10197    <!-- from  the bin directory --> 
    10298    <fileset id="app.bin.files" dir="${bin.home}" > 

  • trunk/deployment/webuser/webapp/build.xml

    r1807 r1894  
    9595         =============================================================== --> 
    9696 
    97     <!-- from  the lib directory --> 
    98     <fileset id="app.lib.files" dir="${org.bedework.empty.dir}" > 
    99     </fileset> 
    100  
    10197    <!-- from  the bin directory --> 
    10298    <fileset id="app.bin.files" dir="${bin.home}" >