qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kgiu...@apache.org
Subject svn commit: r1333027 [13/13] - in /qpid/branches/qpid-3767/qpid: ./ cpp/ cpp/bindings/ cpp/bindings/qmf/ruby/ cpp/bindings/qpid/python/ cpp/bindings/qpid/ruby/ cpp/bindings/qpid/ruby/features/step_definitions/ cpp/bindings/qpid/ruby/lib/qpid/ cpp/docs/...
Date Wed, 02 May 2012 13:10:03 GMT
Modified: qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityQueueTest.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityQueueTest.java (original)
+++ qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityQueueTest.java Wed May  2 13:09:18 2012
@@ -21,8 +21,10 @@
 package org.apache.qpid.server.queue;
 
 import org.apache.qpid.AMQException;
+import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQDestination;
 import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.configuration.ClientProperties;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
 
@@ -30,12 +32,15 @@ import javax.jms.Connection;
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageConsumer;
+import javax.jms.MessageListener;
 import javax.jms.MessageProducer;
 import javax.jms.Queue;
 import javax.jms.Session;
 import javax.naming.NamingException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 public class PriorityQueueTest extends QpidBrokerTestCase
 {
@@ -197,4 +202,99 @@ public class PriorityQueueTest extends Q
 
         return send;
     }
+
+    /**
+     * Test that after sending an initial  message with priority 0, it is able to be repeatedly reflected back to the queue using
+     * default priority and then consumed again, with separate transacted sessions with prefetch 1 for producer and consumer.
+     *
+     * Highlighted defect with PriorityQueues resolved in QPID-3927.
+     */
+    public void testMessageReflectionWithPriorityIncreaseOnTransactedSessionsWithPrefetch1() throws Exception
+    {
+        setTestClientSystemProperty(ClientProperties.MAX_PREFETCH_PROP_NAME, "1");
+        Connection conn = getConnection();
+        conn.start();
+        assertEquals("Prefetch not reset", 1, ((AMQConnection) conn).getMaxPrefetch());
+
+        final Session producerSess = conn.createSession(true, Session.SESSION_TRANSACTED);
+        final Session consumerSess = conn.createSession(true, Session.SESSION_TRANSACTED);
+
+        //declare a priority queue with 10 priorities
+        final Map<String,Object> arguments = new HashMap<String, Object>();
+        arguments.put("x-qpid-priorities",10);
+        ((AMQSession<?,?>) producerSess).createQueue(new AMQShortString(getTestQueueName()), false, true, false, arguments);
+
+        Queue queue = producerSess.createQueue(getTestQueueName());
+
+        //create the consumer, producer, add message listener
+        CountDownLatch latch = new CountDownLatch(5);
+        MessageConsumer cons = producerSess.createConsumer(queue);
+        MessageProducer producer = producerSess.createProducer(queue);
+
+        ReflectingMessageListener listener = new ReflectingMessageListener(producerSess,producer,consumerSess,latch);
+        cons.setMessageListener(listener);
+
+        //Send low priority 0 message to kick start the asynchronous reflection process
+        producer.setPriority(0);
+        producer.send(nextMessage(1, true, producerSess, producer));
+        producerSess.commit();
+
+        //wait for the reflection process to complete
+        assertTrue("Test process failed to complete in allowed time", latch.await(10, TimeUnit.SECONDS));
+        assertNull("Unexpected throwable encountered", listener.getThrown());
+    }
+
+    private static class ReflectingMessageListener implements MessageListener
+    {
+        private Session _prodSess;
+        private Session _consSess;
+        private CountDownLatch _latch;
+        private MessageProducer _prod;
+        private long _origCount;
+        private Throwable _lastThrown;
+
+        public ReflectingMessageListener(final Session prodSess, final MessageProducer prod,
+                final Session consSess, final CountDownLatch latch)
+        {
+            _latch = latch;
+            _origCount = _latch.getCount();
+            _prodSess = prodSess;
+            _consSess = consSess;
+            _prod = prod;
+        }
+
+        @Override
+        public void onMessage(final Message message)
+        {
+            try
+            {
+                _latch.countDown();
+                long msgNum = _origCount - _latch.getCount();
+                System.out.println("Received message " + msgNum + " with ID: " + message.getIntProperty("msg"));
+
+                if(_latch.getCount() > 0)
+                {
+                    //reflect the message, updating its ID and using default priority
+                    message.clearProperties();
+                    message.setIntProperty("msg", (int) msgNum + 1);
+                    _prod.setPriority(Message.DEFAULT_PRIORITY);
+                    _prod.send(message);
+                    _prodSess.commit();
+                }
+
+                //commit the consumer session to consume the message
+                _consSess.commit();
+            }
+            catch(Throwable t)
+            {
+                t.printStackTrace();
+                _lastThrown = t;
+            }
+        }
+
+        public Throwable getThrown()
+        {
+            return _lastThrown;
+        }
+    }
 }

Modified: qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java (original)
+++ qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java Wed May  2 13:09:18 2012
@@ -26,10 +26,10 @@ import org.apache.log4j.Logger;
 import org.apache.qpid.AMQStoreException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.FieldTable;
+import org.apache.qpid.server.binding.Binding;
 import org.apache.qpid.server.exchange.Exchange;
 import org.apache.qpid.server.federation.Bridge;
 import org.apache.qpid.server.federation.BrokerLink;
-import org.apache.qpid.server.logging.LogSubject;
 import org.apache.qpid.server.message.EnqueableMessage;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.queue.AMQQueue;
