Author: robbie
Date: Tue Jan 5 11:20:43 2010
New Revision: 895992
URL: http://svn.apache.org/viewvc?rev=895992&view=rev
Log:
QPID-2315: split out commons-configuration from common.libs property and add to
libs for modules other than client that depend on common.libs. Add commons-lang
and commons-collections to client.libs
merge from 0.5.x-dev r894875
Modified:
qpid/trunk/ (props changed)
qpid/trunk/qpid/java/ (props changed)
qpid/trunk/qpid/java/build.deps
Propchange: qpid/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 5 11:20:43 2010
@@ -1,2 +1,2 @@
-/qpid/branches/0.5.x-dev:892761
+/qpid/branches/0.5.x-dev:892761,894875
/qpid/branches/java-network-refactor:805429-825319
Propchange: qpid/trunk/qpid/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 5 11:20:43 2010
@@ -1,5 +1,5 @@
/qpid/branches/0.5.x-dev:886720-886722
-/qpid/branches/0.5.x-dev/qpid/java:886720-886722,887145,892761
+/qpid/branches/0.5.x-dev/qpid/java:886720-886722,887145,892761,894875
/qpid/branches/java-broker-0-10/qpid/java:795950-829653
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/trunk/qpid:796646-796653
Modified: qpid/trunk/qpid/java/build.deps
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.deps?rev=895992&r1=895991&r2=895992&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.deps (original)
+++ qpid/trunk/qpid/java/build.deps Tue Jan 5 11:20:43 2010
@@ -74,15 +74,17 @@
geronimo-servlet=lib/geronimo-servlet_2.5_spec-1.2.jar
felix.libs=${osgi-core} ${felix-framework}
-common.libs=${slf4j-api} ${backport-util-concurrent} ${mina-core} \
- ${mina-filter-ssl} ${commons-beanutils-core} ${commons-digester}
${commons-codec} ${commons-lang} ${commons-collections} \
- ${commons-configuration}
-client.libs=${common.libs} ${geronimo-jms}
-tools.libs=${client.libs}
+commons-configuration.libs = ${commons-beanutils-core} ${commons-digester}
${commons-codec} ${commons-lang} \
+ ${commons-collections} ${commons-configuration}
+
+common.libs=${slf4j-api} ${backport-util-concurrent} ${mina-core}
${mina-filter-ssl}
+
+client.libs=${common.libs} ${geronimo-jms} ${commons-lang}
${commons-collections}
+tools.libs=${client.libs} ${commons-configuration.libs}
broker.libs=${common.libs} ${commons-cli} ${commons-logging} ${log4j} \
- ${slf4j-log4j} ${xalan} ${felix.libs} ${derby-db}
+ ${slf4j-log4j} ${xalan} ${felix.libs} ${derby-db}
${commons-configuration.libs}
-broker-plugins.libs=${common.libs} ${felix.libs} ${log4j}
+broker-plugins.libs=${common.libs} ${felix.libs} ${log4j}
${commons-configuration.libs}
management-client.libs=${jsp.libs} ${log4j} ${slf4j-log4j} ${slf4j-api}
${commons-pool} ${geronimo-servlet} ${muse.libs} ${javassist} ${xalan}
${mina-core} ${mina-filter-ssl}
management-agent.libs=${client.libs} ${commons-logging} ${geronimo-jms}
@@ -159,7 +161,7 @@
management-eclipse-plugin.libs=${management-eclipse-plugin.core-libs}
${management-eclipse-plugin.platform-libs}
-management-tools-qpid-cli.libs=${common.libs} ${jline}
+management-tools-qpid-cli.libs=${common.libs} ${jline}
${commons-configuration.libs}
common.test.libs=${test.libs}
broker.test.libs=${test.libs}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
