[Yanel-commits] rev 22485 - public/yanel/trunk/src/binary-dist

[michi at wyona.com]

Author: michi
Date: 2007-02-07 00:06:23 +0100 (Wed, 07 Feb 2007)
New Revision: 22485

Modified:
   public/yanel/trunk/src/binary-dist/start.bat
Log:
CATALINA_HOME fixed

Modified: public/yanel/trunk/src/binary-dist/start.bat
===================================================================
--- public/yanel/trunk/src/binary-dist/start.bat	2007-02-06 21:27:48 UTC (rev 22484)
+++ public/yanel/trunk/src/binary-dist/start.bat	2007-02-06 23:06:23 UTC (rev 22485)
@@ -2,10 +2,20 @@
 
 echo "Start Yanel ..."
 
+rem ----- Ignore system CATALINA_HOME variable
+set ORIGINAL_CATALINA_HOME=%CATALINA_HOME%
+set CATALINA_HOME=apache-tomcat-5.5.20
+
 :: Check if JAVA_HOME is set or goto end
 if not "%JAVA_HOME%" == "" goto gotJavaHome
 echo You must set JAVA_HOME to point at your Java Development Kit installation
 goto end
+
 :gotJavaHome
 
-apache-tomcat-5.5.20\bin\startup.bat
+%CATALINA_HOME%\bin\startup.bat
+
+rem ----- Restore CATALINA_HOME
+set CATALINA_HOME=%ORIGINAL_CATALINA_HOME%
+set ORIGINAL_CATALINA_HOME=
+