Changeset 24181 for main/tags

Show
Ignore:
Timestamp:
21.06.2011 14:56:11 (9 years ago)
Author:
xiao
Message:

removed target configure-flax-aux-server; put it in global.properties.in instead

Files:
1 modified

Legend:

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

    r24179 r24181  
    20782078    </copy> 
    20792079  </target> 
    2080   <target name="configure-flax-web" description="Configure wsdl and aux server"> 
    2081     <antcall target="configure-flax-wsdl"/> 
    2082     <antcall target="configure-flax-aux-server"/> 
    2083   </target> 
    20842080  <target name="configure-flax-wsdl" description="Configure flax webservice with tomcat server/port"> 
    20852081    <copy file="${basedir}/flax-resources/FlaxWebService.wsdl" tofile="${web.home}/FlaxWebService.wsdl" overwrite="true"/> 
     
    20872083    <echo>FLAX server for Moodle module is configured to: http://${tomcat.server}:${tomcat.port}.</echo> 
    20882084  </target> 
    2089   <target name="configure-flax-aux-server" description="Copy flax auxiliary collocation server url from build.properties to global.properties"> 
     2085<!--<target name="configure-flax-aux-server" description="Copy flax auxiliary collocation server url from build.properties to global.properties"> 
    20902086    <concat destfile="${web.classes}/global.properties" append="true" fixlastline="yes">flax.aux.server=${flax.aux.server}</concat> 
    20912087    <echo>FLAX auxiliary server set to (in web/WEB-INF/classes/globla.properties): http://${flax.aux.server}.</echo> 
    2092   </target> 
     2088  </target>--> 
    20932089 
    20942090  <target name="update-flax" description="update flax from repository"> 
     
    21102106    <!--<antcall target="flax-copy-files" />--> 
    21112107    <antcall target="compile-core" /> 
    2112     <antcall target="configure-flax-web" /> 
     2108    <antcall target="configure-flax-wsdl" /> 
    21132109  </target> 
    21142110