Changeset 28043

Show
Ignore:
Timestamp:
14.08.2013 18:40:33 (6 years ago)
Author:
ak19
Message:

Shaoqun has confirmed with the Windows Server 2008 RT user that using the osfamily = windows test works for them when starting and stopping tomcat, so we can now avoid having to use the os = os.windows test, which required the list of OS names in os.windows to be updated whenever a new Windows version appeared. Will commit this fix separately for stopping and starting tomcat and in the next commit replace all exec tasks using an os=os.windows check to test using osfamily=windows instead.

Files:
1 modified

Legend:

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

    r28042 r28043  
    13901390    <echo file="${catalina.home}/bin/setenv.bat">set CLASSPATH=${tomcat.classpath}</echo> 
    13911391    <echo file="${catalina.home}/bin/setenv.sh">export CLASSPATH=${tomcat.classpath}</echo> 
    1392      
     1392 
     1393    <!-- using osfamily instead of testing os against os.windows list of recognised windows versions 
     1394     so that future windows versions are included. See http://simonharrer.wordpress.com/tag/osfamily/ --> 
     1395 
    13931396    <exec executable="${catalina.home}/bin/startup.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false"> 
    13941397      <!--<env key="GSDLOS" value="linux"/> do we need this?? --> 
     
    14031406      <env key="FEDORA_HOME" path="${fedora.home}"/> 
    14041407    </exec> 
    1405     <exec executable="${catalina.home}/bin/startup.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="true"> 
     1408    <exec executable="${catalina.home}/bin/startup.bat" osfamily="windows" dir="${catalina.home}/bin" spawn="true"> 
    14061409      <env key="GSDLOS" value="windows"/> 
    14071410      <env key="GSDL3HOME" value="${basedir}"/> 
     
    14491452      <arg line=">/dev/null 2>&amp;1"/> 
    14501453    </exec> 
    1451     <exec executable="${catalina.home}/bin/shutdown.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="false"> 
     1454    <exec executable="${catalina.home}/bin/shutdown.bat" osfamily="windows" dir="${catalina.home}/bin" spawn="false"> 
    14521455      <env key="FEDORA_HOME" path="${fedora.home}"/> 
    14531456      <env key="CATALINA_HOME" value="${catalina.home}"/>