Changeset 23696 for main/trunk

Timestamp:

2011-02-14T09:38:32+13:00 (13 years ago)

Author:

xiao

Message:

clean up typos and combine two rsr tasks into one

File:

• main/trunk/greenstone3/build.xml (modified) (2 diffs)

main/trunk/greenstone3/build.xml

@@ -1955 +1955 @@
     <copy file="${web.home}/WEB-INF/classes/flax/server-config.wsdd" todir="${web.home}/WEB-INF" overwrite="true" />
     <!-- 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) -->
-<<<<<<< .mine
-    <copy file="${basedir}/flax-resources/FlaxWebService.wsdl" tofile="${web.home}/FlaxWebService.wsdl" filtering="true" overwrite="true"/>
-    <copy>
-=======
-    <copy file="${basedir}/flax-resources/FlaxWebService.wsdl" tofile="${web.home}/FlaxWebService.wsdl" filtering="true" overwrite="true"/>
+    <copy file="${basedir}/flax-resources/FlaxWebService.wsdl" tofile="${web.home}/FlaxWebService.wsdl" overwrite="true"/>
     <copy todir="${web.home}/WEB-INF/lib">
->>>>>>> .r23680
         <fileset dir="${basedir}/flax-lib">
             <include name="*.jar"/>
@@ -1968 +1963 @@
   </target>
   <target name="configure-flax-wsdl" description="Configure flax webservice with tomcat server/port">
-    <rsr file="${web.home}/FlaxWebService.wsdl" pattern="@flaxpublicserver@" replacement="${tomcat.server}"/>
-    <rsr file="${web.home}/FlaxWebService.wsdl" pattern="@flaxpublicport@" replacement="${tomcat.port}"/>
+    <rsr file="${web.home}/FlaxWebService.wsdl" pattern="@flaxpublicserver@:@flaxpublicport@" replacement="${tomcat.server}:${tomcat.port}"/>
   </target>