From b358eec8daaab8a5d21ebd221325ff425f89d89d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 6 Sep 2013 12:39:20 +0300 Subject: [PATCH] Spelling fixes. --- README.md | 10 +++++----- RELEASING.md | 4 ++-- .../config/jboss-as-4/clustered/jboss-service.xml | 2 +- .../jboss-as-4/non-clustered/jboss-service.xml | 2 +- docs/eap-manual/en/clusters.xml | 10 +++++----- docs/quickstart-guide/en/download.xml | 2 +- docs/user-manual/en/appserver-integration.xml | 6 +++--- docs/user-manual/en/clusters.xml | 4 ++-- docs/user-manual/en/configuration-index.xml | 2 +- docs/user-manual/en/interoperability.xml | 2 +- docs/user-manual/en/management.xml | 2 +- docs/user-manual/en/queue-attributes.xml | 2 +- docs/user-manual/en/using-jms.xml | 2 +- docs/user-manual/en/using-server.xml | 4 ++-- docs/user-manual/zh/using-jms.xml | 2 +- docs/user-manual/zh/using-server.xml | 2 +- examples/javaee/mdb-bmt/readme.html | 4 ++-- .../javaee/example/server/MDB_BMTExample.java | 4 ++-- examples/javaee/mdb-cmt-tx-local/readme.html | 6 +++--- .../example/server/MDB_CMT_TxLocalExample.java | 6 +++--- .../example/server/MDB_CMT_TxNotSupported.java | 4 ++-- .../javaee/xarecovery/server/jbossts-properties.xml | 2 +- examples/jms/jms-auto-closeable/readme.html | 4 ++-- examples/jms/message-counters/readme.html | 4 ++-- .../jms/example/MultipleFailoverFailbackExample.java | 2 +- .../hornetq/jms/example/MultipleFailoverExample.java | 2 +- examples/jms/non-transaction-failover/readme.html | 4 ++-- .../jms/example/NonTransactionFailoverExample.java | 2 +- examples/jms/queue-selector/readme.html | 4 ++-- examples/jms/reattach-node/readme.html | 4 ++-- .../jms/replicated-transaction-failover/readme.html | 8 ++++---- .../ReplicatedTransactionFailoverExample.java | 4 ++-- examples/jms/stop-server-failover/readme.html | 4 ++-- .../jms/example/StopServerFailoverExample.java | 4 ++-- examples/jms/transaction-failover/readme.html | 8 ++++---- .../jms/example/TransactionFailoverExample.java | 4 ++-- .../src/main/resources/arjuna-properties.xml | 2 +- .../main/java/org/hornetq/api/core/SimpleString.java | 4 ++-- .../src/main/java/org/hornetq/utils/Base64.java | 4 ++-- .../src/main/java/org/hornetq/utils/UUIDTimer.java | 2 +- .../api/core/JGroupsBroadcastGroupConfiguration.java | 2 +- .../org/hornetq/api/core/client/ClientMessage.java | 2 +- .../api/core/management/HornetQServerControl.java | 2 +- .../hornetq/api/core/management/QueueControl.java | 2 +- .../org/hornetq/core/client/HornetQClientLogger.java | 2 +- .../core/client/HornetQClientMessageBundle.java | 2 +- .../hornetq/core/client/impl/ClientConsumerImpl.java | 2 +- .../core/client/impl/ClientSessionFactoryImpl.java | 4 ++-- .../hornetq/core/client/impl/ClientSessionImpl.java | 2 +- .../core/client/impl/LargeMessageControllerImpl.java | 2 +- .../java/org/hornetq/core/client/impl/Topology.java | 2 +- .../core/server/management/NotificationService.java | 2 +- .../main/java/org/hornetq/utils/json/JSONArray.java | 4 ++-- .../main/java/org/hornetq/utils/json/JSONObject.java | 4 ++-- .../org/hornetq/jms/client/HornetQJMSProducer.java | 2 +- .../org/hornetq/jms/client/SelectorTranslator.java | 2 +- .../org/hornetq/jms/bridge/QualityOfServiceMode.java | 2 +- .../org/hornetq/jms/bridge/impl/JMSBridgeImpl.java | 2 +- .../jms/management/impl/JMSQueueControlImpl.java | 4 ++-- .../journal/impl/AbstractSequentialFileFactory.java | 2 +- .../org/hornetq/core/journal/impl/JournalImpl.java | 4 ++-- .../core/protocol/proton/ProtonProtocolManager.java | 4 ++-- .../org/hornetq/core/protocol/stomp/StompUtils.java | 2 +- .../java/org/hornetq/ra/HornetQRACredential.java | 2 +- .../org/hornetq/ra/HornetQRAManagedConnection.java | 4 ++-- .../ra/HornetQRAManagedConnectionFactory.java | 12 ++++++------ .../org/hornetq/ra/HornetQRASessionFactoryImpl.java | 2 +- .../org/hornetq/ra/inflow/HornetQMessageHandler.java | 2 +- .../org/hornetq/core/filter/impl/FilterImpl.java | 2 +- .../paging/cursor/impl/PageCursorProviderImpl.java | 2 +- .../impl/journal/JournalStorageManager.java | 2 +- .../hornetq/core/postoffice/impl/BindingsImpl.java | 4 ++-- .../hornetq/core/postoffice/impl/PostOfficeImpl.java | 2 +- .../hornetq/core/server/HornetQMessageBundle.java | 2 +- .../org/hornetq/core/server/HornetQServerLogger.java | 2 +- .../server/cluster/impl/ClusterConnectionImpl.java | 2 +- .../hornetq/core/server/impl/HornetQServerImpl.java | 2 +- .../settings/impl/HierarchicalObjectRepository.java | 2 +- .../java/org/hornetq/core/settings/impl/Match.java | 2 +- .../java/org/hornetq/tests/util/ServiceTestBase.java | 2 +- .../integration/client/ConsumerRoundRobinTest.java | 2 +- .../integration/client/DeadLetterAddressTest.java | 12 ++++++------ .../hornetq/tests/integration/client/PagingTest.java | 4 ++-- .../tests/integration/client/SessionTest.java | 2 +- .../integration/cluster/failover/FailoverTest.java | 2 +- .../failover/MultipleServerFailoverTestBase.java | 2 +- .../cluster/topology/TopologyClusterTestBase.java | 2 +- .../tests/integration/jms/bridge/JMSBridgeTest.java | 4 ++-- .../jms/cluster/LargeMessageOverBridgeTest.java | 2 +- .../jms/server/management/JMSQueueControlTest.java | 6 +++--- .../integration/jms/server/management/JMSUtil.java | 2 +- .../integration/management/DivertControlTest.java | 6 +++--- .../management/QueueControlUsingCoreTest.java | 4 ++-- .../tests/integration/ra/OutgoingConnectionTest.java | 4 ++-- .../hornetq/tests/integration/stomp/StompTest.java | 2 +- .../tests/integration/stomp/v11/StompV11Test.java | 2 +- .../tests/integration/stomp/v12/StompV12Test.java | 2 +- .../java/org/hornetq/jms/tests/ConnectionTest.java | 2 +- .../org/hornetq/jms/tests/MessageConsumerTest.java | 2 +- .../java/org/hornetq/jms/tests/XARecoveryTest.java | 4 ++-- .../src/test/java/org/hornetq/jms/tests/XATest.java | 2 +- .../hornetq/jms/tests/stress/TopicStressTest.java | 4 ++-- .../jtests/jms/conform/message/MessageBodyTest.java | 2 +- tests/pom.xml | 2 +- .../unit/ra/HornetQResourceAdapterConfigTest.java | 2 +- 105 files changed, 170 insertions(+), 170 deletions(-) diff --git a/README.md b/README.md index 1fb11dd8230..d37b3a53545 100644 --- a/README.md +++ b/README.md @@ -156,16 +156,16 @@ Do not use the [maven-eclipse-plugin] to copy the files as it conflicts with [m2 [maven-eclipse-plugin]: https://maven.apache.org/plugins/maven-eclipse-plugin/ [m2e]: http://eclipse.org/m2e/ -## Github procedures +## GitHub procedures -The best way to submit changes to HornetQ is through pull-request's on +The best way to submit changes to HornetQ is through pull requests on GitHub. After review a pull request should either get merged or be rejected. When a pull request needs to be reworked, say you have missed something, the pull request is then closed. When you finished -addressing the required changes you should reopen your original Pull -Request and it will then be re-evaluated. At that point if the request -is aproved we will then merge it. +addressing the required changes you should reopen your original pull +request and it will then be re-evaluated. At that point if the request +is approved we will then merge it. Make sure you always rebase your branch on master before submitting pull requests. diff --git a/RELEASING.md b/RELEASING.md index ec107328688..b909ca61be8 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -4,13 +4,13 @@ Things to do before issuing a new MAJOR release: * check if all new Configuration parameters are documented; -* use your IDE to regerate equals/hashCode for ConfigurationImpl (this +* use your IDE to regenerate equals/hashCode for ConfigurationImpl (this is just much safer than trying to inspect the code). * check if all public API classes have a proper Javadoc. -## Tagging a relese in Git ## +## Tagging a release in Git ## We must avoid having multiple commits with the same final release version in the POMs. To achieve that, the commit changing the pom versions to the final release version, should be merged together with a second commit changing to version in all pom's to ``X.Y.Z-SNAPSHOT``. diff --git a/distribution/hornetq/src/main/resources/config/jboss-as-4/clustered/jboss-service.xml b/distribution/hornetq/src/main/resources/config/jboss-as-4/clustered/jboss-service.xml index 1e8293bbc52..b848c9eadcd 100644 --- a/distribution/hornetq/src/main/resources/config/jboss-as-4/clustered/jboss-service.xml +++ b/distribution/hornetq/src/main/resources/config/jboss-as-4/clustered/jboss-service.xml @@ -24,7 +24,7 @@ - + false - + false Live Server Configuration - First lets start with the configuration of the live server, we will use the EAP 'all' configuration as + First let's start with the configuration of the live server, we will use the EAP 'all' configuration as our starting point. Since this version only supports shared store for failover we need to configure this in the hornetq-configuration.xml @@ -133,7 +133,7 @@ We also need to configure the connection factories used by the client to be HA. This is done by adding - certain attributes to the connection factories inhornetq-jms.xml. Lets look at an + certain attributes to the connection factories inhornetq-jms.xml. Let's look at an example: @@ -196,7 +196,7 @@
Backup Server Configuration - Now lets look at how to create and configure a backup server on the same eap instance. This is running + Now let's look at how to create and configure a backup server on the same eap instance. This is running on the same eap instance as the live server from the previous chapter but is configured as the backup for a live server running on a different eap instance. @@ -277,7 +277,7 @@ - Now lets add the server configuration in + Now let's add the server configuration in hornetq-configuration.xml and add it to the same directory deploy/hornetq-backup1 @@ -566,4 +566,4 @@
- \ No newline at end of file + diff --git a/docs/quickstart-guide/en/download.xml b/docs/quickstart-guide/en/download.xml index b86da4ec6fa..690f9a374b0 100644 --- a/docs/quickstart-guide/en/download.xml +++ b/docs/quickstart-guide/en/download.xml @@ -65,7 +65,7 @@ >https://github.com/hornetq/hornetq - All release tags are availble from All release tags are available from https://github.com/hornetq/hornetq/tags diff --git a/docs/user-manual/en/appserver-integration.xml b/docs/user-manual/en/appserver-integration.xml index de1d9955def..ca095590289 100644 --- a/docs/user-manual/en/appserver-integration.xml +++ b/docs/user-manual/en/appserver-integration.xml @@ -293,7 +293,7 @@ public class MDBMessageSendTxExample implements MessageListener
MDB and Consumer pool size Most application servers, including JBoss, allow you to configure how many MDB's there are in a pool. In - Jboss this is configured via the MaxPoolSize parameter in the ejb3-interceptors-aop.xml file. Configuring + JBoss this is configured via the MaxPoolSize parameter in the ejb3-interceptors-aop.xml file. Configuring this has no actual effect on how many sessions/consumers there actually are created. This is because the Resource Adaptor implementation knows nothing about the application servers MDB implementation. So even if you set the MDB pool size to 1, 15 sessions/consumers will be created (this is the default). If you want to limit how many @@ -1021,7 +1021,7 @@ private ConnectionFactory connectionFactory; This is a step by step guide on how to configure a JBoss application server that doesn't have HornetQ installed to use a remote instance of HornetQ
- Configuring Jboss 5 + Configuring JBoss 5 Firstly download and install JBoss AS 5 as per the JBoss installation guide and HornetQ as per the HornetQ installation guide. After that the following steps are required @@ -1195,7 +1195,7 @@ Copyright 2009 Red Hat, Inc. Now you should be able to send messages using the JCA JMS connection pooling within an XA transaction.
- Configuring Jboss 5 + Configuring JBoss 5 The steps to do this are exactly the same as for JBoss 4, you will have to create a jboss.xml definition file for your MDB with the following entry diff --git a/docs/user-manual/en/clusters.xml b/docs/user-manual/en/clusters.xml index b8f90ccd6fd..bbbfd4ee859 100644 --- a/docs/user-manual/en/clusters.xml +++ b/docs/user-manual/en/clusters.xml @@ -78,7 +78,7 @@ - This information, lets call it the Cluster Topology, is actually sent around normal HornetQ + This information, let's call it the Cluster Topology, is actually sent around normal HornetQ connections to clients and to other servers over cluster connections. This being the case we need a way of establishing the initial first connection. This can be done using dynamic discovery techniques like UDP @@ -281,7 +281,7 @@ - Although a discovery group will always accept broadcasts, its current list of avaliable live and + Although a discovery group will always accept broadcasts, its current list of available live and backup servers is only ever used when an initial connection is made, from then server discovery is done over the normal HornetQ connections. diff --git a/docs/user-manual/en/configuration-index.xml b/docs/user-manual/en/configuration-index.xml index 8f3c807578a..b3cc1621055 100644 --- a/docs/user-manual/en/configuration-index.xml +++ b/docs/user-manual/en/configuration-index.xml @@ -445,7 +445,7 @@ A user can then replace the real password in the configuration files with the new masked password. When HornetQ loads a masked password, it uses a suitable 'decoder' to decode it into real password. - Hornetq provides a default password encoder and decoder. Optionally users can use or implement their own encoder and decoder for + HornetQ provides a default password encoder and decoder. Optionally users can use or implement their own encoder and decoder for masking the passwords.
Password Masking in Server Configuration File diff --git a/docs/user-manual/en/interoperability.xml b/docs/user-manual/en/interoperability.xml index 1ef4f3a9709..db773b30a19 100644 --- a/docs/user-manual/en/interoperability.xml +++ b/docs/user-manual/en/interoperability.xml @@ -280,7 +280,7 @@ java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfacesAMQP and Coordinations - Handling Transactions An AMQP links target can also be a Coordinator, the Coordinator is used to handle transactions. If a coordinator is used the the underlying HormetQ Server session will be transacted and will be either rolled back - or commited via the coordinator. + or committed via the coordinator. AMQP allows the use of multiple transactions per session, amqp:multi-txns-per-ssn, however in this version HornetQ will only support single transactions per session
diff --git a/docs/user-manual/en/management.xml b/docs/user-manual/en/management.xml index 2d05f7ecafa..be5cd32c3e6 100644 --- a/docs/user-manual/en/management.xml +++ b/docs/user-manual/en/management.xml @@ -1078,7 +1078,7 @@ messageCounter.getMessageCountDelta()); - The name and JNDI name cant be changed, if you want to change these recreate the queue with the appropriate + The name and JNDI name can't be changed, if you want to change these recreate the queue with the appropriate settings. The rest of the configuration options, apart from security roles, relate to address settings for a particular address. The default address settings are picked up from the servers configuration, if you change any of these settings or create a queue via the console a new Address Settings entry will be added. For a full explanation on diff --git a/docs/user-manual/en/queue-attributes.xml b/docs/user-manual/en/queue-attributes.xml index a13339c34c2..8ec06b511ab 100644 --- a/docs/user-manual/en/queue-attributes.xml +++ b/docs/user-manual/en/queue-attributes.xml @@ -29,7 +29,7 @@
Predefined Queues Queues can be predefined via configuration at a core level or at a JMS level. Firstly - lets look at a JMS level. + let's look at a JMS level. The following shows a queue predefined in the hornetq-jms.xml configuration file. diff --git a/docs/user-manual/en/using-jms.xml b/docs/user-manual/en/using-jms.xml index aead17b1850..aaecf62594f 100644 --- a/docs/user-manual/en/using-jms.xml +++ b/docs/user-manual/en/using-jms.xml @@ -214,7 +214,7 @@ java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfacesThe code Here's the code for the example: First we'll create a JNDI initial context from which to lookup our JMS objects: - InitialContect ic = new InitialContext(); + InitialContext ic = new InitialContext(); Now we'll look up the connection factory: ConnectionFactory cf = (ConnectionFactory)ic.lookup("/ConnectionFactory"); And look up the Queue: diff --git a/docs/user-manual/en/using-server.xml b/docs/user-manual/en/using-server.xml index 14e61a33369..36f7641f78d 100644 --- a/docs/user-manual/en/using-server.xml +++ b/docs/user-manual/en/using-server.xml @@ -264,7 +264,7 @@ </deployment> We can see that, as well as the core HornetQ server, the stand-alone server - instantiates various different POJOs, lets look at them in turn: + instantiates various different POJOs, let's look at them in turn: MBeanServer @@ -331,7 +331,7 @@ <mbean code="org.hornetq.service.HornetQStarterService" name="org.hornetq:service=HornetQStarterService"> - <!--lets let the JMS Server start us--> + <!--let's let the JMS Server start us--> <attribute name="Start">false</attribute> <depends optional-attribute-name="SecurityManagerService" diff --git a/docs/user-manual/zh/using-jms.xml b/docs/user-manual/zh/using-jms.xml index 76161db4bd5..254a787a212 100644 --- a/docs/user-manual/zh/using-jms.xml +++ b/docs/user-manual/zh/using-jms.xml @@ -185,7 +185,7 @@ java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces 程序代码 下面给出的例子中的代码： 首先我们创建一个JNDI的Initial Context： - InitialContect ic = new InitialContext(); + InitialContext ic = new InitialContext(); 下面我们查找 connection factory： ConnectionFactory cf = (ConnectionFactory)ic.lookup("/ConnectionFactory"); 然后查找 Queue： diff --git a/docs/user-manual/zh/using-server.xml b/docs/user-manual/zh/using-server.xml index 7f5139c071a..1264e302fad 100644 --- a/docs/user-manual/zh/using-server.xml +++ b/docs/user-manual/zh/using-server.xml @@ -257,7 +257,7 @@ <mbean code="org.hornetq.service.HornetQStarterService" name="org.hornetq:service=HornetQStarterService"> - <!--lets let the JMS Server start us--> + <!--let's let the JMS Server start us--> <attribute name="Start">false</attribute> <depends optional-attribute-name="SecurityManagerService" diff --git a/examples/javaee/mdb-bmt/readme.html b/examples/javaee/mdb-bmt/readme.html index cc4c8378dd0..e95bfbae1c4 100644 --- a/examples/javaee/mdb-bmt/readme.html +++ b/examples/javaee/mdb-bmt/readme.html @@ -75,7 +75,7 @@

