qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kw...@apache.org
Subject svn commit: r1560618 [1/5] - in /qpid/branches/java-broker-bdb-ha: ./ qpid/ qpid/bin/ qpid/cpp/ qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/ qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.sender/ qpid/cpp/bindings/...
Date Thu, 23 Jan 2014 10:15:49 GMT
Author: kwall
Date: Thu Jan 23 10:15:46 2014
New Revision: 1560618

URL: http://svn.apache.org/r1560618
Log:
Complete merge in other parts of the tree started by rev. 1558056

Added:
    qpid/branches/java-broker-bdb-ha/qpid/cpp/include/qpid/messaging/Logger.h
      - copied unchanged from r1558036, qpid/trunk/qpid/cpp/include/qpid/messaging/Logger.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/include/qpid/messaging/Message_io.h
      - copied unchanged from r1558036, qpid/trunk/qpid/cpp/include/qpid/messaging/Message_io.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/QueueObservers.h
      - copied unchanged from r1558036, qpid/trunk/qpid/cpp/src/qpid/broker/QueueObservers.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/ha/README.h
      - copied unchanged from r1558036, qpid/trunk/qpid/cpp/src/qpid/ha/README.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/messaging/Logger.cpp
      - copied unchanged from r1558036, qpid/trunk/qpid/cpp/src/qpid/messaging/Logger.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/messaging/Message_io.cpp
      - copied unchanged from r1558036, qpid/trunk/qpid/cpp/src/qpid/messaging/Message_io.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/tests/MessagingLogger.cpp
      - copied unchanged from r1558036, qpid/trunk/qpid/cpp/src/tests/MessagingLogger.cpp
    qpid/branches/java-broker-bdb-ha/qpid/doc/book/src/jms-client-0-8/
      - copied from r1558036, qpid/trunk/qpid/doc/book/src/jms-client-0-8/
    qpid/branches/java-broker-bdb-ha/qpid/tools/src/py/qls/
      - copied from r1558036, qpid/trunk/qpid/tools/src/py/qls/
    qpid/branches/java-broker-bdb-ha/qpid/tools/src/py/qpid_qls_analyze.py
      - copied unchanged from r1558036, qpid/trunk/qpid/tools/src/py/qpid_qls_analyze.py
