Changeset 16628

Timestamp:

2008-08-01T12:54:36+12:00 (16 years 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.

File:

• greenstone3/trunk/build.xml (modified) (2 diffs)

greenstone3/trunk/build.xml

@@ -737 +737 @@
       <env key="PATH" path="${tomcat.path}"/>
       <env key="CATALINA_OPTS" value="${catalina.opts}"/>
+      <env key="CATALINA_HOME" value="${catalina.home}"/>
       <env key="CLASSPATH" path="${tomcat.classpath}"/>
     </exec>
@@ -754 +755 @@
       <env key="CATALINA_HOME" value="${catalina.home}"/>
     </exec>
-    <exec executable="${catalina.home}/bin/shutdown.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="false"/>
+    <exec executable="${catalina.home}/bin/shutdown.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="false">
+      <env key="CATALINA_HOME" value="${catalina.home}"/>
+    </exec>
   </target>