Example step-by-step

System.out.println("message " + text + " received"); -
  • Now we can do something within a user transaction, lets just start and commit it +
  • Now we can do something within a user transaction, let's just start and commit it 
    •              UserTransaction tx = ctx.getUserTransaction();
@@ -108,4 +108,4 @@ 
    Example step-by-step
    
 
      
   
-
\ No newline at end of file
+
diff --git a/examples/javaee/mdb-bmt/src/main/java/org/hornetq/javaee/example/server/MDB_BMTExample.java b/examples/javaee/mdb-bmt/src/main/java/org/hornetq/javaee/example/server/MDB_BMTExample.java
index 4ec93534221..7753d2e6132 100644
--- a/examples/javaee/mdb-bmt/src/main/java/org/hornetq/javaee/example/server/MDB_BMTExample.java
+++ b/examples/javaee/mdb-bmt/src/main/java/org/hornetq/javaee/example/server/MDB_BMTExample.java
@@ -47,7 +47,7 @@ public void onMessage(final Message message)
 
          System.out.println("message " + text + " received");
 
-         // Step 11. lets look at the user transaction to make sure there isn't one.
+         // Step 11. let's look at the user transaction to make sure there isn't one.
          UserTransaction tx = ctx.getUserTransaction();
 
          if (tx != null)
@@ -66,4 +66,4 @@ public void onMessage(final Message message)
          e.printStackTrace();
       }
    }
-}
\ No newline at end of file
+}
diff --git a/examples/javaee/mdb-cmt-tx-local/readme.html b/examples/javaee/mdb-cmt-tx-local/readme.html
index aa525fdb948..143a3ecdd12 100644
--- a/examples/javaee/mdb-cmt-tx-local/readme.html
+++ b/examples/javaee/mdb-cmt-tx-local/readme.html
@@ -85,8 +85,8 @@ 
    Example step-by-step
    
                 }
                 else
                 {
-                   System.out.println("there is no global transaction, altho the messge delivery is using a local transaction");
-                   System.out.println("lets throw an exception and see what happens");
+                   System.out.println("there is no global transaction, although the message delivery is using a local transaction");
+                   System.out.println("let's throw an exception and see what happens");
                    throw new RuntimeException("DOH!");
                 }
              }            
@@ -118,4 +118,4 @@ 
    Example step-by-step
    
 
      
   
-
\ No newline at end of file
+
diff --git a/examples/javaee/mdb-cmt-tx-local/src/main/java/org/hornetq/javaee/example/server/MDB_CMT_TxLocalExample.java b/examples/javaee/mdb-cmt-tx-local/src/main/java/org/hornetq/javaee/example/server/MDB_CMT_TxLocalExample.java
index f9ccd1ec376..9afbb67130b 100644
--- a/examples/javaee/mdb-cmt-tx-local/src/main/java/org/hornetq/javaee/example/server/MDB_CMT_TxLocalExample.java
+++ b/examples/javaee/mdb-cmt-tx-local/src/main/java/org/hornetq/javaee/example/server/MDB_CMT_TxLocalExample.java
@@ -66,8 +66,8 @@ public void onMessage(final Message message)
             }
             else
             {
-               System.out.println("there is no global transaction, altho the messge delivery is using a local transaction");
-               System.out.println("lets throw an exception and see what happens");
+               System.out.println("there is no global transaction, although the message delivery is using a local transaction");
+               System.out.println("let's throw an exception and see what happens");
                throw new RuntimeException("DOH!");
             }
          }
@@ -87,4 +87,4 @@ public void onMessage(final Message message)
          e.printStackTrace();
       }
    }
-}
\ No newline at end of file
+}
diff --git a/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/hornetq/javaee/example/server/MDB_CMT_TxNotSupported.java b/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/hornetq/javaee/example/server/MDB_CMT_TxNotSupported.java
index 6aaa51ae4ba..3b6a462be3a 100644
--- a/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/hornetq/javaee/example/server/MDB_CMT_TxNotSupported.java
+++ b/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/hornetq/javaee/example/server/MDB_CMT_TxNotSupported.java
@@ -53,7 +53,7 @@ public void onMessage(final Message message)
 
          System.out.println("message " + text + " received");
 
-         // Step 11. lets look at the transaction to make sure there isn't one.
+         // Step 11. let's look at the transaction to make sure there isn't one.
          Transaction tx = tm.getTransaction();
 
          if (tx == null)
@@ -70,4 +70,4 @@ public void onMessage(final Message message)
          e.printStackTrace();
       }
    }