Removed:
    qpid/branches/java-broker-bdb-ha/qpid/cpp/examples/test.txt
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/ha/QueueSnapshots.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/ha/README.md
Modified:
    qpid/branches/java-broker-bdb-ha/   (props changed)
    qpid/branches/java-broker-bdb-ha/qpid/   (props changed)
    qpid/branches/java-broker-bdb-ha/qpid/bin/release.sh
    qpid/branches/java-broker-bdb-ha/qpid/cpp/AMQP_1.0
    qpid/branches/java-broker-bdb-ha/qpid/cpp/DESIGN
    qpid/branches/java-broker-bdb-ha/qpid/cpp/INSTALL-WINDOWS
    qpid/branches/java-broker-bdb-ha/qpid/cpp/README-HA.txt
    qpid/branches/java-broker-bdb-ha/qpid/cpp/README-winsdk.txt
    qpid/branches/java-broker-bdb-ha/qpid/cpp/README.txt
    qpid/branches/java-broker-bdb-ha/qpid/cpp/SSL
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/app.config
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.sender/app.config
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.client/app.config
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.declare_queues/app.config
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.drain/app.config
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.helloworld/app.config
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.server/app.config
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.spout/app.config
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.receiver/app.config
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.sender/app.config
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.receiver/app.config
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.sender/app.config
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sessionreceiver.sln
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sln
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj.filters
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/winsdk_dotnet_examples.sln
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/perl/Makefile.PL
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/closing_a_connection.feature
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/closing_a_session.feature
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/connecting_to_a_broker.feature
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/creating_a_receiver.feature
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/creating_a_sender.feature
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/creating_a_session.feature
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/getting_the_connections_authenticated_username.feature
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/receiving_a_message.feature
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/sending_a_message.feature
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/session_returns_its_connection.feature
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/sessions_have_names.feature
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/qpid_messaging.gemspec
    qpid/branches/java-broker-bdb-ha/qpid/cpp/cmake_uninstall.cmake.in
    qpid/branches/java-broker-bdb-ha/qpid/cpp/design_docs/ha-transactions.md
    qpid/branches/java-broker-bdb-ha/qpid/cpp/design_docs/log-model-category-for-correlation.txt
    qpid/branches/java-broker-bdb-ha/qpid/cpp/design_docs/windows_clfs_store_design.txt
    qpid/branches/java-broker-bdb-ha/qpid/cpp/docs/api/   (props changed)
    qpid/branches/java-broker-bdb-ha/qpid/cpp/docs/api/doxygen_developer_mainpage.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/docs/man/generate_manpage
    qpid/branches/java-broker-bdb-ha/qpid/cpp/docs/man/qpidd.1
    qpid/branches/java-broker-bdb-ha/qpid/cpp/docs/man/qpidd.x
    qpid/branches/java-broker-bdb-ha/qpid/cpp/docs/src/CONTENTS
    qpid/branches/java-broker-bdb-ha/qpid/cpp/etc/cluster.conf-example.xml.in
    qpid/branches/java-broker-bdb-ha/qpid/cpp/examples/messaging/drain.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/examples/messaging/spout.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/managementgen/CMakeLists.txt
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/   (props changed)
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/CMakeLists.txt   (contents, props changed)
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/check-abi
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/libqpidmessaging-api-symbols.txt
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/libqpidtypes-api-symbols.txt
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qmf2.pc.in
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid.linkmap
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid.pc.in
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/amqp/Decoder.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/amqp/Encoder.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/amqp/Encoder.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/amqp/MessageEncoder.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/   (props changed)
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/Bridge.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/Broker.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/BrokerObservers.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/ConnectionObservers.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/Message.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/Observers.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/Queue.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/Queue.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/QueueFactory.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/QueueFlowLimit.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/ThresholdAlerts.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/amqp/Incoming.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/amqp/Incoming.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/amqp/Message.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/amqp/NodeProperties.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/amqp/NodeProperties.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/amqp/Outgoing.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/amqp/Session.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/amqp/Session.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/amqp/Topic.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/ha/HaBroker.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/ha/HaBroker.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/ha/IdSetter.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/ha/Primary.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/ha/Primary.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/ha/QueueGuard.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/ha/QueueReplicator.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/ha/QueueReplicator.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/ha/QueueSnapshot.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/ISSUES
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/JournalImpl.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/TxnCtxt.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/jcfg.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/jcntl.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/jcntl.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/jerrno.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/jerrno.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/txn_map.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/txn_map.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/txn_rec.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/utils/deq_hdr.c
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/utils/file_hdr.c
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/utils/file_hdr.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/utils/rec_hdr.c
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/wmgr.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/wmgr.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/log/Logger.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/log/Options.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/log/Options.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/log/Selector.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/log/Statement.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/log/Statement.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/tests/   (props changed)
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/tests/CMakeLists.txt
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/tests/brokertest.py
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/tests/config.null
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/tests/failing-amqp0-10-python-tests
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/tests/failing-amqp1.0-python-tests
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/tests/ha_tests.py
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/tests/linearstore/linearstoredirsetup.sh
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/tests/policy.acl
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/tests/qpid-send.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/tests/qpidd-empty.conf
    qpid/branches/java-broker-bdb-ha/qpid/doc/book/Makefile
    qpid/branches/java-broker-bdb-ha/qpid/doc/book/src/java-broker/Java-Broker-Close-On-No-Route.xml
    qpid/branches/java-broker-bdb-ha/qpid/doc/book/src/java-broker/Java-Broker-Queues-OtherTypes.xml
    qpid/branches/java-broker-bdb-ha/qpid/python/   (props changed)
    qpid/branches/java-broker-bdb-ha/qpid/python/qpid/messaging/driver.py
    qpid/branches/java-broker-bdb-ha/qpid/tools/src/java/README.txt
    qpid/branches/java-broker-bdb-ha/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/AgentExternal.java
    qpid/branches/java-broker-bdb-ha/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/MethodCallWorkItem.java
    qpid/branches/java-broker-bdb-ha/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/QueryWorkItem.java
    qpid/branches/java-broker-bdb-ha/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/ResubscribeRequestWorkItem.java
    qpid/branches/java-broker-bdb-ha/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/SubscribeRequestWorkItem.java
    qpid/branches/java-broker-bdb-ha/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/agent/UnsubscribeRequestWorkItem.java
    qpid/branches/java-broker-bdb-ha/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/QmfQuery.java
    qpid/branches/java-broker-bdb-ha/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaEventClass.java
    qpid/branches/java-broker-bdb-ha/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaMethod.java
    qpid/branches/java-broker-bdb-ha/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaObjectClass.java
    qpid/branches/java-broker-bdb-ha/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/SchemaProperty.java
    qpid/branches/java-broker-bdb-ha/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/common/WorkItem.java
    qpid/branches/java-broker-bdb-ha/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentAddedWorkItem.java
    qpid/branches/java-broker-bdb-ha/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentDeletedWorkItem.java
    qpid/branches/java-broker-bdb-ha/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentHeartbeatWorkItem.java
    qpid/branches/java-broker-bdb-ha/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/AgentRestartedWorkItem.java
    qpid/branches/java-broker-bdb-ha/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/EventReceivedWorkItem.java
    qpid/branches/java-broker-bdb-ha/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/MethodResponseWorkItem.java
    qpid/branches/java-broker-bdb-ha/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/ObjectUpdateWorkItem.java
    qpid/branches/java-broker-bdb-ha/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/SubscribeResponseWorkItem.java
    qpid/branches/java-broker-bdb-ha/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/console/SubscriptionIndicationWorkItem.java

