activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [1/2] activemq-artemis git commit: Spelling fixes
Date Tue, 03 Nov 2015 15:30:47 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 797ecea5a -> cce107fad


Spelling fixes


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/68c9f3fd
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/68c9f3fd
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/68c9f3fd

Branch: refs/heads/master
Commit: 68c9f3fd69b289c2f9bc1b3a067b45745113b06e
Parents: 797ecea
Author: Ville Skyttä <ville.skytta@iki.fi>
Authored: Tue Nov 3 12:08:59 2015 +0200
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Tue Nov 3 10:30:40 2015 -0500

----------------------------------------------------------------------
 .../org/apache/activemq/artemis/api/core/Message.java     |  4 ++--
 .../activemq/artemis/uri/TCPServerLocatorSchema.java      |  2 +-
 .../artemis/core/server/cluster/ClusterController.java    |  2 +-
 .../security/jaas/JaasCertificateCallbackHandler.java     |  2 +-
 .../activemq/artemis/tests/util/ActiveMQTestBase.java     |  4 ++--
 docs/user-manual/en/protocols-interoperability.md         | 10 +++++-----
 docs/user-manual/en/security.md                           |  2 +-
 .../artemis/jms/example/DelayedRedeliveryExample.java     |  2 +-
 examples/protocols/mqtt/basic-pubsub/readme.html          |  2 +-
 .../tests/integration/ra/ActiveMQClusteredTest.java       |  2 +-
 10 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/68c9f3fd/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
