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 [3/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...
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/messaging/amqp/SessionContext.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/messaging/amqp/SessionContext.cpp?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/messaging/amqp/SessionContext.cpp (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/messaging/amqp/SessionContext.cpp Mon Dec 17 11:22:49 2012
@@ -144,4 +144,13 @@ void SessionContext::acknowledge(const q
}
}
+bool SessionContext::settled()
+{
+ bool result = true;
+ for (SenderMap::iterator i = senders.begin(); i != senders.end(); ++i) {
+ if (!i->second->settled()) result = false;
+ }
+ return result;
+}
+
}}} // namespace qpid::messaging::amqp
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/messaging/amqp/SessionContext.h
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/messaging/amqp/SessionContext.h?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/messaging/amqp/SessionContext.h (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/messaging/amqp/SessionContext.h Mon Dec 17 11:22:49 2012
@@ -59,6 +59,7 @@ class SessionContext
boost::shared_ptr<ReceiverContext> nextReceiver(qpid::messaging::Duration timeout);
uint32_t getReceivable();
uint32_t getUnsettledAcks();
+ bool settled();
private:
friend class ConnectionContext;
typedef std::map<std::string, boost::shared_ptr<SenderContext> > SenderMap;
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/AsynchIO.h
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/AsynchIO.h?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/AsynchIO.h (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/AsynchIO.h Mon Dec 17 11:22:49 2012
@@ -58,6 +58,7 @@ class AsynchConnector {
public:
typedef boost::function1<void, const Socket&> ConnectedCallback;
typedef boost::function3<void, const Socket&, int, const std::string&> FailedCallback;
+ typedef boost::function1<void, AsynchConnector&> RequestCallback;
// Call create() to allocate a new AsynchConnector object with the
// specified poller, addressing, and callbacks.
@@ -72,6 +73,7 @@ public:
FailedCallback failCb);
virtual void start(boost::shared_ptr<Poller> poller) = 0;
virtual void stop() {};
+ virtual void requestCallback(RequestCallback) = 0;
protected:
AsynchConnector() {}
virtual ~AsynchConnector() {}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp Mon Dec 17 11:22:49 2012
@@ -143,6 +143,7 @@ class AsynchConnector : public qpid::sys
private:
void connComplete(DispatchHandle& handle);
+ void requestedCall(RequestCallback rCb);
private:
ConnectedCallback connCallback;
@@ -158,6 +159,7 @@ public:
FailedCallback failCb);
void start(Poller::shared_ptr poller);
void stop();
+ void requestCallback(RequestCallback rCb);
};
AsynchConnector::AsynchConnector(const Socket& s,
@@ -191,6 +193,18 @@ void AsynchConnector::stop()
stopWatch();
}
+void AsynchConnector::requestCallback(RequestCallback callback) {
+ // TODO creating a function object every time isn't all that
+ // efficient - if this becomes heavily used do something better (what?)
+ assert(callback);
+ DispatchHandle::call(boost::bind(&AsynchConnector::requestedCall, this, callback));
+}
+
+void AsynchConnector::requestedCall(RequestCallback callback) {
+ assert(callback);
+ callback(*this);
+}
+
void AsynchConnector::connComplete(DispatchHandle& h)
{
int errCode = socket.getError();
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp Mon Dec 17 11:22:49 2012
@@ -198,6 +198,7 @@ public:
ConnectedCallback connCb,
FailedCallback failCb = 0);
void start(Poller::shared_ptr poller);
+ void requestCallback(RequestCallback rCb);
};
AsynchConnector::AsynchConnector(const Socket& sock,
@@ -223,6 +224,13 @@ void AsynchConnector::start(Poller::shar
}
}
+// This can never be called in the current windows code as connect
+// is blocking and requestCallback only makes sense if connect is
+// non-blocking with the results returned via a poller callback.
+void AsynchConnector::requestCallback(RequestCallback rCb)
+{
+}
+
} // namespace windows
AsynchAcceptor* AsynchAcceptor::create(const Socket& s,
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp Mon Dec 17 11:22:49 2012
@@ -52,13 +52,14 @@ private:
PollableCondition& parent;
boost::shared_ptr<sys::Poller> poller;
LONG isSet;
+ LONG isDispatching;
};
PollableConditionPrivate::PollableConditionPrivate(const sys::PollableCondition::Callback& cb,
sys::PollableCondition& parent,
const boost::shared_ptr<sys::Poller>& poller)
: IOHandle(INVALID_SOCKET, boost::bind(&PollableConditionPrivate::dispatch, this, _1)),
- cb(cb), parent(parent), poller(poller), isSet(0)
+ cb(cb), parent(parent), poller(poller), isSet(0), isDispatching(0)
{
}
@@ -77,7 +78,12 @@ void PollableConditionPrivate::poke()
void PollableConditionPrivate::dispatch(windows::AsynchIoResult *result)
{
delete result; // Poller::monitorHandle() allocates this
+ // If isDispatching is already set, just return. Else, enter.
+ if (::InterlockedCompareExchange(&isDispatching, 1, 0) == 1)
+ return;
cb(parent);
+ LONG oops = ::InterlockedDecrement(&isDispatching); // Result must be 0
+ assert(!oops);
if (isSet)
poke();
}
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/tests:r1411034-1415148
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/BrokerMgmtAgent.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/BrokerMgmtAgent.cpp?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/BrokerMgmtAgent.cpp (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/BrokerMgmtAgent.cpp Mon Dec 17 11:22:49 2012
@@ -123,7 +123,7 @@ class TestManageable : public qpid::mana
mgmtObj = tmp;
};
~TestManageable() { mgmtObj.reset(); }
- management::ManagementObject::shared_ptr GetManagementObject() const { return mgmtObj; };
+ management::ManagementObject::shared_ptr GetManagementObjectShared() const { return mgmtObj; };
static void validateTestObjectProperties(_qmf::TestObject& to)
{
// verify the default values are as expected. We don't check 'string1',
@@ -209,11 +209,11 @@ QPID_AUTO_TEST_CASE(v1ObjPublish)
// create a manageable test object
TestManageable *tm = new TestManageable(agent, std::string("obj1"));
- uint32_t objLen = tm->GetManagementObject()->writePropertiesSize();
+ uint32_t objLen = tm->GetManagementObjectShared()->writePropertiesSize();
Receiver r1 = fix->createV1DataIndRcvr("org.apache.qpid.broker.mgmt.test", "#");
- agent->addObject(tm->GetManagementObject(), 1);
+ agent->addObject(tm->GetManagementObjectShared(), 1);
// wait for the object to be published
Message m1;
@@ -234,7 +234,7 @@ QPID_AUTO_TEST_CASE(v1ObjPublish)
// destroy the object
- tm->GetManagementObject()->resourceDestroy();
+ tm->GetManagementObjectShared()->resourceDestroy();
// wait for the deleted object to be published
@@ -272,9 +272,9 @@ QPID_AUTO_TEST_CASE(v2ObjPublish)
TestManageable *tm = new TestManageable(agent, std::string("obj2"));
- Receiver r1 = fix->createV2DataIndRcvr(tm->GetManagementObject()->getPackageName(), "#");
+ Receiver r1 = fix->createV2DataIndRcvr(tm->GetManagementObjectShared()->getPackageName(), "#");
- agent->addObject(tm->GetManagementObject(), "testobj-1");
+ agent->addObject(tm->GetManagementObjectShared(), "testobj-1");
// wait for the object to be published
Message m1;
@@ -295,7 +295,7 @@ QPID_AUTO_TEST_CASE(v2ObjPublish)
// destroy the object
- tm->GetManagementObject()->resourceDestroy();
+ tm->GetManagementObjectShared()->resourceDestroy();
// wait for the deleted object to be published
@@ -335,11 +335,11 @@ QPID_AUTO_TEST_CASE(v1ExportDelObj)
// create a manageable test object
TestManageable *tm = new TestManageable(agent, std::string("myObj"));
- uint32_t objLen = tm->GetManagementObject()->writePropertiesSize();
+ uint32_t objLen = tm->GetManagementObjectShared()->writePropertiesSize();
Receiver r1 = fix->createV1DataIndRcvr("org.apache.qpid.broker.mgmt.test", "#");
- agent->addObject(tm->GetManagementObject(), 1);
+ agent->addObject(tm->GetManagementObjectShared(), 1);
// wait for the object to be published
Message m1;
@@ -352,7 +352,7 @@ QPID_AUTO_TEST_CASE(v1ExportDelObj)
// destroy the object, then immediately export (before the next poll cycle)
::qpid::management::ManagementAgent::DeletedObjectList delObjs;
- tm->GetManagementObject()->resourceDestroy();
+ tm->GetManagementObjectShared()->resourceDestroy();
agent->exportDeletedObjects( delObjs );
BOOST_CHECK(delObjs.size() == 1);
@@ -399,11 +399,11 @@ QPID_AUTO_TEST_CASE(v1ImportDelObj)
// create a manageable test object
TestManageable *tm = new TestManageable(agent, std::string("anObj"));
- uint32_t objLen = tm->GetManagementObject()->writePropertiesSize();
+ uint32_t objLen = tm->GetManagementObjectShared()->writePropertiesSize();
Receiver r1 = fix->createV1DataIndRcvr("org.apache.qpid.broker.mgmt.test", "#");
- agent->addObject(tm->GetManagementObject(), 1);
+ agent->addObject(tm->GetManagementObjectShared(), 1);
// wait for the object to be published
Message m1;
@@ -416,7 +416,7 @@ QPID_AUTO_TEST_CASE(v1ImportDelObj)
// destroy the object, then immediately export (before the next poll cycle)
::qpid::management::ManagementAgent::DeletedObjectList delObjs;
- tm->GetManagementObject()->resourceDestroy();
+ tm->GetManagementObjectShared()->resourceDestroy();
agent->exportDeletedObjects( delObjs );
BOOST_CHECK(delObjs.size() == 1);
@@ -478,8 +478,8 @@ QPID_AUTO_TEST_CASE(v1ExportFastDelObj)
// add, then immediately delete and export the object...
::qpid::management::ManagementAgent::DeletedObjectList delObjs;
- agent->addObject(tm->GetManagementObject(), 999);
- tm->GetManagementObject()->resourceDestroy();
+ agent->addObject(tm->GetManagementObjectShared(), 999);
+ tm->GetManagementObjectShared()->resourceDestroy();
agent->exportDeletedObjects( delObjs );
BOOST_CHECK(delObjs.size() == 1);
@@ -511,8 +511,8 @@ QPID_AUTO_TEST_CASE(v1ImportMultiDelObj)
// FOR ALL OBJECTS, so objLen will be the same. Otherwise the
// decodeV1ObjectUpdates() will fail (v1 lacks explict encoded length).
TestManageable *tm = new TestManageable(agent, key.str());
- objLen = tm->GetManagementObject()->writePropertiesSize();
- agent->addObject(tm->GetManagementObject(), i + 1);
+ objLen = tm->GetManagementObjectShared()->writePropertiesSize();
+ agent->addObject(tm->GetManagementObjectShared(), i + 1);
tmv.push_back(tm);
}
@@ -531,7 +531,7 @@ QPID_AUTO_TEST_CASE(v1ImportMultiDelObj)
uint32_t delCount = 0;
for (size_t i = 0; i < objCount; i += 2) {
- tmv[i]->GetManagementObject()->resourceDestroy();
+ tmv[i]->GetManagementObjectShared()->resourceDestroy();
delCount++;
}
@@ -604,8 +604,8 @@ QPID_AUTO_TEST_CASE(v2ImportMultiDelObj)
std::stringstream key;
key << "testobj-" << i;
TestManageable *tm = new TestManageable(agent, key.str());
- if (tm->GetManagementObject()->writePropertiesSize()) {}
- agent->addObject(tm->GetManagementObject(), key.str());
+ if (tm->GetManagementObjectShared()->writePropertiesSize()) {}
+ agent->addObject(tm->GetManagementObjectShared(), key.str());
tmv.push_back(tm);
}
@@ -624,7 +624,7 @@ QPID_AUTO_TEST_CASE(v2ImportMultiDelObj)
uint32_t delCount = 0;
for (size_t i = 0; i < objCount; i += 2) {
- tmv[i]->GetManagementObject()->resourceDestroy();
+ tmv[i]->GetManagementObjectShared()->resourceDestroy();
delCount++;
}
@@ -689,12 +689,12 @@ QPID_AUTO_TEST_CASE(v2RapidRestoreObj)
TestManageable *tm1 = new TestManageable(agent, std::string("obj2"));
TestManageable *tm2 = new TestManageable(agent, std::string("obj2"));
- Receiver r1 = fix->createV2DataIndRcvr(tm1->GetManagementObject()->getPackageName(), "#");
+ Receiver r1 = fix->createV2DataIndRcvr(tm1->GetManagementObjectShared()->getPackageName(), "#");
// add, then immediately delete and re-add a copy of the object
- agent->addObject(tm1->GetManagementObject(), "testobj-1");
- tm1->GetManagementObject()->resourceDestroy();
- agent->addObject(tm2->GetManagementObject(), "testobj-1");
+ agent->addObject(tm1->GetManagementObjectShared(), "testobj-1");
+ tm1->GetManagementObjectShared()->resourceDestroy();
+ agent->addObject(tm2->GetManagementObjectShared(), "testobj-1");
// expect: a delete notification, then an update notification
TestObjectVector objs;
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/Makefile.am?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/Makefile.am (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/Makefile.am Mon Dec 17 11:22:49 2012
@@ -154,7 +154,7 @@ receiver_SOURCES = \
receiver.cpp \
TestOptions.h \
ConnectionOptions.h
-receiver_LDADD = $(lib_client)
+receiver_LDADD = $(lib_client) -lboost_program_options -lqpidcommon
qpidexectest_PROGRAMS += sender
sender_SOURCES = \
@@ -162,7 +162,7 @@ sender_SOURCES = \
TestOptions.h \
ConnectionOptions.h \
Statistics.cpp
-sender_LDADD = $(lib_messaging)
+sender_LDADD = $(lib_messaging) -lboost_program_options -lqpidcommon -lqpidtypes -lqpidclient
qpidexectest_PROGRAMS += qpid-receive
qpid_receive_SOURCES = \
@@ -171,7 +171,7 @@ qpid_receive_SOURCES = \
ConnectionOptions.h \
Statistics.h \
Statistics.cpp
-qpid_receive_LDADD = $(lib_messaging)
+qpid_receive_LDADD = $(lib_messaging) -lboost_program_options -lqpidcommon -lqpidtypes
qpidexectest_PROGRAMS += qpid-send
qpid_send_SOURCES = \
@@ -180,42 +180,42 @@ qpid_send_SOURCES = \
ConnectionOptions.h \
Statistics.h \
Statistics.cpp
-qpid_send_LDADD = $(lib_messaging)
+qpid_send_LDADD = $(lib_messaging) -lboost_program_options -lqpidcommon -lqpidtypes
qpidexectest_PROGRAMS+=qpid-perftest
qpid_perftest_SOURCES=qpid-perftest.cpp test_tools.h TestOptions.h ConnectionOptions.h
qpid_perftest_INCLUDES=$(PUBLIC_INCLUDES)
-qpid_perftest_LDADD=$(lib_client)
+qpid_perftest_LDADD=$(lib_client) -lboost_program_options -lqpidcommon
qpidexectest_PROGRAMS+=qpid-txtest
qpid_txtest_INCLUDES=$(PUBLIC_INCLUDES)
qpid_txtest_SOURCES=qpid-txtest.cpp TestOptions.h ConnectionOptions.h
-qpid_txtest_LDADD=$(lib_client)
+qpid_txtest_LDADD=$(lib_client) -lboost_program_options -lqpidcommon
qpidexectest_PROGRAMS+=qpid-latency-test
qpid_latency_test_INCLUDES=$(PUBLIC_INCLUDES)
qpid_latency_test_SOURCES=qpid-latency-test.cpp TestOptions.h ConnectionOptions.h
-qpid_latency_test_LDADD=$(lib_client)
+qpid_latency_test_LDADD=$(lib_client) -lboost_program_options -lqpidcommon
qpidexectest_PROGRAMS+=qpid-client-test
qpid_client_test_INCLUDES=$(PUBLIC_INCLUDES)
qpid_client_test_SOURCES=qpid-client-test.cpp TestOptions.h ConnectionOptions.h
-qpid_client_test_LDADD=$(lib_client)
+qpid_client_test_LDADD=$(lib_client) -lboost_program_options -lqpidcommon
qpidexectest_PROGRAMS+=qpid-topic-listener
qpid_topic_listener_INCLUDES=$(PUBLIC_INCLUDES)
qpid_topic_listener_SOURCES=qpid-topic-listener.cpp TestOptions.h ConnectionOptions.h
-qpid_topic_listener_LDADD=$(lib_client)
+qpid_topic_listener_LDADD=$(lib_client) -lboost_program_options -lqpidcommon
qpidexectest_PROGRAMS+=qpid-topic-publisher
qpid_topic_publisher_INCLUDES=$(PUBLIC_INCLUDES)
qpid_topic_publisher_SOURCES=qpid-topic-publisher.cpp TestOptions.h ConnectionOptions.h
-qpid_topic_publisher_LDADD=$(lib_client)
+qpid_topic_publisher_LDADD=$(lib_client) -lboost_program_options -lqpidcommon
qpidexectest_PROGRAMS+=qpid-ping
qpid_ping_INCLUDES=$(PUBLIC_INCLUDES)
qpid_ping_SOURCES=qpid-ping.cpp test_tools.h TestOptions.h ConnectionOptions.h
-qpid_ping_LDADD=$(lib_client)
+qpid_ping_LDADD=$(lib_client) -lboost_program_options -lqpidcommon
#
# Other test programs
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/cluster_tests.py
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/tests/cluster_tests.py:r1411034-1415148
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/testagent.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/testagent.cpp?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/testagent.cpp (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/testagent.cpp Mon Dec 17 11:22:49 2012
@@ -59,7 +59,7 @@ class CoreClass : public Manageable
{
string name;
ManagementAgent* agent;
- _qmf::Parent::shared_ptr mgmtObject;
+ _qmf::Parent* mgmtObject;
std::vector<ChildClass*> children;
Mutex vectorLock;
@@ -68,7 +68,7 @@ public:
CoreClass(ManagementAgent* agent, string _name);
~CoreClass() { mgmtObject->resourceDestroy(); }
- ManagementObject::shared_ptr GetManagementObject(void) const
+ ManagementObject* GetManagementObject(void) const
{ return mgmtObject; }
void doLoop();
@@ -78,14 +78,14 @@ public:
class ChildClass : public Manageable
{
string name;
- _qmf::Child::shared_ptr mgmtObject;
+ _qmf::Child* mgmtObject;
public:
ChildClass(ManagementAgent* agent, CoreClass* parent, string name);
~ChildClass() { mgmtObject->resourceDestroy(); }
- ManagementObject::shared_ptr GetManagementObject(void) const
+ ManagementObject* GetManagementObject(void) const
{ return mgmtObject; }
void doWork()
@@ -97,9 +97,9 @@ public:
CoreClass::CoreClass(ManagementAgent* _agent, string _name) : name(_name), agent(_agent)
{
static uint64_t persistId = 0x111222333444555LL;
- mgmtObject = _qmf::Parent::shared_ptr(new _qmf::Parent(agent, this, name));
+ mgmtObject = new _qmf::Parent(agent, this, name);
- agent->addObject(mgmtObject.get(), persistId++);
+ agent->addObject(mgmtObject, persistId++);
mgmtObject->set_state("IDLE");
}
@@ -146,9 +146,9 @@ Manageable::status_t CoreClass::Manageme
ChildClass::ChildClass(ManagementAgent* agent, CoreClass* parent, string name)
{
- mgmtObject = _qmf::Child::shared_ptr(new _qmf::Child(agent, this, parent, name));
+ mgmtObject = new _qmf::Child(agent, this, parent, name);
- agent->addObject(mgmtObject.get());
+ agent->addObject(mgmtObject);
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/testagent.mk
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/testagent.mk?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/testagent.mk (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/cpp/src/tests/testagent.mk Mon Dec 17 11:22:49 2012
@@ -46,6 +46,6 @@ testagent-testagent.$(OBJEXT): $(TESTAGE
qpidexectest_PROGRAMS+=testagent
testagent_CXXFLAGS=$(CXXFLAGS) -Itestagent_gen
testagent_SOURCES=testagent.cpp $(TESTAGENT_GEN_SRC)
-testagent_LDADD=$(top_builddir)/src/libqmf.la
+testagent_LDADD=$(top_builddir)/src/libqmf.la -lqpidcommon -lqpidtypes -lqpidclient
EXTRA_DIST+=testagent.xml
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Getting-Started.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Getting-Started.xml?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Getting-Started.xml (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Getting-Started.xml Mon Dec 17 11:22:49 2012
@@ -36,22 +36,25 @@
<title>Starting/Stopping on Windows</title>
<para>Firstly change to the installation directory used during the <link linkend="Java-Broker-Installation-InstallationWindows">installation</link>
and ensure that the <link linkend="Java-Broker-Installation-InstallationWindows-SettingQPIDWORK">QPID_WORK environment variable is set</link>.</para>
- <para>Now use the qpid-server.bat to start the server</para>
+ <para>Now use the <command>qpid-server.bat</command> to start the server</para>
<programlisting><![CDATA[bin\qpid-server.bat]]></programlisting>
<para>Output similar to the following will be seen:</para>
<screen>[Broker] BRK-1006 : Using configuration : C:\qpid\qpid-broker-&qpidCurrentRelease;\etc\config.xml
[Broker] BRK-1007 : Using logging configuration : C:\qpid\qpid-broker-&qpidCurrentRelease;\etc\log4j.xml
-[Broker] MNG-1001 : Startup
-[Broker] MNG-1002 : Starting : RMI Registry : Listening on port 8999
-[Broker] MNG-1002 : Starting : JMX RMIConnectorServer : Listening on port 9099
-[Broker] MNG-1004 : Ready
-[Broker] BRK-1001 : Startup : Version: &qpidCurrentRelease; Build: 1363863
+[Broker] BRK-1001 : Startup : Version: &qpidCurrentRelease; Build: 1411386
[Broker] BRK-1010 : Platform : JVM : Sun Microsystems Inc. version: 1.6.0_24-b07 OS : Windows 7 version: 6.1 arch: amd64
[Broker] BRK-1011 : Maximum Memory : 1,069,416,448 bytes
+[Broker] MNG-1001 : Web Management Startup
+[Broker] MNG-1002 : Starting : HTTP : Listening on port 8080
+[Broker] MNG-1004 : Web Management Ready
+[Broker] MNG-1001 : JMX Management Startup
+[Broker] MNG-1002 : Starting : RMI Registry : Listening on port 8999
+[Broker] MNG-1002 : Starting : JMX RMIConnectorServer : Listening on port 9099
+[Broker] MNG-1004 : JMX Management Ready
[Broker] BRK-1002 : Starting : Listening on TCP port 5672
[Broker] BRK-1004 : Qpid Broker Ready</screen>
- <para>The BRK-1004 message confirms that the Broker is ready for work. The MNG-1002 and BRK-1004 confirm the ports to
- which the Broker is listening (for JMX management and AMQP respectively).</para>
+ <para>The BRK-1004 message confirms that the Broker is ready for work. The MNG-1002 and BRK-1002 confirm the ports to
+ which the Broker is listening (for HTTP/JMX management and AMQP respectively).</para>
<para>To stop the Broker, use Control-C or use the Shutdown MBean made from the <xref
linkend="Java-Broker-Configuring-And-Managing-JMX"/></para>
</section>
@@ -64,17 +67,20 @@
<para>Output similar to the following will be seen:</para>
<screen>[Broker] BRK-1006 : Using configuration : /usr/local/qpid/qpid-broker-&qpidCurrentRelease;/etc/config.xml
[Broker] BRK-1007 : Using logging configuration : /usr/local/qpid/qpid-broker-&qpidCurrentRelease;/etc/log4j.xml
-[Broker] MNG-1001 : Startup
+[Broker] BRK-1001 : Startup : Version: &qpidCurrentRelease; Build: 1411386
+[Broker] BRK-1010 : Platform : JVM : Apple Inc. version: 1.6.0_35-b10-428-11M3811 OS : Mac OS X version: 10.8.2 arch: x86_64
+[Broker] BRK-1011 : Maximum Memory : 1,070,399,488 bytes
+[Broker] MNG-1001 : Web Management Startup
+[Broker] MNG-1002 : Starting : HTTP : Listening on port 8080
+[Broker] MNG-1004 : Web Management Ready
+[Broker] MNG-1001 : JMX Management Startup
[Broker] MNG-1002 : Starting : RMI Registry : Listening on port 8999
[Broker] MNG-1002 : Starting : JMX RMIConnectorServer : Listening on port 9099
-[Broker] MNG-1004 : Ready
-[Broker] BRK-1001 : Startup : Version: &qpidCurrentRelease; Build: 1363863
-[Broker] BRK-1010 : Platform : JVM : Apple Inc. version: 1.6.0_35-b10-428-11M3811 OS : Mac OS X version: 10.8.2 arch: x86_64
-[Broker] BRK-1011 : Maximum Memory : 1,069,416,448 bytes
+[Broker] MNG-1004 : JMX Management Ready
[Broker] BRK-1002 : Starting : Listening on TCP port 5672
[Broker] BRK-1004 : Qpid Broker Ready</screen>
- <para>The BRK-1004 message confirms that the Broker is ready for work. The MNG-1002 and BRK-1004 confirm the ports to
- which the Broker is listening (for JMX management and AMQP respectively).</para>
+ <para>The BRK-1004 message confirms that the Broker is ready for work. The MNG-1002 and BRK-1002 confirm the ports to
+ which the Broker is listening (for HTTP/JMX management and AMQP respectively).</para>
<para>To stop the Broker, use Control-C from the controlling shell, use the
<command>bin/qpid.stop</command> script, or use <command>kill -TERM <pid></command> or
the Shutdown MBean from <xref linkend="Java-Broker-Configuring-And-Managing-JMX"/></para>
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml Mon Dec 17 11:22:49 2012
@@ -506,7 +506,7 @@ amqp://guest:guest@clientid/test?brokerl
<para>Qpid exposes the BDB HA store information via its JMX interface and provides APIs to remove a Node from
the group, update a Node IP address, and assign a Node as the designated primary.</para>
<para>An instance of the <classname>BDBHAMessageStore</classname> MBean is instantiated by the broker for the each virtualhost using the HA store.</para>
- <para>The reference to this MBean can be obtained via JMX API using an ObjectName like <emphasis>org.apache.qpid:type=BDBHAMessageStore,name=<virtualhost name></emphasis>
+ <para>The reference to this MBean can be obtained via JMX API using an ObjectName like <emphasis>org.apache.qpid:type=BDBHAMessageStore,name="<virtualhost name>"</emphasis>
where <virtualhost name> is the name of a specific virtualhost on the broker.</para>
<table border="1">
<title>Mbean <classname>BDBHAMessageStore</classname> attributes</title>
@@ -630,7 +630,7 @@ JMXServiceURL url = new JMXServiceURL("
JMXConnector jmxConnector = JMXConnectorFactory.connect(url, environment);
MBeanServerConnection mbsc = jmxConnector.getMBeanServerConnection();
-ObjectName queueObjectName = new ObjectName("org.apache.qpid:type=BDBHAMessageStore,name=test");
+ObjectName queueObjectName = new ObjectName("org.apache.qpid:type=BDBHAMessageStore,name=\"test\"");
String state = (String)mbsc.getAttribute(queueObjectName, "NodeState");
System.out.println("Node state:" + state);
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Runtime.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Runtime.xml?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Runtime.xml (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Runtime.xml Mon Dec 17 11:22:49 2012
@@ -25,4 +25,5 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Runtime-Log-Files.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Runtime-Alerts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Runtime-Disk-Space-Management.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Runtime-Producer-Transaction-Timeout.xml"/>
</chapter>
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Security-Authentication-Providers.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Security-Authentication-Providers.xml?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Security-Authentication-Providers.xml (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Security-Authentication-Providers.xml Mon Dec 17 11:22:49 2012
@@ -38,18 +38,44 @@
</section>
- <section>
+ <section id="LDAPAuthManager">
<title>LDAP</title>
+
+ <para>
+ LDAP authentication can be configured using the <simple-ldap-auth-manager> element
+ within the <security> section. An example of how to configure this is shown below.
+ Please note this example also configures an unused <pd-auth-manager> to use an empty
+ password file, this is a workaround for an issue relating to registration of security providers.
+ </para>
+
+ <para>
+ <emphasis>NOTE: When using LDAP authentication, you must also use SSL on the brokers AMQP messaging and
+ JMX/HTTP management ports in order to protect passwords during transmission to the broker.</emphasis>
+ </para>
<example>
<title>Configuring LDAP authentication</title>
<programlisting><![CDATA[
<security>
- <simple-ldap-auth-manager>
- <provider-url>ldaps://example.com:636/</provider-url>
- <search-context>dc=example\,dc=com</search-context>
- <search-filter>(uid={0})</search-filter>
- </simple-ldap-auth-manager>
- ...
+ <default-auth-manager>SimpleLDAPAuthenticationManager</default-auth-manager>
+ <simple-ldap-auth-manager>
+ <provider-url>ldaps://example.com:636/</provider-url>
+ <search-context>dc=example\,dc=com</search-context>
+ <search-filter>(uid={0})</search-filter>
+ </simple-ldap-auth-manager>
+
+ <!-- Unused pd-auth-manager, a workaround to register the necessary security providers -->
+ <pd-auth-manager>
+ <principal-database>
+ <class>org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase</class>
+ <attributes>
+ <attribute>
+ <name>passwordFile</name>
+ <value>${conf}/emptyPasswdFile</value>
+ </attribute>
+ </attributes>
+ </principal-database>
+ <pd-auth-manager>
+ ...
</security>]]></programlisting>
</example>
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Stores-BDB-Store.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Stores-BDB-Store.xml?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Stores-BDB-Store.xml (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Stores-BDB-Store.xml Mon Dec 17 11:22:49 2012
@@ -52,16 +52,14 @@
<title>Oracle BDB JE jar installation</title>
<para>
If you wish to use the BDBMessageStore, copy the je-&oracleBdbProductVersion;.jar from within the release
- downloaded <link linkend="Java-Broker-Stores-BDB-Store-BDBJE-Download">above</link> into an 'opt' sub-directory
+ downloaded <link linkend="Java-Broker-Stores-BDB-Store-BDBJE-Download">above</link> into the 'opt' sub-directory
of the brokers 'lib' directory.
</para>
<programlisting>Unix:
-mkdir qpid-broker-&qpidCurrentRelease;/lib/opt
cp je-&oracleBdbProductVersion;.jar qpid-broker-&qpidCurrentRelease;/lib/opt</programlisting>
<programlisting>Windows:
-mkdir qpid-broker-&qpidCurrentRelease;\lib\opt
copy je-&oracleBdbProductVersion;.jar qpid-broker-&qpidCurrentRelease;\lib\opt</programlisting>
</section>
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Stores-Memory-Store.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Stores-Memory-Store.xml?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Stores-Memory-Store.xml (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/Java-Broker-Stores-Memory-Store.xml Mon Dec 17 11:22:49 2012
@@ -32,7 +32,7 @@
ability to store new messages will be entirely constrained by the JVM heap size.
</para>
- <section role="h3" id="Java-Broker-Stores-Derby-Store-Configuration">
+ <section role="h3" id="Java-Broker-Stores-Memory-Store-Configuration">
<title>Configuration</title>
<para>
In order to use the MemoryMessageStore, you must configure it for each VirtualHost desired by updating the store element
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/commonEntities.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/commonEntities.xml?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/commonEntities.xml (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/commonEntities.xml Mon Dec 17 11:22:49 2012
@@ -23,7 +23,7 @@
<!ENTITY qpidProgrammingBook "../../Programming-In-Apache-Qpid/html/">
<!ENTITY qpidCppBook "../../AMQP-Messaging-Broker-CPP-Book/html/">
-<!ENTITY qpidCurrentRelease "0.18">
+<!ENTITY qpidCurrentRelease "0.21">
<!-- Oracle javadoc -->
<!ENTITY oracleJdkDocUrl "http://oracle.com/javase/6/docs/api/">
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/images/HA-BDBHAMessageStore-MBean-jconsole.png
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/images/HA-BDBHAMessageStore-MBean-jconsole.png?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
Files qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/images/HA-BDBHAMessageStore-MBean-jconsole.png (original) and qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/java-broker/images/HA-BDBHAMessageStore-MBean-jconsole.png Mon Dec 17 11:22:49 2012 differ
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/programming/Programming-In-Apache-Qpid.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/programming/Programming-In-Apache-Qpid.xml?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/programming/Programming-In-Apache-Qpid.xml (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/doc/book/src/programming/Programming-In-Apache-Qpid.xml Mon Dec 17 11:22:49 2012
@@ -3087,6 +3087,22 @@ spout - -content "$(cat rdu.xml | sed -e
</para>
</entry>
</row>
+ <row>
+ <entry>
+ ssl
+ </entry>
+ <entry>
+ boolean
+ </entry>
+ <entry>
+ <para>
+ If <literal>ssl='true'</literal>, use SSL for all broker connections. Overrides any per-broker settings in the brokerlist (see below) entries. If not specified, the brokerlist entry for each given broker is used to determine whether SSL is used.
+ </para>
+ <para>
+ Introduced in version 0.22.
+ </para>
+ </entry>
+ </row>
</tbody>
</tgroup>
</table>
@@ -3237,6 +3253,7 @@ spout - -content "$(cat rdu.xml | sed -e
trust_store_password
</entry>
<entry>
+ --
</entry>
<entry>
Trust store password
@@ -3247,6 +3264,7 @@ spout - -content "$(cat rdu.xml | sed -e
key_store
</entry>
<entry>
+ --
</entry>
<entry>
path to key store
@@ -3271,7 +3289,9 @@ spout - -content "$(cat rdu.xml | sed -e
Boolean
</entry>
<entry>
- If <literal>ssl='true'</literal>, the JMS client will encrypt the connection using SSL.
+ <para>If <literal>ssl='true'</literal>, the JMS client will encrypt the connection to this broker using SSL.</para>
+
+ <para>This can also be set/overridden for all brokers using the <link linkend="section-jms-connection-url">Connection URL</link> options.</para>
</entry>
</row>
<row>
@@ -3292,7 +3312,7 @@ spout - -content "$(cat rdu.xml | sed -e
ssl_cert_alias
</entry>
<entry>
-
+ --
</entry>
<entry>
If multiple certificates are present in the keystore, the alias will be used to extract the correct certificate.
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/extras/qmf/setup.py
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/extras/qmf/setup.py?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/extras/qmf/setup.py (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/extras/qmf/setup.py Mon Dec 17 11:22:49 2012
@@ -20,7 +20,7 @@
from distutils.core import setup
setup(name="qpid-qmf",
- version="0.19",
+ version="0.21",
author="Apache Qpid",
author_email="dev@qpid.apache.org",
packages=["qmf"],
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/packaging/windows/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/packaging/windows:r1411034-1415148
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/packaging/windows/INSTALL_NOTES.html
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/packaging/windows/INSTALL_NOTES.html?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/packaging/windows/INSTALL_NOTES.html (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/packaging/windows/INSTALL_NOTES.html Mon Dec 17 11:22:49 2012
@@ -1,11 +1,11 @@
<html>
<head>
-<title>Apache Qpid C++ 0.19 Installation Notes</title>
+<title>Apache Qpid C++ 0.21 Installation Notes</title>
</head>
<body>
-<H1>Apache Qpid C++ 0.19 Installation Notes</H1>
+<H1>Apache Qpid C++ 0.21 Installation Notes</H1>
-<p>Thank you for installing Apache Qpid version 0.19 for Windows.
+<p>Thank you for installing Apache Qpid version 0.21 for Windows.
If the requisite features were installed, you can now run a broker,
use the example programs, and design your own messaging programs while
reading the Qpid C++ API reference documentation.</p>
@@ -83,7 +83,7 @@ default; therefore, to gain support for
must be loaded into the broker. This can be done using the
<code>--load-module</code> option to load the needed plugins. For example:
<pre>
-cd "C:\Program Files\Apache\qpidc-0.19"
+cd "C:\Program Files\Apache\qpidc-0.21"
qpidd.exe --load-module plugins\broker\store.dll --load-module plugins\broker\msclfs_store.dll
</pre>
The <code>--load-module</code> option can also take a full path. The option
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/packaging/windows/installer.proj
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/packaging/windows/installer.proj?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/packaging/windows/installer.proj (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/packaging/windows/installer.proj Mon Dec 17 11:22:49 2012
@@ -32,7 +32,7 @@
<source_root>$(MSBuildProjectDirectory)\..\..</source_root>
<staging_dir>$(MSBuildProjectDirectory)\stage</staging_dir>
<bits Condition="'$(bits)' == ''">32</bits>
- <qpid_version>0.19</qpid_version>
+ <qpid_version>0.21</qpid_version>
<OutputName>qpidc</OutputName>
<OutputType>Package</OutputType>
<WixToolPath>C:\Program Files (x86)\Windows Installer XML v3.5\bin</WixToolPath>
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/packaging/windows/installer.proj
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/packaging/windows/installer.proj:r1411034-1415148
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/python/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/python:r1411034-1415148
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/python/examples/api/spout
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/python/examples/api/spout:r1411034-1415148
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/python/qpid/concurrency.py
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/python/qpid/concurrency.py:r1411034-1415148
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/python/setup.py
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/python/setup.py?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/python/setup.py (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/python/setup.py Mon Dec 17 11:22:49 2012
@@ -298,7 +298,7 @@ class install_lib(_install_lib):
return outfiles + extra
setup(name="qpid-python",
- version="0.19",
+ version="0.21",
author="Apache Qpid",
author_email="dev@qpid.apache.org",
packages=["mllib", "qpid", "qpid.messaging", "qpid.tests",
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/tests/setup.py
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/tests/setup.py?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/tests/setup.py (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/tests/setup.py Mon Dec 17 11:22:49 2012
@@ -20,7 +20,7 @@
from distutils.core import setup
setup(name="qpid-tests",
- version="0.19",
+ version="0.21",
author="Apache Qpid",
author_email="dev@qpid.apache.org",
packages=["qpid_tests", "qpid_tests.broker_0_10", "qpid_tests.broker_0_9",
Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py:r1411034-1415148
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/tools/setup.py
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/tools/setup.py?rev=1422853&r1=1422852&r2=1422853&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/tools/setup.py (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/tools/setup.py Mon Dec 17 11:22:49 2012
@@ -20,7 +20,7 @@
from distutils.core import setup
setup(name="qpid-tools",
- version="0.19",
+ version="0.21",
author="Apache Qpid",
author_email="dev@qpid.apache.org",
package_dir={'' : 'src/py'},
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org