@@ -38,7 +38,7 @@ import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.Iterator;
 
-public class SlowMessageStore implements MessageStore, DurableConfigurationStore
+public class SlowMessageStore implements MessageStore
 {
     private static final Logger _logger = Logger.getLogger(SlowMessageStore.class);
     private static final String DELAYS = "delays";
@@ -55,11 +55,8 @@ public class SlowMessageStore implements
 
     public void configureConfigStore(String name,
                           ConfigurationRecoveryHandler recoveryHandler,
-                          Configuration config,
-                          LogSubject logSubject) throws Exception
+                          Configuration config) throws Exception
     {
-        //To change body of implemented methods use File | Settings | File Templates.
-
         _logger.info("Starting SlowMessageStore on Virtualhost:" + name);
         Configuration delays = config.subset(DELAYS);
 
@@ -74,7 +71,7 @@ public class SlowMessageStore implements
 
         if (messageStoreClass != null)
         {
-            Class clazz = Class.forName(messageStoreClass);
+            Class<?> clazz = Class.forName(messageStoreClass);
 
             Object o = clazz.newInstance();
 
@@ -89,13 +86,14 @@ public class SlowMessageStore implements
                 _durableConfigurationStore = (DurableConfigurationStore)o;
             }
         }
-        _durableConfigurationStore.configureConfigStore(name, recoveryHandler, config, logSubject);
+        _durableConfigurationStore.configureConfigStore(name, recoveryHandler, config);
 
     }
 
     private void configureDelays(Configuration config)
     {
-        Iterator delays = config.getKeys();
+        @SuppressWarnings("unchecked")
+        Iterator<String> delays = config.getKeys();
 
         while (delays.hasNext())
         {
@@ -160,11 +158,11 @@ public class SlowMessageStore implements
 
 
     public void configureMessageStore(String name,
-                                      MessageStoreRecoveryHandler recoveryHandler,
-                                      Configuration config,
-                                      LogSubject logSubject) throws Exception
+                                      MessageStoreRecoveryHandler messageRecoveryHandler,
+                                      TransactionLogRecoveryHandler tlogRecoveryHandler,
+                                      Configuration config) throws Exception
     {
-        _realStore.configureMessageStore(name, recoveryHandler, config, logSubject);
+        _realStore.configureMessageStore(name, messageRecoveryHandler, tlogRecoveryHandler, config);
     }
 
     public void close() throws Exception
@@ -194,17 +192,17 @@ public class SlowMessageStore implements
         doPostDelay("removeExchange");
     }
 
-    public void bindQueue(Exchange exchange, AMQShortString routingKey, AMQQueue queue, FieldTable args) throws AMQStoreException
+    public void bindQueue(Binding binding) throws AMQStoreException
     {
         doPreDelay("bindQueue");
-        _durableConfigurationStore.bindQueue(exchange, routingKey, queue, args);
+        _durableConfigurationStore.bindQueue(binding);
         doPostDelay("bindQueue");
     }
 
-    public void unbindQueue(Exchange exchange, AMQShortString routingKey, AMQQueue queue, FieldTable args) throws AMQStoreException
+    public void unbindQueue(Binding binding) throws AMQStoreException
     {
         doPreDelay("unbindQueue");
-        _durableConfigurationStore.unbindQueue(exchange, routingKey, queue, args);
+        _durableConfigurationStore.unbindQueue(binding);
         doPostDelay("unbindQueue");
     }
 
@@ -227,14 +225,6 @@ public class SlowMessageStore implements
         doPostDelay("removeQueue");
     }
 
-    public void configureTransactionLog(String name,
-                                        TransactionLogRecoveryHandler recoveryHandler,
-                                        Configuration storeConfiguration, LogSubject logSubject)
-            throws Exception
-    {
-        _realStore.configureTransactionLog(name, recoveryHandler, storeConfiguration, logSubject);
-    }
-
     public Transaction newTransaction()
     {
         doPreDelay("beginTran");
@@ -361,4 +351,23 @@ public class SlowMessageStore implements
         _durableConfigurationStore.deleteBridge(bridge);
         doPostDelay("deleteBridge");
     }
+
+    @Override
+    public void activate() throws Exception
+    {
+       _realStore.activate();
+    }
+
+    @Override
+    public void addEventListener(EventListener eventListener, Event... events)
+    {
+        _realStore.addEventListener(eventListener, events);
+    }
+
+    @Override
+    public String getStoreLocation()
+    {
+        return _realStore.getStoreLocation();
+    }
+
 }

Modified: qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java (original)
+++ qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java Wed May  2 13:09:18 2012
@@ -54,7 +54,7 @@ public class SyncWaitDelayTest extends Q
     public void setUp() throws Exception
     {
 
-        setConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST+".store.class", "org.apache.qpid.server.store.SlowMessageStore");
+        setConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST+".store.factoryclass", "org.apache.qpid.server.store.SlowMessageStoreFactory");
         setConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST+".store.delays.commitTran.post", String.valueOf(POST_COMMIT_DELAY));
         setConfigurationProperty("management.enabled", "false");
 

Modified: qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java (original)
+++ qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java Wed May  2 13:09:18 2012
@@ -329,7 +329,11 @@ public class JMXTestUtils
     public boolean isManagedObjectExist(String query)
     {
         return !queryObjects(query).isEmpty();
+    }
 
+    public int getNumberOfObjects(String query)
+    {
+        return queryObjects(query).size();
     }
 
     public <T> T getManagedObject(Class<T> managedClass, ObjectName objectName)
