Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java Thu Jul 7 15:16:33 2011 @@ -23,7 +23,6 @@ import org.apache.qpid.client.AMQConnect import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQTopic; -import org.apache.qpid.client.transport.TransportConnection; import org.apache.qpid.exchange.ExchangeDefaults; import org.apache.qpid.test.utils.QpidBrokerTestCase;
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java Thu Jul 7 15:16:33 2011 @@ -20,7 +20,6 @@ */ package org.apache.qpid.test.unit.client; -import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.InputStreamReader; import java.io.LineNumberReader; @@ -37,11 +36,9 @@ import javax.jms.MessageConsumer; import javax.jms.MessageProducer; import javax.jms.QueueSession; import javax.jms.Session; -import javax.jms.TextMessage; import javax.jms.TopicSession; import org.apache.qpid.client.AMQConnection; -import org.apache.qpid.client.AMQConnectionDelegate_0_10; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQTopic; @@ -231,7 +228,8 @@ public class AMQConnectionTest extends Q } MessageConsumer consumerB = null; - if (isBroker08()) + // 0-8, 0-9, 0-9-1 prefetch is per session, not consumer. + if (!isBroker010()) { Session consSessB = _connection.createSession(true, Session.AUTO_ACKNOWLEDGE); consumerB = consSessB.createConsumer(_queue); Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java Thu Jul 7 15:16:33 2011 @@ -24,7 +24,6 @@ import junit.textui.TestRunner; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; -import org.apache.qpid.client.transport.TransportConnection; import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.slf4j.Logger; Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java Thu Jul 7 15:16:33 2011 @@ -25,7 +25,6 @@ import org.apache.qpid.test.utils.QpidBr import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.failover.FailoverException; import org.apache.qpid.client.protocol.AMQProtocolHandler; -import org.apache.qpid.client.transport.TransportConnection; import org.apache.qpid.framing.*; import org.apache.qpid.jms.ConnectionListener; import org.apache.qpid.protocol.AMQConstant; Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java Thu Jul 7 15:16:33 2011 @@ -20,32 +20,30 @@ */ package org.apache.qpid.test.unit.client.connection; +import javax.jms.Connection; +import javax.jms.QueueSession; +import javax.jms.TopicSession; + import org.apache.qpid.AMQConnectionFailureException; import org.apache.qpid.AMQException; import org.apache.qpid.AMQUnresolvedAddressException; -import org.apache.qpid.server.exchange.Exchange; -import org.apache.qpid.test.utils.QpidBrokerTestCase; -import org.apache.qpid.client.AMQAuthenticationException; import org.apache.qpid.client.AMQConnection; +import org.apache.qpid.client.AMQConnectionURL; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQTopic; -import org.apache.qpid.client.AMQConnectionURL; import org.apache.qpid.exchange.ExchangeDefaults; import org.apache.qpid.framing.AMQShortString; -import org.apache.qpid.jms.Session; -import org.apache.qpid.jms.ConnectionURL; import org.apache.qpid.jms.BrokerDetails; - -import javax.jms.Connection; -import javax.jms.QueueSession; -import javax.jms.TopicSession; -import javax.naming.NamingException; +import org.apache.qpid.jms.ConnectionURL; +import org.apache.qpid.jms.Session; +import org.apache.qpid.test.utils.QpidBrokerTestCase; public class ConnectionTest extends QpidBrokerTestCase { - String _broker_NotRunning = "vm://:2"; + String _broker_NotRunning = "tcp://localhost:" + findFreePort(); + String _broker_BadDNS = "tcp://hg3sgaaw4lgihjs"; public void testSimpleConnection() throws Exception Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java Thu Jul 7 15:16:33 2011 @@ -93,11 +93,6 @@ public class AMQProtocolSessionTest exte checkTempQueueName(new InetSocketAddress(InetAddress.getByName("1080:0:0:0:8:800:200C:417A"), 1234), "tmp_1080_0_0_0_8_800_200c_417a_1234_1"); } - public void testTemporaryQueuePipe() throws UnknownHostException - { - checkTempQueueName(new VmPipeAddress(1), "tmp_vm_1_1"); - } - private void checkTempQueueName(SocketAddress address, String queueName) { _testSession.getNetworkConnection().setLocalAddress(address); Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java Thu Jul 7 15:16:33 2011 @@ -50,7 +50,6 @@ public class MessageRequeueTest extends protected final String queue = "direct://amq.direct//message-requeue-test-queue"; protected String payload = "Message:"; - //protected final String BROKER = "vm://:1"; protected final String BROKER = "tcp://127.0.0.1:5672"; private boolean testReception = true; @@ -155,8 +154,8 @@ public class MessageRequeueTest extends _logger.info("consumed: " + messagesReceived); assertEquals("number of consumed messages does not match initial data", (int) numTestMessages, messagesReceived); - // wit 0_10 we can have a delivery tag of 0 - if (conn.isBroker08()) + // with 0_10 we can have a delivery tag of 0 + if (!conn.isBroker010()) { for (long b : messageLog) { @@ -224,7 +223,7 @@ public class MessageRequeueTest extends StringBuilder list = new StringBuilder(); list.append("Failed to receive:"); int failed = 0; - if (conn.isBroker08()) + if (!conn.isBroker010()) { for (long b : receieved) { Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java Thu Jul 7 15:16:33 2011 @@ -52,7 +52,7 @@ public class DurableSubscriberTest exten */ public void testDurSubRestoredAfterNonPersistentMessageSent() throws Exception { - if (isBrokerStorePersistent() || !isBroker08()) + if (isBrokerStorePersistent()) { TopicConnectionFactory factory = getConnectionFactory(); Topic topic = (Topic) getInitialContext().lookup(_topicName); @@ -116,7 +116,7 @@ public class DurableSubscriberTest exten */ public void testDurSubRestoresMessageSelector() throws Exception { - if (isBrokerStorePersistent() || !isBroker08()) + if (isBrokerStorePersistent()) { TopicConnectionFactory factory = getConnectionFactory(); Topic topic = (Topic) getInitialContext().lookup(_topicName); Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java?rev=1143874&r1=1143873&r2=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java Thu Jul 7 15:16:33 2011 @@ -102,7 +102,7 @@ public class TransactionTimeoutTestCase super.setUp(); // Connect to broker - String broker = _brokerType.equals(VM) ? ("vm://:" + DEFAULT_VM_PORT) : ("tcp://localhost:" + DEFAULT_PORT); + String broker = ("tcp://localhost:" + DEFAULT_PORT); ConnectionURL url = new AMQConnectionURL("amqp://guest:guest@clientid/test?brokerlist='" + broker + "'&maxprefetch='1'"); _con = (AMQConnection) getConnection(url); _con.setExceptionListener(this); Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java?rev=1143874&r1=1143873&r2=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java Thu Jul 7 15:16:33 2011 @@ -68,6 +68,14 @@ public class FailoverBaseCase extends Qp return _connectionFactory; } + @Override + public void stopBroker(int port) throws Exception + { + if (isBrokerPresent(port)) + { + super.stopBroker(port); + } + } public void tearDown() throws Exception { Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1143874&r1=1143873&r2=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java Thu Jul 7 15:16:33 2011 @@ -55,10 +55,8 @@ import org.apache.commons.lang.StringUti import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.qpid.AMQException; -import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQConnectionFactory; import org.apache.qpid.client.AMQQueue; -import org.apache.qpid.client.transport.TransportConnection; import org.apache.qpid.exchange.ExchangeDefaults; import org.apache.qpid.jms.BrokerDetails; import org.apache.qpid.jms.ConnectionURL; @@ -67,8 +65,7 @@ import org.apache.qpid.server.Broker; import org.apache.qpid.server.BrokerOptions; import org.apache.qpid.server.ProtocolExclusion; import org.apache.qpid.server.configuration.ServerConfiguration; -import org.apache.qpid.server.registry.ApplicationRegistry; -import org.apache.qpid.server.registry.ConfigurationFileApplicationRegistry; +import org.apache.qpid.server.protocol.AmqpProtocolVersion; import org.apache.qpid.server.store.DerbyMessageStore; import org.apache.qpid.url.URLSyntaxException; import org.apache.qpid.util.FileUtils; @@ -79,6 +76,13 @@ import org.apache.qpid.util.LogMonitor; */ public class QpidBrokerTestCase extends QpidTestCase { + + public enum BrokerType + { + EXTERNAL /** Test case relies on a Broker started independently of the test-suite */, + INTERNAL /** Test case starts an embedded broker within this JVM */, + SPAWNED /** Test case spawns a new broker as a separate process */ + } protected final String QpidHome = System.getProperty("QPID_HOME"); protected File _configFile = new File(System.getProperty("broker.config")); @@ -123,17 +127,12 @@ public class QpidBrokerTestCase extends private static final String BROKER_LOG_INTERLEAVE = "broker.log.interleave"; private static final String BROKER_LOG_PREFIX = "broker.log.prefix"; private static final String BROKER_PERSITENT = "broker.persistent"; - private static final String BROKER_PROTOCOL_EXCLUDES = "broker.protocols.excludes"; + private static final String BROKER_PROTOCOL_EXCLUDES = "broker.protocol.excludes"; // values protected static final String JAVA = "java"; protected static final String CPP = "cpp"; - protected static final String VM = "vm"; - protected static final String EXTERNAL = "external"; - protected static final String INTERNAL = "internal"; - private static final String VERSION_08 = "0-8"; - private static final String VERSION_010 = "0-10"; protected static final String QPID_HOME = "QPID_HOME"; @@ -144,11 +143,11 @@ public class QpidBrokerTestCase extends public static final int DEFAULT_SSL_PORT = Integer.getInteger("test.sslport", ServerConfiguration.DEFAULT_SSL_PORT); protected String _brokerLanguage = System.getProperty(BROKER_LANGUAGE, JAVA); - protected String _brokerType = System.getProperty(BROKER_TYPE, INTERNAL); + protected BrokerType _brokerType = BrokerType.valueOf(System.getProperty(BROKER_TYPE, "").toUpperCase()); protected String _brokerCommand = System.getProperty(BROKER_COMMAND); private String _brokerClean = System.getProperty(BROKER_CLEAN, null); private Boolean _brokerCleanBetweenTests = Boolean.getBoolean(BROKER_CLEAN_BETWEEN_TESTS); - private String _brokerVersion = System.getProperty(BROKER_VERSION, VERSION_08); + private final AmqpProtocolVersion _brokerVersion = AmqpProtocolVersion.valueOf(System.getProperty(BROKER_VERSION, "")); protected String _output = System.getProperty(TEST_OUTPUT); protected Boolean _brokerPersistent = Boolean.getBoolean(BROKER_PERSITENT); private String _brokerProtocolExcludes = System.getProperty(BROKER_PROTOCOL_EXCLUDES); @@ -407,7 +406,7 @@ public class QpidBrokerTestCase extends } /** - * Return the management portin use by the broker on this main port + * Return the management port in use by the broker on this main port * * @param mainPort the broker's main port. * @@ -415,7 +414,7 @@ public class QpidBrokerTestCase extends */ protected int getManagementPort(int mainPort) { - return mainPort + (DEFAULT_MANAGEMENT_PORT - (_brokerType.equals(VM) ? DEFAULT_VM_PORT : DEFAULT_PORT)); + return mainPort + (DEFAULT_MANAGEMENT_PORT - DEFAULT_PORT); } /** @@ -430,11 +429,7 @@ public class QpidBrokerTestCase extends protected int getPort(int port) { - if (_brokerType.equals(VM)) - { - return port == 0 ? DEFAULT_VM_PORT : port; - } - else if (!_brokerType.equals(EXTERNAL)) + if (!_brokerType.equals(BrokerType.EXTERNAL)) { return port == 0 ? DEFAULT_PORT : port; } @@ -473,34 +468,7 @@ public class QpidBrokerTestCase extends throw new IllegalStateException("There is already an existing broker running on port " + port); } - if (_brokerType.equals(VM)) - { - setConfigurationProperty("management.jmxport", String.valueOf(getManagementPort(port))); - setConfigurationProperty(ServerConfiguration.MGMT_CUSTOM_REGISTRY_SOCKET, String.valueOf(false)); - saveTestConfiguration(); - - // create an in_VM broker - final ConfigurationFileApplicationRegistry registry = new ConfigurationFileApplicationRegistry(_configFile); - try - { - ApplicationRegistry.initialise(registry); - } - catch (Exception e) - { - _logger.error("Broker initialise failed due to:",e); - try - { - registry.close(); - } - catch (Throwable closeE) - { - closeE.printStackTrace(); - } - throw e; - } - TransportConnection.createVMBroker(port); - } - else if (_brokerType.equals(INTERNAL) && !existingInternalBroker()) + if (_brokerType.equals(BrokerType.INTERNAL) && !existingInternalBroker()) { setConfigurationProperty(ServerConfiguration.MGMT_CUSTOM_REGISTRY_SOCKET, String.valueOf(false)); saveTestConfiguration(); @@ -523,7 +491,7 @@ public class QpidBrokerTestCase extends _brokers.put(port, new InternalBrokerHolder(broker)); } - else if (!_brokerType.equals(EXTERNAL)) + else if (!_brokerType.equals(BrokerType.EXTERNAL)) { String cmd = getBrokerCommand(port); _logger.info("starting external broker: " + cmd); @@ -633,11 +601,16 @@ public class QpidBrokerTestCase extends private void addExcludedPorts(int port, BrokerOptions options) { final String protocolExcludesList = _brokerProtocolExcludes.replace("@PORT", "" + port); + + if (protocolExcludesList.equals("")) + { + return; + } final String[] toks = protocolExcludesList.split("\\s"); if(toks.length % 2 != 0) { - throw new IllegalArgumentException("Must be an even number of tokens in " + protocolExcludesList); + throw new IllegalArgumentException("Must be an even number of tokens in '" + protocolExcludesList + "'"); } for (int i = 0; i < toks.length; i=i+2) { @@ -662,13 +635,9 @@ public class QpidBrokerTestCase extends return false; } - private String getQpidWork(String broker, int port) + private String getQpidWork(BrokerType broker, int port) { - if (broker.equals(VM)) - { - return System.getProperty("QPID_WORK"); - } - else if (!broker.equals(EXTERNAL)) + if (!broker.equals(BrokerType.EXTERNAL)) { return System.getProperty("QPID_WORK")+ "/" + port; } @@ -755,17 +724,16 @@ public class QpidBrokerTestCase extends _logger.info("stopping broker: " + getBrokerCommand(port)); BrokerHolder broker = _brokers.remove(port); - if (broker != null) - { - broker.shutdown(); - } - else if (_brokerType.equals(VM)) - { - TransportConnection.killVMBroker(port); - ApplicationRegistry.remove(); - } + broker.shutdown(); } + public boolean isBrokerPresent(int port) throws Exception + { + port = getPort(port); + + return _brokers.containsKey(port); + } + /** * Attempt to set the Java Broker to use the BDBMessageStore for persistence * Falling back to the DerbyMessageStore if @@ -1000,12 +968,12 @@ public class QpidBrokerTestCase extends */ public boolean isBroker08() { - return _brokerVersion.equals(VERSION_08); + return _brokerVersion.equals(AmqpProtocolVersion.v0_8); } public boolean isBroker010() { - return _brokerVersion.equals(VERSION_010); + return _brokerVersion.equals(AmqpProtocolVersion.v0_10); } protected boolean isJavaBroker() @@ -1020,12 +988,12 @@ public class QpidBrokerTestCase extends protected boolean isExternalBroker() { - return !_brokerType.equals("vm"); + return !_brokerType.equals("vm"); //TODO } protected boolean isInternalBroker() { - return _brokerType.equals(INTERNAL); + return _brokerType.equals(BrokerType.INTERNAL); } protected boolean isBrokerStorePersistent() @@ -1099,11 +1067,6 @@ public class QpidBrokerTestCase extends */ public AMQConnectionFactory getConnectionFactory(String factoryName) throws NamingException { - if (_brokerType.equals(VM)) - { - factoryName += ".vm"; - } - return (AMQConnectionFactory) getInitialContext().lookup(factoryName); } @@ -1144,15 +1107,7 @@ public class QpidBrokerTestCase extends public Connection getClientConnection(String username, String password, String id) throws JMSException, URLSyntaxException, AMQException, NamingException { _logger.info("get Connection"); - Connection con; - if (_brokerType.equals(VM)) - { - con = new AMQConnection("vm://:1", username, password, id, "test"); - } - else - { - con = getConnectionFactory().createConnection(username, password, id); - } + Connection con = getConnectionFactory().createConnection(username, password, id); //add the connection in the lis of connections _connections.add(con); return con; @@ -1410,41 +1365,26 @@ public class QpidBrokerTestCase extends */ public void reloadBrokerSecurityConfig() throws Exception { - if (_brokerType.equals(VM)) + JMXTestUtils jmxu = new JMXTestUtils(this, "admin" , "admin"); + jmxu.open(); + + try { - ApplicationRegistry.getInstance().getConfiguration().reparseConfigFileSecuritySections(); + ConfigurationManagement configMBean = jmxu.getConfigurationManagement(); + configMBean.reloadSecurityConfiguration(); } - else + finally { - JMXTestUtils jmxu = new JMXTestUtils(this, "admin" , "admin"); - jmxu.open(); - - try - { - ConfigurationManagement configMBean = jmxu.getConfigurationManagement(); - configMBean.reloadSecurityConfiguration(); - } - finally - { - jmxu.close(); - } - - LogMonitor _monitor = new LogMonitor(_outputFile); - assertTrue("The expected server security configuration reload did not occur", - _monitor.waitForMessage(ServerConfiguration.SECURITY_CONFIG_RELOADED, LOGMONITOR_TIMEOUT)); - + jmxu.close(); } + + LogMonitor _monitor = new LogMonitor(_outputFile); + assertTrue("The expected server security configuration reload did not occur", + _monitor.waitForMessage(ServerConfiguration.SECURITY_CONFIG_RELOADED, LOGMONITOR_TIMEOUT)); } protected int getFailingPort() { - if (_brokerType.equals(VM)) - { - throw new RuntimeException("VM is not supported for Failover testing"); - } - else - { - return FAILING_PORT; - } + return FAILING_PORT; } } Modified: qpid/trunk/qpid/java/test-profiles/CPPExcludes URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/CPPExcludes?rev=1143874&r1=1143873&r2=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/test-profiles/CPPExcludes (original) +++ qpid/trunk/qpid/java/test-profiles/CPPExcludes Thu Jul 7 15:16:33 2011 @@ -173,3 +173,7 @@ org.apache.qpid.test.unit.transacted.Tra // Java broker only org.apache.qpid.server.logging.management.LoggingManagementMBeanTest#* org.apache.qpid.server.management.AMQUserManagementMBeanTest#* + +// QPID-3133: On 0-10, the exception listener is currently not invoked when reconnection fails to occurs. +org.apache.qpid.server.failover.FailoverMethodTest#* + Modified: qpid/trunk/qpid/java/test-profiles/Excludes URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/Excludes?rev=1143874&r1=1143873&r2=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/test-profiles/Excludes (original) +++ qpid/trunk/qpid/java/test-profiles/Excludes Thu Jul 7 15:16:33 2011 @@ -17,7 +17,6 @@ // under the License. // -org.apache.qpid.client.MultipleJCAProviderRegistrationTest#test // QPID-1715, QPID-1715 : Client Error Handling on close is still broken org.apache.qpid.server.queue.QueueCreateTest#testCreatePriorityString org.apache.qpid.server.queue.QueueCreateTest#testCreateFlowToDiskValidNoSize Modified: qpid/trunk/qpid/java/test-profiles/Java010Excludes URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/Java010Excludes?rev=1143874&r1=1143873&r2=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/test-profiles/Java010Excludes (original) +++ qpid/trunk/qpid/java/test-profiles/Java010Excludes Thu Jul 7 15:16:33 2011 @@ -79,3 +79,6 @@ org.apache.qpid.test.unit.client.channel //Should probably raise JIRAs for them. org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testCreateExchange org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testBrowseMode + +// QPID-3133: On 0-10, the exception listener is currently not invoked when reconnection fails to occurs. +org.apache.qpid.server.failover.FailoverMethodTest#* Modified: qpid/trunk/qpid/java/test-profiles/JavaExcludes URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/JavaExcludes?rev=1143874&r1=1143873&r2=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/test-profiles/JavaExcludes (original) +++ qpid/trunk/qpid/java/test-profiles/JavaExcludes Thu Jul 7 15:16:33 2011 @@ -19,13 +19,6 @@ // Those tests are not finished org.apache.qpid.test.testcases.TTLTest#* -org.apache.qpid.test.testcases.FailoverTest#* - -// This is a long running test so should exclude from normal runs -org.apache.qpid.test.client.failover.FailoverTest#test4MinuteFailover - -//QPID-1818 : Client code path does not correctly restore a transacted session after failover. -org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#* // QPID-1823: this takes ages to run org.apache.qpid.client.SessionCreateTest#* @@ -52,3 +45,45 @@ org.apache.qpid.transport.ConnectionTest //QPID-2845: The queue policy types used by the C++ broker are not currently supported by the Java broker org.apache.qpid.test.client.queue.QueuePolicyTest#testRingPolicy org.apache.qpid.test.client.queue.QueuePolicyTest#testRejectPolicy + +/////////////////////////////////////////////////////// +//Moved from JavaStandaloneExcludes when it was removed +/////////////////////////////////////////////////////// + +// This is a long running test so should exclude from normal runs +org.apache.qpid.test.client.failover.FailoverTest#test4MinuteFailover + +// Those tests require failover support +org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverWithQueueBrowser +org.apache.qpid.test.testcases.FailoverTest#* +org.apache.qpid.test.client.failover.FailoverTest#* + +// InVM Broker tests awaiting resolution of QPID-1103 +org.apache.qpid.test.client.timeouts.SyncWaitDelayTest#* +org.apache.qpid.test.client.timeouts.SyncWaitTimeoutDelayTest#* + +// This test currently does not pick up the runtime location of the nonVm queueBacking store. +org.apache.qpid.test.unit.close.FlowToDiskBackingQueueDeleteTest#* + +// This test may use QpidTestCase but it is not using the getConnection and is hardwired to InVM +org.apache.qpid.test.unit.client.connection.CloseAfterConnectionFailureTest#* + +//QPID-1818 : Client code path does not correctly restore a transacted session after failover. +org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#* + +// This test requires the standard configuration file for validation. +// Excluding here does not reduce test coverage. +org.apache.qpid.server.configuration.ServerConfigurationFileTest#* + + Copied: qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes (from r1143870, qpid/trunk/qpid/java/test-profiles/08StandaloneExcludes) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes?p2=qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes&p1=qpid/trunk/qpid/java/test-profiles/08StandaloneExcludes&r1=1143870&r2=1143874&rev=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/test-profiles/08StandaloneExcludes (original) +++ qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes Thu Jul 7 15:16:33 2011 @@ -18,10 +18,10 @@ // //====================================================================== -//Exclude the following from brokers defaulting to the 0-8 protocol +//Exclude the following from brokers using the 0-8/0-9/0-9-1 protocols //====================================================================== -// This test requires a broker capable of 0-8/9 and 0-10 +// This test requires a broker capable of 0-8/0-9/0-9-1 and 0-10 concurrently org.apache.qpid.test.client.message.JMSDestinationTest#testReceiveResend // QPID-2478 test fails when run against broker using 0-8/9 Modified: qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile?rev=1143874&r1=1143873&r2=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile (original) +++ qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile Thu Jul 7 15:16:33 2011 @@ -19,3 +19,5 @@ include=cpp profile.excludes=CPPPrefetchExcludes broker.modules=--load-module ${broker.module.store} +broker.persistent=true + Modified: qpid/trunk/qpid/java/test-profiles/cpp.testprofile URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/cpp.testprofile?rev=1143874&r1=1143873&r2=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/test-profiles/cpp.testprofile (original) +++ qpid/trunk/qpid/java/test-profiles/cpp.testprofile Thu Jul 7 15:16:33 2011 @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. # -broker.version=0-10 +broker.version=v0_10 broker.language=cpp broker.dir=${project.root}/../cpp/src @@ -32,7 +32,8 @@ broker.stopped=Exception constructed broker.modules= broker.args= -broker=${broker.executable} -p @PORT --data-dir ${build.data}/@PORT -t --auth no --no-module-dir ${broker.modules} ${broker.args} +broker.type=spawned +broker.command=${broker.executable} -p @PORT --data-dir ${build.data}/@PORT -t --auth no --no-module-dir ${broker.modules} ${broker.args} profile.excludes=CPPPrefetchExcludes CPPTransientExcludes test.excludes=Excludes CPPExcludes ${profile}.excludes ${profile.excludes} cpp.excludes Copied: qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile (from r1143870, qpid/trunk/qpid/java/test-profiles/java-derby.0.10.testprofile) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile?p2=qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile&p1=qpid/trunk/qpid/java/test-profiles/java-derby.0.10.testprofile&r1=1143870&r2=1143874&rev=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/test-profiles/java-derby.0.10.testprofile (original) +++ qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile Thu Jul 7 15:16:33 2011 @@ -17,13 +17,14 @@ # under the License. # broker.language=java -broker.version=0-10 -broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml +broker.version=v0_10 +broker.type=spawned +broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work broker.ready=BRK-1004 broker.stopped=Exception broker.config=${project.root}/build/etc/config-systests-derby.xml messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore -profile.excludes=JavaStandaloneExcludes JavaPersistentExcludes Java010Excludes +profile.excludes=JavaPersistentExcludes Java010Excludes broker.clean.between.tests=true broker.persistent=true Copied: qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile (from r1143870, qpid/trunk/qpid/java/test-profiles/java-derby.testprofile) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile?p2=qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile&p1=qpid/trunk/qpid/java/test-profiles/java-derby.testprofile&r1=1143870&r2=1143874&rev=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/test-profiles/java-derby.testprofile (original) +++ qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile Thu Jul 7 15:16:33 2011 @@ -16,14 +16,17 @@ # specific language governing permissions and limitations # under the License. # +broker.version=v0_9_1 broker.language=java -broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT --exclude-0-10 @PORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml +broker.type=spawned +broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work broker.ready=BRK-1004 broker.stopped=Exception broker.config=${project.root}/build/etc/config-systests-derby.xml +broker.protocol.excludes=--exclude-0-10 @PORT messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore -profile.excludes=JavaStandaloneExcludes JavaPersistentExcludes 08StandaloneExcludes +profile.excludes=JavaPersistentExcludes JavaPre010Excludes broker.clean.between.tests=true broker.persistent=true # Copied: qpid/trunk/qpid/java/test-profiles/java-dby.0-10.testprofile (from r1143870, qpid/trunk/qpid/java/test-profiles/java-derby.0.10.testprofile) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-dby.0-10.testprofile?p2=qpid/trunk/qpid/java/test-profiles/java-dby.0-10.testprofile&p1=qpid/trunk/qpid/java/test-profiles/java-derby.0.10.testprofile&r1=1143870&r2=1143874&rev=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/test-profiles/java-derby.0.10.testprofile (original) +++ qpid/trunk/qpid/java/test-profiles/java-dby.0-10.testprofile Thu Jul 7 15:16:33 2011 @@ -17,13 +17,14 @@ # under the License. # broker.language=java -broker.version=0-10 -broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml +broker.version=v0_10 +broker.type=internal +broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work broker.ready=BRK-1004 broker.stopped=Exception broker.config=${project.root}/build/etc/config-systests-derby.xml messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore -profile.excludes=JavaStandaloneExcludes JavaPersistentExcludes Java010Excludes +profile.excludes=JavaPersistentExcludes Java010Excludes broker.clean.between.tests=true broker.persistent=true Copied: qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile (from r1143870, qpid/trunk/qpid/java/test-profiles/java-derby.testprofile) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile?p2=qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile&p1=qpid/trunk/qpid/java/test-profiles/java-derby.testprofile&r1=1143870&r2=1143874&rev=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/test-profiles/java-derby.testprofile (original) +++ qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile Thu Jul 7 15:16:33 2011 @@ -16,14 +16,17 @@ # specific language governing permissions and limitations # under the License. # +broker.version=v0_9_1 broker.language=java -broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT --exclude-0-10 @PORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml +broker.type=internal +broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work broker.ready=BRK-1004 broker.stopped=Exception broker.config=${project.root}/build/etc/config-systests-derby.xml +broker.protocol.excludes=--exclude-0-10 @PORT messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore -profile.excludes=JavaStandaloneExcludes JavaPersistentExcludes 08StandaloneExcludes +profile.excludes=JavaPersistentExcludes JavaPre010Excludes broker.clean.between.tests=true broker.persistent=true # Copied: qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile (from r1143870, qpid/trunk/qpid/java/test-profiles/java.testprofile) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile?p2=qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile&p1=qpid/trunk/qpid/java/test-profiles/java.testprofile&r1=1143870&r2=1143874&rev=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/test-profiles/java.testprofile (original) +++ qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile Thu Jul 7 15:16:33 2011 @@ -16,14 +16,15 @@ # specific language governing permissions and limitations # under the License. # +broker.version=v0_10 broker.language=java broker.type=spawned -broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT --exclude-0-10 @PORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml +broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work broker.ready=BRK-1004 broker.stopped=Exception # # Do not enable. Allow client to attempt 0-10 and negotiate downwards # -#qpid.amqp.version=0-91 -profile.excludes=JavaTransientExcludes JavaStandaloneExcludes 08StandaloneExcludes +#qpid.amqp.version=0-10 +profile.excludes=JavaTransientExcludes Java010Excludes Copied: qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile (from r1143870, qpid/trunk/qpid/java/test-profiles/java.testprofile) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile?p2=qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile&p1=qpid/trunk/qpid/java/test-profiles/java.testprofile&r1=1143870&r2=1143874&rev=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/test-profiles/java.testprofile (original) +++ qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile Thu Jul 7 15:16:33 2011 @@ -16,14 +16,16 @@ # specific language governing permissions and limitations # under the License. # +broker.version=v0_9_1 broker.language=java broker.type=spawned -broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT --exclude-0-10 @PORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml +broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work broker.ready=BRK-1004 broker.stopped=Exception +broker.protocol.excludes=--exclude-0-10 @PORT # # Do not enable. Allow client to attempt 0-10 and negotiate downwards # #qpid.amqp.version=0-91 -profile.excludes=JavaTransientExcludes JavaStandaloneExcludes 08StandaloneExcludes +profile.excludes=JavaTransientExcludes JavaPre010Excludes Copied: qpid/trunk/qpid/java/test-profiles/java-mms.0-10.testprofile (from r1143870, qpid/trunk/qpid/java/test-profiles/java.0.10.testprofile) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-mms.0-10.testprofile?p2=qpid/trunk/qpid/java/test-profiles/java-mms.0-10.testprofile&p1=qpid/trunk/qpid/java/test-profiles/java.0.10.testprofile&r1=1143870&r2=1143874&rev=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/test-profiles/java.0.10.testprofile (original) +++ qpid/trunk/qpid/java/test-profiles/java-mms.0-10.testprofile Thu Jul 7 15:16:33 2011 @@ -17,10 +17,11 @@ # under the License. # broker.language=java -broker.version=0-10 -broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml +broker.version=v0_10 +broker.type=internal +broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work broker.ready=BRK-1004 broker.stopped=Exception -profile.excludes=JavaTransientExcludes JavaStandaloneExcludes Java010Excludes +profile.excludes=JavaTransientExcludes Java010Excludes Copied: qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile (from r1143870, qpid/trunk/qpid/java/test-profiles/internal.testprofile) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile?p2=qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile&p1=qpid/trunk/qpid/java/test-profiles/internal.testprofile&r1=1143870&r2=1143874&rev=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/test-profiles/internal.testprofile (original) +++ qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile Thu Jul 7 15:16:33 2011 @@ -17,16 +17,16 @@ # under the License. # 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=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml -#broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT --exclude-0-10 @PORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work broker.ready=BRK-1004 broker.stopped=Exception -broker.protocols.excludes=--exclude-0-10 @PORT +broker.protocol.excludes=--exclude-0-10 @PORT # # Do not enable. Allow client to attempt 0-10 and negotiate downwards # #qpid.amqp.version=0-91 -profile.excludes=JavaTransientExcludes JavaStandaloneExcludes 08StandaloneExcludes +profile.excludes=JavaTransientExcludes JavaPre010Excludes Modified: qpid/trunk/qpid/java/test-profiles/test-provider.properties URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/test-provider.properties?rev=1143874&r1=1143873&r2=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/test-profiles/test-provider.properties (original) +++ qpid/trunk/qpid/java/test-profiles/test-provider.properties Thu Jul 7 15:16:33 2011 @@ -30,16 +30,12 @@ test.port.alt.ssl=25671 connectionfactory.default = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port}' connectionfactory.default.ssl = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port.ssl}?ssl='true'' -connectionfactory.default.vm = amqp://username:password@clientid/test?brokerlist='vm://:1' connectionfactory.failover = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port.alt};tcp://localhost:${test.port}'&sync_ack='true'&sync_publish='all'&failover='roundrobin?cyclecount='20'' connectionfactory.failover.ssl = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port.alt.ssl}?ssl='true';tcp://localhost:${test.port.ssl}?ssl='true''&sync_ack='true'&sync_publish='all'&failover='roundrobin?cyclecount='20'' -connectionfactory.failover.vm = amqp://username:password@clientid/test?brokerlist='vm://:2;vm://:1'&failover='roundrobin?cyclecount='20'' connectionfactory.connection1 = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port}' connectionfactory.connection2 = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port.alt}' -connectionfactory.connection1.vm = amqp://username:password@clientid/test?brokerlist='vm://:1' -connectionfactory.connection2.vm = amqp://username:password@clientid/test?brokerlist='vm://:2' queue.MyQueue = example.MyQueue Copied: qpid/trunk/qpid/java/test-profiles/testprofile.defaults (from r1143870, qpid/trunk/qpid/java/test-profiles/default.testprofile) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/testprofile.defaults?p2=qpid/trunk/qpid/java/test-profiles/testprofile.defaults&p1=qpid/trunk/qpid/java/test-profiles/default.testprofile&r1=1143870&r2=1143874&rev=1143874&view=diff ============================================================================== --- qpid/trunk/qpid/java/test-profiles/default.testprofile (original) +++ qpid/trunk/qpid/java/test-profiles/testprofile.defaults Thu Jul 7 15:16:33 2011 @@ -19,12 +19,12 @@ java.naming.factory.initial=org.apache.qpid.jndi.PropertiesFileInitialContextFactory java.naming.provider.url=${test.profiles}/test-provider.properties -broker.version=0-8 -broker.type=vm broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work broker.ready=Listening on TCP port broker.config=${project.root}/build/etc/config-systests.xml messagestore.class.name=org.apache.qpid.server.store.MemoryMessageStore +broker.protocol.excludes= +broker.persistent=false max_prefetch=1000 qpid.dest_syntax=BURL @@ -47,9 +47,8 @@ test.port.alt=25672 test.port.alt.ssl=25671 test.exclude=true -profile.excludes=JavaTransientExcludes JavaInVMExcludes 08StandaloneExcludes +profile.excludes= test.excludes=Excludes XAExcludes JavaExcludes ${profile}.excludes ${profile.excludes} -test.fork=no test.mem=512M test=*Test haltonfailure=no @@ -57,3 +56,5 @@ haltonerror=no exclude.modules=none profile.clustered=false + + --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:[email protected]