Propchange: qpid/branches/java-broker-bdb-ha/
------------------------------------------------------------------------------
  Merged /qpid/trunk:r1549895-1558036

Propchange: qpid/branches/java-broker-bdb-ha/qpid/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid:r1549895-1558036

Modified: qpid/branches/java-broker-bdb-ha/qpid/bin/release.sh
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/bin/release.sh?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/bin/release.sh (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/bin/release.sh Thu Jan 23 10:15:46 2014
@@ -262,6 +262,7 @@ if [ "JAVA" == "$JAVA" ] ; then
   cp -a qpid-${VER}/java/client/release/maven artifacts/
   cp -a qpid-${VER}/java/common/release/maven artifacts/
   cp -a qpid-${VER}/java/broker/release/maven artifacts/
+  cp -a qpid-${VER}/java/broker-core/release/maven artifacts/
   cp -a qpid-${VER}/java/bdbstore/release/maven artifacts/
   cp -a qpid-${VER}/java/management/common/release/maven artifacts/
   cp -a qpid-${VER}/java/amqp-1-0-common/release/maven artifacts/

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/AMQP_1.0
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/AMQP_1.0?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/AMQP_1.0 (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/AMQP_1.0 Thu Jan 23 10:15:46 2014
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 AMQP 1.0 support for the qpid::messaging API
 --------------------------------------------
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/DESIGN
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/DESIGN?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/DESIGN (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/DESIGN Thu Jan 23 10:15:46 2014
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 Qpid C++ AMQP implementation
 =============================
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/INSTALL-WINDOWS
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/INSTALL-WINDOWS?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/INSTALL-WINDOWS (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/INSTALL-WINDOWS Thu Jan 23 10:15:46 2014
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 		Installing Qpid/C++ on Windows
 		==============================
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/README-HA.txt
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/README-HA.txt?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/README-HA.txt (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/README-HA.txt Thu Jan 23 10:15:46 2014
@@ -1,4 +1,22 @@
 <!--*-markdown-*-->
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
 
 Migrating to new HA
 ===================

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/README-winsdk.txt
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/README-winsdk.txt?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/README-winsdk.txt (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/README-winsdk.txt Thu Jan 23 10:15:46 2014
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
             Qpid-Cpp-Win-Sdk
             ================
 
@@ -169,4 +188,4 @@ Debug or Release configuration.
   the Debug variant of Qpid code may do so under their own copy of 
   Visual Studio where the debug versions of MSVC90 or MSVC100 runtime 
   libraries are available.
-  
\ No newline at end of file
+  

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/README.txt
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/README.txt?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/README.txt (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/README.txt Thu Jan 23 10:15:46 2014
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
             Qpid/C++
             ========
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/SSL
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/SSL?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/SSL (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/SSL Thu Jan 23 10:15:46 2014
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
                  Using SSL
                  =========
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/app.config
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/app.config?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/app.config (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/app.config Thu Jan 23 10:15:46 2014
@@ -1,3 +1,21 @@
 <?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 <configuration>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.sender/app.config
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.sender/app.config?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.sender/app.config (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.sender/app.config Thu Jan 23 10:15:46 2014
@@ -1,3 +1,21 @@
 <?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 <configuration>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.client/app.config
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.client/app.config?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.client/app.config (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.client/app.config Thu Jan 23 10:15:46 2014
@@ -1,3 +1,21 @@
 <?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 <configuration>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.declare_queues/app.config
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.declare_queues/app.config?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.declare_queues/app.config (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.declare_queues/app.config Thu Jan 23 10:15:46 2014
@@ -1,3 +1,21 @@
 <?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 <configuration>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.drain/app.config
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.drain/app.config?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.drain/app.config (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.drain/app.config Thu Jan 23 10:15:46 2014
@@ -1,3 +1,21 @@
 <?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 <configuration>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.helloworld/app.config
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.helloworld/app.config?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.helloworld/app.config (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.helloworld/app.config Thu Jan 23 10:15:46 2014
@@ -1,3 +1,21 @@
 <?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 <configuration>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.server/app.config
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.server/app.config?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.server/app.config (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.server/app.config Thu Jan 23 10:15:46 2014
@@ -1,3 +1,21 @@
 <?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 <configuration>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.spout/app.config
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.spout/app.config?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.spout/app.config (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.spout/app.config Thu Jan 23 10:15:46 2014
@@ -1,3 +1,21 @@
 <?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 <configuration>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.receiver/app.config
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.receiver/app.config?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.receiver/app.config (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.receiver/app.config Thu Jan 23 10:15:46 2014
@@ -1,3 +1,21 @@
 <?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 <configuration>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.sender/app.config
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.sender/app.config?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.sender/app.config (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.sender/app.config Thu Jan 23 10:15:46 2014
@@ -1,3 +1,21 @@
 <?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 <configuration>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.receiver/app.config
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.receiver/app.config?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.receiver/app.config (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.receiver/app.config Thu Jan 23 10:15:46 2014
@@ -1,3 +1,21 @@
 <?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 <configuration>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.sender/app.config
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.sender/app.config?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.sender/app.config (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.sender/app.config Thu Jan 23 10:15:46 2014
@@ -1,3 +1,21 @@
 <?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 <configuration>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sessionreceiver.sln
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sessionreceiver.sln?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sessionreceiver.sln (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sessionreceiver.sln Thu Jan 23 10:15:46 2014
@@ -1,5 +1,25 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
+
+# 
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License
+#
+
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "org.apache.qpid.messaging", "..\src\msvc10\org.apache.qpid.messaging.vcxproj", "{AA5A3B83-5F98-406D-A01C-5A921467A57D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.apache.qpid.messaging.sessionreceiver", "..\src\sessionreceiver\msvc10\org.apache.qpid.messaging.sessionreceiver.csproj", "{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}"

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sln
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sln?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sln (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sln Thu Jan 23 10:15:46 2014
@@ -1,5 +1,25 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
+
+# 
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License
+#
+
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{34C477FB-B0CC-4AB9-A346-EA7B055469AC}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Direct", "Direct", "{DE58D329-10DC-4C8D-9EFA-230A57314089}"

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj Thu Jan 23 10:15:46 2014
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj.filters
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj.filters?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj.filters (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj.filters Thu Jan 23 10:15:46 2014
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/winsdk_dotnet_examples.sln
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/winsdk_dotnet_examples.sln?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/winsdk_dotnet_examples.sln (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/winsdk_dotnet_examples.sln Thu Jan 23 10:15:46 2014
@@ -1,5 +1,25 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
+
+# 
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License
+#
+
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.direct.sender", "examples\csharp.direct.sender\csharp.direct.sender.csproj", "{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.direct.receiver", "examples\csharp.direct.receiver\csharp.direct.receiver.csproj", "{52F880E7-D677-4C91-8516-D679CE0F46A8}"

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/perl/Makefile.PL
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/perl/Makefile.PL?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/perl/Makefile.PL (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/perl/Makefile.PL Thu Jan 23 10:15:46 2014
@@ -1,4 +1,20 @@
 #!/usr/bin/env perl -w
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License
 
 use strict;
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/closing_a_connection.feature
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/closing_a_connection.feature?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/closing_a_connection.feature (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/closing_a_connection.feature Thu Jan 23 10:15:46 2014
@@ -1,3 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
 Feature: Closing an open connection
   When working with a broker
   As a producer or consumer
@@ -10,4 +28,4 @@ Feature: Closing an open connection
   Scenario: The connection is open
     Given an open connection
     And the connection is closed
-    Then the connection is in the closed state
\ No newline at end of file
+    Then the connection is in the closed state

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/closing_a_session.feature
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/closing_a_session.feature?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/closing_a_session.feature (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/closing_a_session.feature Thu Jan 23 10:15:46 2014
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 Feature: Closing an open session
   While working with a session
   As a producer or consumer

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/connecting_to_a_broker.feature
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/connecting_to_a_broker.feature?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/connecting_to_a_broker.feature (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/connecting_to_a_broker.feature Thu Jan 23 10:15:46 2014
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+ 
 Feature: Connecting to a broker
   In order to interaction on an AMQP network
   As a producer or consumer

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/creating_a_receiver.feature
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/creating_a_receiver.feature?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/creating_a_receiver.feature (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/creating_a_receiver.feature Thu Jan 23 10:15:46 2014
@@ -1,3 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
 Feature: Creating a receiver
   When working with a messaging environment
   As a consumer

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/creating_a_sender.feature
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/creating_a_sender.feature?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/creating_a_sender.feature (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/creating_a_sender.feature Thu Jan 23 10:15:46 2014
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 Feature: Creating a sender
   When working with a session
   As a producer

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/creating_a_session.feature
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/creating_a_session.feature?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/creating_a_session.feature (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/creating_a_session.feature Thu Jan 23 10:15:46 2014
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+ 
 Feature: Creating a session
   When working with a broker
   As a producer or consumer

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/getting_the_connections_authenticated_username.feature
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/getting_the_connections_authenticated_username.feature?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/getting_the_connections_authenticated_username.feature (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/getting_the_connections_authenticated_username.feature Thu Jan 23 10:15:46 2014
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 Feature: Getting the authenticated username from an open connection.
   When connected to a broker
   As a producer or consumer

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/receiving_a_message.feature
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/receiving_a_message.feature?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/receiving_a_message.feature (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/receiving_a_message.feature Thu Jan 23 10:15:46 2014
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 Feature: Receving a message
   When working with a broker
   As a message consumer

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/sending_a_message.feature
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/sending_a_message.feature?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/sending_a_message.feature (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/sending_a_message.feature Thu Jan 23 10:15:46 2014
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 Feature: Sending a message
   When working with a broker
   As a producer
@@ -18,4 +35,4 @@ Feature: Sending a message
   Scenario: The message sends successfully
     Given an open session
     And creating a sender with "my-queue;{create:always,delete:always}" succeeds
-    Then sending the message "This is a test" succeeds
\ No newline at end of file
+    Then sending the message "This is a test" succeeds

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/session_returns_its_connection.feature
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/session_returns_its_connection.feature?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/session_returns_its_connection.feature (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/session_returns_its_connection.feature Thu Jan 23 10:15:46 2014
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 Feature: A session returns its connection
   With an action session
   As a producer or consumer

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/sessions_have_names.feature
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/sessions_have_names.feature?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/sessions_have_names.feature (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/features/sessions_have_names.feature Thu Jan 23 10:15:46 2014
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 Feature: Session have a name
   When using a session
   As a producer or consumer

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/qpid_messaging.gemspec
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/qpid_messaging.gemspec?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/qpid_messaging.gemspec (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/ruby/qpid_messaging.gemspec Thu Jan 23 10:15:46 2014
@@ -1,4 +1,21 @@
 # -*- encoding: utf-8 -*-
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+ 
 lib = File.expand_path('lib/', __FILE__)
 $:.unshift lib unless $:.include?(lib)
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/cmake_uninstall.cmake.in
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/cmake_uninstall.cmake.in?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/cmake_uninstall.cmake.in (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/cmake_uninstall.cmake.in Thu Jan 23 10:15:46 2014
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 if (NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
     message(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
 endif(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/design_docs/ha-transactions.md
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/design_docs/ha-transactions.md?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/design_docs/ha-transactions.md (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/design_docs/ha-transactions.md Thu Jan 23 10:15:46 2014
@@ -1,3 +1,22 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
 # Design note: HA with Transactions.
 
 Clients can use transactions (TX or DTX) with the current HA module but:

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/design_docs/log-model-category-for-correlation.txt
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/design_docs/log-model-category-for-correlation.txt?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/design_docs/log-model-category-for-correlation.txt (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/design_docs/log-model-category-for-correlation.txt Thu Jan 23 10:15:46 2014
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 This documennt describes the new logging entries written for
 "QPID-4079 C++ Broker needs log messages to track object life cycles for auditing". 
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/design_docs/windows_clfs_store_design.txt
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/design_docs/windows_clfs_store_design.txt?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/design_docs/windows_clfs_store_design.txt (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/design_docs/windows_clfs_store_design.txt Thu Jan 23 10:15:46 2014
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 Design for Hybrid SQL/CLFS-Based Store in Qpid
 ==============================================
 

Propchange: qpid/branches/java-broker-bdb-ha/qpid/cpp/docs/api/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/cpp/docs/api:r1549895-1558036

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/docs/api/doxygen_developer_mainpage.h
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/docs/api/doxygen_developer_mainpage.h?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/docs/api/doxygen_developer_mainpage.h (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/docs/api/doxygen_developer_mainpage.h Thu Jan 23 10:15:46 2014
@@ -54,6 +54,11 @@
  *   <li><p>Subclasses of Queue and Exchange</p></li>
  * </ul>
  *
+ * Add-on modules to the broker:
+ *
+ * - \ref ha-module "High Availability"
+ *
+ *
  *
  * <h2>Starting Points: Client</h2>
  *
@@ -64,7 +69,3 @@
  * <p>TBD</p>
  *
  */
-
-
-
-

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/docs/man/generate_manpage
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/docs/man/generate_manpage?rev=1560618&r1=1560617&r2=1560618&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/docs/man/generate_manpage (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/docs/man/generate_manpage Thu Jan 23 10:15:46 2014
@@ -17,7 +17,10 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-$2 --help | grep -v 'Usage: ' | sed -f $(dirname $0)/groffify_options.sed > .temp.options.groff
+
+test -n "$3" || { echo "Usage: $0 <source> <qpidd> <output>"; exit 1; }
+
+$2 --help --no-module-dir | grep -v 'Usage: ' | sed -f $(dirname $0)/groffify_options.sed > .temp.options.groff
 cat $1 | sed -f $(dirname $0)/groffify_template.sed | sed -e '/^\.PP$/ r .temp.options.groff' -e "/^.SH NAME/ i\
 .TH QPIDD \"1\" \"$(date +'%B %Y')\" \"$($2 -v)\" \"User Commands\"
 " > $3



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


Mime
View raw message