qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgodf...@apache.org
Subject svn commit: r1560853 [1/3] - in /qpid/trunk/qpid/java: broker-core/src/main/java/org/apache/log4j/ broker-core/src/main/java/org/apache/qpid/server/ broker-core/src/main/java/org/apache/qpid/server/configuration/ broker-core/src/main/java/org/apache/qp...
Date Thu, 23 Jan 2014 23:37:51 GMT
Author: rgodfrey
Date: Thu Jan 23 23:37:48 2014
New Revision: 1560853

URL: http://svn.apache.org/r1560853
Log:
NO-JIRA : fix typos / spelling errors

Modified:
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/ExchangeConfiguration.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/plugins/AbstractConfiguration.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListener.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutor.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/IConnectionRegistry.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherDFAState.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/NullRootMessageLogger.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/RootMessageLogger.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/SystemOutMessageLogger.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationMethod.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractAdapter.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderFactory.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexInitialiser.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationRecoverer.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/StateManager.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/SubscriptionList.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/DefaultUpgraderProvider.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/plugins/AbstractConfigurationTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStoreTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStoreTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/Log4jMessageLoggerTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/configuration/ConfigurationEntryTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticatorTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/amqplain/AMQPlainSaslServerTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupDatabaseTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/EventManagerTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/StateManagerTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/subscription/SubscriptionListTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AsyncAutoCommitTransactionTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockAction.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java
    qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java
    qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java
    qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Rule.java
    qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
    qpid/trunk/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/PlainConfigurationTest.java
    qpid/trunk/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRuleTest.java
    qpid/trunk/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java
    qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
    qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
    qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
    qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
    qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolSession.java
    qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeue.java
    qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionImpl.java
    qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/UnexpectedMethodException.java
    qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java
    qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AcknowledgeTest.java
    qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java
    qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java
    qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
    qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MaxChannelsTest.java
    qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java
    qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactoryImplTest.java
    qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
    qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/RedirectingAuthorisationFilter.java
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/log/LogFileHelper.java
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
    qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/log/LogFileHelperTest.java
    qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanIntrospector.java
    qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
    qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagedObjectRegistry.java
    qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java
    qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBeanTest.java

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java Thu Jan 23 23:37:48 2014
@@ -56,7 +56,7 @@ import java.util.zip.GZIPOutputStream;
  * without clearing the directory could have nasty side effects.  If Date/Time based rolling is enabled,
  * CompositeRollingAppender will attempt to roll existing files in the directory without a date/time tag based on the
  * last modified date of the base log files last modification.<br> <br> <p>A maximum number of backups based on
- * date/time boundries would be nice but is not yet implemented.<br>
+ * date/time boundaries would be nice but is not yet implemented.<br>
  *
  * @author Kevin Steppe
  * @author Heinz Richter
@@ -223,7 +223,7 @@ public class QpidCompositeRollingAppende
      * made.  Note that this could result in very slow performance as a large number of files are rolled over unless
      * {@link #setCountDirection} up is used.
      *
-     * <p>The maximum applys to -each- time based group of files and -not- the total. Using a daily roll the maximum
+     * <p>The maximum applies to -each- time based group of files and -not- the total. Using a daily roll the maximum
      * total files would be (#days run) * (maxSizeRollBackups)
      */
     public void setMaxSizeRollBackups(int maxBackups)
@@ -276,7 +276,7 @@ public class QpidCompositeRollingAppende
         qw = new CountingQuietWriter(writer, errorHandler);
     }
 
-    // Taken verbatum from DailyRollingFileAppender
+    // Taken verbatim from DailyRollingFileAppender
     int computeCheckPeriod()
     {
         RollingCalendar c = new RollingCalendar();
@@ -473,7 +473,7 @@ public class QpidCompositeRollingAppende
     }
 
     /**
-     * Initializes based on exisiting conditions at time of <code> activateOptions</code>.  The following is done:<br>
+     * Initializes based on existing conditions at time of <code> activateOptions</code>.  The following is done:<br>
      * <br> A) determine curSizeRollBackups<br> B) determine curTimeRollBackups (not implemented)<br> C) initiates a
      * roll over if needed for crossing a date boundary since the last run.
      */
@@ -700,7 +700,7 @@ public class QpidCompositeRollingAppende
      * <p>If <code>maxSizeRollBackups</code> < 0, then <code>File</code> is renamed if needed and no files are deleted.
      */
 
-    // synchronization not necessary since doAppend is alreasy synched
+    // synchronization not necessary since doAppend is already synched
     protected void rollOverSize()
     {
         File file;

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java Thu Jan 23 23:37:48 2014
@@ -130,7 +130,7 @@ public class Broker
             }
             catch(Exception ce)
             {
-                LOGGER.debug("An error occured when closing the registry following initialization failure", ce);
+                LOGGER.debug("An error occurred when closing the registry following initialization failure", ce);
             }
             throw e;
         }
