Changeset 23696
- Timestamp:
- 2011-02-14T09:38:32+13:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/build.xml
r23681 r23696 1955 1955 <copy file="${web.home}/WEB-INF/classes/flax/server-config.wsdd" todir="${web.home}/WEB-INF" overwrite="true" /> 1956 1956 <!-- 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"/> 1962 1958 <copy todir="${web.home}/WEB-INF/lib"> 1963 >>>>>>> .r236801964 1959 <fileset dir="${basedir}/flax-lib"> 1965 1960 <include name="*.jar"/> … … 1968 1963 </target> 1969 1964 <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}"/> 1972 1966 </target> 1973 1967
Note:
See TracChangeset
for help on using the changeset viewer.