You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2012/06/28 11:15:39 UTC

svn commit: r1354874 [1/14] - in /qpid/branches/java-config-and-management: ./ qpid/ qpid/bin/ qpid/cpp/ qpid/cpp/bindings/ qpid/cpp/bindings/qmf/ruby/ qpid/cpp/bindings/qpid/python/ qpid/cpp/bindings/qpid/ruby/ qpid/cpp/bindings/qpid/ruby/features/ qp...

Author: robbie
Date: Thu Jun 28 09:14:52 2012
New Revision: 1354874

URL: http://svn.apache.org/viewvc?rev=1354874&view=rev
Log:
merge non-java changes from trunk up to r1353860

Added:
    qpid/branches/java-config-and-management/qpid/bin/install-cpp-python
      - copied unchanged from r1309633, qpid/trunk/qpid/bin/install-cpp-python
    qpid/branches/java-config-and-management/qpid/cpp/etc/cluster.conf-example.xml.in
      - copied, changed from r1309633, qpid/trunk/qpid/cpp/etc/cluster.conf-example.xml.in
    qpid/branches/java-config-and-management/qpid/cpp/etc/qpidd-primary.in
      - copied unchanged from r1309633, qpid/trunk/qpid/cpp/etc/qpidd-primary.in
    qpid/branches/java-config-and-management/qpid/cpp/etc/qpidd.in
      - copied, changed from r1309633, qpid/trunk/qpid/cpp/etc/qpidd.in
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/acl/AclConnectionCounter.cpp
      - copied, changed from r1339789, qpid/trunk/qpid/cpp/src/qpid/acl/AclConnectionCounter.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/acl/AclConnectionCounter.h
      - copied, changed from r1339789, qpid/trunk/qpid/cpp/src/qpid/acl/AclConnectionCounter.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/ConfigurationObserver.h
      - copied unchanged from r1349442, qpid/trunk/qpid/cpp/src/qpid/broker/ConfigurationObserver.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/ConfigurationObservers.h
      - copied unchanged from r1349442, qpid/trunk/qpid/cpp/src/qpid/broker/ConfigurationObservers.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/Observers.h
      - copied unchanged from r1349442, qpid/trunk/qpid/cpp/src/qpid/broker/Observers.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/QueuedMessage.cpp
      - copied unchanged from r1339789, qpid/trunk/qpid/cpp/src/qpid/broker/QueuedMessage.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/TopicKeyNode.h
      - copied unchanged from r1349442, qpid/trunk/qpid/cpp/src/qpid/broker/TopicKeyNode.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/BackupConnectionExcluder.h
      - copied unchanged from r1353860, qpid/trunk/qpid/cpp/src/qpid/ha/BackupConnectionExcluder.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/BrokerInfo.cpp
      - copied, changed from r1349442, qpid/trunk/qpid/cpp/src/qpid/ha/BrokerInfo.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/BrokerInfo.h
      - copied, changed from r1349442, qpid/trunk/qpid/cpp/src/qpid/ha/BrokerInfo.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/ConnectionObserver.cpp
      - copied unchanged from r1353860, qpid/trunk/qpid/cpp/src/qpid/ha/ConnectionObserver.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/ConnectionObserver.h
      - copied unchanged from r1353860, qpid/trunk/qpid/cpp/src/qpid/ha/ConnectionObserver.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/Counter.h
      - copied unchanged from r1339789, qpid/trunk/qpid/cpp/src/qpid/ha/Counter.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/Membership.cpp
      - copied, changed from r1349442, qpid/trunk/qpid/cpp/src/qpid/ha/Membership.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/Membership.h
      - copied, changed from r1349442, qpid/trunk/qpid/cpp/src/qpid/ha/Membership.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/Primary.cpp
      - copied, changed from r1339789, qpid/trunk/qpid/cpp/src/qpid/ha/Primary.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/Primary.h
      - copied, changed from r1339789, qpid/trunk/qpid/cpp/src/qpid/ha/Primary.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/QueueGuard.cpp
      - copied unchanged from r1353860, qpid/trunk/qpid/cpp/src/qpid/ha/QueueGuard.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/QueueGuard.h
      - copied unchanged from r1353860, qpid/trunk/qpid/cpp/src/qpid/ha/QueueGuard.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/QueueRange.h
      - copied unchanged from r1353860, qpid/trunk/qpid/cpp/src/qpid/ha/QueueRange.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/RemoteBackup.cpp
      - copied unchanged from r1353860, qpid/trunk/qpid/cpp/src/qpid/ha/RemoteBackup.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/RemoteBackup.h
      - copied unchanged from r1353860, qpid/trunk/qpid/cpp/src/qpid/ha/RemoteBackup.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/ReplicationTest.cpp
      - copied unchanged from r1353860, qpid/trunk/qpid/cpp/src/qpid/ha/ReplicationTest.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/ReplicationTest.h
      - copied unchanged from r1353860, qpid/trunk/qpid/cpp/src/qpid/ha/ReplicationTest.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/types.cpp
      - copied unchanged from r1353860, qpid/trunk/qpid/cpp/src/qpid/ha/types.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/types.h
      - copied unchanged from r1353860, qpid/trunk/qpid/cpp/src/qpid/ha/types.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/sys/MemStat.cpp
      - copied unchanged from r1349442, qpid/trunk/qpid/cpp/src/qpid/sys/MemStat.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/SystemInfo.cpp
      - copied, changed from r1339789, qpid/trunk/qpid/cpp/src/tests/SystemInfo.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/cpg_check.sh.in
      - copied unchanged from r1339789, qpid/trunk/qpid/cpp/src/tests/cpg_check.sh.in
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/qpidd-empty.conf
      - copied unchanged from r1339789, qpid/trunk/qpid/cpp/src/tests/qpidd-empty.conf
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/run_ha_tests
      - copied unchanged from r1339789, qpid/trunk/qpid/cpp/src/tests/run_ha_tests
    qpid/branches/java-config-and-management/qpid/doc/book/src/Makefile.inc
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/Makefile.inc
    qpid/branches/java-config-and-management/qpid/doc/book/src/common/
      - copied from r1339789, qpid/trunk/qpid/doc/book/src/common/
    qpid/branches/java-config-and-management/qpid/doc/book/src/common/css/
      - copied from r1339789, qpid/trunk/qpid/doc/book/src/common/css/
    qpid/branches/java-config-and-management/qpid/doc/book/src/common/css/style.css
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/common/css/style.css
    qpid/branches/java-config-and-management/qpid/doc/book/src/cpp-broker/
      - copied from r1339789, qpid/trunk/qpid/doc/book/src/cpp-broker/
    qpid/branches/java-config-and-management/qpid/doc/book/src/cpp-broker/AMQP-Compatibility.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/cpp-broker/AMQP-Compatibility.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/cpp-broker/AMQP-Messaging-Broker-CPP-Book.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/cpp-broker/AMQP-Messaging-Broker-CPP-Book.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/cpp-broker/Active-Active-Cluster.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/cpp-broker/Active-Active-Cluster.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml
      - copied, changed from r1339789, qpid/trunk/qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Exchange-Options.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Exchange-Options.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Queue-Options.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Queue-Options.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/cpp-broker/HA-Queue-Replication.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/cpp-broker/HA-Queue-Replication.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/cpp-broker/LVQ.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/cpp-broker/LVQ.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/cpp-broker/Makefile
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/cpp-broker/Makefile
    qpid/branches/java-config-and-management/qpid/doc/book/src/cpp-broker/Managing-CPP-Broker.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/cpp-broker/Managing-CPP-Broker.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/cpp-broker/QMF-Python-Console-Tutorial.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/cpp-broker/QMF-Python-Console-Tutorial.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/cpp-broker/Qpid-Interoperability-Documentation.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/cpp-broker/Qpid-Interoperability-Documentation.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/cpp-broker/Qpid-Management-Framework.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/cpp-broker/Qpid-Management-Framework.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/cpp-broker/Running-CPP-Broker.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/cpp-broker/Running-CPP-Broker.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/cpp-broker/Security.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/cpp-broker/Security.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/cpp-broker/Using-Broker-Federation.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/cpp-broker/Using-Broker-Federation.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/cpp-broker/Using-message-groups.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/cpp-broker/Using-message-groups.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/cpp-broker/images/
      - copied from r1339789, qpid/trunk/qpid/doc/book/src/cpp-broker/images/
    qpid/branches/java-config-and-management/qpid/doc/book/src/cpp-broker/producer-flow-control.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/cpp-broker/producer-flow-control.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/cpp-broker/queue-state-replication.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/cpp-broker/queue-state-replication.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/   (props changed)
      - copied from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml
      - copied, changed from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/Add-New-Users.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/Add-New-Users.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/Broker-Configuration-Guide.xml
      - copied, changed from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/Broker-Configuration-Guide.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/Configure-ACLs.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/Configure-ACLs.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/Configure-Java-Qpid-to-use-a-SSL-connection.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/Configure-Java-Qpid-to-use-a-SSL-connection.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/Configure-Log4j-CompositeRolling-Appender.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/Configure-Log4j-CompositeRolling-Appender.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/Configure-the-Broker-via-config.xml.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/Configure-the-Broker-via-config.xml.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/Configuring-Management-Users.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/Configuring-Management-Users.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/Configuring-Qpid-JMX-Management-Console.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/Configuring-Qpid-JMX-Management-Console.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/Debug-using-log4j.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/Debug-using-log4j.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/HA-Guide.xml
      - copied unchanged from r1349442, qpid/trunk/qpid/doc/book/src/java-broker/HA-Guide.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/How-to-Tune-M3-Java-Broker-Performance.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/How-to-Tune-M3-Java-Broker-Performance.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/How-to-Use-SlowConsumerDisconnect.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/How-to-Use-SlowConsumerDisconnect.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/Java-Broker-Feature-Guide.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Feature-Guide.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/Java-Environment-Variables.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/Java-Environment-Variables.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/Makefile
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/Makefile
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/Management-Console-Security.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/Management-Console-Security.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/Producer-Flow-Control.xml
      - copied unchanged from r1349442, qpid/trunk/qpid/doc/book/src/java-broker/Producer-Flow-Control.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/Qpid-JMX-Management-Console-FAQ.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/Qpid-JMX-Management-Console-FAQ.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/Qpid-JMX-Management-Console-User-Guide.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/Qpid-JMX-Management-Console-User-Guide.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/Qpid-JMX-Management-Console.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/Qpid-JMX-Management-Console.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/Qpid-Java-Broker-Management-CLI.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/Qpid-Java-Broker-Management-CLI.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/Qpid-Java-Build-How-To.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/Qpid-Java-Build-How-To.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/Qpid-Java-FAQ.xml
      - copied, changed from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/Qpid-Java-FAQ.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/Qpid-Management-Features.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/Qpid-Management-Features.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/Qpid-Troubleshooting-Guide.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/Qpid-Troubleshooting-Guide.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/Topic-Configuration.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/Topic-Configuration.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/Use-Priority-Queues.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/Use-Priority-Queues.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/
      - copied from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/images/
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/3113098.png
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/images/3113098.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/3113099.png
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/images/3113099.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/3113100.png
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/images/3113100.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/3113101.png
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/images/3113101.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/3113102.png
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/images/3113102.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/3113103.png
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/images/3113103.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/3113104.png
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/images/3113104.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/3113105.png
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/images/3113105.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/3113106.png
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/images/3113106.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/3113107.png
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/images/3113107.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/3113108.png
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/images/3113108.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/3113109.png
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/images/3113109.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/3113110.png
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/images/3113110.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/3113111.png
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/images/3113111.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/3113112.png
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/images/3113112.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/3113113.png
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/images/3113113.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/3113114.png
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/images/3113114.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/3113115.png
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/images/3113115.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/3113116.png
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/images/3113116.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/3113117.png
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/images/3113117.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/3113118.png
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/images/3113118.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/3113119.png
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/java-broker/images/3113119.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/HA-2N-Key.png
      - copied unchanged from r1349442, qpid/trunk/qpid/doc/book/src/java-broker/images/HA-2N-Key.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/HA-2N-Key.svg
      - copied unchanged from r1349442, qpid/trunk/qpid/doc/book/src/java-broker/images/HA-2N-Key.svg
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/HA-2N-MasterFail.png
      - copied unchanged from r1349442, qpid/trunk/qpid/doc/book/src/java-broker/images/HA-2N-MasterFail.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/HA-2N-MasterFail.svg
      - copied unchanged from r1349442, qpid/trunk/qpid/doc/book/src/java-broker/images/HA-2N-MasterFail.svg
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/HA-2N-NetworkPartition.png
      - copied unchanged from r1349442, qpid/trunk/qpid/doc/book/src/java-broker/images/HA-2N-NetworkPartition.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/HA-2N-NetworkPartition.svg
      - copied unchanged from r1349442, qpid/trunk/qpid/doc/book/src/java-broker/images/HA-2N-NetworkPartition.svg
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/HA-2N-Normal.png
      - copied unchanged from r1349442, qpid/trunk/qpid/doc/book/src/java-broker/images/HA-2N-Normal.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/HA-2N-Normal.svg
      - copied unchanged from r1349442, qpid/trunk/qpid/doc/book/src/java-broker/images/HA-2N-Normal.svg
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/HA-2N-ReplicaFail.png
      - copied unchanged from r1349442, qpid/trunk/qpid/doc/book/src/java-broker/images/HA-2N-ReplicaFail.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/HA-2N-ReplicaFail.svg
      - copied unchanged from r1349442, qpid/trunk/qpid/doc/book/src/java-broker/images/HA-2N-ReplicaFail.svg
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/HA-2N-SplitBrain.png
      - copied unchanged from r1349442, qpid/trunk/qpid/doc/book/src/java-broker/images/HA-2N-SplitBrain.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/HA-2N-SplitBrain.svg
      - copied unchanged from r1349442, qpid/trunk/qpid/doc/book/src/java-broker/images/HA-2N-SplitBrain.svg
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/HA-BDBHAMessageStore-MBean-jconsole.png
      - copied unchanged from r1349442, qpid/trunk/qpid/doc/book/src/java-broker/images/HA-BDBHAMessageStore-MBean-jconsole.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/java-broker/images/HA-perftests-results.png
      - copied unchanged from r1349442, qpid/trunk/qpid/doc/book/src/java-broker/images/HA-perftests-results.png
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/
      - copied from r1339789, qpid/trunk/qpid/doc/book/src/old/
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/ACL.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/ACL.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/AMQP-.NET-Messaging-Client.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/AMQP-.NET-Messaging-Client.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/AMQP-C++-Messaging-Client.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/AMQP-C++-Messaging-Client.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/AMQP-Java-JMS-Messaging-Client.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/AMQP-Java-JMS-Messaging-Client.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/AMQP-Messaging-Broker-CPP.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/AMQP-Messaging-Broker-CPP.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/AMQP-Python-Messaging-Client.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/AMQP-Python-Messaging-Client.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/AMQP-Ruby-Messaging-Client.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/AMQP-Ruby-Messaging-Client.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/AMQP.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/AMQP.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/Binding-URL-Format.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/Binding-URL-Format.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/Book-Info.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/Book-Info.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/Book.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/Book.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/Broker-CPP.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/Broker-CPP.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/Broker-Java.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/Broker-Java.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/Clients.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/Clients.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/Connection-URL-Format.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/Connection-URL-Format.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/Download.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/Download.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/Excel-AddIn.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/Excel-AddIn.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/FAQ.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/FAQ.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/Getting-Started.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/Getting-Started.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/How-to-Use-JNDI.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/How-to-Use-JNDI.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/InfoPlugin.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/InfoPlugin.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/Introduction.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/Introduction.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/Java-Broker-StatusLogMessages.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/Java-Broker-StatusLogMessages.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/Java-JMS-Selector-Syntax.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/Java-JMS-Selector-Syntax.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/Management-Design-notes.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/Management-Design-notes.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/NET-User-Guide.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/NET-User-Guide.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/PythonBrokerTest.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/PythonBrokerTest.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/QMan-Qpid-Management-bridge.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/QMan-Qpid-Management-bridge.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/Qpid-ACLs.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/Qpid-ACLs.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/Qpid-Book.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/Qpid-Book.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/Qpid-Compatibility-And-Interoperability-Book.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/Qpid-Compatibility-And-Interoperability-Book.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/SASL-Compatibility.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/SASL-Compatibility.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/SSL.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/SSL.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/Security-Plugins.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/Security-Plugins.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/System-Properties.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/System-Properties.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/Using-Qpid-with-other-JNDI-Providers.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/Using-Qpid-with-other-JNDI-Providers.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/WCF.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/WCF.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/old/schemas.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/old/schemas.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/programming/
      - copied from r1339789, qpid/trunk/qpid/doc/book/src/programming/
    qpid/branches/java-config-and-management/qpid/doc/book/src/programming/Makefile
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/programming/Makefile
    qpid/branches/java-config-and-management/qpid/doc/book/src/programming/Message-Groups-Guide.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/programming/Message-Groups-Guide.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/programming/Programming-In-Apache-Qpid-Book.xml
      - copied, changed from r1339789, qpid/trunk/qpid/doc/book/src/programming/Programming-In-Apache-Qpid-Book.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/programming/images/
      - copied from r1339789, qpid/trunk/qpid/doc/book/src/programming/images/
    qpid/branches/java-config-and-management/qpid/doc/book/src/qmf/
      - copied from r1339789, qpid/trunk/qpid/doc/book/src/qmf/
    qpid/branches/java-config-and-management/qpid/doc/book/src/qmf/QmfBook.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/qmf/QmfBook.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/qmf/QmfIntroduction.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/src/qmf/QmfIntroduction.xml
    qpid/branches/java-config-and-management/qpid/doc/book/xsl/
      - copied from r1339789, qpid/trunk/qpid/doc/book/xsl/
    qpid/branches/java-config-and-management/qpid/doc/book/xsl/html-custom.xsl
      - copied unchanged from r1339789, qpid/trunk/qpid/doc/book/xsl/html-custom.xsl
    qpid/branches/java-config-and-management/qpid/specs/amqp.xsl
      - copied unchanged from r1339789, qpid/trunk/qpid/specs/amqp.xsl
    qpid/branches/java-config-and-management/qpid/specs/apache-filters.xml
      - copied unchanged from r1339789, qpid/trunk/qpid/specs/apache-filters.xml
    qpid/branches/java-config-and-management/qpid/tests/src/py/qpid_tests/broker_0_10/qmf_events.py
      - copied unchanged from r1353860, qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_10/qmf_events.py
