diff --git a/assembly/src/release/example/perfharness/perfharness-activemq.sh b/assembly/src/release/example/perfharness/perfharness-activemq.sh
index d34c5e405a..3d9a001219 100755
--- a/assembly/src/release/example/perfharness/perfharness-activemq.sh
+++ b/assembly/src/release/example/perfharness/perfharness-activemq.sh
@@ -22,7 +22,7 @@
# Sample Usage:
# ./perfharness-activemq.sh -d dynamicQueues/FOO -tc jms.r11.PutGet -nt 6
#
-# It assumes that the apache-activemq-4.1-incubator-SNAPSHOT.jar and
+# It assumes that the apache-activemq-5.0-SNAPSHOT.jar and
# perfharness.jar files are in the current directory. If they are not,
# set the ACTIVEMQ_HOME and PERFHARNESS_HOME env variable to the correct location.
#
@@ -46,4 +46,4 @@ if [ -z "$BROKER_URL" ] ; then
BROKER_URL='vm://(broker://()/localhost?useJmx=false)/localhost'
fi
-java ${JAVA_OPTIONS} -cp ${ACTIVEMQ_HOME}/apache-activemq-4.1-incubator-SNAPSHOT.jar:${PERFHARNESS_HOME}/perfharness.jar JMSPerfHarness -pc JNDI -ii org.apache.activemq.jndi.ActiveMQInitialContextFactory -iu $BROKER_URL -cf ConnectionFactory -d dynamic$DESTINATION $@
+java ${JAVA_OPTIONS} -cp ${ACTIVEMQ_HOME}/apache-activemq-5.0-SNAPSHOT.jar:${PERFHARNESS_HOME}/perfharness.jar JMSPerfHarness -pc JNDI -ii org.apache.activemq.jndi.ActiveMQInitialContextFactory -iu $BROKER_URL -cf ConnectionFactory -d dynamic$DESTINATION $@
diff --git a/assembly/src/release/example/src/CommnadLineSupport.java b/assembly/src/release/example/src/CommandLineSupport.java
similarity index 95%
rename from assembly/src/release/example/src/CommnadLineSupport.java
rename to assembly/src/release/example/src/CommandLineSupport.java
index e93ab7b906..230697868a 100644
--- a/assembly/src/release/example/src/CommnadLineSupport.java
+++ b/assembly/src/release/example/src/CommandLineSupport.java
@@ -1,114 +1,114 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.util.ArrayList;
-
-import org.apache.activemq.util.IntrospectionSupport;
-
-/**
- * Helper utility that can be used to set the properties on any object
- * using command line arguments.
- *
- * @author Hiram Chirino
- */
-public class CommnadLineSupport {
-
- /**
- * Sets the properties of an object given the command line args.
- *
- * if args contains: --ack-mode=AUTO --url=tcp://localhost:61616 --persistent
- *
- * then it will try to call the following setters on the target object.
- *
- * target.setAckMode("AUTO");
- * target.setURL(new URI("tcp://localhost:61616") );
- * target.setPersistent(true);
- *
- * Notice the the proper conversion for the argument is determined by examining the
- * setter arguement type.
- *
- * @param target the object that will have it's properties set
- * @param args the commline options
- * @return any arguments that are not valid options for the target
- */
- static public String[] setOptions(Object target, String []args) {
- ArrayList rc = new ArrayList();
-
- for (int i = 0; i < args.length; i++) {
- if( args[i] == null )
- continue;
-
- if( args[i].startsWith("--") ) {
-
- // --options without a specified value are considered boolean flags that are enabled.
- String value="true";
- String name = args[i].substring(2);
-
- // if --option=value case
- int p = name.indexOf("=");
- if( p > 0 ) {
- value = name.substring(p+1);
- name = name.substring(0,p);
- }
-
- // name not set, then it's an unrecognized option
- if( name.length()==0 ) {
- rc.add(args[i]);
- continue;
- }
-
- String propName = convertOptionToPropertyName(name);
- if( !IntrospectionSupport.setProperty(target, propName, value) ) {
- rc.add(args[i]);
- continue;
- }
- }
-
- }
-
- String r[] = new String[rc.size()];
- rc.toArray(r);
- return r;
- }
-
- /**
- * converts strings like: test-enabled to testEnabled
- * @param name
- * @return
- */
- private static String convertOptionToPropertyName(String name) {
- String rc="";
-
- // Look for '-' and strip and then convert the subsequent char to uppercase
- int p = name.indexOf("-");
- while( p > 0 ) {
- // strip
- rc += name.substring(0, p);
- name = name.substring(p+1);
-
- // can I convert the next char to upper?
- if( name.length() >0 ) {
- rc += name.substring(0,1).toUpperCase();
- name = name.substring(1);
- }
-
- p = name.indexOf("-");
- }
- return rc+name;
- }
-}
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.util.ArrayList;
+
+import org.apache.activemq.util.IntrospectionSupport;
+
+/**
+ * Helper utility that can be used to set the properties on any object
+ * using command line arguments.
+ *
+ * @author Hiram Chirino
+ */
+public class CommandLineSupport {
+
+ /**
+ * Sets the properties of an object given the command line args.
+ *
+ * if args contains: --ack-mode=AUTO --url=tcp://localhost:61616 --persistent
+ *
+ * then it will try to call the following setters on the target object.
+ *
+ * target.setAckMode("AUTO");
+ * target.setURL(new URI("tcp://localhost:61616") );
+ * target.setPersistent(true);
+ *
+ * Notice the the proper conversion for the argument is determined by examining the
+ * setter arguement type.
+ *
+ * @param target the object that will have it's properties set
+ * @param args the commline options
+ * @return any arguments that are not valid options for the target
+ */
+ static public String[] setOptions(Object target, String []args) {
+ ArrayList rc = new ArrayList();
+
+ for (int i = 0; i < args.length; i++) {
+ if( args[i] == null )
+ continue;
+
+ if( args[i].startsWith("--") ) {
+
+ // --options without a specified value are considered boolean flags that are enabled.
+ String value="true";
+ String name = args[i].substring(2);
+
+ // if --option=value case
+ int p = name.indexOf("=");
+ if( p > 0 ) {
+ value = name.substring(p+1);
+ name = name.substring(0,p);
+ }
+
+ // name not set, then it's an unrecognized option
+ if( name.length()==0 ) {
+ rc.add(args[i]);
+ continue;
+ }
+
+ String propName = convertOptionToPropertyName(name);
+ if( !IntrospectionSupport.setProperty(target, propName, value) ) {
+ rc.add(args[i]);
+ continue;
+ }
+ }
+
+ }
+
+ String r[] = new String[rc.size()];
+ rc.toArray(r);
+ return r;
+ }
+
+ /**
+ * converts strings like: test-enabled to testEnabled
+ * @param name
+ * @return
+ */
+ private static String convertOptionToPropertyName(String name) {
+ String rc="";
+
+ // Look for '-' and strip and then convert the subsequent char to uppercase
+ int p = name.indexOf("-");
+ while( p > 0 ) {
+ // strip
+ rc += name.substring(0, p);
+ name = name.substring(p+1);
+
+ // can I convert the next char to upper?
+ if( name.length() >0 ) {
+ rc += name.substring(0,1).toUpperCase();
+ name = name.substring(1);
+ }
+
+ p = name.indexOf("-");
+ }
+ return rc+name;
+ }
+}
diff --git a/assembly/src/release/example/src/ConsumerTool.java b/assembly/src/release/example/src/ConsumerTool.java
index 919a5ce19e..17f4441d81 100755
--- a/assembly/src/release/example/src/ConsumerTool.java
+++ b/assembly/src/release/example/src/ConsumerTool.java
@@ -66,9 +66,9 @@ public class ConsumerTool implements MessageListener, ExceptionListener {
public static void main(String[] args) {
ConsumerTool consumerTool = new ConsumerTool();
- String[] unknonwn = CommnadLineSupport.setOptions(consumerTool, args);
- if (unknonwn.length > 0) {
- System.out.println("Unknown options: " + Arrays.toString(unknonwn));
+ String[] unknown = CommandLineSupport.setOptions(consumerTool, args);
+ if (unknown.length > 0) {
+ System.out.println("Unknown options: " + Arrays.toString(unknown));
System.exit(-1);
}
consumerTool.run();
diff --git a/assembly/src/release/example/src/ProducerAndConsumerTool.java b/assembly/src/release/example/src/ProducerAndConsumerTool.java
index 6f1b540757..daba45dd6d 100644
--- a/assembly/src/release/example/src/ProducerAndConsumerTool.java
+++ b/assembly/src/release/example/src/ProducerAndConsumerTool.java
@@ -30,21 +30,21 @@ public class ProducerAndConsumerTool extends ConsumerTool implements MessageList
public static void main(String[] args) {
- ConsumerTool consumerTool = new ConsumerTool();
- String[] unknonwn = CommnadLineSupport.setOptions(consumerTool, args);
- HashSet set1 = new HashSet(Arrays.asList(unknonwn));
+ ConsumerTool consumerTool = new ConsumerTool();
+ String[] unknown = CommandLineSupport.setOptions(consumerTool, args);
+ HashSet set1 = new HashSet(Arrays.asList(unknown));
- ProducerTool producerTool = new ProducerTool();
- unknonwn = CommnadLineSupport.setOptions(producerTool, args);
- HashSet set2 = new HashSet(Arrays.asList(unknonwn));
+ ProducerTool producerTool = new ProducerTool();
+ unknown = CommandLineSupport.setOptions(producerTool, args);
+ HashSet set2 = new HashSet(Arrays.asList(unknown));
- set1.retainAll(set2);
- if( set1.size() > 0 ) {
- System.out.println("Unknown options: "+set1);
- System.exit(-1);
+ set1.retainAll(set2);
+ if( set1.size() > 0 ) {
+ System.out.println("Unknown options: "+set1);
+ System.exit(-1);
}
- consumerTool.run();
+ consumerTool.run();
producerTool.run();
}
diff --git a/assembly/src/release/example/src/ProducerTool.java b/assembly/src/release/example/src/ProducerTool.java
index 23f38e6e14..a7f713a16b 100755
--- a/assembly/src/release/example/src/ProducerTool.java
+++ b/assembly/src/release/example/src/ProducerTool.java
@@ -52,12 +52,12 @@ public class ProducerTool {
public static void main(String[] args) {
ProducerTool producerTool = new ProducerTool();
- String[] unknonwn = CommnadLineSupport.setOptions(producerTool, args);
- if( unknonwn.length > 0 ) {
- System.out.println("Unknown options: "+Arrays.toString(unknonwn));
+ String[] unknown = CommandLineSupport.setOptions(producerTool, args);
+ if( unknown.length > 0 ) {
+ System.out.println("Unknown options: " + Arrays.toString(unknown));
System.exit(-1);
- }
- producerTool.run();
+ }
+ producerTool.run();
}
public void run() {
diff --git a/assembly/src/release/example/src/RequesterTool.java b/assembly/src/release/example/src/RequesterTool.java
index 5724959e8a..25de768137 100644
--- a/assembly/src/release/example/src/RequesterTool.java
+++ b/assembly/src/release/example/src/RequesterTool.java
@@ -61,9 +61,9 @@ public class RequesterTool {
public static void main(String[] args) {
RequesterTool requesterTool = new RequesterTool();
- String[] unknonwn = CommnadLineSupport.setOptions(requesterTool, args);
- if (unknonwn.length > 0) {
- System.out.println("Unknown options: " + Arrays.toString(unknonwn));
+ String[] unknown = CommandLineSupport.setOptions(requesterTool, args);
+ if (unknown.length > 0) {
+ System.out.println("Unknown options: " + Arrays.toString(unknown));
System.exit(-1);
}
requesterTool.run();
diff --git a/assembly/src/release/example/src/TopicListener.java b/assembly/src/release/example/src/TopicListener.java
index e3d705eac1..428199d122 100644
--- a/assembly/src/release/example/src/TopicListener.java
+++ b/assembly/src/release/example/src/TopicListener.java
@@ -47,12 +47,12 @@ public class TopicListener implements MessageListener {
public static void main(String[] argv) throws Exception {
TopicListener l = new TopicListener();
- String[] unknonwn = CommnadLineSupport.setOptions(l, argv);
- if (unknonwn.length > 0) {
- System.out.println("Unknown options: " + Arrays.toString(unknonwn));
+ String[] unknown = CommandLineSupport.setOptions(l, argv);
+ if (unknown.length > 0) {
+ System.out.println("Unknown options: " + Arrays.toString(unknown));
System.exit(-1);
}
- l.run();
+ l.run();
}
public void run() throws JMSException {
diff --git a/assembly/src/release/example/src/TopicPublisher.java b/assembly/src/release/example/src/TopicPublisher.java
index 2a5d68577a..49381ca933 100644
--- a/assembly/src/release/example/src/TopicPublisher.java
+++ b/assembly/src/release/example/src/TopicPublisher.java
@@ -48,9 +48,9 @@ public class TopicPublisher implements MessageListener
public static void main(String[] argv) throws Exception
{
TopicPublisher p = new TopicPublisher();
- String[] unknonwn = CommnadLineSupport.setOptions(p, argv);
- if (unknonwn.length > 0) {
- System.out.println("Unknown options: " + Arrays.toString(unknonwn));
+ String[] unknown = CommandLineSupport.setOptions(p, argv);
+ if (unknown.length > 0) {
+ System.out.println("Unknown options: " + Arrays.toString(unknown));
System.exit(-1);
}
p.run();