@@ -430,8 +434,7 @@ public class JMXTestUtils
     }
 
     /**
-     * Returns the Set of ObjectNames returned by the broker for the given query,
-     * or null if there is problem while performing the query.
+     * Returns the Set of ObjectNames returned by the broker for the given query.
      */
     private Set<ObjectName> queryObjects(String query)
     {
@@ -441,8 +444,7 @@ public class JMXTestUtils
         }
         catch (Exception e)
         {
-            e.printStackTrace();
-            return null;
+            throw new RuntimeException("Error using query: " + query, e);
         }
     }
 }

Modified: qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (original)
+++ qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java Wed May  2 13:09:18 2012
@@ -35,7 +35,8 @@ import org.apache.qpid.server.BrokerOpti
 import org.apache.qpid.server.ProtocolExclusion;
 import org.apache.qpid.server.configuration.ServerConfiguration;
 import org.apache.qpid.server.protocol.AmqpProtocolVersion;
-import org.apache.qpid.server.store.DerbyMessageStore;
+import org.apache.qpid.server.store.MessageStoreConstants;
+import org.apache.qpid.server.store.derby.DerbyMessageStoreFactory;
 import org.apache.qpid.url.URLSyntaxException;
 import org.apache.qpid.util.FileUtils;
 import org.apache.qpid.util.LogMonitor;
@@ -63,9 +64,12 @@ import java.io.PrintStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -195,6 +199,7 @@ public class QpidBrokerTestCase extends 
         return QpidBrokerTestCase._logger;
     }
 
+    @Override
     public void runBare() throws Throwable
     {
         String qname = getClass().getName() + "." + getName();
@@ -243,14 +248,7 @@ public class QpidBrokerTestCase extends 
         }
         finally
         {
-            try
-            {
-                stopBroker();
-            }
-            catch (Exception e)
-            {
-                _logger.error("exception stopping broker", e);
-            }
+            stopAllBrokers();
 
             // reset properties used in the test
             revertSystemProperties();
@@ -634,12 +632,21 @@ public class QpidBrokerTestCase extends 
         }
     }
 
-    public void stopBroker() throws Exception
+    public void stopBroker()
     {
         stopBroker(0);
     }
 
-    public void stopBroker(int port) throws Exception
+    public void stopAllBrokers()
+    {
+        Set<Integer> runningBrokerPorts = new HashSet<Integer>(getBrokerPortNumbers());
+        for (int brokerPortNumber : runningBrokerPorts)
+        {
+            stopBroker(brokerPortNumber);
+        }
+    }
+
+    public void stopBroker(int port)
     {
         if (isBrokerPresent(port))
         {
@@ -651,12 +658,12 @@ public class QpidBrokerTestCase extends 
         }
     }
 
-    public void killBroker() throws Exception
+    public void killBroker()
     {
         killBroker(0);
     }
 
-    public void killBroker(int port) throws Exception
+    public void killBroker(int port)
     {
         if (isBrokerPresent(port))
         {
@@ -668,7 +675,7 @@ public class QpidBrokerTestCase extends 
         }
     }
 
-    public boolean isBrokerPresent(int port) throws Exception
+    public boolean isBrokerPresent(int port)
     {
         port = getPort(port);
 
@@ -681,6 +688,11 @@ public class QpidBrokerTestCase extends 
         return _brokers.get(port);
     }
 