Removed:
    qpid/branches/java-config-and-management/qpid/cpp/etc/cluster.conf-example.xml
    qpid/branches/java-config-and-management/qpid/cpp/etc/qpidd
    qpid/branches/java-config-and-management/qpid/cpp/etc/qpidd-primary
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/framing/AMQCommandControlBody.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/framing/BodyHandler.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/framing/BodyHandler.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/ConnectionExcluder.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/ConnectionExcluder.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/sys/windows/MemStat.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/ais_check
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/amqp_0_10/Map.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/amqp_0_10/ProxyTemplate.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/amqp_0_10/apply.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/amqp_0_10/handlers.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/amqp_0_10/serialize.cpp
    qpid/branches/java-config-and-management/qpid/doc/book/README.txt
    qpid/branches/java-config-and-management/qpid/doc/book/build-book.sh
    qpid/branches/java-config-and-management/qpid/doc/book/build-chapter.sh
    qpid/branches/java-config-and-management/qpid/doc/book/build.sh
    qpid/branches/java-config-and-management/qpid/doc/book/build.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/ACL.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/AMQP-.NET-Messaging-Client.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/AMQP-C++-Messaging-Client.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/AMQP-Compatibility.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/AMQP-Java-JMS-Messaging-Client.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/AMQP-Messaging-Broker-CPP-Book.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/AMQP-Messaging-Broker-CPP.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/AMQP-Messaging-Broker-Java-Book.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/AMQP-Messaging-Broker-Java.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/AMQP-Python-Messaging-Client.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/AMQP-Ruby-Messaging-Client.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/AMQP.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Active-Active-Cluster.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Active-Passive-Cluster.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Add-New-Users.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Binding-URL-Format.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Book-Info.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Book.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Broker-CPP.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Broker-Configuration-Guide.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Broker-Java.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Cheat-Sheet-for-configuring-Exchange-Options.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Clients.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Configure-ACLs.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Configure-Java-Qpid-to-use-a-SSL-connection.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Configure-Log4j-CompositeRolling-Appender.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Configure-the-Broker-via-config.xml.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Configuring-Management-Users.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Configuring-Qpid-JMX-Management-Console.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Connection-URL-Format.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Debug-using-log4j.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Download.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Excel-AddIn.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/FAQ.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Getting-Started.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/HA-Queue-Replication.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/How-to-Tune-M3-Java-Broker-Performance.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/How-to-Use-JNDI.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/How-to-Use-SlowConsumerDisconnect.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/InfoPlugin.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Introduction.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Java-Broker-Feature-Guide.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Java-Broker-StatusLogMessages.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Java-Environment-Variables.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Java-JMS-Selector-Syntax.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/LVQ.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Management-Console-Security.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Management-Design-notes.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Managing-CPP-Broker.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Message-Groups-Guide.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/MessageStore-Tool.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/NET-User-Guide.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Programming-In-Apache-Qpid.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/PythonBrokerTest.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/QMF-Python-Console-Tutorial.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/QMan-Qpid-Management-bridge.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/QmfBook.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/QmfIntroduction.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Qpid-ACLs.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Qpid-Book.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Qpid-Compatibility-And-Interoperability-Book.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Qpid-Interoperability-Documentation.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Qpid-JMX-Management-Console-FAQ.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Qpid-JMX-Management-Console-User-Guide.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Qpid-JMX-Management-Console.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Qpid-Java-Broker-Management-CLI.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Qpid-Java-Build-How-To.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Qpid-Java-FAQ.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Qpid-Management-Features.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Qpid-Management-Framework.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Qpid-Troubleshooting-Guide.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Running-CPP-Broker.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/SASL-Compatibility.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/SSL.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Security-Plugins.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Security.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/System-Properties.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Use-Priority-Queues.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Using-Broker-Federation.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Using-Qpid-with-other-JNDI-Providers.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/Using-message-groups.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/WCF.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/amqp-advanced-message-queueing-protocol.html
    qpid/branches/java-config-and-management/qpid/doc/book/src/css/
    qpid/branches/java-config-and-management/qpid/doc/book/src/images/jmx_console/
    qpid/branches/java-config-and-management/qpid/doc/book/src/java/
    qpid/branches/java-config-and-management/qpid/doc/book/src/producer-flow-control.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/queue-state-replication.xml
    qpid/branches/java-config-and-management/qpid/doc/book/src/schemas.xml
