You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2014/01/29 15:48:55 UTC

svn commit: r1562466 [3/6] - in /qpid/branches/java-broker-bdb-ha: ./ qpid/ qpid/cpp/src/ qpid/cpp/src/qpid/client/ qpid/cpp/src/qpid/framing/ qpid/cpp/src/qpid/ha/ qpid/cpp/src/qpid/messaging/amqp/ qpid/cpp/src/tests/ qpid/java/ qpid/java/amqp-1-0-cli...

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java Wed Jan 29 14:48:50 2014
@@ -23,7 +23,7 @@ package org.apache.qpid.server.store;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import org.apache.qpid.AMQStoreException;
-import org.apache.qpid.server.message.EnqueableMessage;
+import org.apache.qpid.server.message.EnqueueableMessage;
 import org.apache.qpid.server.model.VirtualHost;
 
 /** A simple message store that stores the messages in a thread-safe structure in memory. */
@@ -41,12 +41,12 @@ abstract public class AbstractMemoryMess
         }
 
         @Override
-        public void enqueueMessage(TransactionLogResource queue, EnqueableMessage message) throws AMQStoreException
+        public void enqueueMessage(TransactionLogResource queue, EnqueueableMessage message) throws AMQStoreException
         {
         }
 
         @Override
-        public void dequeueMessage(TransactionLogResource  queue, EnqueableMessage message) throws AMQStoreException
+        public void dequeueMessage(TransactionLogResource  queue, EnqueueableMessage message) throws AMQStoreException
         {
         }
 
@@ -133,9 +133,11 @@ abstract public class AbstractMemoryMess
     @Override
     public void close()
     {
-        _stateManager.attainState(State.CLOSING);
-        _closed.getAndSet(true);
-        _stateManager.attainState(State.CLOSED);
+        if (_closed.compareAndSet(false, true))
+        {
+            _stateManager.attainState(State.CLOSING);
+            _stateManager.attainState(State.CLOSED);
+        }
     }
 
     @Override

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationRecoverer.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationRecoverer.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationRecoverer.java Wed Jan 29 14:48:50 2014
@@ -86,7 +86,7 @@ public class DurableConfigurationRecover
         DurableConfiguredObjectRecoverer recoverer = getRecoverer(type);
         if(recoverer == null)
         {
-            throw new IllegalConfigurationException("Unkown type for configured object: " + type);
+            throw new IllegalConfigurationException("Unknown type for configured object: " + type);
         }
         recoverer.load(this, id, attributes);
     }

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/StateManager.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/StateManager.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/StateManager.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/StateManager.java Wed Jan 29 14:48:50 2014
@@ -75,7 +75,7 @@ public class StateManager
     }
 
     public static final Transition INITIALISE = new Transition(State.INITIAL, State.INITIALISING, Event.BEFORE_INIT);
-    public static final Transition INITALISE_COMPLETE = new Transition(State.INITIALISING, State.INITIALISED, Event.AFTER_INIT);
+    public static final Transition INITIALISE_COMPLETE = new Transition(State.INITIALISING, State.INITIALISED, Event.AFTER_INIT);
 
     public static final Transition ACTIVATE = new Transition(State.INITIALISED, State.ACTIVATING, Event.BEFORE_ACTIVATE);
     public static final Transition ACTIVATE_COMPLETE = new Transition(State.ACTIVATING, State.ACTIVE, Event.AFTER_ACTIVATE);

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/Transaction.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/Transaction.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/Transaction.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/Transaction.java Wed Jan 29 14:48:50 2014
@@ -21,7 +21,7 @@
 package org.apache.qpid.server.store;
 
 import org.apache.qpid.AMQStoreException;
