You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2012/12/17 12:22:58 UTC
svn commit: r1422853 [1/3] - in /qpid/branches/java-broker-config-qpid-4390:
./ qpid/ qpid/bin/ qpid/cpp/ qpid/cpp/bindings/qmf/
qpid/cpp/bindings/qmf/python/ qpid/cpp/bindings/qmf/ruby/
qpid/cpp/bindings/qmf2/ qpid/cpp/bindings/qmf2/examples/cpp/ qpid...
Author: orudyy
Date: Mon Dec 17 11:22:49 2012
New Revision: 1422853
URL: http://svn.apache.org/viewvc?rev=1422853&view=rev
Log:
merge from trunk up to revision 1415148: missed changes
Added:
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/perl/LICENSE
- copied unchanged from r1415148, qpid/trunk/qpid/cpp/bindings/qpid/perl/LICENSE
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/perl/Makefile.PL
- copied unchanged from r1415148, qpid/trunk/qpid/cpp/bindings/qpid/perl/Makefile.PL
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/perl/qpid.pm
- copied unchanged from r1415148, qpid/trunk/qpid/cpp/bindings/qpid/perl/qpid.pm
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/etc/qpidd.service
- copied unchanged from r1415148, qpid/trunk/qpid/cpp/etc/qpidd.service
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qmf/qmf2.i
- copied unchanged from r1415148, qpid/trunk/qpid/cpp/include/qmf/qmf2.i
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qmf/qmfengine.i
- copied unchanged from r1415148, qpid/trunk/qpid/cpp/include/qmf/qmfengine.i
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/qpid.i
- copied unchanged from r1415148, qpid/trunk/qpid/cpp/include/qpid/qpid.i
qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Producer-Transaction-Timeout.xml
- copied unchanged from r1415148, qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Producer-Transaction-Timeout.xml
qpid/branches/java-broker-config-qpid-4390/qpid/gentools/lib/
- copied from r1415148, qpid/trunk/qpid/gentools/lib/
qpid/branches/java-broker-config-qpid-4390/qpid/gentools/lib/LICENSE
- copied unchanged from r1415148, qpid/trunk/qpid/gentools/lib/LICENSE
qpid/branches/java-broker-config-qpid-4390/qpid/gentools/lib/NOTICE
- copied unchanged from r1415148, qpid/trunk/qpid/gentools/lib/NOTICE
qpid/branches/java-broker-config-qpid-4390/qpid/gentools/lib/README.txt
- copied unchanged from r1415148, qpid/trunk/qpid/gentools/lib/README.txt
qpid/branches/java-broker-config-qpid-4390/qpid/gentools/lib/velocity-1.4.jar
- copied unchanged from r1415148, qpid/trunk/qpid/gentools/lib/velocity-1.4.jar
qpid/branches/java-broker-config-qpid-4390/qpid/gentools/lib/velocity-dep-1.4.jar
- copied unchanged from r1415148, qpid/trunk/qpid/gentools/lib/velocity-dep-1.4.jar
Removed:
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/qmfengine.i
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/qmf2.i
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/README
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/qpid.i
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/etc/qpidd.service.in
Modified:
qpid/branches/java-broker-config-qpid-4390/ (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/ (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/QPID_VERSION.txt
qpid/branches/java-broker-config-qpid-4390/qpid/bin/release.sh
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/Makefile.am
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/python/CMakeLists.txt
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/python/Makefile.am
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/python/python.i
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/ruby/CMakeLists.txt
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/ruby/Makefile.am
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/ruby/ruby.i
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/examples/cpp/Makefile.am
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/python/CMakeLists.txt
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/python/Makefile.am
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/python/python.i
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/ruby/Makefile.am
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/ruby/ruby.i
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/Makefile.am
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/client.pl (contents, props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/drain.pl (contents, props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/hello_world.pl (contents, props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/hello_xml.pl (contents, props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/map_receiver.pl (contents, props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/map_sender.pl (contents, props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/server.pl (contents, props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/spout.pl (contents, props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/perl/CMakeLists.txt
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/perl/perl.i
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/python/CMakeLists.txt
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/python/Makefile.am
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/python/python.i
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/ruby/Makefile.am
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/ruby/README.rdoc
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/ruby/ruby.i
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/docs/api/ (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/etc/CMakeLists.txt
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/etc/Makefile.am
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/messaging/Makefile.am
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/messaging/spout.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/direct/Makefile.am
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/failover/Makefile.am
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/fanout/Makefile.am
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/pub-sub/Makefile.am
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/request-response/Makefile.am
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/tradedemo/Makefile.am
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/examples/old_api/xml-exchange/Makefile.am
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/qmf-console/Makefile.am
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/management/Manageable.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/managementgen/qmf-gen
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/managementgen/qmfgen/generate.py
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/managementgen/qmfgen/schema.py
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/managementgen/qmfgen/templates/Class.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/managementgen/qmfgen/templates/Event.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/managementgen/qmfgen/templates/Package.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 (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/Makefile.am
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/posix/QpiddBroker.cpp
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/acl/ (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/acl/Acl.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/acl/Acl.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/amqp/Decoder.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/amqp/Decoder.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/amqp/Sasl.cpp
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/Connection.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/Connection.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/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/Protocol.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/QueueFlowLimit.cpp
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/SemanticState.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/SessionState.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/SessionState.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/System.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/Vhost.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/amqp/Connection.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/amqp/ManagedConnection.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/amqp/ManagedConnection.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/amqp/ManagedSession.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/amqp/ManagedSession.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/amqp/Message.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/amqp/Message.h
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/Session.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/amqp/Translation.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/amqp_0_10/MessageTransfer.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/broker/amqp_0_10/MessageTransfer.h
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/ha/HaBroker.h
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/management/Manageable.cpp
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/ConnectionContext.h
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/Sasl.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/messaging/amqp/Sasl.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/SessionContext.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/posix/AsynchIO.cpp
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/PollableCondition.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/ (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/BrokerMgmtAgent.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/cluster_tests.py (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/testagent.cpp
qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/testagent.mk
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-Runtime.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-Stores-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/doc/book/src/java-broker/commonEntities.xml
qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/images/HA-BDBHAMessageStore-MBean-jconsole.png
qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/programming/Programming-In-Apache-Qpid.xml
qpid/branches/java-broker-config-qpid-4390/qpid/extras/qmf/setup.py
qpid/branches/java-broker-config-qpid-4390/qpid/packaging/windows/ (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/packaging/windows/INSTALL_NOTES.html
qpid/branches/java-broker-config-qpid-4390/qpid/packaging/windows/installer.proj (contents, props changed)
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/concurrency.py (props changed)
qpid/branches/java-broker-config-qpid-4390/qpid/python/setup.py
qpid/branches/java-broker-config-qpid-4390/qpid/tests/setup.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/setup.py
Propchange: qpid/branches/java-broker-config-qpid-4390/
------------------------------------------------------------------------------
Merged /qpid/trunk:r1411034-1415148
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid:r1411034-1415148
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/QPID_VERSION.txt
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/QPID_VERSION.txt?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/QPID_VERSION.txt (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/QPID_VERSION.txt Mon Dec 17 11:22:49 2012
@@ -1 +1 @@
-0.19
+0.21
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/bin/release.sh
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/bin/release.sh?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/bin/release.sh (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/bin/release.sh Mon Dec 17 11:22:49 2012
@@ -37,6 +37,7 @@ usage()
echo "--source|-e : Generate the source artefact"
echo "--cpp |-c : Generate the CPP artefacts"
echo "--java |-j : Generate the java artefacts"
+ echo "--perl |-r : Generate the Perl artefacts"
echo "--python|-p : Generate the python artefacts"
echo "--wcf |-w : Generate the WCF artefacts"
echo "--tools |-t : Generate the tools artefacts"
@@ -53,6 +54,7 @@ all_artefacts()
CPP="CPP"
JAVA="JAVA"
+ PERL="PERL"
PYTHON="PYTHON"
WCF="WCF"
TOOLS="TOOLS"
@@ -94,6 +96,9 @@ for arg in $* ; do
--java|-j)
JAVA="JAVA"
;;
+ --perl|-r)
+ PERL="PERL"
+ ;;
--python|-p)
PYTHON="PYTHON"
;;
@@ -146,7 +151,7 @@ echo REV:$REV
echo VER:$VER
# If nothing is specified then do it all
-if [ -z "${CLEAN}${PREPARE}${CPP}${JAVA}${PYTHON}${QMF}${TOOLS}${WCF}${SOURCE}${SIGN}${UPLOAD}" ] ; then
+if [ -z "${CLEAN}${PREPARE}${CPP}${JAVA}${PERL}${PYTHON}${QMF}${TOOLS}${WCF}${SOURCE}${SIGN}${UPLOAD}" ] ; then
PREPARE="PREPARE"
all_artefacts
SIGN="SIGN"
@@ -184,6 +189,24 @@ if [ "SOURCE" == "$SOURCE" ] ; then
tar -czf artifacts/qpid-${VER}.tar.gz qpid-${VER}
fi
+if [ "PERL" == "$PERL" ]; then
+ pushd qpid-${VER}/cpp/bindings/qpid
+ make
+ popd
+ mkdir qpid-${VER}/perl-qpid-${VER}
+ cp qpid-${VER}/cpp/bindings/qpid/perl/perl.i \
+ qpid-${VER}/cpp/bindings/qpid/perl/*pm \
+ qpid-${VER}/cpp/bindings/qpid/perl/LICENSE \
+ qpid-${VER}/cpp/bindings/qpid/perl/Makefile.PL \
+ qpid-${VER}/perl-qpid-${VER}
+ mkdir qpid-${VER}/perl-qpid-${VER}/examples
+ cp qpid-${VER}/cpp/bindings/qpid/examples/perl/* \
+ qpid-${VER}/perl-qpid-${VER}/examples
+ pushd qpid-${VER}
+ tar -czf ../artifacts/perl-qpid-${VER}.tar.gz perl-qpid-${VER}
+ popd
+fi
+
if [ "PYTHON" == "$PYTHON" ] ; then
tar -czf artifacts/qpid-python-${VER}.tar.gz qpid-${VER}/python qpid-${VER}/specs
fi
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=1422853&r1=1422852&r2=1422853&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 Dec 17 11:22:49 2012
@@ -180,6 +180,7 @@ endif()
set (QPID_INSTALL_LIBDIR ${LIB_INSTALL_DIR})
set (QPID_LOCALSTATE_DIR var) # Directory to store local state data
set (QPID_MAN_DIR man) # Directory to install manual files
+ set (QPID_INSTALL_SYSTEMDDIR usr/lib/systemd/system) # Systemd service files
set_absolute_install_path (QPIDC_MODULE_DIR ${QPID_INSTALL_LIBDIR}/qpid/client) # Directory to load client plug-in modules from
set_absolute_install_path (QPIDD_MODULE_DIR ${QPID_INSTALL_LIBDIR}/qpid/daemon) # Directory to load broker plug-in modules from
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=1422853&r1=1422852&r2=1422853&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 Dec 17 11:22:49 2012
@@ -68,6 +68,15 @@ set (QPIDD_CONF_FILE ${QPIDD_CONF_PATH}
"Name of the Qpid broker configuration file")
install(FILES LICENSE NOTICE DESTINATION ${QPID_INSTALL_DOCDIR})
+install(FILES xml/cluster.xml
+ bindings/swig_perl_typemaps.i
+ bindings/swig_python_typemaps.i
+ bindings/swig_ruby_typemaps.i
+ DESTINATION ${QPID_INSTALL_DATADIR})
+install(FILES include/qpid/qpid.i
+ include/qmf/qmfengine.i
+ include/qmf/qmf2.i
+ DESTINATION ${QPID_INSTALL_INCLUDEDIR})
if (WIN32)
set (CMAKE_DEBUG_POSTFIX "d")
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/Makefile.am?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/Makefile.am (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/Makefile.am Mon Dec 17 11:22:49 2012
@@ -26,7 +26,8 @@ EXTRA_DIST = \
LICENSE NOTICE README.txt SSL RELEASE_NOTES DESIGN \
xml/cluster.xml INSTALL-WINDOWS CMakeLists.txt BuildInstallSettings.cmake \
packaging/NSIS QPID_VERSION.txt bindings/CMakeLists.txt \
- bindings/swig_python_typemaps.i bindings/swig_ruby_typemaps.i bindings/swig_perl_typemaps.i
+ bindings/swig_python_typemaps.i bindings/swig_ruby_typemaps.i bindings/swig_perl_typemaps.i \
+ include/qpid/qpid.i include/qmf/qmfengine.i include/qmf/qmf2.i
SUBDIRS = managementgen etc src docs/api docs/man examples bindings/qmf bindings/qpid bindings/qmf2
@@ -36,4 +37,4 @@ libtool: $(LIBTOOL_DEPS)
check-long: all
$(MAKE) -C src/tests check-long
-
\ No newline at end of file
+
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/python/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/python/CMakeLists.txt?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/python/CMakeLists.txt (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/python/CMakeLists.txt Mon Dec 17 11:22:49 2012
@@ -21,7 +21,7 @@
## Use Swig to generate a literal binding to the C++ API
##------------------------------------------------------
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/python.i PROPERTIES CPLUSPLUS ON)
-set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/python.i PROPERTIES SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include")
+set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/python.i PROPERTIES SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include;-I${qpid-cpp_SOURCE_DIR}/bindings")
swig_add_module(qmfengine_python python ${CMAKE_CURRENT_SOURCE_DIR}/python.i)
swig_link_libraries(qmfengine_python qmf qmfconsole ${PYTHON_LIBRARIES})
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/python/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/python/Makefile.am?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/python/Makefile.am (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/python/Makefile.am Mon Dec 17 11:22:49 2012
@@ -29,7 +29,7 @@ EXTRA_DIST = CMakeLists.txt python.i
BUILT_SOURCES = $(generated_file_list)
SWIG_FLAGS = -w362,401
-$(generated_file_list): $(srcdir)/python.i $(srcdir)/../qmfengine.i
+$(generated_file_list): $(srcdir)/python.i
$(SWIG) -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -I/usr/include -o qmfengine.cpp $(srcdir)/python.i
pylibdir = $(pyexecdir)
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/python/python.i
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/python/python.i?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/python/python.i (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/python/python.i Mon Dec 17 11:22:49 2012
@@ -139,5 +139,5 @@
-%include "../qmfengine.i"
+%include "qmf/qmfengine.i"
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/ruby/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/ruby/CMakeLists.txt?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/ruby/CMakeLists.txt (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/ruby/CMakeLists.txt Mon Dec 17 11:22:49 2012
@@ -22,7 +22,9 @@
##------------------------------------------------------
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/ruby.i PROPERTIES CPLUSPLUS ON)
-include_directories(${RUBY_INCLUDE_DIRS} ${qpid-cpp_SOURCE_DIR}/include)
+include_directories(${RUBY_INCLUDE_DIRS}
+ ${qpid-cpp_SOURCE_DIR}/include
+ ${qpid-cpp_SOURCE_DIR}/bindings)
swig_add_module(qmfengine_ruby ruby ${CMAKE_CURRENT_SOURCE_DIR}/ruby.i)
swig_link_libraries(qmfengine_ruby qmf qmfconsole ${RUBY_LIBRARY})
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/ruby/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/ruby/Makefile.am?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/ruby/Makefile.am (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/ruby/Makefile.am Mon Dec 17 11:22:49 2012
@@ -29,7 +29,7 @@ rubylibdir = $(RUBY_LIB)
dist_rubylib_DATA = qmf.rb
-qmfengine.cpp: $(srcdir)/ruby.i $(srcdir)/../qmfengine.i
+qmfengine.cpp: $(srcdir)/ruby.i
$(SWIG) -ruby -c++ $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o qmfengine.cpp $(srcdir)/ruby.i
rubylibarchdir = $(RUBY_LIB_ARCH)
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/ruby/ruby.i
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/ruby/ruby.i?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/ruby/ruby.i (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf/ruby/ruby.i Mon Dec 17 11:22:49 2012
@@ -102,5 +102,5 @@
}
-%include "../qmfengine.i"
+%include "qmf/qmfengine.i"
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/examples/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/examples/cpp/Makefile.am?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/examples/cpp/Makefile.am (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/examples/cpp/Makefile.am Mon Dec 17 11:22:49 2012
@@ -24,13 +24,13 @@ AM_CPPFLAGS = $(INCLUDE)
noinst_PROGRAMS=agent event_driven_list_agents list_agents print_events
agent_SOURCES=agent.cpp
-agent_LDADD=$(top_builddir)/src/libqmf2.la
+agent_LDADD=$(top_builddir)/src/libqmf2.la -lqpidtypes -lqpidmessaging
list_agents_SOURCES=list_agents.cpp
-list_agents_LDADD=$(top_builddir)/src/libqmf2.la
+list_agents_LDADD=$(top_builddir)/src/libqmf2.la -lqpidmessaging
event_driven_list_agents_SOURCES=event_driven_list_agents.cpp
-event_driven_list_agents_LDADD=$(top_builddir)/src/libqmf2.la
+event_driven_list_agents_LDADD=$(top_builddir)/src/libqmf2.la -lqpidmessaging
print_events_SOURCES=print_events.cpp
-print_events_LDADD=$(top_builddir)/src/libqmf2.la
+print_events_LDADD=$(top_builddir)/src/libqmf2.la -lqpidtypes -lqpidmessaging
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/python/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/python/CMakeLists.txt?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/python/CMakeLists.txt (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/python/CMakeLists.txt Mon Dec 17 11:22:49 2012
@@ -21,7 +21,7 @@
## Use Swig to generate a literal binding to the C++ API
##------------------------------------------------------
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/python.i PROPERTIES CPLUSPLUS ON)
-set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/python.i PROPERTIES SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include")
+set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/python.i PROPERTIES SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include;-I${qpid-cpp_SOURCE_DIR}/bindings")
swig_add_module(cqmf2_python python ${CMAKE_CURRENT_SOURCE_DIR}/python.i)
swig_link_libraries(cqmf2_python qmf2 ${PYTHON_LIBRARIES})
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/python/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/python/Makefile.am?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/python/Makefile.am (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/python/Makefile.am Mon Dec 17 11:22:49 2012
@@ -19,7 +19,7 @@
if HAVE_PYTHON_DEVEL
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src $(QMF_INCLUDES)
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/bindings -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src $(QMF_INCLUDES)
generated_file_list = \
cqmf2.cpp \
@@ -29,7 +29,7 @@ EXTRA_DIST = CMakeLists.txt python.i
BUILT_SOURCES = $(generated_file_list)
SWIG_FLAGS = -w362,401
-$(generated_file_list): $(srcdir)/python.i $(srcdir)/../qmf2.i $(srcdir)/../../swig_python_typemaps.i
+$(generated_file_list): $(srcdir)/python.i
$(SWIG) -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o cqmf2.cpp $(srcdir)/python.i
pylibdir = $(pyexecdir)
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/python/python.i
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/python/python.i?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/python/python.i (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/python/python.i Mon Dec 17 11:22:49 2012
@@ -19,7 +19,7 @@
%module cqmf2
%include "std_string.i"
-%include "../../swig_python_typemaps.i"
+%include "swig_python_typemaps.i"
/* Define the general-purpose exception handling */
%exception {
@@ -37,5 +37,5 @@
}
}
-%include "../qmf2.i"
+%include "qmf/qmf2.i"
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt Mon Dec 17 11:22:49 2012
@@ -22,7 +22,9 @@
##------------------------------------------------------
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/ruby.i PROPERTIES CPLUSPLUS ON)
-include_directories(${RUBY_INCLUDE_DIRS} ${qpid-cpp_SOURCE_DIR}/include)
+include_directories(${RUBY_INCLUDE_DIRS}
+ ${qpid-cpp_SOURCE_DIR}/include
+ ${qpid-cpp_SOURCE_DIR}/bindings)
swig_add_module(cqmf2_ruby ruby ${CMAKE_CURRENT_SOURCE_DIR}/ruby.i)
swig_link_libraries(cqmf2_ruby qmf2 ${RUBY_LIBRARY})
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/ruby/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/ruby/Makefile.am?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/ruby/Makefile.am (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/ruby/Makefile.am Mon Dec 17 11:22:49 2012
@@ -19,7 +19,7 @@
if HAVE_RUBY_DEVEL
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src $(QMF_INCLUDES)
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/bindings -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src $(QMF_INCLUDES)
EXTRA_DIST = CMakeLists.txt ruby.i
BUILT_SOURCES = cqmf2.cpp
@@ -27,7 +27,7 @@ SWIG_FLAGS = -w362,401
rubylibdir = $(RUBY_LIB)
-cqmf2.cpp: $(srcdir)/ruby.i $(srcdir)/../qmf2.i $(srcdir)/../../swig_ruby_typemaps.i
+cqmf2.cpp: $(srcdir)/ruby.i
$(SWIG) -ruby -c++ $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o cqmf2.cpp $(srcdir)/ruby.i
rubylibarchdir = $(RUBY_LIB_ARCH)
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/ruby/ruby.i
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/ruby/ruby.i?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/ruby/ruby.i (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qmf2/ruby/ruby.i Mon Dec 17 11:22:49 2012
@@ -21,7 +21,7 @@
/* Ruby doesn't have a != operator*/
#pragma SWIG nowarn=378
%include "std_string.i"
-%include "../../swig_ruby_typemaps.i"
+%include "swig_ruby_typemaps.i"
/* Define the general-purpose exception handling */
%exception {
@@ -34,4 +34,4 @@
}
}
-%include "../qmf2.i"
+%include "qmf/qmf2.i"
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/Makefile.am?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/Makefile.am (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/Makefile.am Mon Dec 17 11:22:49 2012
@@ -21,7 +21,7 @@ SUBDIRS = dotnet
if HAVE_SWIG
-EXTRA_DIST = qpid.i
+EXTRA_DIST = CMakeLists.txt qpid.i
if HAVE_RUBY_DEVEL
SUBDIRS += ruby
@@ -33,18 +33,18 @@ endif
if HAVE_PERL_DEVEL
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src -I$(PERL_INC)
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/bindings -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src -I$(PERL_INC)
EXTRA_DIST += perl/perl.i perl/CMakeLists.txt
BUILT_SOURCES = perl/cqpid_perl.cpp
SWIG_FLAGS = -w362,401
-perl/cqpid_perl.cpp: $(srcdir)/perl/perl.i $(srcdir)/qpid.i $(srcdir)/../swig_perl_typemaps.i
+perl/cqpid_perl.cpp: $(srcdir)/perl/perl.i
$(SWIG) -perl -c++ $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o perl/cqpid_perl.cpp $(srcdir)/perl/perl.i
perl/Makefile: perl/cqpid_perl.cpp
cd perl; \
- $(PERL) Makefile.PL PREFIX=$(prefix) LIB=$(PERL_ARCHLIB) ; \
+ $(PERL) Makefile.PL PREFIX=$(prefix) ; \
cd ..
all-local: perl/Makefile
@@ -54,7 +54,7 @@ all-local: perl/Makefile
install-exec-local:
cd perl ; \
- $(MAKE) pure_install DESTDIR=$(prefix) ; \
+ $(MAKE) pure_install ; \
cd ..
clean-local:
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/client.pl
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/client.pl?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/client.pl (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/client.pl Mon Dec 17 11:22:49 2012
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -20,23 +20,23 @@
use strict;
use warnings;
-use cqpid_perl;
+use qpid;
my $url = ( @ARGV == 1 ) ? $ARGV[0] : "amqp:tcp:127.0.0.1:5672";
-my $connectionOptions = ( @ARGV > 1 ) ? $ARGV[1] : "";
+my $connectionOptions = ( @ARGV > 1 ) ? $ARGV[1] : "";
-my $connection = new cqpid_perl::Connection($url, $connectionOptions);
+my $connection = new qpid::messaging::Connection($url, $connectionOptions);
eval {
$connection->open();
-my $session = $connection->createSession();
+my $session = $connection->create_session();
-my $sender = $session->createSender("service_queue");
+my $sender = $session->create_sender("service_queue");
#create temp queue & receiver...
-my $responseQueue = new cqpid_perl::Address("#response-queue; {create:always, delete:always}");
-my $receiver = $session->createReceiver($responseQueue);
+my $responseQueue = new qpid::messaging::Address("#response-queue; {create:always, delete:always}");
+my $receiver = $session->create_receiver($responseQueue);
#Now send some messages...
@@ -47,13 +47,13 @@ my @s = (
"And the mome raths outgrabe."
);
-my $request = new cqpid_perl::Message();
-$request->setReplyTo($responseQueue);
+my $request = new qpid::messaging::Message();
+$request->set_reply_to($responseQueue);
for (my $i=0; $i<4; $i++) {
- $request->setContent($s[$i]);
+ $request->set_content($s[$i]);
$sender->send($request);
my $response = $receiver->fetch();
- print $request->getContent() . " -> " . $response->getContent() . "\n";
+ print $request->get_content() . " -> " . $response->get_content() . "\n";
}
$connection->close();
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/client.pl
------------------------------------------------------------------------------
svn:executable = *
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/drain.pl
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/drain.pl?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/drain.pl (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/drain.pl Mon Dec 17 11:22:49 2012
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -20,15 +20,17 @@
use strict;
use warnings;
-use cqpid_perl;
+use qpid;
use Getopt::Long;
+use Pod::Usage;
my $url = "127.0.0.1";
-my $timeout = 60;
+my $timeout = 0;
my $forever = 0;
-my $count = 1;
+my $count = 0;
my $connectionOptions = "";
my $address = "amq.direct";
+my $help;
my $result = GetOptions(
"broker|b=s" => \ $url,
@@ -36,48 +38,59 @@ my $result = GetOptions(
"forever|f" => \ $forever,
"connection-options=s" => \ $connectionOptions,
"count|c=i" => \ $count,
-);
+ "help|h" => \ $help
+ ) || pod2usage(-verbose => 0);
-if (! $result) {
- print "Usage: perl drain.pl [OPTIONS]\n";
-}
+pod2usage(-verbose => 1) if $help;
if ($#ARGV ge 0) {
$address = $ARGV[0]
}
sub getTimeout {
- return ($forever) ? $cqpid_perl::Duration::FOREVER : new cqpid_perl::Duration($timeout*1000);
+ return ($forever) ? qpid::messaging::Duration::FOREVER : new qpid::messaging::Duration($timeout*1000);
}
+sub printProperties {
+ my $h = shift();
+ return qq[{${\(join', ',map"'$_': '$h->{$_}'",keys%$h)}}]
+}
-my $connection = new cqpid_perl::Connection($url, $connectionOptions);
+my $connection = new qpid::messaging::Connection($url, $connectionOptions);
eval {
$connection->open();
- my $session = $connection->createSession();
- my $receiver = $session->createReceiver($address);
+ my $session = $connection->create_session();
+ my $receiver = $session->create_receiver($address);
my $timeout = getTimeout();
-
- my $message = new cqpid_perl::Message();
+ my $message = new qpid::messaging::Message();
my $i = 0;
- while($receiver->fetch($message, $timeout)) {
- print "Message(properties=" . $message->getProperties() . ",content='";
- if ($message->getContentType() eq "amqp/map") {
- my $content = cqpid_perl::decodeMap($message);
+ for (;;) {
+ eval {
+ $message = $receiver->fetch($timeout);
+ };
+
+ if ($@) {
+ last;
+ }
+
+ my $redelivered = ($message->get_redelivered) ? "redelivered=True, " : "";
+ print "Message(" . $redelivered . "properties=" . printProperties($message->get_properties()) . ", content='";
+ if ($message->get_content_type() eq "amqp/map") {
+ my $content = qpid::messasging::decode_map($message);
map{ print "\n$_ => $content->{$_}"; } keys %{$content};
}
else {
- print $message->getContent();
+ print $message->get_content();
}
print "')\n";
-
- my $replyto = $message->getReplyTo();
- if ($replyto->getName()) {
- print "Replying to " . $message->getReplyTo()->str() . "...\n";
- my $sender = $session->createSender($replyto);
- my $response = new cqpid_perl::Message("received by the server.");
+
+ my $replyto = $message->get_reply_to();
+ if ($replyto->get_name()) {
+ print "Replying to " . $message->get_reply_to()->str() . "...\n";
+ my $sender = $session->create_sender($replyto);
+ my $response = new qpid::messaging::Message("received by the server.");
$sender->send($response);
}
$session->acknowledge();
@@ -86,6 +99,7 @@ eval {
last;
}
}
+
$receiver->close();
$session->close();
$connection->close();
@@ -96,3 +110,21 @@ if ($@) {
die $@;
}
+__END__
+
+=head1 NAME
+
+drain - Drains messages from the specified address
+
+=head1 SYNOPSIS
+
+ Options:
+ -h, --help show this message
+ -b VALUE, --broker VALUE url of broker to connect to
+ -t VALUE, --timeout VALUE timeout in seconds to wait before exiting
+ -f, --forever ignore timeout and wait forever
+ --connection-options VALUE connection options string in the form {name1:value1, name2:value2}
+ -c VALUE, --count VALUE number of messages to read before exiting
+
+=cut
+
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/drain.pl
------------------------------------------------------------------------------
svn:executable = *
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/hello_world.pl
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/hello_world.pl?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/hello_world.pl (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/hello_world.pl Mon Dec 17 11:22:49 2012
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -21,33 +21,27 @@ use strict;
use warnings;
use Data::Dumper;
-use cqpid_perl;
+use qpid;
my $broker = ( @ARGV > 0 ) ? $ARGV[0] : "localhost:5672";
my $address = ( @ARGV > 1 ) ? $ARGV[0] : "amq.topic";
my $connectionOptions = ( @ARGV > 2 ) ? $ARGV[1] : "";
-my $connection = new cqpid_perl::Connection($broker, $connectionOptions);
+my $connection = new qpid::messaging::Connection($broker, $connectionOptions);
eval {
$connection->open();
- my $session = $connection->createSession();
- my $receiver = $session->createReceiver($address);
- my $sender = $session->createSender($address);
+ my $session = $connection->create_session();
- $sender->send(new cqpid_perl::Message("Hello world!"));
+ my $receiver = $session->create_receiver($address);
+ my $sender = $session->create_sender($address);
- #my $duration = new cqpid_perl::Duration(1000);
- #print ">>>" . $duration->getMilliseconds() . "\n";
+ $sender->send(new qpid::messaging::Message("Hello world!"));
- my $message = $receiver->fetch($cqpid_perl::Duration::SECOND);
+ my $message = $receiver->fetch(qpid::messaging::Duration::SECOND);
- #$message->setDurable(1);
- #print "Durable: " . $message->getDurable() . "\n";
- #print Dumper($message->getProperties());
-
- print $message->getContent() . "\n";
+ print $message->get_content() . "\n";
$session->acknowledge();
$connection->close();
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/hello_world.pl
------------------------------------------------------------------------------
svn:executable = *
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/hello_xml.pl
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/hello_xml.pl?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/hello_xml.pl (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/hello_xml.pl Mon Dec 17 11:22:49 2012
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -20,7 +20,7 @@
use strict;
use warnings;
-use cqpid_perl;
+use qpid;
my $broker = ( @ARGV > 0 ) ? $ARGV[0] : "localhost:5672";
my $connectionOptions = ( @ARGV > 1 ) ? $ARGV[1] : "";
@@ -36,7 +36,7 @@ END
my $address = <<END;
xml-exchange; {
-create: always,
+create: always,
node: { type: topic, x-declare: { type: xml } },
link: {
x-bindings: [{ exchange: xml-exchange, key: weather, arguments: { xquery:" $query" } }]
@@ -44,15 +44,15 @@ x-bindings: [{ exchange: xml-exchange, k
END
-my $connection = new cqpid_perl::Connection($broker, $connectionOptions);
+my $connection = new qpid::messaging::Connection($broker, $connectionOptions);
eval {
$connection->open();
- my $session = $connection->createSession();
+ my $session = $connection->create_session();
- my $receiver = $session->createReceiver($address);
-
- my $message = new cqpid_perl::Message();
+ my $receiver = $session->create_receiver($address);
+
+ my $message = new qpid::messaging::Message();
my $content = <<END;
<weather>
@@ -62,13 +62,13 @@ eval {
<dewpoint>35</dewpoint>
</weather>
END
-
- $message->setContent($content);
- my $sender = $session->createSender('xml-exchange/weather');
+
+ $message->set_content($content);
+ my $sender = $session->create_sender('xml-exchange/weather');
$sender->send($message);
-
+
my $response = $receiver->fetch();
- print $response->getContent() . "\n";
+ print $response->get_content() . "\n";
$connection->close();
};
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/hello_xml.pl
------------------------------------------------------------------------------
svn:executable = *
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/map_receiver.pl
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/map_receiver.pl?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/map_receiver.pl (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/map_receiver.pl Mon Dec 17 11:22:49 2012
@@ -1,4 +1,4 @@
-#! /usr/bin/perl5
+#! /usr/bin/env perl
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -21,22 +21,21 @@ use strict;
use warnings;
use Data::Dumper;
-use cqpid_perl;
+use qpid;
my $url = ( @ARGV > 0 ) ? $ARGV[0] : "amqp:tcp:127.0.0.1:5672";
my $address = ( @ARGV > 1 ) ? $ARGV[0] : "message_queue; {create: always}";
my $connectionOptions = ( @ARGV > 2 ) ? $ARGV[1] : "";
-my $connection = new cqpid_perl::Connection($url, $connectionOptions);
+my $connection = new qpid::messaging::Connection($url, $connectionOptions);
eval {
$connection->open();
- my $session = $connection->createSession();
- my $receiver = $session->createReceiver($address);
+ my $session = $connection->create_session();
+ my $receiver = $session->create_receiver($address);
+
+ my $content = qpid::messaging::decode_map($receiver->fetch());
- my $content = cqpid_perl::decodeMap($receiver->fetch());
- #my $content = cqpid_perl::decodeList($receiver->fetch());
-
print Dumper($content);
$session->acknowledge();
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/map_receiver.pl
------------------------------------------------------------------------------
svn:executable = *
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/map_sender.pl
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/map_sender.pl?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/map_sender.pl (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/map_sender.pl Mon Dec 17 11:22:49 2012
@@ -1,4 +1,4 @@
-#! /usr/bin/perl5
+#! /usr/bin/env perl
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -21,27 +21,27 @@ use strict;
use warnings;
use Data::Dumper;
-use cqpid_perl;
+use qpid;
my $url = ( @ARGV > 0 ) ? $ARGV[0] : "amqp:tcp:127.0.0.1:5672";
my $address = ( @ARGV > 1 ) ? $ARGV[1] : "message_queue; {create: always}";
my $connectionOptions = ( @ARGV > 2 ) ? $ARGV[2] : "";
-my $connection = new cqpid_perl::Connection($url, $connectionOptions);
+my $connection = new qpid::messaging::Connection($url, $connectionOptions);
eval {
$connection->open();
- my $session = $connection->createSession();
- my $sender = $session->createSender($address);
+ my $session = $connection->create_session();
+ my $sender = $session->create_sender($address);
- my $message = new cqpid_perl::Message();
- my $content = { id => 987654321,
- name => "Widget",
- percent => sprintf("%.2f", 0.99),
- colours => [ qw (red green white) ],
+ my $message = new qpid::messaging::Message();
+ my $content = { id => 987654321,
+ name => "Widget",
+ percent => sprintf("%.2f", 0.99),
+ colours => [ qw (red green white) ],
};
- cqpid_perl::encode($content, $message);
+ qpid::messaging::encode($content, $message);
$sender->send($message, 1);
$connection->close();
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/map_sender.pl
------------------------------------------------------------------------------
svn:executable = *
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/server.pl
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/server.pl?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/server.pl (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/server.pl Mon Dec 17 11:22:49 2012
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -20,34 +20,35 @@
use strict;
use warnings;
-use cqpid_perl;
+use qpid;
my $url = ( @ARGV == 1 ) ? $ARGV[0] : "amqp:tcp:127.0.0.1:5672";
-my $connectionOptions = ( @ARGV > 1 ) ? $ARGV[1] : "";
+my $connectionOptions = ( @ARGV > 1 ) ? $ARGV[1] : "";
-my $connection = new cqpid_perl::Connection($url, $connectionOptions);
+my $connection = new qpid::messaging::Connection($url, $connectionOptions);
eval {
$connection->open();
- my $session = $connection->createSession();
+ my $session = $connection->create_session();
- my $receiver = $session->createReceiver("service_queue; {create: always}");
+ my $receiver = $session->create_receiver("service_queue; {create: always}");
while (1) {
my $request = $receiver->fetch();
- my $address = $request->getReplyTo();
+ my $address = $request->get_reply_to();
+
if ($address) {
- my $sender = $session->createSender($address);
- my $s = $request->getContent();
+ my $sender = $session->create_sender($address);
+ my $s = $request->get_content();
$s = uc($s);
- my $response = new cqpid_perl::Message($s);
+ my $response = new qpid::messaging::Message($s);
$sender->send($response);
- print "Processed request: " . $request->getContent() . " -> " . $response->getContent() . "\n";
+ print "Processed request: " . $request->get_content() . " -> " . $response->get_content() . "\n";
$session->acknowledge();
}
else {
- print "Error: no reply address specified for request: " . $request->getContent() . "\n";
+ print "Error: no reply address specified for request: " . $request->get_content() . "\n";
$session->reject($request);
}
}
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/server.pl
------------------------------------------------------------------------------
svn:executable = *
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/spout.pl
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/spout.pl?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/spout.pl (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/spout.pl Mon Dec 17 11:22:49 2012
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -20,8 +20,9 @@
use strict;
use warnings;
-use cqpid_perl;
+use qpid;
use Getopt::Long;
+use Pod::Usage;
use Time::Local;
my $url = "127.0.0.1";
@@ -34,6 +35,7 @@ my @entries;
my $content = "";
my $connectionOptions = "";
my $address = "amq.direct";
+my $help;
my $result = GetOptions(
"broker|b=s" => \ $url,
@@ -44,20 +46,16 @@ my $result = GetOptions(
"property|p=s@" => \ @properties,
"map|m=s@" => \ @entries,
"content=s" => \ $content,
- "connection-options=s" => \ $connectionOptions,
-);
-
-
-if (! $result) {
- print "Usage: perl drain.pl [OPTIONS]\n";
-}
+ "connection-options=s" => \ $connectionOptions,
+ "help|h" => \ $help
+ ) || pod2usage(-verbose => 0);
+pod2usage(-verbose => 1) if $help;
if ($#ARGV ge 0) {
$address = $ARGV[0]
}
-
sub setEntries {
my ($content) = @_;
@@ -73,23 +71,23 @@ sub setProperties {
foreach (@properties) {
my ($name, $value) = split("=", $_);
- $message->getProperties()->{$name} = $value;
+ $message->setProperty($name, $value);
}
}
-my $connection = new cqpid_perl::Connection($url, $connectionOptions);
+my $connection = new qpid::messaging::Connection($url, $connectionOptions);
eval {
$connection->open();
- my $session = $connection->createSession();
- my $sender = $session->createSender($address);
+ my $session = $connection->create_session();
+ my $sender = $session->create_sender($address);
- my $message = new cqpid_perl::Message();
+ my $message = new qpid::messaging::Message();
setProperties($message) if (@properties);
if (@entries) {
my $content = {};
setEntries($content);
- cqpid_perl::encode($content, $message);
+ qpid::messaging::encode($content, $message);
}
elsif ($content) {
$message->setContent($content);
@@ -98,7 +96,7 @@ eval {
my $receiver;
if ($replyto) {
- my $responseQueue = new cqpid_perl::Address($replyto);
+ my $responseQueue = new qpid::messaging::Address($replyto);
$receiver = $session->createReceiver($responseQueue);
$message->setReplyTo($responseQueue);
}
@@ -108,9 +106,9 @@ eval {
my $s = "$s[3]$s[4]$s[5]";
my $n = $s;
- for (my $i = 0;
+ for (my $i = 0;
($i < $count || $count == 0) and
- ($timeout == 0 || abs($n - $s) < $timeout);
+ ($timeout == 0 || abs($n - $s) < $timeout);
$i++) {
$sender->send($message);
@@ -134,3 +132,26 @@ if ($@) {
}
+__END__
+
+=head1 NAME
+
+spout - Send messages to the specified address
+
+=head1 SYNOPSIS
+
+ Usage: spout [OPTIONS] ADDRESS
+
+ Options:
+ -h, --help show this message
+ -b VALUE, --broker VALUE url of broker to connect to
+ -t VALUE, --timeout VALUE exit after the specified time
+ -c VALUE, --count VALUE stop after count messageshave been sent, zero disables
+ -i VALUE, --id VALUE use the supplied id instead of generating one
+ --reply-to VALUE specify reply-to value
+ -P VALUE, --property VALUE specify message property
+ -M VALUE, --map VALUE specify entry for map content
+ --content VALUE specify textual content
+ --connection-options VALUE connection options string in the form {name1:value1, name2:value2}
+
+=cut
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/examples/perl/spout.pl
------------------------------------------------------------------------------
svn:executable = *
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/perl/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/perl/CMakeLists.txt?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/perl/CMakeLists.txt (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/perl/CMakeLists.txt Mon Dec 17 11:22:49 2012
@@ -21,18 +21,25 @@
## Use Swig to generate a literal binding to the C++ API
##------------------------------------------------------
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/perl.i PROPERTIES CPLUSPLUS ON)
-set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/perl.i PROPERTIES SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include")
+set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/perl.i
+ PROPERTIES SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include;-I${qpid-cpp_SOURCE_DIR}/include;-I${qpid-cpp_SOURCE_DIR}/bindings")
swig_add_module(cqpid_perl perl ${CMAKE_CURRENT_SOURCE_DIR}/perl.i)
swig_link_libraries(cqpid_perl qpidmessaging qpidtypes qmf2 ${PERL_LIBRARY})
-set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "-fno-strict-aliasing -I${PERL_INCLUDE_PATH} -I${qpid-cpp_SOURCE_DIR}/include")
+set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "-fno-strict-aliasing")
+include_directories(${PERL_INCLUDE_PATH}
+ ${qpid-cpp_SOURCE_DIR}/include
+ ${qpid-cpp_SOURCE_DIR}/bindings)
##----------------------------------
## Install the complete Perl binding
##----------------------------------
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libcqpid_perl.so
${CMAKE_CURRENT_BINARY_DIR}/cqpid_perl.pm
+ ${CMAKE_CURRENT_SOURCE_DIR}/qpid.pm
+ ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE
+ ${CMAKE_CURRENT_SOURCE_DIR}/Makefile.PL
DESTINATION ${PERL_PFX_ARCHLIB}
COMPONENT ${QPID_COMPONENT_CLIENT}
)
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/perl/perl.i
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/perl/perl.i?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/perl/perl.i (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/perl/perl.i Mon Dec 17 11:22:49 2012
@@ -19,7 +19,7 @@
%module cqpid_perl
%include "std_string.i"
-%include "../../swig_perl_typemaps.i"
+%include "swig_perl_typemaps.i"
/* Define the general-purpose exception handling */
%exception {
@@ -31,5 +31,5 @@
}
}
-%include "../qpid.i"
+%include "qpid/qpid.i"
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/python/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/python/CMakeLists.txt?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/python/CMakeLists.txt (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/python/CMakeLists.txt Mon Dec 17 11:22:49 2012
@@ -21,12 +21,16 @@
## Use Swig to generate a literal binding to the C++ API
##------------------------------------------------------
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/python.i PROPERTIES CPLUSPLUS ON)
-set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/python.i PROPERTIES SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include")
+set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/python.i
+ PROPERTIES SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include;-I${qpid-cpp_SOURCE_DIR}/bindings")
swig_add_module(cqpid_python python ${CMAKE_CURRENT_SOURCE_DIR}/python.i)
swig_link_libraries(cqpid_python qpidmessaging qpidtypes qmf2 ${PYTHON_LIBRARIES})
-set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "-fno-strict-aliasing -I${PYTHON_INCLUDE_PATH} -I${qpid-cpp_SOURCE_DIR}/include")
+set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "-fno-strict-aliasing")
+include_directories(${PYTHON_INCLUDE_PATH}
+ ${qpid-cpp_SOURCE_DIR}/include
+ ${qpid-cpp_SOURCE_DIR}/bindings)
##------------------------------------
## Install the complete Python binding
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/python/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/python/Makefile.am?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/python/Makefile.am (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/python/Makefile.am Mon Dec 17 11:22:49 2012
@@ -19,7 +19,7 @@
if HAVE_PYTHON_DEVEL
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src/qmf -I$(top_srcdir)/src -I$(top_builddir)/src
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/bindings -I$(top_builddir)/include -I$(top_srcdir)/src/qmf -I$(top_srcdir)/src -I$(top_builddir)/src
generated_file_list = \
cqpid.cpp \
@@ -29,7 +29,7 @@ EXTRA_DIST = CMakeLists.txt python.i
BUILT_SOURCES = $(generated_file_list)
SWIG_FLAGS = -w362,401
-$(generated_file_list): $(srcdir)/python.i $(srcdir)/../qpid.i $(srcdir)/../../swig_python_typemaps.i
+$(generated_file_list): $(srcdir)/python.i
$(SWIG) -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -I/usr/include -o cqpid.cpp $(srcdir)/python.i
pylibdir = $(pyexecdir)
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/python/python.i
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/python/python.i?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/python/python.i (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/python/python.i Mon Dec 17 11:22:49 2012
@@ -19,7 +19,7 @@
%module cqpid
%include "std_string.i"
-%include "../../swig_python_typemaps.i"
+%include "swig_python_typemaps.i"
/* Needed for get/setPriority methods. Surprising SWIG 1.3.40 doesn't
* convert uint8_t by default. */
@@ -159,7 +159,7 @@ QPID_EXCEPTION(UnauthorizedAccess, Sessi
%rename(_setTtl) qpid::messaging::Message::setTtl;
-%include "../qpid.i"
+%include "qpid/qpid.i"
%extend qpid::messaging::Connection {
%pythoncode %{
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt Mon Dec 17 11:22:49 2012
@@ -31,7 +31,9 @@ set(GEM_OUTPUT_FILE ${GEM_OUTPUT_PATH}/p
##------------------------------------------------------
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/ruby.i PROPERTIES CPLUSPLUS ON)
-include_directories(${RUBY_INCLUDE_DIRS} ${qpid-cpp_SOURCE_DIR}/include)
+include_directories(${RUBY_INCLUDE_DIRS}
+ ${qpid-cpp_SOURCE_DIR}/include
+ ${qpid-cpp_SOURCE_DIR}/bindings)
swig_add_module(cqpid_ruby ruby ${CMAKE_CURRENT_SOURCE_DIR}/ruby.i)
swig_link_libraries(cqpid_ruby qpidmessaging qpidtypes qmf2 ${RUBY_LIBRARY})
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/ruby/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/ruby/Makefile.am?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/ruby/Makefile.am (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/ruby/Makefile.am Mon Dec 17 11:22:49 2012
@@ -19,7 +19,7 @@
if HAVE_RUBY_DEVEL
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/bindings -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src
EXTRA_DIST = CMakeLists.txt ruby.i
BUILT_SOURCES = cqpid.cpp
@@ -27,7 +27,7 @@ SWIG_FLAGS = -w362,401
rubylibdir = $(RUBY_LIB)
-cqpid.cpp: $(srcdir)/ruby.i $(srcdir)/../qpid.i $(srcdir)/../../swig_ruby_typemaps.i
+cqpid.cpp: $(srcdir)/ruby.i
$(SWIG) -ruby -c++ $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o cqpid.cpp $(srcdir)/ruby.i
rubylibarchdir = $(RUBY_LIB_ARCH)
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/ruby/README.rdoc
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/ruby/README.rdoc?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/ruby/README.rdoc (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/ruby/README.rdoc Mon Dec 17 11:22:49 2012
@@ -3,7 +3,7 @@
Qpid is an cross-platform enterprise messaging system based on the open-source
AMQP protocol.
-Version :: 0.19.0
+Version :: 0.21.0
= Links
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/ruby/ruby.i
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/ruby/ruby.i?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/ruby/ruby.i (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/bindings/qpid/ruby/ruby.i Mon Dec 17 11:22:49 2012
@@ -21,7 +21,7 @@
/* Ruby doesn't have a != operator*/
#pragma SWIG nowarn=378
%include "std_string.i"
-%include "../../swig_ruby_typemaps.i"
+%include "swig_ruby_typemaps.i"
/* Define the general-purpose exception handling */
%exception {
@@ -34,5 +34,5 @@
}
}
-%include "../qpid.i"
+%include "qpid/qpid.i"
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/docs/api/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/docs/api:r1411034-1415148
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/etc/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/etc/CMakeLists.txt?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/etc/CMakeLists.txt (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/etc/CMakeLists.txt Mon Dec 17 11:22:49 2012
@@ -23,6 +23,11 @@ install(FILES qpidc.conf
install(FILES qpidd.conf
DESTINATION ${QPID_INSTALL_CONFDIR}
COMPONENT ${QPID_COMPONENT_BROKER})
+if (UNIX)
+ install(FILES qpidd.service
+ DESTINATION ${QPID_INSTALL_SYSTEMDDIR}
+ COMPONENT ${QPID_COMPONENT_BROKER})
+endif (UNIX)
if (BUILD_SASL)
install(FILES sasl2/qpidd.conf
DESTINATION ${QPID_INSTALL_SASLDIR}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/etc/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/etc/Makefile.am?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/etc/Makefile.am (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/etc/Makefile.am Mon Dec 17 11:22:49 2012
@@ -20,7 +20,7 @@ SASL_CONF = sasl2/qpidd.conf
EXTRA_DIST = \
$(SASL_CONF) \
- qpidd.service.in qpidd.in qpidd-primary.in qpidd.conf qpidc.conf CMakeLists.txt \
+ qpidd.service qpidd.in qpidd-primary.in qpidd.conf qpidc.conf CMakeLists.txt \
cluster.conf-example.xml.in
confdir = $(sysconfdir)/qpid
@@ -47,11 +47,11 @@ qpidd-primary: qpidd-primary.in
sed $(SUBST) $< > $@
cluster.conf-example.xml: cluster.conf-example.xml.in
sed $(SUBST) $< > $@
-qpidd.service: qpidd.service.in
- sed $(SUBST) $< > $@
-CLEANFILES = qpidd qpidd-primary cluster.conf-example.xml qpidd.service
+CLEANFILES = qpidd qpidd-primary cluster.conf-example.xml
initddir = $(sysconfdir)/init.d
-nobase_initd_SCRIPTS = qpidd qpidd-primary qpidd.service
+nobase_initd_SCRIPTS = qpidd qpidd-primary
+systemddir = /usr/lib/systemd/system
+nobase_systemd_SCRIPTS = qpidd.service
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/messaging/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/messaging/Makefile.am?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/messaging/Makefile.am (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/messaging/Makefile.am Mon Dec 17 11:22:49 2012
@@ -33,10 +33,10 @@ hello_xml_SOURCES=hello_xml.cpp
hello_xml_LDADD=$(CLIENT_LIB)
drain_SOURCES=drain.cpp OptionParser.h OptionParser.cpp
-drain_LDADD=$(CLIENT_LIB)
+drain_LDADD=$(CLIENT_LIB) -lqpidtypes
spout_SOURCES=spout.cpp OptionParser.h OptionParser.cpp
-spout_LDADD=$(CLIENT_LIB)
+spout_LDADD=$(CLIENT_LIB) -lqpidtypes
client_SOURCES=client.cpp
client_LDADD=$(CLIENT_LIB)
@@ -45,10 +45,10 @@ server_SOURCES=server.cpp
server_LDADD=$(CLIENT_LIB)
map_sender_SOURCES=map_sender.cpp
-map_sender_LDADD=$(CLIENT_LIB)
+map_sender_LDADD=$(CLIENT_LIB) -lqpidtypes
map_receiver_SOURCES=map_receiver.cpp
-map_receiver_LDADD=$(CLIENT_LIB)
+map_receiver_LDADD=$(CLIENT_LIB) -lqpidtypes
examples_DATA= \
hello_world.cpp \
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/messaging/spout.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/messaging/spout.cpp?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/messaging/spout.cpp (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/messaging/spout.cpp Mon Dec 17 11:22:49 2012
@@ -91,6 +91,7 @@ struct Options : OptionParser
std::string value;
if (nameval(property, name, value)) {
message.getProperties()[name] = value;
+ message.getProperties()[name].setEncoding("utf8");
} else {
message.getProperties()[name] = Variant();
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/direct/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/direct/Makefile.am?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/direct/Makefile.am (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/direct/Makefile.am Mon Dec 17 11:22:49 2012
@@ -23,13 +23,13 @@ include $(top_srcdir)/examples/makedist.
noinst_PROGRAMS=direct_producer listener declare_queues
direct_producer_SOURCES=direct_producer.cpp
-direct_producer_LDADD=$(CLIENT_LIB)
+direct_producer_LDADD=$(CLIENT_LIB) -lqpidcommon
listener_SOURCES=listener.cpp
-listener_LDADD=$(CLIENT_LIB)
+listener_LDADD=$(CLIENT_LIB) -lqpidcommon
declare_queues_SOURCES=declare_queues.cpp
-declare_queues_LDADD=$(CLIENT_LIB)
+declare_queues_LDADD=$(CLIENT_LIB) -lqpidcommon
examples_DATA= \
direct_producer.cpp \
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/failover/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/failover/Makefile.am?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/failover/Makefile.am (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/failover/Makefile.am Mon Dec 17 11:22:49 2012
@@ -24,13 +24,13 @@ include $(top_srcdir)/examples/makedist.
noinst_PROGRAMS=declare_queues resuming_receiver replaying_sender
declare_queues_SOURCES=declare_queues.cpp
-declare_queues_LDADD=$(CLIENT_LIB)
+declare_queues_LDADD=$(CLIENT_LIB) -lqpidcommon
resuming_receiver_SOURCES=resuming_receiver.cpp
-resuming_receiver_LDADD=$(CLIENT_LIB)
+resuming_receiver_LDADD=$(CLIENT_LIB) -lqpidcommon
replaying_sender_SOURCES=replaying_sender.cpp
-replaying_sender_LDADD=$(CLIENT_LIB)
+replaying_sender_LDADD=$(CLIENT_LIB) -lqpidcommon
examples_DATA= \
declare_queues.cpp \
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/fanout/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/fanout/Makefile.am?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/fanout/Makefile.am (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/fanout/Makefile.am Mon Dec 17 11:22:49 2012
@@ -26,7 +26,7 @@ fanout_producer_SOURCES=fanout_producer.
fanout_producer_LDADD=$(CLIENT_LIB)
listener_SOURCES=listener.cpp
-listener_LDADD=$(CLIENT_LIB)
+listener_LDADD=$(CLIENT_LIB) -lqpidcommon
examples_DATA= \
fanout_producer.cpp \
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/pub-sub/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/pub-sub/Makefile.am?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/pub-sub/Makefile.am (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/pub-sub/Makefile.am Mon Dec 17 11:22:49 2012
@@ -24,10 +24,10 @@ include $(top_srcdir)/examples/makedist.
noinst_PROGRAMS=topic_listener topic_publisher
topic_listener_SOURCES=topic_listener.cpp
-topic_listener_LDADD=$(CLIENT_LIB)
+topic_listener_LDADD=$(CLIENT_LIB) -lqpidcommon
topic_publisher_SOURCES=topic_publisher.cpp
-topic_publisher_LDADD=$(CLIENT_LIB)
+topic_publisher_LDADD=$(CLIENT_LIB) -lqpidcommon
examples_DATA= \
topic_listener.cpp \
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/request-response/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/request-response/Makefile.am?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/request-response/Makefile.am (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/request-response/Makefile.am Mon Dec 17 11:22:49 2012
@@ -24,10 +24,10 @@ include $(top_srcdir)/examples/makedist.
noinst_PROGRAMS=client server
client_SOURCES=client.cpp
-client_LDADD=$(CLIENT_LIB)
+client_LDADD=$(CLIENT_LIB) -lqpidcommon
server_SOURCES=server.cpp
-server_LDADD=$(CLIENT_LIB)
+server_LDADD=$(CLIENT_LIB) -lqpidcommon
examples_DATA= \
server.cpp \
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/tradedemo/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/tradedemo/Makefile.am?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/tradedemo/Makefile.am (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/tradedemo/Makefile.am Mon Dec 17 11:22:49 2012
@@ -24,13 +24,13 @@ include $(top_srcdir)/examples/makedist.
noinst_PROGRAMS=topic_listener topic_publisher declare_queues
topic_listener_SOURCES=topic_listener.cpp
-topic_listener_LDADD=$(CLIENT_LIB)
+topic_listener_LDADD=$(CLIENT_LIB) -lqpidcommon
topic_publisher_SOURCES=topic_publisher.cpp
-topic_publisher_LDADD=$(CLIENT_LIB)
+topic_publisher_LDADD=$(CLIENT_LIB) -lqpidcommon
declare_queues_SOURCES=declare_queues.cpp
-declare_queues_LDADD=$(CLIENT_LIB)
+declare_queues_LDADD=$(CLIENT_LIB) -lqpidcommon
examples_DATA= \
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:r1411034-1415148
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/xml-exchange/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/xml-exchange/Makefile.am?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/xml-exchange/Makefile.am (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/old_api/xml-exchange/Makefile.am Mon Dec 17 11:22:49 2012
@@ -24,13 +24,13 @@ include $(top_srcdir)/examples/makedist.
noinst_PROGRAMS=declare_queues xml_producer listener
declare_queues_SOURCES=declare_queues.cpp
-declare_queues_LDADD=$(CLIENT_LIB)
+declare_queues_LDADD=$(CLIENT_LIB) -lqpidcommon
xml_producer_SOURCES=xml_producer.cpp
-xml_producer_LDADD=$(CLIENT_LIB)
+xml_producer_LDADD=$(CLIENT_LIB) -lqpidcommon
listener_SOURCES=listener.cpp
-listener_LDADD=$(CLIENT_LIB)
+listener_LDADD=$(CLIENT_LIB) -lqpidcommon
EXTRA_DIST= \
README.txt \
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/qmf-console/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/qmf-console/Makefile.am?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/qmf-console/Makefile.am (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/examples/qmf-console/Makefile.am Mon Dec 17 11:22:49 2012
@@ -25,19 +25,19 @@ include $(top_srcdir)/examples/makedist.
noinst_PROGRAMS=console printevents ping queuestats cluster-qmon
console_SOURCES=console.cpp
-console_LDADD=$(CONSOLE_LIB)
+console_LDADD=$(CONSOLE_LIB) -lqpidcommon -lqpidclient
printevents_SOURCES=printevents.cpp
-printevents_LDADD=$(CONSOLE_LIB)
+printevents_LDADD=$(CONSOLE_LIB) -lqpidcommon -lqpidclient
ping_SOURCES=ping.cpp
-ping_LDADD=$(CONSOLE_LIB)
+ping_LDADD=$(CONSOLE_LIB) -lqpidcommon -lqpidclient
queuestats_SOURCES=queuestats.cpp
-queuestats_LDADD=$(CONSOLE_LIB)
+queuestats_LDADD=$(CONSOLE_LIB) -lqpidcommon -lqpidclient
cluster_qmon_SOURCES=cluster-qmon.cpp
-cluster_qmon_LDADD=$(CONSOLE_LIB)
+cluster_qmon_LDADD=$(CONSOLE_LIB) -lqpidcommon -lqpidclient
examples_DATA= \
console.cpp \
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:r1411034-1415148
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:r1411034-1415148
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/management/Manageable.h
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/management/Manageable.h?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/management/Manageable.h (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/include/qpid/management/Manageable.h Mon Dec 17 11:22:49 2012
@@ -55,7 +55,8 @@ class QPID_COMMON_EXTERN Manageable
//
// This accessor function returns a pointer to the management object.
//
- virtual ManagementObject::shared_ptr GetManagementObject(void) const = 0;
+ virtual ManagementObject* GetManagementObject() const;
+ virtual ManagementObject::shared_ptr GetManagementObjectShared() const;
// Every "Manageable" object must implement ManagementMethod. This
// function is called when a remote management client invokes a method
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/managementgen/qmf-gen
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/managementgen/qmf-gen?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/managementgen/qmf-gen (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/managementgen/qmf-gen Mon Dec 17 11:22:49 2012
@@ -68,9 +68,11 @@ vargs = {}
if opts.brokerplugin:
vargs["agentHeaderDir"] = "management"
vargs["genQmfV1"] = True
+ vargs["genForBroker"] = True
else:
vargs["agentHeaderDir"] = "agent"
vargs["genQmfV1"] = None
+ vargs["genForBroker"] = None
if opts.qpidlogs:
vargs["genLogs"] = True
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org