Return-Path: 
 <activemq-commits-return-3818-apmail-geronimo-activemq-commits-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org
Received: (qmail 32664 invoked from network); 31 Oct 2006 22:29:24 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 31 Oct 2006 22:29:24 -0000
Received: (qmail 97221 invoked by uid 500); 31 Oct 2006 22:29:35 -0000
Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org
Received: (qmail 97204 invoked by uid 500); 31 Oct 2006 22:29:35 -0000
Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:activemq-commits-help@geronimo.apache.org>
List-Unsubscribe: <mailto:activemq-commits-unsubscribe@geronimo.apache.org>
List-Post: <mailto:activemq-commits@geronimo.apache.org>
List-Id: <activemq-commits.geronimo.apache.org>
Reply-To: activemq-dev@geronimo.apache.org
Delivered-To: mailing list activemq-commits@geronimo.apache.org
Received: (qmail 97195 invoked by uid 99); 31 Oct 2006 22:29:35 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 31 Oct 2006 14:29:35 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
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, 31 Oct 2006 14:29:23 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 29C471A9846; Tue, 31 Oct 2006 14:29:00 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r469682 - in
 /incubator/activemq/trunk/assembly/src/release/conf: activemq-nojournal.xml
 activemq.xml
Date: Tue, 31 Oct 2006 22:29:00 -0000
To: activemq-commits@geronimo.apache.org
From: aco@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061031222900.29C471A9846@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: aco
Date: Tue Oct 31 14:28:59 2006
New Revision: 469682

URL: http://svn.apache.org/viewvc?view=rev&rev=469682
Log:
Let's use a different name for the network connector in the config file bundled with the distro. This should prevent the default build from spewing some xbean/spring exception.

Modified:
    incubator/activemq/trunk/assembly/src/release/conf/activemq-nojournal.xml
    incubator/activemq/trunk/assembly/src/release/conf/activemq.xml

Modified: incubator/activemq/trunk/assembly/src/release/conf/activemq-nojournal.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/conf/activemq-nojournal.xml?view=diff&rev=469682&r1=469681&r2=469682
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/conf/activemq-nojournal.xml (original)
+++ incubator/activemq/trunk/assembly/src/release/conf/activemq-nojournal.xml Tue Oct 31 14:28:59 2006
@@ -59,7 +59,7 @@
     <networkConnectors>
       <!-- auto discover the other brokers 
       
-      <networkConnector name="default" uri="multicast://default"/>
+      <networkConnector name="default-nc" uri="multicast://default"/>
       
       or use static hosts
       

Modified: incubator/activemq/trunk/assembly/src/release/conf/activemq.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/conf/activemq.xml?view=diff&rev=469682&r1=469681&r2=469682
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/conf/activemq.xml (original)
+++ incubator/activemq/trunk/assembly/src/release/conf/activemq.xml Tue Oct 31 14:28:59 2006
@@ -67,7 +67,7 @@
     
     <networkConnectors>
       <!-- by default just auto discover the other brokers -->
-      <networkConnector name="default" uri="multicast://default"/>
+      <networkConnector name="default-nc" uri="multicast://default"/>
       <!--
       <networkConnector name="host1 and host2" uri="static://(tcp://host1:61616,tcp://host2:61616)" failover="true"/>
       -->