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 2011/02/19 14:51:07 UTC
svn commit: r1072330 [1/2] - in /qpid/branches/qpid-2935/qpid: ./ cpp/
cpp/bindings/qpid/ cpp/bindings/qpid/dotnet/
cpp/bindings/qpid/examples/perl/ cpp/bindings/qpid/perl/
cpp/bindings/qpid/python/ cpp/bindings/qpid/ruby/ cpp/examples/tradedemo/
cpp/i...
Author: kgiusti
Date: Sat Feb 19 13:51:04 2011
New Revision: 1072330
URL: http://svn.apache.org/viewvc?rev=1072330&view=rev
Log:
QPID-2935: merge latest trunk
Added:
qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/CMakeLists.txt
- copied unchanged from r1072326, qpid/trunk/qpid/cpp/bindings/qpid/CMakeLists.txt
qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sessionreceiver.sln
- copied unchanged from r1072326, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sessionreceiver.sln
qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/perl/CMakeLists.txt
- copied unchanged from r1072326, qpid/trunk/qpid/cpp/bindings/qpid/perl/CMakeLists.txt
qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/python/CMakeLists.txt
- copied unchanged from r1072326, qpid/trunk/qpid/cpp/bindings/qpid/python/CMakeLists.txt
qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
- copied unchanged from r1072326, qpid/trunk/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
qpid/branches/qpid-2935/qpid/doc/dev-readme/QPID-Component-README.odg
- copied unchanged from r1072326, qpid/trunk/qpid/doc/dev-readme/QPID-Component-README.odg
qpid/branches/qpid-2935/qpid/doc/dev-readme/QPID-Component-README.pdf
- copied unchanged from r1072326, qpid/trunk/qpid/doc/dev-readme/QPID-Component-README.pdf
Removed:
qpid/branches/qpid-2935/qpid/doc/dev-readme/QPID-0.8-Component-README.odg
qpid/branches/qpid-2935/qpid/doc/dev-readme/QPID-0.8-Component-README.pdf
Modified:
qpid/branches/qpid-2935/qpid/ (props changed)
qpid/branches/qpid-2935/qpid/cpp/CMakeLists.txt
qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/dotnet/Makefile.am (contents, props changed)
qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sln (props changed)
qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/client.pl
qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/drain.pl
qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/hello_world.pl
qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/hello_xml.pl
qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/map_receiver.pl
qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/map_sender.pl
qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/server.pl
qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/spout.pl
qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/perl/Makefile.am
qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/perl/perl.i
qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/qpid.i
qpid/branches/qpid-2935/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj (props changed)
qpid/branches/qpid-2935/qpid/cpp/include/qmf/engine/Agent.h (props changed)
qpid/branches/qpid-2935/qpid/cpp/include/qmf/engine/Console.h (props changed)
qpid/branches/qpid-2935/qpid/cpp/src/CMakeLists.txt (contents, props changed)
qpid/branches/qpid-2935/qpid/cpp/src/Makefile.am
qpid/branches/qpid-2935/qpid/cpp/src/qmf/engine/Agent.cpp (props changed)
qpid/branches/qpid-2935/qpid/cpp/src/qpid/cluster/UpdateClient.cpp (props changed)
qpid/branches/qpid-2935/qpid/cpp/src/qpid/cluster/UpdateClient.h (props changed)
qpid/branches/qpid-2935/qpid/cpp/src/qpid/management/ManagementAgent.cpp (contents, props changed)
qpid/branches/qpid-2935/qpid/cpp/src/qpid/management/ManagementAgent.h (contents, props changed)
qpid/branches/qpid-2935/qpid/cpp/src/tests/MessagingFixture.h
qpid/branches/qpid-2935/qpid/cpp/src/tests/MessagingSessionTests.cpp
qpid/branches/qpid-2935/qpid/cpp/src/tests/QueueTest.cpp
qpid/branches/qpid-2935/qpid/cpp/src/tests/cluster_tests.py (props changed)
qpid/branches/qpid-2935/qpid/cpp/src/tests/qpid-ctrl
qpid/branches/qpid-2935/qpid/cpp/src/tests/sender.cpp
qpid/branches/qpid-2935/qpid/dotnet/build-msbuild.bat (props changed)
qpid/branches/qpid-2935/qpid/dotnet/build-nant-release (props changed)
qpid/branches/qpid-2935/qpid/dotnet/build-nant.bat (props changed)
qpid/branches/qpid-2935/qpid/java/ (props changed)
qpid/branches/qpid-2935/qpid/java/broker/ (props changed)
qpid/branches/qpid-2935/qpid/java/broker/bin/ (props changed)
qpid/branches/qpid-2935/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
qpid/branches/qpid-2935/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/CurrentActor.java
qpid/branches/qpid-2935/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ (props changed)
qpid/branches/qpid-2935/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ (props changed)
qpid/branches/qpid-2935/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ (props changed)
qpid/branches/qpid-2935/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
qpid/branches/qpid-2935/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
qpid/branches/qpid-2935/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
qpid/branches/qpid-2935/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/Binary.java
qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java
qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java
qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/BBDecoder.java
qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java
qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java
qpid/branches/qpid-2935/qpid/java/management/client/src/main/java/org/apache/qpid/management/ (props changed)
qpid/branches/qpid-2935/qpid/java/management/client/src/test/java/org/apache/qpid/management/ (props changed)
qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java (props changed)
qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java (props changed)
qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (props changed)
qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (props changed)
qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (props changed)
qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (props changed)
qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java (props changed)
qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java (props changed)
qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java (props changed)
qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java (props changed)
qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java (props changed)
qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java (props changed)
qpid/branches/qpid-2935/qpid/java/management/eclipse-plugin/src/ (props changed)
qpid/branches/qpid-2935/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java (props changed)
qpid/branches/qpid-2935/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java (props changed)
qpid/branches/qpid-2935/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java (props changed)
qpid/branches/qpid-2935/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java (props changed)
qpid/branches/qpid-2935/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc (props changed)
qpid/branches/qpid-2935/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java (props changed)
qpid/branches/qpid-2935/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java
qpid/branches/qpid-2935/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
qpid/branches/qpid-2935/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java
qpid/branches/qpid-2935/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (props changed)
qpid/branches/qpid-2935/qpid/java/test-profiles/ (props changed)
qpid/branches/qpid-2935/qpid/java/test-profiles/08StandaloneExcludes (props changed)
qpid/branches/qpid-2935/qpid/java/test-profiles/CPPExcludes (props changed)
qpid/branches/qpid-2935/qpid/java/test-profiles/Excludes (props changed)
qpid/branches/qpid-2935/qpid/java/test-profiles/JavaExcludes (props changed)
qpid/branches/qpid-2935/qpid/java/test-profiles/JavaStandaloneExcludes (props changed)
qpid/branches/qpid-2935/qpid/java/test-profiles/JavaTransientExcludes (props changed)
qpid/branches/qpid-2935/qpid/java/test-profiles/XAExcludes (props changed)
qpid/branches/qpid-2935/qpid/java/test-profiles/clean-dir (props changed)
qpid/branches/qpid-2935/qpid/java/test-profiles/cpp.async.testprofile (props changed)
qpid/branches/qpid-2935/qpid/java/test-profiles/cpp.cluster.testprofile (props changed)
qpid/branches/qpid-2935/qpid/java/test-profiles/cpp.noprefetch.testprofile (props changed)
qpid/branches/qpid-2935/qpid/java/test-profiles/cpp.ssl.excludes (props changed)
qpid/branches/qpid-2935/qpid/java/test-profiles/cpp.ssl.testprofile (props changed)
qpid/branches/qpid-2935/qpid/java/test-profiles/cpp.testprofile (props changed)
qpid/branches/qpid-2935/qpid/java/test-profiles/default.testprofile (props changed)
qpid/branches/qpid-2935/qpid/java/test-profiles/java-derby.testprofile (props changed)
qpid/branches/qpid-2935/qpid/java/test-profiles/java.testprofile (props changed)
qpid/branches/qpid-2935/qpid/java/test-profiles/log4j-test.xml (props changed)
qpid/branches/qpid-2935/qpid/java/test-profiles/test-provider.properties (props changed)
qpid/branches/qpid-2935/qpid/java/test-profiles/test_resources/ (props changed)
qpid/branches/qpid-2935/qpid/packaging/windows/ (props changed)
qpid/branches/qpid-2935/qpid/packaging/windows/INSTALL_NOTES.html
qpid/branches/qpid-2935/qpid/packaging/windows/installer.proj
qpid/branches/qpid-2935/qpid/packaging/windows/qpidc.wxs
qpid/branches/qpid-2935/qpid/python/ (props changed)
qpid/branches/qpid-2935/qpid/python/examples/api/spout (props changed)
qpid/branches/qpid-2935/qpid/python/qpid/concurrency.py (props changed)
qpid/branches/qpid-2935/qpid/ruby/ext/sasl/extconf.rb (props changed)
qpid/branches/qpid-2935/qpid/specs/management-schema.xml
qpid/branches/qpid-2935/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py (props changed)
Propchange: qpid/branches/qpid-2935/qpid/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 13:51:04 2011
@@ -2,4 +2,4 @@
/qpid/branches/0.6-release-windows-installer:926803
/qpid/branches/0.6-release-windows-installer/qpid:926803,927233
/qpid/branches/java-network-refactor/qpid:805429-825319
-/qpid/trunk/qpid:1061302-1071383
+/qpid/trunk/qpid:1061302-1072326
Modified: qpid/branches/qpid-2935/qpid/cpp/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/cpp/CMakeLists.txt?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/cpp/CMakeLists.txt (original)
+++ qpid/branches/qpid-2935/qpid/cpp/CMakeLists.txt Sat Feb 19 13:51:04 2011
@@ -80,6 +80,7 @@ set(CPACK_PACKAGE_INSTALL_DIRECTORY "qpi
add_subdirectory(managementgen)
add_subdirectory(etc)
add_subdirectory(src)
+add_subdirectory(bindings/qpid)
add_subdirectory(docs/api)
# add_subdirectory(docs/man)
add_subdirectory(examples)
Modified: qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/dotnet/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/dotnet/Makefile.am?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/dotnet/Makefile.am (original)
+++ qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/dotnet/Makefile.am Sat Feb 19 13:51:04 2011
@@ -81,6 +81,7 @@ EXTRA_DIST = winsdk_sources/winsdk_dotne
configure-windows.ps1 \
ReadMe.txt \
org.apache.qpid.messaging.sln \
+ org.apache.qpid.messaging.sessionreceiver.sln \
test/messaging.test/messaging.test.address.cs \
test/messaging.test/messaging.test.duration.cs \
test/messaging.test/messaging.test.cs \
Propchange: qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/dotnet/Makefile.am
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sln
------------------------------------------------------------------------------
svn:eol-style = CRLF
Modified: qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/client.pl
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/client.pl?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/client.pl (original)
+++ qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/client.pl Sat Feb 19 13:51:04 2011
@@ -20,13 +20,13 @@
use strict;
use warnings;
-use cqpid;
+use cqpid_perl;
my $url = ( @ARGV == 1 ) ? $ARGV[0] : "amqp:tcp:127.0.0.1:5672";
my $connectionOptions = ( @ARGV > 1 ) ? $ARGV[1] : "";
-my $connection = new cqpid::Connection($url, $connectionOptions);
+my $connection = new cqpid_perl::Connection($url, $connectionOptions);
eval {
$connection->open();
@@ -35,7 +35,7 @@ my $session = $connection->createSession
my $sender = $session->createSender("service_queue");
#create temp queue & receiver...
-my $responseQueue = new cqpid::Address("#response-queue; {create:always, delete:always}");
+my $responseQueue = new cqpid_perl::Address("#response-queue; {create:always, delete:always}");
my $receiver = $session->createReceiver($responseQueue);
#Now send some messages...
@@ -47,7 +47,7 @@ my @s = (
"And the mome raths outgrabe."
);
-my $request = new cqpid::Message();
+my $request = new cqpid_perl::Message();
$request->setReplyTo($responseQueue);
for (my $i=0; $i<4; $i++) {
$request->setContent($s[$i]);
Modified: qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/drain.pl
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/drain.pl?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/drain.pl (original)
+++ qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/drain.pl Sat Feb 19 13:51:04 2011
@@ -20,7 +20,7 @@
use strict;
use warnings;
-use cqpid;
+use cqpid_perl;
use Getopt::Long;
my $url = "127.0.0.1";
@@ -47,11 +47,11 @@ if ($#ARGV ge 0) {
}
sub getTimeout {
- return ($forever) ? $cqpid::Duration::FOREVER : new cqpid::Duration($timeout*1000);
+ return ($forever) ? $cqpid_perl::Duration::FOREVER : new cqpid_perl::Duration($timeout*1000);
}
-my $connection = new cqpid::Connection($url, $connectionOptions);
+my $connection = new cqpid_perl::Connection($url, $connectionOptions);
eval {
$connection->open();
@@ -59,13 +59,13 @@ eval {
my $receiver = $session->createReceiver($address);
my $timeout = getTimeout();
- my $message = new cqpid::Message();
+ my $message = new cqpid_perl::Message();
my $i = 0;
while($receiver->fetch($message, $timeout)) {
print "Message(properties=" . $message->getProperties() . ",content='";
if ($message->getContentType() eq "amqp/map") {
- my $content = cqpid::decodeMap($message);
+ my $content = cqpid_perl::decodeMap($message);
map{ print "\n$_ => $content->{$_}"; } keys %{$content};
}
else {
@@ -77,7 +77,7 @@ eval {
if ($replyto->getName()) {
print "Replying to " . $message->getReplyTo()->str() . "...\n";
my $sender = $session->createSender($replyto);
- my $response = new cqpid::Message("received by the server.");
+ my $response = new cqpid_perl::Message("received by the server.");
$sender->send($response);
}
$session->acknowledge();
Modified: qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/hello_world.pl
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/hello_world.pl?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/hello_world.pl (original)
+++ qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/hello_world.pl Sat Feb 19 13:51:04 2011
@@ -21,13 +21,13 @@ use strict;
use warnings;
use Data::Dumper;
-use cqpid;
+use cqpid_perl;
my $broker = ( @ARGV > 0 ) ? $ARGV[0] : "localhost:5672";
my $address = ( @ARGV > 1 ) ? $ARGV[0] : "amq.topic";
my $connectionOptions = ( @ARGV > 2 ) ? $ARGV[1] : "";
-my $connection = new cqpid::Connection($broker, $connectionOptions);
+my $connection = new cqpid_perl::Connection($broker, $connectionOptions);
eval {
$connection->open();
@@ -36,12 +36,12 @@ eval {
my $receiver = $session->createReceiver($address);
my $sender = $session->createSender($address);
- $sender->send(new cqpid::Message("Hello world!"));
+ $sender->send(new cqpid_perl::Message("Hello world!"));
- #my $duration = new cqpid::Duration(1000);
+ #my $duration = new cqpid_perl::Duration(1000);
#print ">>>" . $duration->getMilliseconds() . "\n";
- my $message = $receiver->fetch($cqpid::Duration::SECOND);
+ my $message = $receiver->fetch($cqpid_perl::Duration::SECOND);
#$message->setDurable(1);
#print "Durable: " . $message->getDurable() . "\n";
Modified: qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/hello_xml.pl
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/hello_xml.pl?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/hello_xml.pl (original)
+++ qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/hello_xml.pl Sat Feb 19 13:51:04 2011
@@ -20,7 +20,7 @@
use strict;
use warnings;
-use cqpid;
+use cqpid_perl;
my $broker = ( @ARGV > 0 ) ? $ARGV[0] : "localhost:5672";
my $connectionOptions = ( @ARGV > 1 ) ? $ARGV[1] : "";
@@ -44,7 +44,7 @@ x-bindings: [{ exchange: xml-exchange, k
END
-my $connection = new cqpid::Connection($broker, $connectionOptions);
+my $connection = new cqpid_perl::Connection($broker, $connectionOptions);
eval {
$connection->open();
@@ -52,7 +52,7 @@ eval {
my $receiver = $session->createReceiver($address);
- my $message = new cqpid::Message();
+ my $message = new cqpid_perl::Message();
my $content = <<END;
<weather>
Modified: qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/map_receiver.pl
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/map_receiver.pl?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/map_receiver.pl (original)
+++ qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/map_receiver.pl Sat Feb 19 13:51:04 2011
@@ -21,21 +21,21 @@ use strict;
use warnings;
use Data::Dumper;
-use cqpid;
+use cqpid_perl;
my $url = ( @ARGV > 0 ) ? $ARGV[0] : "amqp:tcp:127.0.0.1:5672";
my $address = ( @ARGV > 1 ) ? $ARGV[0] : "message_queue; {create: always}";
my $connectionOptions = ( @ARGV > 2 ) ? $ARGV[1] : "";
-my $connection = new cqpid::Connection($url, $connectionOptions);
+my $connection = new cqpid_perl::Connection($url, $connectionOptions);
eval {
$connection->open();
my $session = $connection->createSession();
my $receiver = $session->createReceiver($address);
- my $content = cqpid::decodeMap($receiver->fetch());
- #my $content = cqpid::decodeList($receiver->fetch());
+ my $content = cqpid_perl::decodeMap($receiver->fetch());
+ #my $content = cqpid_perl::decodeList($receiver->fetch());
print Dumper($content);
Modified: qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/map_sender.pl
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/map_sender.pl?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/map_sender.pl (original)
+++ qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/map_sender.pl Sat Feb 19 13:51:04 2011
@@ -21,13 +21,13 @@ use strict;
use warnings;
use Data::Dumper;
-use cqpid;
+use cqpid_perl;
my $url = ( @ARGV > 0 ) ? $ARGV[0] : "amqp:tcp:127.0.0.1:5672";
my $address = ( @ARGV > 1 ) ? $ARGV[1] : "message_queue; {create: always}";
my $connectionOptions = ( @ARGV > 2 ) ? $ARGV[2] : "";
-my $connection = new cqpid::Connection($url, $connectionOptions);
+my $connection = new cqpid_perl::Connection($url, $connectionOptions);
eval {
$connection->open();
@@ -35,13 +35,13 @@ eval {
my $session = $connection->createSession();
my $sender = $session->createSender($address);
- my $message = new cqpid::Message();
+ my $message = new cqpid_perl::Message();
my $content = { id => 987654321,
name => "Widget",
percent => sprintf("%.2f", 0.99),
colours => [ qw (red green white) ],
};
- cqpid::encode($content, $message);
+ cqpid_perl::encode($content, $message);
$sender->send($message, 1);
$connection->close();
Modified: qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/server.pl
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/server.pl?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/server.pl (original)
+++ qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/server.pl Sat Feb 19 13:51:04 2011
@@ -20,13 +20,13 @@
use strict;
use warnings;
-use cqpid;
+use cqpid_perl;
my $url = ( @ARGV == 1 ) ? $ARGV[0] : "amqp:tcp:127.0.0.1:5672";
my $connectionOptions = ( @ARGV > 1 ) ? $ARGV[1] : "";
-my $connection = new cqpid::Connection($url, $connectionOptions);
+my $connection = new cqpid_perl::Connection($url, $connectionOptions);
eval {
$connection->open();
@@ -41,7 +41,7 @@ eval {
my $sender = $session->createSender($address);
my $s = $request->getContent();
$s = uc($s);
- my $response = new cqpid::Message($s);
+ my $response = new cqpid_perl::Message($s);
$sender->send($response);
print "Processed request: " . $request->getContent() . " -> " . $response->getContent() . "\n";
$session->acknowledge();
Modified: qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/spout.pl
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/spout.pl?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/spout.pl (original)
+++ qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/examples/perl/spout.pl Sat Feb 19 13:51:04 2011
@@ -20,7 +20,7 @@
use strict;
use warnings;
-use cqpid;
+use cqpid_perl;
use Getopt::Long;
use Time::Local;
@@ -77,19 +77,19 @@ sub setProperties {
}
}
-my $connection = new cqpid::Connection($url, $connectionOptions);
+my $connection = new cqpid_perl::Connection($url, $connectionOptions);
eval {
$connection->open();
my $session = $connection->createSession();
my $sender = $session->createSender($address);
- my $message = new cqpid::Message();
+ my $message = new cqpid_perl::Message();
setProperties($message) if (@properties);
if (@entries) {
my $content = {};
setEntries($content);
- cqpid::encode($content, $message);
+ cqpid_perl::encode($content, $message);
}
elsif ($content) {
$message->setContent($content);
@@ -98,7 +98,7 @@ eval {
my $receiver;
if ($replyto) {
- my $responseQueue = new cqpid::Address($replyto);
+ my $responseQueue = new cqpid_perl::Address($replyto);
$receiver = $session->createReceiver($responseQueue);
$message->setReplyTo($responseQueue);
}
Modified: qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/perl/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/perl/Makefile.am?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/perl/Makefile.am (original)
+++ qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/perl/Makefile.am Sat Feb 19 13:51:04 2011
@@ -22,21 +22,21 @@ if HAVE_PERL_DEVEL
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src -I$(PERL_INC)
EXTRA_DIST = perl.i
-BUILT_SOURCES = cqpid.cpp
+BUILT_SOURCES = cqpid_perl.cpp
SWIG_FLAGS = -w362,401
-cqpid.cpp: $(srcdir)/perl.i $(srcdir)/../qpid.i $(srcdir)/../../swig_perl_typemaps.i
- $(SWIG) -perl -c++ $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o cqpid.cpp $(srcdir)/perl.i
+cqpid_perl.cpp: $(srcdir)/perl.i $(srcdir)/../qpid.i $(srcdir)/../../swig_perl_typemaps.i
+ $(SWIG) -perl -c++ $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o cqpid_perl.cpp $(srcdir)/perl.i
-lib_LTLIBRARIES = cqpid.la
-cqpid_PERL = cqpid.pm
+lib_LTLIBRARIES = libcqpid_perl.la
+cqpid_perl_PERL = cqpid_perl.pm
-cqpid_la_LDFLAGS = -avoid-version -module -shared
-cqpid_la_LIBADD = -L$(top_builddir)/src/.libs -lqpidmessaging -lqpidtypes \
+libcqpid_perl_la_LDFLAGS = -avoid-version -shared
+libcqpid_perl_la_LIBADD = -L$(top_builddir)/src/.libs -lqpidmessaging -lqpidtypes \
$(top_builddir)/src/libqpidmessaging.la $(top_builddir)/src/libqpidtypes.la
-cqpid_la_CXXFLAGS = $(INCLUDES)
-nodist_cqpid_la_SOURCES = cqpid.cpp
+libcqpid_perl_la_CXXFLAGS = $(INCLUDES)
+nodist_libcqpid_perl_la_SOURCES = cqpid_perl.cpp
-CLEANFILES = cqpid.cpp cqpid.pm
+CLEANFILES = cqpid_perl.cpp cqpid_perl.pm
endif # HAVE_PERL_DEVEL
Modified: qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/perl/perl.i
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/perl/perl.i?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/perl/perl.i (original)
+++ qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/perl/perl.i Sat Feb 19 13:51:04 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-%module cqpid
+%module cqpid_perl
%include "std_string.i"
%include "../../swig_perl_typemaps.i"
Modified: qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/qpid.i
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/qpid.i?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/qpid.i (original)
+++ qpid/branches/qpid-2935/qpid/cpp/bindings/qpid/qpid.i Sat Feb 19 13:51:04 2011
@@ -27,6 +27,7 @@
#include <qpid/messaging/Sender.h>
#include <qpid/messaging/Message.h>
#include <qpid/messaging/Duration.h>
+#include <qpid/messaging/FailoverUpdates.h>
//
// Wrapper functions for map-decode and list-decode. This allows us to avoid
@@ -56,6 +57,7 @@ qpid::types::Variant::List& decodeList(c
%include <qpid/messaging/Sender.h>
%include <qpid/messaging/Session.h>
%include <qpid/messaging/Connection.h>
+%include <qpid/messaging/FailoverUpdates.h>
qpid::types::Variant::Map& decodeMap(const qpid::messaging::Message&);
qpid::types::Variant::List& decodeList(const qpid::messaging::Message&);
Propchange: qpid/branches/qpid-2935/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 13:51:04 2011
@@ -2,4 +2,4 @@
/qpid/branches/0.6-release-windows-installer/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj:926803
/qpid/branches/0.6-release-windows-installer/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj:926803,927218,927233
/qpid/branches/java-network-refactor/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj:805429-825319
-/qpid/trunk/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj:1061302-1071383
+/qpid/trunk/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj:1061302-1072326
Propchange: qpid/branches/qpid-2935/qpid/cpp/include/qmf/engine/Agent.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 13:51:04 2011
@@ -1 +1 @@
-/qpid/trunk/qpid/cpp/include/qmf/engine/Agent.h:1061302-1071383
+/qpid/trunk/qpid/cpp/include/qmf/engine/Agent.h:1061302-1072326
Propchange: qpid/branches/qpid-2935/qpid/cpp/include/qmf/engine/Console.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 13:51:04 2011
@@ -1 +1 @@
-/qpid/trunk/qpid/cpp/include/qmf/engine/Console.h:1061302-1071383
+/qpid/trunk/qpid/cpp/include/qmf/engine/Console.h:1061302-1072326
Modified: qpid/branches/qpid-2935/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/cpp/src/CMakeLists.txt?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/branches/qpid-2935/qpid/cpp/src/CMakeLists.txt Sat Feb 19 13:51:04 2011
@@ -313,10 +313,6 @@ if (NOT Boost_FILESYSTEM_LIBRARY)
set(Boost_FILESYSTEM_LIBRARY boost_filesystem)
endif (NOT Boost_FILESYSTEM_LIBRARY)
-if (NOT Boost_SYSTEM_LIBRARY)
- set(Boost_SYSTEM_LIBRARY boost_system)
-endif (NOT Boost_SYSTEM_LIBRARY)
-
if (NOT Boost_UNIT_TEST_FRAMEWORK_LIBRARY)
set(Boost_UNIT_TEST_FRAMEWORK_LIBRARY boost_unit_test_framework)
endif (NOT Boost_UNIT_TEST_FRAMEWORK_LIBRARY)
@@ -602,14 +598,14 @@ if (CMAKE_SYSTEM_NAME STREQUAL Windows)
set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD /O2 /Ob2 /D NDEBUG")
set (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "/debug /INCREMENTAL:NO")
- # Set the windows version for the .NET Binding cpp project
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc
- ${CMAKE_CURRENT_BINARY_DIR}/windows/resources/org.apache.qpid.messaging.rc)
-
- # Set the windows version for the .NET Binding sessionreceiver project
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../bindings/qpid/dotnet/src/sessionreceiver/properties/sessionreceiver-AssemblyInfo-template.cs
- ${CMAKE_CURRENT_BINARY_DIR}/windows/generated_src/sessionreceiver-AssemblyInfo.cs)
-
+ if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../bindings/qpid/dotnet/src)
+ # Set the windows version for the .NET Binding cpp project
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc
+ ${CMAKE_CURRENT_BINARY_DIR}/windows/resources/org.apache.qpid.messaging.rc)
+ # Set the windows version for the .NET Binding sessionreceiver project
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../bindings/qpid/dotnet/src/sessionreceiver/properties/sessionreceiver-AssemblyInfo-template.cs
+ ${CMAKE_CURRENT_BINARY_DIR}/windows/generated_src/sessionreceiver-AssemblyInfo.cs)
+ endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../bindings/qpid/dotnet/src)
endif (MSVC)
set (qpidtypes_platform_SOURCES
@@ -1068,13 +1064,15 @@ endif (CPACK_GENERATOR STREQUAL "NSIS")
# REVISION => Version of underlying implementation.
# Bump if implementation changes but API/ABI doesn't
# AGE => Number of API/ABI versions this is backward compatible with
-set (qmf_version 1.0.0)
+set (qmf_version 2.0.0)
+set (qmf2_version 1.0.0)
set (qmfengine_version 1.0.0)
set (qmf_SOURCES
qpid/agent/ManagementAgentImpl.cpp
qpid/agent/ManagementAgentImpl.h
)
+
add_msvc_version (qmf library dll)
add_library (qmf SHARED ${qmf_SOURCES})
target_link_libraries (qmf qpidclient)
@@ -1085,6 +1083,83 @@ install (TARGETS qmf OPTIONAL
COMPONENT ${QPID_COMPONENT_QMF})
install_pdb (qmf ${QPID_COMPONENT_QMF})
+if(NOT WIN32)
+ set (qmf2_HEADERS
+ ../include/qmf/AgentEvent.h
+ ../include/qmf/Agent.h
+ ../include/qmf/AgentSession.h
+ ../include/qmf/ConsoleEvent.h
+ ../include/qmf/ConsoleSession.h
+ ../include/qmf/DataAddr.h
+ ../include/qmf/Data.h
+ ../include/qmf/exceptions.h
+ ../include/qmf/Handle.h
+ ../include/qmf/ImportExport.h
+ ../include/qmf/Query.h
+ ../include/qmf/Schema.h
+ ../include/qmf/SchemaId.h
+ ../include/qmf/SchemaMethod.h
+ ../include/qmf/SchemaProperty.h
+ ../include/qmf/SchemaTypes.h
+ ../include/qmf/Subscription.h
+ )
+
+ set (qmf2_SOURCES
+ ${qmf2_HEADERS}
+ qmf/agentCapability.h
+ qmf/Agent.cpp
+ qmf/AgentEvent.cpp
+ qmf/AgentEventImpl.h
+ qmf/AgentImpl.h
+ qmf/AgentSession.cpp
+ qmf/AgentSubscription.cpp
+ qmf/AgentSubscription.h
+ qmf/ConsoleEvent.cpp
+ qmf/ConsoleEventImpl.h
+ qmf/ConsoleSession.cpp
+ qmf/ConsoleSessionImpl.h
+ qmf/constants.cpp
+ qmf/constants.h
+ qmf/DataAddr.cpp
+ qmf/DataAddrImpl.h
+ qmf/Data.cpp
+ qmf/DataImpl.h
+ qmf/exceptions.cpp
+ qmf/Expression.cpp
+ qmf/Expression.h
+ qmf/Hash.cpp
+ qmf/Hash.h
+ qmf/PrivateImplRef.h
+ qmf/Query.cpp
+ qmf/QueryImpl.h
+ qmf/Schema.cpp
+ qmf/SchemaCache.cpp
+ qmf/SchemaCache.h
+ qmf/SchemaId.cpp
+ qmf/SchemaIdImpl.h
+ qmf/SchemaImpl.h
+ qmf/SchemaMethod.cpp
+ qmf/SchemaMethodImpl.h
+ qmf/SchemaProperty.cpp
+ qmf/SchemaPropertyImpl.h
+ qmf/Subscription.cpp
+ qmf/SubscriptionImpl.h
+ )
+
+ add_msvc_version (qmf2 library dll)
+ add_library (qmf2 SHARED ${qmf2_SOURCES})
+ target_link_libraries (qmf2 qpidmessaging qpidtypes qpidclient qpidcommon)
+ set_target_properties (qmf2 PROPERTIES
+ VERSION ${qmf2_version})
+ install (TARGETS qmf2 OPTIONAL
+ DESTINATION ${QPID_INSTALL_LIBDIR}
+ COMPONENT ${QPID_COMPONENT_QMF})
+ install (FILES ${qmf2_HEADERS}
+ DESTINATION ${QPID_INSTALL_INCLUDEDIR}/qmf
+ COMPONENT ${QPID_COMPONENT_QMF})
+ install_pdb (qmf2 ${QPID_COMPONENT_QMF})
+endif (NOT WIN32)
+
set (qmfengine_SOURCES
qmf/engine/Agent.cpp
qmf/engine/BrokerProxyImpl.cpp
Propchange: qpid/branches/qpid-2935/qpid/cpp/src/CMakeLists.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 13:51:04 2011
@@ -2,4 +2,4 @@
/qpid/branches/0.6-release-windows-installer/cpp/src/CMakeLists.txt:926803
/qpid/branches/0.6-release-windows-installer/qpid/cpp/src/CMakeLists.txt:926803,927233,932132
/qpid/branches/java-network-refactor/qpid/cpp/src/CMakeLists.txt:805429-825319
-/qpid/trunk/qpid/cpp/src/CMakeLists.txt:1061302-1071383
+/qpid/trunk/qpid/cpp/src/CMakeLists.txt:1061302-1072326
Modified: qpid/branches/qpid-2935/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/cpp/src/Makefile.am?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/cpp/src/Makefile.am (original)
+++ qpid/branches/qpid-2935/qpid/cpp/src/Makefile.am Sat Feb 19 13:51:04 2011
@@ -56,7 +56,10 @@ windows_dist = \
qpid/broker/windows/BrokerDefaults.cpp \
qpid/broker/windows/SaslAuthenticator.cpp \
qpid/broker/windows/SslProtocolFactory.cpp \
- qpid/messaging/HandleInstantiator.cpp
+ qpid/messaging/HandleInstantiator.cpp \
+ windows/resources/template-resource.rc \
+ windows/resources/version-resource.h \
+ windows/resources/qpid-icon.ico
EXTRA_DIST= $(platform_dist) $(rgen_srcs) $(windows_dist)
Propchange: qpid/branches/qpid-2935/qpid/cpp/src/qmf/engine/Agent.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 13:51:04 2011
@@ -1 +1 @@
-/qpid/trunk/qpid/cpp/src/qmf/engine/Agent.cpp:1061302-1071383
+/qpid/trunk/qpid/cpp/src/qmf/engine/Agent.cpp:1061302-1072326
Propchange: qpid/branches/qpid-2935/qpid/cpp/src/qpid/cluster/UpdateClient.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 13:51:04 2011
@@ -1 +1 @@
-/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.cpp:1061302-1071383
+/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.cpp:1061302-1072326
Propchange: qpid/branches/qpid-2935/qpid/cpp/src/qpid/cluster/UpdateClient.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 13:51:04 2011
@@ -1 +1 @@
-/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.h:1061302-1071383
+/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.h:1061302-1072326
Modified: qpid/branches/qpid-2935/qpid/cpp/src/qpid/management/ManagementAgent.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/cpp/src/qpid/management/ManagementAgent.cpp?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/cpp/src/qpid/management/ManagementAgent.cpp (original)
+++ qpid/branches/qpid-2935/qpid/cpp/src/qpid/management/ManagementAgent.cpp Sat Feb 19 13:51:04 2011
@@ -31,6 +31,7 @@
#include <qpid/broker/Message.h>
#include "qpid/framing/MessageTransferBody.h"
#include "qpid/sys/Time.h"
+#include "qpid/sys/Thread.h"
#include "qpid/broker/ConnectionState.h"
#include "qpid/broker/AclModule.h"
#include "qpid/types/Variant.h"
@@ -2237,6 +2238,7 @@ void ManagementAgent::dispatchAgentComma
uint32_t bufferLen = inBuffer.getPosition();
inBuffer.reset();
+ setManagementExecutionContext((const qpid::broker::ConnectionState*) msg.getPublisher());
const framing::FieldTable *headers = msg.getApplicationHeaders();
if (headers && msg.getAppId() == "qmf2")
{
@@ -3085,3 +3087,21 @@ bool ManagementAgent::moveDeletedObjects
}
return !deleteList.empty();
}
+
+namespace qpid {
+namespace management {
+
+namespace {
+QPID_TSS const qpid::broker::ConnectionState* executionContext = 0;
+}
+
+void setManagementExecutionContext(const qpid::broker::ConnectionState* ctxt)
+{
+ executionContext = ctxt;
+}
+const qpid::broker::ConnectionState* getManagementExecutionContext()
+{
+ return executionContext;
+}
+
+}}
Propchange: qpid/branches/qpid-2935/qpid/cpp/src/qpid/management/ManagementAgent.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 13:51:04 2011
@@ -1 +1 @@
-/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp:1061302-1071383
+/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp:1061302-1072326
Modified: qpid/branches/qpid-2935/qpid/cpp/src/qpid/management/ManagementAgent.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/cpp/src/qpid/management/ManagementAgent.h?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/cpp/src/qpid/management/ManagementAgent.h (original)
+++ qpid/branches/qpid-2935/qpid/cpp/src/qpid/management/ManagementAgent.h Sat Feb 19 13:51:04 2011
@@ -41,6 +41,9 @@
#include <map>
namespace qpid {
+namespace broker {
+class ConnectionState;
+}
namespace management {
class ManagementAgent
@@ -422,6 +425,8 @@ private:
void debugSnapshot(const char* title);
};
+void setManagementExecutionContext(const qpid::broker::ConnectionState*);
+const qpid::broker::ConnectionState* getManagementExecutionContext();
}}
-
+
#endif /*!_ManagementAgent_*/
Propchange: qpid/branches/qpid-2935/qpid/cpp/src/qpid/management/ManagementAgent.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 13:51:04 2011
@@ -1 +1 @@
-/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h:1061302-1071383
+/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h:1061302-1072326
Modified: qpid/branches/qpid-2935/qpid/cpp/src/tests/MessagingFixture.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/cpp/src/tests/MessagingFixture.h?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/cpp/src/tests/MessagingFixture.h (original)
+++ qpid/branches/qpid-2935/qpid/cpp/src/tests/MessagingFixture.h Sat Feb 19 13:51:04 2011
@@ -27,15 +27,19 @@
#include "qpid/client/Connection.h"
#include "qpid/client/Session.h"
#include "qpid/framing/Uuid.h"
+#include "qpid/messaging/Address.h"
#include "qpid/messaging/Connection.h"
#include "qpid/messaging/Session.h"
#include "qpid/messaging/Sender.h"
#include "qpid/messaging/Receiver.h"
#include "qpid/messaging/Message.h"
+#include "qpid/types/Variant.h"
namespace qpid {
namespace tests {
+using qpid::types::Variant;
+
struct BrokerAdmin
{
qpid::client::Connection connection;
@@ -223,6 +227,119 @@ inline void receive(messaging::Receiver&
}
}
+
+class MethodInvoker
+{
+ public:
+ MethodInvoker(messaging::Session& session) : replyTo("#; {create:always, node:{x-declare:{auto-delete:true}}}"),
+ sender(session.createSender("qmf.default.direct/broker")),
+ receiver(session.createReceiver(replyTo)) {}
+
+ void createExchange(const std::string& name, const std::string& type, bool durable=false)
+ {
+ Variant::Map params;
+ params["name"]=name;
+ params["type"]="exchange";
+ params["properties"] = Variant::Map();
+ params["properties"].asMap()["exchange-type"] = type;
+ params["properties"].asMap()["durable"] = durable;
+ methodRequest("create", params);
+ }
+
+ void deleteExchange(const std::string& name)
+ {
+ Variant::Map params;
+ params["name"]=name;
+ params["type"]="exchange";
+ methodRequest("delete", params);
+ }
+
+ void createQueue(const std::string& name, bool durable=false, bool autodelete=false,
+ const Variant::Map& options=Variant::Map())
+ {
+ Variant::Map params;
+ params["name"]=name;
+ params["type"]="queue";
+ params["properties"] = options;
+ params["properties"].asMap()["durable"] = durable;
+ params["properties"].asMap()["auto-delete"] = autodelete;
+ methodRequest("create", params);
+ }
+
+ void deleteQueue(const std::string& name)
+ {
+ Variant::Map params;
+ params["name"]=name;
+ params["type"]="queue";
+ methodRequest("delete", params);
+ }
+
+ void bind(const std::string& exchange, const std::string& queue, const std::string& key,
+ const Variant::Map& options=Variant::Map())
+ {
+ Variant::Map params;
+ params["name"]=(boost::format("%1%/%2%/%3%") % (exchange) % (queue) % (key)).str();
+ params["type"]="binding";
+ params["properties"] = options;
+ methodRequest("create", params);
+ }
+
+ void unbind(const std::string& exchange, const std::string& queue, const std::string& key)
+ {
+ Variant::Map params;
+ params["name"]=(boost::format("%1%/%2%/%3%") % (exchange) % (queue) % (key)).str();
+ params["type"]="binding";
+ methodRequest("delete", params);
+ }
+
+ void methodRequest(const std::string& method, const Variant::Map& inParams, Variant::Map* outParams = 0)
+ {
+ Variant::Map content;
+ Variant::Map objectId;
+ objectId["_object_name"] = "org.apache.qpid.broker:broker:amqp-broker";
+ content["_object_id"] = objectId;
+ content["_method_name"] = method;
+ content["_arguments"] = inParams;
+
+ messaging::Message request;
+ request.setReplyTo(replyTo);
+ request.getProperties()["x-amqp-0-10.app-id"] = "qmf2";
+ request.getProperties()["qmf.opcode"] = "_method_request";
+ encode(content, request);
+
+ sender.send(request);
+
+ messaging::Message response;
+ if (receiver.fetch(response, messaging::Duration::SECOND*5)) {
+ if (response.getProperties()["x-amqp-0-10.app-id"] == "qmf2") {
+ std::string opcode = response.getProperties()["qmf.opcode"];
+ if (opcode == "_method_response") {
+ if (outParams) {
+ Variant::Map m;
+ decode(response, m);
+ *outParams = m["_arguments"].asMap();
+ }
+ } else if (opcode == "_exception") {
+ Variant::Map m;
+ decode(response, m);
+ throw Exception(QPID_MSG("Error: " << m["_values"]));
+ } else {
+ throw Exception(QPID_MSG("Invalid response received, unexpected opcode: " << opcode));
+ }
+ } else {
+ throw Exception(QPID_MSG("Invalid response received, not a qmfv2 message: app-id="
+ << response.getProperties()["x-amqp-0-10.app-id"]));
+ }
+ } else {
+ throw Exception(QPID_MSG("No response received"));
+ }
+ }
+ private:
+ messaging::Address replyTo;
+ messaging::Sender sender;
+ messaging::Receiver receiver;
+};
+
}} // namespace qpid::tests
#endif /*!TESTS_MESSAGINGFIXTURE_H*/
Modified: qpid/branches/qpid-2935/qpid/cpp/src/tests/MessagingSessionTests.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/cpp/src/tests/MessagingSessionTests.cpp?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/cpp/src/tests/MessagingSessionTests.cpp (original)
+++ qpid/branches/qpid-2935/qpid/cpp/src/tests/MessagingSessionTests.cpp Sat Feb 19 13:51:04 2011
@@ -890,6 +890,53 @@ QPID_AUTO_TEST_CASE(testAcknowledge)
BOOST_CHECK(!fix.session.createReceiver(fix.queue).fetch(m, Duration::IMMEDIATE));
}
+QPID_AUTO_TEST_CASE(testQmfCreateAndDelete)
+{
+ MessagingFixture fix(Broker::Options(), true/*enable management*/);
+ MethodInvoker control(fix.session);
+ control.createQueue("my-queue");
+ control.createExchange("my-exchange", "topic");
+ control.bind("my-exchange", "my-queue", "subject1");
+
+ Sender sender = fix.session.createSender("my-exchange");
+ Receiver receiver = fix.session.createReceiver("my-queue");
+ Message out;
+ out.setSubject("subject1");
+ out.setContent("one");
+ sender.send(out);
+ Message in;
+ BOOST_CHECK(receiver.fetch(in, Duration::SECOND*5));
+ BOOST_CHECK_EQUAL(out.getContent(), in.getContent());
+ control.unbind("my-exchange", "my-queue", "subject1");
+ control.bind("my-exchange", "my-queue", "subject2");
+
+ out.setContent("two");
+ sender.send(out);//should be dropped
+
+ out.setSubject("subject2");
+ out.setContent("three");
+ sender.send(out);//should not be dropped
+
+ BOOST_CHECK(receiver.fetch(in, Duration::SECOND*5));
+ BOOST_CHECK_EQUAL(out.getContent(), in.getContent());
+ BOOST_CHECK(!receiver.fetch(in, Duration::IMMEDIATE));
+ sender.close();
+ receiver.close();
+
+ control.deleteExchange("my-exchange");
+ messaging::Session other = fix.connection.createSession();
+ {
+ ScopedSuppressLogging sl;
+ BOOST_CHECK_THROW(other.createSender("my-exchange"), qpid::messaging::NotFound);
+ }
+ control.deleteQueue("my-queue");
+ other = fix.connection.createSession();
+ {
+ ScopedSuppressLogging sl;
+ BOOST_CHECK_THROW(other.createReceiver("my-queue"), qpid::messaging::NotFound);
+ }
+}
+
QPID_AUTO_TEST_SUITE_END()
}} // namespace qpid::tests
Modified: qpid/branches/qpid-2935/qpid/cpp/src/tests/QueueTest.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/cpp/src/tests/QueueTest.cpp?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/cpp/src/tests/QueueTest.cpp (original)
+++ qpid/branches/qpid-2935/qpid/cpp/src/tests/QueueTest.cpp Sat Feb 19 13:51:04 2011
@@ -249,7 +249,7 @@ QPID_AUTO_TEST_CASE(testBound){
exchange2.reset();
//unbind the queue from all exchanges it knows it has been bound to:
- queue->unbind(exchanges, queue);
+ queue->unbind(exchanges);
//ensure the remaining exchanges don't still have the queue bound to them:
FailOnDeliver deliverable;
Propchange: qpid/branches/qpid-2935/qpid/cpp/src/tests/cluster_tests.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 13:51:04 2011
@@ -1 +1 @@
-/qpid/trunk/qpid/cpp/src/tests/cluster_tests.py:1061302-1071383
+/qpid/trunk/qpid/cpp/src/tests/cluster_tests.py:1061302-1072326
Modified: qpid/branches/qpid-2935/qpid/cpp/src/tests/qpid-ctrl
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/cpp/src/tests/qpid-ctrl?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/cpp/src/tests/qpid-ctrl (original)
+++ qpid/branches/qpid-2935/qpid/cpp/src/tests/qpid-ctrl Sat Feb 19 13:51:04 2011
@@ -92,7 +92,10 @@ try:
arguments = {}
for a in args:
name, val = nameval(a)
- arguments[name] = val
+ if val[0] == '{' or val[0] == '[':
+ arguments[name] = eval(val)
+ else:
+ arguments[name] = val
content = {
"_object_id": {"_object_name": object_name},
"_method_name": method_name,
Modified: qpid/branches/qpid-2935/qpid/cpp/src/tests/sender.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/cpp/src/tests/sender.cpp?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/cpp/src/tests/sender.cpp (original)
+++ qpid/branches/qpid-2935/qpid/cpp/src/tests/sender.cpp Sat Feb 19 13:51:04 2011
@@ -120,7 +120,7 @@ void Sender::execute(AsyncSession& sessi
string data;
while (getline(std::cin, data)) {
message.setData(data);
- message.getHeaders().setInt("SN", ++sent);
+ //message.getHeaders().setInt("SN", ++sent);
string matchKey;
if (lvqMatchValues && getline(lvqMatchValues, matchKey)) {
message.getHeaders().setString(QueueOptions::strLVQMatchProperty, matchKey);
Propchange: qpid/branches/qpid-2935/qpid/dotnet/build-msbuild.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 13:51:04 2011
@@ -1 +1 @@
-/qpid/trunk/qpid/dotnet/build-msbuild.bat:1061302-1071383
+/qpid/trunk/qpid/dotnet/build-msbuild.bat:1061302-1072326
Propchange: qpid/branches/qpid-2935/qpid/dotnet/build-nant-release
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 13:51:04 2011
@@ -1 +1 @@
-/qpid/trunk/qpid/dotnet/build-nant-release:1061302-1071383
+/qpid/trunk/qpid/dotnet/build-nant-release:1061302-1072326
Propchange: qpid/branches/qpid-2935/qpid/dotnet/build-nant.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 13:51:04 2011
@@ -1 +1 @@
-/qpid/trunk/qpid/dotnet/build-nant.bat:1061302-1071383
+/qpid/trunk/qpid/dotnet/build-nant.bat:1061302-1072326
Propchange: qpid/branches/qpid-2935/qpid/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 13:51:04 2011
@@ -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:1061302-1071383
+/qpid/trunk/qpid/java:1061302-1072326
Propchange: qpid/branches/qpid-2935/qpid/java/broker/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 13:51:04 2011
@@ -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,1061302-1071383
+/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,1061302-1072326
Propchange: qpid/branches/qpid-2935/qpid/java/broker/bin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 13:51:04 2011
@@ -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,1061302-1071383
+/qpid/trunk/qpid/java/broker/bin:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,1061302-1072326
Modified: qpid/branches/qpid-2935/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java (original)
+++ qpid/branches/qpid-2935/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java Sat Feb 19 13:51:04 2011
@@ -712,6 +712,25 @@ public class QMFService implements Confi
return factory.createResponseCommand(CompletionCode.NOT_IMPLEMENTED);
}
+ public BrokerSchema.BrokerClass.CreateMethodResponseCommand create(final BrokerSchema.BrokerClass.CreateMethodResponseCommandFactory factory,
+ final String type,
+ final String name,
+ final Map properties,
+ final java.lang.Boolean lenient)
+ {
+ //TODO:
+ return factory.createResponseCommand(CompletionCode.NOT_IMPLEMENTED);
+ }
+
+ public BrokerSchema.BrokerClass.DeleteMethodResponseCommand delete(final BrokerSchema.BrokerClass.DeleteMethodResponseCommandFactory factory,
+ final String type,
+ final String name,
+ final Map options)
+ {
+ //TODO:
+ return factory.createResponseCommand(CompletionCode.NOT_IMPLEMENTED);
+ }
+
public UUID getId()
{
return _obj.getId();
Modified: qpid/branches/qpid-2935/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/CurrentActor.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/CurrentActor.java?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/CurrentActor.java (original)
+++ qpid/branches/qpid-2935/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/CurrentActor.java Sat Feb 19 13:51:04 2011
@@ -21,9 +21,6 @@
package org.apache.qpid.server.logging.actors;
import org.apache.qpid.server.logging.LogActor;
-import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.logging.RootMessageLogger;
import java.util.EmptyStackException;
import java.util.Stack;
@@ -72,7 +69,7 @@ public class CurrentActor
private static LogActor _defaultActor;
/**
- * Set a new LogActor to be the Current Actor
+ * Set a new {@link LogActor} to be the Current Actor
* <p/>
* This pushes the Actor in to the LIFO Queue
*
@@ -85,7 +82,16 @@ public class CurrentActor
}
/**
- * Remove the current LogActor.
+ * Remove all {@link LogActor}s
+ */
+ public static void removeAll()
+ {
+ Stack<LogActor> stack = _currentActor.get();
+ stack.clear();
+ }
+
+ /**
+ * Remove the current {@link LogActor}.
* <p/>
* Calling remove without calling set will result in an EmptyStackException.
*/
@@ -96,9 +102,7 @@ public class CurrentActor
}
/**
- * Return the current head of the list of LogActors.
- * <p/>
- * If there has been no set call then this will return Null.
+ * Return the current head of the list of {@link LogActor}s.
*
* @return Current LogActor
*/
Propchange: qpid/branches/qpid-2935/qpid/java/broker/src/main/java/org/apache/qpid/server/management/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 13:51:04 2011
@@ -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,1061302-1071383
+/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,1061302-1072326
Propchange: qpid/branches/qpid-2935/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 13:51:04 2011
@@ -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,1061302-1071383
+/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,1061302-1072326
Propchange: qpid/branches/qpid-2935/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 13:51:04 2011
@@ -1,2 +1,2 @@
/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost:930288
-/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost:1061302-1071383
+/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost:1061302-1072326
Modified: qpid/branches/qpid-2935/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java (original)
+++ qpid/branches/qpid-2935/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java Sat Feb 19 13:51:04 2011
@@ -149,10 +149,7 @@ public class InternalBrokerBaseCase exte
{
super.tearDown();
// Purge Any erroneously added actors
- while (CurrentActor.get() != null)
- {
- CurrentActor.remove();
- }
+ CurrentActor.removeAll();
}
}
Modified: qpid/branches/qpid-2935/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java (original)
+++ qpid/branches/qpid-2935/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java Sat Feb 19 13:51:04 2011
@@ -26,6 +26,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.CountDownLatch;
import javax.jms.ExceptionListener;
import javax.jms.JMSException;
@@ -211,15 +212,13 @@ public class AMQConnectionDelegate_0_10
public void resubscribeSessions() throws JMSException, AMQException, FailoverException
{
List<AMQSession> sessions = new ArrayList<AMQSession>(_conn.getSessions().values());
- _logger.info(String.format("Resubscribing sessions = %s sessions.size=%s", sessions, sessions.size()));
+ _logger.info(String.format("Resubscribing sessions = %s sessions.size=%d", sessions, sessions.size()));
for (AMQSession s : sessions)
{
- ((AMQSession_0_10) s)._qpidConnection = _qpidConnection;
s.resubscribe();
}
}
-
public void closeConnection(long timeout) throws JMSException, AMQException
{
try
@@ -257,12 +256,14 @@ public class AMQConnectionDelegate_0_10
ConnectionClose close = exc.getClose();
if (close == null)
{
+ _conn.getProtocolHandler().setFailoverLatch(new CountDownLatch(1));
+
try
{
if (_conn.firePreFailover(false) && _conn.attemptReconnection())
{
_conn.failoverPrep();
- _qpidConnection.resume();
+ _conn.resubscribeSessions();
_conn.fireFailoverComplete();
return;
}
@@ -271,6 +272,11 @@ public class AMQConnectionDelegate_0_10
{
_logger.error("error during failover", e);
}
+ finally
+ {
+ _conn.getProtocolHandler().getFailoverLatch().countDown();
+ _conn.getProtocolHandler().setFailoverLatch(null);
+ }
}
ExceptionListener listener = _conn._exceptionListener;
Modified: qpid/branches/qpid-2935/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java (original)
+++ qpid/branches/qpid-2935/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java Sat Feb 19 13:51:04 2011
@@ -892,14 +892,6 @@ public class AMQSession_0_10 extends AMQ
public void resumed(Session ssn)
{
_qpidConnection = ssn.getConnection();
- try
- {
- resubscribe();
- }
- catch (AMQException e)
- {
- throw new RuntimeException(e);
- }
}
public void message(Session ssn, MessageTransfer xfr)
@@ -942,6 +934,7 @@ public class AMQSession_0_10 extends AMQ
protected Long requestQueueDepth(AMQDestination amqd)
{
+ flushAcknowledgments();
return getQpidSession().queueQuery(amqd.getQueueName()).get().getMessageCount();
}
Modified: qpid/branches/qpid-2935/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java (original)
+++ qpid/branches/qpid-2935/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java Sat Feb 19 13:51:04 2011
@@ -21,6 +21,7 @@
package org.apache.qpid.client.message;
+import java.lang.ref.SoftReference;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
@@ -38,7 +39,6 @@ import javax.jms.Session;
import org.apache.qpid.AMQException;
import org.apache.qpid.AMQPInvalidClassException;
-import org.apache.qpid.collections.ReferenceMap;
import org.apache.qpid.client.AMQDestination;
import org.apache.qpid.client.AMQSession;
import org.apache.qpid.client.AMQSession_0_10;
@@ -61,7 +61,7 @@ import org.apache.qpid.transport.ReplyTo
*/
public class AMQMessageDelegate_0_10 extends AbstractAMQMessageDelegate
{
- private static final Map<ReplyTo, Destination> _destinationCache = Collections.synchronizedMap(new ReferenceMap());
+ private static final Map<ReplyTo, SoftReference<Destination>> _destinationCache = Collections.synchronizedMap(new HashMap<ReplyTo, SoftReference<Destination>>());
public static final String JMS_TYPE = "x-jms-type";
@@ -229,22 +229,19 @@ public class AMQMessageDelegate_0_10 ext
}
else
{
- Destination dest = _destinationCache.get(replyTo);
+ Destination dest = null;
+ SoftReference<Destination> ref = _destinationCache.get(replyTo);
+ if (ref != null)
+ {
+ dest = ref.get();
+ }
if (dest == null)
{
String exchange = replyTo.getExchange();
String routingKey = replyTo.getRoutingKey();
- dest = generateDestination(exchange == null ? new AMQShortString("") :
- new AMQShortString(exchange),
- routingKey == null ? new AMQShortString(""):
- new AMQShortString(routingKey));
-
-
-
-
-
- _destinationCache.put(replyTo, dest);
+ dest = generateDestination(new AMQShortString(exchange), new AMQShortString(routingKey));
+ _destinationCache.put(replyTo, new SoftReference<Destination>(dest));
}
return dest;
@@ -291,7 +288,7 @@ public class AMQMessageDelegate_0_10 ext
}
final ReplyTo replyTo = new ReplyTo(amqd.getExchangeName().toString(), amqd.getRoutingKey().toString());
- _destinationCache.put(replyTo, destination);
+ _destinationCache.put(replyTo, new SoftReference<Destination>(destination));
_messageProps.setReplyTo(replyTo);
}
Modified: qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/Binary.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/Binary.java?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/Binary.java (original)
+++ qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/Binary.java Sat Feb 19 13:51:04 2011
@@ -142,4 +142,13 @@ public final class Binary
return str(ByteBuffer.wrap(bytes, offset, size));
}
+ public boolean hasExcessCapacity()
+ {
+ return size != bytes.length;
+ }
+
+ public Binary copy()
+ {
+ return new Binary(getBytes());
+ }
}
Modified: qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java (original)
+++ qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java Sat Feb 19 13:51:04 2011
@@ -35,9 +35,7 @@ import org.slf4j.LoggerFactory;
/**
* ServerDelegate
- *
*/
-
public class ServerDelegate extends ConnectionDelegate
{
protected static final Logger _logger = LoggerFactory.getLogger(ServerDelegate.class);
@@ -140,12 +138,12 @@ public class ServerDelegate extends Conn
protected int getHeartbeatMax()
{
- return Integer.MAX_VALUE;
+ return 0xFFFF;
}
protected int getChannelMax()
{
- return Integer.MAX_VALUE;
+ return 0xFFFF;
}
@Override
@@ -202,5 +200,4 @@ public class ServerDelegate extends Conn
ssn.sessionAttached(atc.getName());
ssn.setState(Session.State.OPEN);
}
-
}
Modified: qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java (original)
+++ qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java Sat Feb 19 13:51:04 2011
@@ -143,10 +143,18 @@ abstract class AbstractDecoder implement
short size = readUint8();
Binary bin = get(size);
String str = str8cache.get(bin);
+
if (str == null)
{
str = decode(bin.array(), bin.offset(), bin.size(), "UTF-8");
- str8cache.put(bin, str);
+ if(bin.hasExcessCapacity())
+ {
+ str8cache.put(bin.copy(), str);
+ }
+ else
+ {
+ str8cache.put(bin, str);
+ }
}
return str;
}
Modified: qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/BBDecoder.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/BBDecoder.java?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/BBDecoder.java (original)
+++ qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/BBDecoder.java Sat Feb 19 13:51:04 2011
@@ -41,6 +41,11 @@ public final class BBDecoder extends Abs
this.in.order(ByteOrder.BIG_ENDIAN);
}
+ public void releaseBuffer()
+ {
+ in = null;
+ }
+
protected byte doGet()
{
return in.get();
Modified: qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java (original)
+++ qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java Sat Feb 19 13:51:04 2011
@@ -20,38 +20,36 @@
*/
package org.apache.qpid.transport.network;
+import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.nio.ByteBuffer;
-
-import org.apache.qpid.transport.codec.BBDecoder;
-import org.apache.qpid.transport.codec.Decoder;
-
import org.apache.qpid.transport.Header;
import org.apache.qpid.transport.Method;
import org.apache.qpid.transport.ProtocolError;
import org.apache.qpid.transport.ProtocolEvent;
import org.apache.qpid.transport.ProtocolHeader;
import org.apache.qpid.transport.Receiver;
-import org.apache.qpid.transport.SegmentType;
import org.apache.qpid.transport.Struct;
-
+import org.apache.qpid.transport.codec.BBDecoder;
/**
* Assembler
*
*/
-
public class Assembler implements Receiver<NetworkEvent>, NetworkDelegate
{
+ // Use a small array to store incomplete Methods for low-value channels, instead of allocating a huge
+ // array or always boxing the channelId and looking it up in the map. This value must be of the form 2^X - 1.
+ private static final int ARRAY_SIZE = 0xFF;
+ private final Method[] _incompleteMethodArray = new Method[ARRAY_SIZE + 1];
+ private final Map<Integer, Method> _incompleteMethodMap = new HashMap<Integer, Method>();
private final Receiver<ProtocolEvent> receiver;
private final Map<Integer,List<Frame>> segments;
- private final Method[] incomplete;
- private final ThreadLocal<BBDecoder> decoder = new ThreadLocal<BBDecoder>()
+ private static final ThreadLocal<BBDecoder> _decoder = new ThreadLocal<BBDecoder>()
{
public BBDecoder initialValue()
{
@@ -63,7 +61,6 @@ public class Assembler implements Receiv
{
this.receiver = receiver;
segments = new HashMap<Integer,List<Frame>>();
- incomplete = new Method[64*1024];
}
private int segmentKey(Frame frame)
@@ -169,7 +166,7 @@ public class Assembler implements Receiv
private void assemble(Frame frame, ByteBuffer segment)
{
- BBDecoder dec = decoder.get();
+ BBDecoder dec = _decoder.get();
dec.init(segment);
int channel = frame.getChannel();
@@ -192,7 +189,7 @@ public class Assembler implements Receiv
command.read(dec);
if (command.hasPayload())
{
- incomplete[channel] = command;
+ setIncompleteCommand(channel, command);
}
else
{
@@ -200,8 +197,8 @@ public class Assembler implements Receiv
}
break;
case HEADER:
- command = incomplete[channel];
- List<Struct> structs = new ArrayList(2);
+ command = getIncompleteCommand(channel);
+ List<Struct> structs = new ArrayList<Struct>(2);
while (dec.hasRemaining())
{
structs.add(dec.readStruct32());
@@ -209,19 +206,51 @@ public class Assembler implements Receiv
command.setHeader(new Header(structs));
if (frame.isLastSegment())
{
- incomplete[channel] = null;
+ setIncompleteCommand(channel, null);
emit(channel, command);
}
break;
case BODY:
- command = incomplete[channel];
+ command = getIncompleteCommand(channel);
command.setBody(segment);
- incomplete[channel] = null;
+ setIncompleteCommand(channel, null);
emit(channel, command);
break;
default:
throw new IllegalStateException("unknown frame type: " + frame.getType());
}
+
+ dec.releaseBuffer();
}
+ private void setIncompleteCommand(int channelId, Method incomplete)
+ {
+ if ((channelId & ARRAY_SIZE) == channelId)
+ {
+ _incompleteMethodArray[channelId] = incomplete;
+ }
+ else
+ {
+ if(incomplete != null)
+ {
+ _incompleteMethodMap.put(channelId, incomplete);
+ }
+ else
+ {
+ _incompleteMethodMap.remove(channelId);
+ }
+ }
+ }
+
+ private Method getIncompleteCommand(int channelId)
+ {
+ if ((channelId & ARRAY_SIZE) == channelId)
+ {
+ return _incompleteMethodArray[channelId];
+ }
+ else
+ {
+ return _incompleteMethodMap.get(channelId);
+ }
+ }
}
Modified: qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java?rev=1072330&r1=1072329&r2=1072330&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java (original)
+++ qpid/branches/qpid-2935/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java Sat Feb 19 13:51:04 2011
@@ -40,21 +40,15 @@ import static java.lang.Math.min;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
-
/**
* Disassembler
- *
*/
-
-public final class Disassembler implements Sender<ProtocolEvent>,
- ProtocolDelegate<Void>
+public final class Disassembler implements Sender<ProtocolEvent>, ProtocolDelegate<Void>
{
-
private final Sender<ByteBuffer> sender;
private final int maxPayload;
- private final ByteBuffer header;
private final Object sendlock = new Object();
- private final ThreadLocal<BBEncoder> encoder = new ThreadLocal<BBEncoder>()
+ private final static ThreadLocal<BBEncoder> _encoder = new ThreadLocal<BBEncoder>()
{
public BBEncoder initialValue()
{
@@ -66,14 +60,10 @@ public final class Disassembler implemen
{
if (maxFrame <= HEADER_SIZE || maxFrame >= 64*1024)
{
- throw new IllegalArgumentException
- ("maxFrame must be > HEADER_SIZE and < 64K: " + maxFrame);
+ throw new IllegalArgumentException("maxFrame must be > HEADER_SIZE and < 64K: " + maxFrame);
}
this.sender = sender;
this.maxPayload = maxFrame - HEADER_SIZE;
- this.header = ByteBuffer.allocate(HEADER_SIZE);
- this.header.order(ByteOrder.BIG_ENDIAN);
-
}
public void send(ProtocolEvent event)
@@ -101,25 +91,27 @@ public final class Disassembler implemen
{
synchronized (sendlock)
{
- header.put(0, flags);
- header.put(1, type);
- header.putShort(2, (short) (size + HEADER_SIZE));
- header.put(5, track);
- header.putShort(6, (short) channel);
-
- header.rewind();
-
- sender.send(header);
+ ByteBuffer data = ByteBuffer.allocate(size + HEADER_SIZE);
+ data.order(ByteOrder.BIG_ENDIAN);
+
+ data.put(0, flags);
+ data.put(1, type);
+ data.putShort(2, (short) (size + HEADER_SIZE));
+ data.put(5, track);
+ data.putShort(6, (short) channel);
+ data.position(HEADER_SIZE);
int limit = buf.limit();
buf.limit(buf.position() + size);
- sender.send(buf);
+ data.put(buf);
buf.limit(limit);
+
+ data.rewind();
+ sender.send(data);
}
}
- private void fragment(byte flags, SegmentType type, ProtocolEvent event,
- ByteBuffer buf)
+ private void fragment(byte flags, SegmentType type, ProtocolEvent event, ByteBuffer buf)
{
byte typeb = (byte) type.getValue();
byte track = event.getEncodedTrack() == Frame.L4 ? (byte) 1 : (byte) 0;
@@ -170,17 +162,9 @@ public final class Disassembler implemen
method(method, SegmentType.COMMAND);
}
- private ByteBuffer copy(ByteBuffer src)
- {
- ByteBuffer buf = ByteBuffer.allocate(src.remaining());
- buf.put(src);
- buf.flip();
- return buf;
- }
-
private void method(Method method, SegmentType type)
{
- BBEncoder enc = encoder.get();
+ BBEncoder enc = _encoder.get();
enc.init();
enc.writeUint16(method.getEncodedType());
if (type == SegmentType.COMMAND)
@@ -227,8 +211,7 @@ public final class Disassembler implemen
if (payload)
{
ByteBuffer body = method.getBody();
- fragment(body == null ? LAST_SEG : 0x0, SegmentType.HEADER,
- method, headerSeg);
+ fragment(body == null ? LAST_SEG : 0x0, SegmentType.HEADER, method, headerSeg);
if (body != null)
{
fragment(LAST_SEG, SegmentType.BODY, method, body);
@@ -240,7 +223,7 @@ public final class Disassembler implemen
public void error(Void v, ProtocolError error)
{
- throw new IllegalArgumentException("" + error);
+ throw new IllegalArgumentException(String.valueOf(error));
}
public void setIdleTimeout(int i)
Propchange: qpid/branches/qpid-2935/qpid/java/management/client/src/main/java/org/apache/qpid/management/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 13:51:04 2011
@@ -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:1061302-1071383
+/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management:1061302-1072326
Propchange: qpid/branches/qpid-2935/qpid/java/management/client/src/test/java/org/apache/qpid/management/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 13:51:04 2011
@@ -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:1061302-1071383
+/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management:1061302-1072326
Propchange: qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 13:51:04 2011
@@ -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:1061302-1071383
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java:1061302-1072326
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org