Changeset 23682

Timestamp:

2011-02-11T11:52:51+13:00 (13 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

File:

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

main/tags/stable/greenstone3/build.xml

@@ -1924 +1924 @@
     <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) -->
-    <copy file="${basedir}/flax-resources/FlaxWebService.wsdl" tofile="${web.home}/FlaxWebService.wsdl" filtering="true" overwrite="true">
-        <filterset>
-            <filter token="flaxpublicserver" value="${tomcat.server}"/>
-            <filter token="flaxpublicport" value="${tomcat.port}"/>
-        </filterset>    
-    </copy>
+    <copy file="${basedir}/flax-resources/FlaxWebService.wsdl" tofile="${web.home}/FlaxWebService.wsdl" overwrite="true"/>
     <copy todir="${web.home}/WEB-INF/lib">
         <fileset dir="${basedir}/flax-lib">
@@ -1936 +1931 @@
     </copy>
   </target>
-
+  <target name="configure-flax-wsdl" description="configure tomcat server/port on flax webservices">
+    <rsr file="${web.home}/FlaxWebService.wsdl" pattern="@flaxpublicserver@" replacement="${tomcat.server}"/>
+    <rsr file="${web.home}/FlaxWebService.wsdl" pattern="@flaxpublicport@" replacement="${tomcat.port}"/>
+  </target>
   <target name="update-flax" description="update flax from repository">
     <echo>updating flax ...</echo>