Changeset 23669 for main/trunk

Timestamp:

2011-02-08T15:13:36+13:00 (13 years ago)

Author:

xiao

Message:

modified flax-copy-files target not to do tomcat.server/port replacements in FlaxWebService.wsdl as it disrupts what is being done by release-kits; will come up a solution with svn-install later

File:

• main/trunk/greenstone3/build.xml (modified) (1 diff)

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) -->
-    <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" filtering="true" overwrite="true"><!-- Do not do the replacement here, as it disrupts the replacement when using the release-kits. Do this manually when installing flax from svn.
         <filterset>
             <filter token="flaxpublicserver" value="${tomcat.server}"/>
             <filter token="flaxpublicport" value="${tomcat.port}"/>
-        </filterset>    
+        </filterset>-->
     </copy>
     <copy todir="${web.home}/WEB-INF/lib">