Ignore:
Timestamp:
2008-03-20T10:48:10+13:00 (16 years ago)
Author:
oranfry
Message:

checking in a few weeks work on wirk3

Location:
release-kits/wirk3
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed

  • release-kits/wirk3

    • Property svn:externals

      •  

        old new  
        11lib http://svn.greenstone.org/release-kits/shared/lib
         2search4j http://svn.greenstone.org/release-kits/shared/search4j
        23
         4

  • release-kits/wirk3/installer/antinstall-config.xml

    r15053 r15095  
    4343    <page type="input" name="tomcatports" displayText="Tomcat Ports">
    4444
    45         <comment displayText="Please select the ports which the web server (Apache Tomcat) will use  will use. It is usually safe to accept the defaults by just clicking Next. The exception is when you are running other services on these ports - if this is the case, select some free ports and click Next."/>
     45        <comment name="tomcatportsdescription" displayText="Please select the ports which the web server (Apache Tomcat) will use  will use. It is usually safe to accept the defaults by just clicking Next. The exception is when you are running other services on these ports - if this is the case, select some free ports and click Next."/>
    4646
    4747        <text property="tomcat.server" defaultValue="localhost" displayText="Tomcat Server"/>
    … …  
    5656            displayText="Components to install">
    5757        <comment
     58                name="choosecomponents"
    5859                displayText="Choose the components you want to install"
    5960                bold="true"/>

  • release-kits/wirk3/installer/build.xml

    r15053 r15095  
    1616    <typedef name="rsr" classname="RegexSearchReplace" classpathref="project.classpath"/>
    1717
     18    <!-- create a local installDir String -->
     19    <path id="installDir.path">
     20        <pathelement location="${installDir}"/>
     21    </path>
     22    <property name="installDir.local" refid="installDir.path"/>
     23   
     24   
    1825    <target name="default" depends="">
    1926
    … …  
    8491        <!-- change the tomcat ports in tomcats server.xml -->
    8592        <echo message="Changing tomcat ports tomcat's server.xml"/>
    86         <copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir}/packages/tomcat/conf/server.xml" overwrite="true"/>
    87         <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="(.*)@port@(.*)" replacement="$1${tomcat.port}$2" />
    88         <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="(.*)@shutdown-port@(.*)" replacement="$1${tomcat.shutdown.port}$2" />
     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="@port@" replacement="${tomcat.port}" />
     95        <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@shutdown-port@" replacement="${tomcat.shutdown.port}" />
    8996       
    9097        <!-- copy the greenstone3.xml file to tomcat -->
    9198        <echo message="Copying greenstone3.xml to tomcat directory"/>
    9299        <copy file="${installDir}/resources/tomcat/greenstone3.xml" tofile="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" overwrite="true"/>
    93         <rsr file="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" pattern="(.*)@gsdl3webhome@(.*)" replacement="$1${installDir}/web$2" />
     100        <rsr file="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" pattern="@gsdl3webhome@" replacement="${installDir.local}\web" />
    94101
    95102        <!-- set up global properties -->
    96103        <echo message="Setting up global properties"/>
    97104        <copy file="${installDir}/resources/java/global.properties.in" tofile="${installDir}/web/WEB-INF/classes/global.properties" overwrite="true"/>
    98         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
    99         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.server@(.*)" replacement="$1localhost$2" />
    100         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.port@(.*)" replacement="$1${tomcat.port}$2" />
     105        <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="@gsdl3home@" replacement="${installDir.local}\web" />
     106        <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="@tomcat.server@" replacement="${tomcat.server}" />
     107        <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="@tomcat.port@" replacement="${tomcat.port}" />
    101108
    102109        <!-- set up log4j properties-->
    103110        <echo message="Setting up log4j properties"/>
    104111        <copy file="${installDir}/resources/java/log4j.properties.in" tofile="${installDir}/web/WEB-INF/classes/log4j.properties" overwrite="true"/>
    105         <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
     112        <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="@gsdl3home@" replacement="${installDir.local}\web" />
    106113
    107114        <!-- get the found JRE_HOME -->
    108         <exec executable="cmd" dir="${installDir}" outputproperty="backup.jre.home"><arg line="/C launch-installer.exe -find"/></exec>
     115        <exec executable="search4j.exe" outputproperty="backup.jre.home"><arg line="-m @java.min.version@"/></exec>
    109116               
    110117        <!-- in the gs3-setup.sh file, set ANT_HOME and put it in PATH, and set the fallback JRE_HOME -->
    111118        <echo>In the gs3-setup.sh file, set ANT_HOME and put it in PATH</echo>
    112         <exec executable="cmd" output="${installDir}/machine.bat" append="true"><arg line="/C echo set ANT_HOME=${installDir}/packages/ant"/></exec>
    113         <exec executable="cmd" output="${installDir}/machine.bat" append="true"><arg line="/C echo set PATH=\%ANT_HOME\%/bin:\%PATH\%"/></exec>
    114         <exec executable="cmd" output="${installDir}/machine.bat" append="true"><arg line="/C echo set BACKUP_JRE_HOME=${backup.jre.home}"/></exec>
     119        <concat destfile="${installDir}/machine.bat" append="yes">
     120set ANT_HOME=${installDir}\packages\ant
     121set PATH=%ANT_HOME%\bin;%PATH%
     122set BACKUP_JAVA_HOME=${backup.jre.home}
     123</concat>
     124       
    115125
    116126        <!-- delete unneeded files -->     
Note: See TracChangeset for help on using the changeset viewer.