greenstone.org greenstone wiki greenstone trac planet greenstone

Changeset 16628

Show
Ignore:
Timestamp:
2008-08-01 12:54:36 (4 months ago)
Author:
ak19
Message:

When executing ant start or ant stop on Windows, the exec command now passes catalina.home env variable just like it already did for Linux. Otherwise the tomcat startup.bat script was guessing the location for catalina when on Windows (since it wasn't set previously) and guessing the location incorrectly as tomcat/bin instead of tomcat.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • greenstone3/trunk/build.xml

    r16626 r16628  
    737737      <env key="PATH" path="${tomcat.path}"/> 
    738738      <env key="CATALINA_OPTS" value="${catalina.opts}"/> 
     739      <env key="CATALINA_HOME" value="${catalina.home}"/> 
    739740      <env key="CLASSPATH" path="${tomcat.classpath}"/> 
    740741    </exec> 
    …… 
    754755      <env key="CATALINA_HOME" value="${catalina.home}"/> 
    755756    </exec> 
    756     <exec executable="${catalina.home}/bin/shutdown.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="false"/> 
     757    <exec executable="${catalina.home}/bin/shutdown.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="false"> 
     758      <env key="CATALINA_HOME" value="${catalina.home}"/> 
     759    </exec> 
    757760  </target> 
    758761