vgritsenko 2004/01/14 06:06:09
Modified: . xindice.bat Log: Fix goto labels, tweak messages. Revision Changes Path 1.12 +14 -11 xml-xindice/xindice.bat Index: xindice.bat =================================================================== RCS file: /home/cvs/xml-xindice/xindice.bat,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xindice.bat 1 Jan 2004 21:46:41 -0000 1.11 +++ xindice.bat 14 Jan 2004 14:06:09 -0000 1.12 @@ -9,8 +9,9 @@ :: ----- Verify and Set Required Environment Variables ------------------------- if not "%JAVA_HOME%" == "" goto gotJavaHome -echo You must set JAVA_HOME to point at your Java Development Kit installation -goto cleanup +echo ERROR: You must set JAVA_HOME to point at your Java +echo Development Kit installation +goto end :gotJavaHome if not "%XINDICE_HOME%" == "" goto gotXindiceHome @@ -18,12 +19,14 @@ set XINDICE_HOME=%~dp0. if not exist "%XINDICE_HOME%\dist" goto noXindiceHome echo WARNING: The environment variable XINDICE_HOME is not set. -echo defaulting to %XINDICE_HOME%. +echo defaulting to %XINDICE_HOME% goto gotXindiceHome :noXindiceHome -echo You must set XINDICE_HOME to point at your Xindice installation -goto cleanup +echo ERROR: You must set XINDICE_HOME to point at your +echo Xindice installation directory +goto end + :gotXindiceHome echo Using Xindice home: %XINDICE_HOME% @@ -43,17 +46,17 @@ set JETTY_PORT=8888 :gotPort -if not "%JETTY_ADMIN_PORT%" == "" goto gotPort +if not "%JETTY_ADMIN_PORT%" == "" goto gotAdminPort set JETTY_ADMIN_PORT=8889 -:gotPort +:gotAdminPort if not "%JETTY_WEBAPP%" == "" goto gotWebapp set JETTY_WEBAPP=%XINDICE_HOME%\dist\xindice-1.1b4-dev.war :gotWebapp -if not "%JAVA_DEBUG_PORT%" == "" goto gotWebapp +if not "%JAVA_DEBUG_PORT%" == "" goto gotDebugPort set JAVA_DEBUG_PORT=8000 -:gotWebapp +:gotDebugPort :: ----- Check action ---------------------------------------------------------- @@ -91,4 +94,4 @@ :: ----- End ------------------------------------------------------------------- :end -set LOCALCLASSPATH= [EMAIL PROTECTED]