[java-identity-provider COMMIT] in /trunk/idp-distribution/src/main/resources/bin: ant.bat runclass.bat

[noreply at shibboleth.net]

Author: rdw
Date: Tue Dec 16 11:00:38 2014
New Revision: 7115

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7115&view=rev
Log:
 More "spaces in directories" fixes.  Turns out that bat files don't understand them too good these days.

Modified:
    trunk/idp-distribution/src/main/resources/bin/ant.bat
    trunk/idp-distribution/src/main/resources/bin/runclass.bat

Modified: trunk/idp-distribution/src/main/resources/bin/ant.bat
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/ant.bat?rev=7115&r1=7114&r2=7115&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/ant.bat (original)
+++ trunk/idp-distribution/src/main/resources/bin/ant.bat Tue Dec 16 11:00:38 2014
@@ -28,20 +28,7 @@
   exit /b
 )
 
-if defined CLASSPATH (
-  set LOCALCLASSPATH=%CLASSPATH%
-)
-
 REM add in the dependency .jar files
-set LOCALCLASSPATH=%ANT_HOME%\..\bin\lib\*;%LOCALCLASSPATH%
-set LOCALCLASSPATH=%ANT_HOME%\..\webapp\WEB-INF\lib\*;%LOCALCLASSPATH%
-
-if exist %JAVA_HOME%\lib\tools.jar (
-    set LOCALCLASSPATH=%LOCALCLASSPATH%;%JAVA_HOME%\lib\tools.jar
-)
-
-if exist %JAVA_HOME%\lib\classes.zip (
-    set LOCALCLASSPATH=%LOCALCLASSPATH%;%JAVA_HOME%\lib\classes.zip
-)
+set LOCALCLASSPATH=%ANT_HOME%\..\bin\lib\*;%ANT_HOME%\..\webapp\WEB-INF\lib\*;%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%CLASSPATH%
 
 %JAVACMD% -cp "%LOCALCLASSPATH%" -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main -e -q -f "%ANT_HOME%/build.xml" %*

Modified: trunk/idp-distribution/src/main/resources/bin/runclass.bat
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/runclass.bat?rev=7115&r1=7114&r2=7115&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/runclass.bat (original)
+++ trunk/idp-distribution/src/main/resources/bin/runclass.bat Tue Dec 16 11:00:38 2014
@@ -17,20 +17,8 @@
   exit /b
 )
 
-if defined CLASSPATH (
-  set LOCALCLASSPATH=%CLASSPATH%
-)
-
-set LOCALCLASSPATH=%LOCALCLASSPATH%;%~dp0lib\*
-set LOCALCLASSPATH=%LOCALCLASSPATH%;%~dp0..\webapp\WEB-INF\lib\*
-
-if exist %JAVA_HOME%\lib\tools.jar (
-    set LOCALCLASSPATH=%LOCALCLASSPATH%;%JAVA_HOME%\lib\tools.jar
-)
-
-if exist %JAVA_HOME%\lib\classes.zip (
-    set LOCALCLASSPATH=%LOCALCLASSPATH%;%JAVA_HOME%\lib\classes.zip
-)
+REM add in the dependency .jar files
+set LOCALCLASSPATH=%~dp0lib\*;%~dp0..\webapp\WEB-INF\lib\*;%JAVA_HOME%\lib\classes.zip;%CLASSPATH%
 
 REM Go to it !