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/11/19 13:48:08 UTC
svn commit: r1411155 [1/6] - in
/qpid/branches/java-broker-config-qpid-4390/qpid: ./ cpp/ cpp/bindings/
cpp/bindings/qpid/dotnet/
cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/
cpp/bindings/qpid/dotnet/msvc9/ cpp/bindings/qpid/dotnet/s...
Author: robbie
Date: Mon Nov 19 12:47:53 2012
New Revision: 1411155
URL: http://svn.apache.org/viewvc?rev=1411155&view=rev
Log:
merge from trunk up to r 1411033
Added:
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/amqp/MapReader.cpp
- copied unchanged from r1411033, qpid/trunk/qpid/cpp/src/qpid/amqp/MapReader.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/amqp/MapReader.h
- copied unchanged from r1411033, qpid/trunk/qpid/cpp/src/qpid/amqp/MapReader.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/amqp/DataReader.cpp
- copied unchanged from r1411033, qpid/trunk/qpid/cpp/src/qpid/broker/amqp/DataReader.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/amqp/DataReader.h
- copied unchanged from r1411033, qpid/trunk/qpid/cpp/src/qpid/broker/amqp/DataReader.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/amqp/Filter.cpp
- copied unchanged from r1411033, qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Filter.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/amqp/Filter.h
- copied unchanged from r1411033, qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Filter.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/amqp/NodeProperties.cpp
- copied unchanged from r1411033, qpid/trunk/qpid/cpp/src/qpid/broker/amqp/NodeProperties.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/amqp/NodeProperties.h
- copied unchanged from r1411033, qpid/trunk/qpid/cpp/src/qpid/broker/amqp/NodeProperties.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
- copied unchanged from r1411033, qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.h
- copied unchanged from r1411033, qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/posix/BSDSocket.cpp
- copied unchanged from r1411033, qpid/trunk/qpid/cpp/src/qpid/sys/posix/BSDSocket.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/posix/BSDSocket.h
- copied unchanged from r1411033, qpid/trunk/qpid/cpp/src/qpid/sys/posix/BSDSocket.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/windows/WinSocket.cpp
- copied unchanged from r1411033, qpid/trunk/qpid/cpp/src/qpid/sys/windows/WinSocket.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/windows/WinSocket.h
- copied unchanged from r1411033, qpid/trunk/qpid/cpp/src/qpid/sys/windows/WinSocket.h
qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Miscellaneous.xml
- copied unchanged from r1411033, qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Miscellaneous.xml
qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/commonEntities.xml
- copied unchanged from r1411033, qpid/trunk/qpid/doc/book/src/java-broker/commonEntities.xml
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client-jms/example/build.xml
- copied unchanged from r1411033, qpid/trunk/qpid/java/amqp-1-0-client-jms/example/build.xml
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/example/
- copied from r1411033, qpid/trunk/qpid/java/amqp-1-0-client/example/
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/example/build.xml
- copied unchanged from r1411033, qpid/trunk/qpid/java/amqp-1-0-client/example/build.xml
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/example/src/
- copied from r1411033, qpid/trunk/qpid/java/amqp-1-0-client/example/src/
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/example/src/main/
- copied from r1411033, qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/example/src/main/java/
- copied from r1411033, qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/example/src/main/java/org/
- copied from r1411033, qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/
- copied from r1411033, qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/
- copied from r1411033, qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/
- copied from r1411033, qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/
- copied from r1411033, qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Command.java
- copied unchanged from r1411033, qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Command.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Demo.java
- copied unchanged from r1411033, qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Demo.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Dump.java
- copied unchanged from r1411033, qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Dump.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Filereceiver.java
- copied unchanged from r1411033, qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Filereceiver.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Filesender.java
- copied unchanged from r1411033, qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Filesender.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Receive.java
- copied unchanged from r1411033, qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Receive.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Request.java
- copied unchanged from r1411033, qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Request.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Respond.java
- copied unchanged from r1411033, qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Respond.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Send.java
- copied unchanged from r1411033, qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Send.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java
- copied unchanged from r1411033, qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/common/src/test/java/org/apache/qpid/framing/FieldTableTest.java
- copied unchanged from r1411033, qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/framing/FieldTableTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java
- copied unchanged from r1411033, qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/python/qpid/tests/util.py
- copied unchanged from r1411033, qpid/trunk/qpid/python/qpid/tests/util.py
qpid/branches/java-broker-config-qpid-4390/qpid/tests/src/py/qpid_tests/broker_0_9/messageheader.py
- copied unchanged from r1411033, qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_9/messageheader.py
Removed:
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/alloca.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/posix/Socket.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/ssl/SslHandler.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/ssl/SslHandler.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/ssl/SslIo.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/ssl/SslIo.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/windows/Socket.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Command.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Demo.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Dump.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Filereceiver.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Filesender.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/ReadBytes.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receive.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Request.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Respond.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Send.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/SendBytes.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/ (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/KEYS
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/BuildInstallSettings.cmake
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/CMakeLists.txt
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/CMakeLists.txt
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.cs
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/sessionreceiver.cs
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bld-winsdk.ps1
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/configure.ac
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/docs/api/ (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/docs/api/CMakeLists.txt
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/etc/qpidd.service.in
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qmf/engine/Agent.h (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qmf/engine/Console.h (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/framing/FieldValue.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/sys/IOHandle.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/sys/SystemInfo.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/sys/posix/PrivatePosix.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/types/Variant.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/managementgen/qmfgen/templates/Event.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/managementgen/qmfgen/templates/Event.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/ (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/CMakeLists.txt (contents, props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/Makefile.am
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/amqp.cmake
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qmf/engine/Agent.cpp (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/NullSaslServer.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/Options.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/acl/ (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/amqp/descriptors.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/ (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/Bridge.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/Bridge.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/Broker.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/Broker.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/ConfigurationObserver.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/Exchange.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/Exchange.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/ExchangeRegistry.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/Link.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/Link.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/LinkRegistry.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/Queue.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/Queue.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/QueueRegistry.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/QueueRegistry.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/SemanticState.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/SessionAdapter.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/amqp/Outgoing.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/amqp/Session.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/amqp/Session.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/client/SslConnector.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/client/TCPConnector.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/client/TCPConnector.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/framing/FieldValue.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/ha/BrokerReplicator.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/ha/HaBroker.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/ha/HaPlugin.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/ha/Primary.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/ha/Primary.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/ha/QueueReplicator.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/ha/types.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/ha/types.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/management/ManagementAgent.cpp (contents, props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/management/ManagementAgent.h (contents, props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/messaging/amqp/DriverImpl.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/messaging/amqp/ReceiverContext.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/messaging/amqp/ReceiverContext.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/messaging/amqp/SenderContext.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/messaging/amqp/SenderContext.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/messaging/amqp/SessionContext.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/messaging/amqp/SslTransport.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/messaging/amqp/SslTransport.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/messaging/amqp/TcpTransport.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/messaging/amqp/TcpTransport.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/AggregateOutput.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/AggregateOutput.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/AsynchIO.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/AsynchIOHandler.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/AsynchIOHandler.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/SecuritySettings.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/Socket.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/SocketAddress.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/SslPlugin.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/TCPIOPlugin.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/Timer.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/TimerWarnings.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/posix/IOHandle.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/posix/PollableCondition.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/posix/PosixPoller.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/posix/SystemInfo.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/rdma/rdma_wrap.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/rdma/rdma_wrap.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/ssl/SslSocket.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/windows/IOHandle.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/windows/IoHandlePrivate.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/windows/IocpPoller.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/windows/SslAsynchIO.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/windows/SslAsynchIO.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/windows/SystemInfo.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/types/Variant.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/rdma.cmake
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/ssl.cmake
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/ssl.mk
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/ (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/DispatcherTest.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/FieldTable.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/Makefile.am
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/PollerTest.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/SystemInfo.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/cluster_tests.py (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/ha_test.py
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/ha_tests.py
qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml
qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml
qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Getting-Started.xml
qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml
qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Installation.xml
qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Introduction.xml
qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Queues-OtherTypes.xml
qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Security-Authentication-Providers.xml
qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Security-SSL.xml
qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Stores-BDB-Store.xml
qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Stores-Derby-Store.xml
qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Stores-HA-BDB-Store.xml
qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Stores-Memory-Store.xml
qpid/branches/java-broker-config-qpid-4390/qpid/java/ (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/ (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client-jms/ (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client-jms/build.xml
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageConsumerImpl.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueBrowserImpl.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/build.xml
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-common/ (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ReceivingLinkEndpoint.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/ (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/bin/ (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/build.deps
qpid/branches/java-broker-config-qpid-4390/qpid/java/build.xml
qpid/branches/java-broker-config-qpid-4390/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/common.xml
qpid/branches/java-broker-config-qpid-4390/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/module.xml
qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/ClientRegistry.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ClientRegistryTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (contents, props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/ (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/CPPExcludes (contents, props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/Excludes (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/JavaBDBExcludes (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/JavaExcludes (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/JavaPre010Excludes (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/JavaTransientExcludes (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/XAExcludes (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/cpp.async.testprofile (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/cpp.cluster.testprofile (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/cpp.noprefetch.testprofile (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/cpp.ssl.excludes (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/cpp.ssl.testprofile (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/cpp.testprofile (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb.0-9-1.testprofile (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby.0-9-1.testprofile (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms.0-9-1.testprofile (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/log4j-test.xml (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/test-provider.properties (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/test_resources/ (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/testprofile.defaults (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/packaging/windows/ (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/packaging/windows/installer.proj (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/packaging/windows/qpidc.wxs
qpid/branches/java-broker-config-qpid-4390/qpid/python/ (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/python/examples/api/spout (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/python/qpid/client.py
qpid/branches/java-broker-config-qpid-4390/qpid/python/qpid/concurrency.py (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/python/qpid/connection08.py
qpid/branches/java-broker-config-qpid-4390/qpid/python/qpid/delegates.py
qpid/branches/java-broker-config-qpid-4390/qpid/python/qpid/messaging/driver.py
qpid/branches/java-broker-config-qpid-4390/qpid/python/qpid/testlib.py
qpid/branches/java-broker-config-qpid-4390/qpid/python/qpid/tests/__init__.py
qpid/branches/java-broker-config-qpid-4390/qpid/python/qpid/util.py
qpid/branches/java-broker-config-qpid-4390/qpid/tests/src/py/qpid_tests/broker_0_8/basic.py
qpid/branches/java-broker-config-qpid-4390/qpid/tests/src/py/qpid_tests/broker_0_9/__init__.py
qpid/branches/java-broker-config-qpid-4390/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/tools/src/py/qpid-config
qpid/branches/java-broker-config-qpid-4390/qpid/wcf/samples/Channel/HelloWorld/HelloWorld.cs
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid:r1401294-1411033
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/KEYS
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/KEYS?rev=1411155&r1=1411154&r2=1411155&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/KEYS (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/KEYS Mon Nov 19 12:47:53 2012
@@ -426,3 +426,58 @@ U6nOKyS2R4/y+0s1J85amn4YHTUhOHYRnQAEckX8
MxumwmEHVDFpDpKCCnJa9A==
=Uryx
-----END PGP PUBLIC KEY BLOCK-----
+pub 4096R/845FD0AC 2012-11-06
+uid Ted Ross (CODE SIGNING KEY) <tr...@apache.org>
+sub 4096R/59780337 2012-11-06
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+mQINBFCZY/EBEACWoKgXLUAPsunBvW6CpfAiif706gJAO+Svlg5QX7BWaYEl1yhj
+/x1MXCtiEgcDZMv+dBPXkLRNQpyxVe+wrYCFTLhZIfQHtWyd8kzphRQHL+igmiC0
+jC5y5ZutMTFnVgeHls4A80lKSJe+gcd2CdbxeVIEf8i1OLIVGLj6a+bNgfFLiL5K
+W297G+Xi8EYSccXqo9S/hleih7FTIioHeyJd/BBJI5eQIJVTz9cjaC1A3/tzluFO
+zu8fpVHRWY2jRd/pz/TkVbcpwPPMhS7vPzFMIexrs0LhGEn2C4D0XN82niA19as6
+KwKhJdiUX4vAowikX0U96CySY4H5pboq74wVYyq9kKqdNL0OlV79cCwwMkvjk7fn
+ANiBYLV/N3FQur349/QroUo5MtHgQP5mv/OSLBS00KHdhjRUCJfCiGkimU9LlWP3
+xaLZWPFgeA8tCzmsnpjFTbyFk0Ar/MaQvHVDK8ks52Vo7mvBo+b8VF+NsYis58pM
+EvjEBdAJhooB43aCIfTszEZYPSnSoOCr1l6TGNpj5m7TzxMbHGNOW3xKQxtKSHmY
+pWr8lEylknI+KZR7IAwf2NrjcJThVRv6ccwXFDP6H4hljEsSTlqOPh+rLpqbdmQe
+FEuakQFZALQhAsQyiJaogymLbrqCgVBVzpXdiX2+1TPiZps+VRaaQUd+HwARAQAB
+tC5UZWQgUm9zcyAoQ09ERSBTSUdOSU5HIEtFWSkgPHRyb3NzQGFwYWNoZS5vcmc+
+iQI3BBMBAgAhAhsDAh4BAheABQJQmWToBQsJCAcDBRUKCQgLBRYCAwEAAAoJEOaX
+VceEX9CsPsIP/igNMqFCDC+1xuK9oWgzp1WHT3yG6PsqTMh6fKRtD2wa0VTkcY4f
+BzoaJyK956tfQxMygcyhzGoj/Y7Oz6lsgIHKLVck64pqj5+heQJHaXjGIoqsUWQ2
+xyH/TkbXAK97BK2HBPAxla4qdB+mudUYspw6cfXRlRooNaBmlVTLP1F8j5HDNqb/
+ALz3fHcQfwFsTRSZVq89XZVROAYTygor1eLya7JxdTZdOIPJTeDocPRe3GR6BDDJ
+/mioXG9UEYIg/3Z6oWWTzkBCyV8LYef+Zg471bVsz4c4tut7DZClCA4eUJA3nLBD
+jMBJrEhzEGrfMaDVND+oFxPl4O/5Hw/jmG/EiGEA2OAAwh8ZgjXlpDrhlAAkHiVp
+2riTMMqDxBdbq8BZWhTqj7ZxB+CDMqr5t5LQb/GjHVXfmH8kfv/3z/PXoPwmMx6N
+nuMmDPkUy996ak2UYoVLNt4JVFEFqN2Zl/2MCOpCOs9L83FmGz5bbKnQ5dF7x566
+2woH31x+yplPP5jeFe9cgPnRgDrfbFqSBwBFmK+SAVTDtW3aOVAfOnVLq7M3+Q+q
+AWzs+hWA4pflQDpA6dtffUJ0xlAyGzUHnB8atfqf9bwcUBzdGybyf5Cg4QwZqSxt
+HX1Lj8Ba/FIT52pmyPF5YT6xdgZRk96JGpiraaNiTkZ0o22aabJ0QGtguQINBFCZ
+Y/EBEADHkmcxZjY6msJQfe6GQZ5k96pC3LJ0oa/1P1qAtLKONFt8WnaCOLlD4ozz
+8M1WXNMfZdVXD4rRs6FR62MshjRlVdcG59Eyi3q1UxH1tseJacUqkyuXapq41zi1
+ZDOtZPvPJHtiyyG0tS/Uu3Xk2HP7/ECVOMittis9++/BSXyVr9fap09ADWWYAIP7
+t8JZDfUPnEALYs0u9ofOjuEJh6aB1RFqmiVy1PMjHvxcz9AmMYN+AILIJgr2KS7N
+Swh43o8JSOf0503bwkTP6n6uv3g0/CyK60UI5BNJVn7PEuOVWoLcMSYBVRI04lwm
+B19T0QUR3ulUIJy43BAFX4nk3QIFbDdXehhbXP/1bBN87CyMMJRN4zAqR9Tg/pD7
+ZJDUdlXaZ+4WW/A43oYfqx1kBFJQN5Xvxb6KCVWTvw6wIGNxSG2gioYVyXqIbed/
+mZJ5FHJA/ZRvbN7MCaF1Yf34ERodueG7DhXm5HHUQqYyt0yTFHJbLybyNQz3fuob
+RvBsBrzIHGowgyI+18rq2fIDv/zWxjwHlwdhPjrehh0yO9BYfPtIYkmu3U7ddMrk
+p8mTLhQBYeduLXp6DuflGLjmwdjEfqyXRWJxtscgvhQaArL+srmqu1sVl7vqZHXO
+4m20i+ogjsmsfXM6f6NfRph4yKpgW2RVtZVRhZuprzVEFryB3QARAQABiQIfBBgB
+AgAJBQJQmWPxAhsMAAoJEOaXVceEX9CsRQAP/10ySvtgjW1phfpC8wDlG/BG1VVQ
+Edhr+vmWQS69wM47HDV28YKjSPGc+OrGiUbWm/pePg9LWg6IMU3SPiRStORNbBEP
+WtTRFo9P5XyfulN9/KR4m1BtUjdmaXFpT0WomR5zpJ3Mq5bgJfFffCWt3+WWqedg
+H22Ti+TesDS4dE8fplUWEHTFaKOUQJSbTs2nDKVxc86v6ssgkPvSupMUtz5mSZS5
+lUnf7MfVLdcaYvOeB52pXaPbXJqejM/NfOwPZMEP6v9tUgRbeN+FvyU3ozFlfUaZ
+MbZNahYz6h6YCdK+Uk9Jor0IB5vUgGKiKWikR/3pIxNzlBAFXwi/sTwUEKZjBPlZ
+6if8EIJ8S44xuVuPyPaNaUVJp8PlAvY/jzCCe1yuFsyI3e7iwIS8ykUt9ntmQQ2C
+s/l0XX+GQ8eDrTN2yALKszQ59M0KEKC+YWZRrAP2ZJRf4odBYTHIULI9PftTdztb
+EP1CZqvRNrvdrhX4zY3XCn4CS5dSnCvf6mFZpYvR0G1TeK0sBlMhNefaVmZ9BWd9
+fJ9FLilcEh7TgbhNSd5z1EAuljniwSnj3nN929fh82PgB2yON2m1ZvQfvrNL15Hm
+EiP9S9DGf3NdGjeO6RWzJvuUv+9lYsL3gI3gcKy7EOem+7VqAGiU3m0MOsb40Odg
+YUWAO6m/prr2Y/Qg
+=G9bq
+-----END PGP PUBLIC KEY BLOCK-----
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/BuildInstallSettings.cmake
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/BuildInstallSettings.cmake?rev=1411155&r1=1411154&r2=1411155&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/BuildInstallSettings.cmake (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/BuildInstallSettings.cmake Mon Nov 19 12:47:53 2012
@@ -31,6 +31,7 @@ else()
endif(EXISTS "${PROJECT_SOURCE_DIR}/../QPID_VERSION.txt")
string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)\n" "\\1" QPID_VERSION_MAJOR "${QPID_VERSION}")
string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)\n" "\\2" QPID_VERSION_MINOR "${QPID_VERSION}")
+set (QPID_VERSION_FULL "${QPID_VERSION_MAJOR}.${QPID_VERSION_MINOR}")
# When doing installs, there are a number of components that the item can
# be associated with. Since there may be different sets of components desired
@@ -131,6 +132,16 @@ function(set_absolute_install_path var i
endif ()
endfunction(set_absolute_install_path)
+# Figure out the default library suffix
+if (NOT DEFINED LIB_SUFFIX)
+ get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
+ if (${LIB64} STREQUAL "TRUE" AND ${CMAKE_SIZEOF_VOID_P} STREQUAL "8")
+ set(LIB_SUFFIX 64)
+ else()
+ set(LIB_SUFFIX "")
+ endif()
+endif()
+
# In rpm builds the build sets some variables:
# CMAKE_INSTALL_PREFIX - this is a standard cmake variable
# INCLUDE_INSTALL_DIR
@@ -140,10 +151,10 @@ endfunction(set_absolute_install_path)
# So make these cached variables and the specific variables non cached and
# derived from them.
set (INCLUDE_INSTALL_DIR include CACHE PATH "Include file directory")
- set (LIB_INSTALL_DIR lib CACHE PATH "Library object file directory")
+ set (LIB_INSTALL_DIR lib${LIB_SUFFIX} CACHE PATH "Library object file directory")
set (SYSCONF_INSTALL_DIR etc CACHE PATH "System read only configuration directory")
set (SHARE_INSTALL_DIR share CACHE PATH "Shared read only data directory")
- set (DOC_INSTALL_DIR ${SHARE_INSTALL_DIR}/doc/${CMAKE_PROJECT_NAME}-${QPID_VERSION} CACHE PATH "Shared read only data directory")
+ set (DOC_INSTALL_DIR ${SHARE_INSTALL_DIR}/doc/${CMAKE_PROJECT_NAME}-${QPID_VERSION_FULL} CACHE PATH "Shared read only data directory")
set (QPID_COMPONENT_BROKER runtime)
set (QPID_COMPONENT_CLIENT runtime)
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/CMakeLists.txt?rev=1411155&r1=1411154&r2=1411155&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/CMakeLists.txt (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/CMakeLists.txt Mon Nov 19 12:47:53 2012
@@ -25,6 +25,12 @@ endif(COMMAND cmake_policy)
include(BuildInstallSettings.cmake)
+if (${CMAKE_VERSION} VERSION_LESS "2.8.0")
+ set (OPTIONAL_ARG "")
+else()
+ set (OPTIONAL_ARG OPTIONAL)
+endif()
+
set (qpidc_version ${QPID_VERSION_MAJOR}.${QPID_VERSION_MINOR})
enable_testing()
@@ -78,6 +84,15 @@ set(CPACK_PACKAGE_VERSION_MINOR "${QPID_
set(CPACK_PACKAGE_VERSION_PATCH "0")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "qpidc-${qpidc_version}")
+# Add custom target for docs since we don't include a cmake file there directly.
+# If we can't use OPTIONAL in the install command then we have to make the docs
+# every time so that the install target succeeds
+if (OPTIONAL_ARG)
+ add_custom_target(docs)
+else (OPTIONAL_ARG)
+ add_custom_target(docs ALL)
+endif (OPTIONAL_ARG)
+
add_subdirectory(managementgen)
add_subdirectory(src)
add_subdirectory(etc)
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/CMakeLists.txt?rev=1411155&r1=1411154&r2=1411155&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/CMakeLists.txt (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/CMakeLists.txt Mon Nov 19 12:47:53 2012
@@ -24,7 +24,12 @@ include(FindRuby)
include(FindPythonLibs)
include(FindPerlLibs)
+set (SWIG_MINIMUM_VERSION "1.3.32")
+
if (SWIG_FOUND)
+ if (${SWIG_VERSION} VERSION_LESS ${SWIG_MINIMUM_VERSION})
+ message("Found Swig < ${SWIG_MINIMUM_VERSION} - skipping language bindings")
+ else()
set(CMAKE_SWIG_FLAGS "-w361,362,401,467,503")
if (PYTHONLIBS_FOUND)
@@ -58,4 +63,5 @@ if (SWIG_FOUND)
add_subdirectory(qpid/perl)
endif (PERLLIBS_FOUND)
+ endif (${SWIG_VERSION} VERSION_LESS ${SWIG_MINIMUM_VERSION})
endif (SWIG_FOUND)
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1?rev=1411155&r1=1411154&r2=1411155&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1 (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1 Mon Nov 19 12:47:53 2012
@@ -496,7 +496,7 @@ if ($make32) {
$env:BOOST_ROOT = "$boost32"
cd "$build32"
Write-Host "Running 32-bit CMake in $build32 ..."
- CMake -G "$global:cmakeGenerator" "-DCMAKE_INSTALL_PREFIX=install_x86" $cppDir
+ CMake -G "$global:cmakeGenerator" "-DGEN_DOXYGEN=No" "-DCMAKE_INSTALL_PREFIX=install_x86" $cppDir
} else {
Write-Host "Skipped 32-bit CMake."
}
@@ -508,7 +508,7 @@ if ($make64) {
$env:BOOST_ROOT = "$boost64"
cd "$build64"
Write-Host "Running 64-bit CMake in $build64"
- CMake -G "$global:cmakeGenerator Win64" "-DCMAKE_INSTALL_PREFIX=install_x64" $cppDir
+ CMake -G "$global:cmakeGenerator Win64" "-DGEN_DOXYGEN=No" "-DCMAKE_INSTALL_PREFIX=install_x64" $cppDir
} else {
Write-Host "Skipped 64-bit CMake."
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.cs
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.cs?rev=1411155&r1=1411154&r2=1411155&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.cs (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.cs Mon Nov 19 12:47:53 2012
@@ -153,6 +153,21 @@ namespace Org.Apache.Qpid.Messaging.Exam
/// <summary>
+ /// SessionReceiver implements the ISessionReceiver interface.
+ /// It is the exception function that receives all exception messages
+ /// It may be called any time server is running.
+ /// It is always called on server's private thread.
+ /// After this is called then the sessionReceiver and private thread are closed.
+ /// </summary>
+ /// <param name="exception">The exception.</param>
+ public void SessionException(Exception exception)
+ {
+ // A typical application will take more action here.
+ Console.WriteLine("{0} Exception caught.", exception.ToString());
+ }
+
+
+ /// <summary>
/// Usage
/// </summary>
/// <param name="url">Connection target</param>
@@ -259,8 +274,17 @@ namespace Org.Apache.Qpid.Messaging.Exam
//
// Close the receiver and the connection.
//
- receiver.Close();
- connection.Close();
+ try
+ {
+ receiver.Close();
+ connection.Close();
+ }
+ catch (Exception exception)
+ {
+ // receiver or connection may throw if they closed in error.
+ // A typical application will take more action here.
+ Console.WriteLine("{0} Closing exception caught.", exception.ToString());
+ }
return 0;
}
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln?rev=1411155&r1=1411154&r2=1411155&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln Mon Nov 19 12:47:53 2012
@@ -21,7 +21,7 @@ Microsoft Visual Studio Solution File, F
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Org.Apache.Qpid.Messaging", "..\src\msvc9\org.apache.qpid.messaging.vcproj", "{AA5A3B83-5F98-406D-A01C-5A921467A57D}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.apache.qpid.messaging.sessionreceiver", "..\src\msvc9\sessionreceiver\org.apache.qpid.messaging.sessionreceiver.csproj", "{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.apache.qpid.messaging.sessionreceiver", "..\src\sessionreceiver\msvc9\org.apache.qpid.messaging.sessionreceiver.csproj", "{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp?rev=1411155&r1=1411154&r2=1411155&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp Mon Nov 19 12:47:53 2012
@@ -344,9 +344,34 @@ namespace Messaging {
void Receiver::Close()
{
- msclr::lock lk(privateLock);
- ThrowIfDisposed();
+ System::Exception ^ newException = nullptr;
+ Message ^ newMessage = nullptr;
- nativeObjPtr->close();
+ try
+ {
+ msclr::lock lk(privateLock);
+ ThrowIfDisposed();
+
+ nativeObjPtr->close();
+ }
+ catch (const ::qpid::types::Exception & error)
+ {
+ String ^ errmsg = gcnew String(error.what());
+ newException = gcnew QpidException(errmsg);
+ }
+ finally
+ {
+ if (newException != nullptr)
+ {
+ if (newMessage != nullptr)
+ {
+ delete newMessage;
+ }
+ }
+ }
+ if (newException != nullptr)
+ {
+ throw newException;
+ }
}
}}}}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/sessionreceiver.cs
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/sessionreceiver.cs?rev=1411155&r1=1411154&r2=1411155&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/sessionreceiver.cs (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/sessionreceiver.cs Mon Nov 19 12:47:53 2012
@@ -37,6 +37,7 @@ namespace Org.Apache.Qpid.Messaging.Sess
public interface ISessionReceiver
{
void SessionReceiver(Receiver receiver, Message message);
+ void SessionException(Exception exception);
}
@@ -67,25 +68,32 @@ namespace Org.Apache.Qpid.Messaging.Sess
{
Receiver rcvr;
Message msg;
-
- keepRunning = true;
- while (keepRunning)
+ try
{
- rcvr = session.NextReceiver(DurationConstants.SECOND);
-
- if (null != rcvr)
+ keepRunning = true;
+ while (keepRunning)
{
- if (keepRunning)
+ rcvr = session.NextReceiver(DurationConstants.SECOND);
+
+ if (null != rcvr)
{
- msg = rcvr.Fetch(DurationConstants.SECOND);
- this.callback.SessionReceiver(rcvr, msg);
+ if (keepRunning)
+ {
+ msg = rcvr.Fetch(DurationConstants.SECOND);
+ this.callback.SessionReceiver(rcvr, msg);
+ }
}
+ //else
+ // receive timed out
+ // EventEngine exits the nextReceiver() function periodically
+ // in order to test the keepRunning flag
}
- //else
- // receive timed out
- // EventEngine exits the nextReceiver() function periodically
- // in order to test the keepRunning flag
}
+ catch (Exception e)
+ {
+ this.callback.SessionException(e);
+ }
+
// Private thread is now exiting.
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bld-winsdk.ps1
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bld-winsdk.ps1?rev=1411155&r1=1411154&r2=1411155&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bld-winsdk.ps1 (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bld-winsdk.ps1 Mon Nov 19 12:47:53 2012
@@ -245,13 +245,7 @@ function BuildAPlatform
'bin/boost_regex*.*',
'bin/boost',
'conf',
- 'examples/direct',
- 'examples/failover',
- 'examples/fanout',
- 'examples/pub-sub',
'examples/qmf-console',
- 'examples/request-response',
- 'examples/tradedemo',
'examples/*.sln',
'examples/*.vcproj',
'examples/messaging/*.vcproj',
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/configure.ac
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/configure.ac?rev=1411155&r1=1411154&r2=1411155&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/configure.ac (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/configure.ac Mon Nov 19 12:47:53 2012
@@ -29,6 +29,10 @@ AC_PROG_CXX
AC_USE_SYSTEM_EXTENSIONS
AC_LANG([C++])
+# Check whether a C++ was found (AC_PROG_CXX sets $CXX to "g++" even when it
+# doesn't exist)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],[],[AC_MSG_ERROR([No C++ compiler found])])
+
# Check for optional use of help2man
AC_CHECK_PROG([HELP2MAN], [help2man], [help2man])
AC_ARG_WITH([help2man],
@@ -146,7 +150,7 @@ AM_CONDITIONAL([HAS_RPMLINT], [test -n "
AC_CHECK_PROG([RUBY], [ruby], [ruby])
# Swig binding generator is needed for the script (Ruby, Python, etc.) bindings.
-AC_PROG_SWIG(1.3.26)
+AC_PROG_SWIG(1.3.32)
test ! -x "$SWIG" && SWIG=""
AC_ARG_WITH([swig],
[AS_HELP_STRING([--with-swig], [Use swig to generate qmf bindings.])],
@@ -210,10 +214,11 @@ AS_IF([test -n "$PYTHON"], [
# location
AC_MSG_WARN([Didn't find Python 2.7 developer libs - looking for older version])
PYTHON_INC=$($PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_inc()')
- AC_CHECK_LIB([python$PYTHON_VERSION],[Py_Initialize])
+ AC_CHECK_LIB([python$PYTHON_VERSION],[Py_Initialize],[
+ PYTHON_LIBS="-lpython$PYTHON_VERSION"
+ ])
AC_CHECK_FILE(["$PYTHON_INC/Python.h"],[
PYTHON_CFLAGS="-I$PYTHON_INC"
- PYTHON_LIBS="-lpython$PYTHON_VERSION"
have_python_dev=yes
],[
if test yes = "$with_python" ; then
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/docs/api/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/docs/api:r1401294-1411033
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/docs/api/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/docs/api/CMakeLists.txt?rev=1411155&r1=1411154&r2=1411155&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/docs/api/CMakeLists.txt (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/docs/api/CMakeLists.txt Mon Nov 19 12:47:53 2012
@@ -28,13 +28,15 @@ if (GEN_DOXYGEN)
${CMAKE_CURRENT_BINARY_DIR}/user.doxygen)
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/developer.doxygen.in
${CMAKE_CURRENT_BINARY_DIR}/developer.doxygen)
- add_custom_target (docs-user-api ALL COMMAND ${DOXYGEN_EXECUTABLE} user.doxygen)
- add_custom_target (docs-developer ALL COMMAND ${DOXYGEN_EXECUTABLE} developer.doxygen)
+ add_custom_target (docs-user-api COMMAND ${DOXYGEN_EXECUTABLE} user.doxygen)
+ add_custom_target (docs-developer COMMAND ${DOXYGEN_EXECUTABLE} developer.doxygen)
+ add_dependencies (docs docs-developer docs-user-api)
# HTML files are generated to ./html - put those in the install.
install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/
DESTINATION ${QPID_INSTALL_DOCDIR}/api/html
- COMPONENT ${QPID_COMPONENT_CLIENT_INCLUDE})
+ COMPONENT ${QPID_COMPONENT_CLIENT_INCLUDE}
+ ${OPTIONAL_ARG})
if (CPACK_GENERATOR STREQUAL "NSIS")
set (CPACK_NSIS_MENU_LINKS
"${QPID_INSTALL_HTMLDIR}/index.html" "Qpid C++ API Documentation"
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/etc/qpidd.service.in
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/etc/qpidd.service.in?rev=1411155&r1=1411154&r2=1411155&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/etc/qpidd.service.in (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/etc/qpidd.service.in Mon Nov 19 12:47:53 2012
@@ -1,7 +1,7 @@
[Unit]
Description=An AMQP message broker daemon.
Documentation=man:qpidd(1) http://qpid.apache.org/
-After=network.target
+Requires=network.target
[Service]
User=qpidd
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj:r1401294-1411033
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qmf/engine/Agent.h
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/include/qmf/engine/Agent.h:r1401294-1411033
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qmf/engine/Console.h
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/include/qmf/engine/Console.h:r1401294-1411033
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/framing/FieldValue.h
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/framing/FieldValue.h?rev=1411155&r1=1411154&r2=1411155&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/framing/FieldValue.h (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/framing/FieldValue.h Mon Nov 19 12:47:53 2012
@@ -175,11 +175,19 @@ class FixedWidthValue : public FieldValu
return v;
}
uint8_t* rawOctets() { return octets; }
- uint8_t* rawOctets() const { return octets; }
+ const uint8_t* rawOctets() const { return octets; }
void print(std::ostream& o) const { o << "F" << width << ":"; };
};
+class UuidData : public FixedWidthValue<16> {
+ public:
+ UuidData();
+ UuidData(const unsigned char* bytes);
+ bool convertsToString() const;
+ std::string getString() const;
+};
+
template <class T, int W>
inline T FieldValue::getIntegerValue() const
{
@@ -356,7 +364,7 @@ class Var16Value : public FieldValue {
class Var32Value : public FieldValue {
public:
QPID_COMMON_EXTERN Var32Value(const std::string& v, uint8_t code);
-};
+ };
class Struct32Value : public FieldValue {
public:
@@ -453,6 +461,7 @@ class ListValue : public FieldValue {
class UuidValue : public FieldValue {
public:
+ QPID_COMMON_EXTERN UuidValue();
QPID_COMMON_EXTERN UuidValue(const unsigned char*);
};
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/sys/IOHandle.h
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/sys/IOHandle.h?rev=1411155&r1=1411154&r2=1411155&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/sys/IOHandle.h (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/sys/IOHandle.h Mon Nov 19 12:47:53 2012
@@ -22,8 +22,6 @@
*
*/
-#include "qpid/CommonImportExport.h"
-
namespace qpid {
namespace sys {
@@ -31,18 +29,7 @@ namespace sys {
* This is a class intended to abstract the Unix concept of file descriptor
* or the Windows concept of HANDLE
*/
-class PollerHandle;
-class IOHandlePrivate;
-class IOHandle {
- friend class PollerHandle;
- friend class IOHandlePrivate;
-
-protected:
- IOHandlePrivate* const impl;
-
- IOHandle(IOHandlePrivate*);
- QPID_COMMON_EXTERN virtual ~IOHandle();
-};
+class IOHandle;
}}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/sys/SystemInfo.h
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/sys/SystemInfo.h?rev=1411155&r1=1411154&r2=1411155&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/sys/SystemInfo.h (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/sys/SystemInfo.h Mon Nov 19 12:47:53 2012
@@ -53,10 +53,23 @@ QPID_COMMON_EXTERN bool getLocalHostname
QPID_COMMON_EXTERN void getLocalIpAddresses (uint16_t port, std::vector<Address> &addrList);
/**
- * Return true if host names an address of the local host.
- *@param host host name or IP address.
+ * Get the names of all the network interfaces connected to
+ * this host.
+ * @param names Receives the list of interface names
*/
-QPID_COMMON_EXTERN bool isLocalHost(const std::string& host);
+QPID_COMMON_EXTERN void getInterfaceNames(std::vector<std::string>& names );
+
+/**
+ * Get strings for each of the IP addresses associated with a named network
+ * interface.
+ * If there is no interface of that name an empty list will be returned.
+ *
+ * @param interface The name of the network interface
+ * @param addresses The list of the strings for the IP addresses are pushed on the back of this parameter
+ * to get just the list you need to clear the vector before using it.
+ * @return true if an interface of the correct name was found, false otherwise
+ */
+QPID_COMMON_EXTERN bool getInterfaceAddresses(const std::string& interface, std::vector<std::string>& addresses);
/**
* Retrieve system identifiers and versions. This is information that can
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/sys/posix/PrivatePosix.h
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/sys/posix/PrivatePosix.h?rev=1411155&r1=1411154&r2=1411155&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/sys/posix/PrivatePosix.h (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/sys/posix/PrivatePosix.h Mon Nov 19 12:47:53 2012
@@ -23,7 +23,6 @@
*/
#include "qpid/sys/Time.h"
-#include "qpid/sys/IOHandle.h"
struct timespec;
struct timeval;
@@ -41,32 +40,21 @@ Duration toTime(const struct timespec& t
class SocketAddress;
const struct addrinfo& getAddrInfo(const SocketAddress&);
-// Private fd related implementation details
-class IOHandlePrivate {
+// Posix fd as an IOHandle
+class IOHandle {
public:
- IOHandlePrivate(int f = -1) :
- fd(f)
+ IOHandle(int fd0 = -1) :
+ fd(fd0)
{}
int fd;
};
-int toFd(const IOHandlePrivate* h);
-
-// Posix fd as an IOHandle
-class PosixIOHandle : public IOHandle {
-public:
- PosixIOHandle(int fd) :
- IOHandle(new IOHandlePrivate(fd))
- {}
-};
-
// Dummy IOHandle for places it's required in the API
// but we promise not to actually try to do any operations on the IOHandle
class NullIOHandle : public IOHandle {
public:
- NullIOHandle() :
- IOHandle(new IOHandlePrivate)
+ NullIOHandle()
{}
};
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/types/Variant.h
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/types/Variant.h?rev=1411155&r1=1411154&r2=1411155&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/types/Variant.h (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/types/Variant.h Mon Nov 19 12:47:53 2012
@@ -177,6 +177,7 @@ QPID_TYPES_EXTERN std::ostream& operator
QPID_TYPES_EXTERN std::ostream& operator<<(std::ostream& out, const Variant::Map& map);
QPID_TYPES_EXTERN std::ostream& operator<<(std::ostream& out, const Variant::List& list);
QPID_TYPES_EXTERN bool operator==(const Variant& a, const Variant& b);
+QPID_TYPES_EXTERN bool operator!=(const Variant& a, const Variant& b);
#endif
}} // namespace qpid::types
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/managementgen/qmfgen/templates/Event.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/managementgen/qmfgen/templates/Event.cpp?rev=1411155&r1=1411154&r2=1411155&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/managementgen/qmfgen/templates/Event.cpp (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/managementgen/qmfgen/templates/Event.cpp Mon Nov 19 12:47:53 2012
@@ -35,8 +35,8 @@ using qpid::management::Args;
using qpid::management::Mutex;
using std::string;
-string Event/*MGEN:Event.NameCap*/::PACKAGE_NAME = string ("/*MGEN:Event.NamePackageLower*/");
-string Event/*MGEN:Event.NameCap*/::EVENT_NAME = string ("/*MGEN:Event.Name*/");
+string Event/*MGEN:Event.NameCap*/::packageName = string ("/*MGEN:Event.NamePackageLower*/");
+string Event/*MGEN:Event.NameCap*/::eventName = string ("/*MGEN:Event.Name*/");
uint8_t Event/*MGEN:Event.NameCap*/::md5Sum[16] =
{/*MGEN:Event.SchemaMD5*/};
@@ -54,7 +54,7 @@ namespace {
void Event/*MGEN:Event.NameCap*/::registerSelf(ManagementAgent* agent)
{
- agent->registerEvent(PACKAGE_NAME, EVENT_NAME, md5Sum, writeSchema);
+ agent->registerEvent(packageName, eventName, md5Sum, writeSchema);
}
void Event/*MGEN:Event.NameCap*/::writeSchema (std::string& schema)
@@ -66,8 +66,8 @@ void Event/*MGEN:Event.NameCap*/::writeS
// Schema class header:
buf.putOctet (CLASS_KIND_EVENT);
- buf.putShortString (PACKAGE_NAME); // Package Name
- buf.putShortString (EVENT_NAME); // Event Name
+ buf.putShortString (packageName); // Package Name
+ buf.putShortString (eventName); // Event Name
buf.putBin128 (md5Sum); // Schema Hash
buf.putShort (/*MGEN:Event.ArgCount*/); // Argument Count
@@ -102,5 +102,5 @@ void Event/*MGEN:Event.NameCap*/::mapEnc
bool Event/*MGEN:Event.NameCap*/::match(const std::string& evt, const std::string& pkg)
{
- return EVENT_NAME == evt && PACKAGE_NAME == pkg;
+ return eventName == evt && packageName == pkg;
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/managementgen/qmfgen/templates/Event.h
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/managementgen/qmfgen/templates/Event.h?rev=1411155&r1=1411154&r2=1411155&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/managementgen/qmfgen/templates/Event.h (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/managementgen/qmfgen/templates/Event.h Mon Nov 19 12:47:53 2012
@@ -34,27 +34,29 @@ QPID_BROKER_CLASS_EXTERN class Event/*MG
private:
static void writeSchema (std::string& schema);
static uint8_t md5Sum[MD5_LEN];
+ QPID_BROKER_EXTERN static std::string packageName;
+ QPID_BROKER_EXTERN static std::string eventName;
/*MGEN:Event.ArgDeclarations*/
public:
- QPID_BROKER_EXTERN static std::string PACKAGE_NAME;
- QPID_BROKER_EXTERN static std::string EVENT_NAME;
-
writeSchemaCall_t getWriteSchemaCall(void) { return writeSchema; }
QPID_BROKER_EXTERN Event/*MGEN:Event.NameCap*/(/*MGEN:Event.ConstructorArgs*/);
QPID_BROKER_EXTERN ~Event/*MGEN:Event.NameCap*/() {};
static void registerSelf(::qpid::management::ManagementAgent* agent);
- std::string& getPackageName() const { return PACKAGE_NAME; }
- std::string& getEventName() const { return EVENT_NAME; }
+ std::string& getPackageName() const { return packageName; }
+ std::string& getEventName() const { return eventName; }
uint8_t* getMd5Sum() const { return md5Sum; }
uint8_t getSeverity() const { return /*MGEN:Event.Severity*/; }
QPID_BROKER_EXTERN void encode(std::string& buffer) const;
QPID_BROKER_EXTERN void mapEncode(::qpid::types::Variant::Map& map) const;
QPID_BROKER_EXTERN static bool match(const std::string& evt, const std::string& pkg);
+ static std::pair<std::string,std::string> getFullName() {
+ return std::make_pair(packageName, eventName);
+ }
};
}/*MGEN:Event.CloseNamespaces*/
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src:r1401294-1411033
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/CMakeLists.txt?rev=1411155&r1=1411154&r2=1411155&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/CMakeLists.txt Mon Nov 19 12:47:53 2012
@@ -271,16 +271,20 @@ if (CMAKE_COMPILER_IS_GNUCXX)
set (WARNING_FLAGS
"-Werror -pedantic -Wall -Wextra -Wno-shadow -Wpointer-arith -Wcast-qual -Wcast-align -Wno-long-long -Wvolatile-register-var -Winvalid-pch -Wno-system-headers -Woverloaded-virtual")
- set (GCC_CATCH_UNDEFINED "-Wl,--no-undefined")
+ set (CATCH_UNDEFINED "-Wl,--no-undefined")
# gcc on SunOS uses native linker whose "-z defs" is too fussy
if (CMAKE_SYSTEM_NAME STREQUAL SunOS)
- set (GCC_CATCH_UNDEFINED "")
+ set (CATCH_UNDEFINED "")
endif (CMAKE_SYSTEM_NAME STREQUAL SunOS)
+ set (COMPILER_FLAGS "-fvisibility-inlines-hidden")
+ set (HIDE_SYMBOL_FLAGS "-fvisibility=hidden")
endif (CMAKE_COMPILER_IS_GNUCXX)
if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro)
set (COMPILER_FLAGS "-library=stlport4 -mt")
set (WARNING_FLAGS "+w")
+ set (CATCH_UNDEFINED "")
+ set (HIDE_SYMBOL_FLAGS "")
endif (CMAKE_CXX_COMPILER_ID STREQUAL SunPro)
option(ENABLE_WARNINGS "Enable lots of compiler warnings (recommended)" ON)
@@ -571,13 +575,10 @@ if (BUILD_XML)
qpid/xml/XmlExchange.cpp
qpid/xml/XmlExchange.h
qpid/xml/XmlExchangePlugin.cpp)
- set_target_properties (xml PROPERTIES PREFIX "")
target_link_libraries (xml xerces-c xqilla qpidbroker pthread)
- if (CMAKE_COMPILER_IS_GNUCXX)
- set_target_properties (xml PROPERTIES
- PREFIX ""
- LINK_FLAGS ${GCC_CATCH_UNDEFINED})
- endif (CMAKE_COMPILER_IS_GNUCXX)
+ set_target_properties (xml PROPERTIES
+ PREFIX ""
+ LINK_FLAGS "${CATCH_UNDEFINED}")
install (TARGETS xml
DESTINATION ${QPIDD_MODULE_DIR}
COMPONENT ${QPID_COMPONENT_BROKER})
@@ -610,13 +611,10 @@ if (BUILD_ACL)
# the qpidbroker platform-specific source list.
if (NOT CMAKE_SYSTEM_NAME STREQUAL Windows)
add_library (acl MODULE ${acl_SOURCES})
- set_target_properties (acl PROPERTIES PREFIX "")
target_link_libraries (acl qpidbroker ${Boost_PROGRAM_OPTIONS_LIBRARY})
- if (CMAKE_COMPILER_IS_GNUCXX)
- set_target_properties (acl PROPERTIES
- PREFIX ""
- LINK_FLAGS "${GCC_CATCH_UNDEFINED}")
- endif (CMAKE_COMPILER_IS_GNUCXX)
+ set_target_properties (acl PROPERTIES
+ PREFIX ""
+ LINK_FLAGS "${CATCH_UNDEFINED}")
install (TARGETS acl
DESTINATION ${QPIDD_MODULE_DIR}
COMPONENT ${QPID_COMPONENT_BROKER})
@@ -748,7 +746,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL Windows)
qpid/sys/windows/PipeHandle.cpp
qpid/sys/windows/PollableCondition.cpp
qpid/sys/windows/Shlib.cpp
- qpid/sys/windows/Socket.cpp
+ qpid/sys/windows/WinSocket.cpp
qpid/sys/windows/SocketAddress.cpp
qpid/sys/windows/StrError.cpp
qpid/sys/windows/SystemInfo.cpp
@@ -808,10 +806,8 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows
if (CMAKE_SYSTEM_NAME STREQUAL Linux)
add_definitions(-pthread)
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread")
- if (CMAKE_COMPILER_IS_GNUCXX)
- set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${GCC_CATCH_UNDEFINED} -pthread")
- set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -pthread")
- endif (CMAKE_COMPILER_IS_GNUCXX)
+ set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CATCH_UNDEFINED} -pthread")
+ set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -pthread")
# On Linux override memory status module
set (qpid_memstat_module
qpid/sys/posix/MemStat.cpp
@@ -853,7 +849,7 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows
qpid/sys/posix/PollableCondition.cpp
qpid/sys/posix/Shlib.cpp
qpid/log/posix/SinkOptions.cpp
- qpid/sys/posix/Socket.cpp
+ qpid/sys/posix/BSDSocket.cpp
qpid/sys/posix/SocketAddress.cpp
qpid/sys/posix/StrError.cpp
qpid/sys/posix/Thread.cpp
@@ -958,6 +954,8 @@ set (qpidcommon_SOURCES
qpid/amqp/Descriptor.cpp
qpid/amqp/Encoder.h
qpid/amqp/Encoder.cpp
+ qpid/amqp/MapReader.h
+ qpid/amqp/MapReader.cpp
qpid/amqp/MessageEncoder.h
qpid/amqp/MessageEncoder.cpp
qpid/amqp/MessageId.h
@@ -1058,29 +1056,17 @@ install (DIRECTORY ../include/qpid
PATTERN ".svn" EXCLUDE)
install_pdb (qpidclient ${QPID_COMPONENT_CLIENT})
-
-set (qpidmessaging_SOURCES
- ${qpidmessaging_platform_SOURCES}
- qpid/messaging/Address.cpp
+set (qpidmessaging_SOURCES_hidden
qpid/messaging/AddressParser.h
- qpid/messaging/AddressParser.cpp
- qpid/messaging/Connection.cpp
qpid/messaging/ConnectionImpl.h
qpid/messaging/ConnectionOptions.h
qpid/messaging/ConnectionOptions.cpp
- qpid/messaging/Duration.cpp
- qpid/messaging/exceptions.cpp
- qpid/messaging/Message.cpp
qpid/messaging/MessageImpl.h
qpid/messaging/MessageImpl.cpp
qpid/messaging/ProtocolRegistry.cpp
- qpid/messaging/Receiver.cpp
qpid/messaging/ReceiverImpl.h
- qpid/messaging/Session.cpp
qpid/messaging/SessionImpl.h
- qpid/messaging/Sender.cpp
qpid/messaging/SenderImpl.h
- qpid/messaging/FailoverUpdates.cpp
qpid/messaging/amqp/EncodedMessage.h
qpid/messaging/amqp/EncodedMessage.cpp
qpid/client/amqp0_10/AcceptTracker.h
@@ -1102,6 +1088,25 @@ set (qpidmessaging_SOURCES
qpid/client/amqp0_10/SenderImpl.h
qpid/client/amqp0_10/SenderImpl.cpp
)
+set_source_files_properties(
+ ${qpidmessaging_SOURCES_hidden}
+ PROPERTIES
+ COMPILE_FLAGS "${HIDE_SYMBOL_FLAGS}")
+
+set (qpidmessaging_SOURCES
+ ${qpidmessaging_platform_SOURCES}
+ ${qpidmessaging_SOURCES_hidden}
+ qpid/messaging/Address.cpp
+ qpid/messaging/AddressParser.cpp # The functions in here are not in the public interface, but qmf uses them
+ qpid/messaging/Connection.cpp
+ qpid/messaging/Duration.cpp
+ qpid/messaging/exceptions.cpp
+ qpid/messaging/FailoverUpdates.cpp
+ qpid/messaging/Message.cpp
+ qpid/messaging/Receiver.cpp
+ qpid/messaging/Session.cpp
+ qpid/messaging/Sender.cpp
+)
add_msvc_version (qpidmessaging library dll)
add_library (qpidmessaging SHARED ${qpidmessaging_SOURCES})
@@ -1484,8 +1489,8 @@ set (VERSION ${QPID_VERSION})
#add_custom_target(pkgconfig ALL echo DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/qpid.pc)
#add_dependencies(pkgconfig ${CMAKE_CURRENT_BINARY_DIR}/qmf2.pc)
-configure_file(qpid.pc.in qpid.pc @ONLY)
-configure_file(qmf2.pc.in qmf2.pc @ONLY)
+configure_file(qpid.pc.in ${CMAKE_CURRENT_BINARY_DIR}/qpid.pc @ONLY)
+configure_file(qmf2.pc.in ${CMAKE_CURRENT_BINARY_DIR}/qmf2.pc @ONLY)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/qpid.pc ${CMAKE_CURRENT_BINARY_DIR}/qmf2.pc
DESTINATION ${LIB_INSTALL_DIR}/pkgconfig
COMPONENT ${QPID_COMPONENT_COMMON})
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/CMakeLists.txt
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/CMakeLists.txt:r1401294-1411033
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/Makefile.am?rev=1411155&r1=1411154&r2=1411155&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/Makefile.am (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/Makefile.am Mon Nov 19 12:47:53 2012
@@ -46,7 +46,6 @@ windows_dist = \
qpid/sys/windows/QpidDllMain.h \
qpid/sys/windows/Shlib.cpp \
qpid/sys/windows/SocketAddress.cpp \
- qpid/sys/windows/Socket.cpp \
qpid/sys/windows/SslAsynchIO.cpp \
qpid/sys/windows/SslAsynchIO.h \
qpid/sys/windows/StrError.cpp \
@@ -56,6 +55,8 @@ windows_dist = \
../include/qpid/sys/windows/Time.h \
qpid/sys/windows/uuid.cpp \
qpid/sys/windows/uuid.h \
+ qpid/sys/windows/WinSocket.cpp \
+ qpid/sys/windows/WinSocket.h \
windows/QpiddBroker.cpp \
windows/SCM.h \
windows/SCM.cpp \
@@ -158,7 +159,8 @@ qpidd_SOURCES = qpidd.cpp qpidd.h $(posi
libqpidcommon_la_SOURCES += \
qpid/log/posix/SinkOptions.cpp \
qpid/sys/posix/IOHandle.cpp \
- qpid/sys/posix/Socket.cpp \
+ qpid/sys/posix/BSDSocket.cpp \
+ qpid/sys/posix/BSDSocket.h \
qpid/sys/posix/SocketAddress.cpp \
qpid/sys/posix/AsynchIO.cpp \
qpid/sys/posix/FileSysDir.cpp \
@@ -510,7 +512,6 @@ libqpidcommon_la_SOURCES += \
qpid/sys/TimerWarnings.cpp \
qpid/sys/TimerWarnings.h \
qpid/sys/Waitable.h \
- qpid/sys/alloca.h \
qpid/sys/uuid.h \
qpid/sys/unordered_map.h \
qpid/amqp_0_10/Codecs.cpp \
@@ -527,6 +528,8 @@ libqpidcommon_la_SOURCES += \
qpid/amqp/Encoder.cpp \
qpid/amqp/ListReader.h \
qpid/amqp/LoggingReader.h \
+ qpid/amqp/MapReader.h \
+ qpid/amqp/MapReader.cpp \
qpid/amqp/MessageEncoder.h \
qpid/amqp/MessageEncoder.cpp \
qpid/amqp/MessageId.h \
@@ -763,6 +766,10 @@ amqp_la_LIBADD = libqpidcommon.la
amqp_la_SOURCES = \
qpid/broker/amqp/Connection.h \
qpid/broker/amqp/Connection.cpp \
+ qpid/broker/amqp/DataReader.h \
+ qpid/broker/amqp/DataReader.cpp \
+ qpid/broker/amqp/Filter.h \
+ qpid/broker/amqp/Filter.cpp \
qpid/broker/amqp/Header.h \
qpid/broker/amqp/Header.cpp \
qpid/broker/amqp/ManagedConnection.h \
@@ -773,6 +780,8 @@ amqp_la_SOURCES = \
qpid/broker/amqp/ManagedOutgoingLink.cpp \
qpid/broker/amqp/Message.h \
qpid/broker/amqp/Message.cpp \
+ qpid/broker/amqp/NodeProperties.h \
+ qpid/broker/amqp/NodeProperties.cpp \
qpid/broker/amqp/Outgoing.h \
qpid/broker/amqp/Outgoing.cpp \
qpid/broker/amqp/ProtocolPlugin.cpp \
@@ -789,6 +798,8 @@ amqp_la_LDFLAGS = $(PLUGINLDFLAGS) $(PRO
cmoduleexec_LTLIBRARIES += amqpc.la
amqpc_la_LIBADD = libqpidcommon.la
amqpc_la_SOURCES = \
+ qpid/messaging/amqp/AddressHelper.h \
+ qpid/messaging/amqp/AddressHelper.cpp \
qpid/messaging/amqp/ConnectionContext.h \
qpid/messaging/amqp/ConnectionContext.cpp \
qpid/messaging/amqp/ConnectionHandle.h \
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/amqp.cmake
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/amqp.cmake?rev=1411155&r1=1411154&r2=1411155&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/amqp.cmake (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/amqp.cmake Mon Nov 19 12:47:53 2012
@@ -50,6 +50,10 @@ if (BUILD_AMQP)
set (amqp_SOURCES
qpid/broker/amqp/Connection.h
qpid/broker/amqp/Connection.cpp
+ qpid/broker/amqp/DataReader.h
+ qpid/broker/amqp/DataReader.cpp
+ qpid/broker/amqp/Filter.h
+ qpid/broker/amqp/Filter.cpp
qpid/broker/amqp/Header.h
qpid/broker/amqp/Header.cpp
qpid/broker/amqp/ManagedConnection.h
@@ -60,6 +64,8 @@ if (BUILD_AMQP)
qpid/broker/amqp/ManagedOutgoingLink.cpp
qpid/broker/amqp/Message.h
qpid/broker/amqp/Message.cpp
+ qpid/broker/amqp/NodeProperties.h
+ qpid/broker/amqp/NodeProperties.cpp
qpid/broker/amqp/Outgoing.h
qpid/broker/amqp/Outgoing.cpp
qpid/broker/amqp/ProtocolPlugin.cpp
@@ -82,6 +88,8 @@ if (BUILD_AMQP)
set (amqpc_SOURCES
+ qpid/messaging/amqp/AddressHelper.h
+ qpid/messaging/amqp/AddressHelper.cpp
qpid/messaging/amqp/ConnectionContext.h
qpid/messaging/amqp/ConnectionContext.cpp
qpid/messaging/amqp/ConnectionHandle.h
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qmf/engine/Agent.cpp
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/qmf/engine/Agent.cpp:r1401294-1411033
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/NullSaslServer.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/NullSaslServer.cpp?rev=1411155&r1=1411154&r2=1411155&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/NullSaslServer.cpp (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/NullSaslServer.cpp Mon Nov 19 12:47:53 2012
@@ -39,7 +39,10 @@ NullSaslServer::Status NullSaslServer::s
} else if (i != std::string::npos) {
//authorization id is first null delimited field
uid = response->substr(0, i);
- }//else not a valid SASL PLAIN response, throw error?
+ } else {
+ QPID_LOG(error, "Invalid PLAIN request, null delimiter not found in response data");
+ return FAIL;
+ }
if (!uid.empty()) {
//append realm if it has not already been added
i = uid.find(realm);
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/Options.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/Options.cpp?rev=1411155&r1=1411154&r2=1411155&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/Options.cpp (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/Options.cpp Mon Nov 19 12:47:53 2012
@@ -150,6 +150,7 @@ void Options::parse(int argc, char const
if (!configFile.empty()) {
parsing="configuration file "+configFile;
ifstream conf(configFile.c_str());
+ conf.peek();
if (conf.good()) {
// Remove this hack when we get a stable version of boost that
// can allow unregistered options in config files.
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/acl/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/qpid/acl:r1401294-1411033
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/amqp/descriptors.h
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/amqp/descriptors.h?rev=1411155&r1=1411154&r2=1411155&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/amqp/descriptors.h (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/amqp/descriptors.h Mon Nov 19 12:47:53 2012
@@ -73,7 +73,14 @@ const Descriptor SASL_INIT(SASL_INIT_COD
const Descriptor SASL_CHALLENGE(SASL_CHALLENGE_CODE);
const Descriptor SASL_RESPONSE(SASL_RESPONSE_CODE);
const Descriptor SASL_OUTCOME(SASL_OUTCOME_CODE);
+}
+
+namespace filters {
+const std::string LEGACY_DIRECT_FILTER_SYMBOL("apache.org:legacy-amqp-direct-binding:string");
+const std::string LEGACY_TOPIC_FILTER_SYMBOL("apache.org:legacy-amqp-direct-binding:string");
+const uint64_t LEGACY_DIRECT_FILTER_CODE(0x0000468C00000000);
+const uint64_t LEGACY_TOPIC_FILTER_CODE(0x0000468C00000001);
}
}} // namespace qpid::amqp
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/qpid/broker:r1401294-1411033
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org