You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2012/04/04 23:10:10 UTC

svn commit: r1309594 [3/3] - in /qpid/trunk/qpid/java: ./ amqp-1-0-client-jms/ amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/ amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ amqp-1-0-client/ amqp-1-0-client/src/mai...

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java?rev=1309594&r1=1305003&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java Wed Apr  4 21:10:07 2012
@@ -53,7 +53,9 @@ import org.apache.qpid.amqp_1_0.type.tra
 import org.apache.qpid.amqp_1_0.type.transport.Detach;
 import org.apache.qpid.amqp_1_0.type.transport.Error;
 import org.apache.qpid.amqp_1_0.type.transport.Transfer;
+import org.apache.qpid.filter.SelectorParsingException;
 import org.apache.qpid.filter.selector.ParseException;
+import org.apache.qpid.server.binding.Binding;
 import org.apache.qpid.server.exchange.DirectExchange;
 import org.apache.qpid.server.exchange.Exchange;
 import org.apache.qpid.server.exchange.TopicExchange;
@@ -106,7 +108,7 @@ public class SendingLink_1_0 implements 
         if(destination instanceof QueueDestination)
         {
             queue = ((QueueDestination) _destination).getQueue();
-            if(queue.getArguments().containsKey("topic"))
+            if(queue.getArguments() != null && queue.getArguments().containsKey("topic"))
             {
                 source.setDistributionMode(StdDistMode.COPY);
             }
@@ -143,6 +145,14 @@ public class SendingLink_1_0 implements 
                             error.setInfo(Collections.singletonMap(Symbol.valueOf("field"), Symbol.valueOf("filter")));
                             throw new AmqpErrorException(error);
                         }
+                        catch (SelectorParsingException e)
+                        {
+                            Error error = new Error();
+                            error.setCondition(AmqpError.INVALID_FIELD);
+                            error.setDescription("Invalid JMS Selector: " + selectorFilter.getValue());
+                            error.setInfo(Collections.singletonMap(Symbol.valueOf("field"), Symbol.valueOf("filter")));
+                            throw new AmqpErrorException(error);
+                        }
 
 
                     }
@@ -150,42 +160,138 @@ public class SendingLink_1_0 implements 
             }
             source.setFilter(actualFilters.isEmpty() ? null : actualFilters);
 
+            _subscription = new Subscription_1_0(this, qd);
         }
         else if(destination instanceof ExchangeDestination)
         {
             try
             {
-                queue = AMQQueueFactory.createAMQQueueImpl(UUID.randomUUID().toString(), false, null, true,
-                            false, _vhost, Collections.EMPTY_MAP);
-                Exchange exchange = ((ExchangeDestination) destination).getExchange();
 
-                String binding = "";
+                ExchangeDestination exchangeDestination = (ExchangeDestination) destination;
+
+                boolean isDurable = exchangeDestination.getDurability() == TerminusDurability.CONFIGURATION
+                                    || exchangeDestination.getDurability() == TerminusDurability.UNSETTLED_STATE;
+                String name;
+                if(isDurable)
+                {
+                    String remoteContainerId = getEndpoint().getSession().getConnection().getRemoteContainerId();
+                    remoteContainerId = remoteContainerId.replace("_","__").replace(".", "_:");
+
+                    String endpointName = linkAttachment.getEndpoint().getName();
+                    endpointName = endpointName
+                                    .replace("_", "__")
+                                    .replace(".", "_:")
+                                    .replace("(", "_O")
+                                    .replace(")", "_C")
+                                    .replace("<", "_L")
+                                    .replace(">", "_R");
+                    name = "qpid_/" + remoteContainerId + "_/" + endpointName;
+                }
+                else
+                {
+                    name = UUID.randomUUID().toString();
+                }
+
+                queue = _vhost.getQueueRegistry().getQueue(name);
+                Exchange exchange = exchangeDestination.getExchange();
+
+                if(queue == null)
+                {
+                    queue = AMQQueueFactory.createAMQQueueImpl(
+                                name,
+                                isDurable,
+                                null,
+                                true,
+                                true,
+                                _vhost,
+                                Collections.EMPTY_MAP);
+                }
+                else
+                {
+                    List<Binding> bindings = queue.getBindings();
+                    List<Binding> bindingsToRemove = new ArrayList<Binding>();
+                    for(Binding existingBinding : bindings)
+                    {
+                        if(existingBinding.getExchange() != _vhost.getExchangeRegistry().getDefaultExchange()
+                            && existingBinding.getExchange() != exchange)
+                        {
+                            bindingsToRemove.add(existingBinding);
+                        }
+                    }
+                    for(Binding existingBinding : bindingsToRemove)
+                    {
+                        existingBinding.getExchange().removeBinding(existingBinding);
+                    }
+                }
 
-                Map filters = source.getFilter();
 
+                String binding = "";
+
+                Map<Symbol,Filter> filters = source.getFilter();
+                Map<Symbol,Filter> actualFilters = new HashMap<Symbol,Filter>();
+                boolean hasBindingFilter = false;
                 if(filters != null && !filters.isEmpty())
                 {
 
-                    source.setFilter(null);
-                    if(exchange.getType() == DirectExchange.TYPE)
+                    for(Map.Entry<Symbol,Filter> entry : filters.entrySet())
                     {
-                        if(filters.size() == 1 && filters.values().iterator().next() instanceof ExactSubjectFilter)
+                        if(!hasBindingFilter
+                           && entry.getValue() instanceof ExactSubjectFilter
+                           && exchange.getType() == DirectExchange.TYPE)
                         {
                             ExactSubjectFilter filter = (ExactSubjectFilter) filters.values().iterator().next();
                             source.setFilter(filters);
                             binding = filter.getValue();
+                            actualFilters.put(entry.getKey(), entry.getValue());
+                            hasBindingFilter = true;
                         }
-                    }
-                    else if(exchange.getType() == TopicExchange.TYPE)
-                    {
-                        if(filters.size() == 1 && filters.values().iterator().next() instanceof MatchingSubjectFilter)
+                        else if(!hasBindingFilter
+                                && entry.getValue() instanceof MatchingSubjectFilter
+                                && exchange.getType() == TopicExchange.TYPE)
                         {
                             MatchingSubjectFilter filter = (MatchingSubjectFilter) filters.values().iterator().next();
                             source.setFilter(filters);
                             binding = filter.getValue();
+                            actualFilters.put(entry.getKey(), entry.getValue());
+                            hasBindingFilter = true;
+                        }
+                        else if(entry.getValue() instanceof NoLocalFilter)
+                        {
+                            actualFilters.put(entry.getKey(), entry.getValue());
+                            noLocal = true;
+                        }
+                        else if(messageFilter == null && entry.getValue() instanceof org.apache.qpid.amqp_1_0.type.messaging.JMSSelectorFilter)
+                        {
+
+                            org.apache.qpid.amqp_1_0.type.messaging.JMSSelectorFilter selectorFilter = (org.apache.qpid.amqp_1_0.type.messaging.JMSSelectorFilter) entry.getValue();
+                            try
+                            {
+                                messageFilter = new JMSSelectorFilter(selectorFilter.getValue());
+
+                                actualFilters.put(entry.getKey(), entry.getValue());
+                            }
+                            catch (ParseException e)
+                            {
+                                Error error = new Error();
+                                error.setCondition(AmqpError.INVALID_FIELD);
+                                error.setDescription("Invalid JMS Selector: " + selectorFilter.getValue());
+                                error.setInfo(Collections.singletonMap(Symbol.valueOf("field"), Symbol.valueOf("filter")));
+                                throw new AmqpErrorException(error);
+                            }
+                            catch (SelectorParsingException e)
+                            {
+                                Error error = new Error();
+                                error.setCondition(AmqpError.INVALID_FIELD);
+                                error.setDescription("Invalid JMS Selector: " + selectorFilter.getValue());
+                                error.setInfo(Collections.singletonMap(Symbol.valueOf("field"), Symbol.valueOf("filter")));
+                                throw new AmqpErrorException(error);
+                            }
+
+
                         }
                     }
                 }
+                source.setFilter(actualFilters.isEmpty() ? null : actualFilters);
 
                 vhost.getBindingFactory().addBinding(binding,queue,exchange,null);
                 source.setDistributionMode(StdDistMode.COPY);
@@ -203,28 +309,29 @@ public class SendingLink_1_0 implements 
             {
                 e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
             }
-
+            _subscription = new Subscription_1_0(this, qd, true);
 
         }
 
-        _subscription = new Subscription_1_0(this, qd);
-        _subscription.setNoLocal(noLocal);
-        if(messageFilter!=null)
+        if(_subscription != null)
         {
-            _subscription.setFilters(new SimpleFilterManager(messageFilter));
-        }
+            _subscription.setNoLocal(noLocal);
+            if(messageFilter!=null)
+            {
+                _subscription.setFilters(new SimpleFilterManager(messageFilter));
+            }
 
-        try
-        {
+            try
+            {
 
-            queue.registerSubscription(_subscription, false);
-        }
-        catch (AMQException e)
-        {
-            e.printStackTrace();  //TODO
+                queue.registerSubscription(_subscription, false);
+            }
+            catch (AMQException e)
+            {
+                e.printStackTrace();  //TODO
+            }
         }
 
-
     }
 
     public void resume(SendingLinkAttachment linkAttachment)