Modified:
    qpid/branches/java-config-and-management/   (props changed)
    qpid/branches/java-config-and-management/.gitignore
    qpid/branches/java-config-and-management/qpid/   (props changed)
    qpid/branches/java-config-and-management/qpid/cpp/bindings/qmf/ruby/qmf.rb
    qpid/branches/java-config-and-management/qpid/cpp/bindings/qpid/python/python.i
    qpid/branches/java-config-and-management/qpid/cpp/bindings/qpid/ruby/LICENSE
    qpid/branches/java-config-and-management/qpid/cpp/bindings/qpid/ruby/README.rdoc
    qpid/branches/java-config-and-management/qpid/cpp/bindings/qpid/ruby/Rakefile
    qpid/branches/java-config-and-management/qpid/cpp/bindings/qpid/ruby/features/creating_a_receiver.feature
    qpid/branches/java-config-and-management/qpid/cpp/bindings/qpid/ruby/features/creating_a_sender.feature
    qpid/branches/java-config-and-management/qpid/cpp/bindings/qpid/ruby/features/receiving_a_message.feature
    qpid/branches/java-config-and-management/qpid/cpp/bindings/qpid/ruby/features/sending_a_message.feature
    qpid/branches/java-config-and-management/qpid/cpp/bindings/qpid/ruby/features/step_definitions/address_steps.rb
    qpid/branches/java-config-and-management/qpid/cpp/bindings/qpid/ruby/features/step_definitions/connection_steps.rb
    qpid/branches/java-config-and-management/qpid/cpp/bindings/qpid/ruby/features/step_definitions/receiver_steps.rb
    qpid/branches/java-config-and-management/qpid/cpp/bindings/qpid/ruby/features/step_definitions/sender_steps.rb
    qpid/branches/java-config-and-management/qpid/cpp/bindings/qpid/ruby/features/step_definitions/session_steps.rb
    qpid/branches/java-config-and-management/qpid/cpp/bindings/qpid/ruby/lib/qpid/encoding.rb
    qpid/branches/java-config-and-management/qpid/cpp/bindings/qpid/ruby/lib/qpid/version.rb
    qpid/branches/java-config-and-management/qpid/cpp/bindings/swig_python_typemaps.i
    qpid/branches/java-config-and-management/qpid/cpp/configure.ac
    qpid/branches/java-config-and-management/qpid/cpp/docs/api/   (props changed)
    qpid/branches/java-config-and-management/qpid/cpp/etc/Makefile.am
    qpid/branches/java-config-and-management/qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj   (props changed)
    qpid/branches/java-config-and-management/qpid/cpp/include/qmf/engine/Agent.h   (props changed)
    qpid/branches/java-config-and-management/qpid/cpp/include/qmf/engine/Console.h   (props changed)
    qpid/branches/java-config-and-management/qpid/cpp/include/qpid/Options.h
    qpid/branches/java-config-and-management/qpid/cpp/include/qpid/RangeSet.h
    qpid/branches/java-config-and-management/qpid/cpp/include/qpid/Url.h
    qpid/branches/java-config-and-management/qpid/cpp/include/qpid/client/SessionBase_0_10.h
    qpid/branches/java-config-and-management/qpid/cpp/include/qpid/client/SubscriptionSettings.h
    qpid/branches/java-config-and-management/qpid/cpp/include/qpid/framing/Array.h
    qpid/branches/java-config-and-management/qpid/cpp/include/qpid/framing/Buffer.h
    qpid/branches/java-config-and-management/qpid/cpp/include/qpid/framing/FieldTable.h
    qpid/branches/java-config-and-management/qpid/cpp/include/qpid/framing/ProtocolVersion.h
    qpid/branches/java-config-and-management/qpid/cpp/include/qpid/framing/SequenceNumber.h
    qpid/branches/java-config-and-management/qpid/cpp/include/qpid/framing/StructHelper.h
    qpid/branches/java-config-and-management/qpid/cpp/include/qpid/framing/Uuid.h
    qpid/branches/java-config-and-management/qpid/cpp/include/qpid/framing/amqp_types.h
    qpid/branches/java-config-and-management/qpid/cpp/include/qpid/log/Logger.h
    qpid/branches/java-config-and-management/qpid/cpp/include/qpid/log/Options.h
    qpid/branches/java-config-and-management/qpid/cpp/include/qpid/log/Selector.h
    qpid/branches/java-config-and-management/qpid/cpp/include/qpid/log/Statement.h
    qpid/branches/java-config-and-management/qpid/cpp/include/qpid/management/Buffer.h
    qpid/branches/java-config-and-management/qpid/cpp/include/qpid/sys/SystemInfo.h
    qpid/branches/java-config-and-management/qpid/cpp/managementgen/qmfgen/management-types.xml
    qpid/branches/java-config-and-management/qpid/cpp/managementgen/qmfgen/schema.py
    qpid/branches/java-config-and-management/qpid/cpp/managementgen/qmfgen/templates/Class.cpp
    qpid/branches/java-config-and-management/qpid/cpp/rubygen/framing.0-10/structs.rb
    qpid/branches/java-config-and-management/qpid/cpp/src/   (props changed)
    qpid/branches/java-config-and-management/qpid/cpp/src/CMakeLists.txt   (contents, props changed)
    qpid/branches/java-config-and-management/qpid/cpp/src/Makefile.am
    qpid/branches/java-config-and-management/qpid/cpp/src/acl.mk
    qpid/branches/java-config-and-management/qpid/cpp/src/ha.mk
    qpid/branches/java-config-and-management/qpid/cpp/src/posix/QpiddBroker.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qmf/AgentSession.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qmf/AgentSessionImpl.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qmf/ConsoleSessionImpl.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qmf/EventNotifierImpl.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qmf/PrivateImplRef.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qmf/engine/Agent.cpp   (props changed)
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/Options.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/RefCounted.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/UrlArray.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/UrlArray.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/acl/   (props changed)
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/acl/Acl.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/acl/Acl.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/acl/AclData.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/acl/AclPlugin.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/acl/AclReader.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/acl/management-schema.xml
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/agent/ManagementAgentImpl.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/   (props changed)
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/AclModule.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/Bridge.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/Bridge.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/Broker.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/Broker.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/Connection.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/Connection.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/ConnectionFactory.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/ConnectionHandler.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/ConnectionHandler.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/ConnectionObservers.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/Daemon.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/DirectExchange.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/DtxManager.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/DtxManager.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/DtxWorkRecord.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/Exchange.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/Fairshare.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/FanOutExchange.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/HeadersExchange.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/LegacyLVQ.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/LegacyLVQ.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/Link.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/Link.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/LinkRegistry.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/LinkRegistry.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/Message.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/Message.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/MessageDeque.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/MessageDeque.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/MessageGroupManager.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/MessageMap.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/MessageMap.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/Messages.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/NameGenerator.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/PriorityQueue.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/PriorityQueue.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/Queue.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/Queue.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/QueueFlowLimit.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/QueueListeners.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/QueueListeners.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/QueuePolicy.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/QueueRegistry.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/QueuedMessage.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/SaslAuthenticator.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/SecureConnectionFactory.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/SemanticState.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/SemanticState.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/SessionAdapter.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/SessionAdapter.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/SessionContext.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/SessionHandler.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/SessionHandler.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/SessionState.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/SessionState.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/System.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/System.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/TopicExchange.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/TopicExchange.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/client/ConnectionHandler.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/client/ConnectionImpl.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/client/LoadPlugins.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/client/PrivateImplRef.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/client/SessionImpl.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/client/SslConnector.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/client/TCPConnector.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/client/TCPConnector.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/cluster/Cluster.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/cluster/ClusterMap.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/cluster/ClusterTimer.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/cluster/Connection.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/cluster/Connection.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/cluster/ConnectionCodec.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/cluster/Cpg.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/cluster/Cpg.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/cluster/InitialStatusMap.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/cluster/UpdateClient.cpp   (contents, props changed)
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/cluster/UpdateClient.h   (props changed)
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/cluster/types.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/console/ClassKey.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/framing/AMQContentBody.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/framing/AMQContentBody.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/framing/AMQFrame.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/framing/Buffer.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/framing/FieldTable.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/framing/FrameSet.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/framing/FrameSet.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/framing/ProtocolInitiation.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/framing/Uuid.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/framing/amqp_framing.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/Backup.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/Backup.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/BrokerReplicator.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/HaBroker.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/HaBroker.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/HaPlugin.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/QueueReplicator.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/QueueReplicator.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/Settings.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/ha/management-schema.xml
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/log/Logger.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/log/Options.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/log/Selector.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/log/Statement.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/log/posix/SinkOptions.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/management/Buffer.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/management/ManagementAgent.cpp   (contents, props changed)
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/management/ManagementAgent.h   (contents, props changed)
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/management/ManagementDirectExchange.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/management/ManagementTopicExchange.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/messaging/PrivateImplRef.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/replication/ReplicatingEventListener.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/replication/ReplicationExchange.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/store/MessageStorePlugin.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/store/ms-clfs/MessageLog.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/store/ms-clfs/Transaction.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/store/ms-clfs/TransactionLog.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/sys/AsynchIOHandler.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/sys/AsynchIOHandler.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/sys/SslPlugin.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/sys/TCPIOPlugin.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/sys/posix/LockFile.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/sys/posix/MemStat.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/sys/posix/PollableCondition.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/sys/posix/SystemInfo.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/sys/ssl/SslHandler.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/sys/ssl/SslHandler.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/sys/ssl/SslIo.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/sys/ssl/SslIo.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/sys/unordered_map.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/sys/windows/IocpPoller.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/sys/windows/Socket.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/sys/windows/SslAsynchIO.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/sys/windows/SystemInfo.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/xml/XmlExchange.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpid/xml/XmlExchange.h
    qpid/branches/java-config-and-management/qpid/cpp/src/qpidd.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/qpidd.h
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/   (props changed)
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/Array.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/CMakeLists.txt
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/ExchangeTest.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/FieldTable.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/Frame.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/FramingTest.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/Makefile.am
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/MessageBuilderTest.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/MessageTest.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/MessageUtils.h
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/MessagingSessionTests.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/QueueFlowLimitTest.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/QueueTest.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/RangeSet.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/RefCounted.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/ReplicationTest.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/SessionState.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/StringUtils.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/TestMessageStore.h
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/TimerTest.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/TopicExchangeTest.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/TxPublishTest.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/Uuid.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/acl.py
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/brokertest.py
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/cli_tests.py
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/cluster.cmake
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/cluster.mk
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/cluster_failover
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/cluster_python_tests
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/cluster_read_credit
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/cluster_test_logs.py
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/cluster_tests.py   (contents, props changed)
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/clustered_replication_test
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/federated_cluster_test
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/federation.py
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/ha_tests.py
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/install_env.sh.in
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/ipv6_test
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/logging.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/qpid-cluster-benchmark
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/qpid-cpp-benchmark
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/qpid-latency-test.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/qpid-ping.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/qpid-receive.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/qpid-send.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/qpid-txtest.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/run_acl_tests
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/run_cluster_authentication_soak
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/run_cluster_authentication_test
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/run_cluster_test
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/run_cluster_tests
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/run_failover_soak
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/run_federation_sys_tests
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/run_federation_tests
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/sasl.mk
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/sasl_fed_ex_dynamic_cluster
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/sasl_fed_ex_link_cluster
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/sasl_fed_ex_queue_cluster
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/sasl_fed_ex_route_cluster
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/sasl_test_setup.sh
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/ssl_test
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/start_cluster
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/test_env.sh.in
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/testagent.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/txjob.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/txshift.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/tests/windows/DisableWin32ErrorWindows.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/windows/QpiddBroker.cpp
    qpid/branches/java-config-and-management/qpid/cpp/src/windows/SCM.cpp
    qpid/branches/java-config-and-management/qpid/cpp/xml/cluster.xml
    qpid/branches/java-config-and-management/qpid/doc/book/Makefile
    qpid/branches/java-config-and-management/qpid/doc/book/src/   (props changed)
    qpid/branches/java-config-and-management/qpid/extras/qmf/src/py/qmf/console.py
    qpid/branches/java-config-and-management/qpid/java/amqp-1-0-client/   (props changed)
    qpid/branches/java-config-and-management/qpid/java/amqp-1-0-client-jms/   (props changed)
    qpid/branches/java-config-and-management/qpid/java/amqp-1-0-common/   (props changed)
    qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java   (props changed)
    qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java   (props changed)
    qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java   (props changed)
    qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/   (props changed)
    qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java   (props changed)
    qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java   (props changed)
    qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java   (props changed)
    qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java   (props changed)
    qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java   (props changed)
    qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java   (props changed)
    qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java   (props changed)
    qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java   (props changed)
    qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java   (props changed)
    qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java   (props changed)
    qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java   (props changed)
    qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java   (props changed)
    qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/   (props changed)
    qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java   (props changed)
    qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java   (props changed)
    qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java   (props changed)
    qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java   (props changed)
    qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc   (props changed)
    qpid/branches/java-config-and-management/qpid/packaging/windows/   (props changed)
    qpid/branches/java-config-and-management/qpid/python/   (props changed)
    qpid/branches/java-config-and-management/qpid/python/examples/api/spout   (props changed)
    qpid/branches/java-config-and-management/qpid/python/qpid/concurrency.py   (props changed)
    qpid/branches/java-config-and-management/qpid/python/qpid/connection.py
    qpid/branches/java-config-and-management/qpid/python/qpid/messaging/driver.py
    qpid/branches/java-config-and-management/qpid/python/qpid/messaging/util.py
    qpid/branches/java-config-and-management/qpid/specs/management-schema.xml
    qpid/branches/java-config-and-management/qpid/tests/src/py/qpid_tests/broker_0_10/__init__.py
    qpid/branches/java-config-and-management/qpid/tests/src/py/qpid_tests/broker_0_10/management.py
    qpid/branches/java-config-and-management/qpid/tests/src/py/qpid_tests/broker_0_10/msg_groups.py
    qpid/branches/java-config-and-management/qpid/tests/src/py/qpid_tests/broker_0_10/new_api.py
    qpid/branches/java-config-and-management/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py   (props changed)
    qpid/branches/java-config-and-management/qpid/tools/src/py/.gitignore
    qpid/branches/java-config-and-management/qpid/tools/src/py/qmf-tool
    qpid/branches/java-config-and-management/qpid/tools/src/py/qpid-config
    qpid/branches/java-config-and-management/qpid/tools/src/py/qpid-ha
    qpid/branches/java-config-and-management/qpid/tools/src/py/qpid-printevents
    qpid/branches/java-config-and-management/qpid/tools/src/py/qpid-stat
    qpid/branches/java-config-and-management/qpid/tools/src/py/qpid-tool
    qpid/branches/java-config-and-management/qpid/tools/src/py/qpidtoollibs/broker.py
    qpid/branches/java-config-and-management/qpid/wcf/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp

