Updated blackbox tests to work with new metadata classes.

[java-idp.git] / bin / extkeytool.bat

diff --git a/bin/extkeytool.bat b/bin/extkeytool.bat
index dc04f67..4eb451c 100644 (file)
--- a/bin/extkeytool.bat
+++ b/bin/extkeytool.bat
@@ -8,7 +8,7 @@ if not defined JAVA_HOME  (
 )
 
 if not defined JAVACMD (
 )
 
 if not defined JAVACMD (

-  set JAVACMD=%JAVA_HOME%\bin\java.exe
+  set JAVACMD="%JAVA_HOME%\bin\java.exe"

 )
 
 if not exist %JAVACMD% (
 )
 
 if not exist %JAVACMD% (

@@ -18,16 +18,17 @@ if not exist %JAVACMD% (
 )
 
 REM The root of the Shibboleth package tree, relative to the run directory
 )
 
 REM The root of the Shibboleth package tree, relative to the run directory

-if not defined SHIB_HOME (
-  set SHIB_HOME=.
+if not defined IDP_HOME (
+  echo Error: IDP_HOME is not defined.
+  exit /b

 )
 
 )
 

-set ENDORSED=%SHIB_HOME%\endorsed
+set ENDORSED=%IDP_HOME%\endorsed

 
 REM Where log4j config file is
 
 REM Where log4j config file is

-set LOG_CONFIG=%SHIB_HOME%\conf\log4j.properties
+set LOG_CONFIG=%IDP_HOME%\etc\log4j.properties

 
 

-if not exist %SHIB_HOME%\lib\shib-util.jar (
+if not exist %IDP_HOME%\lib\shib-util.jar (

   echo Error: Cannot find shib-util.jar
   echo                 If you downloaded the shibboleth source, you need to run "ant build-util"
   exit /b
   echo Error: Cannot find shib-util.jar
   echo                 If you downloaded the shibboleth source, you need to run "ant build-util"
   exit /b

@@ -39,8 +40,8 @@ if defined CLASSPATH (
 )
 
 REM add in the dependency .jar files
 )
 
 REM add in the dependency .jar files

-for %%i in (%SHIB_HOME%\lib\*.jar) do (
-       call %SHIB_HOME%\cpappend.bat %%i
+for %%i in (%IDP_HOME%\lib\*.jar) do (
+       call %IDP_HOME%\bin\cpappend.bat %%i

 )
 
 REM Here we go
 )
 
 REM Here we go