Changeset 23682 for main/tags

Show
Ignore:
Timestamp:
11.02.2011 11:52:51 (9 years ago)
Author:
xiao
Message:

removed tomcat server/port filtering when copying over FlaxWebService?.wsdl; added a seperate target to do the task so that the action won't be carried out twice when using the release-kist

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/tags/stable/greenstone3/build.xml

    r23443 r23682  
    19241924    <copy file="${web.home}/WEB-INF/classes/flax/server-config.wsdd" todir="${web.home}/WEB-INF" overwrite="true" /> 
    19251925    <!-- A static web service wsdl file which is queried by soap client. The reason this file is used (instead of the dynamically generated version) is in case any redirects are used in the Apache configuration (e.g., flax.nzdl.org:80 redirects to harakeke:8080) --> 
    1926     <copy file="${basedir}/flax-resources/FlaxWebService.wsdl" tofile="${web.home}/FlaxWebService.wsdl" filtering="true" overwrite="true"> 
    1927         <filterset> 
    1928             <filter token="flaxpublicserver" value="${tomcat.server}"/> 
    1929             <filter token="flaxpublicport" value="${tomcat.port}"/> 
    1930         </filterset>     
    1931     </copy> 
     1926    <copy file="${basedir}/flax-resources/FlaxWebService.wsdl" tofile="${web.home}/FlaxWebService.wsdl" overwrite="true"/> 
    19321927    <copy todir="${web.home}/WEB-INF/lib"> 
    19331928        <fileset dir="${basedir}/flax-lib"> 
     
    19361931    </copy> 
    19371932  </target> 
    1938  
     1933  <target name="configure-flax-wsdl" description="configure tomcat server/port on flax webservices"> 
     1934    <rsr file="${web.home}/FlaxWebService.wsdl" pattern="@flaxpublicserver@" replacement="${tomcat.server}"/> 
     1935    <rsr file="${web.home}/FlaxWebService.wsdl" pattern="@flaxpublicport@" replacement="${tomcat.port}"/> 
     1936  </target> 
    19391937  <target name="update-flax" description="update flax from repository"> 
    19401938    <echo>updating flax ...</echo>