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

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

diff --git a/bin/metadatatool b/bin/metadatatool
index 4f56d76..66ea7cc 100755 (executable)
--- a/bin/metadatatool
+++ b/bin/metadatatool
@@ -23,9 +23,6 @@ if [ ! -n "$SHIB_HOME" ] ; then
 fi
 ENDORSED=$SHIB_HOME/endorsed
 
-## Where log4j config file is
-LOG_CONFIG=$SHIB_HOME/conf/log4j.properties
-
 if [ ! \( -f "$SHIB_HOME/lib/shib-util.jar" -a -r "$SHIB_HOME/lib/shib-util.jar" \) ] ; then
   echo "Error: Cannot find the shibboleth jar (shib-util.jar)."
   echo "       If you downloaded the shibboleth source, you need to run \"ant build-util\""
@@ -53,4 +50,4 @@ done
 SHIB_UTIL_CLASSPATH=$SHIB_UTIL_CLASSPATH:"$SHIB_HOME"
 
 ##Here we go
-$JAVACMD -Djava.endorsed.dirs="$ENDORSED" -Dlog4j.configuration="$LOG_CONFIG" -cp $SHIB_UTIL_CLASSPATH  edu.internet2.middleware.shibboleth.utils.MetadataTool "$@"
+$JAVACMD -Djava.endorsed.dirs="$ENDORSED" -cp $SHIB_UTIL_CLASSPATH  edu.internet2.middleware.shibboleth.utils.MetadataTool "$@"

diff --git a/bin/metadatatool.bat b/bin/metadatatool.bat
index 9447a9f..97d5095 100755 (executable)
--- a/bin/metadatatool.bat
+++ b/bin/metadatatool.bat
@@ -24,9 +24,6 @@ if not defined SHIB_HOME (
 
 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"
@@ -44,5 +41,5 @@ for %%i in (%SHIB_HOME%\lib\*.jar) do (
 )
 
 REM Here we go
-%JAVACMD% -Djava.endorsed.dirs="%ENDORSED%" -Dlog4j.configuration="%LOG_CONFIG%" -cp "%LOCALCLASSPATH%" edu.internet2.middleware.shibboleth.utils.MetadataTool %*
+%JAVACMD% -Djava.endorsed.dirs="%ENDORSED%" -cp "%LOCALCLASSPATH%" edu.internet2.middleware.shibboleth.utils.MetadataTool %*
 

diff --git a/bin/resolvertest b/bin/resolvertest
index c8f6cdf..355cb1f 100755 (executable)
--- a/bin/resolvertest
+++ b/bin/resolvertest
@@ -31,9 +31,6 @@ fi
 
 ENDORSED=$SHIB_HOME/endorsed/
 
-## Where log4j config file is
-LOG_CONFIG=$SHIB_HOME/conf/log4j.properties
-
 ##Grab all the dependencies
 if [ -n "$CLASSPATH" ] ; then
   SHIB_UTIL_CLASSPATH=$CLASSPATH
@@ -70,4 +67,4 @@ done
 SHIB_UTIL_CLASSPATH=$SHIB_UTIL_CLASSPATH:"$SHIB_HOME"
 
 ##Here we go
-$JAVACMD -Djava.endorsed.dirs="$ENDORSED" -Dlog4j.configuration="$LOG_CONFIG" -cp $SHIB_UTIL_CLASSPATH  edu.internet2.middleware.shibboleth.utils.ResolverTest "$@"
+$JAVACMD -Djava.endorsed.dirs="$ENDORSED" -cp $SHIB_UTIL_CLASSPATH  edu.internet2.middleware.shibboleth.utils.ResolverTest "$@"

diff --git a/bin/resolvertest.bat b/bin/resolvertest.bat
index fd9af95..26f1149 100644 (file)
--- a/bin/resolvertest.bat
+++ b/bin/resolvertest.bat
@@ -24,9 +24,6 @@ if not defined SHIB_HOME (
 
 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"
@@ -47,4 +44,4 @@ for %%i in (%SHIB_HOME%\webApplication\WEB-INF\lib\*.jar) do (
 )
 
 REM Here we go
-%JAVACMD% -Djava.endorsed.dirs="%ENDORSED%" -Dlog4j.configuration="%LOG_CONFIG%" -cp "%LOCALCLASSPATH%" edu.internet2.middleware.shibboleth.utils.ResolverTest %*
+%JAVACMD% -Djava.endorsed.dirs="%ENDORSED%" -cp "%LOCALCLASSPATH%" edu.internet2.middleware.shibboleth.utils.ResolverTest %*