Changeset 23696

Show
Ignore:
Timestamp:
14.02.2011 09:38:32 (9 years ago)
Author:
xiao
Message:

clean up typos and combine two rsr tasks into one

Files:
1 modified

Legend:

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

    r23681 r23696  
    19551955    <copy file="${web.home}/WEB-INF/classes/flax/server-config.wsdd" todir="${web.home}/WEB-INF" overwrite="true" /> 
    19561956    <!-- 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) --> 
    1957 <<<<<<< .mine 
    1958     <copy file="${basedir}/flax-resources/FlaxWebService.wsdl" tofile="${web.home}/FlaxWebService.wsdl" filtering="true" overwrite="true"/> 
    1959     <copy> 
    1960 ======= 
    1961     <copy file="${basedir}/flax-resources/FlaxWebService.wsdl" tofile="${web.home}/FlaxWebService.wsdl" filtering="true" overwrite="true"/> 
     1957    <copy file="${basedir}/flax-resources/FlaxWebService.wsdl" tofile="${web.home}/FlaxWebService.wsdl" overwrite="true"/> 
    19621958    <copy todir="${web.home}/WEB-INF/lib"> 
    1963 >>>>>>> .r23680 
    19641959        <fileset dir="${basedir}/flax-lib"> 
    19651960            <include name="*.jar"/> 
     
    19681963  </target> 
    19691964  <target name="configure-flax-wsdl" description="Configure flax webservice with tomcat server/port"> 
    1970     <rsr file="${web.home}/FlaxWebService.wsdl" pattern="@flaxpublicserver@" replacement="${tomcat.server}"/> 
    1971     <rsr file="${web.home}/FlaxWebService.wsdl" pattern="@flaxpublicport@" replacement="${tomcat.port}"/> 
     1965    <rsr file="${web.home}/FlaxWebService.wsdl" pattern="@flaxpublicserver@:@flaxpublicport@" replacement="${tomcat.server}:${tomcat.port}"/> 
    19721966  </target> 
    19731967