@@ -253,7 +253,7 @@ public class Broker
         }
         else
         {
-            LOGGER.debug("Skipping shutdown hook removal as there either isnt one, or we are it.");
+            LOGGER.debug("Skipping shutdown hook removal as there either isn't one, or we are it.");
         }
     }
 

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java Thu Jan 23 23:37:48 2014
@@ -186,9 +186,9 @@ public class BrokerOptions
      *
      * Passing null clears previously set values and returns to the default.
      */
-    public void setConfigurationStoreType(String cofigurationStoreType)
+    public void setConfigurationStoreType(String configurationStoreType)
     {
-        _configurationStoreType = cofigurationStoreType;
+        _configurationStoreType = configurationStoreType;
     }
 
     /**
@@ -217,9 +217,9 @@ public class BrokerOptions
      *
      * Passing null clears any previously set value and returns to the default.
      */
-    public void setConfigurationStoreLocation(String cofigurationStore)
+    public void setConfigurationStoreLocation(String configurationStore)
     {
-        _configurationStoreLocation = cofigurationStore;
+        _configurationStoreLocation = configurationStore;
     }
 
     /**

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/ExchangeConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/ExchangeConfiguration.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/ExchangeConfiguration.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/ExchangeConfiguration.java Thu Jan 23 23:37:48 2014
@@ -29,9 +29,9 @@ public class ExchangeConfiguration
     private Configuration _config;
     private String _name;
 
-    public ExchangeConfiguration(String exchName, Configuration subset)
+    public ExchangeConfiguration(String name, Configuration subset)
     {
-        _name = exchName;
+        _name = name;
         _config = subset;
     }
 

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/plugins/AbstractConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/plugins/AbstractConfiguration.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/plugins/AbstractConfiguration.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/plugins/AbstractConfiguration.java Thu Jan 23 23:37:48 2014
@@ -46,7 +46,7 @@ public abstract class AbstractConfigurat
      * <li>queue - the queue entries
      * <li>the alerting values for defaults
      * <li>exchange - the default exchange
-     * <li>durable - set the default durablity
+     * <li>durable - set the default durability
      * </ul>
      */
     abstract public String[] getElementsProcessed();
