You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2010/03/23 21:07:03 UTC
svn commit: r926759 - in /qpid/branches/qmf-devel0.7a/qpid: ./ cpp/
cpp/include/qmf/engine/ cpp/src/qmf/engine/ cpp/src/qpid/client/
cpp/src/qpid/cluster/ cpp/src/qpid/management/ cpp/src/tests/ dotnet/ java/
java/broker/ java/broker/bin/ java/broker/s...
Author: kgiusti
Date: Tue Mar 23 20:07:01 2010
New Revision: 926759
URL: http://svn.apache.org/viewvc?rev=926759&view=rev
Log:
merge r926606:926753 from trunk - trunk passes cluster tests
Modified:
qpid/branches/qmf-devel0.7a/qpid/ (props changed)
qpid/branches/qmf-devel0.7a/qpid/cpp/BuildInstallSettings.cmake
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qmf/engine/Agent.h (props changed)
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qmf/engine/Console.h (props changed)
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qmf/engine/Agent.cpp (props changed)
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/ConnectionImpl.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/UpdateClient.cpp (props changed)
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/UpdateClient.h (props changed)
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/management/ManagementAgent.cpp (props changed)
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/management/ManagementAgent.h (props changed)
qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/cluster_tests.py (props changed)
qpid/branches/qmf-devel0.7a/qpid/dotnet/build-msbuild.bat (props changed)
qpid/branches/qmf-devel0.7a/qpid/dotnet/build-nant-release (props changed)
qpid/branches/qmf-devel0.7a/qpid/dotnet/build-nant.bat (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/ (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/broker/ (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/broker/bin/ (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/lib/org.osgi.core_1.0.0.jar (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/client/src/main/java/org/apache/qpid/management/ (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/client/src/test/java/org/apache/qpid/management/ (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/eclipse-plugin/src/ (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/08StandaloneExcludes (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/CPPExcludes (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/Excludes (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/JavaExcludes (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/JavaStandaloneExcludes (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/JavaTransientExcludes (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/XAExcludes (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/clean-dir (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/cpp.async.testprofile (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/cpp.cluster.testprofile (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/cpp.noprefetch.testprofile (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/cpp.ssl.excludes (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/cpp.ssl.testprofile (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/cpp.testprofile (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/default.testprofile (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/java-derby.testprofile (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/java.testprofile (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/log4j-test.xml (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/test-provider.properties (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/test_resources/ (props changed)
qpid/branches/qmf-devel0.7a/qpid/python/ (props changed)
qpid/branches/qmf-devel0.7a/qpid/python/examples/api/spout (props changed)
qpid/branches/qmf-devel0.7a/qpid/python/qpid/concurrency.py (props changed)
qpid/branches/qmf-devel0.7a/qpid/python/qpid/messaging/message.py
qpid/branches/qmf-devel0.7a/qpid/python/qpid/tests/messaging/message.py
qpid/branches/qmf-devel0.7a/qpid/ruby/ext/sasl/extconf.rb (props changed)
qpid/branches/qmf-devel0.7a/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py (props changed)
Propchange: qpid/branches/qmf-devel0.7a/qpid/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,3 +1,3 @@
/qpid/branches/0.5.x-dev/qpid:892761,894875
/qpid/branches/java-network-refactor/qpid:805429-825319
-/qpid/trunk/qpid:919043-926606
+/qpid/trunk/qpid:919043-926753
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/BuildInstallSettings.cmake
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/BuildInstallSettings.cmake?rev=926759&r1=926758&r2=926759&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/BuildInstallSettings.cmake (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/BuildInstallSettings.cmake Tue Mar 23 20:07:01 2010
@@ -92,7 +92,7 @@ if (WIN32)
"Directory to install read-only arch.-independent data root")
set (QPID_INSTALL_EXAMPLESDIR examples CACHE STRING
"Directory to install programming examples in")
- set (QPID_INSTALL_HTMLDIR html CACHE STRING
+ set (QPID_INSTALL_HTMLDIR docs/api/html CACHE STRING
"Directory to install HTML documentation")
set (QPID_INSTALL_INCLUDEDIR include CACHE STRING
"Directory to install programming header files")
Propchange: qpid/branches/qmf-devel0.7a/qpid/cpp/include/qmf/engine/Agent.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1 +1 @@
-/qpid/trunk/qpid/cpp/include/qmf/engine/Agent.h:919043-926606
+/qpid/trunk/qpid/cpp/include/qmf/engine/Agent.h:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/cpp/include/qmf/engine/Console.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1 +1 @@
-/qpid/trunk/qpid/cpp/include/qmf/engine/Console.h:919043-926606
+/qpid/trunk/qpid/cpp/include/qmf/engine/Console.h:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qmf/engine/Agent.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1 +1 @@
-/qpid/trunk/qpid/cpp/src/qmf/engine/Agent.cpp:919043-926606
+/qpid/trunk/qpid/cpp/src/qmf/engine/Agent.cpp:919043-926753
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/ConnectionImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/ConnectionImpl.cpp?rev=926759&r1=926758&r2=926759&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/ConnectionImpl.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/ConnectionImpl.cpp Tue Mar 23 20:07:01 2010
@@ -89,6 +89,8 @@ public:
void add() {
ScopedLock<Mutex> l(threadLock);
++connections;
+ if (!poller_)
+ poller_.reset(new Poller);
if (ioThreads < maxIOThreads) {
QPID_LOG(debug, "Created IO thread: " << ioThreads);
++ioThreads;
@@ -102,14 +104,14 @@ public:
}
Poller::shared_ptr poller() const {
+ assert(poller_);
return poller_;
}
// Here is where the maximum number of threads is set
IOThread(int c) :
ioThreads(0),
- connections(0),
- poller_(new Poller)
+ connections(0)
{
IOThreadOptions options(c);
options.parse(0, 0, QPIDC_CONF_FILE, true);
@@ -122,7 +124,8 @@ public:
// and we can't do that before we're unloaded as we can't
// restart the Poller after shutting it down
~IOThread() {
- poller_->shutdown();
+ if (poller_)
+ poller_->shutdown();
for (int i=0; i<ioThreads; ++i) {
t[i].join();
}
Propchange: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/UpdateClient.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1 +1 @@
-/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.cpp:919043-926606
+/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.cpp:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/UpdateClient.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1 +1 @@
-/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.h:919043-926606
+/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.h:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/management/ManagementAgent.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1 +1 @@
-/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp:919043-926606
+/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/management/ManagementAgent.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1 +1 @@
-/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h:919043-926606
+/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/cluster_tests.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1 +1 @@
-/qpid/trunk/qpid/cpp/src/tests/cluster_tests.py:919043-926606
+/qpid/trunk/qpid/cpp/src/tests/cluster_tests.py:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/dotnet/build-msbuild.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1 +1 @@
-/qpid/trunk/qpid/dotnet/build-msbuild.bat:919043-926606
+/qpid/trunk/qpid/dotnet/build-msbuild.bat:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/dotnet/build-nant-release
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1 +1 @@
-/qpid/trunk/qpid/dotnet/build-nant-release:919043-926606
+/qpid/trunk/qpid/dotnet/build-nant-release:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/dotnet/build-nant.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1 +1 @@
-/qpid/trunk/qpid/dotnet/build-nant.bat:919043-926606
+/qpid/trunk/qpid/dotnet/build-nant.bat:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 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:919043-926606
+/qpid/trunk/qpid/java:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/broker/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/broker:795950-829653
/qpid/branches/java-network-refactor/qpid/java/broker:805429-821809
/qpid/branches/jmx_mc_gsoc09/qpid/java/broker:787599
-/qpid/trunk/qpid/java/broker:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,919043-926606
+/qpid/trunk/qpid/java/broker:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/broker/bin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/qpid/branches/0.5-release/qpid/java/broker/bin:757268
/qpid/branches/java-broker-0-10/qpid/java/broker/bin:795950-829653
/qpid/branches/java-network-refactor/qpid/java/broker/bin:805429-821809
-/qpid/trunk/qpid/java/broker/bin:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,919043-926606
+/qpid/trunk/qpid/java/broker/bin:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -3,4 +3,4 @@
/qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/management:795950-829653
/qpid/branches/java-network-refactor/qpid/java/broker/src/main/java/org/apache/qpid/server/management:805429-821809
/qpid/branches/jmx_mc_gsoc09/qpid/java/broker/src/main/java/org/apache/qpid/server/management:787599
-/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,919043-926606
+/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -3,4 +3,4 @@
/qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:795950-829653
/qpid/branches/java-network-refactor/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:805429-821809
/qpid/branches/jmx_mc_gsoc09/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:787599
-/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:753219-753220,753253,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,919043-926606
+/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:753219-753220,753253,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/lib/org.osgi.core_1.0.0.jar
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/lib/org.osgi.core_1.0.0.jar:443187-720930
/qpid/branches/java-broker-0-10/qpid/java/lib/org.osgi.core_1.0.0.jar:795950-829653
/qpid/branches/java-network-refactor/qpid/java/lib/org.osgi.core_1.0.0.jar:805429-821809
-/qpid/trunk/qpid/java/lib/org.osgi.core_1.0.0.jar:919043-926606
+/qpid/trunk/qpid/java/lib/org.osgi.core_1.0.0.jar:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/management/client/src/main/java/org/apache/qpid/management/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management:443187-703176
/qpid/branches/java-broker-0-10/qpid/java/management/client/src/main/java/org/apache/qpid/management:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/client/src/main/java/org/apache/qpid/management:805429-821809
-/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management:919043-926606
+/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/management/client/src/test/java/org/apache/qpid/management/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management:443187-703176
/qpid/branches/java-broker-0-10/qpid/java/management/client/src/test/java/org/apache/qpid/management:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/client/src/test/java/org/apache/qpid/management:805429-821809
-/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management:919043-926606
+/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java:805429-821809
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagement.java:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
-/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java:919043-926606
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:805429-821809
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagement.java:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
-/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:919043-926606
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:805429-821809
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
-/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:919043-926606
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:805429-821809
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedConnection.java:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
-/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:919043-926606
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:805429-821809
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
-/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:919043-926606
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:805429-821809
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ManagedQueue.java:753219-753220,753253,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
-/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:919043-926606
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:805429-821809
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/UserManagement.java:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
-/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:919043-926606
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:805429-821809
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanAttribute.java:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
-/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:919043-926606
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:805429-821809
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanConstructor.java:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
-/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:919043-926606
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:805429-821809
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanDescription.java:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
-/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:919043-926606
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:805429-821809
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanOperation.java:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
-/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:919043-926606
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:805429-821809
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanOperationParameter.java:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
-/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:919043-926606
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/management/eclipse-plugin/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/eclipse-plugin/src:805429-821809
/qpid/branches/jmx_mc_gsoc09/qpid/java/management/eclipse-plugin/src:788755
-/qpid/trunk/qpid/java/management/eclipse-plugin/src:919043-926606
+/qpid/trunk/qpid/java/management/eclipse-plugin/src:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:805429-821809
-/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:919043-926606
+/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:805429-821809
-/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:919043-926606
+/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:805429-821809
-/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:919043-926606
+/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:805429-821809
-/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:919043-926606
+/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:805429-821809
-/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:919043-926606
+/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java:443187-707694
/qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java:805429-821809
-/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java:919043-926606
+/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/08StandaloneExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/08StandaloneExcludes:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/08StandaloneExcludes:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/08StandaloneExcludes:805429-821809
-/qpid/trunk/qpid/java/test-profiles/08StandaloneExcludes:919043-926606
+/qpid/trunk/qpid/java/test-profiles/08StandaloneExcludes:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/CPPExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/010Excludes:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/010Excludes:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/010Excludes:805429-821809
-/qpid/trunk/qpid/java/test-profiles/CPPExcludes:919043-926606
+/qpid/trunk/qpid/java/test-profiles/CPPExcludes:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/Excludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/Excludes:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/Excludes:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/Excludes:805429-821809
-/qpid/trunk/qpid/java/test-profiles/Excludes:919043-926606
+/qpid/trunk/qpid/java/test-profiles/Excludes:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/JavaExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/08Excludes:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/08Excludes:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/08Excludes:805429-821809
-/qpid/trunk/qpid/java/test-profiles/JavaExcludes:919043-926606
+/qpid/trunk/qpid/java/test-profiles/JavaExcludes:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/JavaStandaloneExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/08StandaloneExcludes:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/08StandaloneExcludes:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/08StandaloneExcludes:805429-821809
-/qpid/trunk/qpid/java/test-profiles/JavaStandaloneExcludes:919043-926606
+/qpid/trunk/qpid/java/test-profiles/JavaStandaloneExcludes:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/JavaTransientExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/08TransientExcludes:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/08TransientExcludes:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/08TransientExcludes:805429-821809
-/qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:919043-926606
+/qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/XAExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/XAExcludes:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/XAExcludes:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/XAExcludes:805429-821809
-/qpid/trunk/qpid/java/test-profiles/XAExcludes:919043-926606
+/qpid/trunk/qpid/java/test-profiles/XAExcludes:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/clean-dir
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/clean-dir:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/clean-dir:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/clean-dir:805429-821809
-/qpid/trunk/qpid/java/test-profiles/clean-dir:919043-926606
+/qpid/trunk/qpid/java/test-profiles/clean-dir:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/cpp.async.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.async.testprofile:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.async.testprofile:805429-821809
-/qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:919043-926606
+/qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/cpp.cluster.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.cluster.testprofile:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.cluster.testprofile:805429-821809
-/qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:919043-926606
+/qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/cpp.noprefetch.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.noprefetch.testprofile:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.noprefetch.testprofile:805429-821809
-/qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:919043-926606
+/qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/cpp.ssl.excludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.ssl.excludes:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.ssl.excludes:805429-821809
-/qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:919043-926606
+/qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/cpp.ssl.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.ssl.testprofile:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.ssl.testprofile:805429-821809
-/qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:919043-926606
+/qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/cpp.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/cpp.testprofile:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.testprofile:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.testprofile:805429-821809
-/qpid/trunk/qpid/java/test-profiles/cpp.testprofile:919043-926606
+/qpid/trunk/qpid/java/test-profiles/cpp.testprofile:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/default.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/default.testprofile:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/default.testprofile:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/default.testprofile:805429-821809
-/qpid/trunk/qpid/java/test-profiles/default.testprofile:919043-926606
+/qpid/trunk/qpid/java/test-profiles/default.testprofile:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/java-derby.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/java-derby.testprofile:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/java-derby.testprofile:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/java-derby.testprofile:805429-821809
-/qpid/trunk/qpid/java/test-profiles/java-derby.testprofile:919043-926606
+/qpid/trunk/qpid/java/test-profiles/java-derby.testprofile:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/java.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/java.testprofile:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/java.testprofile:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/java.testprofile:805429-821809
-/qpid/trunk/qpid/java/test-profiles/java.testprofile:919043-926606
+/qpid/trunk/qpid/java/test-profiles/java.testprofile:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/log4j-test.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/log4j-test.xml:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/log4j-test.xml:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/log4j-test.xml:805429-821809
-/qpid/trunk/qpid/java/test-profiles/log4j-test.xml:919043-926606
+/qpid/trunk/qpid/java/test-profiles/log4j-test.xml:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/test-provider.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/test-provider.properties:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/test-provider.properties:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/test-provider.properties:805429-821809
-/qpid/trunk/qpid/java/test-profiles/test-provider.properties:919043-926606
+/qpid/trunk/qpid/java/test-profiles/test-provider.properties:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/test_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/test_resources:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/test_resources:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/test_resources:805429-821809
-/qpid/trunk/qpid/java/test-profiles/test_resources:919043-926606
+/qpid/trunk/qpid/java/test-profiles/test_resources:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/python/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,4 +1,4 @@
/qpid/branches/0.5.x-dev/qpid/python:892761,894875
/qpid/branches/java-network-refactor/qpid/python:805429-825319
/qpid/branches/qmfv2/qpid/python:902858,902894
-/qpid/trunk/qpid/python:919043-926606
+/qpid/trunk/qpid/python:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/python/examples/api/spout
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,3 +1,3 @@
/qpid/branches/qmfv2/qpid/python/examples/api/spout:902858,902894
/qpid/branches/qpid.rnr/python/examples/api/spout:894071-896158
-/qpid/trunk/qpid/python/examples/api/spout:919043-926606
+/qpid/trunk/qpid/python/examples/api/spout:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/python/qpid/concurrency.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,3 +1,3 @@
/qpid/branches/qmfv2/qpid/python/qpid/concurrency.py:902858,902894
/qpid/branches/qpid.rnr/python/qpid/concurrency.py:894071-896158
-/qpid/trunk/qpid/python/qpid/concurrency.py:919043-926606
+/qpid/trunk/qpid/python/qpid/concurrency.py:919043-926753
Modified: qpid/branches/qmf-devel0.7a/qpid/python/qpid/messaging/message.py
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/python/qpid/messaging/message.py?rev=926759&r1=926758&r2=926759&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/python/qpid/messaging/message.py (original)
+++ qpid/branches/qmf-devel0.7a/qpid/python/qpid/messaging/message.py Tue Mar 23 20:07:01 2010
@@ -47,20 +47,22 @@ TYPE_MAPPINGS={
None.__class__: None
}
+DEFAULT_CODEC = (lambda x: x, lambda x: x)
+
TYPE_CODEC={
"amqp/map": codec("map"),
"amqp/list": codec("list"),
"text/plain; charset=utf8": (lambda x: x.encode("utf8"), lambda x: x.decode("utf8")),
"text/plain": (lambda x: x.encode("utf8"), lambda x: x.decode("utf8")),
- "": (lambda x: x, lambda x: x),
- None: (lambda x: x, lambda x: x)
+ "": DEFAULT_CODEC,
+ None: DEFAULT_CODEC
}
def get_type(content):
return TYPE_MAPPINGS[content.__class__]
def get_codec(content_type):
- return TYPE_CODEC[content_type]
+ return TYPE_CODEC.get(content_type, DEFAULT_CODEC)
UNSPECIFIED = object()
Modified: qpid/branches/qmf-devel0.7a/qpid/python/qpid/tests/messaging/message.py
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/python/qpid/tests/messaging/message.py?rev=926759&r1=926758&r2=926759&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/python/qpid/tests/messaging/message.py (original)
+++ qpid/branches/qmf-devel0.7a/qpid/python/qpid/tests/messaging/message.py Tue Mar 23 20:07:01 2010
@@ -107,3 +107,7 @@ class MessageEchoTests(Base):
msg.properties = MessageEchoTests.TEST_MAP
msg.reply_to = "reply-address"
self.check(msg)
+
+ def testContentTypeUnknown(self):
+ msg = Message(content_type = "this-content-type-does-not-exist")
+ self.check(msg)
Propchange: qpid/branches/qmf-devel0.7a/qpid/ruby/ext/sasl/extconf.rb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1 +1 @@
-/qpid/trunk/qpid/ruby/ext/sasl/extconf.rb:919043-926606
+/qpid/trunk/qpid/ruby/ext/sasl/extconf.rb:919043-926753
Propchange: qpid/branches/qmf-devel0.7a/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 20:07:01 2010
@@ -1,3 +1,3 @@
/qpid/branches/qmfv2/qpid/python/tests_0-9/queue.py:902858,902894
/qpid/branches/qpid.rnr/python/tests_0-9/queue.py:894071-896158
-/qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py:919043-926606
+/qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py:919043-926753
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org