[java-identity-provider] branch master updated: IDP-1548 remove logback.xml from installer classpath

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=837e694ffc86a315702e93b80ae2859e50fb5686

The following commit(s) were added to refs/heads/master by this push:
       new  837e694   IDP-1548 remove logback.xml from installer classpath
837e694 is described below

commit 837e694ffc86a315702e93b80ae2859e50fb5686
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Feb 12 11:16:45 2020 +0000

    IDP-1548 remove logback.xml from installer classpath
    
    https://issues.shibboleth.net/jira/browse/IDP-1548
    
    Make the ant scripts collect an explicit log file (bin\install-log.xml) instead
---
 idp-distribution/src/main/resources/bin/ant.bat                    | 6 +++++-
 idp-distribution/src/main/resources/bin/ant.sh                     | 7 ++++++-
 .../src/main/resources/bin/install-log.xml                         | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/idp-distribution/src/main/resources/bin/ant.bat b/idp-distribution/src/main/resources/bin/ant.bat
index 0ddbdcf..bd64f6c 100644
--- a/idp-distribution/src/main/resources/bin/ant.bat
+++ b/idp-distribution/src/main/resources/bin/ant.bat
@@ -12,6 +12,10 @@ if "%ANT_HOME:~-1%" NEQ "\" (
 set ANT_HOME=%ANT_HOME:~0,-1%
 :nostrip
 
+if not defined INSTALL_LOG_FILE (
+   set INSTALL_LOG_FILE=%ANT_HOME%\install-log.xml
+)
+
 REM We need a JVM
 if not defined JAVA_HOME  (
   echo Error: JAVA_HOME is not defined.
@@ -31,4 +35,4 @@ if not exist %JAVACMD% (
 REM add in the dependency .jar files
 set LOCALCLASSPATH=%ANT_HOME%\..\bin\lib\*;%ANT_HOME%\..\webapp\WEB-INF\lib\*;%ANT_HOME%\..\dist\webapp\WEB-INF\lib\*;%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%CLASSPATH%
 
-%JAVACMD% -cp "%LOCALCLASSPATH%" -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main -e -f "%ANT_HOME%/build.xml" %*
\ No newline at end of file
+%JAVACMD% -cp "%LOCALCLASSPATH%" -Dlogback.configurationFile=%INSTALL_LOG_FILE% -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main -e -f "%ANT_HOME%/build.xml" %*
diff --git a/idp-distribution/src/main/resources/bin/ant.sh b/idp-distribution/src/main/resources/bin/ant.sh
index f428374..51dde82 100755
--- a/idp-distribution/src/main/resources/bin/ant.sh
+++ b/idp-distribution/src/main/resources/bin/ant.sh
@@ -24,6 +24,10 @@ if [ -z "$JAVACMD" ] ; then
     JAVACMD=java
   fi
 fi
+
+if [ -z "$INSTALL_LOG_FILE" ] ; then
+    INSTALL_LOG_FILE=$ANT_HOME/install-log.xml
+fi
  
 if [ ! -x "$JAVACMD" ] ; then
   echo "Error: JAVA_HOME is not defined correctly."
@@ -82,4 +86,5 @@ if $cygwin; then
   JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
   LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
 fi
-$JAVACMD -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" $ANT_OPTS org.apache.tools.ant.Main -e -f "${ANT_HOME}/build.xml" "$@"
+
+$JAVACMD -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" -Dlogback.configurationFile=$INSTALL_LOG_FILE $ANT_OPTS org.apache.tools.ant.Main -e -f "${ANT_HOME}/build.xml" "$@"
diff --git a/idp-installer/src/main/resources/logback.xml b/idp-distribution/src/main/resources/bin/install-log.xml
similarity index 93%
rename from idp-installer/src/main/resources/logback.xml
rename to idp-distribution/src/main/resources/bin/install-log.xml
index f52d4cc..afe8289 100644
--- a/idp-installer/src/main/resources/logback.xml
+++ b/idp-distribution/src/main/resources/bin/install-log.xml
@@ -10,7 +10,7 @@
     </appender>
 
     <root>
-        <level value="DEBUG" />
+        <level value="INFO" />
         <appender-ref ref="STDOUT" />
     </root>
     

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.