Works on NT now

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

diff --git a/bin/resolvertest.bat b/bin/resolvertest.bat
index 112b3e9..5bc4c8e 100644 (file)
--- a/bin/resolvertest.bat
+++ b/bin/resolvertest.bat
@@ -8,52 +8,43 @@ if not defined JAVA_HOME  (
 )
 
 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% (
   echo Error: JAVA_HOME is not defined correctly.
-  echo Cannot execute %JAVACMD
+  echo Cannot execute %JAVACMD%
   exit /b
 )
 
-
-REM Find the shibboleth components
+REM The root of the Shibboleth package tree, relative to the run directory
 if not defined SHIB_HOME (
-  echo Error: SHIB_HOME is not defined.
-  exit /b
+  set SHIB_HOME=.
 )
 
-if not exist %SHIB_HOME/lib/shib-util.jar (
-  echo Error: Cannot find the shibboleth jar (shib-util.jar).
-  echo      If you downloaded the shibboleth source, you need to run "ant build-util"
+set ENDORSED=%SHIB_HOME%\endorsed
+
+REM Where log4j config file is
+set LOG_CONFIG=%SHIB_HOME%\conf\log4j.properties
+
+if not exist %SHIB_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
 )
 
-set ENDORSED=%SHIB_HOME\endorsed
-
 REM Grab all the dependencies
 if defined CLASSPATH (
-  set SHIB_UTIL_CLASSPATH=%CLASSPATH
+  set LOCALCLASSPATH=%CLASSPATH%
 )
 
-set DIRLIBS=%SHIB_HOME\lib\*.jar
-for %%i in (%DIRLIBS) do (
-  if defined SHIB_UTIL_CLASSPATH (
-    set SHIB_UTIL_CLASSPATH="%i";%SHIB_UTIL_CLASSPATH
-  ) else (
-    set SHIB_UTIL_CLASSPATH=%i
-  )
+REM add in the dependency .jar files
+for %%i in (%SHIB_HOME%\lib\*.jar) do (
+       call %SHIB_HOME%\cpappend.bat %%i
 )
-
-set DIRLIBS=%SHIB_HOME\webApplication\WEB-INF\lib\*.jar
-for %%i in (%DIRLIBS) do (
-  if defined SHIB_UTIL_CLASSPATH (
-    set SHIB_UTIL_CLASSPATH="%i";%SHIB_UTIL_CLASSPATH
-  ) else (
-    set SHIB_UTIL_CLASSPATH=%i
-  )
+for %%i in (%SHIB_HOME%\webApplication\WEB-INF\*.jar) do (
+       call %SHIB_HOME%\cpappend.bat %%i
 )
 
 REM Here we go
-%JAVACMD -Djava.endorsed.dirs="%ENDORSED" -classpath "%SHIB_UTIL_CLASSPATH" edu.internet2.middleware.shibboleth.utils.ResolverTest %*
+%JAVACMD% -Djava.endorsed.dirs="%ENDORSED%" -Dlog4j.configuration="%LOG_CONFIG%" -cp "%LOCALCLASSPATH%" edu.internet2.middleware.shibboleth.utils.ResolverTest %*