Changeset 2698

Show
Ignore:
Timestamp:
01/22/10 11:32:19
Author:
douglm
Message:

Rework the build process to make war/ear differences part of the imported platform specific build files.

Added a resource reference to the web.xml files for jms and updated the jboss-web files to link that in to a jboss resource. This probably needs some more parameterization.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/buildwar.xml

    r2430 r2698  
    5353      <isset property="org.bedework.global.build.ear" /> 
    5454      <then> 
    55         <!-- Common library in ear file --> 
    56         <property name="app.dest.lib" 
    57                   location="${org.bedework.ear.templib}" /> 
    58  
    5955        <!-- Properties all go into a single jar file at termination --> 
    6056        <property name="app.dest.classes" 
    …… 
    6258      </then> 
    6359      <else> 
    64         <!-- Library in war file --> 
    65         <property name="app.dest.lib" 
    66                   location="${app.dest.webinf}/lib" /> 
    67  
    6860        <!-- Properties in the war file --> 
    6961        <property name="app.dest.classes" 
    …… 
    242234    <delete file="${app.temp.web.xml}" /> 
    243235 
    244     <!-- Add the contex root to the file. Note that newline is required --> 
     236    <!-- Add the context root to the file. Note that newline is required --> 
    245237    <echo file="${org.bedework.global.context.roots}" append="yes"> 
    246238${propval.app.war.name}.context=${propval.app.context.root} 
    247239    </echo> 
    248240 
    249     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.antlr}" /> 
    250     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm-attrs}" /> 
    251     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm}" /> 
    252     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.cglib}" /> 
    253     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dom4j}" /> 
    254     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ehcache}" /> 
    255     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.hibernate}" /> 
    256     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.javassist}" /> 
    257     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jgroups}" /> 
    258     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jta}" /> 
    259     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-api}" /> 
    260     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-log4j12}" /> 
    261  
    262     <!-- jms support --> 
    263     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.activemq-core}" /> 
    264     <copy todir="${app.dest.lib}" 
    265           file="${org.bedework.appjar.geronimo-j2ee-management_1.0_spec}" /> 
    266     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jms}" /> 
    267  
    268     <antcall target="bexchange-stuff" inheritRefs="true" /> 
    269     <antcall target="domino-stuff" inheritRefs="true" /> 
    270     <antcall target="google-stuff" inheritRefs="true" /> 
    271  
    272     <!-- =============================================================== 
    273          Any jar files required 
    274          =============================================================== --> 
    275  
    276     <echo message="+++++++++++  bw-logging at ${org.bedework.appjar.bw-logging}" /> 
    277     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-annotations}" /> 
    278     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiaccess}" /> 
    279     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiutil}" /> 
    280     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-davio}" /> 
    281     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-apiutil}" /> 
    282     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcore}" /> 
    283     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcorei}" /> 
    284     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calfacade}" /> 
    285     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvc}" /> 
    286     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvci}" /> 
    287     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-client}" /> 
    288     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-icalendar}" /> 
    289     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-logging}" /> 
    290     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-mail}" /> 
    291     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-sysevents}" /> 
    292     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-appcommon}" /> 
    293  
    294     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-core}"/> 
    295     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-misc}"/> 
    296     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j}"/> 
    297     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-codec}"/> 
    298     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-collections}"/> 
    299     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-httpclient}"/> 
    300     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-lang}"/> 
    301     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-ssl}"/> 
    302  
    303     <!-- Mail related stuff --> 
    304     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.activation}" /> 
    305     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dsn}" /> 
    306     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.imap}" /> 
    307     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.mailapi}" /> 
    308     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.pop3}" /> 
    309     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.smtp}" /> 
    310  
    311     <!-- any extra files--> 
    312     <copy todir="${app.dest.lib}" > 
    313       <fileset dir="${org.bedework.temp.extrajars.dir}" /> 
    314     </copy> 
     241    <!-- Add libraries: Platform specific --> 
     242    <antcall target="addLibs" inheritRefs="true" /> 
    315243 
    316244    <!-- Platform specific --> 
    317245    <antcall target="doPlatform" inheritRefs="true" /> 
    318246 
    319     <!-- build the war file --> 
     247    <!-- build the war file or directory --> 
    320248    <mkdir dir="${dist.home}" /> 
     249         
     250        <!-- may be there as a file or a directory --> 
    321251    <delete file="${app.war.file}" /> 
    322  
    323     <war warfile="${app.war.file}" 
    324          webxml="${app.dest.web.xml}" 
    325          basedir="${app.dest.war}" 
    326          excludes="WEB-INF/web.xml" /> 
    327   </target> 
    328  
    329   <target name="bexchange-stuff" if="org.bedework.build.caldav.bexchange"> 
    330   </target> 
    331  
    332   <target name="domino-stuff" if="org.bedework.build.caldav.domino"> 
    333   </target> 
    334  
    335   <target name="google-stuff" if="org.bedework.build.caldav.google"> 
    336     <copy todir="${app.dest.lib}"> 
    337       <fileset dir="${google.dir}"> 
    338         <include name="*.jar"/> 
    339       </fileset> 
    340     </copy> 
     252    <delete dir="${app.war.file}" /> 
     253         
     254    <if> 
     255        <or> 
     256                <not> 
     257          <isset property="org.bedework.global.wars.zipped" /> 
     258                </not> 
     259                <istrue value="${org.bedework.global.wars.zipped}"/> 
     260      </or> 
     261      <then> 
     262        <!-- Build a zipped war file --> 
     263        <war warfile="${app.war.file}" 
     264             webxml="${app.dest.web.xml}" 
     265             basedir="${app.dest.war}" 
     266             excludes="WEB-INF/web.xml" /> 
     267      </then> 
     268      <else> 
     269        <!-- Unzipped war file --> 
     270        <copy todir="${app.war.file}"> 
     271          <fileset dir="${app.dest.war}"  includes="*"/> 
     272          <filterset refid="property.filters" /> 
     273        </copy> 
     274      </else> 
     275    </if> 
    341276  </target> 
    342277 
    …… 
    432367    </if> 
    433368 
    434     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.serializer}"/> 
    435     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.xalan}"/> 
    436     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.struts}"/> 
    437  
    438     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.antlr}"/> 
    439     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-beanutils}"/> 
    440     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-digester}"/> 
    441     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-fileupload}"/> 
    442     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-logging}"/> 
    443     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-validator}"/> 
    444     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jakarta-oro}"/> 
    445     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jstl}"/> 
    446     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jstl-standard}"/> 
    447369  </target> 
    448370</project> 

  • trunk/build/platforms/geronimoWar.xml

    r2680 r2698  
    22 
    33<!-- =================================================================== 
    4      This file is imported by buildwar.xml and adds a target 
    5         doPlatform 
     4     This file is imported by buildwar.xml and adds the targets 
    65     which will be invoked by the buildwar targets. 
     6        addLibs: add libraries for this platform 
     7        doPlatform - misc stuff 
     8        deployWar: deploy the war to the server 
     9        deployEar: deploy the ear to the server  
    710     =================================================================== --> 
    811 
    …… 
    3336    </if> 
    3437  </target> 
     38   
     39  <!-- ================================================================ 
     40       Add libraries 
     41       ================================================================ --> 
     42 
     43  <target name="addLibs"> 
     44    <!-- hibernate jars --> 
     45    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.antlr}" /> 
     46    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm-attrs}" /> 
     47    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm}" /> 
     48    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.cglib}" /> 
     49    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dom4j}" /> 
     50    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ehcache}" /> 
     51    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.hibernate}" /> 
     52    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.javassist}" /> 
     53    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jgroups}" /> 
     54    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jta}" /> 
     55    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-api}" /> 
     56    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-log4j12}" /> 
     57 
     58    <if> 
     59      <isset property="org.bedework.build.caldav.google" /> 
     60      <then> 
     61        <copy todir="${app.dest.lib}"> 
     62          <fileset dir="${google.dir}"> 
     63            <include name="*.jar"/> 
     64          </fileset> 
     65        </copy> 
     66      </then> 
     67    </if> 
     68 
     69    <!-- =============================================================== 
     70         Any jar files required 
     71         =============================================================== --> 
     72 
     73    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-annotations}" /> 
     74    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiaccess}" /> 
     75    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiutil}" /> 
     76    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-davio}" /> 
     77    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-apiutil}" /> 
     78    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcore}" /> 
     79    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcorei}" /> 
     80    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calfacade}" /> 
     81    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvc}" /> 
     82    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvci}" /> 
     83    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-client}" /> 
     84    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-icalendar}" /> 
     85    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-logging}" /> 
     86    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-mail}" /> 
     87    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-sysevents}" /> 
     88    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-appcommon}" /> 
     89 
     90    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-core}"/> 
     91    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-misc}"/> 
     92    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j}"/> 
     93    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-codec}"/> 
     94    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-collections}"/> 
     95    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-httpclient}"/> 
     96    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-lang}"/> 
     97    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-ssl}"/> 
     98 
     99    <!-- Mail related stuff --> 
     100    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.activation}" /> 
     101    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dsn}" /> 
     102    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.imap}" /> 
     103    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.mailapi}" /> 
     104    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.pop3}" /> 
     105    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.smtp}" /> 
     106 
     107    <!-- any extra files--> 
     108    <copy todir="${app.dest.lib}" > 
     109      <fileset dir="${org.bedework.temp.extrajars.dir}" /> 
     110    </copy> 
     111     
     112    <if> 
     113      <isset property="org.bedework.strutsapp" /> 
     114      <then> 
     115        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.serializer}"/> 
     116        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.xalan}"/> 
     117        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.struts}"/> 
     118 
     119        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-beanutils}"/> 
     120        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-digester}"/> 
     121        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-fileupload}"/> 
     122        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-logging}"/> 
     123        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-validator}"/> 
     124        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jakarta-oro}"/> 
     125        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jstl}"/> 
     126        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jstl-standard}"/> 
     127      </then> 
     128    </if> 
     129  </target> 
     130   
     131  <!-- ================================================================ 
     132       Deploy war 
     133       ================================================================ --> 
     134 
     135  <target name="deployWar"> 
     136    <if> 
     137      <not> 
     138        <isset property="org.bedework.global.build.ear" /> 
     139      </not> 
     140      <then> 
     141        <echo message="***************************************************************" /> 
     142        <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
     143        <echo message="***************************************************************" /> 
     144 
     145        <!-- copy the war file. --> 
     146        <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
     147              overwrite="yes" /> 
     148 
     149        <!-- Delete expanded version --> 
     150        <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
     151      </then> 
     152    </if> 
     153  </target> 
     154     
     155  <!-- ================================================================ 
     156       Deploy ear 
     157       ================================================================ --> 
     158 
     159  <target name="deployEar"> 
     160  </target> 
    35161</project> 

  • trunk/build/platforms/jbossWar.xml

    r2695 r2698  
    22 
    33<!-- =================================================================== 
    4      This file is imported by buildwar.xml and adds a target 
    5         doPlatform 
     4     This file is imported by buildwar.xml and adds the targets 
    65     which will be invoked by the buildwar targets. 
     6        addLibs: add libraries for this platform 
     7        doPlatform - misc stuff 
     8        deployWar: deploy the war to the server 
     9        deployEar: deploy the ear to the server  
    710     =================================================================== --> 
    811 
    …… 
    3336    </if> 
    3437  </target> 
     38   
     39  <!-- ================================================================ 
     40       Add libraries 
     41       ================================================================ --> 
     42 
     43  <target name="addLibs"> 
     44    <if> 
     45      <not> 
     46        <isset property="org.bedework.global.build.ear" /> 
     47      </not> 
     48      <then> 
     49        <!-- Library in war file --> 
     50        <property name="app.dest.lib" 
     51                  location="${app.dest.webinf}/lib" /> 
     52        <antcall target="copyLibs" inheritRefs="true" /> 
     53      </then> 
     54      <else> 
     55        <!-- Preserve extra jars for later --> 
     56        <copy todir="${org.bedework.temp.ear.extrajars.dir}" > 
     57          <fileset dir="${org.bedework.temp.extrajars.dir}" /> 
     58        </copy> 
     59      </else> 
     60    </if> 
     61  </target> 
     62   
     63  <!-- ================================================================ 
     64       Deploy war 
     65       ================================================================ --> 
     66 
     67  <target name="deployWar"> 
     68    <if> 
     69      <not> 
     70        <isset property="org.bedework.global.build.ear" /> 
     71      </not> 
     72      <then> 
     73        <echo message="***************************************************************" /> 
     74        <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
     75        <echo message="***************************************************************" /> 
     76 
     77        <!-- copy the war file. --> 
     78        <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
     79              overwrite="yes" /> 
     80 
     81        <!-- Delete expanded version --> 
     82        <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
     83      </then> 
     84    </if> 
     85  </target> 
     86     
     87  <!-- ================================================================ 
     88       Deploy ear 
     89       ================================================================ --> 
     90 
     91  <target name="deployEar"> 
     92    <!-- Common library in ear file --> 
     93    <property name="app.dest.lib" 
     94              location="${org.bedework.ear.dir}" /> 
     95    <antcall target="copyLibs" inheritRefs="true" /> 
     96 
     97        <!-- And the extra jars we preserved --> 
     98    <copy todir="${app.dest.lib}" > 
     99      <fileset dir="${org.bedework.temp.ear.extrajars.dir}" /> 
     100    </copy> 
     101         
     102    <echo message="***************************************************************" /> 
     103    <echo message="Building ear file for jboss deployment" /> 
     104    <echo message="***************************************************************" /> 
     105 
     106    <jar jarfile="${org.bedework.ear.properties.jar}"> 
     107      <fileset dir="${org.bedework.ear.properties.dir}"/> 
     108    </jar> 
     109 
     110    <path id="app.xml.cp"> 
     111      <pathelement location="${org.bedework.deployutil.jar}"/> 
     112    </path> 
     113 
     114    <taskdef name="applicationXml" 
     115             classname="org.bedework.deployment.ApplicationXmlTask"> 
     116      <classpath refid="app.xml.cp"/> 
     117    </taskdef> 
     118 
     119    <echo message="outFile=${org.bedework.ear.dir}/META-INF/application.xml 
     120                    warDir=${org.bedework.temp.dir}/wars 
     121                    contexts=${org.bedework.global.context.roots}" /> 
     122 
     123    <applicationXml displayName="Bedework calendar suite" 
     124                    outFile="${org.bedework.ear.dir}/META-INF/application.xml" 
     125                    warDir="${org.bedework.temp.dir}/wars" 
     126                    contexts="${org.bedework.global.context.roots}"> 
     127      <fileset dir="${org.bedework.ear.dir}"> 
     128        <include name="*.jar"/> 
     129      </fileset> 
     130    </applicationXml> 
     131 
     132    <manifest file="${org.bedework.ear.dir}/META-INF/MANIFEST.MF" /> 
     133 
     134    <if> 
     135      <equals arg1="${org.bedework.global.ear.wars.zipped}" 
     136              arg2="yes" /> 
     137      <then> 
     138        <copy toDir="${org.bedework.ear.dir}"> 
     139          <fileset dir="${dist.home}" 
     140                   includes="*.war" /> 
     141        </copy> 
     142      </then> 
     143      <else> 
     144        <copy toDir="${org.bedework.ear.dir}"> 
     145          <fileset dir="${org.bedework.temp.wars.home}"/> 
     146        </copy> 
     147      </else> 
     148    </if> 
     149 
     150    <if> 
     151      <equals arg1="${org.bedework.global.ear.zipped}" 
     152              arg2="yes" /> 
     153      <then> 
     154         <zip destfile="${org.bedework.ear.file}" 
     155             basedir="${org.bedework.ear.dir}"/> 
     156      </then> 
     157    </if> 
     158 
     159    <!-- copy the ear - at the moment copy the uncompressed. --> 
     160 
     161    <if> 
     162      <isset property="org.bedework.appserver.deploy.dir" /> 
     163      <then> 
     164        <delete dir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}" /> 
     165        <mkdir dir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}" /> 
     166        <copy todir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}"> 
     167          <fileset dir="${org.bedework.ear.dir}"/> 
     168        </copy> 
     169      </then> 
     170    </if> 
     171  </target> 
     172   
     173  <!-- ================================================================ 
     174       Private target to copy libraries 
     175       ================================================================ --> 
     176 
     177  <target name="copyLibs"> 
     178    <!-- hibernate jars --> 
     179    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.antlr}" /> 
     180    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm-attrs}" /> 
     181    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm}" /> 
     182    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.cglib}" /> 
     183    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dom4j}" /> 
     184    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ehcache}" /> 
     185    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.hibernate}" /> 
     186    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.javassist}" /> 
     187    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jta}" /> 
     188    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-api}" /> 
     189    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-log4j12}" /> 
     190 
     191    <if> 
     192      <isset property="org.bedework.build.caldav.google" /> 
     193      <then> 
     194        <copy todir="${app.dest.lib}"> 
     195          <fileset dir="${google.dir}"> 
     196            <include name="*.jar"/> 
     197          </fileset> 
     198        </copy> 
     199      </then> 
     200    </if> 
     201 
     202    <!-- =============================================================== 
     203         Any jar files required 
     204         =============================================================== --> 
     205 
     206    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-annotations}" /> 
     207    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiaccess}" /> 
     208    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiutil}" /> 
     209    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-davio}" /> 
     210    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-apiutil}" /> 
     211    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcore}" /> 
     212    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcorei}" /> 
     213    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calfacade}" /> 
     214    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvc}" /> 
     215    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvci}" /> 
     216    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-client}" /> 
     217    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-icalendar}" /> 
     218    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-logging}" /> 
     219    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-mail}" /> 
     220    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-sysevents}" /> 
     221    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-appcommon}" /> 
     222 
     223    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-core}"/> 
     224    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-misc}"/> 
     225    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j}"/> 
     226    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-codec}"/> 
     227    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-collections}"/> 
     228    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-httpclient}"/> 
     229    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-lang}"/> 
     230    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-ssl}"/> 
     231 
     232    <!-- Mail related stuff --> 
     233    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.activation}" /> 
     234    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dsn}" /> 
     235    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.imap}" /> 
     236    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.mailapi}" /> 
     237    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.pop3}" /> 
     238    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.smtp}" /> 
     239 
     240    <!-- any extra files--> 
     241    <copy todir="${app.dest.lib}" > 
     242      <fileset dir="${org.bedework.temp.extrajars.dir}" /> 
     243    </copy> 
     244 
     245        <!-- Add the struts stuff --> 
     246    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.serializer}"/> 
     247    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.xalan}"/> 
     248    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.struts}"/> 
     249 
     250    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-beanutils}"/> 
     251    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-digester}"/> 
     252    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-fileupload}"/> 
     253    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-validator}"/> 
     254    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jakarta-oro}"/> 
     255    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jstl}"/> 
     256    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jstl-standard}"/> 
     257  </target> 
    35258</project> 

  • trunk/build/platforms/tomcat5War.xml

    r2655 r2698  
    22 
    33<!-- =================================================================== 
    4      This file is imported by buildwar.xml and adds a target 
    5         doPlatform 
     4     This file is imported by buildwar.xml and adds the targets 
    65     which will be invoked by the buildwar targets. 
     6        addLibs: add libraries for this platform 
     7        doPlatform - misc stuff 
     8        deployWar: deploy the war to the server 
     9        deployEar: deploy the ear to the server  
    710     =================================================================== --> 
    811 
    …… 
    2023      <filterset refid="property.filters" /> 
    2124    </copy> 
     25  </target> 
     26   
     27  <!-- ================================================================ 
     28       Add libraries 
     29       ================================================================ --> 
     30 
     31  <target name="addLibs"> 
     32    <!-- hibernate jars --> 
     33    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.antlr}" /> 
     34    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm-attrs}" /> 
     35    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm}" /> 
     36    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.cglib}" /> 
     37    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dom4j}" /> 
     38    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ehcache}" /> 
     39    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.hibernate}" /> 
     40    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.javassist}" /> 
     41    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jgroups}" /> 
     42    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jta}" /> 
     43    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-api}" /> 
     44    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-log4j12}" /> 
     45 
     46    <!-- jms support --> 
     47    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.activemq-core}" /> 
     48    <copy todir="${app.dest.lib}" 
     49          file="${org.bedework.appjar.geronimo-j2ee-management_1.0_spec}" /> 
     50    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jms}" /> 
     51 
     52    <if> 
     53      <isset property="org.bedework.build.caldav.google" /> 
     54      <then> 
     55        <copy todir="${app.dest.lib}"> 
     56          <fileset dir="${google.dir}"> 
     57            <include name="*.jar"/> 
     58          </fileset> 
     59        </copy> 
     60      </then> 
     61    </if> 
     62 
     63    <!-- =============================================================== 
     64         Any jar files required 
     65         =============================================================== --> 
     66 
     67    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-annotations}" /> 
     68    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiaccess}" /> 
     69    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiutil}" /> 
     70    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-davio}" /> 
     71    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-apiutil}" /> 
     72    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcore}" /> 
     73    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcorei}" /> 
     74    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calfacade}" /> 
     75    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvc}" /> 
     76    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvci}" /> 
     77    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-client}" /> 
     78    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-icalendar}" /> 
     79    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-logging}" /> 
     80    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-mail}" /> 
     81    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-sysevents}" /> 
     82    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-appcommon}" /> 
     83 
     84    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-core}"/> 
     85    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-misc}"/> 
     86    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j}"/> 
     87    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-codec}"/> 
     88    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-collections}"/> 
     89    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-httpclient}"/> 
     90    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-lang}"/> 
     91    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-ssl}"/> 
    2292 
    2393    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.log4j}"/> 
     94 
     95    <!-- Mail related stuff --> 
     96    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.activation}" /> 
     97    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dsn}" /> 
     98    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.imap}" /> 
     99    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.mailapi}" /> 
     100    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.pop3}" /> 
     101    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.smtp}" /> 
     102 
     103    <!-- any extra files--> 
     104    <copy todir="${app.dest.lib}" > 
     105      <fileset dir="${org.bedework.temp.extrajars.dir}" /> 
     106    </copy> 
     107     
     108    <if> 
     109      <isset property="org.bedework.strutsapp" /> 
     110      <then> 
     111        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.serializer}"/> 
     112        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.xalan}"/> 
     113        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.struts}"/> 
     114 
     115        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-beanutils}"/> 
     116        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-digester}"/> 
     117        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-fileupload}"/> 
     118        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-logging}"/> 
     119        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-validator}"/> 
     120        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jakarta-oro}"/> 
     121        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jstl}"/> 
     122        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jstl-standard}"/> 
     123      </then> 
     124    </if> 
     125  </target> 
     126   
     127  <!-- ================================================================ 
     128       Deploy war 
     129       ================================================================ --> 
     130 
     131  <target name="deployWar"> 
     132    <echo message="***************************************************************" /> 
     133    <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
     134    <echo message="***************************************************************" /> 
     135 
     136    <!-- copy the war file. --> 
     137    <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
     138          overwrite="yes" /> 
     139 
     140    <!-- Delete expanded version --> 
     141    <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
     142 
     143    <!-- Delete the quickstart context def --> 
     144    <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
     145  </target> 
     146     
     147  <!-- ================================================================ 
     148       Deploy ear 
     149       ================================================================ --> 
     150 
     151  <target name="deployEar"> 
     152        <!-- Noop for tomcat --> 
    24153  </target> 
    25154</project> 

  • trunk/config/bwbuild/jboss/cal.properties

    r2695 r2698  
    6464org.bedework.global.ear.name=rpical 
    6565 
    66 # This allows us to exclude some libraries when copying files into the ear file. 
    67 # Version we use in bedework may conflict with versions installed in the application 
    68 # server. 
    69 org.bedework.global.ear.lib.excludes=commons-logging*,log4j*,jgroup*,servlet.jsp* 
    70  
    7166# 
    7267# The ear can be zipped or left unzipped. Zipped can be useful for copying 
    7368# Jboss will not tolerate zipped ears and unzipped wars. 
    7469 
    75 # Comment out or set to "no" to disable zipped ear file 
    76 org.bedework.global.ear.zipped=yes 
     70# Comment out or set to "no"/"false" to disable zipped ear file 
     71org.bedework.global.ear.zipped=no 
    7772 
    7873# How would you like your wars sir? zipped or unzipped? 
    79 org.bedework.global.ear.wars.zipped=yes 
     74org.bedework.global.wars.zipped=no 
    8075# 
    8176# ------------------------------------------------------------------------ 

  • trunk/deployment/build.xml

    r2231 r2698  
    44     This directory and the files within it are to be part of the config 
    55     and deployment process. 
     6      
     7     ======================== new comment ======================== 
     8     Modules are of type and kind. 
     9      
     10     The type is for example, webadmin, usercaldav etc. 
     11      
     12     The kind is webapp, shellscr etc. 
     13      
     14     We cycle over the information we have for each application we want to  
     15     build and for each application use ants property mapping to map the  
     16     properties onto a constant set of names, e.g. the application specific  
     17     name  
     18         org.bedework.app.CalAdmin.deploy.dir 
     19     would be mapped onto  
     20         propval.app.deploy.dir 
     21          
     22     We then look for build.xml files on a path given by the type and kind,  
     23     for example  
     24         webadmin/webapp/build.xml 
     25     or 
     26         indexer/shellscr/build.xml 
     27          
     28     The intent was to allow certain modules to be built in different forms. 
     29     At one point it was also the case that we tried to deal with platform 
     30     specific issues through this scheme. Now that is handled by importing 
     31     platform specific build files into a generic build file. 
     32      
     33     That may allow for some simplification.  
     34     ======================== old comment ======================== 
    635 
    736     A number of properties of the form org.bedework.install.XXX will be 
    8      defined, each indicating that a particualr component is to be deployed. 
     37     defined, each indicating that a particular component is to be deployed. 
    938 
    1039     Targets below will be executed only if that property is defined. 
    …… 
    2352        Add an antcall for each component and a corresponding target 
    2453 
    25      Authors: Mike Douglass   douglm@rpi.edu 
     54     Authors: Mike Douglass   douglm rpi.edu 
    2655     =================================================================== --> 
    2756 
    …… 
    3968            location="${org.bedework.temp.dir}/extrajars" /> 
    4069 
     70  <!-- Preserve extra jars for ear builds --> 
     71  <property name="org.bedework.temp.ear.extrajars.dir" 
     72            location="${org.bedework.temp.dir}/earextrajars" /> 
     73         
    4174  <dirname property="this.build.dir" file="${ant.file}"/> 
    4275  <property name="bedework.deployment.base" location="this.build.dir" /> 
    …… 
    88121        </if> 
    89122 
    90         <!-- 
    91         <property name="org.bedework.ear.templib" 
    92                   location="${org.bedework.ear.dir}/lib" /> 
    93                   --> 
    94         <property name="org.bedework.ear.templib" 
    95                   location="${org.bedework.temp.dir}/earlib" /> 
    96123        <property name="org.bedework.ear.properties.dir" 
    97124                  location="${org.bedework.temp.dir}/ear-properties" /> 

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

    r2409 r2698  
    77<project name="bwpublic.deploy" default="deploy" > 
    88  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
     10  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" /> 
    911 
    1012  <dirname property="this.dir" file="${ant.file}"/> 
    …… 
    7678    </if> 
    7779 
    78     <if> 
    79       <not> 
    80         <isset property="org.bedework.global.build.ear" /> 
    81       </not> 
    82       <then> 
    83         <echo message="***************************************************************" /> 
    84         <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    85         <echo message="***************************************************************" /> 
    86  
    87         <!-- Delete expanded version --> 
    88         <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    89  
    90         <!-- copy the war file. --> 
    91         <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" 
    92               file="${app.war.file}" 
    93               overwrite="yes" /> 
    94  
    95         <!-- Delete the quickstart context def --> 
    96         <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    97       </then> 
    98     </if> 
     80    <!-- Platform specific --> 
     81    <antcall target="deployWar" inheritRefs="true" /> 
    9982  </target> 
    10083 

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

    r1938 r2698  
    77<project name="bwpubcaldav.deploy" default="deploy" > 
    88  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
     10  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" /> 
    911 
    1012  <dirname property="this.dir" file="${ant.file}"/> 
    …… 
    3840 
    3941  <target name="deploy" depends="init,build.configured" > 
    40     <if> 
    41       <not> 
    42         <isset property="org.bedework.global.build.ear" /> 
    43       </not> 
    44       <then> 
    45         <echo message="***************************************************************" /> 
    46         <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    47         <echo message="***************************************************************" /> 
    48  
    49         <!-- copy the war file. --> 
    50         <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
    51               overwrite="yes" /> 
    52  
    53         <!-- Delete expanded version --> 
    54         <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    55  
    56         <!-- Delete the quickstart context def --> 
    57         <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    58       </then> 
    59     </if> 
     42    <!-- Platform specific --> 
     43    <antcall target="deployWar" inheritRefs="true" /> 
    6044  </target> 
    6145 

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

    r952 r2698  
    55     =================================================================== --> 
    66 
    7 <project name="bwpubcaldav.deploy" default="deploy" > 
     7<project name="bwdeploy.termination" default="deploy" > 
    88  <target name="init"> 
    99  </target> 

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

    r1991 r2698  
    88  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
    99 
     10  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" /> 
     11 
     12  <dirname property="this.dir" file="${ant.file}"/> 
     13 
    1014  <target name="init"> 
    11     <dirname property="this.dir" file="${ant.file}"/> 
    12  
    1315  </target> 
    1416 
    …… 
    2123      <isset property="org.bedework.global.build.ear" /> 
    2224      <then> 
    23         <echo message="***************************************************************" /> 
    24         <echo message="Building ear file for jboss deployment" /> 
    25         <echo message="***************************************************************" /> 
    26  
    27         <jar jarfile="${org.bedework.ear.properties.jar}"> 
    28           <fileset dir="${org.bedework.ear.properties.dir}"/> 
    29         </jar> 
    30  
    31         <path id="app.xml.cp"> 
    32           <pathelement location="${org.bedework.deployutil.jar}"/> 
    33         </path> 
    34  
    35         <taskdef name="applicationXml" 
    36                  classname="org.bedework.deployment.ApplicationXmlTask"> 
    37           <classpath refid="app.xml.cp"/> 
    38         </taskdef> 
    39  
    40         <!-- We have to drop some of the libraries so they don't conflict --> 
    41         <copy toDir="${org.bedework.ear.dir}"> 
    42           <fileset dir="${org.bedework.ear.templib}" 
    43                    excludes="${org.bedework.global.ear.lib.excludes}" /> 
    44         </copy> 
    45  
    46         <echo message="outFile=${org.bedework.ear.dir}/META-INF/application.xml 
    47                         warDir=${org.bedework.temp.dir}/wars 
    48                         contexts=${org.bedework.global.context.roots}" /> 
    49  
    50         <applicationXml displayName="Bedework calendar suite" 
    51                         outFile="${org.bedework.ear.dir}/META-INF/application.xml" 
    52                         warDir="${org.bedework.temp.dir}/wars" 
    53                         contexts="${org.bedework.global.context.roots}"> 
    54           <fileset dir="${org.bedework.ear.dir}"> 
    55             <include name="*.jar"/> 
    56           </fileset> 
    57         </applicationXml> 
    58  
    59         <manifest file="${org.bedework.ear.dir}/META-INF/MANIFEST.MF" /> 
    60  
    61         <if> 
    62           <equals arg1="${org.bedework.global.ear.wars.zipped}" 
    63                   arg2="yes" /> 
    64           <then> 
    65             <copy toDir="${org.bedework.ear.dir}"> 
    66               <fileset dir="${dist.home}" 
    67                        includes="*.war" /> 
    68             </copy> 
    69           </then> 
    70           <else> 
    71             <copy toDir="${org.bedework.ear.dir}"> 
    72               <fileset dir="${org.bedework.temp.wars.home}"/> 
    73             </copy> 
    74           </else> 
    75         </if> 
    76  
    77         <if> 
    78           <equals arg1="${org.bedework.global.ear.zipped}" 
    79                   arg2="yes" /> 
    80           <then> 
    81              <zip destfile="${org.bedework.ear.file}" 
    82                  basedir="${org.bedework.ear.dir}"/> 
    83           </then> 
    84         </if> 
    85  
    86         <!-- copy the ear - at the moment copy the uncompressed. --> 
    87  
    88         <if> 
    89           <isset property="org.bedework.appserver.deploy.dir" /> 
    90           <then> 
    91             <delete dir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}" /> 
    92             <mkdir dir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}" /> 
    93             <copy todir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}"> 
    94               <fileset dir="${org.bedework.ear.dir}"/> 
    95             </copy> 
    96           </then> 
    97         </if> 
     25        <!-- Platform specific --> 
     26        <antcall target="deployEar" inheritRefs="true" /> 
    9827      </then> 
    9928    </if> 

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

    r1998 r2698  
    77<project name="bwpubcaldav.deploy" default="deploy" > 
    88  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
     10  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" /> 
    911 
    1012  <dirname property="deployer.dir" file="${ant.file}"/> 
    …… 
    3234 
    3335  <target name="deploy" depends="init,build.configured" > 
    34     <if> 
    35       <not> 
    36         <isset property="org.bedework.global.build.ear" /> 
    37       </not> 
    38       <then> 
    39         <echo message="***************************************************************" /> 
    40         <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    41         <echo message="***************************************************************" /> 
    42  
    43         <!-- copy the war file. --> 
    44         <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
    45               overwrite="yes" /> 
    46  
    47         <!-- Delete expanded version --> 
    48         <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    49  
    50         <!-- Delete the quickstart context def --> 
    51         <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    52       </then> 
    53     </if> 
     36    <!-- Platform specific --> 
     37    <antcall target="deployWar" inheritRefs="true" /> 
    5438  </target> 
    5539 

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

    r1938 r2698  
    77<project name="bwusercaldav.deploy" default="deploy" > 
    88  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
     10  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" /> 
    911 
    1012  <dirname property="this.dir" file="${ant.file}"/> 
    …… 
    3739 
    3840  <target name="deploy" depends="init,build.configured" > 
    39     <if> 
    40       <not> 
    41         <isset property="org.bedework.global.build.ear" /> 
    42       </not> 
    43       <then> 
    44         <echo message="***************************************************************" /> 
    45         <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    46         <echo message="***************************************************************" /> 
    47  
    48         <!-- copy the war file. --> 
    49         <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
    50               overwrite="yes" /> 
    51  
    52         <!-- Delete expanded version --> 
    53         <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    54  
    55         <!-- Delete the quickstart context def --> 
    56         <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    57       </then> 
    58     </if> 
     41    <!-- Platform specific --> 
     42    <antcall target="deployWar" inheritRefs="true" /> 
    5943  </target> 
    6044 

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

    r1956 r2698  
    77<project name="bwadmin.deploy" default="deploy" > 
    88  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
     10  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" /> 
    911 
    1012  <dirname property="this.dir" file="${ant.file}"/> 
    …… 
    6870    </if> 
    6971 
    70     <if> 
    71       <not> 
    72         <isset property="org.bedework.global.build.ear" /> 
    73       </not> 
    74       <then> 
    75         <echo message="***************************************************************" /> 
    76         <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    77         <echo message="***************************************************************" /> 
    78  
    79         <!-- copy the war file. --> 
    80         <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
    81               overwrite="yes" /> 
    82  
    83         <!-- Delete expanded version --> 
    84         <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    85  
    86         <!-- Delete the quickstart context def --> 
    87         <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    88       </then> 
    89     </if> 
     72    <!-- Platform specific --> 
     73    <antcall target="deployWar" inheritRefs="true" /> 
    9074  </target> 
    9175 

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

    r1956 r2698  
    77<project name="bwconfig.deploy" default="deploy" > 
    88  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
     10  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" /> 
    911 
    1012  <dirname property="this.dir" file="${ant.file}"/> 
    …… 
    5860    </if> 
    5961 
    60     <if> 
    61       <not> 
    62         <isset property="org.bedework.global.build.ear" /> 
    63       </not> 
    64       <then> 
    65         <echo message="***************************************************************" /> 
    66         <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    67         <echo message="***************************************************************" /> 
    68  
    69         <!-- copy the war file. --> 
    70         <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
    71               overwrite="yes" /> 
    72  
    73         <!-- Delete expanded version --> 
    74         <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    75  
    76         <!-- Delete the quickstart context def --> 
    77         <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    78       </then> 
    79     </if> 
     62    <!-- Platform specific --> 
     63    <antcall target="deployWar" inheritRefs="true" /> 
    8064  </target> 
    8165 

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

    r2541 r2698  
    77<project name="bwpublic.deploy" default="deploy" > 
    88  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
     10  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" /> 
    911 
    1012  <dirname property="this.dir" file="${ant.file}"/> 
    …… 
    3335              --> 
    3436 
    35         <echo message="XXXXXXXXXXXXXXXXXXXXXXX  app.resources.dir=${app.resources.dir}" /> 
    3637    <property name="app.resources.dir" 
    3738              location="${this.dir}/resources" /> 
    …… 
    7879    </if> 
    7980 
    80     <if> 
    81       <not> 
    82         <isset property="org.bedework.global.build.ear" /> 
    83       </not> 
    84       <then> 
    85         <echo message="***************************************************************" /> 
    86         <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    87         <echo message="***************************************************************" /> 
    88  
    89         <!-- Delete expanded version --> 
    90         <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    91  
    92         <!-- copy the war file. --> 
    93         <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" 
    94               file="${app.war.file}" 
    95               overwrite="yes" /> 
    96  
    97         <!-- Delete the quickstart context def --> 
    98         <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    99       </then> 
    100     </if> 
     81    <!-- Platform specific --> 
     82    <antcall target="deployWar" inheritRefs="true" /> 
    10183  </target> 
    10284 

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

    r1956 r2698  
    77<project name="bwsubmit.deploy" default="deploy" > 
    88  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
     10  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" /> 
    911 
    1012  <dirname property="this.dir" file="${ant.file}"/> 
    …… 
    7678    </if> 
    7779 
    78     <if> 
    79       <not> 
    80         <isset property="org.bedework.global.build.ear" /> 
    81       </not> 
    82       <then> 
    83         <echo message="***************************************************************" /> 
    84         <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    85         <echo message="***************************************************************" /> 
    86  
    87         <!-- copy the war file. --> 
    88         <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
    89               overwrite="yes" /> 
    90  
    91         <!-- Delete expanded version --> 
    92         <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    93  
    94         <!-- Delete the quickstart context def --> 
    95         <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    96       </then> 
    97     </if> 
     80    <!-- Platform specific --> 
     81    <antcall target="deployWar" inheritRefs="true" /> 
    9882  </target> 
    9983 

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

    r1956 r2698  
    77<project name="bwpersonal.deploy" default="deploy" > 
    88  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
     10  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" /> 
    911 
    1012  <dirname property="this.dir" file="${ant.file}"/> 
    …… 
    7678    </if> 
    7779 
    78     <if> 
    79       <not> 
    80         <isset property="org.bedework.global.build.ear" /> 
    81       </not> 
    82       <then> 
    83         <echo message="***************************************************************" /> 
    84         <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    85         <echo message="***************************************************************" /> 
    86  
    87         <!-- copy the war file. --> 
    88         <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
    89               overwrite="yes" /> 
    90  
    91         <!-- Delete expanded version --> 
    92         <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    93  
    94         <!-- Delete the quickstart context def --> 
    95         <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    96       </then> 
    97     </if> 
     80    <!-- Platform specific --> 
     81    <antcall target="deployWar" inheritRefs="true" /> 
    9882  </target> 
    9983