Changeset 25902

Show
Ignore:
Timestamp:
06.07.2012 15:06:48 (7 years ago)
Author:
xiao
Message:

modified flax targets to reflect flax2 release

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/tags/stable4flax/greenstone3/build.xml

    r25708 r25902  
    22502250    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/lib"/>  
    22512251      <arg value="flax-lib"/></exec>  
    2252     <antcall target="flax-copy-files" /> 
    2253   </target> 
    2254    
    2255   <target name="flax-copy-files" description="copy some flax files into the appropriate greenstone3 directories"> 
    2256     <echo>copying flax files ...</echo> 
     2252    <antcall target="flax-copy-del-files" /> 
     2253  </target> 
     2254   
     2255  <target name="flax-copy-del-files" description="copy some flax files into the appropriate greenstone3 directories and delete some unwanted greenstone stuff"> 
    22572256    <copy file="${web.home}/WEB-INF/classes/flax/web.xml" todir="${web.home}/WEB-INF" overwrite="true" /> 
    2258     <!-- A configuration file containing web service binding information for the axis engine --> 
    2259     <copy file="${web.home}/WEB-INF/classes/flax/server-config.wsdd" todir="${web.home}/WEB-INF" overwrite="true" /> 
    2260     <!-- 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)  
    2261     <copy file="${basedir}/flax-resources/FlaxWebService.wsdl" tofile="${web.home}/FlaxWebService.wsdl" overwrite="true"/>--> 
    22622257    <copy todir="${web.home}/WEB-INF/lib"> 
    2263         <fileset dir="${basedir}/flax-lib"> 
    2264             <include name="*.jar"/> 
    2265         </fileset>   
     2258            <fileset dir="${basedir}/flax-lib"> 
     2259               <include name="*.jar"/> 
     2260            </fileset>   
    22662261    </copy> 
    2267   </target> 
    2268 <!--  <target name="configure-flax-wsdl" description="Configure flax webservice with tomcat server/port"> 
    2269     <copy file="${basedir}/flax-resources/FlaxWebService.wsdl" tofile="${web.home}/FlaxWebService.wsdl" overwrite="true"/> 
    2270     <rsr file="${web.home}/FlaxWebService.wsdl" pattern="@flaxpublicserver@:@flaxpublicport@" replacement="${tomcat.server}:${tomcat.port}"/> 
    2271     <echo>FLAX server for Moodle module is configured to: http://${tomcat.server}:${tomcat.port}.</echo> 
    2272   </target>--> 
     2262    <delete dir="${web.home}/sites/gateway"/> 
     2263    <delete dir="${web.home}/sites/localsite"/> 
     2264  </target> 
    22732265 
    22742266  <target name="update-flax" description="update flax from repository"> 
     
    22932285  </target> 
    22942286 
     2287  <!-- ======================== End of FLAX Targets ========================= --> 
     2288 
    22952289 
    22962290  <target name="compile-javadocs">