Author: robbie
Date: Thu Jun 28 12:38:36 2012
New Revision: 1354981
URL: http://svn.apache.org/viewvc?rev=1354981&view=rev
Log:
merge changes from trunk up to r1354912
Added:
qpid/branches/java-config-and-management/qpid/cpp/include/qmf/BrokerImportExport.h
- copied unchanged from r1354912,
qpid/trunk/qpid/cpp/include/qmf/BrokerImportExport.h
Removed:
qpid/branches/java-config-and-management/qpid/cpp/src/qmf/BrokerImportExport.h
Modified:
qpid/branches/java-config-and-management/ (props changed)
qpid/branches/java-config-and-management/qpid/ (props changed)
qpid/branches/java-config-and-management/qpid/cpp/docs/api/ (props
changed)
qpid/branches/java-config-and-management/qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj
(props changed)
qpid/branches/java-config-and-management/qpid/cpp/include/qmf/engine/Agent.h
(props changed)
qpid/branches/java-config-and-management/qpid/cpp/include/qmf/engine/Console.h
(props changed)
qpid/branches/java-config-and-management/qpid/cpp/src/ (props changed)
qpid/branches/java-config-and-management/qpid/cpp/src/CMakeLists.txt
(contents, props changed)
qpid/branches/java-config-and-management/qpid/cpp/src/qmf.mk
qpid/branches/java-config-and-management/qpid/cpp/src/qmf/engine/Agent.cpp
(props changed)
qpid/branches/java-config-and-management/qpid/cpp/src/qpid/acl/ (props
changed)
qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/ (props
changed)
qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp
qpid/branches/java-config-and-management/qpid/cpp/src/qpid/cluster/UpdateClient.cpp
(props changed)
qpid/branches/java-config-and-management/qpid/cpp/src/qpid/cluster/UpdateClient.h
(props changed)
qpid/branches/java-config-and-management/qpid/cpp/src/qpid/management/ManagementAgent.cpp
(props changed)
qpid/branches/java-config-and-management/qpid/cpp/src/qpid/management/ManagementAgent.h
(props changed)
qpid/branches/java-config-and-management/qpid/cpp/src/tests/ (props
changed)
qpid/branches/java-config-and-management/qpid/cpp/src/tests/cluster_tests.py
(props changed)
qpid/branches/java-config-and-management/qpid/cpp/src/tests/ha_tests.py
qpid/branches/java-config-and-management/qpid/cpp/src/tests/logging.cpp
qpid/branches/java-config-and-management/qpid/java/ (props changed)
qpid/branches/java-config-and-management/qpid/java/amqp-1-0-client/
(props changed)
qpid/branches/java-config-and-management/qpid/java/amqp-1-0-client-jms/
(props changed)
qpid/branches/java-config-and-management/qpid/java/amqp-1-0-common/
(props changed)
qpid/branches/java-config-and-management/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java
qpid/branches/java-config-and-management/qpid/java/broker/ (props changed)
qpid/branches/java-config-and-management/qpid/java/broker/bin/ (props
changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/
(props changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/
(props changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
(props changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc
(props changed)
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/ (props
changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/CPPExcludes
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/Excludes
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaBDBExcludes
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaExcludes
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaPre010Excludes
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaTransientExcludes
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/XAExcludes
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.async.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.cluster.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.noprefetch.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.ssl.excludes
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.ssl.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-dby.0-9-1.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-mms.0-9-1.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/log4j-test.xml
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/test-provider.properties
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/test_resources/
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/testprofile.defaults
(props changed)
qpid/branches/java-config-and-management/qpid/packaging/windows/ (props
changed)
qpid/branches/java-config-and-management/qpid/python/ (props changed)
qpid/branches/java-config-and-management/qpid/python/examples/api/spout
(props changed)
qpid/branches/java-config-and-management/qpid/python/qpid/concurrency.py
(props changed)
qpid/branches/java-config-and-management/qpid/tests/src/py/qpid_tests/broker_0_10/qmf_events.py
qpid/branches/java-config-and-management/qpid/tests/src/py/qpid_tests/broker_0_10/query.py
qpid/branches/java-config-and-management/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py
(props changed)
qpid/branches/java-config-and-management/qpid/tools/src/py/qpid-ha
Propchange: qpid/branches/java-config-and-management/
------------------------------------------------------------------------------
Merged /qpid/trunk:r1353861-1354912
Propchange: qpid/branches/java-config-and-management/qpid/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid:r1353861-1354912
Propchange: qpid/branches/java-config-and-management/qpid/cpp/docs/api/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/docs/api:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/cpp/include/qmf/engine/Agent.h
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/include/qmf/engine/Agent.h:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/cpp/include/qmf/engine/Console.h
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/include/qmf/engine/Console.h:r1353861-1354912
Propchange: qpid/branches/java-config-and-management/qpid/cpp/src/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src:r1353861-1354912
Modified: qpid/branches/java-config-and-management/qpid/cpp/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/cpp/src/CMakeLists.txt?rev=1354981&r1=1354980&r2=1354981&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/cpp/src/CMakeLists.txt
(original)
+++ qpid/branches/java-config-and-management/qpid/cpp/src/CMakeLists.txt Thu
Jun 28 12:38:36 2012
@@ -1223,6 +1223,7 @@ set (qmf_SOURCES
set (qmf_HEADERS
../include/qpid/agent/ManagementAgent.h
../include/qpid/agent/QmfAgentImportExport.h
+ ../include/qmf/BrokerImportExport.h
)
add_msvc_version (qmf library dll)
Propchange: qpid/branches/java-config-and-management/qpid/cpp/src/CMakeLists.txt
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/CMakeLists.txt:r1353861-1354912
Modified: qpid/branches/java-config-and-management/qpid/cpp/src/qmf.mk
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/cpp/src/qmf.mk?rev=1354981&r1=1354980&r2=1354981&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/cpp/src/qmf.mk (original)
+++ qpid/branches/java-config-and-management/qpid/cpp/src/qmf.mk Thu Jun 28
12:38:36 2012
@@ -30,7 +30,8 @@ lib_LTLIBRARIES += \
#
QMF_API = \
../include/qpid/agent/ManagementAgent.h \
- ../include/qpid/agent/QmfAgentImportExport.h
+ ../include/qpid/agent/QmfAgentImportExport.h \
+ ../include/qmf/BrokerImportExport.h
#
# Public headers for the QMF2 API
@@ -96,7 +97,6 @@ libqmf2_la_SOURCES = \
qmf/AgentSessionImpl.h \
qmf/AgentSubscription.cpp \
qmf/AgentSubscription.h \
- qmf/BrokerImportExport.h \
qmf/ConsoleEvent.cpp \
qmf/ConsoleEventImpl.h \
qmf/ConsoleSession.cpp \
Propchange:
qpid/branches/java-config-and-management/qpid/cpp/src/qmf/engine/Agent.cpp
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/qmf/engine/Agent.cpp:r1353861-1354912
Propchange: qpid/branches/java-config-and-management/qpid/cpp/src/qpid/acl/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/qpid/acl:r1353861-1354912
Propchange: qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/qpid/broker:r1353861-1354912
Modified:
qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp?rev=1354981&r1=1354980&r2=1354981&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp
(original)
+++
qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp
Thu Jun 28 12:38:36 2012
@@ -81,7 +81,7 @@ void SaslAuthenticator::fini(void)
return;
}
-std::auto_ptr<SaslAuthenticator>
SaslAuthenticator::createAuthenticator(Connection& c, bool)
+std::auto_ptr<SaslAuthenticator>
SaslAuthenticator::createAuthenticator(Connection& c)
{
if (c.getBroker().getOptions().auth) {
return std::auto_ptr<SaslAuthenticator>(new SspiAuthenticator(c));
Propchange:
qpid/branches/java-config-and-management/qpid/cpp/src/qpid/cluster/UpdateClient.cpp
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.cpp:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/cpp/src/qpid/cluster/UpdateClient.h
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.h:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/cpp/src/qpid/management/ManagementAgent.cpp
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/cpp/src/qpid/management/ManagementAgent.h
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h:r1353861-1354912
Propchange: qpid/branches/java-config-and-management/qpid/cpp/src/tests/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/tests:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/cpp/src/tests/cluster_tests.py
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/tests/cluster_tests.py:r1353861-1354912
Modified:
qpid/branches/java-config-and-management/qpid/cpp/src/tests/ha_tests.py
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/cpp/src/tests/ha_tests.py?rev=1354981&r1=1354980&r2=1354981&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/cpp/src/tests/ha_tests.py
(original)
+++ qpid/branches/java-config-and-management/qpid/cpp/src/tests/ha_tests.py Thu
Jun 28 12:38:36 2012
@@ -67,7 +67,9 @@ class HaBroker(Broker):
def __str__(self): return Broker.__str__(self)
- def qpid_ha(self, args): self.qpid_ha_script.main(["", "-b",
self.host_port()]+args)
+ # FIXME aconway 2012-06-26: check exit status from script.
+ def qpid_ha(self, args):
+ self.qpid_ha_script.main_except(["", "-b", self.host_port()]+args)
def promote(self): self.qpid_ha(["promote"])
def set_client_url(self, url): self.qpid_ha(["set", "--public-url", url])
@@ -164,7 +166,8 @@ class HaCluster(object):
def update_urls(self):
self.url = ",".join([b.host_port() for b in self])
- for b in self: b.set_brokers_url(self.url)
+ if len(self) > 1: # No failover addresses on a 1 cluster.
+ for b in self: b.set_brokers_url(self.url)
def connect(self, i):
"""Connect with reconnect_urls"""
Modified:
qpid/branches/java-config-and-management/qpid/cpp/src/tests/logging.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/cpp/src/tests/logging.cpp?rev=1354981&r1=1354980&r2=1354981&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/cpp/src/tests/logging.cpp
(original)
+++ qpid/branches/java-config-and-management/qpid/cpp/src/tests/logging.cpp Thu
Jun 28 12:38:36 2012
@@ -375,7 +375,7 @@ QPID_AUTO_TEST_CASE(testQuoteNonPrintabl
char s[] = "null\0tab\tspace newline\nret\r\x80\x99\xff";
string str(s, sizeof(s));
- QPID_LOG(critical, str);
+ QPID_LOG_CAT(critical, test, str);
ifstream log("logging.tmp");
string line;
getline(log, line, '\0');
Propchange: qpid/branches/java-config-and-management/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1353861-1354912
Propchange: qpid/branches/java-config-and-management/qpid/java/amqp-1-0-client/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-client:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/amqp-1-0-client-jms/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-client-jms:r1353861-1354912
Propchange: qpid/branches/java-config-and-management/qpid/java/amqp-1-0-common/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-common:r1353861-1354912
Modified:
qpid/branches/java-config-and-management/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java?rev=1354981&r1=1354980&r2=1354981&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java
Thu Jun 28 12:38:36 2012
@@ -20,7 +20,6 @@
package org.apache.qpid.server.store.berkeleydb;
import java.io.File;
-import java.io.IOException;
import java.util.Set;
import javax.jms.Connection;
@@ -35,8 +34,6 @@ import org.apache.log4j.Logger;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
import org.apache.qpid.url.URLSyntaxException;
-import com.sleepycat.je.rep.ReplicationConfig;
-
/**
* The HA white box tests test the BDB cluster where the test retains the
knowledge of the
* individual test nodes. It uses this knowledge to examine the nodes to
ensure that they
@@ -103,7 +100,7 @@ public class HAClusterWhiteboxTest exten
final Connection initialConnection = getConnectionToNodeInCluster();
assertNotNull(initialConnection);
- killConnectionBroker(initialConnection);
+ closeConnectionAndKillBroker(initialConnection);
final Connection subsequentConnection = getConnectionToNodeInCluster();
assertNotNull(subsequentConnection);
@@ -119,7 +116,7 @@ public class HAClusterWhiteboxTest exten
final Connection initialConnection = getConnectionToNodeInCluster();
assertNotNull(initialConnection);
- killConnectionBroker(initialConnection);
+ closeConnectionAndKillBroker(initialConnection);
final Connection subsequentConnection = getConnectionToNodeInCluster();
assertNotNull(subsequentConnection);
@@ -139,6 +136,7 @@ public class HAClusterWhiteboxTest exten
assertNotNull(connection);
final int brokerPortNumber =
_clusterCreator.getBrokerPortNumberFromConnection(connection);
+ connection.close();
_clusterCreator.stopNode(brokerPortNumber);
_clusterCreator.startNode(brokerPortNumber);
@@ -157,7 +155,7 @@ public class HAClusterWhiteboxTest exten
populateBrokerWithData(initialConnection, inbuiltExchangeQueueUrl,
customExchangeQueueUrl);
- killConnectionBroker(initialConnection);
+ closeConnectionAndKillBroker(initialConnection);
final Connection subsequentConnection = getConnectionToNodeInCluster();
@@ -229,10 +227,11 @@ public class HAClusterWhiteboxTest exten
return connection;
}
- private void killConnectionBroker(final Connection initialConnection)
throws IOException,
- InterruptedException
+ private void closeConnectionAndKillBroker(final Connection
initialConnection) throws Exception
{
final int initialPortNumber =
_clusterCreator.getBrokerPortNumberFromConnection(initialConnection);
+ initialConnection.close();
+
killBroker(initialPortNumber); // kill awaits the death of the child
}
Propchange: qpid/branches/java-config-and-management/qpid/java/broker/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker:r1353861-1354912
Propchange: qpid/branches/java-config-and-management/qpid/java/broker/bin/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker/bin:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:r1353861-1354912
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java?rev=1354981&r1=1354980&r2=1354981&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
Thu Jun 28 12:38:36 2012
@@ -20,19 +20,11 @@
*/
package org.apache.qpid.server.transport;
-import java.util.Collections;
-import java.util.HashSet;
-import static
org.apache.qpid.server.logging.subjects.LogSubjectFormat.CHANNEL_FORMAT;
-import org.apache.qpid.server.message.InboundMessage;
-import org.apache.qpid.server.message.MessageMetaData_0_10;
-import org.apache.qpid.server.message.MessageTransferMessage;
-import org.apache.qpid.server.txn.RollbackOnlyDtxException;
-import org.apache.qpid.server.txn.TimeoutDtxException;
-import static org.apache.qpid.util.Serial.gt;
-
import java.security.Principal;
import java.text.MessageFormat;
import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -46,9 +38,7 @@ import java.util.concurrent.CopyOnWriteA
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-
import javax.security.auth.Subject;
-
import org.apache.qpid.AMQException;
import org.apache.qpid.AMQStoreException;
import org.apache.qpid.protocol.AMQConstant;
@@ -64,7 +54,10 @@ import org.apache.qpid.server.logging.ac
import org.apache.qpid.server.logging.actors.GenericActor;
import org.apache.qpid.server.logging.messages.ChannelMessages;
import org.apache.qpid.server.logging.subjects.ChannelLogSubject;
+import org.apache.qpid.server.message.InboundMessage;
+import org.apache.qpid.server.message.MessageMetaData_0_10;
import org.apache.qpid.server.message.MessageReference;
+import org.apache.qpid.server.message.MessageTransferMessage;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.protocol.AMQConnectionModel;
import org.apache.qpid.server.protocol.AMQSessionModel;
@@ -83,14 +76,19 @@ import org.apache.qpid.server.txn.Incorr
import org.apache.qpid.server.txn.JoinAndResumeDtxException;
import org.apache.qpid.server.txn.LocalTransaction;
import org.apache.qpid.server.txn.NotAssociatedDtxException;
+import org.apache.qpid.server.txn.RollbackOnlyDtxException;
import org.apache.qpid.server.txn.ServerTransaction;
import org.apache.qpid.server.txn.SuspendAndFailDtxException;
+import org.apache.qpid.server.txn.TimeoutDtxException;
import org.apache.qpid.server.txn.UnknownDtxBranchException;
import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.transport.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static
org.apache.qpid.server.logging.subjects.LogSubjectFormat.CHANNEL_FORMAT;
+import static org.apache.qpid.util.Serial.gt;
+
public class ServerSession extends Session
implements AuthorizationHolder, SessionConfig,
AMQSessionModel, LogSubject,
AsyncAutoCommitTransaction.FutureRecorder
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxBranch.java?rev=1354981&r1=1354980&r2=1354981&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
Thu Jun 28 12:38:36 2012
@@ -103,7 +103,7 @@ public class DtxBranch
_timeoutFuture.cancel(false);
}
_timeout = timeout;
- _expiration = timeout == 0 ? 0 : System.currentTimeMillis() + timeout;
+ _expiration = timeout == 0 ? 0 : System.currentTimeMillis() + (1000 *
timeout);
if(_timeout == 0)
{
@@ -111,7 +111,7 @@ public class DtxBranch
}
else
{
- _timeoutFuture = _vhost.scheduleTask(_timeout, new Runnable()
+ _timeoutFuture = _vhost.scheduleTask(1000*_timeout, new Runnable()
{
public void run()
{
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java?rev=1354981&r1=1354980&r2=1354981&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java
Thu Jun 28 12:38:36 2012
@@ -37,7 +37,7 @@ public class DtxRegistry
private static final class ComparableXid
{
private final Xid _xid;
-
+
private ComparableXid(Xid xid)
{
_xid = xid;
@@ -58,7 +58,7 @@ public class DtxRegistry
ComparableXid that = (ComparableXid) o;
return compareBytes(_xid.getBranchId(), that._xid.getBranchId())
- && compareBytes(_xid.getGlobalId(),
that._xid.getGlobalId());
+ && compareBytes(_xid.getGlobalId(),
that._xid.getGlobalId());
}
private static boolean compareBytes(byte[] a, byte[] b)
@@ -94,7 +94,7 @@ public class DtxRegistry
return result;
}
}
-
+
public synchronized DtxBranch getBranch(Xid xid)
{
return _branches.get(new ComparableXid(xid));
@@ -318,6 +318,7 @@ public class DtxRegistry
branch.disassociateSession(session);
}
}
+
}
Propchange:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java:r1353861-1354912
Modified:
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java?rev=1354981&r1=1354980&r2=1354981&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java
Thu Jun 28 12:38:36 2012
@@ -1,6 +1,6 @@
package org.apache.qpid.test.unit.xa;
/*
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,16 +8,16 @@ package org.apache.qpid.test.unit.xa;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -344,7 +344,7 @@ public class FaultTest extends AbstractX
{
assertEquals("Wrong error code: ", XAException.XAER_PROTO,
e.errorCode);
}
- }
+ }
/**
* Strategy:
@@ -366,27 +366,28 @@ public class FaultTest extends AbstractX
/**
* Strategy:
* Check that a transaction timeout as expected
- * - set timeout to 10ms
- * - sleep 1000ms
+ * - set timeout to 1s
+ * - sleep 1500ms
* - call end and check that the expected exception is thrown
*/
public void testTransactionTimeout() throws Exception
{
+ _xaResource.setTransactionTimeout(1);
+
Xid xid = getNewXid();
try
{
_xaResource.start(xid, XAResource.TMNOFLAGS);
- assertEquals("Wrong timeout", _xaResource.getTransactionTimeout(),
0);
- _xaResource.setTransactionTimeout(10);
- Thread.sleep(1000);
+ Thread.sleep(1500);
_xaResource.end(xid, XAResource.TMSUCCESS);
+ fail("Timeout expected ");
}
catch (XAException e)
{
assertEquals("Wrong error code: ", XAException.XA_RBTIMEOUT,
e.errorCode);
}
}
-
+
/**
* Strategy:
* Set the transaction timeout to 1000
@@ -394,18 +395,18 @@ public class FaultTest extends AbstractX
public void testTransactionTimeoutAfterCommit() throws Exception
{
Xid xid = getNewXid();
-
+
_xaResource.start(xid, XAResource.TMNOFLAGS);
_xaResource.setTransactionTimeout(1000);
assertEquals("Wrong timeout",
1000,_xaResource.getTransactionTimeout());
-
+
//_xaResource.prepare(xid);
_xaResource.end(xid, XAResource.TMSUCCESS);
_xaResource.commit(xid, true);
-
+
_xaResource.setTransactionTimeout(2000);
assertEquals("Wrong timeout",
2000,_xaResource.getTransactionTimeout());
-
+
xid = getNewXid();
_xaResource.start(xid, XAResource.TMNOFLAGS);
assertEquals("Wrong timeout", 2000,
_xaResource.getTransactionTimeout());
Propchange:
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:r1353861-1354912
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/CPPExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/CPPExcludes:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/Excludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/Excludes:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaBDBExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaExcludes:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaPre010Excludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaTransientExcludes
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/XAExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/XAExcludes:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.async.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.cluster.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.noprefetch.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.ssl.excludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.ssl.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.testprofile:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-dby.0-9-1.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-mms.0-9-1.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/log4j-test.xml
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/log4j-test.xml:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/test-provider.properties
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/test-provider.properties:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/test_resources/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/test_resources:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/testprofile.defaults
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/testprofile.defaults:r1353861-1354912
Propchange: qpid/branches/java-config-and-management/qpid/packaging/windows/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/packaging/windows:r1353861-1354912
Propchange: qpid/branches/java-config-and-management/qpid/python/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/python:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/python/examples/api/spout
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/python/examples/api/spout:r1353861-1354912
Propchange:
qpid/branches/java-config-and-management/qpid/python/qpid/concurrency.py
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/python/qpid/concurrency.py:r1353861-1354912
Modified:
qpid/branches/java-config-and-management/qpid/tests/src/py/qpid_tests/broker_0_10/qmf_events.py
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/tests/src/py/qpid_tests/broker_0_10/qmf_events.py?rev=1354981&r1=1354980&r2=1354981&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/tests/src/py/qpid_tests/broker_0_10/qmf_events.py
(original)
+++
qpid/branches/java-config-and-management/qpid/tests/src/py/qpid_tests/broker_0_10/qmf_events.py
Thu Jun 28 12:38:36 2012
@@ -65,7 +65,7 @@ class EventTests (Base):
snd = ssn2.sender("myq; {create:always,
node:{x-declare:{auto-delete:True, exclusive:True}}}")
ssn2.close()
- event = helper.event(rcv.fetch(timeout=1))
+ event = helper.event(rcv.fetch(timeout=5))
assert event.name, "org_apache_qpid_broker:queueDelete"
assert event.qName, "myq"
@@ -77,7 +77,7 @@ class EventTests (Base):
rcv2 = self.ssn.receiver("myq; {create:always,
node:{x-declare:{auto-delete:True}}}")
rcv2.close()
- event = helper.event(rcv.fetch(timeout=1))
+ event = helper.event(rcv.fetch(timeout=5))
assert event.name, "org_apache_qpid_broker:queueDelete"
assert event.qName, "myq"
Modified:
qpid/branches/java-config-and-management/qpid/tests/src/py/qpid_tests/broker_0_10/query.py
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/tests/src/py/qpid_tests/broker_0_10/query.py?rev=1354981&r1=1354980&r2=1354981&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/tests/src/py/qpid_tests/broker_0_10/query.py
(original)
+++
qpid/branches/java-config-and-management/qpid/tests/src/py/qpid_tests/broker_0_10/query.py
Thu Jun 28 12:38:36 2012
@@ -26,7 +26,7 @@ class QueryTests(TestBase010):
def test_queue_query(self):
session = self.session
- session.queue_declare(queue="my-queue", exclusive=True)
+ session.queue_declare(queue="my-queue", exclusive=True,
auto_delete=True)
result = session.queue_query(queue="my-queue")
self.assertEqual("my-queue", result.queue)
Propchange:
qpid/branches/java-config-and-management/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:r1353861-1354912
Modified: qpid/branches/java-config-and-management/qpid/tools/src/py/qpid-ha
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/tools/src/py/qpid-ha?rev=1354981&r1=1354980&r2=1354981&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/tools/src/py/qpid-ha
(original)
+++ qpid/branches/java-config-and-management/qpid/tools/src/py/qpid-ha Thu Jun
28 12:38:36 2012
@@ -32,6 +32,10 @@ except ImportError:
# QMF address for the HA broker object.
HA_BROKER = "org.apache.qpid.ha:habroker:ha-broker"
+class ExitStatus(Exception):
+ """Raised if a command want's a non-0 exit status from the script"""
+ def __init__(self, status): self.status = status
+
class Command:
commands = {}
@@ -54,7 +58,7 @@ class Command:
qmf_broker = BrokerAgent(connection)
ha_broker = qmf_broker.getHaBroker()
if not ha_broker: raise Exception("HA module is not loaded on broker
at %s"%broker)
- try: return self.do_execute(qmf_broker, ha_broker, opts, args)
+ try: self.do_execute(qmf_broker, ha_broker, opts, args)
finally: connection.close()
def do_execute(self, qmf_broker, opts, args):
@@ -75,10 +79,10 @@ class StatusCmd(Command):
help="Don't print status but return 0 if it matches <status>, 1
otherwise")
def do_execute(self, qmf_broker, ha_broker, opts, args):
if opts.expect:
- if opts.expect != ha_broker.status: return 1
+ if opts.expect != ha_broker.status: raise ExitStatus(1)
else:
print ha_broker.status
- return 0
+
StatusCmd()
class ReplicateCmd(Command):
@@ -134,18 +138,25 @@ def find_command(args):
return Command.commands[arg]
return None
-def main(argv):
- try:
- args=argv[1:]
- if args and args[0] == "--help-all":
- for c in Command.commands.itervalues():
- c.op.print_help(); print
- return 1
+def main_except(argv):
+ """This version of main raises exceptions"""
+ args=argv[1:]
+ if args and args[0] == "--help-all":
+ for c in Command.commands.itervalues():
+ c.op.print_help(); print
+ else:
command = find_command(args)
if not command:
print_usage(os.path.basename(argv[0]));
- return 1;
- if command.execute(args): return 1
+ raise Exception("Command not found")
+ command.execute(args)
+
+def main(argv):
+ try:
+ main_except(argv)
+ return 0
+ except ExitStatus, e:
+ return e.status
except Exception, e:
print e
return 1
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
