Changeset 3147

Show
Ignore:
Timestamp:
01/19/11 16:43:53
Author:
douglm
Message:

Small change to incorporate bedework services in ear file. Should reduce startup time and build/deploy time as well as memory usage

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • releases/bedework-3.7/build/buildsh.xml

    r3104 r3147  
    4242 
    4343  <target name="build" depends="init"> 
     44    <infoMsg message="* =========== Building ${propval.app.zip.name}" /> 
     45 
    4446    <delete dir="${app.dest.home}" /> 
    4547 

  • releases/bedework-3.7/build/platforms/jbossService.xml

    r3104 r3147  
    6060          <fileset dir="${org.bedework.temp.extrajars.dir}" /> 
    6161        </copy> 
     62         
     63        <if> 
     64          <istrue value="${propval.app.in.ear}"/> 
     65          <then> 
     66            <!-- Preserve extra jars for later --> 
     67            <copy todir="${org.bedework.temp.ear.extrajars.dir}" > 
     68              <fileset dir="${org.bedework.temp.extrajars.dir}" /> 
     69            </copy> 
     70          </then> 
     71        </if> 
    6272         
    6373        <if> 

  • releases/bedework-3.7/build/platforms/jbossWar.xml

    r3104 r3147  
    127127      </then> 
    128128    </if> 
     129     
     130    <!-- Add any extra jars --> 
     131    <copy todir="${org.bedework.temp.ear.extrajars.dir}" > 
     132      <fileset dir="${org.bedework.temp.extrajars.dir}" /> 
     133    </copy> 
    129134 
    130135    <!-- And the extra jars we preserved --> 

  • releases/bedework-3.7/config/bwbuild/default/cal.properties

    r3097 r3147  
    1818# Define the names of the applications we want to build 
    1919org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\ 
    20  SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,indexer,dumpres,\ 
    21  sysevlog,iosched,monitor,genkeys 
     20 SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,\ 
     21 test,sysevlog,monitor,genkeys 
    2222 
    2323# 

  • releases/bedework-3.7/config/bwbuild/jboss-h2/cal.properties

    r3097 r3147  
    1818# Define the names of the applications we want to build 
    1919org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\ 
    20  SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,indexer,dumpres,\ 
    21  sysevlog,iosched,monitor,genkeys 
     20 SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,\ 
     21 test,sysevlog,monitor,genkeys 
    2222 
    2323# 

  • releases/bedework-3.7/config/bwbuild/jboss-mysql/cal.properties

    r3097 r3147  
    1818# Define the names of the applications we want to build 
    1919org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\ 
    20  SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,indexer,dumpres,\ 
    21  sysevlog,iosched,monitor,genkeys 
     20 SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,\ 
     21 test,sysevlog,monitor,genkeys 
    2222 
    2323# 

  • releases/bedework-3.7/config/bwbuild/jboss-postgresql/cal.properties

    r3097 r3147  
    1818# Define the names of the applications we want to build 
    1919org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\ 
    20  SoEDept,UserCal,Pubcaldav,Usercaldav,Pubcalws,Usercalws,caldavTest,\ 
    21  test,indexer,dumpres,\ 
    22  sysevlog,iosched,monitor,genkeys 
     20 SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,\ 
     21 Pubcalws,Usercalws,\ 
     22 test,sysevlog,monitor,genkeys 
    2323 
    2424# 
    …… 
    590590org.bedework.app.iosched.project=calendarapi 
    591591org.bedework.app.iosched.sou.dir= 
     592org.bedework.app.iosched.in.ear=true 
    592593org.bedework.app.iosched.shellscr.name=bwrun 
    593594org.bedework.app.iosched.batscr.name=bwrun.bat 

  • releases/bedework-3.7/deployment/build.xml

    r3104 r3147  
    6262            location="${org.bedework.temp.dir}/shellscr" /> 
    6363 
    64   <!-- Recreateed by each app build file. Place extra jars here --> 
     64  <!-- Recreated by each app build file. Place extra jars here --> 
    6565  <property name="org.bedework.temp.extrajars.dir" 
    6666            location="${org.bedework.temp.dir}/extrajars" /> 
    …… 
    7878 
    7979  <import file="${build.dir}/loadDeployConfig.xml"/> 
     80   
     81  <property name="ear.meta.dir" location="${this.build.dir}/ear.meta"/> 
    8082 
    8183  <target name="init" > 

  • releases/bedework-3.7/deployment/inoutsched/shellscr/build.xml

    r2715 r3147  
    4242 
    4343  <target name="deploy" depends="init,build.configured" > 
    44     <antcall target="deployService" inheritRefs="true" /> 
     44    <if> 
     45      <not> 
     46        <istrue value="${propval.app.in.ear}"/> 
     47      </not> 
     48      <then> 
     49        <antcall target="deployService" inheritRefs="true" /> 
     50      </then> 
     51    </if> 
    4552  </target> 
    4653 

  • releases/bedework-3.7/deployment/termination/webapp/build.xml

    r3104 r3147  
    1212  <dirname property="this.dir" file="${ant.file}"/> 
    1313 
     14  <import file="${this.dir}/appjars.xml" /> 
     15 
    1416  <!-- ensure has value --> 
    1517  <property name="propval.app.cal.suite" value="" /> 
    1618 
    1719  <target name="init"> 
     20    <getExtraJars /> 
    1821  </target> 
    1922