From commits-return-13314-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Thu Mar 18 14:04:07 2010
Return-Path: <commits-return-13314-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: (qmail 51100 invoked from network); 18 Mar 2010 14:04:07 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 18 Mar 2010 14:04:07 -0000
Received: (qmail 29738 invoked by uid 500); 18 Mar 2010 14:04:07 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 29717 invoked by uid 500); 18 Mar 2010 14:04:07 -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 29710 invoked by uid 99); 18 Mar 2010 14:04:06 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Mar 2010 14:04:06 +0000
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.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Mar 2010 14:04:04 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 6DCF32388A70; Thu, 18 Mar 2010 14:03:43 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r924782 -
 /activemq/branches/activemq-5.3/assembly/src/release/conf/camel.xml
Date: Thu, 18 Mar 2010 14:03:43 -0000
To: commits@activemq.apache.org
From: dejanb@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100318140343.6DCF32388A70@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dejanb
Date: Thu Mar 18 14:03:43 2010
New Revision: 924782

URL: http://svn.apache.org/viewvc?rev=924782&view=rev
Log:
merge -c 924763 - https://issues.apache.org/activemq/browse/AMQ-2448 - temp workaround for network connector leak

Modified:
    activemq/branches/activemq-5.3/assembly/src/release/conf/camel.xml

Modified: activemq/branches/activemq-5.3/assembly/src/release/conf/camel.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/release/conf/camel.xml?rev=924782&r1=924781&r2=924782&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/release/conf/camel.xml (original)
+++ activemq/branches/activemq-5.3/assembly/src/release/conf/camel.xml Thu Mar 18 14:03:43 2010
@@ -53,12 +53,7 @@
 
     <!-- configure the camel activemq component to use the current broker -->
     <bean id="activemq" class="org.apache.activemq.camel.component.ActiveMQComponent" >
-        <property name="connectionFactory">
-          <bean class="org.apache.activemq.ActiveMQConnectionFactory">
-            <property name="brokerURL" value="vm://localhost?create=false&amp;waitForStart=10000" />
-            <property name="userName" value="${activemq.username}"/>
-            <property name="password" value="${activemq.password}"/>
-          </bean>
-        </property>
+       <property name="userName" value="${activemq.username}"/>
+       <property name="password" value="${activemq.password}"/>
     </bean>
 </beans>