Changeset 25901

Show
Ignore:
Timestamp:
06.07.2012 14:24:40 (7 years ago)
Author:
xiao
Message:

modified flax targets to reflect flax2 release

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r25830 r25901  
    22532253    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/lib"/>  
    22542254      <arg value="flax-lib"/></exec>  
    2255     <antcall target="flax-copy-files" /> 
    2256   </target> 
    2257    
    2258   <target name="flax-copy-files" description="copy some flax files into the appropriate greenstone3 directories"> 
    2259     <echo>copying flax files ...</echo> 
     2255    <antcall target="flax-copy-del-files" /> 
     2256  </target> 
     2257   
     2258  <target name="flax-copy-del-files" description="copy some flax files into the appropriate greenstone3 directories and delete some unwanted greenstone stuff"> 
    22602259    <copy file="${web.home}/WEB-INF/classes/flax/web.xml" todir="${web.home}/WEB-INF" overwrite="true" /> 
    2261     <!-- A configuration file containing web service binding information for the axis engine --> 
    2262     <copy file="${web.home}/WEB-INF/classes/flax/server-config.wsdd" todir="${web.home}/WEB-INF" overwrite="true" /> 
    2263     <!-- 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)  
    2264     <copy file="${basedir}/flax-resources/FlaxWebService.wsdl" tofile="${web.home}/FlaxWebService.wsdl" overwrite="true"/>--> 
    22652260    <copy todir="${web.home}/WEB-INF/lib"> 
    2266         <fileset dir="${basedir}/flax-lib"> 
    2267             <include name="*.jar"/> 
    2268         </fileset>   
     2261            <fileset dir="${basedir}/flax-lib"> 
     2262               <include name="*.jar"/> 
     2263            </fileset>   
    22692264    </copy> 
    2270   </target> 
    2271 <!--  <target name="configure-flax-wsdl" description="Configure flax webservice with tomcat server/port"> 
    2272     <copy file="${basedir}/flax-resources/FlaxWebService.wsdl" tofile="${web.home}/FlaxWebService.wsdl" overwrite="true"/> 
    2273     <rsr file="${web.home}/FlaxWebService.wsdl" pattern="@flaxpublicserver@:@flaxpublicport@" replacement="${tomcat.server}:${tomcat.port}"/> 
    2274     <echo>FLAX server for Moodle module is configured to: http://${tomcat.server}:${tomcat.port}.</echo> 
    2275   </target>--> 
     2265    <delete dir="${web.home}/sites/gateway"/> 
     2266    <delete dir="${web.home}/sites/localsite"/> 
     2267  </target> 
    22762268 
    22772269  <target name="update-flax" description="update flax from repository"> 
     
    22962288  </target> 
    22972289 
     2290  <!-- ========================End of FLAX Targets ========================= --> 
    22982291 
    22992292  <target name="compile-javadocs">