Changeset 2829

Show
Ignore:
Timestamp:
03/01/10 10:45:58
Author:
douglm
Message:

Create new platform specific termination build files.

Move some stuff out of the web termination and the deployment build.xml into the termination build files.

Allow the bedework ds config to be supplied in the configuration directory and copied into the server

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/platforms/jbossWar.xml

    r2719 r2829  
    180180          <fileset dir="${org.bedework.ear.dir}"/> 
    181181        </copy> 
    182  
    183         <!-- If requested we also copy in the activemq configuration. --> 
    184  
    185         <if> 
    186           <istrue value="${org.bedework.global.copy.activemq.config}" /> 
    187           <then> 
    188             <copy file="${org.bedework.config.home}/activemq-ra.xml" 
    189                     tofile="${org.bedework.global.activemq.dir}/META-INF/ra.xml" 
    190                   overwrite="yes" /> 
    191             <copy file="${org.bedework.config.home}/activemq-broker-config.xml" 
    192                   tofile="${org.bedework.global.activemq.dir}/broker-config.xml" 
    193                   overwrite="yes" /> 
    194             <copy file="${org.bedework.config.home}/activemq-jms-ds.xml" 
    195                   tofile="${org.bedework.appserver.deploy.dir}/activemq-jms-ds.xml" 
    196                   overwrite="yes" /> 
    197           </then> 
    198         </if> 
    199182      </then> 
    200183    </if> 

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

    r2819 r2829  
    151151#org.bedework.global.jdbcid=sa 
    152152#org.bedework.global.jdbcpw= 
     153# 
     154# If set to true or yes will copy in the bedework db datasource def bedework-ds.xml 
     155org.bedework.global.copy.bedeworkds.config=yes 
    153156 
    154157# ------------------------------------------------------------------------ 

  • trunk/deployment/build.xml

    r2811 r2829  
    226226    </antcall> 
    227227 
    228     <!-- copy startup website that sends you to the applications --> 
    229         <property name="startup.website.dir" 
    230                   location="${org.bedework.appserver.dir}/${org.bedework.server.resource.root.dir}/bedework" /> 
    231     <delete dir="${startup.website.dir}"/> 
    232     <mkdir dir="${startup.website.dir}"/> 
    233     <copy todir="${startup.website.dir}"> 
    234       <fileset dir="${app.root.dir}/resources/bedework"/> 
    235     </copy> 
    236  
    237     <!-- copy jdbc jar so datasources work --> 
    238     <if> 
    239       <available file="${org.bedework.global.ext.lib}/server" type="dir" /> 
    240       <then> 
    241         <!-- jdbc drivers --> 
    242         <copy todir="${appserver.lib.dir}" flatten="yes" > 
    243           <!-- local jdbc drivers --> 
    244           <fileset dir="${org.bedework.global.ext.lib}/server"> 
    245             <include name="*.jar"/> 
    246           </fileset> 
    247         </copy> 
    248       </then> 
    249     </if> 
    250          
    251         <if> 
    252       <isset property="org.bedework.global.extra.jars" /> 
    253       <then> 
    254         <foreach list="${org.bedework.global.extra.jars}" 
    255                  target="copyToServer" 
    256                  param="org.bedework.extra.jar" 
    257                  inheritall="true" 
    258                  trim="true" /> 
    259       </then> 
    260     </if> 
    261  
    262     <if> 
    263       <available file="${java.tools.jar}" /> 
    264       <then> 
    265         <copy todir="${appserver.lib.dir}" file="${java.tools.jar}"/> 
    266       </then> 
    267     </if> 
    268   </target> 
    269          
    270         <target name="copyToServer"> 
    271     <copy todir="${appserver.lib.dir}" file="${org.bedework.extra.jar}" /> 
    272         </target> 
     228    <!-- ================= termination tasks for deployment ================ --> 
     229 
     230    <ant antfile="${org.bedework.deployment.base}/termination/build.xml" 
     231         inheritrefs="true" target="deploy" /> 
     232  </target> 
    273233 
    274234  <!-- ================================================================= 
    …… 
    300260    </forEachApp> 
    301261 
    302     <!-- ======================= termination tasks ================= --> 
    303  
    304     <ant antfile="${org.bedework.deployment.base}/termination/build.xml" 
     262    <!-- ==================== termination tasks for apps ================= --> 
     263 
     264    <ant antfile="${org.bedework.deployment.base}/termination/${org.bedework.deploy.kind}/build.xml" 
    305265         inheritrefs="true" target="build.configured" /> 
    306266  </target> 
    …… 
    342302    </forEachApp> 
    343303 
    344     <!-- ======================= termination tasks ================= --> 
     304    <!-- =================== termination tasks for apps ================= --> 
    345305 
    346306    <ant antfile="${org.bedework.deployment.base}/termination/${org.bedework.deploy.kind}/build.xml"