Show
Ignore:
Timestamp:
17.11.2009 12:41:23 (10 years ago)
Author:
xiao
Message:

Undo the last commit about moving/importing flax targets. Deal with it later

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r20942 r20950  
    17001700  </target> 
    17011701 
    1702   <!-- ======================== Targets for FLAX ========================= --> 
    1703   <import file="flax-resources/build.xml"/> 
    1704   <target name="prepare-flax" description="Install flax extension" depends="build-flax.main" if="install.flax"/> 
    1705   <target name="update-flax" description="Update flax extension" depends="build-flax.update-flax" if="install.flax"/> 
     1702  <!-- ======================== FLAX Targets ========================= --> 
     1703  <target name="prepare-flax" description="check out flax source code from another repository" if="install.flax"> 
     1704    <echo>checking out flax ...</echo> 
     1705    <mkdir dir="${basedir}/src/java/org/flax"/> 
     1706    <mkdir dir="${basedir}/src/java/org/greenstone/gsdl3/flax"/> 
     1707    <mkdir dir="${web.home}/WEB-INF/classes/flax"/> 
     1708    <mkdir dir="${web.home}/interfaces/flax"/> 
     1709    <mkdir dir="${web.home}/interfaces/flaxmodule"/> 
     1710    <mkdir dir="${web.home}/sites/flax"/> 
     1711    <mkdir dir="${basedir}/flax-resources"/> 
     1712    <mkdir dir="${basedir}/flax-lib"/> 
     1713 
     1714    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/src/java/org/flax"/> 
     1715      <arg value="src/java/org/flax"/></exec> 
     1716    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/src/java/org/greenstone/gsdl3/flax"/> 
     1717      <arg value="src/java/org/greenstone/gsdl3/flax"/></exec> 
     1718    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/web/WEB-INF/classes/flax"/> 
     1719      <arg value="${web.home}/WEB-INF/classes/flax"/></exec> 
     1720    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/web/interfaces/flax"/> 
     1721      <arg value="${web.home}/interfaces/flax"/></exec> 
     1722    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/web/interfaces/flaxmodule"/> 
     1723      <arg value="${web.home}/interfaces/flax"/></exec> 
     1724    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/web/sites/flax"/> 
     1725      <arg value="${web.home}/sites/flax"/></exec> 
     1726    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/flax-resources"/> 
     1727      <arg value="flax-resources"/></exec> 
     1728    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/lib"/> 
     1729      <arg value="flax-lib"/></exec> 
     1730 
     1731    <echo>prepare flax files...</echo> 
     1732    <move file="${web.home}/WEB-INF/web.xml" tofile="${web.home}/WEB-INF/web.xml.greenstone3backup"/> 
     1733    <antcall target="flax-copy-files" /> 
     1734    <antcall target="unzip-flax-resources" /> 
     1735  </target> 
     1736 
     1737  <target name="update-flax" description="update flax from repository"> 
     1738    <echo>updating flax ...</echo> 
     1739    <exec executable="svn"><arg value="update"/><arg value="src/java/org/flax"/></exec> 
     1740 
     1741    <exec executable="svn"><arg value="update"/><arg value="src/java/org/flax"/></exec> 
     1742    <exec executable="svn"><arg value="update"/><arg value="src/java/org/greenstone/gsdl3/flax"/></exec> 
     1743    <exec executable="svn"><arg value="update"/><arg value="${web.home}/WEB-INF/classes/flax"/></exec> 
     1744    <exec executable="svn"><arg value="update"/><arg value="${web.home}/interfaces/flax"/></exec> 
     1745    <exec executable="svn"><arg value="update"/><arg value="${web.home}/sites/flax"/></exec> 
     1746    <antcall target="flax-copy-files" /> 
     1747  </target> 
     1748 
     1749  <target name="unzip-flax-resources" > 
     1750    <property name="classes.dir" value="${web.home}/WEB-INF/classes/flax"/> 
     1751    <unzip dest="${classes.dir}">   
     1752      <fileset dir="${classes.dir}"> 
     1753        <include name="*.zip"/> 
     1754      </fileset>     
     1755    </unzip>     
     1756    <delete> 
     1757      <fileset dir="${classes.dir}" includes="*.zip"/> 
     1758    </delete> 
     1759  </target> 
     1760   
     1761  <target name="flax-copy-files" description="copy some flax files into the appropriate greenstone3 directories"> 
     1762    <echo>copying flax files ...</echo> 
     1763    <copy file="${web.home}/WEB-INF/classes/flax/web.xml" todir="${web.home}/WEB-INF" overwrite="true" /> 
     1764    <!-- A configuration file containing web service binding information for the axis engine --> 
     1765    <copy file="${web.home}/WEB-INF/classes/flax/server-config.wsdd" todir="${web.home}/WEB-INF" overwrite="true" /> 
     1766    <!-- 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) --> 
     1767    <copy file="${basedir}/flax-resources/FlaxWebService.wsdl" tofile="${web.home}/FlaxWebService.wsdl" filtering="true" overwrite="true"> 
     1768        <filterset> 
     1769            <filter token="flaxpublicserver" value="${tomcat.server}"/> 
     1770            <filter token="flaxpublicport" value="${tomcat.port}"/> 
     1771        </filterset>     
     1772    </copy> 
     1773    <copy file="${basedir}/flax-resources/flax-build.xml" todir="${basedir}" overwrite="true" /> 
     1774    <copy file="${basedir}/flax-lib/opennlp-tools-1.3.0.jar" todir="${web.home}/WEB-INF/lib" overwrite="true" />     
     1775    <copy todir="${web.home}/interfaces/flaxmodule/transform" overwrite="true"> 
     1776        <fileset dir="${web.home}/interfaces/flaxmodule/transformmodule" excludes="**/.svn" />         
     1777    </copy> 
     1778  </target> 
    17061779 
    17071780  <target name="compile-javadocs">