Sets up log4j properly.

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

diff --git a/bin/metadatatool b/bin/metadatatool
index cf05623..9a20f0b 100755 (executable)
--- a/bin/metadatatool
+++ b/bin/metadatatool
@@ -23,6 +23,9 @@ if [ ! -n "$SHIB_HOME" ] ; then
 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
@@ -45,4 +48,4 @@ done
 
 
 ##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" -Dlog4j.configuration="$LOG_CONFIG" -cp $SHIB_UTIL_CLASSPATH  edu.internet2.middleware.shibboleth.utils.MetadataTool "$@"

diff --git a/bin/metadatatool.bat b/bin/metadatatool.bat
index 45ce1eb..043327f 100755 (executable)
--- a/bin/metadatatool.bat
+++ b/bin/metadatatool.bat
@@ -24,7 +24,7 @@ if not exist %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 LOG_CONFIG=%SHIB_HOME\conf\log4j.properties
 
 REM Grab all the dependencies
 if defined CLASSPATH (
@@ -51,5 +51,5 @@ for %%i in (%DIRLIBS) do (
 )
 
 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" -Dlog4j.configuration="%LOG_CONFIG" -cp "%SHIB_UTIL_CLASSPATH" edu.internet2.middleware.shibboleth.utils.MetadataTool %*