index b4985bd..77bb7cb 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
@@ -57,12 +57,12 @@ public interface Message {
    SimpleString HDR_ACTUAL_EXPIRY_TIME = new SimpleString("_AMQ_ACTUAL_EXPIRY");
 
    /**
-    * The original address of a message when a message is transfered through DLQ or expiry
+    * The original address of a message when a message is transferred through DLQ or expiry
     */
    SimpleString HDR_ORIGINAL_ADDRESS = new SimpleString("_AMQ_ORIG_ADDRESS");
 
    /**
-    * The original address of a message when a message is transfered through DLQ or expiry
+    * The original address of a message when a message is transferred through DLQ or expiry
     */
    SimpleString HDR_ORIGINAL_QUEUE = new SimpleString("_AMQ_ORIG_QUEUE");
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/68c9f3fd/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/TCPServerLocatorSchema.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/TCPServerLocatorSchema.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/TCPServerLocatorSchema.java
index cb7a4bd..a7c7652 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/TCPServerLocatorSchema.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/TCPServerLocatorSchema.java
@@ -82,7 +82,7 @@ public class TCPServerLocatorSchema extends AbstractServerLocatorSchema
{
       String newHost = IPV6Util.encloseHost(host);
 
       // We really want to check the objects here
-      // Some bug finders may report this as an error, hence the SupressWarnings on this
method
+      // Some bug finders may report this as an error, hence the SuppressWarnings on this
method
       if (host != newHost) {
          params.put("host", "[" + host + "]");
       }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/68c9f3fd/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterController.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterController.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterController.java
index bd097be..b84164f 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterController.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterController.java
@@ -321,7 +321,7 @@ public class ClusterController implements ActiveMQComponent {
             if (packet.getType() == PacketImpl.CLUSTER_CONNECT) {
                ClusterConnection clusterConnection = acceptorUsed.getClusterConnection();
 
-               //if this acceptor isnt associated with a cluster connection use the default
+               //if this acceptor isn't associated with a cluster connection use the default
                if (clusterConnection == null) {
                   clusterConnection = server.getClusterManager().getDefaultConnection(null);
                }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/68c9f3fd/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/JaasCertificateCallbackHandler.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/JaasCertificateCallbackHandler.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/JaasCertificateCallbackHandler.java
index b53f946..22ddf54 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/JaasCertificateCallbackHandler.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/JaasCertificateCallbackHandler.java
@@ -44,7 +44,7 @@ public class JaasCertificateCallbackHandler implements CallbackHandler {
     *
     * @param callbacks The callbacks requested.
     * @throws IOException
-    * @throws UnsupportedCallbackException Thrown if an unkown Callback type is
+    * @throws UnsupportedCallbackException Thrown if an unknown Callback type is
     *                                      encountered.
     */
    @Override

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/68c9f3fd/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
index 5556c4e..048ab08 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
@@ -1271,7 +1271,7 @@ public abstract class ActiveMQTestBase extends Assert {
 
       if (server.isStarted()) {
          log.info(threadDump("Server didn't start"));
-         fail("server didnt start: " + server);
+         fail("Server didn't start: " + server);
       }
    }
 
@@ -2552,4 +2552,4 @@ public abstract class ActiveMQTestBase extends Assert {
          super.finalize();
       }
    }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/68c9f3fd/docs/user-manual/en/protocols-interoperability.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/protocols-interoperability.md b/docs/user-manual/en/protocols-interoperability.md
index 26e3b4d..a466d28 100644
--- a/docs/user-manual/en/protocols-interoperability.md
+++ b/docs/user-manual/en/protocols-interoperability.md
@@ -23,7 +23,7 @@ is a whole section on configuring transports that can be found [here](configurin
 The default configuration shipped with the ActiveMQ Artemis distribution comes with a number
of acceptors already
 defined, one for each of the above protocols plus a generic acceptor that supports all protocols.
 To enable a
 protocol on a particular acceptor simply add a url parameter "protocol=AMQP,STOMP" to the
acceptor url.  Where the value
-of the parameter is a comma separated list of protocol names.  If the protocol parameter
is ommited from the url all
+of the parameter is a comma separated list of protocol names.  If the protocol parameter
is omitted from the url all
 protocols are enabled.
 
     <!-- The following example enables only MQTT on port 1883 -->
@@ -159,7 +159,7 @@ but if something fails and the message does not reach it's destination
(say due
 may be lost.  This QoS has the least network traffic overhead and the least burden on the
client and the broker and is often
 useful for telemetry data where it doesn't matter if some of the data is lost.
 
-* QoS 1: AT LEAST ONCE: Guarentees that a message will reach it's intended recipient one
or more times.  The sender will
+* QoS 1: AT LEAST ONCE: Guarantees that a message will reach it's intended recipient one
or more times.  The sender will
 continue to send the message until it receives an acknowledgment from the recipient, confirming
it has received the message.
 The result of this QoS is that the recipient may receive the message multiple times, and
also increases the network
 overhead than QoS 0, (due to acks).  In addition more burden is placed on the sender as it
needs to store the message
@@ -189,14 +189,14 @@ Other subscribers to the will topic will receive the will message and
can react
 
 ### Wild card subscriptions
 
-MQTT addresses are hierarchical much like a file system, and use "/" charactor to separate
heirarchical levels.
-Subscribers are able to subscribe to specific topics or to whole branches of a heirarchy.
+MQTT addresses are hierarchical much like a file system, and use "/" character to separate
hierarchical levels.
+Subscribers are able to subscribe to specific topics or to whole branches of a hierarchy.
 
 To subscribe to branches of an address hierarchy a subscriber can use wild cards.
 
 There are 2 types of wild card in MQTT:
 
- * "#" Multi level wild card.  Adding this wild card to an address would match all branches
of the address heirarchy
+ * "#" Multi level wild card.  Adding this wild card to an address would match all branches
of the address hierarchy
  under a specified node.  For example:  /uk/#  Would match /uk/cities, /uk/cities/newcastle
and also /uk/rivers/tyne.
  Subscribing to an address "#" would result in subscribing to all topics in the broker. 
This can be useful, but should
  be done so with care since it has significant performance implications.

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/68c9f3fd/docs/user-manual/en/security.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/security.md b/docs/user-manual/en/security.md
index b631b40..4e797f2 100644
--- a/docs/user-manual/en/security.md
+++ b/docs/user-manual/en/security.md
@@ -394,7 +394,7 @@ Depending on the user login data, authentication proceeds as follows:
 
 -   User logs in with a valid password — the guest login module fails to authenticate the
user (because the user has 
     presented a password while the credentialsInvalidate option is enabled) and authentication
proceeds to the properties 
-    login module. The properties login module sucessfully authenticates the user and returns.
+    login module. The properties login module successfully authenticates the user and returns.
 
 -   User logs in with an invalid password — the guest login module fails to authenticate
the user and authentication proceeds
     to the properties login module. The properties login module also fails to authenticate
the user. The nett result is 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/68c9f3fd/examples/features/standard/delayed-redelivery/src/main/java/org/apache/activemq/artemis/jms/example/DelayedRedeliveryExample.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/delayed-redelivery/src/main/java/org/apache/activemq/artemis/jms/example/DelayedRedeliveryExample.java
b/examples/features/standard/delayed-redelivery/src/main/java/org/apache/activemq/artemis/jms/example/DelayedRedeliveryExample.java
index afa538f..cc12293 100644
--- a/examples/features/standard/delayed-redelivery/src/main/java/org/apache/activemq/artemis/jms/example/DelayedRedeliveryExample.java
+++ b/examples/features/standard/delayed-redelivery/src/main/java/org/apache/activemq/artemis/jms/example/DelayedRedeliveryExample.java
@@ -85,7 +85,7 @@ public class DelayedRedeliveryExample {
          messageReceived = (TextMessage) messageConsumer.receive(3000);
 
          if (messageReceived != null) {
-            throw new IllegalStateException("Expected to recieve message.");
+            throw new IllegalStateException("Expected to receive message.");
          }
 
          System.out.println("Redelivery has been delayed so received message is " + messageReceived);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/68c9f3fd/examples/protocols/mqtt/basic-pubsub/readme.html
----------------------------------------------------------------------
diff --git a/examples/protocols/mqtt/basic-pubsub/readme.html b/examples/protocols/mqtt/basic-pubsub/readme.html
index 58c9643..d9abc9a 100644
--- a/examples/protocols/mqtt/basic-pubsub/readme.html
+++ b/examples/protocols/mqtt/basic-pubsub/readme.html
@@ -113,7 +113,7 @@ under the License.
 
          <p>Since we have subscribed to a number of topics and sent messages to them,
the client should now receive
          2 messages.  We are not using callbacks here on message receive so we specifically
call receive to get
-         the messages.  Once we recieve the message we convert the payload consisting of
bytes back to a UTF8
+         the messages.  Once we receive the message we convert the payload consisting of
bytes back to a UTF8
          encoded string and print the result.</p>
 
          <pre class="prettyprint">

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/68c9f3fd/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQClusteredTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQClusteredTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQClusteredTest.java
index 7718830..fbab7f0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQClusteredTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQClusteredTest.java
@@ -65,7 +65,7 @@ public class ActiveMQClusteredTest extends ActiveMQRAClusteredTestBase {
       DummyMessageEndpoint endpoint = new DummyMessageEndpoint(latch);
       DummyMessageEndpointFactory endpointFactory = new DummyMessageEndpointFactory(endpoint,
false);
       qResourceAdapter.endpointActivation(endpointFactory, spec);
-      //make sure thet activation didnt start, i.e. no MDB consumers
+      //make sure thet activation didn't start, i.e. no MDB consumers
       assertEquals(((Queue) server.getPostOffice().getBinding(MDBQUEUEPREFIXEDSIMPLE).getBindable()).getConsumerCount(),
0);
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
 


Mime
View raw message