Changeset 2368

Show
Ignore:
Timestamp:
08/21/09 11:39:42
Author:
douglm
Message:

Use a separate properties file for activemq jndi configuration. Avoid issues with systems with their own jndi config.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/buildsh.xml

    r2342 r2368  
    134134    </copy> 
    135135 
    136     <copy tofile="${app.dest.classes}/jndi.properties" 
    137           file="${org.bedework.config.jndi.properties}" /> 
     136    <copy tofile="${app.dest.classes}/sysevents.properties" 
     137          file="${org.bedework.config.sysevents.properties}" /> 
    138138 
    139139    <copy todir="${app.dest.classes}" overwrite="yes" > 

  • trunk/build/buildwar.xml

    r2342 r2368  
    179179    </copy> 
    180180 
    181        <!-- Temp do it again --> 
     181    <!-- Temp do it again --> 
    182182    <mkdir dir="${app.dest.properties.old}" /> 
    183183 
    …… 
    199199      <filterset refid="property.filters" /> 
    200200    </copy> 
     201 
     202    <copy tofile="${app.dest.classes}/sysevents.properties" 
     203          file="${org.bedework.config.sysevents.properties}" /> 
    201204 
    202205    <!-- =============================================================== 
    …… 
    250253    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-log4j12}" /> 
    251254 
    252        <!-- jms support --> 
     255    <!-- jms support --> 
    253256    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.activemq-core}" /> 
    254257    <copy todir="${app.dest.lib}" 
    255            file="${org.bedework.appjar.geronimo-j2ee-management_1.0_spec}" /> 
     258          file="${org.bedework.appjar.geronimo-j2ee-management_1.0_spec}" /> 
    256259    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jms}" /> 
    257260 

  • trunk/config/bwbuild/default/build.properties

    r2342 r2368  
    2222org.bedework.config.options=${env.BEDEWORK_CONFIG}/cal.options.xml 
    2323 
    24 org.bedework.config.jndi.properties=${env.BEDEWORK_CONFIG}/jndi.properties 
     24org.bedework.config.sysevents.properties=${env.BEDEWORK_CONFIG}/sysevents.properties 
    2525 
    2626org.bedework.carddav.options=${env.BEDEWORK_CONFIG}/carddav.options.xml