You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ac...@apache.org on 2007/06/18 06:32:18 UTC
svn commit: r548207 -
/activemq/branches/activemq-4.1/assembly/src/release/example/src/
Author: aco
Date: Sun Jun 17 21:32:17 2007
New Revision: 548207
URL: http://svn.apache.org/viewvc?view=rev&rev=548207
Log:
Fix for https://issues.apache.org/activemq/browse/AMQ-1167. Thanks for the heads up Woonsan.
Added some spelling corrections.
Added:
activemq/branches/activemq-4.1/assembly/src/release/example/src/CommandLineSupport.java
activemq/branches/activemq-4.1/assembly/src/release/example/src/Utilities.java
Removed:
activemq/branches/activemq-4.1/assembly/src/release/example/src/CommnadLineSupport.java
Modified:
activemq/branches/activemq-4.1/assembly/src/release/example/src/ConsumerTool.java
activemq/branches/activemq-4.1/assembly/src/release/example/src/ProducerAndConsumerTool.java
activemq/branches/activemq-4.1/assembly/src/release/example/src/ProducerTool.java
activemq/branches/activemq-4.1/assembly/src/release/example/src/RequesterTool.java
activemq/branches/activemq-4.1/assembly/src/release/example/src/TopicListener.java
activemq/branches/activemq-4.1/assembly/src/release/example/src/TopicPublisher.java
Added: activemq/branches/activemq-4.1/assembly/src/release/example/src/CommandLineSupport.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/assembly/src/release/example/src/CommandLineSupport.java?view=auto&rev=548207
==============================================================================
--- activemq/branches/activemq-4.1/assembly/src/release/example/src/CommandLineSupport.java (added)
+++ activemq/branches/activemq-4.1/assembly/src/release/example/src/CommandLineSupport.java Sun Jun 17 21:32:17 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/branches/activemq-4.1/assembly/src/release/example/src/ConsumerTool.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/assembly/src/release/example/src/ConsumerTool.java?view=diff&rev=548207&r1=548206&r2=548207
==============================================================================
--- activemq/branches/activemq-4.1/assembly/src/release/example/src/ConsumerTool.java (original)
+++ activemq/branches/activemq-4.1/assembly/src/release/example/src/ConsumerTool.java Sun Jun 17 21:32:17 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: " + Utilities.arrayToString(unknown));
System.exit(-1);
}
consumerTool.run();
Modified: activemq/branches/activemq-4.1/assembly/src/release/example/src/ProducerAndConsumerTool.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/assembly/src/release/example/src/ProducerAndConsumerTool.java?view=diff&rev=548207&r1=548206&r2=548207
==============================================================================
--- activemq/branches/activemq-4.1/assembly/src/release/example/src/ProducerAndConsumerTool.java (original)
+++ activemq/branches/activemq-4.1/assembly/src/release/example/src/ProducerAndConsumerTool.java Sun Jun 17 21:32:17 2007
@@ -30,23 +30,23 @@
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();
}
-}
\ No newline at end of file
+}
Modified: activemq/branches/activemq-4.1/assembly/src/release/example/src/ProducerTool.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/assembly/src/release/example/src/ProducerTool.java?view=diff&rev=548207&r1=548206&r2=548207
==============================================================================
--- activemq/branches/activemq-4.1/assembly/src/release/example/src/ProducerTool.java (original)
+++ activemq/branches/activemq-4.1/assembly/src/release/example/src/ProducerTool.java Sun Jun 17 21:32:17 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: "+ Utilities.arrayToString(unknown));
System.exit(-1);
- }
- producerTool.run();
+ }
+ producerTool.run();
}
public void run() {
Modified: activemq/branches/activemq-4.1/assembly/src/release/example/src/RequesterTool.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/assembly/src/release/example/src/RequesterTool.java?view=diff&rev=548207&r1=548206&r2=548207
==============================================================================
--- activemq/branches/activemq-4.1/assembly/src/release/example/src/RequesterTool.java (original)
+++ activemq/branches/activemq-4.1/assembly/src/release/example/src/RequesterTool.java Sun Jun 17 21:32:17 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: " + Utilities.arrayToString(unknown));
System.exit(-1);
}
requesterTool.run();
Modified: activemq/branches/activemq-4.1/assembly/src/release/example/src/TopicListener.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/assembly/src/release/example/src/TopicListener.java?view=diff&rev=548207&r1=548206&r2=548207
==============================================================================
--- activemq/branches/activemq-4.1/assembly/src/release/example/src/TopicListener.java (original)
+++ activemq/branches/activemq-4.1/assembly/src/release/example/src/TopicListener.java Sun Jun 17 21:32:17 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: " + Utilities.arrayToString(unknown));
System.exit(-1);
}
- l.run();
+ l.run();
}
public void run() throws JMSException {
Modified: activemq/branches/activemq-4.1/assembly/src/release/example/src/TopicPublisher.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/assembly/src/release/example/src/TopicPublisher.java?view=diff&rev=548207&r1=548206&r2=548207
==============================================================================
--- activemq/branches/activemq-4.1/assembly/src/release/example/src/TopicPublisher.java (original)
+++ activemq/branches/activemq-4.1/assembly/src/release/example/src/TopicPublisher.java Sun Jun 17 21:32:17 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: " + Utilities.arrayToString(unknown));
System.exit(-1);
}
p.run();
Added: activemq/branches/activemq-4.1/assembly/src/release/example/src/Utilities.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/assembly/src/release/example/src/Utilities.java?view=auto&rev=548207
==============================================================================
--- activemq/branches/activemq-4.1/assembly/src/release/example/src/Utilities.java (added)
+++ activemq/branches/activemq-4.1/assembly/src/release/example/src/Utilities.java Sun Jun 17 21:32:17 2007
@@ -0,0 +1,39 @@
+/**
+ *
+ * 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.
+ */
+
+/**
+ * Generic utility class that can be used by the examples
+ */
+public class Utilities {
+
+ /**
+ * Converts an array of objects to a string
+ * Useful only for Java 1.4 and below, because of the unavailability of the Arrays.toString() method.
+ */
+ static public String arrayToString(Object target[]) {
+ StringBuffer buf = new StringBuffer("{");
+ int i;
+ for (i=0; i<target.length-1; i++) {
+ buf.append(target[i].toString());
+ buf.append(", ");
+ }
+ buf.append(target[i].toString());
+ buf.append("}");
+ return buf.toString();
+ }
+}