+    public Set<Integer> getBrokerPortNumbers()
+    {
+        return new HashSet<Integer>(_brokers.keySet());
+    }
+
     /**
      * Attempt to set the Java Broker to use the BDBMessageStore for persistence
      * Falling back to the DerbyMessageStore if
@@ -693,22 +705,22 @@ public class QpidBrokerTestCase extends 
     protected void makeVirtualHostPersistent(String virtualhost)
             throws ConfigurationException, IOException
     {
-        Class<?> storeClass = null;
+        Class<?> storeFactoryClass = null;
         try
         {
             // Try and lookup the BDB class
-            storeClass = Class.forName("org.apache.qpid.server.store.berkeleydb.BDBMessageStore");
+            storeFactoryClass = Class.forName("org.apache.qpid.server.store.berkeleydb.BDBMessageStoreFactory");
         }
         catch (ClassNotFoundException e)
         {
             // No BDB store, we'll use Derby instead.
-            storeClass = DerbyMessageStore.class;
+            storeFactoryClass = DerbyMessageStoreFactory.class;
         }
 
 
-        setConfigurationProperty("virtualhosts.virtualhost." + virtualhost + ".store.class",
-                                    storeClass.getName());
-        setConfigurationProperty("virtualhosts.virtualhost." + virtualhost + ".store." + DerbyMessageStore.ENVIRONMENT_PATH_PROPERTY,
+        setConfigurationProperty("virtualhosts.virtualhost." + virtualhost + ".store.factoryclass",
+                                    storeFactoryClass.getName());
+        setConfigurationProperty("virtualhosts.virtualhost." + virtualhost + ".store." + MessageStoreConstants.ENVIRONMENT_PATH_PROPERTY,
                                    "${QPID_WORK}/" + virtualhost);
     }
 

Propchange: qpid/branches/qpid-3767/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:r1306564-1332660

Modified: qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java (original)
+++ qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java Wed May  2 13:09:18 2012
@@ -114,7 +114,7 @@ public class SpawnedBrokerHolder impleme
             }
             catch (ReflectionUtilsException e)
             {
-                LOGGER.warn("Could not get pid for process, Broker process shutdown will be ungraceful");
+                LOGGER.warn("Could not get pid for process, Broker process shutdown will be graceful");
             }
         }
         return null;

Propchange: qpid/branches/qpid-3767/qpid/java/test-profiles/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles:r1306564-1332660

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/CPPExcludes
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/CPPExcludes?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/CPPExcludes (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/CPPExcludes Wed May  2 13:09:18 2012
@@ -91,6 +91,7 @@ org.apache.qpid.server.store.MessageStor
 org.apache.qpid.server.store.MessageStoreTest#testDurableQueueRemoval
 org.apache.qpid.server.store.MessageStoreTest#testExchangePersistence
 org.apache.qpid.server.store.MessageStoreTest#testDurableExchangeRemoval
+org.apache.qpid.server.store.DurableConfigurationStoreTest#*
 
 // CPP Broker does not follow the same Logging convention as the Java broker
 org.apache.qpid.server.BrokerStartupTest#*
@@ -171,3 +172,8 @@ org.apache.qpid.scripts.QpidPasswdTest#*
 
 // QPID-3604: Immediate Prefetch no longer supported by 0-10
 org.apache.qpid.client.AsynchMessageListenerTest#testImmediatePrefetchWithMessageListener
+
+// QPID-3936: Exclude Performance Test Framework tests
+org.apache.qpid.systest.disttest.*
+org.apache.qpid.disttest.*
+

Propchange: qpid/branches/qpid-3767/qpid/java/test-profiles/CPPExcludes
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/CPPExcludes:r1306564-1332660

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/Excludes
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/Excludes?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/Excludes (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/Excludes Wed May  2 13:09:18 2012
@@ -30,3 +30,4 @@ org.apache.qpid.server.logging.MemoryMes
 org.apache.qpid.server.logging.DerbyMessageStoreLoggingTest#*
 
 org.apache.qpid.client.ssl.SSLTest#testVerifyLocalHostLocalDomain
+

Propchange: qpid/branches/qpid-3767/qpid/java/test-profiles/Excludes
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/Excludes:r1306564-1332660

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/JavaBDBExcludes
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/JavaBDBExcludes?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/JavaBDBExcludes (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/JavaBDBExcludes Wed May  2 13:09:18 2012
@@ -20,3 +20,4 @@
 //This test is subclassed within the bdbstore module to enable it to run and
 //also add some bdb-specific tests. It is excluded to prevent running twice.
 org.apache.qpid.server.store.MessageStoreTest#*
+org.apache.qpid.server.store.DurableConfigurationStoreTest#*

Propchange: qpid/branches/qpid-3767/qpid/java/test-profiles/JavaBDBExcludes
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes:r1306564-1332660

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/JavaDerbyExcludes
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/JavaDerbyExcludes?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/JavaDerbyExcludes (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/JavaDerbyExcludes Wed May  2 13:09:18 2012
@@ -17,6 +17,4 @@
 // under the License.
 //
 
-org.apache.qpid.server.store.berkeleydb.BDBMessageStoreTest#*
-org.apache.qpid.server.store.berkeleydb.BDBUpgradeTest#*
-org.apache.qpid.server.store.berkeleydb.BDBBackupTest#*
+org.apache.qpid.server.store.berkeleydb.*

Propchange: qpid/branches/qpid-3767/qpid/java/test-profiles/JavaExcludes
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/JavaExcludes:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/test-profiles/JavaPre010Excludes
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes:r1306564-1332660

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/JavaTransientExcludes
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/JavaTransientExcludes?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/JavaTransientExcludes (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/JavaTransientExcludes Wed May  2 13:09:18 2012
@@ -40,6 +40,6 @@ org.apache.qpid.server.store.MessageStor
 org.apache.qpid.server.store.MessageStoreTest#testExchangePersistence
 org.apache.qpid.server.store.MessageStoreTest#testDurableExchangeRemoval
 
-org.apache.qpid.server.store.berkeleydb.BDBMessageStoreTest#*
-org.apache.qpid.server.store.berkeleydb.BDBUpgradeTest#*
-org.apache.qpid.server.store.berkeleydb.BDBBackupTest#*
+org.apache.qpid.server.store.berkeleydb.*
+
+org.apache.qpid.server.store.DurableConfigurationStoreTest#*
\ No newline at end of file

Propchange: qpid/branches/qpid-3767/qpid/java/test-profiles/JavaTransientExcludes
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/test-profiles/XAExcludes
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/XAExcludes:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/test-profiles/cpp.async.testprofile
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/test-profiles/cpp.cluster.testprofile
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/test-profiles/cpp.noprefetch.testprofile
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/test-profiles/cpp.ssl.excludes
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/test-profiles/cpp.ssl.testprofile
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/test-profiles/cpp.testprofile
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/cpp.testprofile:r1306564-1332660

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile Wed May  2 13:09:18 2012
@@ -23,7 +23,7 @@ broker.command=build/bin/qpid-server -p 
 broker.ready=BRK-1004
 broker.stopped=Exception
 broker.config=build/etc/config-systests-bdb.xml
-messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
+messagestorefactory.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStoreFactory
 profile.excludes=JavaExcludes JavaPersistentExcludes Java010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile Wed May  2 13:09:18 2012
@@ -23,11 +23,11 @@ broker.command=build/bin/qpid-server -p 
 broker.ready=BRK-1004
 broker.stopped=Exception
 broker.config=build/etc/config-systests-bdb.xml
-messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
+messagestorefactory.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStoreFactory
 profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT --exclude-0-9 @PORT --exclude-0-9 @SSL_PORT
+broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT --exclude-0-9 @PORT --exclude-0-9 @SSL_PORT
 broker.version=v0_8
 #
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile Wed May  2 13:09:18 2012
@@ -23,11 +23,11 @@ broker.command=build/bin/qpid-server -p 
 broker.ready=BRK-1004
 broker.stopped=Exception
 broker.config=build/etc/config-systests-bdb.xml
-messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
+messagestorefactory.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStoreFactory
 profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT
+broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT
 broker.version=v0_9_1
 #
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards

Propchange: qpid/branches/qpid-3767/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:r1306564-1332660

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile Wed May  2 13:09:18 2012
@@ -23,11 +23,11 @@ broker.command=build/bin/qpid-server -p 
 broker.ready=BRK-1004
 broker.stopped=Exception
 broker.config=build/etc/config-systests-bdb.xml
-messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
+messagestorefactory.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStoreFactory
 profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT
+broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT
 broker.version=v0_9
 #
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb.0-10.testprofile?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb.0-10.testprofile (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb.0-10.testprofile Wed May  2 13:09:18 2012
@@ -24,7 +24,7 @@ broker.command=build/bin/qpid-server -p 
 broker.ready=BRK-1004
 broker.stopped=Exception
 broker.config=build/etc/config-systests-bdb.xml
-messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
+messagestorefactory.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStoreFactory
 profile.excludes=JavaExcludes JavaPersistentExcludes Java010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb.0-8.testprofile?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb.0-8.testprofile (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb.0-8.testprofile Wed May  2 13:09:18 2012
@@ -24,11 +24,11 @@ broker.command=build/bin/qpid-server -p 
 broker.ready=BRK-1004
 broker.stopped=Exception
 broker.config=build/etc/config-systests-bdb.xml
-messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
+messagestorefactory.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStoreFactory
 profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT --exclude-0-9 @PORT --exclude-0-9 @SSL_PORT
+broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT --exclude-0-9 @PORT --exclude-0-9 @SSL_PORT
 broker.version=v0_8
 #
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb.0-9-1.testprofile?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb.0-9-1.testprofile (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb.0-9-1.testprofile Wed May  2 13:09:18 2012
@@ -24,11 +24,11 @@ broker.command=build/bin/qpid-server -p 
 broker.ready=BRK-1004
 broker.stopped=Exception
 broker.config=build/etc/config-systests-bdb.xml
-messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
+messagestorefactory.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStoreFactory
 profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT
+broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT
 broker.version=v0_9_1
 #
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards

Propchange: qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile:r1306564-1332660

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb.0-9.testprofile?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb.0-9.testprofile (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/java-bdb.0-9.testprofile Wed May  2 13:09:18 2012
@@ -24,11 +24,11 @@ broker.command=build/bin/qpid-server -p 
 broker.ready=BRK-1004
 broker.stopped=Exception
 broker.config=build/etc/config-systests-bdb.xml
-messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
+messagestorefactory.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStoreFactory
 profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT
+broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT
 broker.version=v0_9
 #
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile Wed May  2 13:09:18 2012
@@ -23,7 +23,7 @@ broker.command=build/bin/qpid-server -p 
 broker.ready=BRK-1004
 broker.stopped=Exception
 broker.config=build/etc/config-systests-derby.xml
-messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore
+messagestorefactory.class.name=org.apache.qpid.server.store.derby.DerbyMessageStoreFactory
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes Java010Excludes
 broker.clean.between.tests=true
 broker.persistent=true

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile Wed May  2 13:09:18 2012
@@ -23,8 +23,8 @@ broker.command=build/bin/qpid-server -p 
 broker.ready=BRK-1004
 broker.stopped=Exception
 broker.config=build/etc/config-systests-derby.xml
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT --exclude-0-9 @PORT --exclude-0-9 @SSL_PORT
-messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore
+broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT --exclude-0-9 @PORT --exclude-0-9 @SSL_PORT
+messagestorefactory.class.name=org.apache.qpid.server.store.derby.DerbyMessageStoreFactory
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true
 broker.persistent=true

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile Wed May  2 13:09:18 2012
@@ -23,8 +23,8 @@ broker.command=build/bin/qpid-server -p 
 broker.ready=BRK-1004
 broker.stopped=Exception
 broker.config=build/etc/config-systests-derby.xml
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT
-messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore
+broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT
+messagestorefactory.class.name=org.apache.qpid.server.store.derby.DerbyMessageStoreFactory
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true
 broker.persistent=true

Propchange: qpid/branches/qpid-3767/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:r1306564-1332660

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile Wed May  2 13:09:18 2012
@@ -23,8 +23,8 @@ broker.command=build/bin/qpid-server -p 
 broker.ready=BRK-1004
 broker.stopped=Exception
 broker.config=build/etc/config-systests-derby.xml
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT
-messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore
+broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT
+messagestorefactory.class.name=org.apache.qpid.server.store.derby.DerbyMessageStoreFactory
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true
 broker.persistent=true

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby.0-10.testprofile?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby.0-10.testprofile (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby.0-10.testprofile Wed May  2 13:09:18 2012
@@ -24,7 +24,7 @@ broker.command=build/bin/qpid-server -p 
 broker.ready=BRK-1004
 broker.stopped=Exception
 broker.config=build/etc/config-systests-derby.xml
-messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore
+messagestorefactory.class.name=org.apache.qpid.server.store.derby.DerbyMessageStoreFactory
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes Java010Excludes
 broker.clean.between.tests=true
 broker.persistent=true

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby.0-8.testprofile?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby.0-8.testprofile (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby.0-8.testprofile Wed May  2 13:09:18 2012
@@ -24,8 +24,8 @@ broker.command=build/bin/qpid-server -p 
 broker.ready=BRK-1004
 broker.stopped=Exception
 broker.config=build/etc/config-systests-derby.xml
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT --exclude-0-9 @PORT --exclude-0-9 @SSL_PORT
-messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore
+broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT --exclude-0-9 @PORT --exclude-0-9 @SSL_PORT
+messagestorefactory.class.name=org.apache.qpid.server.store.derby.DerbyMessageStoreFactory
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true
 broker.persistent=true

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby.0-9-1.testprofile?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby.0-9-1.testprofile (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby.0-9-1.testprofile Wed May  2 13:09:18 2012
@@ -24,8 +24,8 @@ broker.command=build/bin/qpid-server -p 
 broker.ready=BRK-1004
 broker.stopped=Exception
 broker.config=build/etc/config-systests-derby.xml
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT
-messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore
+broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT
+messagestorefactory.class.name=org.apache.qpid.server.store.derby.DerbyMessageStoreFactory
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true
 broker.persistent=true

Propchange: qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby.0-9-1.testprofile
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile:r1306564-1332660

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby.0-9.testprofile?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby.0-9.testprofile (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/java-dby.0-9.testprofile Wed May  2 13:09:18 2012
@@ -24,8 +24,8 @@ broker.command=build/bin/qpid-server -p 
 broker.ready=BRK-1004
 broker.stopped=Exception
 broker.config=build/etc/config-systests-derby.xml
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT
-messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore
+broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT
+messagestorefactory.class.name=org.apache.qpid.server.store.derby.DerbyMessageStoreFactory
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true
 broker.persistent=true

Propchange: qpid/branches/qpid-3767/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile:r1306564-1332660

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile Wed May  2 13:09:18 2012
@@ -22,7 +22,7 @@ broker.type=spawned
 broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT --exclude-0-9 @PORT --exclude-0-9 @SSL_PORT
+broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT --exclude-0-9 @PORT --exclude-0-9 @SSL_PORT
 #
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile Wed May  2 13:09:18 2012
@@ -22,7 +22,7 @@ broker.type=spawned
 broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT
+broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT
 #
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards 
 #

Propchange: qpid/branches/qpid-3767/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:r1306564-1332660

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile Wed May  2 13:09:18 2012
@@ -22,7 +22,7 @@ broker.type=spawned
 broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT
+broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT
 #
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/java-mms.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/java-mms.0-8.testprofile?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/java-mms.0-8.testprofile (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/java-mms.0-8.testprofile Wed May  2 13:09:18 2012
@@ -23,7 +23,7 @@ broker.type=internal
 broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT --exclude-0-9 @PORT --exclude-0-9 @SSL_PORT
+broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT --exclude-0-9 @PORT --exclude-0-9 @SSL_PORT
 #
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/java-mms.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/java-mms.0-9-1.testprofile?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/java-mms.0-9-1.testprofile (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/java-mms.0-9-1.testprofile Wed May  2 13:09:18 2012
@@ -23,7 +23,7 @@ broker.type=internal
 broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT
+broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT
 #
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards 
 #

Propchange: qpid/branches/qpid-3767/qpid/java/test-profiles/java-mms.0-9-1.testprofile
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile:r1306564-1332660

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/java-mms.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/java-mms.0-9.testprofile?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/java-mms.0-9.testprofile (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/java-mms.0-9.testprofile Wed May  2 13:09:18 2012
@@ -23,7 +23,7 @@ broker.type=internal
 broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT
+broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT
 #
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #

Propchange: qpid/branches/qpid-3767/qpid/java/test-profiles/log4j-test.xml
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/log4j-test.xml:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/test-profiles/test-provider.properties
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/test-provider.properties:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/test-profiles/test_resources/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/test_resources:r1306564-1332660

Modified: qpid/branches/qpid-3767/qpid/java/test-profiles/testprofile.defaults
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/test-profiles/testprofile.defaults?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/test-profiles/testprofile.defaults (original)
+++ qpid/branches/qpid-3767/qpid/java/test-profiles/testprofile.defaults Wed May  2 13:09:18 2012
@@ -21,7 +21,7 @@ java.naming.provider.url=${test.profiles
 
 broker.ready=Listening on TCP
 broker.config=build/etc/config-systests.xml
-messagestore.class.name=org.apache.qpid.server.store.MemoryMessageStore
+messagestorefactory.class.name=org.apache.qpid.server.store.MemoryMessageStoreFactory
 broker.protocol.excludes=
 broker.persistent=false
 

Propchange: qpid/branches/qpid-3767/qpid/java/test-profiles/testprofile.defaults
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/testprofile.defaults:r1306564-1332660

Modified: qpid/branches/qpid-3767/qpid/java/tools/src/main/java/org/apache/qpid/tools/Clock.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/tools/src/main/java/org/apache/qpid/tools/Clock.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/tools/src/main/java/org/apache/qpid/tools/Clock.java (original)
+++ qpid/branches/qpid-3767/qpid/java/tools/src/main/java/org/apache/qpid/tools/Clock.java Wed May  2 13:09:18 2012
@@ -27,6 +27,8 @@ package org.apache.qpid.tools;
 
 public class Clock
 {
+    public final static long SEC = 60000;
+
     private static Precision precision;
     private static long offset = -1;  // in nano secs
 

Propchange: qpid/branches/qpid-3767/qpid/packaging/windows/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/packaging/windows:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/python/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/python:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/python/examples/api/spout
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/python/examples/api/spout:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/python/qpid/concurrency.py
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/python/qpid/concurrency.py:r1306564-1332660

Modified: qpid/branches/qpid-3767/qpid/python/qpid/messaging/driver.py
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/python/qpid/messaging/driver.py?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/python/qpid/messaging/driver.py (original)
+++ qpid/branches/qpid-3767/qpid/python/qpid/messaging/driver.py Wed May  2 13:09:18 2012
@@ -226,7 +226,11 @@ class LinkIn:
 
   def do_link(self, sst, rcv, _rcv, type, subtype, action):
     link_opts = _rcv.options.get("link", {})
-    reliability = link_opts.get("reliability", "at-least-once")
+    if type == "topic":
+      default_reliability = "unreliable"
+    else:
+      default_reliability = "at-least-once"
+    reliability = link_opts.get("reliability", default_reliability)
     declare = link_opts.get("x-declare", {})
     subscribe = link_opts.get("x-subscribe", {})
     acq_mode = acquire_mode.pre_acquired

Modified: qpid/branches/qpid-3767/qpid/specs/management-schema.xml
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/specs/management-schema.xml?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/specs/management-schema.xml (original)
+++ qpid/branches/qpid-3767/qpid/specs/management-schema.xml Wed May  2 13:09:18 2012
@@ -125,8 +125,8 @@
     <statistic name="abandonedViaAlt"     type="count64" unit="message" desc="Messages routed to alternate exchange from a deleted queue"/>
 
     <method name="echo" desc="Request a response to test the path to the management broker">
-      <arg name="sequence" dir="IO" type="uint32" default="0"/>
-      <arg name="body"     dir="IO" type="lstr"   default=""/>
+      <arg name="sequence" dir="IO" type="uint32"/>
+      <arg name="body"     dir="IO" type="lstr"/>
     </method>
 
     <method name="connect" desc="Establish a connection to another broker">
@@ -143,7 +143,7 @@
       <arg name="srcQueue"          dir="I" type="sstr" desc="Source queue"/>
       <arg name="destQueue"         dir="I" type="sstr" desc="Destination queue"/>
       <arg name="qty"               dir="I" type="uint32" desc="# of messages to move. 0 means all messages"/>
-      <arg name="filter"  dir="I" type="map" default="{}"   desc="if specified, move only those messages matching this filter"/>
+      <arg name="filter"  dir="I" type="map" desc="if specified, move only those messages matching this filter"/>
     </method>
 
     <method name="setLogLevel" desc="Set the log level">
@@ -272,14 +272,14 @@
 
     <method name="purge" desc="Discard all or some messages on a queue">
       <arg name="request" dir="I" type="uint32" desc="0 for all messages or n>0 for n messages"/>
-      <arg name="filter"  dir="I" type="map" default="{}"  desc="if specified, purge only those messages matching this filter"/>
+      <arg name="filter"  dir="I" type="map"    desc="if specified, purge only those messages matching this filter"/>
     </method>
 
     <method name="reroute" desc="Remove all or some messages on this queue and route them to an exchange">
       <arg name="request"        dir="I" type="uint32" desc="0 for all messages or n>0 for n messages"/>
       <arg name="useAltExchange" dir="I" type="bool"   desc="Iff true, use the queue's configured alternate exchange; iff false, use exchange named in the 'exchange' argument"/>
       <arg name="exchange"       dir="I" type="sstr"   desc="Name of the exchange to route the messages through"/>
-      <arg name="filter"  dir="I" type="map" default="{}" desc="if specified, reroute only those messages matching this filter"/>
+      <arg name="filter"  dir="I" type="map"           desc="if specified, reroute only those messages matching this filter"/>
     </method>
   </class>
 

Modified: qpid/branches/qpid-3767/qpid/tests/src/py/qpid_tests/broker_0_10/management.py
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/tests/src/py/qpid_tests/broker_0_10/management.py?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/tests/src/py/qpid_tests/broker_0_10/management.py (original)
+++ qpid/branches/qpid-3767/qpid/tests/src/py/qpid_tests/broker_0_10/management.py Wed May  2 13:09:18 2012
@@ -385,6 +385,30 @@ class ManagementTest (TestBase010):
         # Cleanup
         for e in ["A", "B"]: session.exchange_delete(exchange=e)
 
+    def test_reroute_invalid_alt_exchange(self):
+        """
+        Test that an error is returned for an attempt to reroute to
+        alternate exchange on a queue for which no such exchange has
+        been defined.
+        """
+        self.startQmf()
+        session = self.session
+        # create queue with no alt-exchange, and send a message to it
+        session.queue_declare(queue="q", exclusive=True, auto_delete=True)
+        props = session.delivery_properties(routing_key="q")
+        session.message_transfer(message=Message(props, "don't reroute me!"))
+
+        # attempt to reroute the message to alt-exchange
+        q = self.qmf.getObjects(_class="queue", name="q")[0]
+        result = q.reroute(1, True, "", {})
+        # verify the attempt fails...
+        self.assertEqual(result.status, 4) #invalid parameter
+
+        # ...and message is still on the queue
+        self.subscribe(destination="d", queue="q")
+        self.assertEqual("don't reroute me!", session.incoming("d").get(timeout=1).body)
+
+
     def test_methods_async (self):
         """
         """

Modified: qpid/branches/qpid-3767/qpid/tests/src/py/qpid_tests/broker_0_10/new_api.py
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/tests/src/py/qpid_tests/broker_0_10/new_api.py?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/tests/src/py/qpid_tests/broker_0_10/new_api.py (original)
+++ qpid/branches/qpid-3767/qpid/tests/src/py/qpid_tests/broker_0_10/new_api.py Wed May  2 13:09:18 2012
@@ -57,7 +57,7 @@ class GeneralTests(Base):
         sess2 = self.setup_session()
 
         tx = sess1.sender("amq.direct/key")
-        rx_main = sess1.receiver("amq.direct/key;{link:{x-declare:{alternate-exchange:'amq.fanout'}}}")
+        rx_main = sess1.receiver("amq.direct/key;{link:{reliability:at-least-once,x-declare:{alternate-exchange:'amq.fanout'}}}")
         rx_alt  = sess2.receiver("amq.fanout")
         rx_alt.capacity = 10
 

Propchange: qpid/branches/qpid-3767/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py:r1306564-1332660

Modified: qpid/branches/qpid-3767/qpid/tools/src/py/qmf-tool
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/tools/src/py/qmf-tool?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/tools/src/py/qmf-tool (original)
+++ qpid/branches/qpid-3767/qpid/tools/src/py/qmf-tool Wed May  2 13:09:18 2012
@@ -266,7 +266,7 @@ class QmfData:
     self.conn_options = conn_options
     self.qmf_options = qmf_options
     self.agent_filter = '[]'
-    self.connection = cqpid.Connection(self.url, self.conn_options)
+    self.connection = cqpid.Connection(self.url, **self.conn_options)
     self.connection.open()
     self.session = qmf2.ConsoleSession(self.connection, self.qmf_options)
     self.session.setAgentFilter(self.agent_filter)

Modified: qpid/branches/qpid-3767/qpid/tools/src/py/qpid-ha
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/tools/src/py/qpid-ha?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/tools/src/py/qpid-ha (original)
+++ qpid/branches/qpid-3767/qpid/tools/src/py/qpid-ha Wed May  2 13:09:18 2012
@@ -113,7 +113,8 @@ class QueryCmd(Command):
         for x in [("Status:", hb.status),
                   ("Brokers URL:", hb.brokers),
                   ("Public URL:", hb.publicBrokers),
-                  ("Expected Backups:", hb.expectedBackups)
+                  ("Expected Backups:", hb.expectedBackups),
+                  ("Replicate: ", hb.replicateDefault)
                   ]:
             print "%-20s %s"%(x[0], x[1])
 QueryCmd()

Modified: qpid/branches/qpid-3767/qpid/tools/src/py/qpidtoollibs/broker.py
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/tools/src/py/qpidtoollibs/broker.py?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/tools/src/py/qpidtoollibs/broker.py (original)
+++ qpid/branches/qpid-3767/qpid/tools/src/py/qpidtoollibs/broker.py Wed May  2 13:09:18 2012
@@ -268,6 +268,20 @@ class BrokerAgent(object):
   def reloadAclFile(self):
     self._method('reloadACLFile', {}, "org.apache.qpid.acl:acl:org.apache.qpid.broker:broker:amqp-broker")
 
+  def acl_lookup(self, userName, action, aclObj, aclObjName, propMap):
+    args = {'userId':      userName,
+            'action':      action,
+            'object':      aclObj,
+            'objectName':  aclObjName,
+            'propertyMap': propMap}
+    return self._method('Lookup', args, "org.apache.qpid.acl:acl:org.apache.qpid.broker:broker:amqp-broker")
+
+  def acl_lookupPublish(self, userName, exchange, key):
+    args = {'userId':       userName,
+            'exchangeName': exchange,
+            'routingKey':   key}
+    return self._method('LookupPublish', args, "org.apache.qpid.acl:acl:org.apache.qpid.broker:broker:amqp-broker")
+
   def create(self, _type, name, properties, strict):
     """Create an object of the specified type"""
     pass

Modified: qpid/branches/qpid-3767/qpid/wcf/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/wcf/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/wcf/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp (original)
+++ qpid/branches/qpid-3767/qpid/wcf/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp Wed May  2 13:09:18 2012
@@ -49,6 +49,7 @@
 
 #include "qpid/client/AsyncSession.h"
 #include "qpid/client/Connection.h"
+#include "qpid/framing/FieldValue.h"
 
 
 #include <map>
@@ -472,13 +473,15 @@ INT ResourceManager::recover(XID *xids, 
 	try {
 	    // status if we can't talk to the broker
 	    status = XAER_RMFAIL;
-	    std::vector<std::string> wireFormatXids;
 
 	    DtxRecoverResult dtxrr = qpidSession.dtxRecover(true);
 
 	    // status if we can't process the xids
 	    status = XAER_RMERR;
-	    dtxrr.getInDoubt().collect(wireFormatXids);
+
+        std::vector<std::string> wireFormatXids(dtxrr.getInDoubt().size());
+        std::transform(dtxrr.getInDoubt().begin(), dtxrr.getInDoubt().end(), wireFormatXids.begin(), Array::get<std::string, Array::ValuePtr>);
+
 	    size_t nXids = wireFormatXids.size();
 
 	    if (nXids > 0) {



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message