You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2014/01/23 12:01:08 UTC
svn commit: r1560634 [7/7] - in /qpid/branches/java-broker-bdb-ha: ./ qpid/
qpid/bin/ qpid/cpp/ qpid/cpp/bindings/qmf2/examples/cpp/
qpid/cpp/bindings/qpid/dotnet/src/ qpid/cpp/bindings/qpid/dotnet/src/msvc10/
qpid/cpp/bindings/qpid/dotnet/src/msvc9/ q...
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java Thu Jan 23 11:01:02 2014
@@ -39,7 +39,6 @@ import javax.transaction.xa.Xid;
public class QueueTest extends AbstractXATestCase
{
- /* this clas logger */
private static final Logger _logger = LoggerFactory.getLogger(QueueTest.class);
/**
@@ -167,7 +166,7 @@ public class QueueTest extends AbstractX
}
catch (JMSException e)
{
- e.printStackTrace();
+ _logger.error("cannot create queue session",e);
fail("cannot create queue session: " + e.getMessage());
}
init(session, _queue);
@@ -197,7 +196,7 @@ public class QueueTest extends AbstractX
}
catch (XAException e)
{
- e.printStackTrace();
+ _logger.error("cannot start the transaction with xid1", e);
fail("cannot start the transaction with xid1: " + e.getMessage());
}
try
@@ -411,14 +410,14 @@ public class QueueTest extends AbstractX
{
if (anInDoubt.equals(xid1))
{
- System.out.println("commit xid1 ");
+ _logger.info("commit xid1 ");
try
{
_xaResource.commit(anInDoubt, false);
}
catch (Exception e)
{
- System.out.println("PB when aborted xid1");
+ _logger.error("PB when aborted xid1", e);
}
}
else
@@ -429,7 +428,7 @@ public class QueueTest extends AbstractX
}
catch (XAException e)
{
- e.printStackTrace();
+ _logger.error("exception thrown when recovering transactions", e);
fail("exception thrown when recovering transactions " + e.getMessage());
}
// the queue should contain the first message!
@@ -607,7 +606,7 @@ public class QueueTest extends AbstractX
}
catch (Exception e)
{
- System.out.println("PB when aborted xid1");
+ _logger.error("PB when aborted xid1", e);
}
}
else if (anInDoubt.equals(xid2))
@@ -619,14 +618,14 @@ public class QueueTest extends AbstractX
}
catch (Exception e)
{
- System.out.println("PB when commiting xid2");
+ _logger.error("PB when commiting xid2", e);
}
}
}
}
catch (XAException e)
{
- e.printStackTrace();
+ _logger.error("exception thrown when recovering transactions", e);
fail("exception thrown when recovering transactions " + e.getMessage());
}
// the queue should be empty
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java Thu Jan 23 11:01:02 2014
@@ -36,7 +36,7 @@ import java.util.concurrent.atomic.Atomi
*/
public class TopicTest extends AbstractXATestCase
{
- /* this clas logger */
+ /* this class logger */
private static final Logger _logger = LoggerFactory.getLogger(TopicTest.class);
/**
@@ -163,7 +163,7 @@ public class TopicTest extends AbstractX
}
catch (JMSException e)
{
- e.printStackTrace(); //To change body of catch statement use Options | File Templates.
+ _logger.error("Error creating topic session", e);
}
init(_session, _topic);
}
@@ -199,7 +199,7 @@ public class TopicTest extends AbstractX
}
catch (XAException e)
{
- e.printStackTrace();
+ _logger.error("cannot start the transaction with xid1", e);
fail("cannot start the transaction with xid1: " + e.getMessage());
}
try
@@ -384,7 +384,7 @@ public class TopicTest extends AbstractX
}
catch (Exception e)
{
- e.printStackTrace();
+ _logger.error("Exception when working with xid1", e);
fail("Exception when working with xid1: " + e.getMessage());
}
try
@@ -426,7 +426,7 @@ public class TopicTest extends AbstractX
}
catch (Exception e)
{
- e.printStackTrace();
+ _logger.error("Exception when working with xid2", e);
fail("Exception when working with xid2: " + e.getMessage());
}
try
@@ -453,7 +453,7 @@ public class TopicTest extends AbstractX
}
catch (Exception e)
{
- e.printStackTrace();
+ _logger.error("Exception when working with xid3", e);
fail("Exception when working with xid3: " + e.getMessage());
}
try
@@ -472,13 +472,13 @@ public class TopicTest extends AbstractX
}
catch (Exception e)
{
- e.printStackTrace();
+ _logger.error("Exception when working with xid4", e);
fail("Exception when working with xid4: " + e.getMessage());
}
}
catch (Exception e)
{
- e.printStackTrace();
+ _logger.error("problem when creating dur sub", e);
fail("problem when creating dur sub: " + e.getMessage());
}
finally
@@ -489,7 +489,7 @@ public class TopicTest extends AbstractX
}
catch (JMSException e)
{
- e.printStackTrace();
+ _logger.error("problem when unsubscribing dur sub", e);
fail("problem when unsubscribing dur sub: " + e.getMessage());
}
}
@@ -537,7 +537,7 @@ public class TopicTest extends AbstractX
}
catch (JMSException e)
{
- e.printStackTrace();
+ _logger.error("Exception thrown when producing messages", e);
fail("Exception thrown when producing messages: " + e.getMessage());
}
@@ -595,7 +595,7 @@ public class TopicTest extends AbstractX
}
catch (Exception e)
{
- e.printStackTrace();
+ _logger.error("Exception thrown when consumming 6 first messages", e);
fail("Exception thrown when consumming 6 first messages: " + e.getMessage());
}
try
@@ -626,7 +626,7 @@ public class TopicTest extends AbstractX
}
catch (Exception e)
{
- e.printStackTrace();
+ _logger.error("Exception thrown when consumming message: 3, 4 and 7", e);
fail("Exception thrown when consumming message: 3, 4 and 7: " + e.getMessage());
}
@@ -641,7 +641,7 @@ public class TopicTest extends AbstractX
}
catch (XAException e)
{
- e.printStackTrace();
+ _logger.error("XAException thrown when committing tx3 or aborting tx1", e);
fail("XAException thrown when committing tx3 or aborting tx1: " + e.getMessage());
}
@@ -676,7 +676,7 @@ public class TopicTest extends AbstractX
}
catch (Exception e)
{
- e.printStackTrace();
+ _logger.error("Exception thrown in last phase", e);
fail("Exception thrown in last phase: " + e.getMessage());
}
// now the topic should be empty!!
@@ -697,13 +697,13 @@ public class TopicTest extends AbstractX
}
catch (Exception e)
{
- e.printStackTrace();
+ _logger.error("Exception when working with xid6", e);
fail("Exception when working with xid6: " + e.getMessage());
}
}
catch (Exception e)
{
- e.printStackTrace();
+ _logger.error("problem when creating dur sub", e);
fail("problem when creating dur sub: " + e.getMessage());
}
finally
@@ -714,7 +714,7 @@ public class TopicTest extends AbstractX
}
catch (JMSException e)
{
- e.printStackTrace();
+ _logger.error("problem when unsubscribing dur sub", e);
fail("problem when unsubscribing dur sub: " + e.getMessage());
}
}
@@ -769,7 +769,7 @@ public class TopicTest extends AbstractX
}
catch (JMSException e)
{
- e.printStackTrace();
+ _logger.error("Exception thrown when producing messages", e);
fail("Exception thrown when producing messages: " + e.getMessage());
}
try
@@ -830,7 +830,7 @@ public class TopicTest extends AbstractX
}
catch (Exception e)
{
- e.printStackTrace();
+ _logger.error("Exception thrown when consumming 6 first messages", e);
fail("Exception thrown when consumming 6 first messages: " + e.getMessage());
}
/////// stop the broker now !!
@@ -862,7 +862,7 @@ public class TopicTest extends AbstractX
}
catch (XAException e)
{
- e.printStackTrace();
+ _logger.error("exception thrown when recovering transactions", e);
fail("exception thrown when recovering transactions " + e.getMessage());
}
try
@@ -929,7 +929,7 @@ public class TopicTest extends AbstractX
}
catch (Exception e)
{
- e.printStackTrace();
+ _logger.error("Exception thrown when consumming message: 3, 4 and 7", e);
fail("Exception thrown when consumming message: 3, 4 and 7: " + e.getMessage());
}
@@ -944,7 +944,7 @@ public class TopicTest extends AbstractX
}
catch (XAException e)
{
- e.printStackTrace();
+ _logger.error("XAException thrown when committing tx3 or aborting tx1", e);
fail("XAException thrown when committing tx3 or aborting tx1: " + e.getMessage());
}
@@ -1024,7 +1024,7 @@ public class TopicTest extends AbstractX
}
catch (Exception e)
{
- e.printStackTrace();
+ _logger.error("Exception thrown in last phase", e);
fail("Exception thrown in last phase: " + e.getMessage());
}
// now the topic should be empty!!
@@ -1045,13 +1045,13 @@ public class TopicTest extends AbstractX
}
catch (Exception e)
{
- e.printStackTrace();
+ _logger.error("Exception when working with xid6", e);
fail("Exception when working with xid6: " + e.getMessage());
}
}
catch (Exception e)
{
- e.printStackTrace();
+ _logger.error("problem when creating dur sub", e);
fail("problem when creating dur sub: " + e.getMessage());
}
finally
@@ -1062,7 +1062,7 @@ public class TopicTest extends AbstractX
}
catch (JMSException e)
{
- e.printStackTrace();
+ _logger.error("problem when unsubscribing dur sub", e);
fail("problem when unsubscribing dur sub: " + e.getMessage());
}
}
@@ -1108,7 +1108,7 @@ public class TopicTest extends AbstractX
}
catch (Exception e)
{
- e.printStackTrace();
+ _logger.error("Exception when working with xid1", e);
fail("Exception when working with xid1: " + e.getMessage());
}
try
@@ -1134,7 +1134,7 @@ public class TopicTest extends AbstractX
}
catch (Exception e)
{
- e.printStackTrace();
+ _logger.error("Exception when working with xid2", e);
fail("Exception when working with xid2: " + e.getMessage());
}
@@ -1171,26 +1171,26 @@ public class TopicTest extends AbstractX
{
if (anInDoubt.equals(xid2))
{
- System.out.println("aborting xid2 ");
+ _logger.info("aborting xid2 ");
try
{
_xaResource.rollback(anInDoubt);
}
catch (Exception e)
{
- e.printStackTrace();
+ _logger.error("exception when aborting xid2 ", e);
fail("exception when aborting xid2 ");
}
}
else
{
- System.out.println("XID2 is not in doubt ");
+ _logger.info("XID2 is not in doubt ");
}
}
}
catch (XAException e)
{
- e.printStackTrace();
+ _logger.error("exception thrown when recovering transactions", e);
fail("exception thrown when recovering transactions " + e.getMessage());
}
@@ -1218,7 +1218,7 @@ public class TopicTest extends AbstractX
}
catch (Exception e)
{
- e.printStackTrace();
+ _logger.error("Exception when working with xid3", e);
fail("Exception when working with xid3: " + e.getMessage());
}
try
@@ -1238,13 +1238,13 @@ public class TopicTest extends AbstractX
}
catch (Exception e)
{
- e.printStackTrace();
+ _logger.error("Exception when working with xid4", e);
fail("Exception when working with xid4: " + e.getMessage());
}
}
catch (Exception e)
{
- e.printStackTrace();
+ _logger.error("problem when creating dur sub", e);
fail("problem when creating dur sub: " + e.getMessage());
}
finally
@@ -1255,7 +1255,7 @@ public class TopicTest extends AbstractX
}
catch (JMSException e)
{
- e.printStackTrace();
+ _logger.error("problem when unsubscribing dur sub", e);
fail("problem when unsubscribing dur sub: " + e.getMessage());
}
}
@@ -1356,8 +1356,7 @@ public class TopicTest extends AbstractX
}
catch (Exception e)
{
- _logger.debug("PB when aborted xid1");
- e.printStackTrace();
+ _logger.error("PB when aborted xid1");
fail("exception when committing xid1 ");
}
}
@@ -1369,7 +1368,7 @@ public class TopicTest extends AbstractX
}
catch (XAException e)
{
- e.printStackTrace();
+ _logger.error("exception thrown when recovering transactions ", e);
fail("exception thrown when recovering transactions " + e.getMessage());
}
_logger.debug("the topic should not be empty");
@@ -1381,13 +1380,13 @@ public class TopicTest extends AbstractX
}
catch (Exception e)
{
- e.printStackTrace();
+ _logger.error("Exception thrown when testin that queue test is empty", e);
fail("Exception thrown when testin that queue test is empty: " + e.getMessage());
}
}
catch (JMSException e)
{
- e.printStackTrace();
+ _logger.error("cannot create dummy durable subscriber", e);
fail("cannot create dummy durable subscriber: " + e.getMessage());
}
finally
@@ -1469,7 +1468,7 @@ public class TopicTest extends AbstractX
}
else if (message.getLongProperty(_sequenceNumberPropertyName) != 2)
{
- System.out.println("wrong sequence number, 2 expected, received: " + message
+ _logger.info("wrong sequence number, 2 expected, received: " + message
.getLongProperty(_sequenceNumberPropertyName));
}
_xaResource.end(xid1, XAResource.TMSUCCESS);
@@ -1491,7 +1490,7 @@ public class TopicTest extends AbstractX
}
else if (message.getLongProperty(_sequenceNumberPropertyName) != 2)
{
- System.out.println("wrong sequence number, 2 expected, received: " + message
+ _logger.info("wrong sequence number, 2 expected, received: " + message
.getLongProperty(_sequenceNumberPropertyName));
}
// consume the third message with that xa durable subscriber
@@ -1502,7 +1501,7 @@ public class TopicTest extends AbstractX
}
else if (message.getLongProperty(_sequenceNumberPropertyName) != 3)
{
- System.out.println("wrong sequence number, 3 expected, received: " + message
+ _logger.info("wrong sequence number, 3 expected, received: " + message
.getLongProperty(_sequenceNumberPropertyName));
}
stSession.commit();
@@ -1565,11 +1564,11 @@ public class TopicTest extends AbstractX
message = (TextMessage) durSub.receive(1000);
if (message == null)
{
- System.out.println("no message received ");
+ _logger.info("no message received ");
}
else if (message.getLongProperty(_sequenceNumberPropertyName) != i)
{
- System.out.println("wrong sequence number, " + i + " expected, received: " + message
+ _logger.info("wrong sequence number, " + i + " expected, received: " + message
.getLongProperty(_sequenceNumberPropertyName));
}
}
@@ -1639,7 +1638,7 @@ public class TopicTest extends AbstractX
}
catch (Exception e)
{
- e.printStackTrace();
+ _logger.error("Exception thrown", e);
fail("Exception thrown: " + e.getMessage());
}
finally
@@ -1710,7 +1709,7 @@ public class TopicTest extends AbstractX
}
catch (JMSException e)
{
- e.printStackTrace();
+ _logger.error("Error getting long property: " + TopicTest._sequenceNumberPropertyName , e);
TopicTest.failure();
_lock.set(false);
synchronized (_lock)
@@ -1720,7 +1719,7 @@ public class TopicTest extends AbstractX
}
if (seq != _counter)
{
- System.out.println("received message " + seq + " expected " + _counter);
+ _logger.info("received message " + seq + " expected " + _counter);
TopicTest.failure();
_lock.set(false);
synchronized (_lock)
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java Thu Jan 23 11:01:02 2014
@@ -21,8 +21,6 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintStream;
-import java.net.URI;
-import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -31,6 +29,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
+
import javax.jms.BytesMessage;
import javax.jms.Connection;
import javax.jms.Destination;
@@ -48,6 +47,7 @@ import javax.jms.Topic;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.XMLConfiguration;
import org.apache.commons.lang.StringUtils;
@@ -72,6 +72,7 @@ import org.apache.qpid.server.store.Mess
import org.apache.qpid.server.store.MessageStoreCreator;
import org.apache.qpid.url.URLSyntaxException;
import org.apache.qpid.util.FileUtils;
+import org.apache.qpid.util.SystemUtils;
/**
* Qpid base class for system testing test cases.
@@ -131,6 +132,7 @@ public class QpidBrokerTestCase extends
private static final String BROKER_LANGUAGE = "broker.language";
protected static final String BROKER_TYPE = "broker.type";
private static final String BROKER_COMMAND = "broker.command";
+ private static final String BROKER_COMMAND_PLATFORM = "broker.command." + SystemUtils.getOSConfigSuffix();
private static final String BROKER_CLEAN_BETWEEN_TESTS = "broker.clean.between.tests";
private static final String BROKER_VERSION = "broker.version";
protected static final String BROKER_READY = "broker.ready";
@@ -158,13 +160,13 @@ public class QpidBrokerTestCase extends
public static final int FAILING_PORT = Integer.parseInt(System.getProperty("test.port.alt"));
public static final int DEFAULT_MANAGEMENT_PORT = Integer.getInteger("test.mport", DEFAULT_JMXPORT_REGISTRYSERVER);
public static final int DEFAULT_SSL_PORT = Integer.getInteger("test.port.ssl", DEFAULT_SSL_PORT_VALUE);
- public static final String OS_NAME = System.getProperty("os.name");
- public static final boolean IS_OS_WINDOWS = String.valueOf(OS_NAME).toLowerCase().contains("windows");
protected String _brokerLanguage = System.getProperty(BROKER_LANGUAGE, JAVA);
protected BrokerType _brokerType = BrokerType.valueOf(System.getProperty(BROKER_TYPE, "").toUpperCase());
- protected BrokerCommandHelper _brokerCommandHelper = new BrokerCommandHelper(System.getProperty(BROKER_COMMAND));
+ private static final String BROKER_COMMAND_TEMPLATE = System.getProperty(BROKER_COMMAND_PLATFORM, System.getProperty(BROKER_COMMAND));
+ protected BrokerCommandHelper _brokerCommandHelper = new BrokerCommandHelper(BROKER_COMMAND_TEMPLATE);
+
private Boolean _brokerCleanBetweenTests = Boolean.getBoolean(BROKER_CLEAN_BETWEEN_TESTS);
private final AmqpProtocolVersion _brokerVersion = AmqpProtocolVersion.valueOf(System.getProperty(BROKER_VERSION, ""));
protected String _output = System.getProperty(TEST_OUTPUT, System.getProperty("java.io.tmpdir"));
@@ -253,8 +255,6 @@ public class QpidBrokerTestCase extends
private void initialiseLogConfigFile()
{
- _logger.info("About to initialise log config file from system property: " + LOG4J_CONFIG_FILE_PATH);
-
_logConfigFile = new File(LOG4J_CONFIG_FILE_PATH);
if(!_logConfigFile.exists())
{
@@ -499,8 +499,21 @@ public class QpidBrokerTestCase extends
String qpidHome = System.getProperty(QPID_HOME);
processEnv.put(QPID_HOME, qpidHome);
//Augment Path with bin directory in QPID_HOME.
- processEnv.put("PATH", processEnv.get("PATH").concat(File.pathSeparator + qpidHome + "/bin"));
+ boolean foundPath = false;
+ final String pathEntry = qpidHome + File.separator + "bin";
+ for(Map.Entry<String,String> entry : processEnv.entrySet())
+ {
+ if(entry.getKey().equalsIgnoreCase("path"))
+ {
+ entry.setValue(entry.getValue().concat(File.pathSeparator + pathEntry));
+ foundPath = true;
+ }
+ }
+ if(!foundPath)
+ {
+ processEnv.put("PATH", pathEntry);
+ }
//Add the test name to the broker run.
// DON'T change PNAME, qpid.stop needs this value.
processEnv.put("QPID_PNAME", "-DPNAME=QPBRKR -DTNAME=\"" + getTestName() + "\"");
@@ -565,8 +578,14 @@ public class QpidBrokerTestCase extends
_interleaveBrokerLog ? _brokerLogPrefix : null);
p.start();
+ StringBuilder cmdLine = new StringBuilder(cmd[0]);
+ for(int i = 1; i< cmd.length; i++)
+ {
+ cmdLine.append(' ');
+ cmdLine.append(cmd[i]);
+ }
- SpawnedBrokerHolder holder = new SpawnedBrokerHolder(process, qpidWork, portsUsedByBroker);
+ SpawnedBrokerHolder holder = new SpawnedBrokerHolder(process, qpidWork, portsUsedByBroker, cmdLine.toString());
if (!p.await(30, TimeUnit.SECONDS))
{
_logger.info("broker failed to become ready (" + p.getReady() + "):" + p.getStopLine());
@@ -639,7 +658,16 @@ public class QpidBrokerTestCase extends
private String relativeToQpidHome(String file)
{
- return file.replace(System.getProperty(QPID_HOME,"QPID_HOME") + File.separator,"");
+ _logger.debug("Converting path to be relative to QPID_HOME: " + file);
+
+ final String qpidHome = System.getProperty(QPID_HOME,"QPID_HOME");
+ _logger.debug("QPID_HOME is: " + qpidHome);
+
+ if(!file.startsWith(qpidHome)) {
+ throw new RuntimeException("Provided path is not a child of the QPID_HOME directory: " + qpidHome);
+ }
+
+ return file.replace(qpidHome + File.separator,"");
}
protected String getPathRelativeToWorkingDirectory(String file)
@@ -653,7 +681,7 @@ public class QpidBrokerTestCase extends
{
String configPath = configLocation.getAbsolutePath();
String workingDirectoryPath = workingDirectory.getCanonicalPath();
- if (IS_OS_WINDOWS)
+ if (SystemUtils.isWindows())
{
configPath = configPath.toLowerCase();
workingDirectoryPath = workingDirectoryPath.toLowerCase();
Propchange: qpid/branches/java-broker-bdb-ha/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:r1558037-1560619
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java Thu Jan 23 11:01:02 2014
@@ -20,24 +20,32 @@
*/
package org.apache.qpid.test.utils;
+import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.Set;
import org.apache.log4j.Logger;
+import org.apache.qpid.util.SystemUtils;
public class SpawnedBrokerHolder implements BrokerHolder
{
private static final Logger LOGGER = Logger.getLogger(SpawnedBrokerHolder.class);
- private final boolean _isWindows = String.valueOf(System.getProperty("os.name")).toLowerCase().contains("windows");
private final Process _process;
private final Integer _pid;
private final String _workingDirectory;
private Set<Integer> _portsUsedByBroker;
+ private final String _brokerCommand;
- public SpawnedBrokerHolder(final Process process, final String workingDirectory, Set<Integer> portsUsedByBroker)
+ public SpawnedBrokerHolder(final Process process, final String workingDirectory, Set<Integer> portsUsedByBroker,
+ String brokerCmd)
{
if(process == null)
{
@@ -48,6 +56,7 @@ public class SpawnedBrokerHolder impleme
_pid = retrieveUnixPidIfPossible();
_workingDirectory = workingDirectory;
_portsUsedByBroker = portsUsedByBroker;
+ _brokerCommand = brokerCmd;
}
@Override
@@ -58,6 +67,11 @@ public class SpawnedBrokerHolder impleme
public void shutdown()
{
+ if(SystemUtils.isWindows())
+ {
+ doWindowsKill();
+ }
+
LOGGER.info("Destroying broker process");
_process.destroy();
@@ -66,12 +80,85 @@ public class SpawnedBrokerHolder impleme
waitUntilPortsAreFree();
}
+ private void doWindowsKill()
+ {
+ try
+ {
+ Process p = Runtime.getRuntime().exec(new String[] {"wmic", "process", "list"});
+ BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
+ String line;
+ String headers = reader.readLine();
+ int processIdOffset = headers.indexOf(" ProcessId") + 1;
+ int parentProcessIdOffset = headers.indexOf(" ParentProcessId") + 1;
+ String parentProcess = null;
+ Map<String,List<String>> parentProcessMap = new HashMap<String, List<String>>();
+
+ while ((line = reader.readLine()) != null)
+ {
+ if(line.length() > processIdOffset)
+ {
+ String processIdStr = line.substring(processIdOffset);
+ processIdStr = processIdStr.substring(0, processIdStr.indexOf(' '));
+ processIdStr.trim();
+
+ String parentProcessIdStr = line.substring(parentProcessIdOffset);
+ parentProcessIdStr = parentProcessIdStr.substring(0, parentProcessIdStr.indexOf(' '));
+ parentProcessIdStr.trim();
+ if(parentProcessIdStr.length() > 0 && (parentProcess == null || parentProcess.equals(parentProcessIdStr)))
+ {
+ List<String> children = parentProcessMap.get(parentProcessIdStr);
+ if(children == null)
+ {
+ children = new ArrayList<String>();
+ parentProcessMap.put(parentProcessIdStr,children);
+ }
+ children.add(processIdStr);
+ }
+ if(line.substring(0,_brokerCommand.length()+7).toLowerCase().contains(_brokerCommand.toLowerCase()))
+ {
+ parentProcess = processIdStr;
+ }
+
+ }
+ if(parentProcess != null)
+ {
+ List<String> children = parentProcessMap.get(parentProcess);
+ if(children != null)
+ {
+ for(String child : children)
+ {
+ p = Runtime.getRuntime().exec(new String[] {"taskkill", "/PID", child, "/T", "/F"});
+ reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
+ while((line = reader.readLine()) != null)
+ {
+ }
+ }
+ }
+ p = Runtime.getRuntime().exec(new String[] {"taskkill", "/PID", parentProcess, "/T", "/F"});
+ reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
+ while((line = reader.readLine()) != null)
+ {
+ }
+ }
+
+ }
+ }
+ catch (IOException e)
+ {
+ LOGGER.error("Error whilst killing process " + _brokerCommand, e);
+ }
+ }
+
@Override
public void kill()
{
if (_pid == null)
{
- LOGGER.info("Destroying broker process");
+ if(SystemUtils.isWindows())
+ {
+ doWindowsKill();
+ }
+ LOGGER.info("Destroying broker process (no PID)");
_process.destroy();
}
else
@@ -113,7 +200,7 @@ public class SpawnedBrokerHolder impleme
private Integer retrieveUnixPidIfPossible()
{
- if(!_isWindows)
+ if(!SystemUtils.isWindows())
{
try
{
Propchange: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles:r1558037-1560619
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/Java010Excludes
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/Java010Excludes?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/Java010Excludes (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/Java010Excludes Thu Jan 23 11:01:02 2014
@@ -67,9 +67,5 @@ org.apache.qpid.client.failover.AddressB
// QPID-3604: Immediate Prefetch no longer supported by 0-10
org.apache.qpid.client.AsynchMessageListenerTest#testImmediatePrefetchWithMessageListener
-// QPID-2796 : Java 0-10 client only sends heartbeats in response to heartbeats from the server, not timeout based
-org.apache.qpid.client.HeartbeatTest#testUnidirectionalHeartbeating
-org.apache.qpid.client.HeartbeatTest#testHeartbeatsEnabledBrokerSide
-
// Java 0-10 client does not support re-binding the queue to the same exchange
org.apache.qpid.server.queue.QueueBindTest#testQueueCanBeReboundOnTopicExchange
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile Thu Jan 23 11:01:02 2014
@@ -19,7 +19,8 @@
broker.language=java
broker.type=spawned
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile Thu Jan 23 11:01:02 2014
@@ -19,7 +19,8 @@
broker.language=java
broker.type=spawned
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1,AMQP_0_9
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile Thu Jan 23 11:01:02 2014
@@ -19,7 +19,8 @@
broker.language=java
broker.type=spawned
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10
Propchange: qpid/branches/java-broker-bdb-ha/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:r1558037-1560619
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile Thu Jan 23 11:01:02 2014
@@ -19,7 +19,8 @@
broker.language=java
broker.type=spawned
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb.0-10.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb.0-10.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb.0-10.testprofile Thu Jan 23 11:01:02 2014
@@ -20,7 +20,8 @@
broker.language=java
broker.type=internal
#broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb.0-8.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb.0-8.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb.0-8.testprofile Thu Jan 23 11:01:02 2014
@@ -20,7 +20,8 @@
broker.language=java
broker.type=internal
#broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1,AMQP_0_9
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb.0-9-1.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb.0-9-1.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb.0-9-1.testprofile Thu Jan 23 11:01:02 2014
@@ -20,7 +20,8 @@
broker.language=java
broker.type=internal
#broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10
Propchange: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile:r1558037-1560619
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb.0-9.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb.0-9.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb.0-9.testprofile Thu Jan 23 11:01:02 2014
@@ -20,7 +20,8 @@
broker.language=java
broker.type=internal
#broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-mem.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-mem.0-10.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-mem.0-10.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-mem.0-10.testprofile Thu Jan 23 11:01:02 2014
@@ -20,7 +20,8 @@ broker.language=java
broker.version=v0_10
broker.type=internal
#broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-mem.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-mem.0-8.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-mem.0-8.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-mem.0-8.testprofile Thu Jan 23 11:01:02 2014
@@ -20,7 +20,8 @@ broker.version=v0_8
broker.language=java
broker.type=internal
#broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1,AMQP_0_9
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-mem.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-mem.0-9-1.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-mem.0-9-1.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-mem.0-9-1.testprofile Thu Jan 23 11:01:02 2014
@@ -20,7 +20,8 @@ broker.version=v0_9_1
broker.language=java
broker.type=internal
#broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-mem.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-mem.0-9.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-mem.0-9.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-mem.0-9.testprofile Thu Jan 23 11:01:02 2014
@@ -20,7 +20,8 @@ broker.version=v0_9
broker.language=java
broker.type=internal
#broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile Thu Jan 23 11:01:02 2014
@@ -19,7 +19,8 @@
broker.language=java
broker.version=v0_10
broker.type=spawned
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile Thu Jan 23 11:01:02 2014
@@ -19,7 +19,8 @@
broker.version=v0_8
broker.language=java
broker.type=spawned
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1,AMQP_0_9
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile Thu Jan 23 11:01:02 2014
@@ -19,7 +19,8 @@
broker.version=v0_9_1
broker.language=java
broker.type=spawned
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10
Propchange: qpid/branches/java-broker-bdb-ha/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:r1558037-1560619
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile Thu Jan 23 11:01:02 2014
@@ -19,7 +19,8 @@
broker.version=v0_9
broker.language=java
broker.type=spawned
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby.0-10.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby.0-10.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby.0-10.testprofile Thu Jan 23 11:01:02 2014
@@ -20,7 +20,8 @@ broker.language=java
broker.version=v0_10
broker.type=internal
#broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby.0-8.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby.0-8.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby.0-8.testprofile Thu Jan 23 11:01:02 2014
@@ -20,7 +20,8 @@ broker.version=v0_8
broker.language=java
broker.type=internal
#broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1,AMQP_0_9
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby.0-9-1.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby.0-9-1.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby.0-9-1.testprofile Thu Jan 23 11:01:02 2014
@@ -20,7 +20,8 @@ broker.version=v0_9_1
broker.language=java
broker.type=internal
#broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10
Propchange: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile:r1558037-1560619
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby.0-9.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby.0-9.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby.0-9.testprofile Thu Jan 23 11:01:02 2014
@@ -20,7 +20,8 @@ broker.version=v0_9
broker.language=java
broker.type=internal
#broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile Thu Jan 23 11:01:02 2014
@@ -19,7 +19,8 @@
broker.version=v0_10
broker.language=java
broker.type=spawned
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0
Propchange: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile:r1558037-1560619
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile Thu Jan 23 11:01:02 2014
@@ -19,7 +19,8 @@
broker.version=v0_8
broker.language=java
broker.type=spawned
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1,AMQP_0_9
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile Thu Jan 23 11:01:02 2014
@@ -19,7 +19,8 @@
broker.version=v0_9_1
broker.language=java
broker.type=spawned
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10
Propchange: qpid/branches/java-broker-bdb-ha/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:r1558037-1560619
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile Thu Jan 23 11:01:02 2014
@@ -19,7 +19,8 @@
broker.version=v0_9
broker.language=java
broker.type=spawned
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms.0-10.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms.0-10.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms.0-10.testprofile Thu Jan 23 11:01:02 2014
@@ -20,7 +20,8 @@ broker.language=java
broker.version=v0_10
broker.type=internal
#broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms.0-8.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms.0-8.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms.0-8.testprofile Thu Jan 23 11:01:02 2014
@@ -20,7 +20,8 @@ broker.language=java
broker.version=v0_8
broker.type=internal
#broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1,AMQP_0_9
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms.0-9-1.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms.0-9-1.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms.0-9-1.testprofile Thu Jan 23 11:01:02 2014
@@ -20,7 +20,8 @@ broker.language=java
broker.version=v0_9_1
broker.type=internal
#broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10
Propchange: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile:r1558037-1560619
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms.0-9.testprofile?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms.0-9.testprofile (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms.0-9.testprofile Thu Jan 23 11:01:02 2014
@@ -20,7 +20,8 @@ broker.language=java
broker.version=v0_9
broker.type=internal
#broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command=build${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
+broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/tools/pom.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/tools/pom.xml?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/tools/pom.xml (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/tools/pom.xml Thu Jan 23 11:01:02 2014
@@ -34,18 +34,25 @@
</dependency>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j-version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j-version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
<version>1.0</version>
<scope>compile</scope>
</dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
<build>
Propchange: qpid/branches/java-broker-bdb-ha/qpid/python/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/python:r1558037-1560619
Modified: qpid/branches/java-broker-bdb-ha/qpid/python/qpid/compat.py
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/python/qpid/compat.py?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/python/qpid/compat.py (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/python/qpid/compat.py Thu Jan 23 11:01:02 2014
@@ -18,6 +18,8 @@
#
import sys
+import errno
+import time
try:
set = set
@@ -42,6 +44,7 @@ if tuple(sys.version_info[0:2]) < (2, 4)
return old_select(list(rlist), list(wlist), list(xlist), timeout)
else:
from select import select
+ from select import error as SelectError
class BaseWaiter:
@@ -49,8 +52,18 @@ class BaseWaiter:
self._do_write()
def wait(self, timeout=None):
+ start = time.time()
if timeout is not None:
- ready, _, _ = select([self], [], [], timeout)
+ while True:
+ try:
+ ready, _, _ = select([self], [], [], timeout)
+ break
+ except SelectError, e:
+ if e[0] == errno.EINTR:
+ elapsed = time.time() - start
+ timeout = timeout - elapsed
+ else:
+ raise e
else:
ready = True
Modified: qpid/branches/java-broker-bdb-ha/qpid/tests/src/py/qpid_tests/broker_0_10/new_api.py
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/tests/src/py/qpid_tests/broker_0_10/new_api.py?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/tests/src/py/qpid_tests/broker_0_10/new_api.py (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/tests/src/py/qpid_tests/broker_0_10/new_api.py Thu Jan 23 11:01:02 2014
@@ -123,6 +123,25 @@ class GeneralTests(Base):
sess4.close()
+ def test_next_receiver(self):
+ keys = ["a", "b", "c"]
+ receivers = [self.ssn.receiver("amq.direct/%s" % k) for k in keys]
+ for r in receivers:
+ r.capacity = 10
+
+ snd = self.ssn.sender("amq.direct")
+
+ for k in keys:
+ snd.send(Message(subject=k, content=k))
+
+ expected = keys
+ while len(expected):
+ rcv = self.ssn.next_receiver(timeout=self.delay())
+ c = rcv.fetch().content
+ assert c in expected
+ expected.remove(c)
+ self.ssn.acknowledge()
+
class SequenceNumberTests(Base):
"""
Tests of ring queue sequence number
Modified: qpid/branches/java-broker-bdb-ha/qpid/tools/src/py/qls/jrnl.py
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/tools/src/py/qls/jrnl.py?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/tools/src/py/qls/jrnl.py (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/tools/src/py/qls/jrnl.py Thu Jan 23 11:01:02 2014
@@ -248,9 +248,10 @@ class Journal(object):
self.directory = directory
self.queue_name = os.path.basename(directory)
self.files = {}
+ self.file_num_list = None
+ self.file_num_itr = None
self.enq_map = EnqueueMap(self)
self.txn_map = TransactionMap(self.enq_map)
- self.file_itr = None
self.current_file_header = None
self.first_rec_flag = None
self.statistics = Journal.JournalStatistics()
@@ -288,7 +289,8 @@ class Journal(object):
print self.txn_map.report_str(True, True)
print 'file_num p_no efp journal_file'
print '-------- ---- ----- ------------'
- for file_num, file_hdr in self.files.iteritems():
+ for file_num in sorted(self.files.keys()):
+ file_hdr = self.files[file_num]
comment = '<uninitialized>' if file_hdr.file_num == 0 else ''
print '%8d %4d %4dk %s %s' % (file_num, file_hdr.partition_num, file_hdr.efp_data_size_kb,
os.path.basename(file_hdr.file_handle.name), comment)
@@ -308,7 +310,8 @@ class Journal(object):
file_hdr.load(file_handle)
Utils.skip(file_handle, file_hdr.file_header_size_sblks * Utils.SBLK_SIZE)
self.files[file_hdr.file_num] = file_hdr
- self.file_itr = iter(self.files)
+ self.file_num_list = sorted(self.files.keys())
+ self.file_num_itr = iter(self.file_num_list)
def _check_file(self):
if not self.current_file_header is None and not self.current_file_header.is_end_of_file():
return
@@ -321,7 +324,7 @@ class Journal(object):
file_num = 0
try:
while file_num == 0:
- file_num = self.file_itr.next()
+ file_num = self.file_num_itr.next()
except StopIteration:
pass
if file_num == 0:
@@ -355,6 +358,7 @@ class Journal(object):
Utils.skip(self.current_file_header.file_handle, Utils.DBLK_SIZE)
return True
def _handle_enqueue_record(self, enqueue_record):
+ start_file_header = self.current_file_header
while enqueue_record.load(self.current_file_header.file_handle):
self._get_next_file()
if enqueue_record.is_external() and enqueue_record.data != None:
@@ -363,12 +367,12 @@ class Journal(object):
self.statistics.transient_record_count += 1
return
if enqueue_record.xid_size > 0:
- self.txn_map.add(self.current_file_header, enqueue_record)
+ self.txn_map.add(start_file_header, enqueue_record)
self.statistics.transaction_operation_count += 1
self.statistics.transaction_record_count += 1
self.statistics.transaction_enqueue_count += 1
else:
- self.enq_map.add(self.current_file_header, enqueue_record, False)
+ self.enq_map.add(start_file_header, enqueue_record, False)
self.statistics.enqueue_count += 1
#print enqueue_record, # DEBUG
def _handle_dequeue_record(self, dequeue_record):
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org