Changeset 2311

Show
Ignore:
Timestamp:
08/06/09 10:23:30
Author:
douglm
Message:

Remove use of <user-home>/bedework.build.properties

Rename deployment/scheduler to deployment/inoutsched

activemq run scrip now copies the activemq config out of the bedework build configuration

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/douglm/build.xml

    r2271 r2311  
    111111 
    112112  <target name="init" > 
    113     <!-- Overriding this when invoking ant allows different user property 
    114          files to be included e.g. 
    115             ant -Dorg.bedework.user.build.properties=/home/me/bedework.properties ... 
    116             --> 
    117     <property name="org.bedework.user.build.properties" 
    118               location="${user.home}/bedework.build.properties" /> 
    119  
    120113    <echo level="info" message="Load user properties from ${org.bedework.user.build.properties}" /> 
    121114 

  • branches/douglm/build/quickstart/build.xml

    r2310 r2311  
    9797    <property name="bedework.build.file" 
    9898              location="${basedir}/bedework/build.xml" /> 
    99     <property name="org.bedework.user.build.properties" 
    100               location="${user.home}/bedework.build.properties" /> 
    10199    <dirname property="org.bedework.configuration.location" 
    102100             file="${org.bedework.user.build.properties}" /> 
    …… 
    108106 
    109107  <target name="run.init" depends="init" > 
    110     <property name="org.bedework.user.build.properties" 
    111               location="${user.home}/bedework.build.properties" /> 
    112  
    113108    <property name="org.bedework.appserver.dir" 
    114109              location="${org.bedework.project.bedework}/../apache-tomcat-5.5.17" /> 

  • branches/douglm/build/quickstart/run-activemq.xml

    r2291 r2311  
    2020              location="${org.bedework.project.bedework}/../apache-activemq-5.2.0" /> 
    2121 
     22        <!-- Copy our deployment into activemq configuration directory --> 
     23    <if> 
     24      <available file="${org.bedework.config.home}/activemq.xml" /> 
     25      <then> 
     26        <copy todir="${org.bedework.activemq.dir}/conf" 
     27                    file="${org.bedework.config.home}/activemq.xml" /> 
     28      </then> 
     29    </if> 
     30 
    2231    <path id="run.classpath"> 
    2332      <fileset dir="${org.bedework.activemq.dir}/lib"> 
    2433         <include name="*.jar"/> 
    2534      </fileset> 
    26         <pathelement path="${org.bedework.activemq.dir}/conf"/> 
     35      <pathelement path="${org.bedework.activemq.dir}/conf"/> 
    2736    </path> 
    2837 

  • branches/douglm/build/quickstart/run-inoutscheduler.xml

    r2310 r2311  
    1818  </target> 
    1919 
     20        <!-- The name "bwiosched" should come from the config or as a parameter --> 
    2021  <target name="inoutscheduler.init" depends="run.init"> 
    2122    <property name="org.bedework.inoutscheduler.dir" 
    22               location="${org.bedework.project.bedework}/dist/temp/shellscr/scheduler" /> 
     23              location="${org.bedework.project.bedework}/dist/temp/shellscr/bwiosched" /> 
    2324 
    2425    <path id="run.classpath">