Changeset 21847


Ignore:
Timestamp:
2010-03-30T17:43:59+13:00 (11 years ago)
Author:
oranfry
Message:

dont rely on hooks for replacement

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/kits/rk3/installer/build.xml

    r21820 r21847  
    9999
    100100        <echo>Setting tomcat ports</echo>
    101         <rsr file="${installDir}/build.properties" pattern="(tomcat.port[=:]).*" replacement="$1${tomcat.port}" />
    102         <rsr file="${installDir}/build.properties" pattern="(tomcat.shutdown.port[=:]).*" replacement="$1${tomcat.shutdown.port}" />
     101        <rsr file="${installDir}/build.properties">
     102            <job pattern="^(tomcat\.server[=:]).*" replacement="$1${tomcat.server}" />
     103            <job pattern="^(tomcat\.port[=:]).*" replacement="$1${tomcat.port}" />
     104            <job pattern="^(tomcat\.shutdown.port[=:]).*" replacement="$1${tomcat.shutdown.port}" />
     105        </rsr>
    103106
    104107        <echo>Setting up global properties</echo>
    105108        <copy file="${installDir}/resources/java/global.properties.in" tofile="${installDir}/web/WEB-INF/classes/global.properties" overwrite="true"/>
    106109        <rsr file="${installDir}/web/WEB-INF/classes/global.properties">
    107             <job pattern="@gsdl3home@" replacement="${installDir.unix}/web" />
    108             <job pattern="@tomcat.server@" replacement="${tomcat.server}" />
    109             <job pattern="@tomcat.port@" replacement="${tomcat.port}" />
     110            <job pattern="^(gsdl3\.home[:=]).*" replacement="$1${installDir.unix}/web" />
     111            <job pattern="^(tomcat.server[:=]).*" replacement="$1${tomcat.server}" />
     112            <job pattern="^(tomcat\.port[:=]).*" replacement="$1${tomcat.port}" />
    110113        </rsr>
    111114
Note: See TracChangeset for help on using the changeset viewer.