@@ -224,7 +224,7 @@ public abstract class AbstractConfigurat
     }
 
     /**
-     * Provide mechanism to validate Configuration contains a Postiive Long Value
+     * Provide mechanism to validate Configuration contains a Positive Long Value
      *
      * @param property
      *

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java Thu Jan 23 23:37:48 2014
@@ -59,7 +59,7 @@ public class ManagementModeStoreHandler 
         ConfigurationEntry storeRoot = store.getRootEntry();
         _store = store;
         _rootId = storeRoot.getId();
-        _cliEntries = createPortsFromCommadLineOptions(options);
+        _cliEntries = createPortsFromCommandLineOptions(options);
         _quiescedEntries = quiesceEntries(storeRoot, options);
     }
 
@@ -183,7 +183,7 @@ public class ManagementModeStoreHandler 
         return _store.getType();
     }
 
-    private Map<UUID, ConfigurationEntry> createPortsFromCommadLineOptions(BrokerOptions options)
+    private Map<UUID, ConfigurationEntry> createPortsFromCommandLineOptions(BrokerOptions options)
     {
         int managementModeRmiPortOverride = options.getManagementModeRmiPortOverride();
         if (managementModeRmiPortOverride < 0)

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java Thu Jan 23 23:37:48 2014
@@ -150,9 +150,9 @@ public class MemoryConfigurationEntrySto
                     {
                         Set<UUID> children = new HashSet<UUID>(entry.getChildrenIds());
                         children.remove(uuid);
-                        ConfigurationEntry referal = new ConfigurationEntry(entry.getId(), entry.getType(),
+                        ConfigurationEntry referral = new ConfigurationEntry(entry.getId(), entry.getType(),
                                 entry.getAttributes(), children, this);
-                        _entries.put(entry.getId(), referal);
+                        _entries.put(entry.getId(), referral);
                     }
                 }
                 removedIds.add(uuid);

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListener.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListener.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListener.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListener.java Thu Jan 23 23:37:48 2014
@@ -79,7 +79,7 @@ public class StoreConfigurationChangeLis
     }
 
     @Override
-    public void attributeSet(ConfiguredObject object, String attrinuteName, Object oldAttributeValue, Object newAttributeValue)
+    public void attributeSet(ConfiguredObject object, String attributeName, Object oldAttributeValue, Object newAttributeValue)
     {
         _store.save(toConfigurationEntry(object));
     }
@@ -87,13 +87,13 @@ public class StoreConfigurationChangeLis
     private ConfigurationEntry toConfigurationEntry(ConfiguredObject object)
     {
         Class<? extends ConfiguredObject> objectType = getConfiguredObjectType(object);
-        Set<UUID> childrenIds = getChildernIds(object, objectType);
+        Set<UUID> childrenIds = getChildrenIds(object, objectType);
         ConfigurationEntry entry = new ConfigurationEntry(object.getId(), objectType.getSimpleName(),
                 object.getActualAttributes(), childrenIds, _store);
         return entry;
     }
 
-    private Set<UUID> getChildernIds(ConfiguredObject object, Class<? extends ConfiguredObject> objectType)
+    private Set<UUID> getChildrenIds(ConfiguredObject object, Class<? extends ConfiguredObject> objectType)
     {
         // Virtual Host children's IDs should not be stored in broker store
         if (object instanceof VirtualHost)

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutor.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutor.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutor.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutor.java Thu Jan 23 23:37:48 2014
@@ -267,7 +267,7 @@ public class TaskExecutor
                 }
                 catch (Exception e)
                 {
-                    LOGGER.warn("Unxpected exception on current actor removal", e);
+                    LOGGER.warn("Unexpected exception on current actor removal", e);
                 }
                 try
                 {
@@ -275,7 +275,7 @@ public class TaskExecutor
                 }
                 catch (Exception e)
                 {
-                    LOGGER.warn("Unxpected exception on nullifying of subject for a security manager", e);
+                    LOGGER.warn("Unexpected exception on nullifying of subject for a security manager", e);
                 }
             }
         }

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java Thu Jan 23 23:37:48 2014
@@ -82,32 +82,32 @@ public class ConnectionRegistry implemen
         }
     }
 
-    public void registerConnection(AMQConnectionModel connnection)
+    public void registerConnection(AMQConnectionModel connection)
     {
         synchronized (this)
         {
-            _registry.add(connnection);
+            _registry.add(connection);
             synchronized (_listeners)
             {
                 for(RegistryChangeListener listener : _listeners)
                 {
-                    listener.connectionRegistered(connnection);
+                    listener.connectionRegistered(connection);
                 }
             }
         }
     }
 
-    public void deregisterConnection(AMQConnectionModel connnection)
+    public void deregisterConnection(AMQConnectionModel connection)
     {
         synchronized (this)
         {
-            _registry.remove(connnection);
+            _registry.remove(connection);
 
             synchronized (_listeners)
             {
                 for(RegistryChangeListener listener : _listeners)
                 {
-                    listener.connectionUnregistered(connnection);
+                    listener.connectionUnregistered(connection);
                 }
             }
         }

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/IConnectionRegistry.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/IConnectionRegistry.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/IConnectionRegistry.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/IConnectionRegistry.java Thu Jan 23 23:37:48 2014
@@ -39,9 +39,9 @@ public interface IConnectionRegistry
 
     public List<AMQConnectionModel> getConnections();
 
-    public void registerConnection(AMQConnectionModel connnection);
+    public void registerConnection(AMQConnectionModel connection);
 
-    public void deregisterConnection(AMQConnectionModel connnection);
+    public void deregisterConnection(AMQConnectionModel connection);
 
     void addRegistryChangeListener(RegistryChangeListener listener);
 

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java Thu Jan 23 23:37:48 2014
@@ -33,7 +33,7 @@ import org.apache.qpid.AMQException;
  * @todo Not an AMQP exception as no status code.
  *
  * @todo This exception is not used. However, it is part of the ExchangeRegistry interface, and looks like code is
- *       going to need to be added to throw/deal with this. Alternatively ExchangeResitries may be able to handle the
+ *       going to need to be added to throw/deal with this. Alternatively ExchangeRegistries may be able to handle the
  *       issue internally.
  */
 public class ExchangeInUseException extends AMQException

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java Thu Jan 23 23:37:48 2014
@@ -168,7 +168,7 @@ public class FanoutExchange extends Abst
             }
             catch (AMQInvalidArgumentException e)
             {
-                _logger.warn("Cannoy bind queue " + queue + " to exchange this " + this + " beacuse selector cannot be parsed.", e);
+                _logger.warn("Cannot bind queue " + queue + " to exchange this " + this + " because selector cannot be parsed.", e);
                 return;
             }
         }

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherDFAState.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherDFAState.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherDFAState.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherDFAState.java Thu Jan 23 23:37:48 2014
@@ -44,7 +44,7 @@ public class TopicMatcherDFAState
 
     private final Collection<TopicMatcherResult> _results;
     private final Map<TopicWord, TopicMatcherDFAState> _nextStateMap;