-import org.apache.qpid.server.message.EnqueableMessage;
+import org.apache.qpid.server.message.EnqueueableMessage;
 
 public interface Transaction
 {
@@ -34,7 +34,7 @@ public interface Transaction
      * @param message
      * @throws org.apache.qpid.AMQStoreException If the operation fails for any reason.
      */
-    void enqueueMessage(TransactionLogResource queue, EnqueableMessage message) throws AMQStoreException;
+    void enqueueMessage(TransactionLogResource queue, EnqueueableMessage message) throws AMQStoreException;
 
     /**
      * Extracts a message from a specified queue, in a given transactional context.
@@ -43,7 +43,7 @@ public interface Transaction
      * @param message The message to dequeue.
      * @throws AMQStoreException If the operation fails for any reason, or if the specified message does not exist.
      */
-    void dequeueMessage(TransactionLogResource queue, EnqueableMessage message) throws AMQStoreException;
+    void dequeueMessage(TransactionLogResource queue, EnqueueableMessage message) throws AMQStoreException;
 
 
     /**
@@ -71,7 +71,7 @@ public interface Transaction
     public static interface Record
     {
         TransactionLogResource getQueue();
-        EnqueableMessage getMessage();
+        EnqueueableMessage getMessage();
     }
 
     void removeXid(long format, byte[] globalId, byte[] branchId) throws AMQStoreException;

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/ClientDeliveryMethod.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/ClientDeliveryMethod.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/ClientDeliveryMethod.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/ClientDeliveryMethod.java Wed Jan 29 14:48:50 2014
@@ -21,9 +21,11 @@
 package org.apache.qpid.server.subscription;
 
 import org.apache.qpid.AMQException;
-import org.apache.qpid.server.queue.QueueEntry;
+import org.apache.qpid.server.message.InstanceProperties;
+import org.apache.qpid.server.message.ServerMessage;
 
 public interface ClientDeliveryMethod
 {
-    void deliverToClient(final Subscription sub, final QueueEntry entry, final long deliveryTag) throws AMQException;
+    void deliverToClient(final Subscription sub, final ServerMessage message, final InstanceProperties props,
+                         final long deliveryTag) throws AMQException;
 }

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/SubscriptionList.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/SubscriptionList.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/SubscriptionList.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/SubscriptionList.java Wed Jan 29 14:48:50 2014
@@ -173,7 +173,7 @@ public class SubscriptionList
                     insert(new SubscriptionNode(), false);
                 }
 
-                //advance the next node reference in the 'prevNode' to scavange
+                //advance the next node reference in the 'prevNode' to scavenge
                 //the newly 'deleted' node for the Subscription.
                 prevNode.findNext();
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java Wed Jan 29 14:48:50 2014
@@ -24,7 +24,7 @@ import org.apache.log4j.Logger;
 
 import org.apache.qpid.AMQException;
 import org.apache.qpid.AMQStoreException;
-import org.apache.qpid.server.message.EnqueableMessage;
+import org.apache.qpid.server.message.EnqueueableMessage;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.queue.BaseQueue;
 import org.apache.qpid.server.queue.QueueEntry;
@@ -51,7 +51,7 @@ public class AsyncAutoCommitTransaction 
     private final MessageStore _messageStore;
     private final FutureRecorder _futureRecorder;
 
-    //Set true to ensure strict ordering when enqueing messages with mixed delivery mode, i.e. disable async persistence
+    //Set true to ensure strict ordering when enqueuing messages with mixed delivery mode, i.e. disable async persistence
     private boolean _strictOrderWithMixedDeliveryMode = Boolean.getBoolean(QPID_STRICT_ORDER_WITH_MIXED_DELIVERY_MODE);
 
     public static interface FutureRecorder
@@ -88,7 +88,7 @@ public class AsyncAutoCommitTransaction 
 
     }
 
-    public void dequeue(BaseQueue queue, EnqueableMessage message, Action postTransactionAction)
+    public void dequeue(BaseQueue queue, EnqueueableMessage message, Action postTransactionAction)
     {
         Transaction txn = null;
         try
@@ -210,7 +210,7 @@ public class AsyncAutoCommitTransaction 
     }
 
 
-    public void enqueue(BaseQueue queue, EnqueableMessage message, Action postTransactionAction)
+    public void enqueue(BaseQueue queue, EnqueueableMessage message, Action postTransactionAction)
     {
         Transaction txn = null;
         try
@@ -248,7 +248,7 @@ public class AsyncAutoCommitTransaction 
 
     }
 
-    public void enqueue(List<? extends BaseQueue> queues, EnqueableMessage message, Action postTransactionAction)
+    public void enqueue(List<? extends BaseQueue> queues, EnqueueableMessage message, Action postTransactionAction)
     {
         Transaction txn = null;
         try

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java Wed Jan 29 14:48:50 2014
@@ -24,7 +24,7 @@ import org.apache.log4j.Logger;
 
 import org.apache.qpid.AMQException;
 import org.apache.qpid.AMQStoreException;
-import org.apache.qpid.server.message.EnqueableMessage;
+import org.apache.qpid.server.message.EnqueueableMessage;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.queue.BaseQueue;
 import org.apache.qpid.server.queue.QueueEntry;
@@ -73,7 +73,7 @@ public class AutoCommitTransaction imple
         immediateAction.postCommit();
     }
 
-    public void dequeue(BaseQueue queue, EnqueableMessage message, Action postTransactionAction)
+    public void dequeue(BaseQueue queue, EnqueueableMessage message, Action postTransactionAction)
     {
         Transaction txn = null;
         try
@@ -152,7 +152,7 @@ public class AutoCommitTransaction imple
     }
 
 
-    public void enqueue(BaseQueue queue, EnqueableMessage message, Action postTransactionAction)
+    public void enqueue(BaseQueue queue, EnqueueableMessage message, Action postTransactionAction)
     {
         Transaction txn = null;
         try
@@ -185,7 +185,7 @@ public class AutoCommitTransaction imple
 
     }
 
-    public void enqueue(List<? extends BaseQueue> queues, EnqueableMessage message, Action postTransactionAction)
+    public void enqueue(List<? extends BaseQueue> queues, EnqueueableMessage message, Action postTransactionAction)
     {
         Transaction txn = null;
         try

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java Wed Jan 29 14:48:50 2014
@@ -21,7 +21,7 @@
 
 package org.apache.qpid.server.txn;
 
-import org.apache.qpid.server.message.EnqueableMessage;
+import org.apache.qpid.server.message.EnqueueableMessage;
 import org.apache.qpid.server.protocol.AMQSessionModel;
 import org.apache.qpid.server.queue.BaseQueue;
 import org.apache.qpid.server.queue.QueueEntry;
@@ -66,7 +66,7 @@ public class DistributedTransaction impl
     {
         if(_branch != null)
         {
-            _branch.addPostTransactionAcion(postTransactionAction);
+            _branch.addPostTransactionAction(postTransactionAction);
         }
         else
         {
@@ -74,12 +74,12 @@ public class DistributedTransaction impl
         }
     }
 
-    public void dequeue(BaseQueue queue, EnqueableMessage message, Action postTransactionAction)
+    public void dequeue(BaseQueue queue, EnqueueableMessage message, Action postTransactionAction)
     {
         if(_branch != null)
         {
             _branch.dequeue(queue, message);
-            _branch.addPostTransactionAcion(postTransactionAction);
+            _branch.addPostTransactionAction(postTransactionAction);
         }
         else
         {
@@ -95,7 +95,7 @@ public class DistributedTransaction impl
             {
                 _branch.dequeue(entry.getQueue(), entry.getMessage());
             }
-            _branch.addPostTransactionAcion(postTransactionAction);
+            _branch.addPostTransactionAction(postTransactionAction);
         }
         else
         {
@@ -103,12 +103,12 @@ public class DistributedTransaction impl
         }
     }
 
-    public void enqueue(BaseQueue queue, EnqueableMessage message, Action postTransactionAction)
+    public void enqueue(BaseQueue queue, EnqueueableMessage message, Action postTransactionAction)
     {
         if(_branch != null)
         {
             _branch.enqueue(queue, message);
-            _branch.addPostTransactionAcion(postTransactionAction);
+            _branch.addPostTransactionAction(postTransactionAction);
             enqueue(Collections.singletonList(queue), message, postTransactionAction);
         }
         else
@@ -117,7 +117,7 @@ public class DistributedTransaction impl
         }
     }
 
-    public void enqueue(List<? extends BaseQueue> queues, EnqueableMessage message,
+    public void enqueue(List<? extends BaseQueue> queues, EnqueueableMessage message,
                         Action postTransactionAction)
     {
         if(_branch != null)
@@ -126,7 +126,7 @@ public class DistributedTransaction impl
             {
                 _branch.enqueue(queue, message);
             }
-            _branch.addPostTransactionAcion(postTransactionAction);
+            _branch.addPostTransactionAction(postTransactionAction);
         }
         else
         {

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java Wed Jan 29 14:48:50 2014
@@ -29,7 +29,7 @@ import java.util.concurrent.ScheduledFut
 
 import org.apache.log4j.Logger;
 import org.apache.qpid.AMQStoreException;
-import org.apache.qpid.server.message.EnqueableMessage;
+import org.apache.qpid.server.message.EnqueueableMessage;
 import org.apache.qpid.server.protocol.AMQSessionModel;
 import org.apache.qpid.server.queue.BaseQueue;
 import org.apache.qpid.server.store.MessageStore;
@@ -350,19 +350,19 @@ public class DtxBranch
     }
 
 
-    public void addPostTransactionAcion(ServerTransaction.Action postTransactionAction)
+    public void addPostTransactionAction(ServerTransaction.Action postTransactionAction)
     {
         _postTransactionActions.add(postTransactionAction);
     }
 
 
-    public void dequeue(BaseQueue queue, EnqueableMessage message)
+    public void dequeue(BaseQueue queue, EnqueueableMessage message)
     {
         _dequeueRecords.add(new Record(queue, message));
     }
 
 
-    public void enqueue(BaseQueue queue, EnqueableMessage message)
+    public void enqueue(BaseQueue queue, EnqueueableMessage message)
     {
         _enqueueRecords.add(new Record(queue, message));
     }
@@ -370,9 +370,9 @@ public class DtxBranch
     private static final class Record implements Transaction.Record
     {
         private final BaseQueue _queue;
-        private final EnqueableMessage _message;
+        private final EnqueueableMessage _message;
 
-        public Record(BaseQueue queue, EnqueableMessage message)
+        public Record(BaseQueue queue, EnqueueableMessage message)
         {
             _queue = queue;
             _message = message;
@@ -383,7 +383,7 @@ public class DtxBranch
             return _queue;
         }
 
-        public EnqueableMessage getMessage()
+        public EnqueueableMessage getMessage()
         {
             return _message;
         }

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java Wed Jan 29 14:48:50 2014
@@ -20,12 +20,12 @@
  */
 package org.apache.qpid.server.txn;
 
+import org.apache.qpid.server.message.EnqueueableMessage;
 import org.apache.qpid.server.store.StoreFuture;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.AMQException;
-import org.apache.qpid.server.message.EnqueableMessage;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.queue.BaseQueue;
 import org.apache.qpid.server.queue.QueueEntry;
@@ -91,7 +91,7 @@ public class LocalTransaction implements
         _postTransactionActions.add(postTransactionAction);
     }
 
