activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r548220 - in /activemq/trunk/assembly/src/release/example: perfharness/ src/
Date Mon, 18 Jun 2007 05:18:39 GMT
Author: aco
Date: Sun Jun 17 22:18:38 2007
New Revision: 548220

URL: http://svn.apache.org/viewvc?view=rev&rev=548220
Log:
- Change the perfharness-activemq.sh to refer to 5.0-SNAPSHOT
- Minor spelling corrections

Added:
    activemq/trunk/assembly/src/release/example/src/CommandLineSupport.java
Removed:
    activemq/trunk/assembly/src/release/example/src/CommnadLineSupport.java
Modified:
    activemq/trunk/assembly/src/release/example/perfharness/perfharness-activemq.sh
    activemq/trunk/assembly/src/release/example/src/ConsumerTool.java
    activemq/trunk/assembly/src/release/example/src/ProducerAndConsumerTool.java
    activemq/trunk/assembly/src/release/example/src/ProducerTool.java
    activemq/trunk/assembly/src/release/example/src/RequesterTool.java
    activemq/trunk/assembly/src/release/example/src/TopicListener.java
    activemq/trunk/assembly/src/release/example/src/TopicPublisher.java

Modified: activemq/trunk/assembly/src/release/example/perfharness/perfharness-activemq.sh
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/example/perfharness/perfharness-activemq.sh?view=diff&rev=548220&r1=548219&r2=548220
==============================================================================
--- activemq/trunk/assembly/src/release/example/perfharness/perfharness-activemq.sh (original)
+++ activemq/trunk/assembly/src/release/example/perfharness/perfharness-activemq.sh Sun Jun
17 22:18:38 2007
@@ -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 @@
    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 $@

Added: activemq/trunk/assembly/src/release/example/src/CommandLineSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/example/src/CommandLineSupport.java?view=auto&rev=548220
==============================================================================
--- activemq/trunk/assembly/src/release/example/src/CommandLineSupport.java (added)
+++ activemq/trunk/assembly/src/release/example/src/CommandLineSupport.java Sun Jun 17 22:18:38
2007
@@ -0,0 +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 <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
+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;
+	}
+}

Modified: activemq/trunk/assembly/src/release/example/src/ConsumerTool.java
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/example/src/ConsumerTool.java?view=diff&rev=548220&r1=548219&r2=548220
==============================================================================
--- activemq/trunk/assembly/src/release/example/src/ConsumerTool.java (original)
+++ activemq/trunk/assembly/src/release/example/src/ConsumerTool.java Sun Jun 17 22:18:38
2007
@@ -66,9 +66,9 @@
 
 	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();

Modified: activemq/trunk/assembly/src/release/example/src/ProducerAndConsumerTool.java
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/example/src/ProducerAndConsumerTool.java?view=diff&rev=548220&r1=548219&r2=548220
==============================================================================
--- activemq/trunk/assembly/src/release/example/src/ProducerAndConsumerTool.java (original)
+++ activemq/trunk/assembly/src/release/example/src/ProducerAndConsumerTool.java Sun Jun 17
22:18:38 2007
@@ -30,21 +30,21 @@
 
     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();
 		
     }

Modified: activemq/trunk/assembly/src/release/example/src/ProducerTool.java
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/example/src/ProducerTool.java?view=diff&rev=548220&r1=548219&r2=548220
==============================================================================
--- activemq/trunk/assembly/src/release/example/src/ProducerTool.java (original)
+++ activemq/trunk/assembly/src/release/example/src/ProducerTool.java Sun Jun 17 22:18:38
2007
@@ -52,12 +52,12 @@
 
 	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() {

Modified: activemq/trunk/assembly/src/release/example/src/RequesterTool.java
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/example/src/RequesterTool.java?view=diff&rev=548220&r1=548219&r2=548220
==============================================================================
--- activemq/trunk/assembly/src/release/example/src/RequesterTool.java (original)
+++ activemq/trunk/assembly/src/release/example/src/RequesterTool.java Sun Jun 17 22:18:38
2007
@@ -61,9 +61,9 @@
 
 	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();

Modified: activemq/trunk/assembly/src/release/example/src/TopicListener.java
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/example/src/TopicListener.java?view=diff&rev=548220&r1=548219&r2=548220
==============================================================================
--- activemq/trunk/assembly/src/release/example/src/TopicListener.java (original)
+++ activemq/trunk/assembly/src/release/example/src/TopicListener.java Sun Jun 17 22:18:38
2007
@@ -47,12 +47,12 @@
 
 	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 {

Modified: activemq/trunk/assembly/src/release/example/src/TopicPublisher.java
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/example/src/TopicPublisher.java?view=diff&rev=548220&r1=548219&r2=548220
==============================================================================
--- activemq/trunk/assembly/src/release/example/src/TopicPublisher.java (original)
+++ activemq/trunk/assembly/src/release/example/src/TopicPublisher.java Sun Jun 17 22:18:38
2007
@@ -48,9 +48,9 @@
     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();



Mime
View raw message