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 2010/05/06 22:23:34 UTC
svn commit: r941895 - in /servicemix/smx4/nmr/trunk: ./
jbi/cluster/config/src/main/resources/OSGI-INF/blueprint/
jbi/cluster/engine/ jbi/cluster/requestor/
jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/
Author: gnodet
Date: Thu May 6 20:23:34 2010
New Revision: 941895
URL: http://svn.apache.org/viewvc?rev=941895&view=rev
Log:
SMX4NMR-186: Upgrade to ActiveMQ 5.3.2
Modified:
servicemix/smx4/nmr/trunk/jbi/cluster/config/src/main/resources/OSGI-INF/blueprint/jbi-cluster.xml
servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml
servicemix/smx4/nmr/trunk/jbi/cluster/requestor/pom.xml
servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/ActiveMQJmsRequestorPool.java
servicemix/smx4/nmr/trunk/pom.xml
Modified: servicemix/smx4/nmr/trunk/jbi/cluster/config/src/main/resources/OSGI-INF/blueprint/jbi-cluster.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/config/src/main/resources/OSGI-INF/blueprint/jbi-cluster.xml?rev=941895&r1=941894&r2=941895&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/config/src/main/resources/OSGI-INF/blueprint/jbi-cluster.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/config/src/main/resources/OSGI-INF/blueprint/jbi-cluster.xml Thu May 6 20:23:34 2010
@@ -21,16 +21,16 @@
xmlns:cm="http://geronimo.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
xmlns:ext="http://geronimo.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
- <bean id="clusterEngine" class="org.apache.servicemix.jbi.cluster.engine.ClusterEngine">
- <property name="pool">
- <bean class="org.apache.servicemix.jbi.cluster.requestor.ActiveMQJmsRequestorPool">
- <property name="connectionFactory" ref="connectionFactory" />
- <property name="destinationName" value="${destinationName}" />
- </bean>
- </property>
+ <bean id="clusterEngine" class="org.apache.servicemix.jbi.cluster.engine.ClusterEngine" init-method="afterPropertiesSet" destroy-method="destroy">
+ <property name="pool" ref="pool" />
<property name="name" value="${clusterName}" />
</bean>
+ <bean id="pool" class="org.apache.servicemix.jbi.cluster.requestor.ActiveMQJmsRequestorPool" init-method="afterPropertiesSet" destroy-method="destroy">
+ <property name="connectionFactory" ref="connectionFactory" />
+ <property name="destinationName" value="${destinationName}" />
+ </bean>
+
<reference-list id="clusterRegistrations"
interface="org.apache.servicemix.jbi.cluster.engine.ClusterRegistration"
availability="optional">
Modified: servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml?rev=941895&r1=941894&r2=941895&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml Thu May 6 20:23:34 2010
@@ -126,7 +126,6 @@
<Import-Package>
*
</Import-Package>
- <Spring-Context>*;publish-context:=false;create-asynchronously:=true</Spring-Context>
</instructions>
</configuration>
</plugin>
Modified: servicemix/smx4/nmr/trunk/jbi/cluster/requestor/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/requestor/pom.xml?rev=941895&r1=941894&r2=941895&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/requestor/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/requestor/pom.xml Thu May 6 20:23:34 2010
@@ -77,7 +77,6 @@
org.apache.activemq*;resolution:=optional,
*
</Import-Package>
- <Spring-Context>*;publish-context:=false;create-asynchronously:=true</Spring-Context>
</instructions>
</configuration>
</plugin>
Modified: servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/ActiveMQJmsRequestorPool.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/ActiveMQJmsRequestorPool.java?rev=941895&r1=941894&r2=941895&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/ActiveMQJmsRequestorPool.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/ActiveMQJmsRequestorPool.java Thu May 6 20:23:34 2010
@@ -77,7 +77,7 @@ public class ActiveMQJmsRequestorPool ex
try {
refreshSharedConnection();
} catch (JMSException e) {
- e.printStackTrace();
+ logger.debug("Error while refreshing shared connection", e);
}
}
recreateConsumers(true);
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=941895&r1=941894&r2=941895&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Thu May 6 20:23:34 2010
@@ -76,7 +76,7 @@
<properties>
- <activemq.version>5.3.0</activemq.version>
+ <activemq.version>5.3.2</activemq.version>
<ant.version>1.7.0_3</ant.version>
<aopalliance.version>1.0_3</aopalliance.version>
<asm.version>2.2.3_1</asm.version>