From commits-return-8310-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Tue Apr 01 19:43:14 2008
Return-Path: <commits-return-8310-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: (qmail 86835 invoked from network); 1 Apr 2008 19:43:14 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 1 Apr 2008 19:43:14 -0000
Received: (qmail 20211 invoked by uid 500); 1 Apr 2008 19:43:13 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 20188 invoked by uid 500); 1 Apr 2008 19:43:13 -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 20179 invoked by uid 99); 1 Apr 2008 19:43:13 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Apr 2008 12:43:13 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Apr 2008 19:42:33 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id E9D001A9838; Tue,  1 Apr 2008 12:42:44 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r643534 - in
 /activemq/trunk/activemq-console/src/test/resources: activemq.xml
 log4j.properties
Date: Tue, 01 Apr 2008 19:42:44 -0000
To: commits@activemq.apache.org
From: chirino@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080401194244.E9D001A9838@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: chirino
Date: Tue Apr  1 12:42:41 2008
New Revision: 643534

URL: http://svn.apache.org/viewvc?rev=643534&view=rev
Log:
reverting this change.. did not intend to commit it with the last commit

Modified:
    activemq/trunk/activemq-console/src/test/resources/activemq.xml
    activemq/trunk/activemq-console/src/test/resources/log4j.properties

Modified: activemq/trunk/activemq-console/src/test/resources/activemq.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-console/src/test/resources/activemq.xml?rev=643534&r1=643533&r2=643534&view=diff
==============================================================================
--- activemq/trunk/activemq-console/src/test/resources/activemq.xml (original)
+++ activemq/trunk/activemq-console/src/test/resources/activemq.xml Tue Apr  1 12:42:41 2008
@@ -21,85 +21,35 @@
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
   
   <!-- Default configuration -->
-  <broker brokerName="broker1" useJmx="true" persistent="false" xmlns="http://activemq.org/config/1.0" useShutdownHook="false" monitorConnectionSplits="true">
+  <broker useJmx="false" xmlns="http://activemq.org/config/1.0">
 	  
-        <managementContext>
-            <managementContext createConnector="false"/>
-        </managementContext>
-
-        <networkConnectors>
-            <networkConnector uri="static:(tcp://localhost:61626?socketBufferSize=256000)" userName="foo" password="bar" dynamicOnly="false" decreaseNetworkConsumerPriority="true">
-				<excludedDestinations>
-					<topic physicalName="bbm.batch.1"/>
-					<topic physicalName="intl.service.status"/>
-				</excludedDestinations>
-			</networkConnector>
-		</networkConnectors>
-
-		<transportConnectors>
-			<transportConnector uri="tcp://localhost:61616?socketBufferSize=256000"/>
-			<transportConnector uri="tcp://localhost:61618?socketBufferSize=256000"/>
-		</transportConnectors>
-
-		<destinationPolicy>
-			<policyMap>
-				<policyEntries>
-					<policyEntry queue=">" minimumMessageSize="1" optimizedDispatch="true" lazyDispatch="false" producerFlowControl="false">
-						<deadLetterStrategy>
-							<sharedDeadLetterStrategy processExpired="false" processNonPersistent="false"/>
-						</deadLetterStrategy>
-					</policyEntry>
-					<policyEntry topic=">" minimumMessageSize="1" optimizedDispatch="true" lazyDispatch="false" producerFlowControl="false">
-						<deadLetterStrategy>
-							<sharedDeadLetterStrategy processExpired="false" processNonPersistent="false"/>
-						</deadLetterStrategy>
-					</policyEntry>
-					
-					<policyEntry topic="intl.bbm.batch.>" minimumMessageSize="1" optimizedDispatch="true" lazyDispatch="false" producerFlowControl="false">
-						<deadLetterStrategy>
-							<sharedDeadLetterStrategy processExpired="false" processNonPersistent="false"/>
-						</deadLetterStrategy>
-						<!-- 
-						<pendingMessageLimitStrategy>
-							<constantPendingMessageLimitStrategy limit="${activemq.pending.message.limit}"/>
-						</pendingMessageLimitStrategy>
-						 -->
-						<subscriptionRecoveryPolicy>
-							<fixedCountSubscriptionRecoveryPolicy maximumSize="10"/>
-						</subscriptionRecoveryPolicy>
-					</policyEntry>
-					<policyEntry topic="bbm.batch.>" minimumMessageSize="1" optimizedDispatch="true" lazyDispatch="false" producerFlowControl="false">
-						<deadLetterStrategy>
-							<sharedDeadLetterStrategy processExpired="false" processNonPersistent="false"/>
-						</deadLetterStrategy>
-						<!-- 
-						<pendingMessageLimitStrategy>
-							<constantPendingMessageLimitStrategy limit="${activemq.pending.message.limit}"/>
-						</pendingMessageLimitStrategy>
-						 -->
-						<subscriptionRecoveryPolicy>
-							<fixedCountSubscriptionRecoveryPolicy maximumSize="10"/>
-						</subscriptionRecoveryPolicy>
-					</policyEntry>
-					<policyEntry topic="intl.service.status" minimumMessageSize="1" optimizedDispatch="true" lazyDispatch="false" producerFlowControl="false"> 
-						<subscriptionRecoveryPolicy>
-							<lastImageSubscriptionRecoveryPolicy/>
-						</subscriptionRecoveryPolicy>
-					</policyEntry>
-				</policyEntries>
-			</policyMap>
-		</destinationPolicy>
-		
-		<systemUsage>
-			<systemUsage>
-				<memoryUsage>
-					<memoryUsage limit="1gb"/>
-				</memoryUsage>
-			</systemUsage>  
-		</systemUsage>
-	
+	<transportConnectors>
+      <transportConnector uri="tcp://localhost:61616"/>
+    </transportConnectors>
 	  
+	<persistenceAdapter>
+	  <journaledJDBC journalLogFiles="2" dataDirectory="target/foo"/>
+	</persistenceAdapter>
+	  
+  </broker>
+
+  <!-- Example of broker configuration that uses new logging options and dynamic management of logging
+  <broker useJmx="true" xmlns="http://activemq.org/config/1.0" persistent="false" deleteAllMessagesOnStartup="true">
+  
+    <transportConnectors>
+      <transportConnector uri="tcp://localhost:61616?trace=true&amp;logWriterName=custom&amp;dynamicManagement=true&amp;startLogging=true"/>
+    </transportConnectors>
+    
+    <persistenceAdapter>
+      <memoryPersistenceAdapter/>
+    </persistenceAdapter>
+    
   </broker>
+  End of example-->
+  
+<!-- Note: the jmxPort=portnumber option on transportConnectors should only be used on clients.
+On brokers, there is a default port (usually 1099) -->
+  
   
 </beans>
 <!-- END SNIPPET: xbean -->

Modified: activemq/trunk/activemq-console/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-console/src/test/resources/log4j.properties?rev=643534&r1=643533&r2=643534&view=diff
==============================================================================
--- activemq/trunk/activemq-console/src/test/resources/log4j.properties (original)
+++ activemq/trunk/activemq-console/src/test/resources/log4j.properties Tue Apr  1 12:42:41 2008
@@ -18,7 +18,7 @@
 #
 # The logging properties used during tests..
 #
-log4j.rootLogger=INFO, stdout
+log4j.rootLogger=DEBUG, stdout
 log4j.logger.org.apache.activemq.spring=WARN
 
 # CONSOLE appender, not used by default