You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/09/09 13:49:22 UTC
svn commit: r693440 - in /servicemix/smx4/features/trunk:
activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml
pom.xml
Author: gnodet
Date: Tue Sep 9 04:49:21 2008
New Revision: 693440
URL: http://svn.apache.org/viewvc?rev=693440&view=rev
Log:
Use our own copy of jetty bundles
Modified:
servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml?rev=693440&r1=693439&r2=693440&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml (original)
+++ servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml Tue Sep 9 04:49:21 2008
@@ -105,15 +105,18 @@
<bean id="pooledConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactoryBean">
<property name="maxConnections" value="8" />
- <property name="transactionManager" ref="transactionManager" />
<property name="connectionFactory" ref="activemqConnectionFactory" />
+ <!-- if using a JTA transaction manager, uncomment the two following properties to
+ enable integration
+ <property name="transactionManager" ref="transactionManager" />
<property name="resourceName" value="activemq.${name}" />
+ -->
</bean>
<bean id="resourceManager" class="org.apache.activemq.pool.ActiveMQResourceManager" init-method="recoverResource">
- <property name="transactionManager" ref="transactionManager" />
- <property name="connectionFactory" ref="activemqConnectionFactory" />
- <property name="resourceName" value="activemq.${name}" />
+ <property name="transactionManager" ref="transactionManager" />
+ <property name="connectionFactory" ref="activemqConnectionFactory" />
+ <property name="resourceName" value="activemq.${name}" />
</bean>
<osgi:reference id="transactionManager" interface="javax.transaction.TransactionManager"
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=693440&r1=693439&r2=693440&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Tue Sep 9 04:49:21 2008
@@ -118,8 +118,8 @@
<jaxws.api.version>2.1</jaxws.api.version>
<jdt.core.version>3.2.3_1-SNAPSHOT</jdt.core.version>
<jencks.version>2.1_1-SNAPSHOT</jencks.version>
- <jetty.version>6.1.12rc1</jetty.version>
- <jetty.client.version>6.1.12rc1</jetty.client.version>
+ <jetty.version>6.1.12-rc1</jetty.version>
+ <jetty.client.version>6.1.12-rc1</jetty.client.version>
<jline.version>0.9.94</jline.version>
<junit.version>4.4</junit.version>
<log4j.version>1.2.14</log4j.version>