You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2010/11/22 22:19:05 UTC
svn commit: r1037893 - in /qpid/branches/0.8-release-candidates/qpid/java:
./ lib/ management/client/bin/
Author: robbie
Date: Mon Nov 22 21:19:05 2010
New Revision: 1037893
URL: http://svn.apache.org/viewvc?rev=1037893&view=rev
Log:
QPID-2947: update slf4j to 1.6.1 to allow using the client package out-of-the-box without supplying a logging implementation
marged from trunk r1035879
Added:
qpid/branches/0.8-release-candidates/qpid/java/lib/slf4j-api-1.6.1.jar (with props)
qpid/branches/0.8-release-candidates/qpid/java/lib/slf4j-log4j12-1.6.1.jar (with props)
Removed:
qpid/branches/0.8-release-candidates/qpid/java/lib/slf4j-api-1.4.0.jar
qpid/branches/0.8-release-candidates/qpid/java/lib/slf4j-log4j12-1.4.0.jar
Modified:
qpid/branches/0.8-release-candidates/qpid/java/ (props changed)
qpid/branches/0.8-release-candidates/qpid/java/build.deps
qpid/branches/0.8-release-candidates/qpid/java/management/client/bin/qman-wsdm-start.cmd
qpid/branches/0.8-release-candidates/qpid/java/management/client/bin/qman-wsdm-start.sh
Propchange: qpid/branches/0.8-release-candidates/qpid/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 21:19:05 2010
@@ -3,4 +3,4 @@
/qpid/branches/java-broker-0-10/qpid/java:795950-829653
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/trunk/qpid:796646-796653
-/qpid/trunk/qpid/java:1033975,1035026
+/qpid/trunk/qpid/java:1033975,1035026,1035879
Modified: qpid/branches/0.8-release-candidates/qpid/java/build.deps
URL: http://svn.apache.org/viewvc/qpid/branches/0.8-release-candidates/qpid/java/build.deps?rev=1037893&r1=1037892&r2=1037893&view=diff
==============================================================================
--- qpid/branches/0.8-release-candidates/qpid/java/build.deps (original)
+++ qpid/branches/0.8-release-candidates/qpid/java/build.deps Mon Nov 22 21:19:05 2010
@@ -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
Added: qpid/branches/0.8-release-candidates/qpid/java/lib/slf4j-api-1.6.1.jar
URL: http://svn.apache.org/viewvc/qpid/branches/0.8-release-candidates/qpid/java/lib/slf4j-api-1.6.1.jar?rev=1037893&view=auto
==============================================================================
Binary file - no diff available.
Propchange: qpid/branches/0.8-release-candidates/qpid/java/lib/slf4j-api-1.6.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: qpid/branches/0.8-release-candidates/qpid/java/lib/slf4j-log4j12-1.6.1.jar
URL: http://svn.apache.org/viewvc/qpid/branches/0.8-release-candidates/qpid/java/lib/slf4j-log4j12-1.6.1.jar?rev=1037893&view=auto
==============================================================================
Binary file - no diff available.
Propchange: qpid/branches/0.8-release-candidates/qpid/java/lib/slf4j-log4j12-1.6.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: qpid/branches/0.8-release-candidates/qpid/java/management/client/bin/qman-wsdm-start.cmd
URL: http://svn.apache.org/viewvc/qpid/branches/0.8-release-candidates/qpid/java/management/client/bin/qman-wsdm-start.cmd?rev=1037893&r1=1037892&r2=1037893&view=diff
==============================================================================
--- qpid/branches/0.8-release-candidates/qpid/java/management/client/bin/qman-wsdm-start.cmd (original)
+++ qpid/branches/0.8-release-candidates/qpid/java/management/client/bin/qman-wsdm-start.cmd Mon Nov 22 21:19:05 2010
@@ -59,8 +59,8 @@ SET CLASSPATH=%CLASSPATH%;%QMAN_LIBS%\st
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%
Modified: qpid/branches/0.8-release-candidates/qpid/java/management/client/bin/qman-wsdm-start.sh
URL: http://svn.apache.org/viewvc/qpid/branches/0.8-release-candidates/qpid/java/management/client/bin/qman-wsdm-start.sh?rev=1037893&r1=1037892&r2=1037893&view=diff
==============================================================================
--- qpid/branches/0.8-release-candidates/qpid/java/management/client/bin/qman-wsdm-start.sh (original)
+++ qpid/branches/0.8-release-candidates/qpid/java/management/client/bin/qman-wsdm-start.sh Mon Nov 22 21:19:05 2010
@@ -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
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org