diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java index c52cee6ae2..57d4d4dc90 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java @@ -183,7 +183,7 @@ public class DefaultSensitiveStringCodec implements SensitiveDataCodec { } private class PBKDF2Algorithm extends CodecAlgorithm { - private static final String SEPERATOR = ":"; + private static final String SEPARATOR = ":"; private String sceretKeyAlgorithm = "PBKDF2WithHmacSHA1"; private String randomScheme = "SHA1PRNG"; private int keyLength = 64 * 8; @@ -212,7 +212,7 @@ public class DefaultSensitiveStringCodec implements SensitiveDataCodec { byte[] salt = getSalt(); StringBuilder builder = new StringBuilder(); - builder.append(iterations).append(SEPERATOR).append(ByteUtil.bytesToHex(salt)).append(SEPERATOR); + builder.append(iterations).append(SEPARATOR).append(ByteUtil.bytesToHex(salt)).append(SEPARATOR); PBEKeySpec spec = new PBEKeySpec(chars, salt, iterations, keyLength); @@ -225,7 +225,7 @@ public class DefaultSensitiveStringCodec implements SensitiveDataCodec { @Override public boolean verify(char[] plainChars, String storedValue) { - String[] parts = storedValue.split(SEPERATOR); + String[] parts = storedValue.split(SEPARATOR); int originalIterations = Integer.parseInt(parts[0]); byte[] salt = ByteUtil.hexToBytes(parts[1]); byte[] originalHash = ByteUtil.hexToBytes(parts[2]); diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/TypedProperties.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/TypedProperties.java index 9657f366cd..5b653abda7 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/TypedProperties.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/TypedProperties.java @@ -64,7 +64,7 @@ public class TypedProperties { } /** - * Return the number of properites + * Return the number of properties * */ public int size() { return properties.size(); diff --git a/artemis-distribution/src/test/scripts/validate-instalation.sh b/artemis-distribution/src/test/scripts/validate-instalation.sh index 5837739112..54f002b679 100755 --- a/artemis-distribution/src/test/scripts/validate-instalation.sh +++ b/artemis-distribution/src/test/scripts/validate-instalation.sh @@ -18,7 +18,7 @@ # This script will validate the distribution works with folders with spaces on Linux machines -echo validating instalation on $1 +echo validating installation on $1 rm -rf target mkdir target mkdir target/"$1" diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java index 7d30c4bf06..e6a8b998e0 100644 --- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java +++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java @@ -191,7 +191,7 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal { for (JDBCJournalRecord record : recordRef) { if (logger.isTraceEnabled()) { - logger.trace("sync::preparing JDBC statment for " + record); + logger.trace("sync::preparing JDBC statement for " + record); } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/ColocatedHAManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/ColocatedHAManager.java index c08fcf6ee3..627d59ab04 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/ColocatedHAManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/ColocatedHAManager.java @@ -274,7 +274,7 @@ public class ColocatedHAManager implements HAManager { * Offset the port for Netty connector/acceptor (unless HTTP upgrade is enabled) and the server ID for invm connector/acceptor. * * The port is not offset for Netty connector/acceptor when HTTP upgrade is enabled. In this case, the app server that - * embed ActiveMQ is "owning" the port and is charge to delegate the HTTP ugprade to the correct broker (that can be + * embed ActiveMQ is "owning" the port and is charge to delegate the HTTP upgrade to the correct broker (that can be * the main one or any colocated backup hosted on the main broker). Delegation to the correct broker is done by looking at the * {@link TransportConstants#ACTIVEMQ_SERVER_NAME} property [ARTEMIS-803] */ diff --git a/docs/user-manual/en/address-model.md b/docs/user-manual/en/address-model.md index 8d994d2fdf..0714410aec 100644 --- a/docs/user-manual/en/address-model.md +++ b/docs/user-manual/en/address-model.md @@ -367,7 +367,7 @@ However, there are scenarios where a user may want to use broker side configurat #### Configuring a shared durable subscription queue with up to 10 concurrent consumers -The default behavior for queues is to not limit the number connected queue consumers. The **max-consumers** paramter of the queue element can be used to limit the number of connected consumers allowed at any one time. +The default behavior for queues is to not limit the number connected queue consumers. The **max-consumers** parameter of the queue element can be used to limit the number of connected consumers allowed at any one time. Open the file /etc/broker.xml for editing. diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java index 14f3393586..f873ffd5ef 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java @@ -1766,7 +1766,7 @@ public class NIOJournalCompactTest extends JournalImplTestBase { logger.info("Going to commit " + tx); storage.commit(tx); - logger.info("Commited " + tx); + logger.info("Committed " + tx); ctx.executeOnCompletion(new IOCallback() { @Override diff --git a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/sends/MeasureCommitPerfTest.java b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/sends/MeasureCommitPerfTest.java index cbbc6f2566..8b02c56e49 100644 --- a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/sends/MeasureCommitPerfTest.java +++ b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/sends/MeasureCommitPerfTest.java @@ -35,33 +35,33 @@ public class MeasureCommitPerfTest extends AbstractSendReceivePerfTest { long startMeasure = System.currentTimeMillis() + 5000; long start = 0; - long committs = 0; + long commits = 0; while (timeout > System.currentTimeMillis()) { if (start == 0 && System.currentTimeMillis() > startMeasure) { System.out.println("heat up"); start = System.currentTimeMillis(); - committs = 0; + commits = 0; } s.commit(); - committs++; - if (start > 0 && committs % 1000 == 0) - printCommitsSecond(start, committs); + commits++; + if (start > 0 && commits % 1000 == 0) + printCommitsSecond(start, commits); } - printCommitsSecond(start, committs); + printCommitsSecond(start, commits); s.close(); } - protected void printCommitsSecond(final long start, final double committs) { + protected void printCommitsSecond(final long start, final double commits) { long end = System.currentTimeMillis(); double elapsed = ((double) end - (double) start) / 1000f; - double commitsPerSecond = committs / elapsed; + double commitsPerSecond = commits / elapsed; - System.out.println("end = " + end + ", start=" + start + ", numberOfMessages=" + committs + ", elapsed=" + elapsed + " msgs/sec= " + commitsPerSecond); + System.out.println("end = " + end + ", start=" + start + ", numberOfMessages=" + commits + ", elapsed=" + elapsed + " msgs/sec= " + commitsPerSecond); }