Propchange: qpid/branches/java-config-and-management/
------------------------------------------------------------------------------
  Merged /qpid/trunk:r1300143-1349442,1349444-1349530,1349532-1353860

Modified: qpid/branches/java-config-and-management/.gitignore
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/.gitignore?rev=1354874&r1=1354873&r2=1354874&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/.gitignore (original)
+++ qpid/branches/java-config-and-management/.gitignore Thu Jun 28 09:14:52 2012
@@ -32,7 +32,7 @@ configure
 .deps
 .libs
 autom4te.cache
-aclocal.m4
+*.m4
 developer.doxygen
 user.doxygen
 qpid/cpp/libtool
@@ -53,10 +53,15 @@ release
 .settings
 generated/
 target
+classes
+qpid/java/lib/*.jar
+qpid/java/lib/required
 qpid/java/lib/bdbstore
 qpid/java/lib/cobertura
 qpid/java/lib/findbugs
 qpid/java/lib/ivy
+qpid/java/lib/csvjdbc
+qpid/java/lib/jfree
 qpid/java/build.overrides
 qpid/java/felix-cache/*
 qpid/java/eclipse-projects

Propchange: qpid/branches/java-config-and-management/qpid/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid:r1300143-1349442,1349444-1349530,1349532-1353860

Modified: qpid/branches/java-config-and-management/qpid/cpp/bindings/qmf/ruby/qmf.rb
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/cpp/bindings/qmf/ruby/qmf.rb?rev=1354874&r1=1354873&r2=1354874&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/cpp/bindings/qmf/ruby/qmf.rb (original)
+++ qpid/branches/java-config-and-management/qpid/cpp/bindings/qmf/ruby/qmf.rb Thu Jun 28 09:14:52 2012
@@ -26,18 +26,28 @@ module Qmf
 
   # Pull all the TYPE_* constants into Qmf namespace.  Maybe there's an easier way?
   Qmfengine.constants.each do |c|
+    c = c.to_s
     if c.index('TYPE_') == 0 or c.index('ACCESS_') == 0 or c.index('DIR_') == 0 or
         c.index('CLASS_') == 0 or c.index('SEV_') == 0
       const_set(c, Qmfengine.const_get(c))
     end
   end
 
+  module StringHelpers
+    def ensure_encoding(str)
+      enc = (Encoding.default_external.name || "UTF-8" rescue "UTF-8")
+      str.respond_to?(:force_encoding) ? str.force_encoding(enc) : str
+    end
+  end
+
   class Util
+    include StringHelpers
+
     def qmf_to_native(val)
       case val.getType
       when TYPE_UINT8, TYPE_UINT16, TYPE_UINT32 then val.asUint
       when TYPE_UINT64                          then val.asUint64
-      when TYPE_SSTR, TYPE_LSTR                 then val.asString
+      when TYPE_SSTR, TYPE_LSTR                 then ensure_encoding(val.asString)
       when TYPE_ABSTIME                         then val.asInt64
       when TYPE_DELTATIME                       then val.asUint64
       when TYPE_REF                             then ObjectId.new(val.asObjectId)
@@ -161,6 +171,7 @@ module Qmf
   ##==============================================================================
 
   class ConnectionSettings
+    include StringHelpers
     attr_reader :impl
 
     def initialize(url = nil)
@@ -192,7 +203,7 @@ module Qmf
     def get_attr(key)
       _v = @impl.getAttr(key)
       if _v.isString()
-        return _v.asString()
+        return ensure_encoding(_v.asString())
       elsif _v.isUint()
         return _v.asUint()
       elsif _v.isBool()
@@ -348,7 +359,7 @@ module Qmf
       @broker = kwargs[:broker] if kwargs.include?(:broker)
       @allow_sets = :true
 
-      if cls:
+      if cls
         @event_class = cls
         @impl = Qmfengine::Event.new(@event_class.impl)
       elsif kwargs.include?(:impl)
@@ -434,7 +445,7 @@ module Qmf
       @allow_sets = :false
       @broker = kwargs[:broker] if kwargs.include?(:broker)
 
-      if cls:
+      if cls
         @object_class = cls
         @impl = Qmfengine::Object.new(@object_class.impl)
       elsif kwargs.include?(:impl)
@@ -707,6 +718,8 @@ module Qmf
   end
 
   class MethodResponse
+    include StringHelpers
+
     def initialize(impl)
       @impl = Qmfengine::MethodResponse.new(impl)
     end
@@ -720,7 +733,7 @@ module Qmf
     end
 
     def text
-      exception.asString
+      ensure_encoding(exception.asString)
     end
 
     def args
@@ -885,6 +898,7 @@ module Qmf
   end
 
   class SchemaClassKey
+    include StringHelpers
     attr_reader :impl
     def initialize(i)
       @impl = Qmfengine::SchemaClassKey.new(i)
@@ -899,7 +913,7 @@ module Qmf
     end
 
     def to_s
-      @impl.asString
+      ensure_encoding(@impl.asString)
     end
   end
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org