-}
\ No newline at end of file
+}
diff --git a/examples/javaee/xarecovery/server/jbossts-properties.xml b/examples/javaee/xarecovery/server/jbossts-properties.xml
index 87f9b876aa4..35b00ab5104 100644
--- a/examples/javaee/xarecovery/server/jbossts-properties.xml
+++ b/examples/javaee/xarecovery/server/jbossts-properties.xml
@@ -15,7 +15,7 @@
         in which case the token values are substituted for the values of the corresponding system
         properties as follows:
  
-        - Any occurance of ${p} with the System.getProperty(p) value.
+        - Any occurrence of ${p} with the System.getProperty(p) value.
         If there is no such property p defined, then the ${p} reference will remain unchanged.
 
         - If the property reference is of the form ${p:v} and there is no such property p,
diff --git a/examples/jms/jms-auto-closeable/readme.html b/examples/jms/jms-auto-closeable/readme.html
index cb902d80d7f..cc92549e4ad 100644
--- a/examples/jms/jms-auto-closeable/readme.html
+++ b/examples/jms/jms-auto-closeable/readme.html
@@ -30,7 +30,7 @@ 
    Example step-by-step
    
            ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("/ConnectionFactory");
    -
  • We create a JMS context but we do it inside the try-with-resources statment like so:
    • +
  • We create a JMS context but we do it inside the try-with-resources statement like so:
    •             
             try
@@ -73,4 +73,4 @@ 
    Example step-by-step
    
 
      
   
-
\ No newline at end of file
+
diff --git a/examples/jms/message-counters/readme.html b/examples/jms/message-counters/readme.html
index 18b8d0ca149..4badc1e35f5 100644
--- a/examples/jms/message-counters/readme.html
+++ b/examples/jms/message-counters/readme.html
@@ -81,7 +81,7 @@ 
    Example step-by-step
    
                                                                                               false);
    -
  • We retrieve the message counter and display them. MessageCounters are retrieved as JSON Strings for portability reason (wether +
  • We retrieve the message counter and display them. MessageCounters are retrieved as JSON Strings for portability reason (whether JMX is used for management or JMS messages). To make it simpler to use them in the code, there is a MessageCounterInfo data structure.
    •              String counters = queueControl.listMessageCounter();
@@ -174,4 +174,4 @@ 
    Example step-by-step
    
      
  • MessageCounterInfo is a helper class used 
         to create a MessageCounterInfo object from the JSON String which represents message counters
    • 
   
-
\ No newline at end of file
+
diff --git a/examples/jms/multiple-failover-failback/src/main/java/org/hornetq/jms/example/MultipleFailoverFailbackExample.java b/examples/jms/multiple-failover-failback/src/main/java/org/hornetq/jms/example/MultipleFailoverFailbackExample.java
index 292c2338d92..db26f56756c 100644
--- a/examples/jms/multiple-failover-failback/src/main/java/org/hornetq/jms/example/MultipleFailoverFailbackExample.java
+++ b/examples/jms/multiple-failover-failback/src/main/java/org/hornetq/jms/example/MultipleFailoverFailbackExample.java
@@ -58,7 +58,7 @@ public boolean runExample() throws Exception
          // Step 3. Create a JMS Connection
          connection = connectionFactory.createConnection();
 
-         // Step 4. Create a *non-transacted* JMS Session with client acknwoledgement
+         // Step 4. Create a *non-transacted* JMS Session with client acknowledgement
          Session session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE);
 
          // Step 5. Start the connection to ensure delivery occurs
diff --git a/examples/jms/multiple-failover/src/main/java/org/hornetq/jms/example/MultipleFailoverExample.java b/examples/jms/multiple-failover/src/main/java/org/hornetq/jms/example/MultipleFailoverExample.java
index 73b21d961a3..63b01d68f15 100644
--- a/examples/jms/multiple-failover/src/main/java/org/hornetq/jms/example/MultipleFailoverExample.java
+++ b/examples/jms/multiple-failover/src/main/java/org/hornetq/jms/example/MultipleFailoverExample.java
@@ -58,7 +58,7 @@ public boolean runExample() throws Exception
          // Step 3. Create a JMS Connection
          connection = connectionFactory.createConnection();
 
-         // Step 4. Create a *non-transacted* JMS Session with client acknwoledgement
+         // Step 4. Create a *non-transacted* JMS Session with client acknowledgement
          Session session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE);
 
          // Step 5. Start the connection to ensure delivery occurs
diff --git a/examples/jms/non-transaction-failover/readme.html b/examples/jms/non-transaction-failover/readme.html
index 106657c8c65..77a55bb6ef1 100644
--- a/examples/jms/non-transaction-failover/readme.html
+++ b/examples/jms/non-transaction-failover/readme.html
@@ -10,7 +10,7 @@ 
    JMS Failover Without Transactions Example
    
      
      
    This example demonstrates two servers coupled as a live-backup pair for high availability (HA), and a client
      connection failing over from live to backup when the live server is crashed.
    
-     
    Failover behavior differs wether the JMS session is transacted or not.
    
+     
    Failover behavior differs whether the JMS session is transacted or not.
    
      
    When a non-transacted JMS session is used, once and only once delivery is not guaranteed 
         and it is possible some messages will be lost or delivered twice, depending when the failover to the backup server occurs.
    
      
    It is up to the client to deal with such cases. To ensure once and only once delivery, the client must
@@ -92,7 +92,7 @@ 
    Example step-by-step
    
            Thread.sleep(2000);
    -
  • Acknowledging the second half of the sent messages will fail as failover to the backup server has occured
    • +
  • Acknowledging the second half of the sent messages will fail as failover to the backup server has occurred
    •             try
            {
diff --git a/examples/jms/non-transaction-failover/src/main/java/org/hornetq/jms/example/NonTransactionFailoverExample.java b/examples/jms/non-transaction-failover/src/main/java/org/hornetq/jms/example/NonTransactionFailoverExample.java
index 38b9cc59c80..fc20e6d877c 100644
--- a/examples/jms/non-transaction-failover/src/main/java/org/hornetq/jms/example/NonTransactionFailoverExample.java
+++ b/examples/jms/non-transaction-failover/src/main/java/org/hornetq/jms/example/NonTransactionFailoverExample.java
@@ -58,7 +58,7 @@ public boolean runExample() throws Exception
          // Step 3. Create a JMS Connection
          connection = connectionFactory.createConnection();
 
-         // Step 4. Create a *non-transacted* JMS Session with client acknwoledgement
+         // Step 4. Create a *non-transacted* JMS Session with client acknowledgement
          Session session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE);
 
          // Step 5. Start the connection to ensure delivery occurs
diff --git a/examples/jms/queue-selector/readme.html b/examples/jms/queue-selector/readme.html
index d70e8826004..b90e7463989 100644
--- a/examples/jms/queue-selector/readme.html
+++ b/examples/jms/queue-selector/readme.html
@@ -19,7 +19,7 @@ 
    JMS Queue Selector Example
    
      'color=red', it only receives messages that
      have a 'color' string property of 'red' value; the second is created with selector 'color=green', it 
      only receives messages who have a 'color' string property of 
-     'green' value; and the thrid without a selector, which means it receives all messages. To illustrate, three messages 
+     'green' value; and the third without a selector, which means it receives all messages. To illustrate, three messages
      with different 'color' property values are created and sent.
    
 
      
    Selectors can be used with both queue consumers and topic consumers. The difference is that with queue consumers,
