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 2009/03/17 07:50:57 UTC
svn commit: r755133 - in /servicemix/smx4/nmr/trunk: ./ jbi/cluster/config/
jbi/cluster/config/src/main/resources/META-INF/spring/
jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/
Author: gnodet
Date: Tue Mar 17 06:50:56 2009
New Revision: 755133
URL: http://svn.apache.org/viewvc?rev=755133&view=rev
Log:
SMX4NMR-25: a few clustering fixes
Modified:
servicemix/smx4/nmr/trunk/jbi/cluster/config/pom.xml
servicemix/smx4/nmr/trunk/jbi/cluster/config/src/main/resources/META-INF/spring/jbi-cluster.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/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/config/pom.xml?rev=755133&r1=755132&r2=755133&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/config/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/config/pom.xml Tue Mar 17 06:50:56 2009
@@ -50,10 +50,15 @@
javax.jms,
org.apache.servicemix.nmr.api,
org.apache.servicemix.nmr.api.event,
+ org.apache.servicemix.nmr.core,
org.apache.servicemix.jbi.cluster.engine,
org.apache.servicemix.jbi.cluster.requestor,
+ org.apache.servicemix.jbi.runtime.impl,
*
</Import-Package>
+ <DynamicImport-Package>
+ *
+ </DynamicImport-Package>
<Spring-Context>*;publish-context:=false;create-asynchronously:=true</Spring-Context>
</instructions>
</configuration>
Modified: servicemix/smx4/nmr/trunk/jbi/cluster/config/src/main/resources/META-INF/spring/jbi-cluster.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/config/src/main/resources/META-INF/spring/jbi-cluster.xml?rev=755133&r1=755132&r2=755133&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/config/src/main/resources/META-INF/spring/jbi-cluster.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/config/src/main/resources/META-INF/spring/jbi-cluster.xml Tue Mar 17 06:50:56 2009
@@ -19,24 +19,30 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ctx="http://www.springframework.org/schema/context"
xmlns:osgi="http://www.springframework.org/schema/osgi"
+ xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util.xsd
http://www.springframework.org/schema/osgi
- http://www.springframework.org/schema/osgi/spring-osgi.xsd">
+ http://www.springframework.org/schema/osgi/spring-osgi.xsd
+ http://www.springframework.org/schema/osgi-compendium
+ http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd">
<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="org.apache.servicemix.jbi.cluster" />
+ <property name="destinationName" value="${destinationName}" />
</bean>
</property>
- <property name="name" value="org.apache.servicemix.jbi.cluster" />
+ <property name="name" value="${clusterName}" />
</bean>
<osgi:list id="clusterRegistrations"
@@ -55,8 +61,15 @@
<value>org.apache.servicemix.nmr.api.event.ExchangeListener</value>
</osgi:interfaces>
<osgi:service-properties>
- <entry key="NAME" value="org.apache.servicemix.jbi.cluster" />
+ <entry key="NAME" value="${clusterName}" />
</osgi:service-properties>
</osgi:service>
+ <osgix:cm-properties id="clusterProps" persistent-id="org.apache.servicemix.jbi.cluster.config">
+ <prop key="clusterName">${servicemix.name}</prop>
+ <prop key="destinationName">org.apache.servicemix.jbi.cluster</prop>
+ </osgix:cm-properties>
+
+ <ctx:property-placeholder properties-ref="clusterProps" />
+
</beans>
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=755133&r1=755132&r2=755133&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 Tue Mar 17 06:50:56 2009
@@ -356,6 +356,7 @@
}
failure = false;
} catch (Exception e) {
+ logger.debug("Error processing message", e);
setRollbackOnly();
} finally {
close();
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=755133&r1=755132&r2=755133&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Tue Mar 17 06:50:56 2009
@@ -72,9 +72,8 @@
<depends.maven.plugin.version>1.0</depends.maven.plugin.version>
<easymock.version>2.4</easymock.version>
<felix.configadmin.version>1.0.4</felix.configadmin.version>
- <felix.main.version>1.5.0-SNAPSHOT</felix.main.version>
<felix.plugin.version>1.4.3</felix.plugin.version>
- <felix.framework.version>1.5.0-SNAPSHOT</felix.framework.version>
+ <felix.framework.version>1.5.0-r752991</felix.framework.version>
<felix.osgi.version>1.2.0</felix.osgi.version>
<felix.compendium.version>1.2.0</felix.compendium.version>
<felix.bundlerepository.version>1.2.0</felix.bundlerepository.version>
@@ -95,12 +94,12 @@
<pax.logging.version>1.1.1</pax.logging.version>
<servicemix3.version>3.3</servicemix3.version>
<servicemix.eip.version>2008.01</servicemix.eip.version>
- <servicemix.http.version>2009.01-SNAPSHOT</servicemix.http.version>
+ <servicemix.http.version>2008.01</servicemix.http.version>
<servicemix.jsr181.version>2008.01</servicemix.jsr181.version>
- <servicemix.shared.version>2009.01-SNAPSHOT</servicemix.shared.version>
- <servicemix.kernel.version>1.1.0-SNAPSHOT</servicemix.kernel.version>
+ <servicemix.shared.version>2008.01</servicemix.shared.version>
+ <servicemix.kernel.version>1.1.0</servicemix.kernel.version>
<servicemix.legal.version>1.0</servicemix.legal.version>
- <servicemix.specs.version>1.2.0</servicemix.specs.version>
+ <servicemix.specs.version>1.3.0</servicemix.specs.version>
<servicemix.utils.version>1.0.0</servicemix.utils.version>
<spring.osgi.version>1.2.0-m2</spring.osgi.version>
<spring.version>2.5.6</spring.version>