Changeset 21360 for main


Ignore:
Timestamp:
2009-12-16T11:32:28+13:00 (14 years ago)
Author:
xiao
Message:

various modifications specific to FLAX

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/tags/3.04flax1.0/release-kits/shared/greenstone3/installer/build.xml

    r20306 r21360  
    9898        -->
    9999
    100         <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}" />
     100        <echo>Setting up server.default.servlet, tomcat.server, and tomcat.port in build.properties</echo>
     101        <rsr file="${installDir}/build.properties">
     102            <job pattern="(server.default.servlet=).*"  replacement="$1/flax" />
     103            <job pattern="(tomcat.server[=:]).*" replacement="$1${tomcat.server}" />
     104            <job pattern="(tomcat.port[=:]).*" replacement="$1${tomcat.port}" />
     105            <job pattern="(tomcat.shutdown.port[=:]).*" replacement="$1${tomcat.shutdown.port}" />
     106        </rsr>
    103107
    104108        <echo>Setting up global properties</echo>
    … …  
    106110        <rsr file="${installDir}/web/WEB-INF/classes/global.properties">
    107111            <job pattern="@gsdl3home@" replacement="${installDir.unix}/web" />
    108             <job pattern="@tomcat.server@" replacement="${tomcat.server}" />
     112            <!--This doesn't work - at this point, the pattern doesn't exist any more
     113            <job pattern="@tomcat.server@" replacement="${tomcat.server}" />-->
     114            <job pattern="^tomcat.server=.*" replacement="tomcat.server=${tomcat.server}" />
    109115            <job pattern="@tomcat.port@" replacement="${tomcat.port}" />
    110116        </rsr>
    111117
     118        <echo>Modifying FlaxWebService.wsdl</echo>
     119        <!-- Note: can't use the following here because the patterns @flaxpublicserver@:@flaxpublicport@
     120        were already replaced with localhost:8080 by the target flax-copy-files during the initial prepare process.
     121        Therefore, at this point the patterns don't exist any more.
     122                 <job pattern="@flaxpublicserver@" replacement="${tomcat.server}" />
     123            <job pattern="@flaxpublicport@" replacement="${tomcat.port}" />                       
     124        -->
     125        <rsr
     126            file="${installDir}/web/FlaxWebService.wsdl"
     127            pattern="(&lt;wsdlsoap:address location=&quot;http://).*(/greenstone3/flax/FlaxWebService&quot;/&gt;)"
     128            replacement="$1${tomcat.server}:${tomcat.port}$2"
     129            />
     130               
    112131        <echo>Setting up log4j properties</echo>
    113132        <copy file="${installDir}/resources/java/log4j.properties.in" tofile="${installDir}/web/WEB-INF/classes/log4j.properties" overwrite="true"/>
    … …  
    204223        <echo>Installing Start Menu Shortcuts</echo>
    205224
    206         <mkdir dir="${startmenu.path}\Documentation"/>
    207        
    208225        <shortcut
    209             file="${startmenu.path}\Greenstone3 Server.lnk"
     226            file="${startmenu.path}\Start FLAX Server.lnk"
    210227            execute="${installDir}\gs3-server.bat"
    211228            workingDirectory="${installDir}"
    … …  
    214231
    215232        <shortcut
    216             file="${startmenu.path}\Greenstone Librarian Interface (GLI).lnk"
    217             execute="${installDir}\gli\gli.bat"
    218             workingDirectory="${installDir}\gli"
    219             iconFile="${installDir}\resources\images\gs3.ico"
    220             iconIndex="0" />
    221            
    222         <shortcut
    223             file="${startmenu.path}\Greenstone Editor for Metadata Sets (GEMS).lnk"
    224             execute="${installDir}\gli\gems.bat"
    225             workingDirectory="${installDir}\gli"
    226             iconFile="${installDir}\resources\images\gems.ico"
    227             iconIndex="0" />
    228 
    229         <shortcut
    230             file="${startmenu.path}\Uninstall.lnk"
     233            file="${startmenu.path}\Uninstall FLAX.lnk"
    231234            execute="${installDir}\Uninstall.bat"
    232235            workingDirectory="${installDir}"
    233236            iconFile="${installDir}\resources\images\uninstall.ico"
    234237            iconIndex="0" />
    235    
    236         <shortcut
    237             file="${startmenu.path}\Documentation\README.lnk"
    238             execute="${installDir}\README.txt" />
    239        
    240         <shortcut
    241             file="${startmenu.path}\Documentation\Greenstone3 Users' Guide.lnk"
    242             execute="${installDir}\documentation\manual\manual.pdf" />
    243        
    244         <shortcut
    245             file="${startmenu.path}\Documentation\Greenstone2 Users' Guide.lnk"
    246             execute="${installDir}\documentation\manual\gs2_user_en.pdf" />
    247 
    248         <shortcut
    249             file="${startmenu.path}\Documentation\Greenstone Wiki.url"
    250             url="http://wiki.greenstone.org" />
    251 
    252         <shortcut
    253             file="${startmenu.path}\Documentation\Greenstone Website.url"
    254             url="http://www.greenstone.org" />
    255        
     238               
    256239    </target>
    257240
Note: See TracChangeset for help on using the changeset viewer.