@@ -143,4 +143,4 @@ 
    Example step-by-step
    - \ No newline at end of file + diff --git a/examples/jms/reattach-node/readme.html b/examples/jms/reattach-node/readme.html index 2b6d83d5c1f..59dc57d966b 100644 --- a/examples/jms/reattach-node/readme.html +++ b/examples/jms/reattach-node/readme.html @@ -85,7 +85,7 @@

    Example step-by-step

  • To simulate a temporary problem on the network, we stop the remoting acceptor on the - server which will casue all client connections to fail.
    • + server which will cause all client connections to fail. 
                stopAcceptor(initialContext);
    @@ -129,4 +129,4 @@

    Example step-by-step

    - \ No newline at end of file + diff --git a/examples/jms/replicated-transaction-failover/readme.html b/examples/jms/replicated-transaction-failover/readme.html index 018d10ea80b..11e589c65b1 100644 --- a/examples/jms/replicated-transaction-failover/readme.html +++ b/examples/jms/replicated-transaction-failover/readme.html @@ -10,7 +10,7 @@

    JMS Failover With Transaction using Replication Example

    This example demonstrates two servers coupled as a live-backup pair for high availability (HA) using replication, and a client connection failing over from live to backup when the live server is crashed.

    -

    Failover behavior differs wether the JMS session is transacter or not.

    +

    Failover behavior differs whether the JMS session is transacter or not.

    When a transacted JMS session is used, once-and-only once delivery is guaranteed.

    • if the failover occurs while there is an in-flight transaction, the transaction will be flagged as rollback only. In that case, the JMS client @@ -73,7 +73,7 @@

      Example step-by-step

      fails over from server #1 to server #0 (in your real program you wouldn't need to sleep).

      -
    • As failover occured during transaction, the session has been marked for rollback only and commit will fail
      • +
    • As failover occurred during transaction, the session has been marked for rollback only and commit will fail
      •             try
            {
@@ -89,7 +89,7 @@ 
      Example step-by-step
      
            sendMessages(session, producer, numMessages, false);
      -
    • We commit the session succesfully: the messages will be all delivered to the activated backup server
      • +
    • We commit the session successfully: the messages will be all delivered to the activated backup server
      •             session.commit();
      @@ -126,4 +126,4 @@

      Example step-by-step

      - \ No newline at end of file + diff --git a/examples/jms/replicated-transaction-failover/src/main/java/org/hornetq/jms/example/ReplicatedTransactionFailoverExample.java b/examples/jms/replicated-transaction-failover/src/main/java/org/hornetq/jms/example/ReplicatedTransactionFailoverExample.java index bce2afd5279..76ec56fc59d 100644 --- a/examples/jms/replicated-transaction-failover/src/main/java/org/hornetq/jms/example/ReplicatedTransactionFailoverExample.java +++ b/examples/jms/replicated-transaction-failover/src/main/java/org/hornetq/jms/example/ReplicatedTransactionFailoverExample.java @@ -74,7 +74,7 @@ public boolean runExample() throws Exception // Step 8. We send half of the messages, kill the live server and send the remaining messages sendMessages(session, producer, numMessages, true); - // Step 9. As failover occured during transaction, the session has been marked for rollback only + // Step 9. As failover occurred during transaction, the session has been marked for rollback only try { session.commit(); @@ -87,7 +87,7 @@ public boolean runExample() throws Exception // Step 10. We resend all the messages sendMessages(session, producer, numMessages, false); - // Step 11. We commit the session succesfully: the messages will be all delivered to the activated backup + // Step 11. We commit the session successfully: the messages will be all delivered to the activated backup // server session.commit(); diff --git a/examples/jms/stop-server-failover/readme.html b/examples/jms/stop-server-failover/readme.html index 106657c8c65..77a55bb6ef1 100644 --- a/examples/jms/stop-server-failover/readme.html +++ b/examples/jms/stop-server-failover/readme.html @@ -10,7 +10,7 @@

      JMS Failover Without Transactions Example

      This example demonstrates two servers coupled as a live-backup pair for high availability (HA), and a client connection failing over from live to backup when the live server is crashed.

      -

      Failover behavior differs wether the JMS session is transacted or not.

      +

      Failover behavior differs whether the JMS session is transacted or not.

      When a non-transacted JMS session is used, once and only once delivery is not guaranteed and it is possible some messages will be lost or delivered twice, depending when the failover to the backup server occurs.

      It is up to the client to deal with such cases. To ensure once and only once delivery, the client must @@ -92,7 +92,7 @@

      Example step-by-step

      Thread.sleep(2000); -
    • Acknowledging the second half of the sent messages will fail as failover to the backup server has occured
      • +
    • Acknowledging the second half of the sent messages will fail as failover to the backup server has occurred
      •             try
            {
diff --git a/examples/jms/stop-server-failover/src/main/java/org/hornetq/jms/example/StopServerFailoverExample.java b/examples/jms/stop-server-failover/src/main/java/org/hornetq/jms/example/StopServerFailoverExample.java
index 535d8c0e18c..60fdc821e21 100644
--- a/examples/jms/stop-server-failover/src/main/java/org/hornetq/jms/example/StopServerFailoverExample.java
+++ b/examples/jms/stop-server-failover/src/main/java/org/hornetq/jms/example/StopServerFailoverExample.java
@@ -58,7 +58,7 @@ public boolean runExample() throws Exception
          // Step 3. Create a JMS Connection
          connection = connectionFactory.createConnection();
 
-         // Step 4. Create a *non-transacted* JMS Session with client acknwoledgement
+         // Step 4. Create a *non-transacted* JMS Session with client acknowledgement
          Session session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE);
 
          // Step 5. Start the connection to ensure delivery occurs
@@ -99,7 +99,7 @@ public boolean runExample() throws Exception
          System.in.read();
 
          // Step 11. Acknowledging the 2nd half of the sent messages will fail as failover to the
-         // backup server has occured
+         // backup server has occurred
          try
          {
             message0.acknowledge();
diff --git a/examples/jms/transaction-failover/readme.html b/examples/jms/transaction-failover/readme.html
index 48f3a04b921..3714a5fe34c 100644
--- a/examples/jms/transaction-failover/readme.html
+++ b/examples/jms/transaction-failover/readme.html
@@ -10,7 +10,7 @@ 
      JMS Failover With Transaction Example
      
      
      
      This example demonstrates two servers coupled as a live-backup pair for high availability (HA), and a client
      connection failing over from live to backup when the live server is crashed.
      
-     
      Failover behavior differs wether the JMS session is transacter or not.
      
+     
      Failover behavior differs whether the JMS session is transacter or not.
      
      
      When a transacted JMS session is used, once-and-only once delivery is guaranteed.
      
      
        
         
      • if the failover occurs while there is an in-flight transaction, the transaction will be flagged as rollback only. In that case, the JMS client 
@@ -73,7 +73,7 @@ 
        Example step-by-step
        
             fails over from server #1 to server #0 (in your real program you wouldn't need to sleep).
         
        
         
-        
      • As failover occured during transaction, the session has been marked for rollback only and commit will fail
        • 
+        
      • As failover occurred during transaction, the session has been marked for rollback only and commit will fail
        • 
         
                    try
            {
@@ -89,7 +89,7 @@ 
        Example step-by-step
        
            sendMessages(session, producer, numMessages, false);
         
        
 
-        
      • We commit the session succesfully: the messages will be all delivered to the activated backup server
        • 
+        
      • We commit the session successfully: the messages will be all delivered to the activated backup server
        • 
         
                    session.commit();
         
        
@@ -126,4 +126,4 @@ 
        Example step-by-step
        
 
      
   
-
\ No newline at end of file
+
diff --git a/examples/jms/transaction-failover/src/main/java/org/hornetq/jms/example/TransactionFailoverExample.java b/examples/jms/transaction-failover/src/main/java/org/hornetq/jms/example/TransactionFailoverExample.java
index f7e881d7a77..cb2e2eb5799 100644
--- a/examples/jms/transaction-failover/src/main/java/org/hornetq/jms/example/TransactionFailoverExample.java
+++ b/examples/jms/transaction-failover/src/main/java/org/hornetq/jms/example/TransactionFailoverExample.java
@@ -74,7 +74,7 @@ public boolean runExample() throws Exception
          // Step 8. We send half of the messages, kill the live server and send the remaining messages
          sendMessages(session, producer, numMessages, true);
 
-         // Step 9. As failover occured during transaction, the session has been marked for rollback only
+         // Step 9. As failover occurred during transaction, the session has been marked for rollback only
          try
          {
             session.commit();
@@ -87,7 +87,7 @@ public boolean runExample() throws Exception
          // Step 10. We resend all the messages
          sendMessages(session, producer, numMessages, false);
 
-         // Step 11. We commit the session succesfully: the messages will be all delivered to the activated backup
+         // Step 11. We commit the session successfully: the messages will be all delivered to the activated backup
          // server
          session.commit();
 
diff --git a/examples/jms/xa-with-jta/src/main/resources/arjuna-properties.xml b/examples/jms/xa-with-jta/src/main/resources/arjuna-properties.xml
index dc839c8574c..45ada3d8f74 100644
--- a/examples/jms/xa-with-jta/src/main/resources/arjuna-properties.xml
+++ b/examples/jms/xa-with-jta/src/main/resources/arjuna-properties.xml
@@ -32,7 +32,7 @@
     in which case the token values are substituted for the values of the corresponding system
     properties as follows:
 
-    - Any occurance of ${p} with the System.getProperty(p) value.
+    - Any occurrence of ${p} with the System.getProperty(p) value.
     If there is no such property p defined, then the ${p} reference will remain unchanged.
 
     - If the property reference is of the form ${p:v} and there is no such property p,
diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/SimpleString.java b/hornetq-commons/src/main/java/org/hornetq/api/core/SimpleString.java
index 2ba73a86d8d..0d43c9a5f14 100644
--- a/hornetq-commons/src/main/java/org/hornetq/api/core/SimpleString.java
+++ b/hornetq-commons/src/main/java/org/hornetq/api/core/SimpleString.java
@@ -155,7 +155,7 @@ public byte[] getData()
 
    /**
     * returns true if the SimpleString parameter starts with the same data as this one. false if not.
-    * @param other the SimpelString to look for
+    * @param other the SimpleString to look for
     * @return true if this SimpleString starts with the same data
     */
    public boolean startsWith(final SimpleString other)
@@ -435,4 +435,4 @@ public void getChars(final int srcBegin, final int srcEnd, final char dst[], fin
       }
    }
 
-}
\ No newline at end of file
+}
diff --git a/hornetq-commons/src/main/java/org/hornetq/utils/Base64.java b/hornetq-commons/src/main/java/org/hornetq/utils/Base64.java
index 2a1b74aa262..a28cbfbc02b 100644
--- a/hornetq-commons/src/main/java/org/hornetq/utils/Base64.java
+++ b/hornetq-commons/src/main/java/org/hornetq/utils/Base64.java
@@ -883,7 +883,7 @@ private static byte[] encode3to4(final byte[] b4, final byte[] threeBytes, final
     * anywhere along their length by specifying
     * srcOffset and destOffset.
     * This method does not check to make sure your arrays
-    * are large enough to accomodate srcOffset + 3 for
+    * are large enough to accommodate srcOffset + 3 for
     * the source array or destOffset + 4 for
     * the destination array.
     * The actual number of significant bytes in your array is
@@ -1263,7 +1263,7 @@ public static String encodeBytes(final byte[] source, final int off, final int l
     * anywhere along their length by specifying
     * srcOffset and destOffset.
     * This method does not check to make sure your arrays
-    * are large enough to accomodate srcOffset + 4 for
+    * are large enough to accommodate srcOffset + 4 for
     * the source array or destOffset + 3 for
     * the destination array.
     * This method returns the actual number of bytes that
diff --git a/hornetq-commons/src/main/java/org/hornetq/utils/UUIDTimer.java b/hornetq-commons/src/main/java/org/hornetq/utils/UUIDTimer.java
index e4b725fae33..933989c6f20 100644
--- a/hornetq-commons/src/main/java/org/hornetq/utils/UUIDTimer.java
+++ b/hornetq-commons/src/main/java/org/hornetq/utils/UUIDTimer.java
@@ -33,7 +33,7 @@
  * advances).
  * 
      • As an additional precaution, counter is initialized not to 0 but to a
  * random 8-bit number, and each time clock changes, lowest 8-bits of counter
- * are preserved. The purpose it to make likelyhood of multi-JVM multi-instance
+ * are preserved. The purpose it to make likelihood of multi-JVM multi-instance
  * generators to collide, without significantly reducing max. UUID generation
  * speed. Note though that using more than one generator (from separate JVMs) is
  * strongly discouraged, so hopefully this enhancement isn't needed. This 8-bit
diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/JGroupsBroadcastGroupConfiguration.java b/hornetq-core-client/src/main/java/org/hornetq/api/core/JGroupsBroadcastGroupConfiguration.java
index 5d2ce0a70f7..99e57eb62fd 100644
--- a/hornetq-core-client/src/main/java/org/hornetq/api/core/JGroupsBroadcastGroupConfiguration.java
+++ b/hornetq-core-client/src/main/java/org/hornetq/api/core/JGroupsBroadcastGroupConfiguration.java
@@ -376,7 +376,7 @@ public String toString()
        * This class maintain a global Map of JChannels wrapped in JChannelWrapper for
        * the purpose of reference counting.
        *
-       * Whereever a JChannel is needed it should only get it by calling the getChannel()
+       * Wherever a JChannel is needed it should only get it by calling the getChannel()
        * method of this class. The real disconnect of channels are also done here only.
        */
       private static class JChannelManager
diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/ClientMessage.java b/hornetq-core-client/src/main/java/org/hornetq/api/core/client/ClientMessage.java
index faed0cd3ed5..9e761235012 100644
--- a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/ClientMessage.java
+++ b/hornetq-core-client/src/main/java/org/hornetq/api/core/client/ClientMessage.java
@@ -90,7 +90,7 @@ public interface ClientMessage extends Message
 
    /**
     * Saves the content of the message to the OutputStream.
-    * It will block until the entire content is transfered to the OutputStream.
+    * It will block until the entire content is transferred to the OutputStream.
     * 
        
     *
     * @throws HornetQException
diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/HornetQServerControl.java b/hornetq-core-client/src/main/java/org/hornetq/api/core/management/HornetQServerControl.java
index 7077707d160..69a87a6dd0c 100644
--- a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/HornetQServerControl.java
+++ b/hornetq-core-client/src/main/java/org/hornetq/api/core/management/HornetQServerControl.java
@@ -567,7 +567,7 @@ void addAddressSettings(@Parameter(desc="an address match", name="addressMatch")
    void createDivert(@Parameter(name="name", desc="Name of the divert") String name,
                      @Parameter(name="routingName", desc="Routing name of the divert") String routingName,
                      @Parameter(name="address", desc="Address to divert from") String address,
-                     @Parameter(name="forwardingAddress", desc="Adress to divert to") String forwardingAddress,
+                     @Parameter(name="forwardingAddress", desc="Address to divert to") String forwardingAddress,
                      @Parameter(name="exclusive", desc="Is the divert exclusive?") boolean exclusive,
                      @Parameter(name="filterString", desc="Filter of the divert") String filterString,
                      @Parameter(name="transformerClassName", desc="Class name of the divert's transformer") String transformerClassName) throws Exception;
diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/QueueControl.java b/hornetq-core-client/src/main/java/org/hornetq/api/core/management/QueueControl.java
index 69793b9f6b3..1b8b4fa6ac8 100644
--- a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/QueueControl.java
+++ b/hornetq-core-client/src/main/java/org/hornetq/api/core/management/QueueControl.java
@@ -90,7 +90,7 @@ public interface QueueControl
    /**
     * Sets the expiry address associated to this queue to the specified expiryAddress.
     */
-   void setExpiryAddress(@Parameter(name = "expiryAddress", desc = "Expiry address of the queue") String expiryAddres) throws Exception;
+   void setExpiryAddress(@Parameter(name = "expiryAddress", desc = "Expiry address of the queue") String expiryAddress) throws Exception;
 
    /**
     * Returns the dead-letter address associated to this queue.
diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/HornetQClientLogger.java b/hornetq-core-client/src/main/java/org/hornetq/core/client/HornetQClientLogger.java
index 88a3fd16ca2..c89ce884483 100644
--- a/hornetq-core-client/src/main/java/org/hornetq/core/client/HornetQClientLogger.java
+++ b/hornetq-core-client/src/main/java/org/hornetq/core/client/HornetQClientLogger.java
@@ -125,7 +125,7 @@ public interface HornetQClientLogger extends BasicLogger
    void commitAfterFailover();
 
    @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212012, value = "failover occured during commit throwing XAException.XA_RETRY", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 212012, value = "failover occurred during commit throwing XAException.XA_RETRY", format = Message.Format.MESSAGE_FORMAT)
    void failoverDuringCommit();
 
    @LogMessage(level = Logger.Level.WARN)
diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/HornetQClientMessageBundle.java b/hornetq-core-client/src/main/java/org/hornetq/core/client/HornetQClientMessageBundle.java
index b3d264bdcfa..e469b4abb68 100644
--- a/hornetq-core-client/src/main/java/org/hornetq/core/client/HornetQClientMessageBundle.java
+++ b/hornetq-core-client/src/main/java/org/hornetq/core/client/HornetQClientMessageBundle.java
@@ -155,7 +155,7 @@ public interface HornetQClientMessageBundle
    @Message(id = 119030, value =  "The transaction was rolled back on failover to a backup server", format = Message.Format.MESSAGE_FORMAT)
    HornetQTransactionRolledBackException txRolledBack();
 
-   @Message(id = 119031, value =  "The transaction was rolled back on failover however commit may have been succesful" +
+   @Message(id = 119031, value =  "The transaction was rolled back on failover however commit may have been successful" +
          "", format = Message.Format.MESSAGE_FORMAT)
    HornetQTransactionOutcomeUnknownException txOutcomeUnknown();
 
diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientConsumerImpl.java b/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientConsumerImpl.java
index 150fb84488f..4fee46eb566 100644
--- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientConsumerImpl.java
+++ b/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientConsumerImpl.java
@@ -337,7 +337,7 @@ private ClientMessage receive(final long timeout, final boolean forcingDelivery)
                      continue;
                   }
                }
-               // if we have already pre acked we cant expire
+               // if we have already pre acked we can't expire
                boolean expired = m.isExpired();
 
                flowControlBeforeConsumption(m);
diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java b/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java
index 08287882528..6f0232aedab 100644
--- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java
+++ b/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java
@@ -1128,7 +1128,7 @@ else if (reconnectAttempts == 1)
             {
                if (HornetQClientLogger.LOGGER.isDebugEnabled())
                {
-                  HornetQClientLogger.LOGGER.debug("Reconnection successfull");
+                  HornetQClientLogger.LOGGER.debug("Reconnection successful");
                }
                return;
             }
@@ -1284,7 +1284,7 @@ public CoreRemotingConnection getConnection()
                      }
                      else
                      {
-                        /*looks like the backup is now live, lets use that*/
+                        /*looks like the backup is now live, let's use that*/
 
                         if (ClientSessionFactoryImpl.isDebug)
                         {
diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientSessionImpl.java b/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientSessionImpl.java
index 3e64435a425..b4bbb5c3ead 100644
--- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientSessionImpl.java
+++ b/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientSessionImpl.java
@@ -623,7 +623,7 @@ public void commit() throws HornetQException
          }
       }
 
-      //oops, we have failed over during the commit and dont know what happened
+      //oops, we have failed over during the commit and don't know what happened
       if(rollbackOnly)
       {
          rollbackOnFailover(false);
diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/LargeMessageControllerImpl.java b/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/LargeMessageControllerImpl.java
index 076dec01083..4427f2eb842 100644
--- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/LargeMessageControllerImpl.java
+++ b/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/LargeMessageControllerImpl.java
@@ -332,7 +332,7 @@ public synchronized boolean waitCompletion(final long timeWait) throws HornetQEx
       long timeOut;
 
       // If timeWait = 0, we will use the readTimeout
-      // And we will check if no packets have arrived withing readTimeout milliseconds
+      // And we will check if no packets have arrived within readTimeout milliseconds
       if (timeWait != 0)
       {
          timeOut = System.currentTimeMillis() + timeWait;
diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/Topology.java b/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/Topology.java
index 16b0ed4f755..0ab19c0e8f7 100644
--- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/Topology.java
+++ b/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/Topology.java
@@ -205,7 +205,7 @@ public boolean updateMember(final long uniqueEventID, final String nodeId, final
          {
             if (HornetQClientLogger.LOGGER.isTraceEnabled())
             {
-               HornetQClientLogger.LOGGER.trace(this + "::NewMemeberAdd nodeId=" + nodeId + " member = " + memberInput,
+               HornetQClientLogger.LOGGER.trace(this + "::NewMemberAdd nodeId=" + nodeId + " member = " + memberInput,
                                           new Exception("trace"));
             }
             memberInput.setUniqueEventID(uniqueEventID);
diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/server/management/NotificationService.java b/hornetq-core-client/src/main/java/org/hornetq/core/server/management/NotificationService.java
index e1e6f64770e..a70221bd6aa 100644
--- a/hornetq-core-client/src/main/java/org/hornetq/core/server/management/NotificationService.java
+++ b/hornetq-core-client/src/main/java/org/hornetq/core/server/management/NotificationService.java
@@ -29,7 +29,7 @@ public interface NotificationService
     * 
          
     *   
        • ManagementHelper.HDR_NOTIFICATION_TYPE - the type of notification (SimpleString)
          • 
     *   
        • ManagementHelper.HDR_NOTIFICATION_MESSAGE - a message contextual to the notification (SimpleString)
          • 
-    *   
        • ManagementHelper.HDR_NOTIFICATION_TIMESTAMP - the timestamp when the notification occured (long)
          • 
+    *   
        • ManagementHelper.HDR_NOTIFICATION_TIMESTAMP - the timestamp when the notification occurred (long)
          • 
     * 
        
     *
     * in addition to the properties defined in props
diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/json/JSONArray.java b/hornetq-core-client/src/main/java/org/hornetq/utils/json/JSONArray.java
index d514f075b12..a6aa0dcf38b 100644
--- a/hornetq-core-client/src/main/java/org/hornetq/utils/json/JSONArray.java
+++ b/hornetq-core-client/src/main/java/org/hornetq/utils/json/JSONArray.java
@@ -617,7 +617,7 @@ public long optLong(final int index, final long defaultValue)
    /**
     * Get the optional string value associated with an index. It returns an
     * empty string if there is no value at that index. If the value
-    * is not a string and is not null, then it is coverted to a string.
+    * is not a string and is not null, then it is converted to a string.
     *
     * @param index The index must be between 0 and length() - 1.
     * @return      A String value.
@@ -1022,4 +1022,4 @@ else if (v instanceof JSONArray)
          throw new JSONException(e);
       }
    }
-}
\ No newline at end of file
+}
diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/json/JSONObject.java b/hornetq-core-client/src/main/java/org/hornetq/utils/json/JSONObject.java
index 30c6631cbc9..9663183ff2b 100644
--- a/hornetq-core-client/src/main/java/org/hornetq/utils/json/JSONObject.java
+++ b/hornetq-core-client/src/main/java/org/hornetq/utils/json/JSONObject.java
@@ -1034,7 +1034,7 @@ public long optLong(final String key, final long defaultValue)
    /**
     * Get an optional string associated with a key.
     * It returns an empty string if there is no such key. If the value is not
-    * a string and is not null, then it is coverted to a string.
+    * a string and is not null, then it is converted to a string.
     *
     * @param key   A key string.
     * @return      A string which is the value.
@@ -1729,4 +1729,4 @@ else if (v instanceof JSONArray)
          throw new JSONException(e);
       }
    }
-}
\ No newline at end of file
+}
diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQJMSProducer.java b/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQJMSProducer.java
index e0a780bedfb..ebb41a54dff 100644
--- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQJMSProducer.java
+++ b/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQJMSProducer.java
@@ -47,7 +47,7 @@ public final class HornetQJMSProducer implements JMSProducer
    private final MessageProducer producer;
    private final TypedProperties properties = new TypedProperties();
 
-   //we convert Strings to SimpelStrings so if getProperty is called the wrong object is returned, this list lets us return the
+   //we convert Strings to SimpleStrings so if getProperty is called the wrong object is returned, this list let's us return the
    //correct type
    private final List stringPropertyNames = new ArrayList<>();
 
diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/SelectorTranslator.java b/hornetq-jms-client/src/main/java/org/hornetq/jms/client/SelectorTranslator.java
index 081b6127c8e..7bdef1b8b26 100644
--- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/SelectorTranslator.java
+++ b/hornetq-jms-client/src/main/java/org/hornetq/jms/client/SelectorTranslator.java
@@ -25,7 +25,7 @@
  * We basically just need to replace the JMS header and property Identifier names
  * with the corresponding HornetQ field and header Identifier names.
  *
- * We must be careful not to substitute any literals, or identifers whose name contains the name
+ * We must be careful not to substitute any literals, or identifiers whose name contains the name
  * of one we want to substitute.
  *
  * This makes it less trivial than a simple search and replace.
diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/QualityOfServiceMode.java b/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/QualityOfServiceMode.java
index 627c665bed4..0b73fe37ef6 100644
--- a/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/QualityOfServiceMode.java
+++ b/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/QualityOfServiceMode.java
@@ -23,7 +23,7 @@
  * sending to the destination. Therefore there is a possibility that if failure
  * occurs between removing them from the source and them arriving at the
  * destination they could be lost. Hence delivery will occur at most once. This
- * mode is avilable for both persistent and non persistent messages.
+ * mode is available for both persistent and non persistent messages.
  *
  * 
        QOS_DUPLICATES_OK
        
  *
diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/impl/JMSBridgeImpl.java b/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/impl/JMSBridgeImpl.java
index fc6df997a6f..1adaa816971 100644
--- a/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/impl/JMSBridgeImpl.java
+++ b/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/impl/JMSBridgeImpl.java
@@ -1303,7 +1303,7 @@ private boolean setupJMSObjects()
                   HornetQJMSServerLogger.LOGGER.trace("Creating XA dest session");
                }
 
-               // Create an XA sesion for sending to the destination
+               // Create an XA session for sending to the destination
 
                targetConn = createConnection(targetUsername, targetPassword, targetCff, null, true);
 
diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/management/impl/JMSQueueControlImpl.java b/hornetq-jms-server/src/main/java/org/hornetq/jms/management/impl/JMSQueueControlImpl.java
index 213ae33fc66..4f95938ea73 100644
--- a/hornetq-jms-server/src/main/java/org/hornetq/jms/management/impl/JMSQueueControlImpl.java
+++ b/hornetq-jms-server/src/main/java/org/hornetq/jms/management/impl/JMSQueueControlImpl.java
@@ -153,9 +153,9 @@ public String getExpiryAddress()
       return coreQueueControl.getExpiryAddress();
    }
 
-   public void setExpiryAddress(final String expiryAddres) throws Exception
+   public void setExpiryAddress(final String expiryAddress) throws Exception
    {
-      coreQueueControl.setExpiryAddress(expiryAddres);
+      coreQueueControl.setExpiryAddress(expiryAddress);
    }
 
    @Override
diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AbstractSequentialFileFactory.java b/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AbstractSequentialFileFactory.java
index a18111ff043..eaea867f6fd 100644
--- a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AbstractSequentialFileFactory.java
+++ b/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AbstractSequentialFileFactory.java
@@ -161,7 +161,7 @@ public void deactivateBuffer()
    {
       if (timedBuffer != null)
       {
-         // When moving to a new file, we need to make sure any pending buffer will be transfered to the buffer
+         // When moving to a new file, we need to make sure any pending buffer will be transferred to the buffer
          timedBuffer.flush();
          timedBuffer.setObserver(null);
       }
diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalImpl.java b/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalImpl.java
index f7c7f77541e..00a9ca769cd 100644
--- a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalImpl.java
+++ b/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalImpl.java
@@ -443,7 +443,7 @@ public static int readJournalFile(final SequentialFileFactory fileFactory,
                reader.markAsDataFile(file);
 
                wholeFileBuffer.position(pos + 1);
-               // II - Ignore this record, lets keep looking
+               // II - Ignore this record, let's keep looking
                continue;
             }
 
@@ -2893,7 +2893,7 @@ private void checkControlFile() throws Exception
             SequentialFile fileTmp = fileFactory.createSequentialFile(rename.getA(), 1);
             SequentialFile fileTo = fileFactory.createSequentialFile(rename.getB(), 1);
             // We should do the rename only if the tmp file still exist, or else we could
-            // delete a valid file depending on where the crash occured during the control file delete
+            // delete a valid file depending on where the crash occurred during the control file delete
             if (fileTmp.exists())
             {
                fileTo.delete();
diff --git a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/ProtonProtocolManager.java b/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/ProtonProtocolManager.java
index 79b5bb371e9..d246c0853c5 100644
--- a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/ProtonProtocolManager.java
+++ b/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/ProtonProtocolManager.java
@@ -121,7 +121,7 @@ public void handleBuffer(RemotingConnection connection, HornetQBuffer buffer)
    @Override
    public void addChannelHandlers(String protocol, Map handlers, BufferDecoder decoder)
    {
-      //we dont need any we do our own decoding
+      //we don't need any we do our own decoding
    }
 
    @Override
@@ -166,7 +166,7 @@ public void handleMessage(final Receiver receiver, HornetQBuffer buffer, final D
          buffer.clear();
          EncodedMessage encodedMessage = new EncodedMessage(delivery.getMessageFormat(), bytes, 0, bytes.length);
          ServerMessage message = ProtonUtils.INBOUND.transform(connection, encodedMessage);
-         //use the address on the receiver if not null, if null lets hope it was set correctly on the message
+         //use the address on the receiver if not null, if null let's hope it was set correctly on the message
          if (address != null)
          {
             message.setAddress(new SimpleString(address));
diff --git a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompUtils.java b/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompUtils.java
index a464ba07656..22f3f36adbc 100644
--- a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompUtils.java
+++ b/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompUtils.java
@@ -110,7 +110,7 @@ public static void copyStandardHeadersFromMessageToFrame(MessageInternal message
          command.addHeader(Stomp.Headers.Message.TYPE, message.getObjectProperty("JMSType").toString());
       }
 
-      // now lets add all the message headers
+      // now let's add all the message headers
       Set names = message.getPropertyNames();
       for (SimpleString name : names)
       {
diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRACredential.java b/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRACredential.java
index d5b7e5def85..db74aeaf7c5 100644
--- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRACredential.java
+++ b/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRACredential.java
@@ -118,7 +118,7 @@ private void setPassword(final String password)
     * @param subject The subject
     * @param info The connection request info
     * @return The credentials
-    * @exception SecurityException Thrown if the credentials cant be retrieved
+    * @exception SecurityException Thrown if the credentials can't be retrieved
     */
    public static HornetQRACredential getCredential(final ManagedConnectionFactory mcf,
                                                    final Subject subject,
diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAManagedConnection.java b/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAManagedConnection.java
index 9f6ce557cc1..b72a5f66833 100644
--- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAManagedConnection.java
+++ b/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAManagedConnection.java
@@ -737,7 +737,7 @@ protected HornetQRAManagedConnectionFactory getManagedConnectionFactory()
 
    /**
     * Start the connection
-    * @exception JMSException Thrown if the connection cant be started
+    * @exception JMSException Thrown if the connection can't be started
     */
    void start() throws JMSException
    {
@@ -754,7 +754,7 @@ void start() throws JMSException
 
    /**
     * Stop the connection
-    * @exception JMSException Thrown if the connection cant be stopped
+    * @exception JMSException Thrown if the connection can't be stopped
     */
    void stop() throws JMSException
    {
diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAManagedConnectionFactory.java b/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAManagedConnectionFactory.java
index aa71bd29b76..5b7e6d982bb 100644
--- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAManagedConnectionFactory.java
+++ b/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAManagedConnectionFactory.java
@@ -31,7 +31,7 @@
 import org.hornetq.jms.server.recovery.XARecoveryConfig;
 
 /**
- * HornetQ ManagedConectionFactory
+ * HornetQ ManagedConnectionFactory
  *
  * @author Adrian Brock
  * @author Jesper Pedersen.
@@ -92,7 +92,7 @@ public HornetQRAManagedConnectionFactory()
     * Creates a Connection Factory instance
     *
     * @return javax.resource.cci.ConnectionFactory instance
-    * @throws ResourceException Thrown if a connection factory cant be created
+    * @throws ResourceException Thrown if a connection factory can't be created
     */
    public Object createConnectionFactory() throws ResourceException
    {
@@ -109,7 +109,7 @@ public Object createConnectionFactory() throws ResourceException
     *
     * @param cxManager The connection manager
     * @return javax.resource.cci.ConnectionFactory instance
-    * @throws ResourceException Thrown if a connection factory cant be created
+    * @throws ResourceException Thrown if a connection factory can't be created
     */
    public Object createConnectionFactory(final ConnectionManager cxManager) throws ResourceException
    {
@@ -137,7 +137,7 @@ public Object createConnectionFactory(final ConnectionManager cxManager) throws
     * @param subject       Caller's security information
     * @param cxRequestInfo Additional resource adapter specific connection request information
     * @return The managed connection
-    * @throws ResourceException Thrown if a managed connection cant be created
+    * @throws ResourceException Thrown if a managed connection can't be created
     */
    public ManagedConnection createManagedConnection(final Subject subject, final ConnectionRequestInfo cxRequestInfo) throws ResourceException
    {
@@ -253,7 +253,7 @@ public ManagedConnection matchManagedConnections(@SuppressWarnings("rawtypes")
     * Set the log writer -- NOT SUPPORTED
     *
     * @param out The writer
-    * @throws ResourceException Thrown if the writer cant be set
+    * @throws ResourceException Thrown if the writer can't be set
     */
    public void setLogWriter(final PrintWriter out) throws ResourceException
    {
@@ -267,7 +267,7 @@ public void setLogWriter(final PrintWriter out) throws ResourceException
     * Get the log writer -- NOT SUPPORTED
     *
     * @return The writer
-    * @throws ResourceException Thrown if the writer cant be retrieved
+    * @throws ResourceException Thrown if the writer can't be retrieved
     */
    public PrintWriter getLogWriter() throws ResourceException
    {
diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRASessionFactoryImpl.java b/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRASessionFactoryImpl.java
index be4c2d28897..bd7c9d456df 100644
--- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRASessionFactoryImpl.java
+++ b/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRASessionFactoryImpl.java
@@ -875,7 +875,7 @@ protected HornetQRASession allocateConnection(boolean transacted, int acknowledg
                   //The value {@code Session.CLIENT_ACKNOWLEDGE} may not be used.
                   case Session.CLIENT_ACKNOWLEDGE:
                      throw HornetQRABundle.BUNDLE.invalidSessionTransactedModeRuntime();
-                  //same with this altho the spec doesn't explicitly say
+                  //same with this although the spec doesn't explicitly say
                case Session.SESSION_TRANSACTED:
                      throw HornetQRABundle.BUNDLE.invalidClientAcknowledgeModeRuntime();
                default:
diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/inflow/HornetQMessageHandler.java b/hornetq-ra/src/main/java/org/hornetq/ra/inflow/HornetQMessageHandler.java
index c436dacf126..bb988549b3a 100644
--- a/hornetq-ra/src/main/java/org/hornetq/ra/inflow/HornetQMessageHandler.java
+++ b/hornetq-ra/src/main/java/org/hornetq/ra/inflow/HornetQMessageHandler.java
@@ -178,7 +178,7 @@ else if (HornetQRALogger.LOGGER.isDebugEnabled())
          consumer = (ClientConsumerInternal)session.createConsumer(queueName, selectorString);
       }
 
-      // Create the endpoint, if we are transacted pass the sesion so it is enlisted, unless using Local TX
+      // Create the endpoint, if we are transacted pass the session so it is enlisted, unless using Local TX
       MessageEndpointFactory endpointFactory = activation.getMessageEndpointFactory();
       useLocalTx = !activation.isDeliveryTransacted() && activation.getActivationSpec().isUseLocalTx();
       transacted = activation.isDeliveryTransacted();
diff --git a/hornetq-server/src/main/java/org/hornetq/core/filter/impl/FilterImpl.java b/hornetq-server/src/main/java/org/hornetq/core/filter/impl/FilterImpl.java
index f3c5a1d8ebb..7cc0982e917 100644
--- a/hornetq-server/src/main/java/org/hornetq/core/filter/impl/FilterImpl.java
+++ b/hornetq-server/src/main/java/org/hornetq/core/filter/impl/FilterImpl.java
@@ -40,7 +40,7 @@
 * HQExpiration - the expiration of the message
 * HQSize - the encoded size of the full message in bytes
 * HQUserID - the user specified ID string (if any)
-* Any other identifers that appear in a filter expression represent header values for the message
+* Any other identifiers that appear in a filter expression represent header values for the message
 *
 * String values must be set as SimpleString, not java.lang.String (see JBMESSAGING-1307).
 * Derived from JBoss MQ version by
diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/impl/PageCursorProviderImpl.java b/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/impl/PageCursorProviderImpl.java
index 0341203fda9..cc0e8d11445 100644
--- a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/impl/PageCursorProviderImpl.java
+++ b/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/impl/PageCursorProviderImpl.java
@@ -56,7 +56,7 @@ public class PageCursorProviderImpl implements PageCursorProvider
    // Attributes ----------------------------------------------------
 
    /**
-    * As an optimization, avoid subsquent schedules as they are unecessary
+    * As an optimization, avoid subsequent schedules as they are unnecessary
     */
    private final AtomicInteger scheduledCleanup = new AtomicInteger(0);
 
diff --git a/hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java b/hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
index dae2660a812..b43ca3f39a7 100644
--- a/hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
+++ b/hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
@@ -369,7 +369,7 @@ public void startReplication(ReplicationManager replicationManager, PagingManage
       }
 
 
-      // We first do a compact without any locks, to avoid copying unecessary data over the network.
+      // We first do a compact without any locks, to avoid copying unnecessary data over the network.
       // We do this without holding the storageManager lock, so the journal stays open while compact is being done
       originalMessageJournal.scheduleCompactAndBlock(-1);
       originalBindingsJournal.scheduleCompactAndBlock(-1);
diff --git a/hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/BindingsImpl.java b/hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/BindingsImpl.java
index 0c610da9b3b..651b4bbf444 100644
--- a/hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/BindingsImpl.java
+++ b/hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/BindingsImpl.java
@@ -450,7 +450,7 @@ private void routeUsingStrictOrdering(final ServerMessage message,
 
          if (resp == null)
          {
-            // ok lets find the next binding to propose
+            // ok let's find the next binding to propose
             Binding theBinding = getNextBinding(message, routingName, bindings);
             if(theBinding == null)
             {
@@ -473,7 +473,7 @@ private void routeUsingStrictOrdering(final ServerMessage message,
                }
             }
 
-            // and lets route it
+            // and let's route it
             if (theBinding != null)
             {
                theBinding.route(message, context);
diff --git a/hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/PostOfficeImpl.java b/hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/PostOfficeImpl.java
index f4502dd3aca..13baa072465 100644
--- a/hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/PostOfficeImpl.java
+++ b/hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/PostOfficeImpl.java
@@ -799,7 +799,7 @@ public Object getNotificationLock()
 
    public void sendQueueInfoToQueue(final SimpleString queueName, final SimpleString address) throws Exception
    {
-      // We send direct to the queue so we can send it to the same queue that is bound to the notifications adress -
+      // We send direct to the queue so we can send it to the same queue that is bound to the notifications address -
       // this is crucial for ensuring
       // that queue infos and notifications are received in a contiguous consistent stream
       Binding binding = addressManager.getBinding(queueName);
diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/HornetQMessageBundle.java b/hornetq-server/src/main/java/org/hornetq/core/server/HornetQMessageBundle.java
index a98d62e67ad..84792258619 100644
--- a/hornetq-server/src/main/java/org/hornetq/core/server/HornetQMessageBundle.java
+++ b/hornetq-server/src/main/java/org/hornetq/core/server/HornetQMessageBundle.java
@@ -196,7 +196,7 @@ public interface HornetQMessageBundle
    @Message(id = 119042, value = "{0}  must be equals to -1 or greater or equals to 0 (actual value: {1})", format = Message.Format.MESSAGE_FORMAT)
    IllegalArgumentException greaterThanZeroOrMinusOne(String name, Number val);
 
-   @Message(id = 119043, value = "{0} must be betwen {1} and {2} inclusive (actual value: {3})", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119043, value = "{0} must be between {1} and {2} inclusive (actual value: {3})", format = Message.Format.MESSAGE_FORMAT)
    IllegalArgumentException mustbeBetween(String name, Integer minPriority, Integer maxPriority, Object value);
 
    @Message(id = 119044, value = "Invalid journal type {0}", format = Message.Format.MESSAGE_FORMAT)
diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/HornetQServerLogger.java b/hornetq-server/src/main/java/org/hornetq/core/server/HornetQServerLogger.java
index 822229db5fb..e4b6ced0d83 100644
--- a/hornetq-server/src/main/java/org/hornetq/core/server/HornetQServerLogger.java
+++ b/hornetq-server/src/main/java/org/hornetq/core/server/HornetQServerLogger.java
@@ -1006,7 +1006,7 @@ public interface HornetQServerLogger extends BasicLogger
    void keyAttributeMissing(Node node);
 
    @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 224005, value = "Unable to deply node {0}", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 224005, value = "Unable to deploy node {0}", format = Message.Format.MESSAGE_FORMAT)
    void unableToDeployNode(@Cause Exception e, Node node);
 
    @LogMessage(level = Logger.Level.ERROR)
diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java b/hornetq-server/src/main/java/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java
index d344946070c..4be35f0f31e 100644
--- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java
+++ b/hornetq-server/src/main/java/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java
@@ -866,7 +866,7 @@ public void nodeUP(final TopologyMember topologyMember, final boolean last)
       {
          return;
       }
-      /*we dont create bridges to backups*/
+      /*we don't create bridges to backups*/
       if (topologyMember.getLive() == null)
       {
          if (isTrace)
diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java b/hornetq-server/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java
index 03bf2c79afc..a372ee42f49 100644
--- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java
+++ b/hornetq-server/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java
@@ -2465,7 +2465,7 @@ public void run()
                   startThread.start();
                   return;
                }
-               //ok, this live is no good, lets reset and try again
+               //ok, this live is no good, let's reset and try again
                //close this session factory, we're done with it
                liveServerSessionFactory.close();
                quorumManager.reset();
diff --git a/hornetq-server/src/main/java/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java b/hornetq-server/src/main/java/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java
index b516eb0feb4..5a2ee742d8e 100644
--- a/hornetq-server/src/main/java/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java
+++ b/hornetq-server/src/main/java/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java
@@ -102,7 +102,7 @@ public void addMatch(final String match, final T value)
     * Add a new match to the repository
     *
     * @param match The regex to use to match against
-    * @param value the value to hold agains the match
+    * @param value the value to hold against the match
     */
    public void addMatch(final String match, final T value, final boolean immutableMatch)
    {
diff --git a/hornetq-server/src/main/java/org/hornetq/core/settings/impl/Match.java b/hornetq-server/src/main/java/org/hornetq/core/settings/impl/Match.java
index c8311819c76..670436d026d 100644
--- a/hornetq-server/src/main/java/org/hornetq/core/settings/impl/Match.java
+++ b/hornetq-server/src/main/java/org/hornetq/core/settings/impl/Match.java
@@ -112,7 +112,7 @@ public int hashCode()
    /**
     * utility method to verify consistency of match
     * @param match the match to validate
-    * @throws IllegalArgumentException if a match isnt valid
+    * @throws IllegalArgumentException if a match isn't valid
     */
    public static void verify(final String match) throws IllegalArgumentException
    {
diff --git a/hornetq-server/src/test/java/org/hornetq/tests/util/ServiceTestBase.java b/hornetq-server/src/test/java/org/hornetq/tests/util/ServiceTestBase.java
index 056c3ed78db..4403657e4e5 100644
--- a/hornetq-server/src/test/java/org/hornetq/tests/util/ServiceTestBase.java
+++ b/hornetq-server/src/test/java/org/hornetq/tests/util/ServiceTestBase.java
@@ -339,7 +339,7 @@ protected void waitForServer(HornetQServer server) throws InterruptedException
       if (!server.isStarted())
       {
          log.info(threadDump("Server didn't start"));
-         fail("server didnt start: " + server);
+         fail("server didn't start: " + server);
       }
 
       if (!server.getConfiguration().isBackup())
diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java
index 609c46834d0..966c4cbc611 100644
--- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java
+++ b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java
@@ -50,7 +50,7 @@ public void testConsumersRoundRobinCorrectly() throws Exception
 
       ClientConsumer[] consumers = new ClientConsumer[5];
       // start the session before we create the consumers, this is because start is non blocking and we have to
-      // gaurantee
+      // guarantee
       // all consumers have been started before sending messages
       session.start();
       consumers[0] = session.createConsumer(queueA);
diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/DeadLetterAddressTest.java b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/DeadLetterAddressTest.java
index b05c0faae39..05cf2150378 100644
--- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/DeadLetterAddressTest.java
+++ b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/DeadLetterAddressTest.java
@@ -371,15 +371,15 @@ public void testDeadlLetterAddressWithDefaultAddressSettings() throws Exception
 
       SimpleString address = RandomUtil.randomSimpleString();
       SimpleString queue = RandomUtil.randomSimpleString();
-      SimpleString deadLetterAdress = RandomUtil.randomSimpleString();
+      SimpleString deadLetterAddress = RandomUtil.randomSimpleString();
       SimpleString deadLetterQueue = RandomUtil.randomSimpleString();
       AddressSettings addressSettings = new AddressSettings();
       addressSettings.setMaxDeliveryAttempts(deliveryAttempt);
-      addressSettings.setDeadLetterAddress(deadLetterAdress);
+      addressSettings.setDeadLetterAddress(deadLetterAddress);
       server.getAddressSettingsRepository().setDefault(addressSettings);
 
       clientSession.createQueue(address, queue, false);
-      clientSession.createQueue(deadLetterAdress, deadLetterQueue, false);
+      clientSession.createQueue(deadLetterAddress, deadLetterQueue, false);
 
       ClientProducer producer = clientSession.createProducer(address);
       ClientMessage clientMessage = createTextMessage(clientSession, "heyho!");
@@ -414,15 +414,15 @@ public void testDeadlLetterAddressWithWildcardAddressSettings() throws Exception
 
       SimpleString address = RandomUtil.randomSimpleString();
       SimpleString queue = RandomUtil.randomSimpleString();
-      SimpleString deadLetterAdress = RandomUtil.randomSimpleString();
+      SimpleString deadLetterAddress = RandomUtil.randomSimpleString();
       SimpleString deadLetterQueue = RandomUtil.randomSimpleString();
       AddressSettings addressSettings = new AddressSettings();
       addressSettings.setMaxDeliveryAttempts(deliveryAttempt);
-      addressSettings.setDeadLetterAddress(deadLetterAdress);
+      addressSettings.setDeadLetterAddress(deadLetterAddress);
       server.getAddressSettingsRepository().addMatch("*", addressSettings);
 
       clientSession.createQueue(address, queue, false);
-      clientSession.createQueue(deadLetterAdress, deadLetterQueue, false);
+      clientSession.createQueue(deadLetterAddress, deadLetterQueue, false);
 
       ClientProducer producer = clientSession.createProducer(address);
       ClientMessage clientMessage = createTextMessage(clientSession, "heyho!");
diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingTest.java b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingTest.java
index 2cb85199d4d..9a491eb45ea 100644
--- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingTest.java
+++ b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingTest.java
@@ -3569,7 +3569,7 @@ public void testParialConsume() throws Exception
       ClientConsumer consumer = session.createConsumer(PagingTest.ADDRESS);
 
       session.start();
-      // 347 = I just picked any odd number, not rounded, to make sure it's not at the beggining of any page
+      // 347 = I just picked any odd number, not rounded, to make sure it's not at the beginning of any page
       for (int i = 0; i < 347; i++)
       {
          ClientMessage msg = consumer.receive(5000);
@@ -5541,7 +5541,7 @@ public void onMessage(ClientMessage message)
             session.commit();
          }
 
-         // This will consume messages from the beggining of the queue only
+         // This will consume messages from the beginning of the queue only
          ClientConsumer consumerInitial = session.createConsumer("Q_initial");
          for (int i = 0; i < initialBurst; i++)
          {
diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionTest.java b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionTest.java
index e629c4c5edb..82ce008ce27 100644
--- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionTest.java
+++ b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionTest.java
@@ -41,7 +41,7 @@
 import org.hornetq.tests.util.ServiceTestBase;
 
 /**
- * This test covers the API for ClientSession altho XA tests are tested seperately.
+ * This test covers the API for ClientSession although XA tests are tested separately.
  *
  * @author Andy Taylor
  */
diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java
index 374fdde86fe..05a3ea92862 100644
--- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java
@@ -1734,7 +1734,7 @@ private void receiveDurableMessages(ClientConsumer consumer) throws HornetQExcep
             {
                // The test can only jump to the next message if the current iteration is meant for non-durable
                assertFalse("a message on counter=" + i + " was expected", isDurable(i));
-               // message belongs to the next iteration.. lets just ignore it
+               // message belongs to the next iteration.. let's just ignore it
                repeatMessage = message;
                continue;
             }
diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java
index d3426e64008..1c4647b638c 100644
--- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java
+++ b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java
@@ -261,7 +261,7 @@ protected ClientSession createSession(ClientSessionFactory sf,
 
    protected void waitForDistribution(SimpleString address, HornetQServer server, int messageCount) throws Exception
    {
-      HornetQServerLogger.LOGGER.debug("waiting for distribution of messgaes on server " + server);
+      HornetQServerLogger.LOGGER.debug("waiting for distribution of messages on server " + server);
 
       long start = System.currentTimeMillis();
 
diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/topology/TopologyClusterTestBase.java b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/topology/TopologyClusterTestBase.java
index c40a1bf702c..3e6304ed924 100644
--- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/topology/TopologyClusterTestBase.java
+++ b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/topology/TopologyClusterTestBase.java
@@ -451,7 +451,7 @@ public void testMultipleClientSessionFactories() throws Throwable
          assertTrue("Was not notified that all servers are UP", upLatch.await(10, SECONDS));
          checkContains(new int[] { 0, 1, 2, 3, 4 }, nodeIDs, nodes);
 
-         // we cant close all of the servers, we need to leave one up to notify us
+         // we can't close all of the servers, we need to leave one up to notify us
          stopServers(4, 2, 3, 1);
 
          boolean ok = downLatch.await(10, SECONDS);
diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/bridge/JMSBridgeTest.java b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/bridge/JMSBridgeTest.java
index 7ec6b9f5290..3920e884d28 100644
--- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/bridge/JMSBridgeTest.java
+++ b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/bridge/JMSBridgeTest.java
@@ -417,7 +417,7 @@ public void testStartBridgeFirst() throws Exception
          createQueue("sourceQueue", 0);
          createQueue("localTargetQueue", 0);
          jmsServer0.createTopic(false, "sourceTopic", "/topic/sourceTopic");
-         // Send half the messges
+         // Send half the messages
 
          sendMessages(cf0, sourceQueue, 0, NUM_MESSAGES / 2, false, false);
 
@@ -2106,7 +2106,7 @@ private void testNoMaxBatchTime(final QualityOfServiceMode qosMode, final boolea
 
          bridge.start();
 
-         // Send half the messges
+         // Send half the messages
 
          sendMessages(cf0, sourceQueue, 0, NUM_MESSAGES / 2, persistent, false);
 
diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java
index 45954384de8..108ca3fd5fc 100644
--- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java
+++ b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java
@@ -173,7 +173,7 @@ public void testSendBytesAsLargeOnBridgeOnly() throws Exception
    }
 
    /**
-     * The message won't be large to the client while it will be considered large throught he bridge
+     * The message won't be large to the client while it will be considered large through the bridge
      * @throws Exception
      */
    @Test
diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java
index 972edd42c0e..785ef36b87d 100644
--- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java
+++ b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java
@@ -347,13 +347,13 @@ public void testChangeMessagePriorityWithInvalidPriority() throws Exception
    @Test
    public void testChangeMessagePriorityWithUnknownMessageID() throws Exception
    {
-      String unkownMessageID = RandomUtil.randomString();
+      String unknownMessageID = RandomUtil.randomString();
 
       JMSQueueControl queueControl = createManagementControl();
 
       try
       {
-         queueControl.changeMessagePriority(unkownMessageID, 7);
+         queueControl.changeMessagePriority(unknownMessageID, 7);
          Assert.fail();
       }
       catch (Exception e)
@@ -1336,4 +1336,4 @@ private Connection createConnection() throws JMSException
 
    // Inner classes -------------------------------------------------
 
-}
\ No newline at end of file
+}
diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSUtil.java b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSUtil.java
index 78c907d480c..c7044f19a1d 100644
--- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSUtil.java
+++ b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSUtil.java
@@ -203,7 +203,7 @@ public static void waitForServer(HornetQServer server) throws InterruptedExcepti
          }
          else if (System.currentTimeMillis() > timetowait)
          {
-            throw new IllegalStateException("server didnt start");
+            throw new IllegalStateException("server didn't start");
          }
       }
    }
diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/DivertControlTest.java b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/DivertControlTest.java
index e2798a47d39..1e0a77a325c 100644
--- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/DivertControlTest.java
+++ b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/DivertControlTest.java
@@ -92,7 +92,7 @@ public void setUp() throws Exception
                                                               RandomUtil.randomString(),
                                                               null,
                                                               false);
-      CoreQueueConfiguration fowardQueueConfig = new CoreQueueConfiguration(RandomUtil.randomString(),
+      CoreQueueConfiguration forwardQueueConfig = new CoreQueueConfiguration(RandomUtil.randomString(),
                                                                     RandomUtil.randomString(),
                                                                     null,
                                                                     false);
@@ -100,7 +100,7 @@ public void setUp() throws Exception
       divertConfig = new DivertConfiguration(RandomUtil.randomString(),
                                              RandomUtil.randomString(),
                                              queueConfig.getAddress(),
-                                             fowardQueueConfig.getAddress(),
+                                             forwardQueueConfig.getAddress(),
                                              RandomUtil.randomBoolean(),
                                              null,
                                              null);
@@ -108,7 +108,7 @@ public void setUp() throws Exception
       conf.setSecurityEnabled(false);
       conf.setJMXManagementEnabled(true);
       conf.getQueueConfigurations().add(queueConfig);
-      conf.getQueueConfigurations().add(fowardQueueConfig);
+      conf.getQueueConfigurations().add(forwardQueueConfig);
       conf.getDivertConfigurations().add(divertConfig);
 
       conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java
index 5f2a5e505d2..cd83c11d4ba 100644
--- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java
@@ -240,9 +240,9 @@ public void setDeadLetterAddress(final String deadLetterAddress) throws Exceptio
             proxy.invokeOperation("setDeadLetterAddress", deadLetterAddress);
          }
 
-         public void setExpiryAddress(final String expiryAddres) throws Exception
+         public void setExpiryAddress(final String expiryAddress) throws Exception
          {
-            proxy.invokeOperation("setExpiryAddress", expiryAddres);
+            proxy.invokeOperation("setExpiryAddress", expiryAddress);
          }
 
          public void pause() throws Exception
diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/OutgoingConnectionTest.java b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/OutgoingConnectionTest.java
index 5d8d1721e01..51f2ed07692 100644
--- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/OutgoingConnectionTest.java
+++ b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/OutgoingConnectionTest.java
@@ -487,7 +487,7 @@ public void testQueuSessionAckMode(boolean inTx) throws Exception
       {
          if(inTx)
          {
-            fail("shouldnt throw exception " + e);
+            fail("shouldn't throw exception " + e);
          }
       }
       
@@ -507,7 +507,7 @@ public void testQueuSessionAckMode(boolean inTx) throws Exception
       {
          if(inTx)
          {
-            fail("shouldnt throw exception " + e);
+            fail("shouldn't throw exception " + e);
          }
       }
       
diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/StompTest.java b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/StompTest.java
index b5429d23796..9566852626b 100644
--- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/StompTest.java
+++ b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/StompTest.java
@@ -786,7 +786,7 @@ protected void assertSubscribeWithClientAckThenConsumeWithAutoAck(boolean sendDi
       sendFrame(frame);
       waitForFrameToTakeEffect();
 
-      // now lets make sure we don't see the message again
+      // now let's make sure we don't see the message again
       reconnect();
 
       frame = "CONNECT\n" + "login: brianm\n" + "passcode: wombats\n\n" + Stomp.NULL;
diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v11/StompV11Test.java b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v11/StompV11Test.java
index 7dccf1d48c5..7aade937290 100644
--- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v11/StompV11Test.java
+++ b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v11/StompV11Test.java
@@ -2345,7 +2345,7 @@ protected void assertSubscribeWithClientAckThenConsumeWithAutoAck(boolean sendDi
 
       connV11.disconnect();
 
-      // now lets make sure we don't see the message again
+      // now let's make sure we don't see the message again
       connV11.destroy();
       connV11 = StompClientConnectionFactory.createClientConnection("1.1", hostname, port);
       connV11.connect(defUser, defPass);
diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v12/StompV12Test.java b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v12/StompV12Test.java
index 92f7964696e..613ecd00806 100644
--- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v12/StompV12Test.java
+++ b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v12/StompV12Test.java
@@ -2605,7 +2605,7 @@ protected void assertSubscribeWithClientAckThenConsumeWithAutoAck(boolean sendDi
 
       connV12.disconnect();
 
-      // now lets make sure we don't see the message again
+      // now let's make sure we don't see the message again
       connV12.destroy();
       connV12 = (StompClientConnectionV12) StompClientConnectionFactory.createClientConnection("1.2", hostname, port);
       connV12.connect(defUser, defPass);
diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/ConnectionTest.java b/tests/jms-tests/src/test/java/org/hornetq/jms/tests/ConnectionTest.java
index 308ceada1be..0e8704672ac 100644
--- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/ConnectionTest.java
+++ b/tests/jms-tests/src/test/java/org/hornetq/jms/tests/ConnectionTest.java
@@ -72,7 +72,7 @@ public void testGetClientID() throws Exception
       String clientID = connection.getClientID();
 
       // We don't currently set client ids on the server, so this should be null.
-      // In the future we may provide conection factories that set a specific client id
+      // In the future we may provide connection factories that set a specific client id
       // so this may change
       ProxyAssertSupport.assertNull(clientID);
 
diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/MessageConsumerTest.java b/tests/jms-tests/src/test/java/org/hornetq/jms/tests/MessageConsumerTest.java
index 5c9af9e2587..5ed67afa0af 100644
--- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/MessageConsumerTest.java
+++ b/tests/jms-tests/src/test/java/org/hornetq/jms/tests/MessageConsumerTest.java
@@ -4407,7 +4407,7 @@ else if (count == 4)
                }
                else
                {
-                  // Shouldn't get a 4th messge
+                  // Shouldn't get a 4th message
                   failed("Shouldn't get a 4th message");
                   latch.countDown();
                }
diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/XARecoveryTest.java b/tests/jms-tests/src/test/java/org/hornetq/jms/tests/XARecoveryTest.java
index 2d68cbee926..1b88afeef66 100644
--- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/XARecoveryTest.java
+++ b/tests/jms-tests/src/test/java/org/hornetq/jms/tests/XARecoveryTest.java
@@ -2511,13 +2511,13 @@ public void testTransactionalDeliveryRecovery() throws Exception
          TextMessage m1 = (TextMessage)cons.receive(1000);
          ProxyAssertSupport.assertNull(m1);
 
-         log.trace("comitting");
+         log.trace("committing");
 
          // Commit tx1
 
          res.commit(xid1, false);
 
-         log.trace("comitted");
+         log.trace("committed");
 
          // Should now be able to receive tm1 and tm2
 
diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/XATest.java b/tests/jms-tests/src/test/java/org/hornetq/jms/tests/XATest.java
index 2a9196b9f9e..4b953179264 100644
--- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/XATest.java
+++ b/tests/jms-tests/src/test/java/org/hornetq/jms/tests/XATest.java
@@ -1547,7 +1547,7 @@ public void testMultipleSessionsOneTxRollbackAcknowledgeForceFailureInCommit() t
          tx.delistResource(res1, XAResource.TMSUCCESS);
          tx.delistResource(res2, XAResource.TMSUCCESS);
 
-         // rollback will cause an attemp to deliver messages locally to the original consumers.
+         // rollback will cause an attempt to deliver messages locally to the original consumers.
          // the original consumer has closed, so it will cancelled to the server
          // the server cancel is asynch, so we need to sleep for a bit to make sure it completes
          log.trace("Forcing failure");
diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/TopicStressTest.java b/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/TopicStressTest.java
index 232a90a5a58..d881e820a02 100644
--- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/TopicStressTest.java
+++ b/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/TopicStressTest.java
@@ -36,8 +36,8 @@ public class TopicStressTest extends JMSStressTestBase
    /*
     * Stress a topic with with many non transactional, transactional and 2pc receivers.
     * Non transactional receivers use ack modes of auto, dups and client ack.
-    * Client ack receivers go through a cycle of receving a batch, acking and recovering
-    * Transactional receivers go through a cycle of receiving commiting and rolling back.
+    * Client ack receivers go through a cycle of receiving a batch, acking and recovering
+    * Transactional receivers go through a cycle of receiving committing and rolling back.
     * Half the consumers are durable and half non durable.
     *
     */
diff --git a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/message/MessageBodyTest.java b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/message/MessageBodyTest.java
index 075946255fd..883e8fe74e8 100644
--- a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/message/MessageBodyTest.java
+++ b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/message/MessageBodyTest.java
@@ -32,7 +32,7 @@ public class MessageBodyTest extends PTPTestCase
 {
 
    /**
-    * Test that the TextMessage.clearBody() method does nto clear the
+    * Test that the TextMessage.clearBody() method does not clear the
     * message properties.
     */
    @Test
diff --git a/tests/pom.xml b/tests/pom.xml
index 58c5c5c2708..85530a7fa08 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -28,7 +28,7 @@
                ${skipUnitTests}
                ${hornetq-surefire-argline}
                
-                  
+                  
                   **/ManifestTest.java
                
             
diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/ra/HornetQResourceAdapterConfigTest.java b/tests/unit-tests/src/test/java/org/hornetq/tests/unit/ra/HornetQResourceAdapterConfigTest.java
index 5f046c4d5c3..9c0e6539041 100644
--- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/ra/HornetQResourceAdapterConfigTest.java
+++ b/tests/unit-tests/src/test/java/org/hornetq/tests/unit/ra/HornetQResourceAdapterConfigTest.java
@@ -42,7 +42,7 @@
 
 /**
  * This test is used to generate the commented out configs in the src/config/ra.xml. If you add a setter to the HornetQResourceAdapter
- * this test should fail, if it does paste the new commented out configs into the ra.xml file and in here. dont forget to
+ * this test should fail, if it does paste the new commented out configs into the ra.xml file and in here. don't forget to
  * add a description for each new property added and try and put it in the config some where appropriate.
  *
  * @author Andy Taylor