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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Nov  3 09:28:51 2014
New Revision: 6827

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6827&view=rev
Log:
IDP-505 Add appropriate quoting

Modified:
    trunk/idp-distribution/src/main/resources/bin/aacli.bat
    trunk/idp-distribution/src/main/resources/bin/ant.bat
    trunk/idp-distribution/src/main/resources/bin/keygen.bat
    trunk/idp-distribution/src/main/resources/bin/reload-metadata.bat
    trunk/idp-distribution/src/main/resources/bin/reload-service.bat
    trunk/idp-distribution/src/main/resources/bin/seckeygen.bat
    trunk/idp-distribution/src/main/resources/bin/status.bat
    trunk/idp-distribution/src/main/resources/bin/version.bat

Modified: trunk/idp-distribution/src/main/resources/bin/aacli.bat
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/aacli.bat?rev=6827&r1=6826&r2=6827&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/aacli.bat (original)
+++ trunk/idp-distribution/src/main/resources/bin/aacli.bat Mon Nov  3 09:28:51 2014
@@ -1,4 +1,4 @@
 @echo off
 setlocal
 
-%~dp0\runclass.bat -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.cli.ResolverTestArguments net.shibboleth.idp.cli.CLI %*
+"%~dp0\runclass.bat" -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.cli.ResolverTestArguments net.shibboleth.idp.cli.CLI %*

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=6827&r1=6826&r2=6827&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/ant.bat (original)
+++ trunk/idp-distribution/src/main/resources/bin/ant.bat Mon Nov  3 09:28:51 2014
@@ -4,10 +4,13 @@
 REM Find the necessary resources
 set ANT_HOME=%~dp0
 
-REM strip trailing backslash - it confuses java
-if "%ANT_HOME:~-1%" == "\" (
-  set ANT_HOME=%ANT_HOME:~0,-1%
+REM strip trailing backslash - it confuses java.
+REM do it like this because embedding the strip inside an if causes problems if the name has a ")" in it. 
+if "%ANT_HOME:~-1%" NEQ "\" (
+   goto nostrip
 )
+set ANT_HOME=%ANT_HOME:~0,-1%
+:nostrip
 
 REM We need a JVM
 if not defined JAVA_HOME  (
@@ -41,4 +44,4 @@
     set LOCALCLASSPATH=%LOCALCLASSPATH%;%JAVA_HOME%\lib\classes.zip
 )
 
-%JAVACMD% -cp "%LOCALCLASSPATH%" -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main -e -q -f %ANT_HOME%/build.xml %*
+%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/keygen.bat
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/keygen.bat?rev=6827&r1=6826&r2=6827&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/keygen.bat (original)
+++ trunk/idp-distribution/src/main/resources/bin/keygen.bat Mon Nov  3 09:28:51 2014
@@ -1,4 +1,4 @@
 @echo off
 setlocal
 
-%~dp0\runclass.bat net.shibboleth.utilities.java.support.security.SelfSignedCertificateGenerator %*
+"%~dp0\runclass.bat" net.shibboleth.utilities.java.support.security.SelfSignedCertificateGenerator %*

Modified: trunk/idp-distribution/src/main/resources/bin/reload-metadata.bat
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/reload-metadata.bat?rev=6827&r1=6826&r2=6827&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/reload-metadata.bat (original)
+++ trunk/idp-distribution/src/main/resources/bin/reload-metadata.bat Mon Nov  3 09:28:51 2014
@@ -1,4 +1,4 @@
 @echo off
 setlocal
 
-%~dp0\runclass.bat -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.cli.ReloadMetadataArguments net.shibboleth.idp.cli.CLI %*
+"%~dp0\runclass.bat" -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.cli.ReloadMetadataArguments net.shibboleth.idp.cli.CLI %*

Modified: trunk/idp-distribution/src/main/resources/bin/reload-service.bat
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/reload-service.bat?rev=6827&r1=6826&r2=6827&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/reload-service.bat (original)
+++ trunk/idp-distribution/src/main/resources/bin/reload-service.bat Mon Nov  3 09:28:51 2014
@@ -1,4 +1,4 @@
 @echo off
 setlocal
 
-%~dp0\runclass.bat -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.cli.ReloadServiceArguments net.shibboleth.idp.cli.CLI %*
+"%~dp0\runclass.bat" -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.cli.ReloadServiceArguments net.shibboleth.idp.cli.CLI %*


[... 36 lines stripped ...]