Show
Ignore:
Timestamp:
07.05.2008 15:58:52 (12 years ago)
Author:
oranfry
Message:

a few fixes to wirk3

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • release-kits/wirk3/installer/build.xml

    r15146 r15356  
    2323     
    2424     
    25     <target name="default" depends=""> 
     25    <target name="install-core-components"> 
    2626 
    2727        <!-- create the installation directory --> 
     
    5757        <echo/> 
    5858 
     59        <!-- 
    5960        <echo message="Installing Packages (packages)"/> 
    6061        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="packages/**/*"/></patternset></unzip> 
    6162        <echo/> 
     63        --> 
    6264 
    6365        <echo message="Installing Resources (resources)"/> 
     
    8890        <rsr file="${installDir}/build.properties" pattern="(tomcat.port[=:]).*" replacement="$1${tomcat.port}" /> 
    8991        <rsr file="${installDir}/build.properties" pattern="(tomcat.shutdown.port[=:]).*" replacement="$1${tomcat.shutdown.port}" /> 
     92        <echo message="Changing tomcat ports in resources/tomcat/server.xml"/> 
     93        <copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir.local}/packages/tomcat/conf/server.xml" overwrite="true"/> 
    9094 
    91         <!-- change the tomcat ports in tomcats server.xml --> 
    92         <echo message="Changing tomcat ports tomcat's server.xml"/> 
    93         <copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir.local}/packages/tomcat/conf/server.xml" overwrite="true"/> 
    94         <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@server@" replacement="${tomcat.server}" /> 
    95         <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@port@" replacement="${tomcat.port}" /> 
    96         <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@shutdown-port@" replacement="${tomcat.shutdown.port}" /> 
    97          
    9895        <!-- copy the greenstone3.xml file to tomcat --> 
    9996        <echo message="Copying greenstone3.xml to tomcat directory"/> 
     
    132129 
    133130    <!-- Source --> 
    134     <target name="tgsrc" depends=""> 
     131    <target name="install-source-code"> 
    135132        <echo message="Installing Source Code (src)"/> 
    136133        <mkdir dir="${installDir}/src"/> 
     
    142139    </target> 
    143140 
     141    <target name="install-tomcat"> 
     142         
     143        <echo message="Installing Apache Tomcat"/> 
     144        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="packages/tomcat/**/*"/></patternset></unzip> 
     145 
     146        <!-- change the tomcat ports in tomcats server.xml --> 
     147        <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@server@" replacement="${tomcat.server}" /> 
     148        <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@port@" replacement="${tomcat.port}" /> 
     149        <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@shutdown-port@" replacement="${tomcat.shutdown.port}" /> 
     150 
     151    </target> 
     152    <target name="install-ant"> 
     153        <echo message="Installing Apache Ant"/> 
     154        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="packages/ant/**/*"/></patternset></unzip> 
     155    </target> 
     156     
    144157    <target name="cleanuptarget"> 
    145158    </target>