-    private static final String TOPIC_DELIMITTER = "\\.";
+    private static final String TOPIC_DELIMITER = "\\.";
 
 
     public TopicMatcherDFAState(Map<TopicWord, TopicMatcherDFAState> nextStateMap,
@@ -69,7 +69,7 @@ public class TopicMatcherDFAState
 
     public Collection<TopicMatcherResult> parse(TopicWordDictionary dictionary, String routingKey)
     {
-        return parse(dictionary, Arrays.asList(routingKey.split(TOPIC_DELIMITTER)).iterator());
+        return parse(dictionary, Arrays.asList(routingKey.split(TOPIC_DELIMITER)).iterator());
     }
 
     private Collection<TopicMatcherResult> parse(final TopicWordDictionary dictionary,

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java Thu Jan 23 23:37:48 2014
@@ -41,7 +41,7 @@ public class FilterManagerFactory
     {
     }
 
-    //fixme move to a common class so it can be refered to from client code.
+    //TODO move to a common class so it can be referred to from client code.
 
     public static FilterManager createManager(Map<String,Object> filters) throws AMQException
     {

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/NullRootMessageLogger.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/NullRootMessageLogger.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/NullRootMessageLogger.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/NullRootMessageLogger.java Thu Jan 23 23:37:48 2014
@@ -24,7 +24,7 @@ public class NullRootMessageLogger exten
 {
 
     @Override
-    public boolean isMessageEnabled(LogActor actor, LogSubject subject, String logHeirarchy)
+    public boolean isMessageEnabled(LogActor actor, LogSubject subject, String logHierarchy)
     {
         return false;
     }

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/RootMessageLogger.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/RootMessageLogger.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/RootMessageLogger.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/RootMessageLogger.java Thu Jan 23 23:37:48 2014
@@ -65,10 +65,10 @@ public interface RootMessageLogger
 
     /**
      * Log the raw message to the configured logger.
-     * Along with a formated stack trace from the Throwable.
+     * Along with a formatted stack trace from the Throwable.
      *
      * @param message   The message to log
-     * @param throwable Optional Throwable that should provide stact trace
+     * @param throwable Optional Throwable that should provide stack trace
      * @param logHierarchy The log hierarchy for this request
      */
     void rawMessage(String message, Throwable throwable, String logHierarchy);

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/SystemOutMessageLogger.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/SystemOutMessageLogger.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/SystemOutMessageLogger.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/SystemOutMessageLogger.java Thu Jan 23 23:37:48 2014
@@ -24,7 +24,7 @@ package org.apache.qpid.server.logging;
 public class SystemOutMessageLogger extends AbstractRootMessageLogger
 {
     @Override
-    public boolean isMessageEnabled(LogActor actor, LogSubject subject, String logHeirarchy)
+    public boolean isMessageEnabled(LogActor actor, LogSubject subject, String logHierarchy)
     {
         return true;
     }

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java Thu Jan 23 23:37:48 2014
@@ -25,7 +25,7 @@ import org.apache.qpid.server.logging.Ro
 import org.apache.qpid.server.logging.subjects.ChannelLogSubject;
 
 /**
- * An AMQPChannelActor represtents a connection through the AMQP port with an
+ * An AMQPChannelActor represents a connection through the AMQP port with an
  * associated Channel.
  *
  * <p/>

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java Thu Jan 23 23:37:48 2014
@@ -26,7 +26,7 @@ import org.apache.qpid.server.protocol.A
 
 
 /**
- * An AMQPConnectionActor represtents a connectionthrough the AMQP port.
+ * An AMQPConnectionActor represents a connection through the AMQP port.
  * <p/>
  * This is responsible for correctly formatting the LogActor String in the log
  * <p/>

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java Thu Jan 23 23:37:48 2014
@@ -26,7 +26,7 @@ import org.apache.qpid.server.subscripti
 
 /**
  * The subscription actor provides formatted logging for actions that are
- * performed by the subsciption. Such as STATE changes.
+ * performed by the subscription. Such as STATE changes.
  */
 public class SubscriptionActor extends AbstractActor
 {

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java Thu Jan 23 23:37:48 2014
@@ -25,11 +25,11 @@ import org.apache.qpid.server.logging.Lo
 import java.text.MessageFormat;
 
 /**
- * The LogSubjects all have a similar requriement to format their output and
+ * The LogSubjects all have a similar requirement to format their output and
  * provide the String value.
  *
  * This Abstract LogSubject provides this basic functionality, allowing the
- * actual LogSubjects to provide their formating and data.
+ * actual LogSubjects to provide their formatting and data.
  */
 public abstract class AbstractLogSubject implements LogSubject
 {

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java Thu Jan 23 23:37:48 2014
@@ -36,7 +36,7 @@ public class SubscriptionLogSubject exte
      */
     public SubscriptionLogSubject(Subscription subscription)
     {
-        // Delegate the formating of the Queue to the QueueLogSubject. So final
+        // Delegate the formatting of the Queue to the QueueLogSubject. So final
         // log string format is:
         // [ sub:<id>(vh(<vhost>)/qu(<queue>)) ]
 

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java Thu Jan 23 23:37:48 2014
@@ -63,7 +63,7 @@ public abstract class AbstractServerMess
     }
 
     /**
-     * Threadsafe. This will decrement the reference count and when it reaches zero will remove the message from the
+     * Thread-safe. This will decrement the reference count and when it reaches zero will remove the message from the
      * message store.
      *
      */

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationMethod.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationMethod.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationMethod.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationMethod.java Thu Jan 23 23:37:48 2014
@@ -24,7 +24,7 @@ import java.util.Collection;
 
 public interface AuthenticationMethod extends ConfiguredObject
 {
-    // name is the SASL mech where this is a SASL authentication
+    // name is the SASL mechanism where this is a SASL authentication
 
     // parents
     VirtualHostAlias getVirtualHostAlias();

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java Thu Jan 23 23:37:48 2014
@@ -79,12 +79,12 @@ public interface ConfiguredObject
      * Change the desired state of the object
      *
      * Request a change to the current state. The caller must pass in the state it believe the object to be in, if
-     * this differs from the current desired state when the object evalues the request, then no state change will occur.
+     * this differs from the current desired state when the object evaluates the request, then no state change will occur.
      *
      * @param currentState the state the caller believes the object to be in
      * @param desiredState the state the caller wishes the object to attain
      * @return the new current state
-     * @throws IllegalStateTransitionException  the requested state tranisition is invalid
+     * @throws IllegalStateTransitionException  the requested state transition is invalid
      * @throws AccessControlException the current context does not have sufficient permissions to change the state
      */
     State setDesiredState(State currentState, State desiredState) throws IllegalStateTransitionException,

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractAdapter.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractAdapter.java Thu Jan 23 23:37:48 2014
@@ -203,14 +203,14 @@ public abstract class AbstractAdapter im
         }
     }
 
-    protected void attributeSet(String attrinuteName, Object oldAttributeValue, Object newAttributeValue)
+    protected void attributeSet(String attributeName, Object oldAttributeValue, Object newAttributeValue)
     {
         synchronized (_changeListeners)
         {
             List<ConfigurationChangeListener> copy = new ArrayList<ConfigurationChangeListener>(_changeListeners);
             for(ConfigurationChangeListener listener : copy)
             {
-                listener.attributeSet(this, attrinuteName, oldAttributeValue, newAttributeValue);
+                listener.attributeSet(this, attributeName, oldAttributeValue, newAttributeValue);
             }
         }
     }
@@ -278,7 +278,7 @@ public abstract class AbstractAdapter im
             if((currentValue == null && expected == null)
                || (currentValue != null && currentValue.equals(expected)))
             {
-                //TODO: dont put nulls
+                //TODO: don't put nulls
                 _attributes.put(name, desired);
                 return true;
             }

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderFactory.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderFactory.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderFactory.java Thu Jan 23 23:37:48 2014
@@ -36,7 +36,7 @@ import org.apache.qpid.server.security.A
 public class AccessControlProviderFactory
 {
     private final Iterable<AccessControlFactory> _factories;
-    private Collection<String> _supportedAcessControlProviders;
+    private Collection<String> _supportedAccessControlProviders;
 
     public AccessControlProviderFactory(QpidServiceLoader<AccessControlFactory> accessControlFactoryServiceLoader)
     {
@@ -46,7 +46,7 @@ public class AccessControlProviderFactor
         {
             supportedAccessControlProviders.add(factory.getType());
         }
-        _supportedAcessControlProviders = Collections.unmodifiableCollection(supportedAccessControlProviders);
+        _supportedAccessControlProviders = Collections.unmodifiableCollection(supportedAccessControlProviders);
     }
 
     /**
@@ -85,6 +85,6 @@ public class AccessControlProviderFactor
 
     public Collection<String> getSupportedAuthenticationProviders()
     {
-        return _supportedAcessControlProviders;
+        return _supportedAccessControlProviders;
     }
 }

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java Thu Jan 23 23:37:48 2014
@@ -549,8 +549,8 @@ public abstract class AuthenticationProv
                 if(createUser(username, password,null))
                 {
                     @SuppressWarnings("unchecked")
-                    C pricipalAdapter = (C) new PrincipalAdapter(p);
-                    return pricipalAdapter;
+                    C principalAdapter = (C) new PrincipalAdapter(p);
+                    return principalAdapter;
                 }
                 else
                 {

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java Thu Jan 23 23:37:48 2014
@@ -1100,7 +1100,7 @@ public final class VirtualHostAdapter ex
                     }
                     catch(Exception e)
                     {
-                        LOGGER.warn("Exception occured on store deletion", e);
+                        LOGGER.warn("Exception occurred on store deletion", e);
                     }
                 }
 

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java Thu Jan 23 23:37:48 2014
@@ -143,7 +143,7 @@ public interface AMQQueue extends Compar
 
     List<Long> getMessagesOnTheQueue(int num);
 
-    List<Long> getMessagesOnTheQueue(int num, int offest);
+    List<Long> getMessagesOnTheQueue(int num, int offset);
 
     QueueEntry getMessageOnTheQueue(long messageId);
 

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java Thu Jan 23 23:37:48 2014
@@ -117,7 +117,7 @@ public class AMQQueueFactory implements 
         abstract void setPropertyValue(AMQQueue queue, int value);
     }
 
-    private static final QueueProperty[] DECLAREABLE_PROPERTIES = {
+    private static final QueueProperty[] DECLARABLE_PROPERTIES = {
             new QueueLongProperty(Queue.ALERT_THRESHOLD_MESSAGE_AGE)
             {
                 public void setPropertyValue(AMQQueue queue, long value)
@@ -304,7 +304,7 @@ public class AMQQueueFactory implements 
 
         if(arguments != null)
         {
-            for(QueueProperty p : DECLAREABLE_PROPERTIES)
+            for(QueueProperty p : DECLARABLE_PROPERTIES)
             {
                 if(arguments.containsKey(p.getArgumentName()))
                 {
@@ -348,7 +348,7 @@ public class AMQQueueFactory implements 
 
                 if(dlQueue == null)
                 {
-                    //set args to disable DLQ'ing/MDC from the DLQ itself, preventing loops etc
+                    //set args to disable DLQ-ing/MDC from the DLQ itself, preventing loops etc
                     final Map<String, Object> args = new HashMap<String, Object>();
                     args.put(Queue.CREATE_DLQ_ON_CREATION, false);
                     args.put(Queue.MAXIMUM_DELIVERY_ATTEMPTS, 0);

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java Thu Jan 23 23:37:48 2014
@@ -305,7 +305,7 @@ public abstract class QueueEntryImpl imp
         {
             return _rejectedBy.contains(subscriptionId);
         }
-        else // This messasge hasn't been rejected yet.
+        else // This message hasn't been rejected yet.
         {
             return false;
         }

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java Thu Jan 23 23:37:48 2014
@@ -120,7 +120,7 @@ public class SimpleAMQQueue implements A
     private final AtomicLong _persistentMessageDequeueSize = new AtomicLong();
     private final AtomicLong _persistentMessageEnqueueCount = new AtomicLong();
     private final AtomicLong _persistentMessageDequeueCount = new AtomicLong();
-    private final AtomicInteger _counsumerCountHigh = new AtomicInteger(0);
+    private final AtomicInteger _consumerCountHigh = new AtomicInteger(0);
     private final AtomicLong _msgTxnEnqueues = new AtomicLong(0);
     private final AtomicLong _byteTxnEnqueues = new AtomicLong(0);
     private final AtomicLong _msgTxnDequeues = new AtomicLong(0);
@@ -444,9 +444,9 @@ public class SimpleAMQQueue implements A
 
             //Increment consumerCountHigh if necessary. (un)registerSubscription are both
             //synchronized methods so we don't need additional synchronization here
-            if(_counsumerCountHigh.get() < getConsumerCount())
+            if(_consumerCountHigh.get() < getConsumerCount())
             {
-                _counsumerCountHigh.incrementAndGet();
+                _consumerCountHigh.incrementAndGet();
             }
 
             if (isDeleted())
@@ -498,7 +498,7 @@ public class SimpleAMQQueue implements A
             {
                 if (_logger.isInfoEnabled())
                 {
-                    _logger.info("Auto-deleteing queue:" + this);
+                    _logger.info("Auto-deleting queue:" + this);
                 }
 
                 getVirtualHost().removeQueue(this);
@@ -961,7 +961,7 @@ public class SimpleAMQQueue implements A
 
     public int getConsumerCountHigh()
     {
-        return _counsumerCountHigh.get();
+        return _consumerCountHigh.get();
     }
 
     public int getActiveConsumerCount()
@@ -1909,7 +1909,7 @@ public class SimpleAMQQueue implements A
             // Only process nodes that are not currently deleted and not dequeued
             if (!node.isDeleted())
             {
-                // If the node has exired then acquire it
+                // If the node has expired then acquire it
                 if (node.expired() && node.acquire())
                 {
                     if (_logger.isDebugEnabled())

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java Thu Jan 23 23:37:48 2014
@@ -206,7 +206,7 @@ public class ApplicationRegistry impleme
             }
             catch(Exception e)
             {
-                ApplicationRegistry._logger.warn("Unexpected exception occured while reporting the statistics", e);
+                ApplicationRegistry._logger.warn("Unexpected exception occurred while reporting the statistics", e);
             }
             finally
             {

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java Thu Jan 23 23:37:48 2014
@@ -78,7 +78,7 @@ public class Base64MD5PasswordFilePrinci
         
         if (pwd == null)
         {
-            throw new AccountNotFoundException("Unable to lookup the specfied users password");
+            throw new AccountNotFoundException("Unable to lookup the specified users password");
         }
         
         byte[] byteArray = new byte[password.length];

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java Thu Jan 23 23:37:48 2014
@@ -86,7 +86,7 @@ public class PlainPasswordFilePrincipalD
         
         if (pwd == null)
         {
-            throw new AccountNotFoundException("Unable to lookup the specfied users password");
+            throw new AccountNotFoundException("Unable to lookup the specified users password");
         }
 
         return compareCharArray(pwd, password);

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java Thu Jan 23 23:37:48 2014
@@ -225,7 +225,7 @@ public class SimpleLDAPAuthenticationMan
 
     private InitialDirContext createInitialDirContext(Hashtable<String, Object> env) throws NamingException
     {
-        ClassLoader existingContextClassloader = null;
+        ClassLoader existingContextClassLoader = null;
 
         boolean isLdaps = String.valueOf(env.get(Context.PROVIDER_URL)).trim().toLowerCase().startsWith("ldaps:");
 
@@ -234,7 +234,7 @@ public class SimpleLDAPAuthenticationMan
         {
             if (isLdaps && _sslSocketFactoryOverrideClass != null)
             {
-                existingContextClassloader = Thread.currentThread().getContextClassLoader();
+                existingContextClassLoader = Thread.currentThread().getContextClassLoader();
                 env.put(JAVA_NAMING_LDAP_FACTORY_SOCKET, _sslSocketFactoryOverrideClass.getName());
                 Thread.currentThread().setContextClassLoader(_sslSocketFactoryOverrideClass.getClassLoader());
                 revertContentClassLoader = true;
@@ -245,7 +245,7 @@ public class SimpleLDAPAuthenticationMan
         {
             if (revertContentClassLoader)
             {
-                Thread.currentThread().setContextClassLoader(existingContextClassloader);
+                Thread.currentThread().setContextClassLoader(existingContextClassLoader);
             }
         }
     }

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexInitialiser.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexInitialiser.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexInitialiser.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexInitialiser.java Thu Jan 23 23:37:48 2014
@@ -48,11 +48,11 @@ public class CRAMMD5HexInitialiser exten
 
     private static class HexifyPrincipalDatabase implements PrincipalDatabase
     {
-        private PrincipalDatabase _realPricipalDatabase;
+        private PrincipalDatabase _realPrincipalDatabase;
 
         HexifyPrincipalDatabase(PrincipalDatabase db)
         {
-            _realPricipalDatabase = db;
+            _realPrincipalDatabase = db;
         }
 
         private char[] toHex(char[] password)
@@ -80,7 +80,7 @@ public class CRAMMD5HexInitialiser exten
         public void setPassword(Principal principal, PasswordCallback callback) throws IOException, AccountNotFoundException
         {
             //Let the read DB set the password
-            _realPricipalDatabase.setPassword(principal, callback);
+            _realPrincipalDatabase.setPassword(principal, callback);
 
             //Retrieve the setpassword
             char[] plainPassword = callback.getPassword();
@@ -93,37 +93,37 @@ public class CRAMMD5HexInitialiser exten
         // Simply delegate to the real PrincipalDB
         public boolean verifyPassword(String principal, char[] password) throws AccountNotFoundException
         {
-            return _realPricipalDatabase.verifyPassword(principal, password);
+            return _realPrincipalDatabase.verifyPassword(principal, password);
         }
 
         public boolean updatePassword(Principal principal, char[] password) throws AccountNotFoundException
         {
-            return _realPricipalDatabase.updatePassword(principal, password);
+            return _realPrincipalDatabase.updatePassword(principal, password);
         }
 
         public boolean createPrincipal(Principal principal, char[] password)
         {
-            return _realPricipalDatabase.createPrincipal(principal, password);
+            return _realPrincipalDatabase.createPrincipal(principal, password);
         }
 
         public boolean deletePrincipal(Principal principal) throws AccountNotFoundException
         {
-            return _realPricipalDatabase.deletePrincipal(principal);
+            return _realPrincipalDatabase.deletePrincipal(principal);
         }
 
         public Principal getUser(String username)
         {
-            return _realPricipalDatabase.getUser(username);
+            return _realPrincipalDatabase.getUser(username);
         }
 
         public List<Principal> getUsers()
         {
-            return _realPricipalDatabase.getUsers();
+            return _realPrincipalDatabase.getUsers();
         }
 	
         public void reload() throws IOException
         {
-            _realPricipalDatabase.reload();
+            _realPrincipalDatabase.reload();
         }
 
         @Override
@@ -135,14 +135,14 @@ public class CRAMMD5HexInitialiser exten
         @Override
         public String getMechanisms()
         {
-            return _realPricipalDatabase.getMechanisms();
+            return _realPrincipalDatabase.getMechanisms();
         }
 
         @Override
         public SaslServer createSaslServer(String mechanism, String localFQDN,
                 Principal externalPrincipal) throws SaslException
         {
-            return _realPricipalDatabase.createSaslServer(mechanism, localFQDN, externalPrincipal);
+            return _realPrincipalDatabase.createSaslServer(mechanism, localFQDN, externalPrincipal);
         }
     }
 

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java Thu Jan 23 23:37:48 2014
@@ -28,7 +28,7 @@ package org.apache.qpid.server.stats;
  * parts of the broker to set up and configure statistics generation.
  * <p>
  * When creating these objects, there should be a parent/child relationship
- * between them, such that the lowest level gatherer can record staticics if
+ * between them, such that the lowest level gatherer can record statistics if
  * enabled, and pass on the notification to the parent object to allow higher
  * level aggregation. When resetting statistics, this works in the opposite
  * direction, with higher level gatherers also resetting all of their children.

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationRecoverer.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationRecoverer.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationRecoverer.java Thu Jan 23 23:37:48 2014
@@ -85,7 +85,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/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/StateManager.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/StateManager.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/StateManager.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/StateManager.java Thu Jan 23 23:37:48 2014
@@ -73,7 +73,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/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/SubscriptionList.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/SubscriptionList.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/SubscriptionList.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/subscription/SubscriptionList.java Thu Jan 23 23:37:48 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/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java Thu Jan 23 23:37:48 2014
@@ -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

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/DefaultUpgraderProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/DefaultUpgraderProvider.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/DefaultUpgraderProvider.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/DefaultUpgraderProvider.java Thu Jan 23 23:37:48 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/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java Thu Jan 23 23:37:48 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/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java Thu Jan 23 23:37:48 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/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/plugins/AbstractConfigurationTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/plugins/AbstractConfigurationTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/plugins/AbstractConfigurationTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/plugins/AbstractConfigurationTest.java Thu Jan 23 23:37:48 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/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java Thu Jan 23 23:37:48 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;



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


Mime
View raw message