Moved cpappend script into bin.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1729 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/ant.bat b/ant.bat
index 88a8aee..b380522 100644 (file)
--- a/ant.bat
+++ b/ant.bat
@@ -26,7 +26,7 @@ if defined CLASSPATH (
 
 REM add in the dependency .jar files
 for %%i in (%ANT_HOME%\lib\*.jar) do (
-       call %ANT_HOME%\cpappend.bat %%i
+       call %ANT_HOME%\bin\cpappend.bat %%i
 )
 
 if exist %JAVA_HOME%\lib\tools.jar (

diff --git a/cpappend.bat b/bin/cpappend.bat
similarity index 84%
rename from cpappend.bat
rename to bin/cpappend.bat
index c0f2a00..9f606aa 100644 (file)
--- a/cpappend.bat
+++ b/bin/cpappend.bat
@@ -1,19 +1,19 @@
-rem ---------------------------------------------------------------------------\r
-rem Append to CLASSPATH\r
-rem\r
-rem $Id: cpappend.bat,v 1.3 2002/08/04 18:19:43 patrickl Exp $\r
-rem ---------------------------------------------------------------------------\r
-\r
-rem Process the first argument\r
-if ""%1"" == """" goto end\r
-set LOCALCLASSPATH=%LOCALCLASSPATH%;%1\r
-shift\r
-\r
-rem Process the remaining arguments\r
-:setArgs\r
-if ""%1"" == """" goto doneSetArgs\r
-set LOCALCLASSPATH=%LOCALCLASSPATH% %1\r
-shift\r
-goto setArgs\r
-:doneSetArgs\r
-:end\r
+rem ---------------------------------------------------------------------------
+rem Append to CLASSPATH
+rem
+rem $Id$
+rem ---------------------------------------------------------------------------
+
+rem Process the first argument
+if ""%1"" == """" goto end
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%1
+shift
+
+rem Process the remaining arguments
+:setArgs
+if ""%1"" == """" goto doneSetArgs
+set LOCALCLASSPATH=%LOCALCLASSPATH% %1
+shift
+goto setArgs
+:doneSetArgs
+:end

diff --git a/bin/extkeytool.bat b/bin/extkeytool.bat
index 70befa4..55199f7 100644 (file)
--- a/bin/extkeytool.bat
+++ b/bin/extkeytool.bat
@@ -40,7 +40,7 @@ if defined CLASSPATH (
 
 REM add in the dependency .jar files
 for %%i in (%SHIB_HOME%\lib\*.jar) do (
-       call %SHIB_HOME%\cpappend.bat %%i
+       call %SHIB_HOME%\bin\cpappend.bat %%i
 )
 
 REM Here we go

diff --git a/bin/metadatatool.bat b/bin/metadatatool.bat
index 3bc331d..f0902ce 100755 (executable)
--- a/bin/metadatatool.bat
+++ b/bin/metadatatool.bat
@@ -37,7 +37,7 @@ if defined CLASSPATH (
 
 REM add in the dependency .jar files
 for %%i in (%SHIB_HOME%\lib\*.jar) do (
-       call %SHIB_HOME%\cpappend.bat %%i
+       call %SHIB_HOME%\bin\cpappend.bat %%i
 )
 
 REM Here we go

diff --git a/bin/resolvertest.bat b/bin/resolvertest.bat
index cdcb6fc..b3759c6 100644 (file)
--- a/bin/resolvertest.bat
+++ b/bin/resolvertest.bat
@@ -37,10 +37,10 @@ if defined CLASSPATH (
 
 REM add in the dependency .jar files
 for %%i in (%SHIB_HOME%\lib\*.jar) do (
-       call %SHIB_HOME%\cpappend.bat %%i
+       call %SHIB_HOME%\bin\cpappend.bat %%i
 )
 for %%i in (%SHIB_HOME%\webApplication\WEB-INF\lib\*.jar) do (
-       call %SHIB_HOME%\cpappend.bat %%i
+       call %SHIB_HOME%\bin\cpappend.bat %%i
 )
 
 REM Here we go