Changeset 20951

Show
Ignore:
Timestamp:
17.11.2009 13:05:49 (10 years ago)
Author:
xiao
Message:

Modified flax targets to comply with the flax HEAD revision

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/tags/3.04/build.xml

    r20290 r20951  
    16641664    <mkdir dir="${web.home}/WEB-INF/classes/flax"/> 
    16651665    <mkdir dir="${web.home}/interfaces/flax"/> 
     1666    <mkdir dir="${web.home}/interfaces/flaxmodule"/> 
    16661667    <mkdir dir="${web.home}/sites/flax"/> 
    16671668    <mkdir dir="${basedir}/flax-resources"/> 
    16681669    <mkdir dir="${basedir}/flax-lib"/> 
    1669     <svn> 
    1670       <checkout url="${flax.checkout.path}/src/java/org/flax/"   
    1671         destPath="${basedir}/src/java/org/flax"/> 
    1672       <checkout url="${flax.checkout.path}/src/java/org/greenstone/gsdl3/flax/"  
    1673         destPath="${basedir}/src/java/org/greenstone/gsdl3/flax"/> 
    1674       <checkout url="${flax.checkout.path}/web/WEB-INF/classes/flax/"  
    1675         destPath="${web.home}/WEB-INF/classes/flax"/> 
    1676       <checkout url="${flax.checkout.path}/web/interfaces/flax/"  
    1677         destPath="${web.home}/interfaces/flax"/> 
    1678       <checkout url="${flax.checkout.path}/web/sites/flax/"  
    1679         destPath="${web.home}/sites/flax"/> 
    1680       <checkout url="${flax.checkout.path}/flax-resources" 
    1681         destPath="${basedir}/flax-resources"/> 
    1682       <checkout url="${flax.checkout.path}/lib" 
    1683         destPath="${basedir}/flax-lib"/> 
    1684     </svn> 
     1670 
     1671    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/src/java/org/flax"/> 
     1672      <arg value="src/java/org/flax"/></exec> 
     1673    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/src/java/org/greenstone/gsdl3/flax"/> 
     1674      <arg value="src/java/org/greenstone/gsdl3/flax"/></exec> 
     1675    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/web/WEB-INF/classes/flax"/> 
     1676      <arg value="${web.home}/WEB-INF/classes/flax"/></exec> 
     1677    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/web/interfaces/flax"/> 
     1678      <arg value="${web.home}/interfaces/flax"/></exec> 
     1679    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/web/interfaces/flaxmodule"/> 
     1680      <arg value="${web.home}/interfaces/flax"/></exec> 
     1681    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/web/sites/flax"/> 
     1682      <arg value="${web.home}/sites/flax"/></exec> 
     1683    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/flax-resources"/> 
     1684      <arg value="flax-resources"/></exec> 
     1685    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/lib"/> 
     1686      <arg value="flax-lib"/></exec> 
     1687 
    16851688    <echo>prepare flax files...</echo> 
    16861689    <move file="${web.home}/WEB-INF/web.xml" tofile="${web.home}/WEB-INF/web.xml.greenstone3backup"/> 
    16871690    <antcall target="flax-copy-files" /> 
    1688     <antcall target="unzip-flax-resources" /> 
    16891691  </target> 
    16901692 
    16911693  <target name="update-flax" description="update flax from repository"> 
    16921694    <echo>updating flax ...</echo> 
    1693     <svn> 
    1694       <update dir="${basedir}/src/java/org/flax"/> 
    1695       <update dir="${basedir}/src/java/org/greenstone/gsdl3/flax"/> 
    1696       <update dir="${web.home}/WEB-INF/classes/flax"/> 
    1697       <update dir="${web.home}/interfaces/flax"/> 
    1698       <update dir="${web.home}/sites/flax"/> 
    1699     </svn> 
     1695    <exec executable="svn"><arg value="update"/><arg value="src/java/org/flax"/></exec> 
     1696 
     1697    <exec executable="svn"><arg value="update"/><arg value="src/java/org/flax"/></exec> 
     1698    <exec executable="svn"><arg value="update"/><arg value="src/java/org/greenstone/gsdl3/flax"/></exec> 
     1699    <exec executable="svn"><arg value="update"/><arg value="${web.home}/WEB-INF/classes/flax"/></exec> 
     1700    <exec executable="svn"><arg value="update"/><arg value="${web.home}/interfaces/flax"/></exec> 
     1701    <exec executable="svn"><arg value="update"/><arg value="${web.home}/sites/flax"/></exec> 
    17001702    <antcall target="flax-copy-files" /> 
    17011703  </target> 
     
    17181720    <!-- A configuration file containing web service binding information for the axis engine --> 
    17191721    <copy file="${web.home}/WEB-INF/classes/flax/server-config.wsdd" todir="${web.home}/WEB-INF" overwrite="true" /> 
    1720     <copy file="${basedir}/flax-resources/flax-build.xml" todir="${basedir}" overwrite="true" /> 
     1722    <!-- 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) --> 
     1723    <copy file="${basedir}/flax-resources/FlaxWebService.wsdl" tofile="${web.home}/FlaxWebService.wsdl" filtering="true" overwrite="true"> 
     1724        <filterset> 
     1725            <filter token="flaxpublicserver" value="${tomcat.server}"/> 
     1726            <filter token="flaxpublicport" value="${tomcat.port}"/> 
     1727        </filterset>     
     1728    </copy> 
    17211729    <copy file="${basedir}/flax-lib/opennlp-tools-1.3.0.jar" todir="${web.home}/WEB-INF/lib" overwrite="true" />     
     1730    <copy todir="${web.home}/interfaces/flaxmodule/transform" overwrite="true"> 
     1731        <fileset dir="${web.home}/interfaces/flaxmodule/transformmodule" excludes="**/.svn" />         
     1732    </copy> 
    17221733  </target> 
    17231734