mirror of https://github.com/apache/activemq.git
- Change the perfharness-activemq.sh to refer to 5.0-SNAPSHOT
- Minor spelling corrections git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@548220 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
4e0ee66db1
commit
0ef421d14a
|
@ -22,7 +22,7 @@
|
||||||
# Sample Usage:
|
# Sample Usage:
|
||||||
# ./perfharness-activemq.sh -d dynamicQueues/FOO -tc jms.r11.PutGet -nt 6
|
# ./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,
|
# 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.
|
# 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'
|
BROKER_URL='vm://(broker://()/localhost?useJmx=false)/localhost'
|
||||||
fi
|
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 $@
|
||||||
|
|
|
@ -1,114 +1,114 @@
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||||
* contributor license agreements. See the NOTICE file distributed with
|
* contributor license agreements. See the NOTICE file distributed with
|
||||||
* this work for additional information regarding copyright ownership.
|
* this work for additional information regarding copyright ownership.
|
||||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
* 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 not use this file except in compliance with
|
||||||
* the License. You may obtain a copy of the License at
|
* the License. You may obtain a copy of the License at
|
||||||
*
|
*
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
*
|
*
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
import org.apache.activemq.util.IntrospectionSupport;
|
import org.apache.activemq.util.IntrospectionSupport;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Helper utility that can be used to set the properties on any object
|
* Helper utility that can be used to set the properties on any object
|
||||||
* using command line arguments.
|
* using command line arguments.
|
||||||
*
|
*
|
||||||
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
|
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
|
||||||
*/
|
*/
|
||||||
public class CommnadLineSupport {
|
public class CommandLineSupport {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the properties of an object given the command line args.
|
* Sets the properties of an object given the command line args.
|
||||||
*
|
*
|
||||||
* if args contains: --ack-mode=AUTO --url=tcp://localhost:61616 --persistent
|
* if args contains: --ack-mode=AUTO --url=tcp://localhost:61616 --persistent
|
||||||
*
|
*
|
||||||
* then it will try to call the following setters on the target object.
|
* then it will try to call the following setters on the target object.
|
||||||
*
|
*
|
||||||
* target.setAckMode("AUTO");
|
* target.setAckMode("AUTO");
|
||||||
* target.setURL(new URI("tcp://localhost:61616") );
|
* target.setURL(new URI("tcp://localhost:61616") );
|
||||||
* target.setPersistent(true);
|
* target.setPersistent(true);
|
||||||
*
|
*
|
||||||
* Notice the the proper conversion for the argument is determined by examining the
|
* Notice the the proper conversion for the argument is determined by examining the
|
||||||
* setter arguement type.
|
* setter arguement type.
|
||||||
*
|
*
|
||||||
* @param target the object that will have it's properties set
|
* @param target the object that will have it's properties set
|
||||||
* @param args the commline options
|
* @param args the commline options
|
||||||
* @return any arguments that are not valid options for the target
|
* @return any arguments that are not valid options for the target
|
||||||
*/
|
*/
|
||||||
static public String[] setOptions(Object target, String []args) {
|
static public String[] setOptions(Object target, String []args) {
|
||||||
ArrayList rc = new ArrayList();
|
ArrayList rc = new ArrayList();
|
||||||
|
|
||||||
for (int i = 0; i < args.length; i++) {
|
for (int i = 0; i < args.length; i++) {
|
||||||
if( args[i] == null )
|
if( args[i] == null )
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if( args[i].startsWith("--") ) {
|
if( args[i].startsWith("--") ) {
|
||||||
|
|
||||||
// --options without a specified value are considered boolean flags that are enabled.
|
// --options without a specified value are considered boolean flags that are enabled.
|
||||||
String value="true";
|
String value="true";
|
||||||
String name = args[i].substring(2);
|
String name = args[i].substring(2);
|
||||||
|
|
||||||
// if --option=value case
|
// if --option=value case
|
||||||
int p = name.indexOf("=");
|
int p = name.indexOf("=");
|
||||||
if( p > 0 ) {
|
if( p > 0 ) {
|
||||||
value = name.substring(p+1);
|
value = name.substring(p+1);
|
||||||
name = name.substring(0,p);
|
name = name.substring(0,p);
|
||||||
}
|
}
|
||||||
|
|
||||||
// name not set, then it's an unrecognized option
|
// name not set, then it's an unrecognized option
|
||||||
if( name.length()==0 ) {
|
if( name.length()==0 ) {
|
||||||
rc.add(args[i]);
|
rc.add(args[i]);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
String propName = convertOptionToPropertyName(name);
|
String propName = convertOptionToPropertyName(name);
|
||||||
if( !IntrospectionSupport.setProperty(target, propName, value) ) {
|
if( !IntrospectionSupport.setProperty(target, propName, value) ) {
|
||||||
rc.add(args[i]);
|
rc.add(args[i]);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
String r[] = new String[rc.size()];
|
String r[] = new String[rc.size()];
|
||||||
rc.toArray(r);
|
rc.toArray(r);
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* converts strings like: test-enabled to testEnabled
|
* converts strings like: test-enabled to testEnabled
|
||||||
* @param name
|
* @param name
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private static String convertOptionToPropertyName(String name) {
|
private static String convertOptionToPropertyName(String name) {
|
||||||
String rc="";
|
String rc="";
|
||||||
|
|
||||||
// Look for '-' and strip and then convert the subsequent char to uppercase
|
// Look for '-' and strip and then convert the subsequent char to uppercase
|
||||||
int p = name.indexOf("-");
|
int p = name.indexOf("-");
|
||||||
while( p > 0 ) {
|
while( p > 0 ) {
|
||||||
// strip
|
// strip
|
||||||
rc += name.substring(0, p);
|
rc += name.substring(0, p);
|
||||||
name = name.substring(p+1);
|
name = name.substring(p+1);
|
||||||
|
|
||||||
// can I convert the next char to upper?
|
// can I convert the next char to upper?
|
||||||
if( name.length() >0 ) {
|
if( name.length() >0 ) {
|
||||||
rc += name.substring(0,1).toUpperCase();
|
rc += name.substring(0,1).toUpperCase();
|
||||||
name = name.substring(1);
|
name = name.substring(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
p = name.indexOf("-");
|
p = name.indexOf("-");
|
||||||
}
|
}
|
||||||
return rc+name;
|
return rc+name;
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -66,9 +66,9 @@ public class ConsumerTool implements MessageListener, ExceptionListener {
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
ConsumerTool consumerTool = new ConsumerTool();
|
ConsumerTool consumerTool = new ConsumerTool();
|
||||||
String[] unknonwn = CommnadLineSupport.setOptions(consumerTool, args);
|
String[] unknown = CommandLineSupport.setOptions(consumerTool, args);
|
||||||
if (unknonwn.length > 0) {
|
if (unknown.length > 0) {
|
||||||
System.out.println("Unknown options: " + Arrays.toString(unknonwn));
|
System.out.println("Unknown options: " + Arrays.toString(unknown));
|
||||||
System.exit(-1);
|
System.exit(-1);
|
||||||
}
|
}
|
||||||
consumerTool.run();
|
consumerTool.run();
|
||||||
|
|
|
@ -30,21 +30,21 @@ public class ProducerAndConsumerTool extends ConsumerTool implements MessageList
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
|
|
||||||
ConsumerTool consumerTool = new ConsumerTool();
|
ConsumerTool consumerTool = new ConsumerTool();
|
||||||
String[] unknonwn = CommnadLineSupport.setOptions(consumerTool, args);
|
String[] unknown = CommandLineSupport.setOptions(consumerTool, args);
|
||||||
HashSet set1 = new HashSet(Arrays.asList(unknonwn));
|
HashSet set1 = new HashSet(Arrays.asList(unknown));
|
||||||
|
|
||||||
ProducerTool producerTool = new ProducerTool();
|
ProducerTool producerTool = new ProducerTool();
|
||||||
unknonwn = CommnadLineSupport.setOptions(producerTool, args);
|
unknown = CommandLineSupport.setOptions(producerTool, args);
|
||||||
HashSet set2 = new HashSet(Arrays.asList(unknonwn));
|
HashSet set2 = new HashSet(Arrays.asList(unknown));
|
||||||
|
|
||||||
set1.retainAll(set2);
|
set1.retainAll(set2);
|
||||||
if( set1.size() > 0 ) {
|
if( set1.size() > 0 ) {
|
||||||
System.out.println("Unknown options: "+set1);
|
System.out.println("Unknown options: "+set1);
|
||||||
System.exit(-1);
|
System.exit(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
consumerTool.run();
|
consumerTool.run();
|
||||||
producerTool.run();
|
producerTool.run();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -52,12 +52,12 @@ public class ProducerTool {
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
ProducerTool producerTool = new ProducerTool();
|
ProducerTool producerTool = new ProducerTool();
|
||||||
String[] unknonwn = CommnadLineSupport.setOptions(producerTool, args);
|
String[] unknown = CommandLineSupport.setOptions(producerTool, args);
|
||||||
if( unknonwn.length > 0 ) {
|
if( unknown.length > 0 ) {
|
||||||
System.out.println("Unknown options: "+Arrays.toString(unknonwn));
|
System.out.println("Unknown options: " + Arrays.toString(unknown));
|
||||||
System.exit(-1);
|
System.exit(-1);
|
||||||
}
|
}
|
||||||
producerTool.run();
|
producerTool.run();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void run() {
|
public void run() {
|
||||||
|
|
|
@ -61,9 +61,9 @@ public class RequesterTool {
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
RequesterTool requesterTool = new RequesterTool();
|
RequesterTool requesterTool = new RequesterTool();
|
||||||
String[] unknonwn = CommnadLineSupport.setOptions(requesterTool, args);
|
String[] unknown = CommandLineSupport.setOptions(requesterTool, args);
|
||||||
if (unknonwn.length > 0) {
|
if (unknown.length > 0) {
|
||||||
System.out.println("Unknown options: " + Arrays.toString(unknonwn));
|
System.out.println("Unknown options: " + Arrays.toString(unknown));
|
||||||
System.exit(-1);
|
System.exit(-1);
|
||||||
}
|
}
|
||||||
requesterTool.run();
|
requesterTool.run();
|
||||||
|
|
|
@ -47,12 +47,12 @@ public class TopicListener implements MessageListener {
|
||||||
|
|
||||||
public static void main(String[] argv) throws Exception {
|
public static void main(String[] argv) throws Exception {
|
||||||
TopicListener l = new TopicListener();
|
TopicListener l = new TopicListener();
|
||||||
String[] unknonwn = CommnadLineSupport.setOptions(l, argv);
|
String[] unknown = CommandLineSupport.setOptions(l, argv);
|
||||||
if (unknonwn.length > 0) {
|
if (unknown.length > 0) {
|
||||||
System.out.println("Unknown options: " + Arrays.toString(unknonwn));
|
System.out.println("Unknown options: " + Arrays.toString(unknown));
|
||||||
System.exit(-1);
|
System.exit(-1);
|
||||||
}
|
}
|
||||||
l.run();
|
l.run();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void run() throws JMSException {
|
public void run() throws JMSException {
|
||||||
|
|
|
@ -48,9 +48,9 @@ public class TopicPublisher implements MessageListener
|
||||||
public static void main(String[] argv) throws Exception
|
public static void main(String[] argv) throws Exception
|
||||||
{
|
{
|
||||||
TopicPublisher p = new TopicPublisher();
|
TopicPublisher p = new TopicPublisher();
|
||||||
String[] unknonwn = CommnadLineSupport.setOptions(p, argv);
|
String[] unknown = CommandLineSupport.setOptions(p, argv);
|
||||||
if (unknonwn.length > 0) {
|
if (unknown.length > 0) {
|
||||||
System.out.println("Unknown options: " + Arrays.toString(unknonwn));
|
System.out.println("Unknown options: " + Arrays.toString(unknown));
|
||||||
System.exit(-1);
|
System.exit(-1);
|
||||||
}
|
}
|
||||||
p.run();
|
p.run();
|
||||||
|
|
Loading…
Reference in New Issue