@@ -241,10 +348,12 @@ public class SendingLink_1_0 implements 
            (detach != null && Boolean.TRUE.equals(detach.getClosed())))
         {
 
+            AMQQueue queue = _subscription.getQueue();
+
             try
             {
 
-                _subscription.getQueue().unregisterSubscription(_subscription);
+                queue.unregisterSubscription(_subscription);
 
             }
             catch (AMQException e)
@@ -261,7 +370,22 @@ public class SendingLink_1_0 implements 
             }
             _unsettledActionMap.clear();
 
-            endpoint.detach();
+            endpoint.close();
+
+            if(_destination instanceof ExchangeDestination
+               && (_durability == TerminusDurability.CONFIGURATION
+                    || _durability == TerminusDurability.UNSETTLED_STATE))
+            {
+                try
+                {
+                    queue.delete();
+                }
+                catch(AMQException e)
+                {
+                    e.printStackTrace();  // TODO - Implement
+                }
+            }
+
             if(_closeAction != null)
             {
                 _closeAction.run();
@@ -272,6 +396,10 @@ public class SendingLink_1_0 implements 
             _linkAttachment = null;
             _subscription.flowStateChanged();
         }
+        else
+        {
+            endpoint.detach();
+        }
     }
 
     public void start()
@@ -292,7 +420,7 @@ public class SendingLink_1_0 implements 
     public void flowStateChanged()
     {
         if(Boolean.TRUE.equals(getEndpoint().getDrain())
-                && getEndpoint().getLinkCredit().compareTo(UnsignedInteger.ZERO) > 0)
+                && hasCredit())
         {
             _draining = true;
         }
@@ -319,6 +447,11 @@ public class SendingLink_1_0 implements 
 
     }
 
