svn commit: r1228109 - in /qpid/trunk/qpid/java: client/src/main/java/org/apache/qpid/client/ systests/src/main/java/org/apache/qpid/test/unit/transacted/
Author: robbie
Date: Fri Jan 6 11:28:35 2012
New Revision: 1228109
URL: http://svn.apache.org/viewvc?rev=1228109view=rev
Log:
QPID-3716: restore throwing of IllegalStateException upon invoking
Session#getTransacted() on a closed session
Applied patch from Oleksandr Rudyyoru...@gmail.com
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java?rev=1228109r1=1228108r2=1228109view=diff
==
---
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
(original)
+++
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
Fri Jan 6 11:28:35 2012
@@ -308,7 +308,7 @@ public class AMQConnectionDelegate_8_0 i
{
AMQSession s = (AMQSession) it.next();
// _protocolHandler.addSessionByChannel(s.getChannelId(), s);
-reopenChannel(s.getChannelId(), s.getDefaultPrefetchHigh(),
s.getDefaultPrefetchLow(), s.getTransacted());
+reopenChannel(s.getChannelId(), s.getDefaultPrefetchHigh(),
s.getDefaultPrefetchLow(), s.isTransacted());
s.resubscribe();
}
}
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java?rev=1228109r1=1228108r2=1228109view=diff
==
---
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
(original)
+++
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
Fri Jan 6 11:28:35 2012
@@ -256,7 +256,7 @@ public abstract class AMQSessionC exten
protected AMQConnection _connection;
/** Used to indicate whether or not this is a transactional session. */
-protected boolean _transacted;
+protected final boolean _transacted;
/** Holds the sessions acknowledgement mode. */
protected final int _acknowledgeMode;
@@ -1619,7 +1619,24 @@ public abstract class AMQSessionC exten
return _ticket;
}
-public boolean getTransacted()
+/**
+ * Indicates whether the session is in transacted mode.
+ *
+ * @return true if the session is in transacted mode
+ * @throws IllegalStateException - if session is closed.
+ */
+public boolean getTransacted() throws JMSException
+{
+// Sun TCK checks that javax.jms.IllegalStateException is thrown for
closed session
+// nowhere else this behavior is documented
+checkNotClosed();
+return _transacted;
+}
+
+/**
+ * Indicates whether the session is in transacted mode.
+ */
+public boolean isTransacted()
{
return _transacted;
}
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java?rev=1228109r1=1228108r2=1228109view=diff
==
---
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
(original)
+++
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
Fri Jan 6 11:28:35 2012
@@ -152,7 +152,7 @@ public class AMQSession_0_8 extends AMQS
_logger.debug(Sending ack for delivery tag + deliveryTag + on
channel + _channelId);
}
-getProtocolHandler().writeFrame(ackFrame, !getTransacted());
+getProtocolHandler().writeFrame(ackFrame, !isTransacted());
_unacknowledgedMessageTags.remove(deliveryTag);
}
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java?rev=1228109r1=1228108r2=1228109view=diff
==
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
Fri Jan 6 11:28:35 2012
@@
svn commit: r1228192 - in /qpid/trunk/qpid/java: common.xml lib/cobertura/README.txt
Author: robbie
Date: Fri Jan 6 14:07:42 2012
New Revision: 1228192
URL: http://svn.apache.org/viewvc?rev=1228192view=rev
Log:
QPID-3670: Add new build target to allow the Cobertura jar files to be
downloaded automatically if not already present
Applied patch from Andrew MacBean andymacb...@gmail.com
Modified:
qpid/trunk/qpid/java/common.xml
qpid/trunk/qpid/java/lib/cobertura/README.txt
Modified: qpid/trunk/qpid/java/common.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common.xml?rev=1228192r1=1228191r2=1228192view=diff
==
--- qpid/trunk/qpid/java/common.xml (original)
+++ qpid/trunk/qpid/java/common.xml Fri Jan 6 14:07:42 2012
@@ -61,6 +61,12 @@
property name=javac.compiler.args value=/
property name=cobertura.dir value=${project.root}/lib/cobertura /
+ property name=cobertura.version value=1.9.4.1 /
+ property name=cobertura.download.url
+
value=http://downloads.sourceforge.net/project/cobertura/cobertura/${cobertura.version}/cobertura-${cobertura.version}-bin.zip;
/
+ property name=cobertura.zip.filename
value=cobertura-${cobertura.version}-bin.zip /
+ property name=cobertura.temp.dir value=${cobertura.dir}/
+
property name=mllib.dir value=${project.root}/../python /
property name=findbugs.dir value=${project.root}/lib/findbugs /
@@ -71,8 +77,8 @@
path id=cobertura.classpath
fileset dir=${cobertura.dir}
-include name=cobertura.jar /
-include name=lib/**/*.jar /
+include name=cobertura-${cobertura.version}/*.jar /
+include name=cobertura-${cobertura.version}/**/lib/*.jar /
/fileset
/path
@@ -192,6 +198,22 @@
taskdef classpathref=cobertura.classpath resource=tasks.properties /
/target
+ !--download Cobertura jar and expand--
+ target name=download-cobertura description=download Cobertura if not
already present depends=cobertura-check unless=cobertura.already.exists
+ mkdir dir=${cobertura.dir}/
+ echoDownloading Cobertura ${cobertura.version}/echo
+ get src=${cobertura.download.url}
dest=${cobertura.temp.dir}/${cobertura.zip.filename} usetimestamp=false /
+ echoExtracting Cobertura JAR and dependencies/echo
+ unzip src=${cobertura.temp.dir}/${cobertura.zip.filename}
dest=${cobertura.dir}/
+ echoCleanup Cobertura Download/echo
+ delete file=${cobertura.temp.dir}/${cobertura.zip.filename}/
+ echoDone/echo
+ /target
+
+ target name=cobertura-check
+available property=cobertura.already.exists
file=${cobertura.dir}/cobertura-${cobertura.version} type=dir/
+ /target
+
target name=findbugs-init
available file=${findbugs.dir}/findbugs-ant.jar
property=findbugs-ant.jar.present/
fail unless=findbugs-ant.jar.present message=Please follow the
instructions at ${findbugs.dir}/README.txt to configure FindBugs/
Modified: qpid/trunk/qpid/java/lib/cobertura/README.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/cobertura/README.txt?rev=1228192r1=1228191r2=1228192view=diff
==
--- qpid/trunk/qpid/java/lib/cobertura/README.txt (original)
+++ qpid/trunk/qpid/java/lib/cobertura/README.txt Fri Jan 6 14:07:42 2012
@@ -1,10 +1,9 @@
-Download the cobertura binary from the following location:
+Download the cobertura binary from the following location and expand it into
+this directory.
http://cobertura.sourceforge.net/download.html
-
-Unpack it into the cobertura (this) directory with tar --strip-path 1 -xf.
-This should leave you with cobertura.jar in qpid/java/lib/cobertura.
+Alternatively run ant download-cobertura to do this automatically.
+(to set a http proxy for ant use ANT_OPTS=-Dhttp.proxyHost=host
-Dhttp.proxyPort=port)
Run ant cover-test coverage-report to generate coverage report.
-
-
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1228226 - /qpid/trunk/qpid/cpp/bindings/swig_python_typemaps.i
Author: gsim
Date: Fri Jan 6 15:15:11 2012
New Revision: 1228226
URL: http://svn.apache.org/viewvc?rev=1228226view=rev
Log:
QPID-: Fix reference counting for Variants, Maps, Lists; patch from Anthony
Foglia
Modified:
qpid/trunk/qpid/cpp/bindings/swig_python_typemaps.i
Modified: qpid/trunk/qpid/cpp/bindings/swig_python_typemaps.i
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/swig_python_typemaps.i?rev=1228226r1=1228225r2=1228226view=diff
==
--- qpid/trunk/qpid/cpp/bindings/swig_python_typemaps.i (original)
+++ qpid/trunk/qpid/cpp/bindings/swig_python_typemaps.i Fri Jan 6 15:15:11 2012
@@ -134,8 +134,6 @@ typedef int Py_ssize_t;
result = 0;
}
-if (result)
-Py_INCREF(result);
return result;
}
@@ -323,32 +321,22 @@ typedef int Py_ssize_t;
*/
%typemap(out) qpid::types::Variant::Map {
$result = MapToPy($1);
-if ($result)
-Py_INCREF($result);
}
%typemap(out) qpid::types::Variant::Map {
$result = MapToPy($1);
-if ($result)
-Py_INCREF($result);
}
%typemap(out) qpid::types::Variant::List {
$result = ListToPy($1);
-if ($result)
-Py_INCREF($result);
}
%typemap(out) qpid::types::Variant::List {
$result = ListToPy($1);
-if ($result)
-Py_INCREF($result);
}
%typemap(out) qpid::types::Variant {
$result = VariantToPy($1);
-if ($result)
-Py_INCREF($result);
}
/*
@@ -356,8 +344,6 @@ typedef int Py_ssize_t;
*/
%typemap(out) qpid::types::UUID {
$result = UuidToPy($1);
-if ($result)
-Py_INCREF($result);
}
-
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1228425 - in /qpid/branches/qpid-3603/qpid/cpp/src: qpid/ha/QueueReplicator.cpp qpid/ha/ReplicatingSubscription.cpp tests/qpid-cpp-benchmark
Author: aconway
Date: Fri Jan 6 21:54:58 2012
New Revision: 1228425
URL: http://svn.apache.org/viewvc?rev=1228425view=rev
Log:
QPID-3603: Fix memory management error in QueueReplicator.cpp
Modified:
qpid/branches/qpid-3603/qpid/cpp/src/qpid/ha/QueueReplicator.cpp
qpid/branches/qpid-3603/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp
qpid/branches/qpid-3603/qpid/cpp/src/tests/qpid-cpp-benchmark
Modified: qpid/branches/qpid-3603/qpid/cpp/src/qpid/ha/QueueReplicator.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/qpid-3603/qpid/cpp/src/qpid/ha/QueueReplicator.cpp?rev=1228425r1=1228424r2=1228425view=diff
==
--- qpid/branches/qpid-3603/qpid/cpp/src/qpid/ha/QueueReplicator.cpp (original)
+++ qpid/branches/qpid-3603/qpid/cpp/src/qpid/ha/QueueReplicator.cpp Fri Jan 6
21:54:58 2012
@@ -118,8 +118,6 @@ void QueueReplicator::initializeBridge(B
peer.getMessage().flow(getName(), 0, 0x);
peer.getMessage().flow(getName(), 1, 0x);
QPID_LOG(debug, logPrefix Activated bridge from args.i_src
to args.i_dest);
-// Reset self reference so this will be deleted when all external refs are
gone.
-self.reset();
}
namespace {
@@ -150,13 +148,13 @@ void QueueReplicator::route(Deliverable
sys::Mutex::ScopedLock l(lock);
if (key == DEQUEUE_EVENT_KEY) {
SequenceSet dequeues = decodeContentSequenceSet(msg.getMessage());
-QPID_LOG(trace, logPrefix Received dequeues: dequeues);
+QPID_LOG(trace, logPrefix Dequeue update: dequeues);
//TODO: should be able to optimise the following
for (SequenceSet::iterator i = dequeues.begin(); i != dequeues.end();
i++)
dequeue(*i, l);
} else if (key == POSITION_EVENT_KEY) {
SequenceNumber position =
decodeContentSequenceNumber(msg.getMessage());
-QPID_LOG(trace, logPrefix Advance position: from
queue-getPosition()
+QPID_LOG(trace, logPrefix Position update: from
queue-getPosition()
to position);
assert(queue-getPosition() = position);
//TODO aconway 2011-12-14: Optimize this?
Modified:
qpid/branches/qpid-3603/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/qpid-3603/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp?rev=1228425r1=1228424r2=1228425view=diff
==
--- qpid/branches/qpid-3603/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp
(original)
+++ qpid/branches/qpid-3603/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp
Fri Jan 6 21:54:58 2012
@@ -89,11 +89,10 @@ ReplicatingSubscription::ReplicatingSubs
consumer(new DelegatingConsumer(*this))
{
stringstream ss;
-string url = parent-getSession().getConnection().getUrl();
-string qname = getQueue()-getName();
-ss HA: Primary queue qname , backupurl : ;
+ss HA: Primary: getQueue()-getName() at
+parent-getSession().getConnection().getUrl() : ;
logPrefix = ss.str();
-
+
// FIXME aconway 2011-12-09: Failover optimization removed.
// There was code here to re-use messages already on the backup
// during fail-over. This optimization was removed to simplify
@@ -101,7 +100,7 @@ ReplicatingSubscription::ReplicatingSubs
// can be re-introduced later. Last revision with the optimization:
// r1213258 | QPID-3603: Fix QueueReplicator subscription parameters.
-QPID_LOG(debug, logPrefix Created subscription name);
+QPID_LOG(debug, logPrefix Created backup subscription getName());
// FIXME aconway 2011-12-15: ConsumerImpl::position is left at 0
// so we will start consuming from the lowest numbered message.
@@ -137,7 +136,7 @@ ReplicatingSubscription::~ReplicatingSub
// Called in the subscription's connection thread.
void ReplicatingSubscription::cancel()
{
-QPID_LOG(debug, logPrefix Cancelled);
+QPID_LOG(debug, logPrefix Cancelled backup subscription getName());
getQueue()-removeObserver(boost::dynamic_pointer_castQueueObserver(shared_from_this()));
}
Modified: qpid/branches/qpid-3603/qpid/cpp/src/tests/qpid-cpp-benchmark
URL:
http://svn.apache.org/viewvc/qpid/branches/qpid-3603/qpid/cpp/src/tests/qpid-cpp-benchmark?rev=1228425r1=1228424r2=1228425view=diff
==
--- qpid/branches/qpid-3603/qpid/cpp/src/tests/qpid-cpp-benchmark (original)
+++ qpid/branches/qpid-3603/qpid/cpp/src/tests/qpid-cpp-benchmark Fri Jan 6
21:54:58 2012
@@ -147,7 +147,6 @@ def start_send(queue, opts, broker, host
--report-total,
--report-header=no,
--timestamp=%s%(opts.timestamp and yes or no),
- --sequence=no,
--flow-control, str(opts.flow_control),
--durable,
svn commit: r1228424 - in /qpid/branches/qpid-3603/qpid/cpp/src: qpid/broker/Consumer.h qpid/broker/FifoDistributor.cpp qpid/broker/MessageGroupManager.cpp qpid/broker/Queue.cpp qpid/cluster/Connectio
Author: aconway
Date: Fri Jan 6 21:54:50 2012
New Revision: 1228424
URL: http://svn.apache.org/viewvc?rev=1228424view=rev
Log:
QPID-3603: Replace public broker::Consumer::position variable with get/set
function pair.
Done for the new HA work, but this is better practice in any case.
Modified:
qpid/branches/qpid-3603/qpid/cpp/src/qpid/broker/Consumer.h
qpid/branches/qpid-3603/qpid/cpp/src/qpid/broker/FifoDistributor.cpp
qpid/branches/qpid-3603/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp
qpid/branches/qpid-3603/qpid/cpp/src/qpid/broker/Queue.cpp
qpid/branches/qpid-3603/qpid/cpp/src/qpid/cluster/Connection.cpp
qpid/branches/qpid-3603/qpid/cpp/src/qpid/cluster/UpdateClient.cpp
qpid/branches/qpid-3603/qpid/cpp/src/tests/QueueTest.cpp
Modified: qpid/branches/qpid-3603/qpid/cpp/src/qpid/broker/Consumer.h
URL:
http://svn.apache.org/viewvc/qpid/branches/qpid-3603/qpid/cpp/src/qpid/broker/Consumer.h?rev=1228424r1=1228423r2=1228424view=diff
==
--- qpid/branches/qpid-3603/qpid/cpp/src/qpid/broker/Consumer.h (original)
+++ qpid/branches/qpid-3603/qpid/cpp/src/qpid/broker/Consumer.h Fri Jan 6
21:54:50 2012
@@ -45,20 +45,27 @@ class Consumer {
public:
typedef boost::shared_ptrConsumer shared_ptr;
-framing::SequenceNumber position;
-
Consumer(const std::string _name, bool preAcquires = true)
: acquires(preAcquires), inListeners(false), name(_name), position(0) {}
+virtual ~Consumer(){}
+
bool preAcquires() const { return acquires; }
const std::string getName() const { return name; }
+virtual framing::SequenceNumber getPosition() const { return position; }
+virtual void setPosition(framing::SequenceNumber pos) { position = pos; }
+
virtual bool deliver(QueuedMessage msg) = 0;
virtual void notify() = 0;
virtual bool filter(boost::intrusive_ptrMessage) { return true; }
virtual bool accept(boost::intrusive_ptrMessage) { return true; }
virtual OwnershipToken* getSession() = 0;
virtual bool isDelayedCompletion() const { return false; }
-virtual ~Consumer(){}
+
+ protected:
+framing::SequenceNumber position;
+
+ private:
friend class QueueListeners;
};
Modified: qpid/branches/qpid-3603/qpid/cpp/src/qpid/broker/FifoDistributor.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/qpid-3603/qpid/cpp/src/qpid/broker/FifoDistributor.cpp?rev=1228424r1=1228423r2=1228424view=diff
==
--- qpid/branches/qpid-3603/qpid/cpp/src/qpid/broker/FifoDistributor.cpp
(original)
+++ qpid/branches/qpid-3603/qpid/cpp/src/qpid/broker/FifoDistributor.cpp Fri
Jan 6 21:54:50 2012
@@ -42,7 +42,7 @@ bool FifoDistributor::allocate(const std
bool FifoDistributor::nextBrowsableMessage( Consumer::shared_ptr c,
QueuedMessage next )
{
-return messages.browse(c-position, next, false);
+return messages.browse(c-getPosition(), next, false);
}
void FifoDistributor::query(qpid::types::Variant::Map) const
Modified:
qpid/branches/qpid-3603/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/qpid-3603/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp?rev=1228424r1=1228423r2=1228424view=diff
==
--- qpid/branches/qpid-3603/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp
(original)
+++ qpid/branches/qpid-3603/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp
Fri Jan 6 21:54:50 2012
@@ -207,7 +207,7 @@ bool MessageGroupManager::nextConsumable
if (!messages.size())
return false;
-next.position = c-position;
+next.position = c-getPosition();
if (!freeGroups.empty()) {
const framing::SequenceNumber nextFree = freeGroups.begin()-first;
if (nextFree next.position) { // a free message is older than
current
@@ -250,7 +250,7 @@ bool MessageGroupManager::allocate(const
bool MessageGroupManager::nextBrowsableMessage( Consumer::shared_ptr c,
QueuedMessage next )
{
// browse: allow access to any available msg, regardless of group
ownership (?ok?)
-return messages.browse(c-position, next, false);
+return messages.browse(c-getPosition(), next, false);
}
void MessageGroupManager::query(qpid::types::Variant::Map status) const
Modified: qpid/branches/qpid-3603/qpid/cpp/src/qpid/broker/Queue.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/qpid-3603/qpid/cpp/src/qpid/broker/Queue.cpp?rev=1228424r1=1228423r2=1228424view=diff
==
--- qpid/branches/qpid-3603/qpid/cpp/src/qpid/broker/Queue.cpp (original)
+++ qpid/branches/qpid-3603/qpid/cpp/src/qpid/broker/Queue.cpp Fri Jan 6
21:54:50 2012
@@ -302,7 +302,7 @@ Queue::ConsumeCode Queue::consumeNextMes
if (allocator-nextConsumableMessage(c, msg)) {
svn commit: r1228493 - /qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
Author: shuston
Date: Fri Jan 6 23:01:17 2012
New Revision: 1228493
URL: http://svn.apache.org/viewvc?rev=1228493view=rev
Log:
Run the needed python setup to get the python compiled and ready for the test
runs; fixes QPID-3729
Modified:
qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt?rev=1228493r1=1228492r2=1228493view=diff
==
--- qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt Fri Jan 6 23:01:17 2012
@@ -281,6 +281,15 @@ remember_location(msg_group_test)
install (TARGETS qpid-perftest qpid-latency-test RUNTIME
DESTINATION ${QPID_INSTALL_BINDIR})
+# This should ideally be done as part of the test run, but I don't know a way
+# to get these arguments and the working directory set like Makefile.am does,
+# and have that run during the test pass.
+if (PYTHON_EXECUTABLE)
+ set (python_bld ${CMAKE_CURRENT_BINARY_DIR}/python)
+ execute_process(COMMAND ${PYTHON_EXECUTABLE} setup.py install
--prefix=${pythoon_bld} --install-lib=${python_bld}
--install-scripts=${python_bld}/commands
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../python)
+endif (PYTHON_EXECUTABLE)
+
if (CMAKE_SYSTEM_NAME STREQUAL Windows)
set (ENV{OUTDIR} ${EXECUTABLE_OUTPUT_PATH})
set (test_script_suffix .ps1)
@@ -319,49 +328,12 @@ add_library(test_store MODULE test_store
target_link_libraries (test_store qpidbroker qpidcommon)
set_target_properties (test_store PROPERTIES PREFIX )
-#EXTRA_DIST += \
-# run_test vg_check \
-# run-unit-tests start_broker python_tests stop_broker
\
-# quick_topictest \
-# quick_perftest \
-# quick_txtest
\
-# topictest \
-# run_header_test \
-# header_test.py \
-# ssl_test\
-# config.null \
-# ais_check \
-# run_federation_tests
\
-# run_acl_tests
\
-# .valgrind.supp \
-# MessageUtils.h \
-# TestMessageStore.h \
-# TxMocks.h \
-# start_cluster stop_cluster restart_cluster
add_library (dlclose_noop MODULE dlclose_noop.c)
#libdlclose_noop_la_LDFLAGS = -module -rpath $(abs_builddir)
#CLEANFILES+=valgrind.out *.log *.vglog* dummy_test $(unit_wrappers)
#
-## FIXME aconway 2008-05-23: Disabled interop_runner because it uses
-## the obsolete Channel class. Convert to Session and re-enable.
-##
-## check_PROGRAMS += interop_runner
-#
-## interop_runner_SOURCES =\
-## interop_runner.cpp\
-## SimpleTestCaseBase.cpp\
-## BasicP2PTest.cpp \
-## BasicPubSubTest.cpp \
-## SimpleTestCaseBase.h \
-## BasicP2PTest.h\
-## BasicPubSubTest.h \
-## TestCase.h\
-## TestOptions.h ConnectionOptions.h
-## interop_runner_LDADD = $(lib_client) $(lib_common) $(extra_libs)
-#
-#
## Longer running stability tests, not run by default check: target.
## Not run under valgrind, too slow
#LONG_TESTS=fanout_perftest shared_perftest multiq_perftest topic_perftest
run_failover_soak
-
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