-    public void dequeue(BaseQueue queue, EnqueableMessage message, Action postTransactionAction)
+    public void dequeue(BaseQueue queue, EnqueueableMessage message, Action postTransactionAction)
     {
         sync();
         _postTransactionActions.add(postTransactionAction);
@@ -195,7 +195,7 @@ public class LocalTransaction implements
         }
     }
 
-    public void enqueue(BaseQueue queue, EnqueableMessage message, Action postTransactionAction)
+    public void enqueue(BaseQueue queue, EnqueueableMessage message, Action postTransactionAction)
     {
         sync();
         _postTransactionActions.add(postTransactionAction);
@@ -222,7 +222,7 @@ public class LocalTransaction implements
         }
     }
 
-    public void enqueue(List<? extends BaseQueue> queues, EnqueableMessage message, Action postTransactionAction)
+    public void enqueue(List<? extends BaseQueue> queues, EnqueueableMessage message, Action postTransactionAction)
     {
         sync();
         _postTransactionActions.add(postTransactionAction);

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java Wed Jan 29 14:48:50 2014
@@ -22,7 +22,8 @@ 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.message.EnqueueableMessage;
 import org.apache.qpid.server.queue.BaseQueue;
 import org.apache.qpid.server.queue.QueueEntry;
 
@@ -78,7 +79,7 @@ public interface ServerTransaction
      * 
      * A store operation will result only for a persistent message on a durable queue.
      */
-    void dequeue(BaseQueue queue, EnqueableMessage message, Action postTransactionAction);
+    void dequeue(BaseQueue queue, EnqueueableMessage message, Action postTransactionAction);
 
     /** 
      * Dequeue a message(s) from queue(s) registering a post transaction action.
@@ -92,14 +93,14 @@ public interface ServerTransaction
      * 
      * A store operation will result only for a persistent message on a durable queue.
      */
-    void enqueue(BaseQueue queue, EnqueableMessage message, Action postTransactionAction);
+    void enqueue(BaseQueue queue, EnqueueableMessage message, Action postTransactionAction);
 
     /** 
      * Enqueue a message(s) to queue(s) registering a post transaction action.
      * 
      * Store operations will result only for a persistent messages on durable queues.
      */
-    void enqueue(List<? extends BaseQueue> queues, EnqueableMessage message, Action postTransactionAction);
+    void enqueue(List<? extends BaseQueue> queues, EnqueueableMessage message, Action postTransactionAction);
 
     /** 
      * Commit the transaction represented by this object.

Propchange: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost:r1560620-1562452

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/DefaultUpgraderProvider.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/DefaultUpgraderProvider.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/DefaultUpgraderProvider.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/DefaultUpgraderProvider.java Wed Jan 29 14:48:50 2014
@@ -173,7 +173,7 @@ public class DefaultUpgraderProvider imp
 
     /*
      * Change the type string from org.apache.qpid.server.model.Foo to Foo (in line with the practice in the broker
-     * configuration store).  Also remove bindings which reference non-existant queues or exchanges.
+     * configuration store).  Also remove bindings which reference nonexistent queues or exchanges.
      */
     private class Version1Upgrader extends NonNullUpgrader
     {

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java Wed Jan 29 14:48:50 2014
@@ -33,7 +33,7 @@ import org.apache.qpid.server.exchange.E
 import org.apache.qpid.server.logging.actors.CurrentActor;
 import org.apache.qpid.server.logging.messages.TransactionLogMessages;
 import org.apache.qpid.server.logging.subjects.MessageStoreLogSubject;
-import org.apache.qpid.server.message.EnqueableMessage;
+import org.apache.qpid.server.message.EnqueueableMessage;
 import org.apache.qpid.server.message.MessageReference;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.queue.AMQQueue;
@@ -133,7 +133,7 @@ public class VirtualHostConfigRecoveryHa
 
                     branch.enqueue(queue,message);
 
-                    branch.addPostTransactionAcion(new ServerTransaction.Action()
+                    branch.addPostTransactionAction(new ServerTransaction.Action()
                     {
 
                         public void postCommit()
@@ -194,12 +194,12 @@ public class VirtualHostConfigRecoveryHa
 
                     branch.dequeue(queue, message);
 
-                    branch.addPostTransactionAcion(new ServerTransaction.Action()
+                    branch.addPostTransactionAction(new ServerTransaction.Action()
                     {
 
                         public void postCommit()
                         {
-                            entry.discard();
+                            entry.delete();
                         }
 
                         public void onRollback()
@@ -343,7 +343,7 @@ public class VirtualHostConfigRecoveryHa
         return this;
     }
 
-    private static class DummyMessage implements EnqueableMessage
+    private static class DummyMessage implements EnqueueableMessage
     {
 
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java Wed Jan 29 14:48:50 2014
@@ -94,7 +94,7 @@ public class BrokerOptionsTest extends Q
         assertEquals(expectedPath, _options.getLogConfigFileLocation());
     }
 
-    public void testDefaultLogConfigFileWithoutQpiddHome()
+    public void testDefaultLogConfigFileWithoutQpidHome()
     {
         setTestSystemProperty(BrokerProperties.PROPERTY_QPID_HOME, null);
 
@@ -271,7 +271,7 @@ public class BrokerOptionsTest extends Q
         assertEquals("unexpected number of entries", 6, _options.getConfigProperties().keySet().size());
     }
 
-    public void testDefaultomeDirWithoutQpidHome()
+    public void testDefaultHomeDirWithoutQpidHome()
     {
         setTestSystemProperty("QPID_HOME", null);
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java Wed Jan 29 14:48:50 2014
@@ -95,9 +95,9 @@ public class TransactionTimeoutHelperTes
     public void testIdleTransactionProducesWarningOnly() throws Exception
     {
         final long sixtyOneSecondsAgo = _now - SECONDS.toMillis(61);
-        final long thrityOneSecondsAgo = _now - SECONDS.toMillis(31);
+        final long thirtyOneSecondsAgo = _now - SECONDS.toMillis(31);
 
-        configureMockTransaction(sixtyOneSecondsAgo, thrityOneSecondsAgo);
+        configureMockTransaction(sixtyOneSecondsAgo, thirtyOneSecondsAgo);
 
         _transactionTimeoutHelper.checkIdleOrOpenTimes(_transaction, 0, 0, SECONDS.toMillis(30), 0);
 
@@ -108,9 +108,9 @@ public class TransactionTimeoutHelperTes
     public void testIdleTransactionProducesTimeoutActionOnly() throws Exception
     {
         final long sixtyOneSecondsAgo = _now - SECONDS.toMillis(61);
-        final long thrityOneSecondsAgo = _now - SECONDS.toMillis(31);
+        final long thirtyOneSecondsAgo = _now - SECONDS.toMillis(31);
 
-        configureMockTransaction(sixtyOneSecondsAgo, thrityOneSecondsAgo);
+        configureMockTransaction(sixtyOneSecondsAgo, thirtyOneSecondsAgo);
 
         _transactionTimeoutHelper.checkIdleOrOpenTimes(_transaction, 0, 0, 0, SECONDS.toMillis(30));
 
@@ -121,9 +121,9 @@ public class TransactionTimeoutHelperTes
     public void testIdleTransactionProducesWarningAndTimeoutAction() throws Exception
     {
         final long sixtyOneSecondsAgo = _now - SECONDS.toMillis(61);
-        final long thrityOneSecondsAgo = _now - SECONDS.toMillis(31);
+        final long thirtyOneSecondsAgo = _now - SECONDS.toMillis(31);
 
-        configureMockTransaction(sixtyOneSecondsAgo, thrityOneSecondsAgo);
+        configureMockTransaction(sixtyOneSecondsAgo, thirtyOneSecondsAgo);
 
         _transactionTimeoutHelper.checkIdleOrOpenTimes(_transaction, 0, 0, SECONDS.toMillis(15), SECONDS.toMillis(30));
 
@@ -176,9 +176,9 @@ public class TransactionTimeoutHelperTes
         when(_transaction.getTransactionUpdateTime()).thenReturn(updateTime);
     }
 
-    private LogMessage isLogMessage(String expectedlogHierarchy, String expectedText)
+    private LogMessage isLogMessage(String expectedLogHierarchy, String expectedText)
     {
-        return argThat(new IsLogMessage(expectedlogHierarchy, expectedText));
+        return argThat(new IsLogMessage(expectedLogHierarchy, expectedText));
     }
 
     class IsLogMessage extends ArgumentMatcher<LogMessage>
@@ -188,9 +188,9 @@ public class TransactionTimeoutHelperTes
         private String _hierarchyMatchesFailure;
         private String _logMessageMatchesFailure;
 
-        public IsLogMessage(String expectedlogHierarchy, String expectedLogMessageMatches)
+        public IsLogMessage(String expectedLogHierarchy, String expectedLogMessageMatches)
         {
-            _expectedLogHierarchy = expectedlogHierarchy;
+            _expectedLogHierarchy = expectedLogHierarchy;
             _expectedLogMessageMatches = expectedLogMessageMatches;
         }
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/plugins/AbstractConfigurationTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/plugins/AbstractConfigurationTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/plugins/AbstractConfigurationTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/plugins/AbstractConfigurationTest.java Wed Jan 29 14:48:50 2014
@@ -55,7 +55,7 @@ public class AbstractConfigurationTest e
         @Override
         public void validateConfiguration() throws ConfigurationException
         {
-            // no validation requried
+            // no validation required
         }
 
         public String getName()
@@ -79,22 +79,22 @@ public class AbstractConfigurationTest e
         // Test does not directly use the AppRegistry but the configured broker
         // is required for the correct ConfigurationPlugin processing
         super.setUp();
-        XMLConfiguration xmlconfig = new XMLConfiguration();
-        xmlconfig.addProperty("base.element[@property]", "property");
-        xmlconfig.addProperty("base.element.name", "name");
+        XMLConfiguration xmlConfig = new XMLConfiguration();
+        xmlConfig.addProperty("base.element[@property]", "property");
+        xmlConfig.addProperty("base.element.name", "name");
         // We make these strings as that is how they will be read from the file.
-        xmlconfig.addProperty("base.element.positiveLong", String.valueOf(POSITIVE_LONG));
-        xmlconfig.addProperty("base.element.negativeLong", String.valueOf(NEGATIVE_LONG));
-        xmlconfig.addProperty("base.element.boolean", String.valueOf(true));
-        xmlconfig.addProperty("base.element.double", String.valueOf(DOUBLE));
+        xmlConfig.addProperty("base.element.positiveLong", String.valueOf(POSITIVE_LONG));
+        xmlConfig.addProperty("base.element.negativeLong", String.valueOf(NEGATIVE_LONG));
+        xmlConfig.addProperty("base.element.boolean", String.valueOf(true));
+        xmlConfig.addProperty("base.element.double", String.valueOf(DOUBLE));
         for (int i = 0; i < LIST_SIZE; i++)
         {
-            xmlconfig.addProperty("base.element.list", i);
+            xmlConfig.addProperty("base.element.list", i);
         }
 
         //Use a composite configuration as this is what our broker code uses.
         CompositeConfiguration composite = new CompositeConfiguration();
-        composite.addConfiguration(xmlconfig);
+        composite.addConfiguration(xmlConfig);
 
         _plugin = new TestConfigPlugin();
 
@@ -117,7 +117,7 @@ public class AbstractConfigurationTest e
         assertFalse("Plugins has configuration", _plugin.hasConfiguration());
     }
 
-    public void testValuesRetreived()
+    public void testValuesRetrieved()
     {
         assertEquals("Name not correct", "name", _plugin.getName());
         assertEquals("Property not correct", "property", _plugin.getProperty());

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java Wed Jan 29 14:48:50 2014
@@ -367,7 +367,7 @@ public class BrokerRecovererTest extends
             public ConfiguredObjectRecoverer<? extends ConfiguredObject> getRecoverer(String type)
             {
                 @SuppressWarnings({ "unchecked", "rawtypes" })
-                final ConfiguredObjectRecoverer<?  extends ConfiguredObject> recovever = new ConfiguredObjectRecoverer()
+                final ConfiguredObjectRecoverer<?  extends ConfiguredObject> recoverer = new ConfiguredObjectRecoverer()
                 {
                     @Override
                     public ConfiguredObject create(RecovererProvider recovererProvider, ConfigurationEntry entry, ConfiguredObject... parents)
@@ -384,7 +384,7 @@ public class BrokerRecovererTest extends
                     }
                 };
 
-                return recovever;
+                return recoverer;
             }
         };
         return recovererProvider;

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java Wed Jan 29 14:48:50 2014
@@ -61,8 +61,8 @@ public class DefaultRecovererProviderTes
                 mock(StoreConfigurationChangeListener.class));
         for (String configuredObjectType : supportedTypes)
         {
-            ConfiguredObjectRecoverer<?> recovever = provider.getRecoverer(configuredObjectType);
-            assertNotNull("Null recoverer for type: " + configuredObjectType, recovever);
+            ConfiguredObjectRecoverer<?> recoverer = provider.getRecoverer(configuredObjectType);
+            assertNotNull("Null recoverer for type: " + configuredObjectType, recoverer);
         }
     }
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java Wed Jan 29 14:48:50 2014
@@ -51,9 +51,9 @@ public class KeyStoreRecovererTest exten
         when(entry.getAttributes()).thenReturn(attributes);
         when(entry.getId()).thenReturn(id);
 
-        KeyStoreRecoverer recovever = new KeyStoreRecoverer();
+        KeyStoreRecoverer recoverer = new KeyStoreRecoverer();
 
-        KeyStore keyStore = recovever.create(null, entry, broker);
+        KeyStore keyStore = recoverer.create(null, entry, broker);
         assertNotNull("Key store configured object is not created", keyStore);
         assertEquals(id, keyStore.getId());
 
@@ -61,7 +61,7 @@ public class KeyStoreRecovererTest exten
         assertEquals(TestSSLConstants.BROKER_TRUSTSTORE_PASSWORD, keyStore.getPassword());
         assertNotNull(keyStore.getPassword());
 
-        //verify that we havent configured the key store with the actual dummy password value
+        //verify that we haven't configured the key store with the actual dummy password value
         assertFalse(AbstractKeyStoreAdapter.DUMMY_PASSWORD_MASK.equals(keyStore.getPassword()));
 
         // Verify the remaining attributes, including that the password value returned
@@ -83,7 +83,7 @@ public class KeyStoreRecovererTest exten
         ConfigurationEntry entry = mock(ConfigurationEntry.class);
         when(entry.getId()).thenReturn(id);
 
-        KeyStoreRecoverer recovever = new KeyStoreRecoverer();
+        KeyStoreRecoverer recoverer = new KeyStoreRecoverer();
 
         String[] mandatoryProperties = {KeyStore.NAME, KeyStore.PATH, KeyStore.PASSWORD};
         for (int i = 0; i < mandatoryProperties.length; i++)
@@ -93,7 +93,7 @@ public class KeyStoreRecovererTest exten
             when(entry.getAttributes()).thenReturn(properties);
             try
             {
-                recovever.create(null, entry, broker);
+                recoverer.create(null, entry, broker);
                 fail("Cannot create key store without a " + mandatoryProperties[i]);
             }
             catch(IllegalArgumentException e)

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java Wed Jan 29 14:48:50 2014
@@ -59,7 +59,7 @@ public class TrustStoreRecovererTest ext
         assertEquals(TestSSLConstants.BROKER_TRUSTSTORE_PASSWORD, trustStore.getPassword());
         assertNotNull(trustStore.getPassword());
 
-        //verify that we havent configured the trust store with the actual dummy password value
+        //verify that we haven't configured the trust store with the actual dummy password value
         assertFalse(AbstractKeyStoreAdapter.DUMMY_PASSWORD_MASK.equals(trustStore.getPassword()));
 
         // Verify the remaining attributes, including that the password value returned
@@ -82,7 +82,7 @@ public class TrustStoreRecovererTest ext
         when(entry.getAttributes()).thenReturn(attributes);
         when(entry.getId()).thenReturn(id);
 
-        TrustStoreRecoverer recovever = new TrustStoreRecoverer();
+        TrustStoreRecoverer recoverer = new TrustStoreRecoverer();
 
         String[] mandatoryProperties = {TrustStore.NAME, TrustStore.PATH, TrustStore.PASSWORD};
         for (int i = 0; i < mandatoryProperties.length; i++)
@@ -92,7 +92,7 @@ public class TrustStoreRecovererTest ext
             when(entry.getAttributes()).thenReturn(properties);
             try
             {
-                recovever.create(null, entry, broker);
+                recoverer.create(null, entry, broker);
                 fail("Cannot create key store without a " + mandatoryProperties[i]);
             }
             catch(IllegalArgumentException e)

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java Wed Jan 29 14:48:50 2014
@@ -64,7 +64,7 @@ public class VirtualHostRecovererTest ex
         assertEquals("Unexpected name", getName(), host.getName());
     }
 
-    public void testCreateVirtualHostFromStoreConfigAtrributes()
+    public void testCreateVirtualHostFromStoreConfigAttributes()
     {
         StatisticsGatherer statisticsGatherer = mock(StatisticsGatherer.class);
         SecurityManager securityManager = mock(SecurityManager.class);
@@ -121,7 +121,7 @@ public class VirtualHostRecovererTest ex
             try
             {
                 recoverer.create(null, entry, parent);
-                fail("Cannot create a virtual host without a manadatory attribute " + name);
+                fail("Cannot create a virtual host without a mandatory attribute " + name);
             }
             catch(IllegalConfigurationException e)
             {

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java Wed Jan 29 14:48:50 2014
@@ -203,9 +203,9 @@ public abstract class ConfigurationEntry
         assertNotNull("Root entry does not exist", newBrokerConfigEntry);
         assertEquals("Unexpected id", _brokerId, newBrokerConfigEntry.getId());
         assertEquals("Unexpected type ", Broker.class.getSimpleName(), newBrokerConfigEntry.getType());
-        Map<String, Object> newBrokerattributes = newBrokerConfigEntry.getAttributes();
-        assertNotNull("Attributes cannot be null", newBrokerattributes);
-        assertEquals("Unexpected attributes", attributes, newBrokerattributes);
+        Map<String, Object> newBrokerAttributes = newBrokerConfigEntry.getAttributes();
+        assertNotNull("Attributes cannot be null", newBrokerAttributes);
+        assertEquals("Unexpected attributes", attributes, newBrokerAttributes);
     }
 
     public void testSaveNewVirtualHost()
@@ -411,8 +411,8 @@ public abstract class ConfigurationEntry
         assertEquals("Unexpected preference provider ID in authentication provider children set", preferencesProviderId, _store
                 .getEntry(_authenticationProviderId).getChildrenIds().iterator().next());
         ConfigurationEntry preferencesProviderEntry = _store.getEntry(preferencesProviderId);
-        assertNotNull("Preferences providert is not found", preferencesProviderEntry);
-        assertEquals("Unexpected preferences providert id", preferencesProviderId, preferencesProviderEntry.getId());
+        assertNotNull("Preferences provider is not found", preferencesProviderEntry);
+        assertEquals("Unexpected preferences provider id", preferencesProviderId, preferencesProviderEntry.getId());
         Map<String, Object> attributes = preferencesProviderEntry.getAttributes();
         assertEquals("Unexpected preferences provider name", name, attributes.get(PreferencesProvider.NAME));
         assertEquals("Unexpected preferences provider path", path, attributes.get(FileSystemPreferencesProvider.PATH));

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStoreTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStoreTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStoreTest.java Wed Jan 29 14:48:50 2014
@@ -159,7 +159,7 @@ public class JsonConfigurationEntryStore
         assertEquals("Unexpected root entry", brokerId, root.getId());
         Map<String, Object> attributes = root.getAttributes();
         assertNotNull("Attributes not found", attributes);
-        assertEquals("Unexpected number of attriburtes", 2, attributes.size());
+        assertEquals("Unexpected number of attributes", 2, attributes.size());
         assertEquals("Unexpected name attribute", getTestName(), attributes.get(Broker.NAME));
         assertEquals("Unexpected version attribute", 1, attributes.get(Broker.STORE_VERSION));
     }
@@ -180,7 +180,7 @@ public class JsonConfigurationEntryStore
         assertEquals("Unexpected root entry", brokerId, root.getId());
         Map<String, Object> attributes = root.getAttributes();
         assertNotNull("Attributes not found", attributes);
-        assertEquals("Unexpected number of attriburtes", 2, attributes.size());
+        assertEquals("Unexpected number of attributes", 2, attributes.size());
         assertEquals("Unexpected name attribute", getTestName(), attributes.get(Broker.NAME));
         assertEquals("Unexpected version attribute", 1, attributes.get(Broker.STORE_VERSION));
     }
@@ -263,8 +263,8 @@ public class JsonConfigurationEntryStore
         ConfigurationEntry authenticationProviderEntry = newStore.getEntry(_authenticationProviderId);
         assertEquals("Unexpected preference provider ID in authentication provider children set", preferencesProviderId, authenticationProviderEntry.getChildrenIds().iterator().next());
         ConfigurationEntry preferencesProviderEntry = newStore.getEntry(preferencesProviderId);
-        assertNotNull("Preferences providert is not found", preferencesProviderEntry);
-        assertEquals("Unexpected preferences providert id", preferencesProviderId, preferencesProviderEntry.getId());
+        assertNotNull("Preferences provider is not found", preferencesProviderEntry);
+        assertEquals("Unexpected preferences provider id", preferencesProviderId, preferencesProviderEntry.getId());
         Map<String, Object> attributes = preferencesProviderEntry.getAttributes();
         assertEquals("Unexpected preferences provider name", name, attributes.get(PreferencesProvider.NAME));
         assertEquals("Unexpected preferences provider path", path, attributes.get(FileSystemPreferencesProvider.PATH));

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStoreTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStoreTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStoreTest.java Wed Jan 29 14:48:50 2014
@@ -100,7 +100,7 @@ public class MemoryConfigurationEntrySto
         assertEquals("Unexpected root entry", brokerId, root.getId());
         Map<String, Object> attributes = root.getAttributes();
         assertNotNull("Attributes not found", attributes);
-        assertEquals("Unexpected number of attriburtes", 1, attributes.size());
+        assertEquals("Unexpected number of attributes", 1, attributes.size());
         assertEquals("Unexpected name attribute", getTestName(), attributes.get(Broker.NAME));
     }
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java Wed Jan 29 14:48:50 2014
@@ -67,13 +67,13 @@ public class TaskExecutorTest extends Te
 
     public void testGetState()
     {
-        assertEquals("Unxpected initial state", State.INITIALISING, _executor.getState());
+        assertEquals("Unexpected initial state", State.INITIALISING, _executor.getState());
     }
 
     public void testStart()
     {
         _executor.start();
-        assertEquals("Unxpected started state", State.ACTIVE, _executor.getState());
+        assertEquals("Unexpected started state", State.ACTIVE, _executor.getState());
     }
 
     public void testStopImmediately() throws Exception
@@ -110,7 +110,7 @@ public class TaskExecutorTest extends Te
         assertTrue("The first task has not been triggered", waitForCallLatch.await(1000, TimeUnit.MILLISECONDS));
 
         _executor.stopImmediately();
-        assertEquals("Unxpected stopped state", State.STOPPED, _executor.getState());
+        assertEquals("Unexpected stopped state", State.STOPPED, _executor.getState());
 
         Exception e = submitExceptions.poll(1000l, TimeUnit.MILLISECONDS);
         assertNotNull("The task execution was not interrupted or cancelled", e);
@@ -127,7 +127,7 @@ public class TaskExecutorTest extends Te
     {
         _executor.start();
         _executor.stop();
-        assertEquals("Unxpected stopped state", State.STOPPED, _executor.getState());
+        assertEquals("Unexpected stopped state", State.STOPPED, _executor.getState());
     }
 
     public void testSubmitAndWait() throws Exception

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java Wed Jan 29 14:48:50 2014
@@ -81,7 +81,7 @@ public class DefaultExchangeFactoryTest 
         }
     }
 
-    public void testCreateDefaultExchangeFactoryWithoutDireactExchangeType()
+    public void testCreateDefaultExchangeFactoryWithoutDirectExchangeType()
     {
         _stubbedExchangeTypes.add(_topicExchangeType);
         _stubbedExchangeTypes.add(_fanoutExchangeType);

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java Wed Jan 29 14:48:50 2014
@@ -214,7 +214,7 @@ public class TopicExchangeTest extends Q
 
     }
 
-    public void testMatchafterHash() throws AMQException
+    public void testMatchAfterHash() throws AMQException
     {
         AMQQueue queue = _vhost.createQueue(UUIDGenerator.generateRandomUUID(), "a#", false, null, false, false,
                 false, null);

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java Wed Jan 29 14:48:50 2014
@@ -31,20 +31,20 @@ public class JMSSelectorFilterTest exten
 
         assertEquals(filter1 + " should equal itself", filter1, filter1);
         assertFalse(filter1 + " should not equal null", filter1.equals(null));
-        assertEqualsAndHashcodeMatch(filter1, filter2);
+        assertEqualsAndHashCodeMatch(filter1, filter2);
 
         JMSSelectorFilter differentFilter = new JMSSelectorFilter("2 = 2");
         assertNotEqual(filter1, differentFilter);
     }
 
-    private void assertEqualsAndHashcodeMatch(JMSSelectorFilter filter1, JMSSelectorFilter filter2)
+    private void assertEqualsAndHashCodeMatch(JMSSelectorFilter filter1, JMSSelectorFilter filter2)
     {
         String message = filter1 + " and " + filter2 + " should be equal";
 
         assertEquals(message, filter1, filter2);
         assertEquals(message, filter2, filter1);
 
-        assertEquals("Hashcodes of " + filter1 + " and " + filter2 + " should be equal",
+        assertEquals("HashCodes of " + filter1 + " and " + filter2 + " should be equal",
                 filter1.hashCode(), filter2.hashCode());
     }
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/Log4jMessageLoggerTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/Log4jMessageLoggerTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/Log4jMessageLoggerTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/Log4jMessageLoggerTest.java Wed Jan 29 14:48:50 2014
@@ -255,7 +255,7 @@ public class Log4jMessageLoggerTest exte
         }
 
         /**
-         * @return the list of LoggingEvents that have occured in this Appender
+         * @return the list of LoggingEvents that have occurred in this Appender
          */
         public List<LoggingEvent> getLog()
         {

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java Wed Jan 29 14:48:50 2014
@@ -96,7 +96,7 @@ public class UnitTestMessageLoggerTest e
 
         logger.clearLogMessages();
 
-        assertEquals("Expected to have no messagse after a clear",
+        assertEquals("Expected to have no messages after a clear",
                      0, logger.getLogMessages().size());
 
     }

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java Wed Jan 29 14:48:50 2014
@@ -55,7 +55,7 @@ public class AMQPChannelActorTest extend
      * Test that when logging on behalf of the channel
      * The test sends a message then verifies that it entered the logs.
      *
-     * The log message should be fully repalaced (no '{n}' values) and should
+     * The log message should be fully replaced (no '{n}' values) and should
      * contain the channel id ('/ch:1') identification.
      */
     public void testChannel() throws Exception

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java Wed Jan 29 14:48:50 2014
@@ -48,7 +48,7 @@ public class AMQPConnectionActorTest ext
      *
      * The test sends a message then verifies that it entered the logs.
      *
-     * The log message should be fully repalaced (no '{n}' values) and should
+     * The log message should be fully replaced (no '{n}' values) and should
      * not contain any channel identification.
      */
     public void testConnection() throws Exception
@@ -113,7 +113,7 @@ public class AMQPConnectionActorTest ext
 
             public String getLogHierarchy()
             {
-                return "test.hieracrchy";
+                return "test.hierarchy";
             }
         });
         return message;

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java Wed Jan 29 14:48:50 2014
@@ -45,7 +45,7 @@ import org.apache.qpid.server.util.Broke
  * successfully removed.
  *
  * By having a higher number of threads than would normally be used in the
