Removed references to LOGCONFIG env variables that were mistakenly copied from the...

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

diff --git a/bin/metadatatool.bat b/bin/metadatatool.bat
index 45ce1eb..97d5095 100755 (executable)
--- a/bin/metadatatool.bat
+++ b/bin/metadatatool.bat
@@ -8,48 +8,38 @@ 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 The root of the Shibboleth package tree, relative to the run directory
-if not exist %SHIB_HOME (
+if not defined SHIB_HOME (
   set SHIB_HOME=.
 )
-set ENDORSED=%SHIB_HOME\endorsed
 
-REM Where log4j config file is
-set LOG_CONFIG=%SHIB_HOME\webApplication\WEB-INF\classes\conf\log4j.properties
+set ENDORSED=%SHIB_HOME%\endorsed
+
+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
+)
 
 REM Grab all the dependencies
 if defined CLASSPATH (
-  set SHIB_UTIL_CLASSPATH=%CLASSPATH
-)
-set SHIB_UTIL_CLASSPATH="%SHIB_HOME\webApplication\WEB-INF\classes";%SHIB_UTIL_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
-  )
+  set LOCALCLASSPATH=%CLASSPATH%
 )
 
-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
-  )
+REM add in the dependency .jar files
+for %%i in (%SHIB_HOME%\lib\*.jar) do (
+       call %SHIB_HOME%\cpappend.bat %%i
 )
 
 REM Here we go
-%JAVACMD -Djava.endorsed.dirs="%ENDORSED" -Dlog.config="%LOG_CONFIG" -cp "%SHIB_UTIL_CLASSPATH" edu.internet2.middleware.shibboleth.utils.MetadataTool %*
+%JAVACMD% -Djava.endorsed.dirs="%ENDORSED%" -cp "%LOCALCLASSPATH%" edu.internet2.middleware.shibboleth.utils.MetadataTool %*