Changeset 21350

Show
Ignore:
Timestamp:
15.12.2009 18:14:51 (10 years ago)
Author:
xiao
Message:

remove spawn and failonerror attributes from start-tomcat and stop-tomcat targets

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/tags/3.04flax1.0/greenstone3/build.xml

    r21347 r21350  
    802802    <property name="tomcat.path" refid="local.tomcat.path"/> 
    803803    <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx400M"/> 
    804     <exec executable="${catalina.home}/bin/startup.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false" failonerror="true"> 
     804    <exec executable="${catalina.home}/bin/startup.sh" os="${os.unix}" dir="${catalina.home}/bin"> 
    805805      <!--<env key="GSDLOS" value="linux"/> do we need this?? --> 
    806806      <env key="GSDL3HOME" value="${basedir}"/> 
     
    813813      <env key="WNHOME" path="${wn.home}"/> 
    814814    </exec> 
    815     <exec executable="${catalina.home}/bin/startup.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="true" failonerror="true"> 
     815    <exec executable="${catalina.home}/bin/startup.bat" os="${os.windows}" dir="${catalina.home}/bin" > 
    816816      <env key="GSDLOS" value="windows"/> 
    817817      <env key="GSDL3HOME" value="${basedir}"/> 
     
    834834  <!-- shouldn't this test whether anything is running first? --> 
    835835  <target name="stop-tomcat" description="Shutdown only Tomcat" depends="init" if="tomcat.islocal"> 
    836     <exec executable="${catalina.home}/bin/shutdown.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false" failonerror="true"> 
     836    <exec executable="${catalina.home}/bin/shutdown.sh" os="${os.unix}" dir="${catalina.home}/bin" > 
    837837      <env key="CATALINA_HOME" value="${catalina.home}"/> 
    838838    </exec> 
    839     <exec executable="${catalina.home}/bin/shutdown.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="false" failonerror="true"> 
     839    <exec executable="${catalina.home}/bin/shutdown.bat" os="${os.windows}" dir="${catalina.home}/bin" > 
    840840      <env key="CATALINA_HOME" value="${catalina.home}"/> 
    841841    </exec>