Return-Path: 
 <commits-return-16247-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
X-Original-To: apmail-activemq-commits-archive@www.apache.org
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id CB1546906
	for <apmail-activemq-commits-archive@www.apache.org>;
 Mon, 30 May 2011 15:45:21 +0000 (UTC)
Received: (qmail 33767 invoked by uid 500); 30 May 2011 15:45:21 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 33728 invoked by uid 500); 30 May 2011 15:45:20 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 33721 invoked by uid 99); 30 May 2011 15:45:20 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 May 2011 15:45:20 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 May 2011 15:45:19 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id B571823888EA; Mon, 30 May 2011 15:44:58 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1129225 - in
 /activemq/trunk/assembly/src/release/example:
 build.xml src/ConsumerTool.java src/ProducerTool.java
Date: Mon, 30 May 2011 15:44:58 -0000
To: commits@activemq.apache.org
From: dejanb@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110530154458.B571823888EA@eris.apache.org>

Author: dejanb
Date: Mon May 30 15:44:58 2011
New Revision: 1129225

URL: http://svn.apache.org/viewvc?rev=1129225&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3340 - user/pass for examples

Modified:
    activemq/trunk/assembly/src/release/example/build.xml
    activemq/trunk/assembly/src/release/example/src/ConsumerTool.java
    activemq/trunk/assembly/src/release/example/src/ProducerTool.java

Modified: activemq/trunk/assembly/src/release/example/build.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/example/build.xml?rev=1129225&r1=1129224&r2=1129225&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/example/build.xml (original)
+++ activemq/trunk/assembly/src/release/example/build.xml Mon May 30 15:44:58 2011
@@ -39,6 +39,8 @@
 	<property name="receive-time-out" value="0"/>
 	<property name="subscribers" value="1"/>
 	<property name="batch" value="10"/>
+	<property name="user" value=""/>
+	<property name="password" value=""/>
 	
 	<!-- for WAR -->
 	<property name="app.name" value="activemq-web" />
@@ -95,6 +97,8 @@
                                     message consumption
                   parallelThreads - The number of parallel threads
                             batch - Batch size for transactions and client acknowledgment (default 10)
+                             user - Connection username (if connecting to secured broker)
+                         password - Connection password (if connecting to secured broker)
 				
             --------------------------------------------------------				
             ant producer &lt;options&gt; - Creates a producer publishing a number of messages
@@ -116,7 +120,8 @@
                        verbose - Used to print out more info; the default is true
                    messageSize - The size of the message in 1-byte characters
                parallelThreads - The number of parallel threads
-
+                          user - Connection username (if connecting to secured broker)
+                      password - Connection password (if connecting to secured broker)
 		   
            --------------------------------------------------------
 		
@@ -221,6 +226,8 @@
 			<arg value="--ack-mode=${ack-mode}"/>		
 			<arg value="--receive-time-out=${receive-time-out}"/>
             <arg value="--batch=${batch}"/>
+            <arg value="--user=${user}"/>
+            <arg value="--password=${password}"/>
 		</java>
 	</target>
 
@@ -241,7 +248,9 @@
 			<arg value="--time-to-live=${timeToLive}" />
 			<arg value="--sleep-time=${sleepTime}" />
 			<arg value="--transacted=${transacted}" />
-			<arg value="--verbose=${verbose}"/>			
+			<arg value="--verbose=${verbose}"/>
+            <arg value="--user=${user}"/>
+            <arg value="--password=${password}"/>						
 		</java>
 	</target>
 

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?rev=1129225&r1=1129224&r2=1129225&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/example/src/ConsumerTool.java (original)
+++ activemq/trunk/assembly/src/release/example/src/ConsumerTool.java Mon May 30 15:44:58 2011
@@ -111,7 +111,7 @@ public class ConsumerTool extends Thread
     }
 
     public void showParameters() {
-        System.out.println("Connecting to URL: " + url);
+        System.out.println("Connecting to URL: " + url + " (" + user + ":" + password + ")");
         System.out.println("Consuming " + (topic ? "topic" : "queue") + ": " + subject);
         System.out.println("Using a " + (durable ? "durable" : "non-durable") + " subscription");
         System.out.println("Running " + parallelThreads + " parallel threads");

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?rev=1129225&r1=1129224&r2=1129225&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/example/src/ProducerTool.java (original)
+++ activemq/trunk/assembly/src/release/example/src/ProducerTool.java Mon May 30 15:44:58 2011
@@ -90,7 +90,7 @@ public class ProducerTool extends Thread
     }
 
     public void showParameters() {
-        System.out.println("Connecting to URL: " + url);
+        System.out.println("Connecting to URL: " + url + " (" + user + ":" + password + ")");
         System.out.println("Publishing a Message with size " + messageSize + " to " + (topic ? "topic" : "queue") + ": " + subject);
         System.out.println("Using " + (persistent ? "persistent" : "non-persistent") + " messages");
         System.out.println("Sleeping between publish " + sleepTime + " ms");