Changeset 23936

Show
Ignore:
Timestamp:
20.04.2011 15:35:42 (9 years ago)
Author:
xiao
Message:

modified to display the correct url if install.flax is set; cosmetic change on configure-flax-wsdl

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r23896 r23936  
    631631      <echo>Perl  : ${full.perl.path}</echo> 
    632632    </if> 
    633     <echo>URL   : http://${tomcat.server}:${tomcat.port}${app.path}/</echo> 
     633    <if><bool><isset property="install.flax"/></bool> 
     634        <property name="url" value="http://${tomcat.server}:${tomcat.port}${app.path}/flax"/> 
     635    <else> 
     636        <property name="url" value="http://${tomcat.server}:${tomcat.port}${app.path}/"/> 
     637    </else> 
     638    </if> 
     639    <echo>URL   : ${url}</echo> 
    634640    <!-- assuming that index.html is not needed here -->    
    635641  </target> 
     
    20812087  <target name="configure-flax-wsdl" description="Configure flax webservice with tomcat server/port"> 
    20822088    <rsr file="${web.home}/FlaxWebService.wsdl" pattern="@flaxpublicserver@:@flaxpublicport@" replacement="${tomcat.server}:${tomcat.port}"/> 
     2089    <echo>FLAX server for Moodle module is configured to: http://${tomcat.server}:${tomcat.port}.</echo> 
    20832090  </target> 
    20842091