From b4f1e0b9104b84fd092a3d2d4285eade712656ff Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Wed, 17 Nov 2010 00:30:44 +0000 Subject: QPID-2947: update slf4j to 1.6.1 to allow using the client package out-of-the-box without supplying a logging implementation git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1035879 13f79535-47bb-0310-9956-ffa450edef68 --- java/build.deps | 4 ++-- java/lib/slf4j-api-1.4.0.jar | Bin 13095 -> 0 bytes java/lib/slf4j-api-1.6.1.jar | Bin 0 -> 25496 bytes java/lib/slf4j-log4j12-1.4.0.jar | Bin 7132 -> 0 bytes java/lib/slf4j-log4j12-1.6.1.jar | Bin 0 -> 9753 bytes java/management/client/bin/qman-wsdm-start.cmd | 6 +++--- java/management/client/bin/qman-wsdm-start.sh | 4 ++-- 7 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 java/lib/slf4j-api-1.4.0.jar create mode 100644 java/lib/slf4j-api-1.6.1.jar delete mode 100644 java/lib/slf4j-log4j12-1.4.0.jar create mode 100644 java/lib/slf4j-log4j12-1.6.1.jar diff --git a/java/build.deps b/java/build.deps index 26025f8f56..aebd381bbc 100644 --- a/java/build.deps +++ b/java/build.deps @@ -43,8 +43,8 @@ log4j=lib/log4j-1.2.12.jar mina-core=lib/mina-core-1.0.1.jar mina-filter-ssl=lib/mina-filter-ssl-1.0.1.jar -slf4j-api=lib/slf4j-api-1.4.0.jar -slf4j-log4j=lib/slf4j-log4j12-1.4.0.jar +slf4j-api=lib/slf4j-api-1.6.1.jar +slf4j-log4j=lib/slf4j-log4j12-1.6.1.jar xalan=lib/xalan-2.7.0.jar diff --git a/java/lib/slf4j-api-1.4.0.jar b/java/lib/slf4j-api-1.4.0.jar deleted file mode 100644 index 9ce2532aa4..0000000000 Binary files a/java/lib/slf4j-api-1.4.0.jar and /dev/null differ diff --git a/java/lib/slf4j-api-1.6.1.jar b/java/lib/slf4j-api-1.6.1.jar new file mode 100644 index 0000000000..42e0ad0de7 Binary files /dev/null and b/java/lib/slf4j-api-1.6.1.jar differ diff --git a/java/lib/slf4j-log4j12-1.4.0.jar b/java/lib/slf4j-log4j12-1.4.0.jar deleted file mode 100644 index e8e09f35ca..0000000000 Binary files a/java/lib/slf4j-log4j12-1.4.0.jar and /dev/null differ diff --git a/java/lib/slf4j-log4j12-1.6.1.jar b/java/lib/slf4j-log4j12-1.6.1.jar new file mode 100644 index 0000000000..873d11983e Binary files /dev/null and b/java/lib/slf4j-log4j12-1.6.1.jar differ diff --git a/java/management/client/bin/qman-wsdm-start.cmd b/java/management/client/bin/qman-wsdm-start.cmd index df30ce8617..ec8321c6b8 100644 --- a/java/management/client/bin/qman-wsdm-start.cmd +++ b/java/management/client/bin/qman-wsdm-start.cmd @@ -59,8 +59,8 @@ SET CLASSPATH=%CLASSPATH%;%QMAN_LIBS%\start.jar SET CLASSPATH=%CLASSPATH%;%QMAN_LIBS%\jetty-6.1.14.jar SET CLASSPATH=%CLASSPATH%;%QMAN_LIBS%\jetty-util-6.1.14.jar SET CLASSPATH=%CLASSPATH%;%QMAN_LIBS%\geronimo-servlet_2.5_spec-1.2.jar -SET CLASSPATH=%CLASSPATH%;%QMAN_LIBS%\slf4j-api-1.4.0.jar -SET CLASSPATH=%CLASSPATH%;%QMAN_LIBS%\slf4j-log4j12-1.4.0.jar +SET CLASSPATH=%CLASSPATH%;%QMAN_LIBS%\slf4j-api-1.6.1.jar +SET CLASSPATH=%CLASSPATH%;%QMAN_LIBS%\slf4j-log4j12-1.6.1.jar SET CLASSPATH=%CLASSPATH%;%QMAN_LIBS%\log4j-1.2.12.jar echo =============================================================================== @@ -85,4 +85,4 @@ echo. echo =============================================================================== echo. -%JAVA% -cp %CLASSPATH% -DQMAN_HOME=%QMAN_HOME% -Djetty.home=%QMAN_HOME% -Dqman.host=%QMAN_WSDM_ADAPTER_HOST% -Dqman.port=%QMAN_WSDM_ADAPTER_PORT% -DSTOP.PORT=%ADMIN_PORT% -DSTOP.KEY=%ADMIN_KEY% -Dqman-config=%QMAN_CONFIG_FILE% org.mortbay.start.Main %JETTY_CONFIG_FILE% \ No newline at end of file +%JAVA% -cp %CLASSPATH% -DQMAN_HOME=%QMAN_HOME% -Djetty.home=%QMAN_HOME% -Dqman.host=%QMAN_WSDM_ADAPTER_HOST% -Dqman.port=%QMAN_WSDM_ADAPTER_PORT% -DSTOP.PORT=%ADMIN_PORT% -DSTOP.KEY=%ADMIN_KEY% -Dqman-config=%QMAN_CONFIG_FILE% org.mortbay.start.Main %JETTY_CONFIG_FILE% diff --git a/java/management/client/bin/qman-wsdm-start.sh b/java/management/client/bin/qman-wsdm-start.sh index 39a4cba66e..0024890527 100644 --- a/java/management/client/bin/qman-wsdm-start.sh +++ b/java/management/client/bin/qman-wsdm-start.sh @@ -58,7 +58,7 @@ ADMIN_KEY=gazzax QMAN_LIBS=$QMAN_HOME/lib JETTY_CONFIG_FILE=$QMAN_HOME/etc/jetty.xml -QMAN_CLASSPATH=$QMAN_HOME/etc:$QMAN_LIBS/start.jar:$QMAN_LIBS/jetty-6.1.14.jar:$QMAN_LIBS/jetty-util-6.1.14.jar:$QMAN_LIBS/geronimo-servlet_2.5_spec-1.2.jar:$QMAN_LIBS/slf4j-api-1.4.0.jar:$QMAN_LIBS/slf4j-log4j12-1.4.0.jar:$QMAN_LIBS/log4j-1.2.12.jar +QMAN_CLASSPATH=$QMAN_HOME/etc:$QMAN_LIBS/start.jar:$QMAN_LIBS/jetty-6.1.14.jar:$QMAN_LIBS/jetty-util-6.1.14.jar:$QMAN_LIBS/geronimo-servlet_2.5_spec-1.2.jar:$QMAN_LIBS/slf4j-api-1.6.1.jar:$QMAN_LIBS/slf4j-log4j12-1.6.1.jar:$QMAN_LIBS/log4j-1.2.12.jar echo "===============================================================================" echo"" @@ -86,4 +86,4 @@ echo"" echo "===============================================================================" echo"" -"$JAVA" $JAVA_OPTS -cp $QMAN_CLASSPATH -DQMAN_HOME=$QMAN_HOME -Djetty.home=$QMAN_HOME -Dqman.host=$QMAN_WSDM_ADAPTER_HOST -Dqman.port=$QMAN_WSDM_ADAPTER_PORT -DSTOP.PORT=$ADMIN_PORT -DSTOP.KEY=$ADMIN_KEY -Dqman-config=$QMAN_CONFIG_FILE org.mortbay.start.Main $JETTY_CONFIG_FILE \ No newline at end of file +"$JAVA" $JAVA_OPTS -cp $QMAN_CLASSPATH -DQMAN_HOME=$QMAN_HOME -Djetty.home=$QMAN_HOME -Dqman.host=$QMAN_WSDM_ADAPTER_HOST -Dqman.port=$QMAN_WSDM_ADAPTER_PORT -DSTOP.PORT=$ADMIN_PORT -DSTOP.KEY=$ADMIN_KEY -Dqman-config=$QMAN_CONFIG_FILE org.mortbay.start.Main $JETTY_CONFIG_FILE -- cgit v1.2.1