- * Poolling filter we aim to catch the race condition where a ThreadLocal remove
+ * Pooling filter we aim to catch the race condition where a ThreadLocal remove
  * is called before one or more threads call get(). This way we can ensure that
  * the remove does not affect more than the Thread it was called in.
  */
@@ -188,7 +188,7 @@ public class CurrentActorTest extends Ba
             if (threads[count].getException() != null)
             {
                 threads[count].getException().printStackTrace();
-                fail("Error occured in thread:" + count + "("+threads[count].getException()+")");
+                fail("Error occurred in thread:" + count + "("+threads[count].getException()+")");
             }
         }
     }
@@ -210,7 +210,7 @@ public class CurrentActorTest extends Ba
 
             // Create a new actor using retrieving the rootMessageLogger from
             // the default ApplicationRegistry.
-            //fixme reminder that we need a better approach for broker testing.
+            //TODO reminder that we need a better approach for broker testing.
             try
             {
                 LogActor defaultActor = CurrentActor.get();

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java Wed Jan 29 14:48:50 2014
@@ -39,7 +39,7 @@ public class QueueActorTest extends Base
      *
      * The test logs a message then verifies that it entered the logs correctly
      *
-     * The log message should be fully repalaced (no '{n}' values) and should
+     * The log message should be fully replaced (no '{n}' values) and should
      * contain the correct queue identification.
      */
     public void testQueueActor()
@@ -67,7 +67,7 @@ public class QueueActorTest extends Base
 
         // Verify that the logged message contains the 'qu(' marker
         String expected = "qu(" + getName() + ")";
-        assertTrue("Message was not logged with a queue identifer '"+expected+"' actual:" + log,
+        assertTrue("Message was not logged with a queue identifier '"+expected+"' actual:" + log,
                     log.contains(expected));
     }
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java Wed Jan 29 14:48:50 2014
@@ -54,7 +54,7 @@ public class SubscriptionActorTest exten
      *
      * The test sends a message then verifies that it entered the logs.
      *
-     * The log message should be fully repalaced (no '{n}' values) and should
+     * The log message should be fully replaced (no '{n}' values) and should
      * contain subscription identification.
      */
     public void testSubscription()

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java Wed Jan 29 14:48:50 2014
@@ -115,7 +115,7 @@ public abstract class AbstractTestLogSub
         assertNotNull("Unable to find connection 'con:" + connectionID + "' in '"+message+"'",
                       connectionSlice);
 
-        // Exract the userName
+        // Extract the userName
         String[] userNameParts = connectionSlice.split("@");
 
         assertEquals("Unable to split Username from rest of Connection:"
@@ -180,11 +180,11 @@ public abstract class AbstractTestLogSub
      */
     protected void verifyExchange(String message, Exchange exchange)
     {
-        String exchangeSilce = getSlice("ex", message);
+        String exchangeSlice = getSlice("ex", message);
 
-        assertNotNull("Exchange not found:" + message, exchangeSilce);
+        assertNotNull("Exchange not found:" + message, exchangeSlice);
 
-        String[] exchangeParts = exchangeSilce.split("/");
+        String[] exchangeParts = exchangeSlice.split("/");
 
         assertEquals("Exchange should be in two parts ex(type/name)", 2,
                      exchangeParts.length);
@@ -265,10 +265,10 @@ public abstract class AbstractTestLogSub
     }
 
     /**
-     * Call to the individiual tests to validate the message is formatted as
+     * Call to the individual tests to validate the message is formatted as
      * expected
      *
-     * @param message the message whos format needs validation
+     * @param message the message whose format needs validation
      */
     protected abstract void validateLogStatement(String message);
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java Wed Jan 29 14:48:50 2014
@@ -64,7 +64,7 @@ public class BindingLogSubjectTest exten
     /**
      * Validate that the logged Subject  message is as expected:
      * MESSAGE [Blank][vh(/test)/ex(direct/<<default>>)/qu(BindingLogSubjectTest)/rk(RoutingKey)] <Log Message>
-     * @param message the message whos format needs validation
+     * @param message the message whose format needs validation
      */
     @Override
     protected void validateLogStatement(String message)

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java Wed Jan 29 14:48:50 2014
@@ -46,11 +46,11 @@ public class ChannelLogSubjectTest exten
     /**
      * MESSAGE [Blank][con:0(MockProtocolSessionUser@null/test)/ch:1] <Log Message>
      *
-     * @param message the message whos format needs validation
+     * @param message the message whose format needs validation
      */
     protected void validateLogStatement(String message)
     {
-        // Use the ConnectionLogSubjectTest to vaildate that the connection
+        // Use the ConnectionLogSubjectTest to validate that the connection
         // section is ok
         super.validateLogStatement(message);
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java Wed Jan 29 14:48:50 2014
@@ -54,7 +54,7 @@ public class ConnectionLogSubjectTest ex
     /**
      * MESSAGE [Blank][con:0(MockProtocolSessionUser@null/test)] <Log Message>
      *
-     * @param message the message whos format needs validation
+     * @param message the message whose format needs validation
      */
     protected void validateLogStatement(String message)
     {

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java Wed Jan 29 14:48:50 2014
@@ -57,7 +57,7 @@ public class ExchangeLogSubjectTest exte
     /**
      * Validate that the logged Subject  message is as expected:
      * MESSAGE [Blank][vh(/test)/ex(direct/<<default>>)] <Log Message>
-     * @param message the message whos format needs validation
+     * @param message the message whose format needs validation
      */
     @Override
     protected void validateLogStatement(String message)

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java Wed Jan 29 14:48:50 2014
@@ -61,7 +61,7 @@ public class QueueLogSubjectTest extends
      * Validate that the logged Subject  message is as expected:
      * MESSAGE [Blank][vh(/test)/qu(QueueLogSubjectTest)] <Log Message>
      *
-     * @param message the message whos format needs validation
+     * @param message the message whose format needs validation
      */
     @Override
     protected void validateLogStatement(String message)

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java Wed Jan 29 14:48:50 2014
@@ -71,7 +71,7 @@ public class SubscriptionLogSubjectTest 
      * Validate that the logged Subject  message is as expected:
      * MESSAGE [Blank][sub:0(vh(/test)/qu(SubscriptionLogSubjectTest))] <Log Message>
      *
-     * @param message the message whos format needs validation
+     * @param message the message whose format needs validation
      */
     @Override
     protected void validateLogStatement(String message)

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java Wed Jan 29 14:48:50 2014
@@ -180,7 +180,7 @@ public class ConfiguredObjectStateTransi
 
     private void assertInvalidStateTransition(ConfiguredObject object, State initialState, State... invalidStates)
     {
-        assertEquals("Unepxceted state", initialState, object.getActualState());
+        assertEquals("Unexpected state", initialState, object.getActualState());
         for (State state : invalidStates)
         {
             try

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java Wed Jan 29 14:48:50 2014
@@ -58,9 +58,9 @@ public class VirtualHostTest extends Qpi
         CurrentActor.set(new TestLogActor(new SystemOutMessageLogger()));
 
         _broker = BrokerTestHelper.createBrokerMock();
-        TaskExecutor taslExecutor = mock(TaskExecutor.class);
-        when(taslExecutor.isTaskExecutorThread()).thenReturn(true);
-        when(_broker.getTaskExecutor()).thenReturn(taslExecutor);
+        TaskExecutor taskExecutor = mock(TaskExecutor.class);
+        when(taskExecutor.isTaskExecutorThread()).thenReturn(true);
+        when(_broker.getTaskExecutor()).thenReturn(taskExecutor);
 
         _recovererProvider = mock(RecovererProvider.class);
         _statisticsGatherer = mock(StatisticsGatherer.class);
@@ -131,7 +131,7 @@ public class VirtualHostTest extends Qpi
         assertEquals("Unexpected state", State.DELETED, host.getAttribute(VirtualHost.STATE));
     }
 
-    public void testCreateQueueChildHavingMessageGrouppingAttributes()
+    public void testCreateQueueChildHavingMessageGroupingAttributes()
     {
         VirtualHost host = createHost();
         host.setDesiredState(State.INITIALISING, State.ACTIVE);

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java Wed Jan 29 14:48:50 2014
@@ -59,9 +59,9 @@ public class FileSystemPreferencesProvid
         _preferencesFile = TestFileUtils.createTempFile(this, ".prefs.json", TEST_PREFERENCES);
 
         _broker = BrokerTestHelper.createBrokerMock();
-        TaskExecutor taslExecutor = mock(TaskExecutor.class);
-        when(taslExecutor.isTaskExecutorThread()).thenReturn(true);
-        when(_broker.getTaskExecutor()).thenReturn(taslExecutor);
+        TaskExecutor taskExecutor = mock(TaskExecutor.class);
+        when(taskExecutor.isTaskExecutorThread()).thenReturn(true);
+        when(_broker.getTaskExecutor()).thenReturn(taskExecutor);
         when(_authenticationProvider.getParent(Broker.class)).thenReturn(_broker);
     }
 
@@ -111,7 +111,7 @@ public class FileSystemPreferencesProvid
     {
         File emptyPrefsFile = new File(TMP_FOLDER, "preferences-" + getTestName() + ".json");
         emptyPrefsFile.createNewFile();
-        assertTrue("Preferences file does notexists", emptyPrefsFile.exists());
+        assertTrue("Preferences file does not exist", emptyPrefsFile.exists());
         try
         {
             Map<String, Object> attributes = new HashMap<String, Object>();
@@ -130,7 +130,7 @@ public class FileSystemPreferencesProvid
         _preferencesProvider = createPreferencesProvider();
         _preferencesProvider.setDesiredState(State.INITIALISING, State.ACTIVE);
 
-        assertEquals("Unexpexpected state", State.ACTIVE, _preferencesProvider.getActualState());
+        assertEquals("Unexpected state", State.ACTIVE, _preferencesProvider.getActualState());
     }
 
     public void testChangeAttributes()
@@ -178,7 +178,7 @@ public class FileSystemPreferencesProvid
         assertTrue("No preference found for user3", preferences3.isEmpty());
     }
 
-    public void testSetPrefernces()
+    public void testSetPreferences()
     {
         _preferencesProvider = createPreferencesProvider();
         _preferencesProvider.setDesiredState(State.INITIALISING, State.ACTIVE);
@@ -213,7 +213,7 @@ public class FileSystemPreferencesProvid
         assertTrue("Unexpected preferences found for user3", preferences3.isEmpty());
     }
 
-    public void testDeletePrefernces()
+    public void testDeletePreferences()
     {
         _preferencesProvider = createPreferencesProvider();
         _preferencesProvider.setDesiredState(State.INITIALISING, State.ACTIVE);
@@ -237,7 +237,7 @@ public class FileSystemPreferencesProvid
         assertTrue("Unexpected preferences found for user3", preferences3.isEmpty());
     }
 
-    public void testDeleteMultipleUsersPrefernces()
+    public void testDeleteMultipleUsersPreferences()
     {
         _preferencesProvider = createPreferencesProvider();
         _preferencesProvider.setDesiredState(State.INITIALISING, State.ACTIVE);

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java Wed Jan 29 14:48:50 2014
@@ -354,7 +354,7 @@ public class PortFactoryTest extends Qpi
         try
         {
             _portFactory.createPort(_portId, _broker, attributes);
-            fail("RMI port creation should fail as another one olready exist");
+            fail("RMI port creation should fail as another one already exist");
         }
         catch(IllegalConfigurationException e)
         {

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/configuration/ConfigurationEntryTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/configuration/ConfigurationEntryTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/configuration/ConfigurationEntryTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/configuration/ConfigurationEntryTest.java Wed Jan 29 14:48:50 2014
@@ -112,18 +112,18 @@ public class ConfigurationEntryTest exte
                 VirtualHost.class.getSimpleName(), attributes1, childrenIds, store);
 
         assertTrue(entry1.equals(entry2));
-        assertFalse("Entries should be diferrent because of diferrent IDs", entry1.equals(entryWithDifferentId));
+        assertFalse("Entries should be different because of different IDs", entry1.equals(entryWithDifferentId));
 
         ConfigurationEntry entryWithDifferentChildId = new ConfigurationEntry(id,
                 VirtualHost.class.getSimpleName(), attributes1, Collections.singleton(UUID.randomUUID()), store);
-        assertFalse("Entries should be diferrent because of diferrent children", entry1.equals(entryWithDifferentChildId));
+        assertFalse("Entries should be different because of different children", entry1.equals(entryWithDifferentChildId));
 
         ConfigurationEntry entryWithDifferentName = new ConfigurationEntry(id,
                 VirtualHost.class.getSimpleName(), attributes2, childrenIds, store);
-        assertFalse("Entries should be diferrent because of diferrent attributes", entry1.equals(entryWithDifferentName));
+        assertFalse("Entries should be different because of different attributes", entry1.equals(entryWithDifferentName));
 
         ConfigurationEntry entryWithDifferentType = new ConfigurationEntry(id,
                 Broker.class.getSimpleName(), attributes1, childrenIds, store);
-        assertFalse("Entries should be diferrent because of diferrent types", entry1.equals(entryWithDifferentType));
+        assertFalse("Entries should be different because of different types", entry1.equals(entryWithDifferentType));
     }
 }



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