+    boolean hasCredit()
+    {
+        return getEndpoint().getLinkCredit().compareTo(UnsignedInteger.ZERO) > 0;
+    }
+
     public boolean isDraining()
     {
         return false;  //TODO
@@ -389,7 +522,8 @@ public class SendingLink_1_0 implements 
 
     public Binary getTransactionId()
     {
-        return getEndpoint().getTransactionId();
+        SendingLinkEndpoint endpoint = getEndpoint();
+        return endpoint == null ? null : endpoint.getTransactionId();
     }
 
     public synchronized Object getLock()
@@ -423,6 +557,7 @@ public class SendingLink_1_0 implements 
         Map<Binary, QueueEntry> unsettledCopy = new HashMap<Binary, QueueEntry>(_unsettledMap);
         _resumeAcceptedTransfers.clear();
         _resumeFullTransfers.clear();
+
         for(Map.Entry<Binary, QueueEntry> entry : unsettledCopy.entrySet())
         {
             Binary deliveryTag = entry.getKey();
@@ -489,6 +624,7 @@ public class SendingLink_1_0 implements 
             // TODO - else
         }
 
+
     }
 
     public Map getUnsettledOutcomeMap()

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java?rev=1309594&r1=1305003&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java Wed Apr  4 21:10:07 2012
@@ -112,7 +112,7 @@ public class Session_1_0 implements Sess
                         Exchange exchg = _vhost.getExchangeRegistry().getExchange(addr);
                         if(exchg != null)
                         {
-                            destination = new ExchangeDestination(exchg);
+                            destination = new ExchangeDestination(exchg, source.getDurable(), source.getExpiryPolicy());
                         }
                         else
                         {
@@ -153,6 +153,7 @@ public class Session_1_0 implements Sess
                     }
                     catch(AmqpErrorException e)
                     {
+                        e.printStackTrace();
                         destination = null;
                         sendingLinkEndpoint.setSource(null);
                         error = e.getError();
@@ -161,6 +162,7 @@ public class Session_1_0 implements Sess
             }
             else
             {
+                endpoint.setSource(previousLink.getEndpoint().getSource());
                 SendingLinkEndpoint sendingLinkEndpoint = (SendingLinkEndpoint) endpoint;
                 previousLink.setLinkAttachment(new SendingLinkAttachment(this, sendingLinkEndpoint));
                 sendingLinkEndpoint.setLinkEventListener(previousLink);
@@ -234,7 +236,8 @@ public class Session_1_0 implements Sess
                         Exchange exchg = _vhost.getExchangeRegistry().getExchange(addr);
                         if(exchg != null)
                         {
-                            destination = new ExchangeDestination(exchg);
+                            destination = new ExchangeDestination(exchg, target.getDurable(),
+                                                                  target.getExpiryPolicy());
                         }
                         else
                         {
@@ -287,6 +290,11 @@ public class Session_1_0 implements Sess
 
         if(link == null)
         {
+            if(error == null)
+            {
+                error = new Error();
+                error.setCondition(AmqpError.NOT_FOUND);
+            }
             endpoint.detach(error);
         }
         else
@@ -383,6 +391,7 @@ public class Session_1_0 implements Sess
     public void remoteEnd(End end)
     {
         Iterator<Map.Entry<Integer, ServerTransaction>> iter = _openTransactions.entrySet().iterator();
+
         while(iter.hasNext())
         {
             Map.Entry<Integer, ServerTransaction> entry = iter.next();

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Subscription_1_0.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Subscription_1_0.java?rev=1309594&r1=1305003&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Subscription_1_0.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Subscription_1_0.java Wed Apr  4 21:10:07 2012
@@ -21,17 +21,28 @@
 package org.apache.qpid.server.protocol.v1_0;
 
 import java.nio.ByteBuffer;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.ReentrantLock;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructorRegistry;
+import org.apache.qpid.amqp_1_0.codec.ValueHandler;
+import org.apache.qpid.amqp_1_0.messaging.SectionEncoder;
+import org.apache.qpid.amqp_1_0.messaging.SectionEncoderImpl;
 import org.apache.qpid.amqp_1_0.transport.SendingLinkEndpoint;
+import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
 import org.apache.qpid.amqp_1_0.type.Binary;
 import org.apache.qpid.amqp_1_0.type.DeliveryState;
 import org.apache.qpid.amqp_1_0.type.Outcome;
+import org.apache.qpid.amqp_1_0.type.Section;
+import org.apache.qpid.amqp_1_0.type.UnsignedInteger;
+import org.apache.qpid.amqp_1_0.type.codec.AMQPDescribedTypeRegistry;
 import org.apache.qpid.amqp_1_0.type.messaging.Accepted;
+import org.apache.qpid.amqp_1_0.type.messaging.Header;
+import org.apache.qpid.amqp_1_0.type.messaging.Modified;
 import org.apache.qpid.amqp_1_0.type.messaging.Released;
 import org.apache.qpid.amqp_1_0.type.messaging.Source;
 import org.apache.qpid.amqp_1_0.type.messaging.StdDistMode;
@@ -69,13 +80,24 @@ class Subscription_1_0 implements Subscr
     private StateListener _stateListener;
 
     private Binary _transactionId;
+    private final AMQPDescribedTypeRegistry _typeRegistry = AMQPDescribedTypeRegistry.newInstance()
+                                                                                     .registerTransportLayer()
+                                                                                     .registerMessagingLayer()
+                                                                                     .registerTransactionLayer()
+                                                                                     .registerSecurityLayer();
+    private SectionEncoder _sectionEncoder = new SectionEncoderImpl(_typeRegistry);
 
     public Subscription_1_0(final SendingLink_1_0 link, final QueueDestination destination)
     {
+        this(link, destination, ((Source)link.getEndpoint().getSource()).getDistributionMode() != StdDistMode.COPY);
+    }
+
+    public Subscription_1_0(final SendingLink_1_0 link, final QueueDestination destination, boolean acquires)
+    {
         _link = link;
         _queue = destination.getQueue();
         _id = getEndpoint().getLocalHandle().longValue();
-        _acquires = !StdDistMode.COPY.equals(((Source) (getEndpoint().getSource())).getDistributionMode());
+        _acquires = acquires;
     }
 
     private SendingLinkEndpoint getEndpoint()
@@ -214,6 +236,50 @@ class Subscription_1_0 implements Subscr
                 payload.flip();
             }
 
+            if(queueEntry.getDeliveryCount() != 0)
+            {
+                payload = payload.duplicate();
+                ValueHandler valueHandler = new ValueHandler(_typeRegistry);
+
+                Header oldHeader = null;
+                try
+                {
+                    ByteBuffer encodedBuf = payload.duplicate();
+                    Object value = valueHandler.parse(payload);
+                    if(value instanceof Header)
+                    {
+                        oldHeader = (Header) value;
+                    }
+                    else
+                    {
+                        payload.position(0);
+                    }
+                }
+                catch (AmqpErrorException e)
+                {
+                    //TODO
+                    throw new RuntimeException(e);
+                }
+
+                Header header = new Header();
+                if(oldHeader != null)
+                {
+                    header.setDurable(oldHeader.getDurable());
+                    header.setPriority(oldHeader.getPriority());
+                    header.setTtl(oldHeader.getTtl());
+                }
+                header.setDeliveryCount(UnsignedInteger.valueOf(queueEntry.getDeliveryCount()));
+                _sectionEncoder.reset();
+                _sectionEncoder.encodeObject(header);
+                Binary encodedHeader = _sectionEncoder.getEncoding();
+
+                ByteBuffer oldPayload = payload;
+                payload = ByteBuffer.allocate(oldPayload.remaining() + encodedHeader.getLength());
+                payload.put(encodedHeader.getArray(),encodedHeader.getArrayOffset(),encodedHeader.getLength());
+                payload.put(oldPayload);
+                payload.flip();
+            }
+
             transfer.setPayload(payload);
             byte[] data = new byte[8];
             ByteBuffer.wrap(data).putLong(_deliveryTag++);
@@ -290,15 +356,12 @@ class Subscription_1_0 implements Subscr
         getEndpoint().detach();
     }
 
-    public boolean wouldSuspend(final QueueEntry msg)
+    public synchronized boolean wouldSuspend(final QueueEntry msg)
     {
         final boolean hasCredit = _link.isAttached() && getEndpoint().hasCreditToSend();
         if(!hasCredit && getState() == State.ACTIVE)
         {
-            if(_state.compareAndSet(State.ACTIVE, State.SUSPENDED))
-            {
-                _stateListener.stateChange(this, State.ACTIVE, State.SUSPENDED);
-            }
+            suspend();
         }
 
         return !hasCredit;
@@ -306,10 +369,10 @@ class Subscription_1_0 implements Subscr
 
     public boolean trySendLock()
     {
-        return false;  //To change body of implemented methods use File | Settings | File Templates.
+        return _stateChangeLock.tryLock();
     }
 
-    public void suspend()
+    public synchronized void suspend()
     {
         if(_state.compareAndSet(State.ACTIVE, State.SUSPENDED))
         {
@@ -384,7 +447,7 @@ class Subscription_1_0 implements Subscr
         return false;  //TODO
     }
 
-    public void queueEmpty()
+    public synchronized void queueEmpty()
     {
         if(_link.drained())
         {
@@ -395,9 +458,9 @@ class Subscription_1_0 implements Subscr
         }
     }
 
-    public void flowStateChanged()
+    public synchronized void flowStateChanged()
     {
-        if(isSuspended())
+        if(isSuspended() && getEndpoint() != null)
         {
             if(_state.compareAndSet(State.SUSPENDED, State.ACTIVE))
             {
@@ -486,7 +549,27 @@ class Subscription_1_0 implements Subscr
                 {
                     public void postCommit()
                     {
+
+                        _queueEntry.release();
+                        _link.getEndpoint().settle(_deliveryTag);
+                    }
+
+                    public void onRollback()
+                    {
+                        _link.getEndpoint().settle(_deliveryTag);
+                    }
+                });
+            }
+
+            else if(outcome instanceof Modified)
+            {
+                txn.addPostTransactionAction(new ServerTransaction.Action()
+                {
+                    public void postCommit()
+                    {
+
                         _queueEntry.release();
+                        _queueEntry.incrementDeliveryCount();
                         _link.getEndpoint().settle(_deliveryTag);
                     }
 

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueContext.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueContext.java?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueContext.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueContext.java Wed Apr  4 21:10:07 2012
@@ -52,4 +52,13 @@ final class QueueContext implements AMQQ
     {
         return _releasedEntry;
     }
+
+    @Override
+    public String toString()
+    {
+        return "QueueContext{" +
+               "_lastSeenEntry=" + _lastSeenEntry +
+               ", _releasedEntry=" + _releasedEntry +
+               '}';
+    }
 }

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java Wed Apr  4 21:10:07 2012
@@ -227,9 +227,10 @@ public abstract class QueueEntryImpl imp
     public void release()
     {
         EntryState state = _state;
-        
+
         if((state.getState() == State.ACQUIRED) &&_stateUpdater.compareAndSet(this, state, AVAILABLE_STATE))
         {
+
             if(state instanceof SubscriptionAcquiredState)
             {
                 getQueue().decrementUnackedMsgCount();
@@ -254,6 +255,7 @@ public abstract class QueueEntryImpl imp
                 routeToAlternate();
             }
         }
+
     }
 
     public boolean releaseButRetain()
@@ -267,7 +269,6 @@ public abstract class QueueEntryImpl imp
             Subscription sub = ((SubscriptionAcquiredState) state).getSubscription();
             if(_stateUpdater.compareAndSet(this, state, sub.getAssignedState()))
             {
-                System.err.println("Message released (and retained)" + getMessage().getMessageNumber());
                 getQueue().requeue(this);
                 if(_stateChangeListeners != null)
                 {

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java Wed Apr  4 21:10:07 2012
@@ -862,7 +862,6 @@ public class SimpleAMQQueue implements A
 
     public void requeue(QueueEntry entry)
     {
-
         SubscriptionList.SubscriptionNodeIterator subscriberIter = _subscriptionList.iterator();
         // iterate over all the subscribers, and if they are in advance of this queue entry then move them backwards
         while (subscriberIter.advance() && entry.isAvailable())
@@ -1743,6 +1742,7 @@ public class SimpleAMQQueue implements A
     {
         boolean atTail = false;
         final boolean keepSendLockHeld = iterations <=  SimpleAMQQueue.MAX_ASYNC_DELIVERIES;
+        boolean queueEmpty = false;
 
         try
         {
@@ -1760,12 +1760,9 @@ public class SimpleAMQQueue implements A
                     }
 
                     atTail = attemptDelivery(sub, true);
-                    if (atTail && !sub.isSuspended() && sub.isAutoClose())
+                    if (atTail && getNextAvailableEntry(sub) == null)
                     {
-                        unregisterSubscription(sub);
-
-                        sub.confirmAutoClose();
-
+                        queueEmpty = true;
                     }
                     else if (!atTail)
                     {
@@ -1787,6 +1784,11 @@ public class SimpleAMQQueue implements A
             {
                 sub.releaseSendLock();
             }
+            if(queueEmpty)
+            {
+                sub.queueEmpty();
+            }
+
             sub.flushBatched();
 
         }
@@ -2009,13 +2011,9 @@ public class SimpleAMQQueue implements A
                             if (subscriptionDone)
                             {
                                 sub.flushBatched();
-                                //close autoClose subscriptions if we are not currently intent on continuing
-                                if (lastLoop && !sub.isSuspended() && sub.isAutoClose())
+                                if (lastLoop && !sub.isSuspended())
                                 {
-
-                                    unregisterSubscription(sub);
-
-                                    sub.confirmAutoClose();
+                                    sub.queueEmpty();
                                 }
                                 break;
                             }

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java Wed Apr  4 21:10:07 2012
@@ -24,6 +24,7 @@ import org.apache.qpid.common.Closeable;
 import org.apache.qpid.server.plugins.Plugin;
 import org.apache.qpid.server.security.auth.AuthenticationResult;
 
+import javax.security.auth.callback.CallbackHandler;
 import javax.security.sasl.SaslException;
 import javax.security.sasl.SaslServer;
 
@@ -88,4 +89,6 @@ public interface AuthenticationManager e
      * @return authentication result
      */
     AuthenticationResult authenticate(String username, String password);
+
+    CallbackHandler getHandler(String mechanism);
 }

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java Wed Apr  4 21:10:07 2012
@@ -300,6 +300,11 @@ public class PrincipalDatabaseAuthentica
         }
     }
 
+    public CallbackHandler getHandler(String mechanism)
+    {
+        return _callbackHandlerMap.get(mechanism);
+    }
+
     /**
      * @see org.apache.qpid.server.security.auth.manager.AuthenticationManager#authenticate(String, String)
      */

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServerFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServerFactory.java?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServerFactory.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServerFactory.java Wed Apr  4 21:10:07 2012
@@ -58,4 +58,4 @@ public class AnonymousSaslServerFactory 
             return new String[]{AnonymousSaslServer.MECHANISM};
         }
     }
-}
\ No newline at end of file
+}

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageMetaDataType.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageMetaDataType.java?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageMetaDataType.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageMetaDataType.java Wed Apr  4 21:10:07 2012
@@ -22,13 +22,16 @@ package org.apache.qpid.server.store;
 
 import org.apache.qpid.server.message.MessageMetaData;
 import org.apache.qpid.server.message.MessageMetaData_0_10;
+import org.apache.qpid.server.message.MessageMetaData_1_0;
 
 import java.nio.ByteBuffer;
 
 public enum MessageMetaDataType
 {
     META_DATA_0_8  {   public Factory<MessageMetaData> getFactory() { return MessageMetaData.FACTORY; } },
-    META_DATA_0_10 {   public Factory<MessageMetaData_0_10> getFactory() { return MessageMetaData_0_10.FACTORY; } };
+    META_DATA_0_10 {   public Factory<MessageMetaData_0_10> getFactory() { return MessageMetaData_0_10.FACTORY; } },
+    META_DATA_1_0 {   public Factory<MessageMetaData_1_0> getFactory() { return MessageMetaData_1_0.FACTORY; } };
+
 
 
     public static interface Factory<M extends StorableMessageMetaData>

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription.java?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription.java Wed Apr  4 21:10:07 2012
@@ -54,16 +54,12 @@ public interface Subscription
 
     void setNoLocal(boolean noLocal);
 
-    AMQShortString getConsumerTag();
-
     long getSubscriptionID();
 
     boolean isSuspended();
 
     boolean hasInterest(QueueEntry msg);
 
-    boolean isAutoClose();
-
     boolean isClosed();
 
     boolean acquires();
@@ -105,11 +101,11 @@ public interface Subscription
 
     boolean isActive();
 
-    void confirmAutoClose();
-
     public void set(String key, Object value);
 
     public Object get(String key);
 
     boolean isSessionTransactional();
+
+    void queueEmpty() throws AMQException;
 }

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java Wed Apr  4 21:10:07 2012
@@ -375,7 +375,7 @@ public abstract class SubscriptionImpl i
     {
         return getQueue().getConfigStore();
     }
-    
+
     public Long getDelivered()
     {
         return _deliveredCount.get();
@@ -810,12 +810,22 @@ public abstract class SubscriptionImpl i
     {
         return _channel.isTransactional();
     }
-    
+
     public long getCreateTime()
     {
         return _createTime;
     }
 
+    public void queueEmpty() throws AMQException
+    {
+        if (isAutoClose())
+        {
+            _queue.unregisterSubscription(this);
+
+            confirmAutoClose();
+        }
+    }
+
     public void flushBatched()
     {
         _channel.getProtocolSession().setDeferFlush(false);

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java Wed Apr  4 21:10:07 2012
@@ -109,7 +109,7 @@ public class Subscription_0_10 implement
 
                                                 public void stateChange(Subscription sub, State oldState, State newState)
                                                 {
-                                                    CurrentActor.get().message(SubscriptionMessages.STATE(newState.toString()));    
+                                                    CurrentActor.get().message(SubscriptionMessages.STATE(newState.toString()));
                                                 }
                                             };
     private AMQQueue _queue;
@@ -199,12 +199,7 @@ public class Subscription_0_10 implement
             CurrentActor.get().message(this, SubscriptionMessages.CREATE(filterLogString, queue.isDurable() && exclusive,
                     filterLogString.length() > 0));
         }
- 
-    }
 
-    public AMQShortString getConsumerTag()
-    {
-        return new AMQShortString(_destination);
     }
 
     public boolean isSuspended()
@@ -244,12 +239,6 @@ public class Subscription_0_10 implement
         return (_filters == null) || _filters.allAllow(entry);
     }
 
-    public boolean isAutoClose()
-    {
-        // no such thing in 0-10
-        return false;
-    }
-
     public boolean isClosed()
     {
         return getState() == State.CLOSED;
@@ -302,7 +291,7 @@ public class Subscription_0_10 implement
     {
         return getQueue().getConfigStore();
     }
-    
+
     public Long getDelivered()
     {
         return _deliveredCount.get();
@@ -823,11 +812,6 @@ public class Subscription_0_10 implement
         return getState() == State.ACTIVE;
     }
 
-    public void confirmAutoClose()
-    {
-        //No such thing in 0-10
-    }
-
     public void set(String key, Object value)
     {
         _properties.put(key, value);
@@ -1026,6 +1010,10 @@ public class Subscription_0_10 implement
         return _session.isTransactional();
     }
 
+    public void queueEmpty()
+    {
+    }
+
     public long getCreateTime()
     {
         return _createTime;
@@ -1033,7 +1021,7 @@ public class Subscription_0_10 implement
 
     public String toLogString()
     {
-        String queueInfo = MessageFormat.format(QUEUE_FORMAT, _queue.getVirtualHost().getName(), 
+        String queueInfo = MessageFormat.format(QUEUE_FORMAT, _queue.getVirtualHost().getName(),
                   _queue.getNameShortString());
         String result = "[" + MessageFormat.format(SUBSCRIPTION_FORMAT, getSubscriptionID()) + "("
                 // queueString is "vh(/{0})/qu({1}) " so need to trim

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java Wed Apr  4 21:10:07 2012
@@ -134,7 +134,7 @@ public class ServerSession extends Sessi
             new ConcurrentSkipListMap<Integer, MessageDispositionChangeListener>();
 
     private ServerTransaction _transaction;
-    
+
     private final AtomicLong _txnStarts = new AtomicLong(0);
     private final AtomicLong _txnCommits = new AtomicLong(0);
     private final AtomicLong _txnRejects = new AtomicLong(0);
@@ -153,7 +153,7 @@ public class ServerSession extends Sessi
     public ServerSession(Connection connection, SessionDelegate delegate, Binary name, long expiry, ConnectionConfig connConfig)
     {
         super(connection, delegate, name, expiry);
-        _connectionConfig = connConfig;        
+        _connectionConfig = connConfig;
         _transaction = new AsyncAutoCommitTransaction(this.getMessageStore(),this);
         _logSubject = new ChannelLogSubject(this);
         _id = getConfigStore().createId();
@@ -353,7 +353,7 @@ public class ServerSession extends Sessi
         }
     }
 
-    public void removeDispositionListener(Method method)                               
+    public void removeDispositionListener(Method method)
     {
         _messageDispositionListenerMap.remove(method.getId());
     }
@@ -381,7 +381,7 @@ public class ServerSession extends Sessi
         {
             task.doTask(this);
         }
-        
+
         CurrentActor.get().message(getLogSubject(), ChannelMessages.CLOSE());
     }
 
@@ -430,7 +430,7 @@ public class ServerSession extends Sessi
 
     public void unregister(Subscription_0_10 sub)
     {
-        _subscriptions.remove(sub.getConsumerTag().toString());
+        _subscriptions.remove(sub.getName());
         try
         {
             sub.getSendLock();
@@ -559,7 +559,7 @@ public class ServerSession extends Sessi
     public void commit()
     {
         _transaction.commit();
-        
+
         _txnCommits.incrementAndGet();
         _txnStarts.incrementAndGet();
         decrementOutstandingTxnsIfNecessary();
@@ -568,13 +568,13 @@ public class ServerSession extends Sessi
     public void rollback()
     {
         _transaction.rollback();
-        
+
         _txnRejects.incrementAndGet();
         _txnStarts.incrementAndGet();
         decrementOutstandingTxnsIfNecessary();
     }
 
-    
+
     private void incrementOutstandingTxnsIfNecessary()
     {
         if(isTransactional())
@@ -584,7 +584,7 @@ public class ServerSession extends Sessi
             _txnCount.compareAndSet(0,1);
         }
     }
-    
+
     private void decrementOutstandingTxnsIfNecessary()
     {
         if(isTransactional())
@@ -625,7 +625,7 @@ public class ServerSession extends Sessi
     {
         return _txnCount.get();
     }
-    
+
     public Principal getAuthorizedPrincipal()
     {
         return getConnection().getAuthorizedPrincipal();

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java Wed Apr  4 21:10:07 2012
@@ -20,13 +20,12 @@
  */
 package org.apache.qpid.server.txn;
 
+import java.util.Collection;
+import java.util.List;
 import org.apache.qpid.server.message.EnqueableMessage;
 import org.apache.qpid.server.queue.BaseQueue;
 import org.apache.qpid.server.queue.QueueEntry;
 
-import java.util.Collection;
-import java.util.List;
-
 
 /**
  * The ServerTransaction interface allows a set enqueue/dequeue operations to be

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java Wed Apr  4 21:10:07 2012
@@ -33,6 +33,7 @@ import org.apache.qpid.server.exchange.E
 import org.apache.qpid.server.exchange.ExchangeRegistry;
 import org.apache.qpid.server.federation.BrokerLink;
 import org.apache.qpid.server.management.ManagedObject;
+import org.apache.qpid.server.protocol.v1_0.LinkRegistry;
 import org.apache.qpid.server.queue.QueueRegistry;
 import org.apache.qpid.server.registry.IApplicationRegistry;
 import org.apache.qpid.server.security.SecurityManager;
@@ -96,6 +97,8 @@ public interface VirtualHost extends Dur
 
     void removeBrokerConnection(BrokerLink brokerLink);
 
+    LinkRegistry getLinkRegistry(String remoteContainerId);
+
     ScheduledFuture<?> scheduleTask(long delay, Runnable timeoutTask);
 
     State getState();

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java Wed Apr  4 21:10:07 2012
@@ -47,6 +47,7 @@ import org.apache.qpid.server.logging.me
 import org.apache.qpid.server.logging.subjects.MessageStoreLogSubject;
 import org.apache.qpid.server.management.AMQManagedObject;
 import org.apache.qpid.server.management.ManagedObject;
+import org.apache.qpid.server.protocol.v1_0.LinkRegistry;
 import org.apache.qpid.server.protocol.AMQConnectionModel;
 import org.apache.qpid.server.protocol.AMQSessionModel;
 import org.apache.qpid.server.queue.AMQQueue;
@@ -67,7 +68,8 @@ import org.apache.qpid.server.virtualhos
 import javax.management.JMException;
 import javax.management.NotCompliantMBeanException;
 import javax.management.ObjectName;
-
+import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -126,6 +128,8 @@ public class VirtualHostImpl implements 
 
     private StatisticsCounter _messagesDelivered, _dataDelivered, _messagesReceived, _dataReceived;
 
+    private final Map<String, LinkRegistry> _linkRegistry = new HashMap<String, LinkRegistry>();
+
     public VirtualHostImpl(IApplicationRegistry appRegistry, VirtualHostConfiguration hostConfig) throws Exception
     {
         if (hostConfig == null)
@@ -673,6 +677,17 @@ public class VirtualHostImpl implements 
         }
     }
 
+    public synchronized LinkRegistry getLinkRegistry(String remoteContainerId)
+    {
+        LinkRegistry linkRegistry = _linkRegistry.get(remoteContainerId);
+        if(linkRegistry == null)
+        {
+            linkRegistry = new LinkRegistry();
+            _linkRegistry.put(remoteContainerId, linkRegistry);
+        }
+        return linkRegistry;
+    }
+
     public ConfigStore getConfigStore()
     {
         return getApplicationRegistry().getConfigStore();

Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/InternalTestProtocolSession.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/InternalTestProtocolSession.java?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/InternalTestProtocolSession.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/InternalTestProtocolSession.java Wed Apr  4 21:10:07 2012
@@ -34,6 +34,7 @@ import org.apache.qpid.server.registry.A
 import org.apache.qpid.server.security.auth.sasl.UsernamePrincipal;
 import org.apache.qpid.server.subscription.ClientDeliveryMethod;
 import org.apache.qpid.server.subscription.Subscription;
+import org.apache.qpid.server.subscription.SubscriptionImpl;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.transport.TestNetworkConnection;
 
@@ -239,12 +240,12 @@ public class InternalTestProtocolSession
                     _channelDelivers.put(_channelId, consumers);
                 }
 
-                LinkedList<DeliveryPair> consumerDelivers = consumers.get(sub.getConsumerTag());
+                LinkedList<DeliveryPair> consumerDelivers = consumers.get(((SubscriptionImpl)sub).getConsumerTag());
 
                 if (consumerDelivers == null)
                 {
                     consumerDelivers = new LinkedList<DeliveryPair>();
-                    consumers.put(sub.getConsumerTag(), consumerDelivers);
+                    consumers.put(((SubscriptionImpl)sub).getConsumerTag(), consumerDelivers);
                 }
 
                 consumerDelivers.add(new DeliveryPair(deliveryTag, (AMQMessage)entry.getMessage()));

Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java Wed Apr  4 21:10:07 2012
@@ -35,6 +35,7 @@ import java.util.Set;
 
 public class MultiVersionProtocolEngineFactoryTest extends QpidTestCase
 {
+
     protected void setUp() throws Exception
     {
         super.setUp();
@@ -93,7 +94,20 @@ public class MultiVersionProtocolEngineF
                      (byte) 0,
                      (byte) 10
         };
-    
+
+
+    private static final byte[] AMQP_1_0_0_HEADER =
+            new byte[] {
+                    (byte)'A',
+                    (byte)'M',
+                    (byte)'Q',
+                    (byte)'P',
+                    (byte) 0,
+                    (byte) 1,
+                    (byte) 0,
+                    (byte) 0
+            };
+
     private byte[] getAmqpHeader(final AmqpProtocolVersion version)
     {
         switch(version)
@@ -106,6 +120,8 @@ public class MultiVersionProtocolEngineF
                 return AMQP_0_9_1_HEADER;
             case v0_10:
                 return AMQP_0_10_HEADER;
+            case v1_0_0:
+                return AMQP_1_0_0_HEADER;
             default:
                 fail("unknown AMQP version, appropriate header must be added for new protocol version");
                 return null;

Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticatorTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticatorTest.java?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticatorTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticatorTest.java Wed Apr  4 21:10:07 2012
@@ -29,6 +29,7 @@ import org.apache.qpid.server.security.a
 
 import javax.management.remote.JMXPrincipal;
 import javax.security.auth.Subject;
+import javax.security.auth.callback.CallbackHandler;
 import javax.security.sasl.SaslException;
 import javax.security.sasl.SaslServer;
 import java.util.Collections;
@@ -254,6 +255,11 @@ public class RMIPasswordAuthenticatorTes
                     return new AuthenticationResult(AuthenticationStatus.CONTINUE);
                 }
             }
+
+            public CallbackHandler getHandler(String mechanism)
+            {
+                return null;
+            }
         };
     }
 }

Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java Wed Apr  4 21:10:07 2012
@@ -277,6 +277,10 @@ public class MockSubscription implements
         return false;
     }
 
+    public void queueEmpty() throws AMQException
+    {
+    }
+
     public void setActive(final boolean isActive)
     {
         _isActive = isActive;

Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java Wed Apr  4 21:10:07 2012
@@ -33,6 +33,7 @@ import org.apache.qpid.server.exchange.E
 import org.apache.qpid.server.exchange.ExchangeRegistry;
 import org.apache.qpid.server.federation.BrokerLink;
 import org.apache.qpid.server.management.ManagedObject;
+import org.apache.qpid.server.protocol.v1_0.LinkRegistry;
 import org.apache.qpid.server.queue.QueueRegistry;
 import org.apache.qpid.server.registry.IApplicationRegistry;
 import org.apache.qpid.server.security.SecurityManager;
@@ -171,6 +172,11 @@ public class MockVirtualHost implements 
 
     }
 
+    public LinkRegistry getLinkRegistry(String remoteContainerId)
+    {
+        return null;
+    }
+
     public ScheduledFuture<?> scheduleTask(long delay, Runnable timeoutTask)
     {
         return null;

Modified: qpid/trunk/qpid/java/build.deps
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.deps?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.deps (original)
+++ qpid/trunk/qpid/java/build.deps Wed Apr  4 21:10:07 2012
@@ -53,6 +53,8 @@ commons-configuration.libs = ${commons-b
 
 common.libs=${slf4j-api}
 client.libs=${geronimo-jms}
+amqp-1-0-client.libs=${commons-cli}
+amqp-1-0-client-jms.libs=${geronimo-jms}
 tools.libs=${commons-configuration.libs} ${log4j}
 broker.libs=${commons-cli} ${commons-logging} ${log4j} ${slf4j-log4j} \
     ${xalan} ${felix.libs} ${derby-db} ${commons-configuration.libs}

Modified: qpid/trunk/qpid/java/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.xml?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.xml (original)
+++ qpid/trunk/qpid/java/build.xml Wed Apr  4 21:10:07 2012
@@ -26,7 +26,7 @@
   <findSubProjects name="client-plugins" dir="client-plugins"/>
   <findSubProjects name="management" dir="management" excludes="common,example"/>
 
-  <property name="modules.core"       value="common management/common broker client tools"/>
+  <property name="modules.core"       value="common management/common amqp-1-0-common broker client amqp-1-0-client amqp-1-0-client-jms tools"/>
   <property name="modules.examples"   value="client/example management/example"/>
   <property name="modules.tests"      value="systests"/>
   <property name="modules.management" value="${management}"/>

Modified: qpid/trunk/qpid/java/systests/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/build.xml?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/build.xml (original)
+++ qpid/trunk/qpid/java/systests/build.xml Wed Apr  4 21:10:07 2012
@@ -27,7 +27,7 @@ nn - or more contributor license agreeme
         </and>
     </condition>
 
-    <property name="module.depends" value="client management/common broker broker/test common common/test jca ${systests.optional.depends}"/>
+    <property name="module.depends" value="client management/common broker broker/test common amqp-1-0-common common/test jca ${systests.optional.depends}"/>
     <property name="module.test.src" location="src/main/java"/>
     <property name="module.test.excludes"
               value="**/DropInTest.java,**/TestClientControlledTest.java"/>

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java Wed Apr  4 21:10:07 2012
@@ -77,6 +77,7 @@ public class SupportedProtocolVersionsTe
     public void testDisabling010() throws Exception
     {
         //disable 0-10 support
+        setConfigurationProperty("connector.amqp10enabled", "false");
         setConfigurationProperty("connector.amqp010enabled", "false");
 
         super.setUp();
@@ -92,6 +93,7 @@ public class SupportedProtocolVersionsTe
     public void testDisabling091and010() throws Exception
     {
         //disable 0-91 and 0-10 support
+        setConfigurationProperty(ServerConfiguration.CONNECTOR_AMQP10ENABLED, "false");
         setConfigurationProperty(ServerConfiguration.CONNECTOR_AMQP010ENABLED, "false");
         setConfigurationProperty(ServerConfiguration.CONNECTOR_AMQP091ENABLED, "false");
 
@@ -111,6 +113,7 @@ public class SupportedProtocolVersionsTe
         setConfigurationProperty(ServerConfiguration.CONNECTOR_AMQP09ENABLED, "false");
         setConfigurationProperty(ServerConfiguration.CONNECTOR_AMQP091ENABLED, "false");
         setConfigurationProperty(ServerConfiguration.CONNECTOR_AMQP010ENABLED, "false");
+        setConfigurationProperty(ServerConfiguration.CONNECTOR_AMQP10ENABLED, "false");
 
         super.setUp();
 

Modified: qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile Wed Apr  4 21:10:07 2012
@@ -27,7 +27,7 @@ messagestorefactory.class.name=org.apach
 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/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile Wed Apr  4 21:10:07 2012
@@ -27,7 +27,7 @@ messagestorefactory.class.name=org.apach
 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

Modified: qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile Wed Apr  4 21:10:07 2012
@@ -27,7 +27,7 @@ messagestorefactory.class.name=org.apach
 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/trunk/qpid/java/test-profiles/java-bdb.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-bdb.0-8.testprofile?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-bdb.0-8.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-bdb.0-8.testprofile Wed Apr  4 21:10:07 2012
@@ -28,7 +28,7 @@ messagestorefactory.class.name=org.apach
 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/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile Wed Apr  4 21:10:07 2012
@@ -28,7 +28,7 @@ messagestorefactory.class.name=org.apach
 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

Modified: qpid/trunk/qpid/java/test-profiles/java-bdb.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-bdb.0-9.testprofile?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-bdb.0-9.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-bdb.0-9.testprofile Wed Apr  4 21:10:07 2012
@@ -28,7 +28,7 @@ messagestorefactory.class.name=org.apach
 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/trunk/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile Wed Apr  4 21:10:07 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
-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
 messagestorefactory.class.name=org.apache.qpid.server.store.derby.DerbyMessageStoreFactory
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true

Modified: qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile Wed Apr  4 21:10:07 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
-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
 messagestorefactory.class.name=org.apache.qpid.server.store.derby.DerbyMessageStoreFactory
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true

Modified: qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile Wed Apr  4 21:10:07 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
-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
 messagestorefactory.class.name=org.apache.qpid.server.store.derby.DerbyMessageStoreFactory
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true

Modified: qpid/trunk/qpid/java/test-profiles/java-dby.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-dby.0-8.testprofile?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-dby.0-8.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-dby.0-8.testprofile Wed Apr  4 21:10:07 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
-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
 messagestorefactory.class.name=org.apache.qpid.server.store.derby.DerbyMessageStoreFactory
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true

Modified: qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile Wed Apr  4 21:10:07 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
-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
 messagestorefactory.class.name=org.apache.qpid.server.store.derby.DerbyMessageStoreFactory
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true

Modified: qpid/trunk/qpid/java/test-profiles/java-dby.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-dby.0-9.testprofile?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-dby.0-9.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-dby.0-9.testprofile Wed Apr  4 21:10:07 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
-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
 messagestorefactory.class.name=org.apache.qpid.server.store.derby.DerbyMessageStoreFactory
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true

Modified: qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile Wed Apr  4 21:10:07 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/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile Wed Apr  4 21:10:07 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 
 #

Modified: qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile Wed Apr  4 21:10:07 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/trunk/qpid/java/test-profiles/java-mms.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-mms.0-8.testprofile?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-mms.0-8.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-mms.0-8.testprofile Wed Apr  4 21:10:07 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/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile Wed Apr  4 21:10:07 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 
 #

Modified: qpid/trunk/qpid/java/test-profiles/java-mms.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-mms.0-9.testprofile?rev=1309594&r1=1309593&r2=1309594&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-mms.0-9.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-mms.0-9.testprofile Wed Apr  4 21:10:07 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
 #



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