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/07/12 13:59:47 UTC
svn commit: r963250 - in /servicemix/smx4/features/trunk: ./ activemq/
assembly/ assembly/src/main/distribution/text/etc/
assembly/src/main/filtered-resources/
assembly/src/main/filtered-resources/etc/
examples/itests/cxf-jms-osgi/src/main/resources/ME...
Author: gnodet
Date: Mon Jul 12 11:59:47 2010
New Revision: 963250
URL: http://svn.apache.org/viewvc?rev=963250&view=rev
Log:
SMX4-552: Upgrade to ActiveMQ 5.4
Removed:
servicemix/smx4/features/trunk/activemq/
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/activemq-broker.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/src/main/resources/META-INF/spring/activemq-broker.xml
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=963250&r1=963249&r2=963250&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Mon Jul 12 11:59:47 2010
@@ -470,9 +470,9 @@
<version>${geronimo.wsmetadata.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.activemq</groupId>
- <artifactId>org.apache.servicemix.activemq.commands</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-karaf</artifactId>
+ <version>${activemq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.components</groupId>
@@ -1014,6 +1014,7 @@
<descriptors>
<descriptor>mvn:org.apache.karaf/apache-karaf/${karaf.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features</descriptor>
<descriptor>file:${basedir}/target/classes/camel-features.xml</descriptor>
<descriptor>file:${basedir}/target/classes/ode-features.xml</descriptor>
<descriptor>file:${basedir}/target/classes/features.xml</descriptor>
@@ -1024,6 +1025,7 @@
<feature>cxf-nmr</feature>
<feature>cxf-osgi</feature>
<feature>camel-activemq</feature>
+ <feature>activemq-broker</feature>
<!-- ServiceMix components -->
<feature>servicemix-cxf-bc</feature>
<feature>servicemix-file</feature>
Modified: servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/activemq-broker.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/activemq-broker.xml?rev=963250&r1=963249&r2=963250&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/activemq-broker.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/activemq-broker.xml Mon Jul 12 11:59:47 2010
@@ -14,82 +14,72 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<beans
- xmlns="http://www.springframework.org/schema/beans"
- xmlns:amq="http://activemq.apache.org/schema/core"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:osgi="http://www.springframework.org/schema/osgi"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
- http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
-
- <!-- Configures the ActiveMQ PooledConnectionFactoryBean using annotations -->
- <context:annotation-config />
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
+ xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"
+ xmlns:amq="http://activemq.apache.org/schema/core">
<!-- Allows us to use system properties as variables in this configuration file -->
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <ext:property-placeholder />
- <broker xmlns="http://activemq.apache.org/schema/core" brokerName="default" dataDirectory="${karaf.base}/data/activemq/default" useShutdownHook="false">
+ <broker xmlns="http://activemq.apache.org/schema/core" brokerName="default" dataDirectory="${karaf.data}/activemq/default" useShutdownHook="false">
- <!-- Destination specific policies using destination names or wildcards -->
+ <!--
+ For better performances use VM cursor and small memory limit.
+ For more information, see:
+
+ http://activemq.apache.org/message-cursors.html
+
+ Also, if your producer is "hanging", it's probably due to producer flow control.
+ For more information, see:
+ http://activemq.apache.org/producer-flow-control.html
+ -->
+
<destinationPolicy>
<policyMap>
- <policyEntries>
- <policyEntry topic=">" producerFlowControl="true" memoryLimit="1mb">
- <pendingSubscriberPolicy>
- <vmCursor />
- </pendingSubscriberPolicy>
- </policyEntry>
- <policyEntry queue=">" producerFlowControl="true" memoryLimit="1mb">
- <!-- Use VM cursor for better latency
- For more information, see:
-
- http://activemq.apache.org/message-cursors.html
-
- <pendingQueuePolicy>
- <vmQueueCursor/>
- </pendingQueuePolicy>
- -->
- </policyEntry>
- </policyEntries>
+ <policyEntries>
+ <policyEntry topic=">" producerFlowControl="true" memoryLimit="1mb">
+ <pendingSubscriberPolicy>
+ <vmCursor />
+ </pendingSubscriberPolicy>
+ </policyEntry>
+ <policyEntry queue=">" producerFlowControl="true" memoryLimit="1mb">
+ <!-- Use VM cursor for better latency
+ For more information, see:
+
+ http://activemq.apache.org/message-cursors.html
+
+ <pendingQueuePolicy>
+ <vmQueueCursor/>
+ </pendingQueuePolicy>
+ -->
+ </policyEntry>
+ </policyEntries>
</policyMap>
- </destinationPolicy>
+ </destinationPolicy>
<!-- Use the following to configure how ActiveMQ is exposed in JMX -->
<managementContext>
<managementContext createConnector="false"/>
</managementContext>
- <!-- The store and forward broker networks ActiveMQ will listen to -->
- <networkConnectors>
- <!-- by default just auto discover the other brokers -->
- <networkConnector name="default-nc" uri="multicast://default"/>
- <!-- Example of a static configuration:
- <networkConnector name="host1 and host2" uri="static://(tcp://host1:61616,tcp://host2:61616)"/>
- -->
- </networkConnectors>
-
- <persistenceAdapter>
- <kahaDB directory="${karaf.base}/data/activemq/default" />
- </persistenceAdapter>
-
- <!-- Use the following if you wish to configure the journal with JDBC -->
- <!--
- <persistenceAdapter>
- <journaledJDBC dataDirectory="${activemq.base}/data" dataSource="#postgres-ds"/>
- </persistenceAdapter>
+ <!--
+ Configure message persistence for the broker. The default persistence
+ mechanism is the KahaDB store (identified by the kahaDB tag).
+ For more information, see:
+
+ http://activemq.apache.org/persistence.html
-->
-
- <!-- Or if you want to use pure JDBC without a journal -->
- <!--
<persistenceAdapter>
- <jdbcPersistenceAdapter dataSource="#postgres-ds"/>
+ <kahaDB directory="${karaf.data}/activemq/default/kahadb"/>
</persistenceAdapter>
- -->
- <!-- The maximum about of space the broker will use before slowing down producers -->
+ <!--
+ The systemUsage controls the maximum amount of space the broker will
+ use before slowing down producers. For more information, see:
+
+ http://activemq.apache.org/producer-flow-control.html
+
<systemUsage>
<systemUsage>
<memoryUsage>
@@ -103,47 +93,39 @@
</tempUsage>
</systemUsage>
</systemUsage>
-
+ -->
<!-- The transport connectors ActiveMQ will listen to -->
<transportConnectors>
- <transportConnector name="openwire" uri="tcp://0.0.0.0:61616" discoveryUri="multicast://default"/>
- <transportConnector name="stomp" uri="stomp://0.0.0.0:61613"/>
+ <transportConnector name="openwire" uri="tcp://localhost:61616"/>
+ <transportConnector name="stomp" uri="stomp://localhost:61613"/>
</transportConnectors>
</broker>
<bean id="activemqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
+
<property name="brokerURL" value="tcp://localhost:61616" />
</bean>
- <bean id="pooledConnectionFactoryFactory" class="org.apache.activemq.pool.PooledConnectionFactoryBean">
+ <bean id="pooledConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory">
<property name="maxConnections" value="8" />
- <property name="maximumActive" value="500" />
- <property name="transactionManager" ref="transactionManager" />
<property name="connectionFactory" ref="activemqConnectionFactory" />
- <property name="resourceName" value="activemq.default" />
</bean>
- <bean id="pooledConnectionFactory" factory-bean="pooledConnectionFactoryFactory" factory-method="getConnectionFactory" />
-
<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.default" />
</bean>
- <osgi:reference id="transactionManager" interface="javax.transaction.TransactionManager" />
-
- <osgi:service ref="pooledConnectionFactory">
- <osgi:interfaces>
- <value>javax.jms.ConnectionFactory</value>
- </osgi:interfaces>
- <osgi:service-properties>
- <entry key="name" value="default"/>
- </osgi:service-properties>
- </osgi:service>
+ <reference id="transactionManager" interface="javax.transaction.TransactionManager" />
-</beans>
+ <service ref="pooledConnectionFactory" interface="javax.jms.ConnectionFactory">
+ <service-properties>
+ <entry key="name" value="localhost"/>
+ </service-properties>
+ </service>
+</blueprint>
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=963250&r1=963249&r2=963250&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg Mon Jul 12 11:59:47 2010
@@ -20,10 +20,10 @@
#
# Comma separated list of features repositories to register by default
#
-featuresRepositories=mvn:org.apache.karaf/apache-karaf/${karaf.version}/xml/features,mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/features,mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features,mvn:org.apache.servicemix/ode-jbi-karaf/${ode.version}/xml/features
+featuresRepositories=mvn:org.apache.karaf/apache-karaf/${karaf.version}/xml/features,mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/features,mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features,mvn:org.apache.servicemix/ode-jbi-karaf/${ode.version}/xml/features,mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features
#
# Comma separated list of features to install at startup
#
-featuresBoot=activemq,activemq-broker,camel,jbi-cluster,web,servicemix-cxf-bc,servicemix-file,servicemix-ftp,servicemix-http,servicemix-jms,servicemix-mail,servicemix-smpp,servicemix-snmp,servicemix-vfs,servicemix-bean,servicemix-camel,servicemix-cxf-se,servicemix-drools,servicemix-eip,servicemix-osworkflow,servicemix-quartz,servicemix-scripting,servicemix-validation,servicemix-saxon,servicemix-wsn2005,servicemix-exec
+featuresBoot=activemq-broker,camel,jbi-cluster,web,servicemix-cxf-bc,servicemix-file,servicemix-ftp,servicemix-http,servicemix-jms,servicemix-mail,servicemix-smpp,servicemix-snmp,servicemix-vfs,servicemix-bean,servicemix-camel,servicemix-cxf-se,servicemix-drools,servicemix-eip,servicemix-osworkflow,servicemix-quartz,servicemix-scripting,servicemix-validation,servicemix-saxon,servicemix-wsn2005,servicemix-exec
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=963250&r1=963249&r2=963250&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml Mon Jul 12 11:59:47 2010
@@ -42,24 +42,6 @@
<bundle>mvn:org.ops4j.pax.url/pax-url-war/${pax.url.version}</bundle>
<bundle>mvn:org.apache.servicemix.war/org.apache.servicemix.war.deployer/${version}</bundle>
</feature>
- <feature name="activemq" version="${activemq.version}">
- <feature version="${version}">connector</feature>
- <feature version="${spring.version}">spring</feature>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.josql/${josql.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang-version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.version}</bundle>
- <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/${geronimo.j2ee.management.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.activemq.version}</bundle>
- <bundle>mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
- <bundle>mvn:org.apache.activemq/kahadb/${activemq.version}</bundle>
- <bundle>mvn:org.apache.activemq/activemq-core/${activemq.version}</bundle>
- <bundle>mvn:org.apache.activemq/activemq-ra/${activemq.version}</bundle>
- <bundle>mvn:org.apache.activemq/activemq-console/${activemq.version}</bundle>
- <bundle>mvn:org.apache.activemq/activemq-pool/${activemq.version}</bundle>
- <bundle>mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.commands/${version}</bundle>
- </feature>
<feature name="cxf" version="${cxf.version}">
<feature>transaction</feature>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
@@ -362,8 +344,7 @@
<!-- Default broker configuration -->
<feature name="activemq-broker" version="${version}">
- <feature>spring-dm</feature>
- <feature version="${activemq.version}">activemq</feature>
- <bundle>spring:file:etc/activemq-broker.xml</bundle>
+ <feature version="${activemq.version}">activemq-blueprint</feature>
+ <bundle>blueprint:file:etc/activemq-broker.xml</bundle>
</feature>
</features>
Modified: servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/src/main/resources/META-INF/spring/activemq-broker.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/src/main/resources/META-INF/spring/activemq-broker.xml?rev=963250&r1=963249&r2=963250&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/src/main/resources/META-INF/spring/activemq-broker.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/src/main/resources/META-INF/spring/activemq-broker.xml Mon Jul 12 11:59:47 2010
@@ -103,7 +103,7 @@
<property name="brokerURL" value="tcp://localhost:61616" />
</bean>
- <bean id="pooledConnectionFactoryFactory" class="org.apache.activemq.pool.PooledConnectionFactoryBean">
+ <bean id="pooledConnectionFactoryFactory" class="org.apache.activemq.pool.PooledConnectionFactory">
<property name="maxConnections" value="8" />
<property name="maximumActive" value="500" />
<property name="transactionManager" ref="transactionManager" />
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=963250&r1=963249&r2=963250&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Mon Jul 12 11:59:47 2010
@@ -38,7 +38,6 @@
<modules>
<module>deps</module>
<module>branding</module>
- <module>activemq</module>
<module>camel</module>
<module>war</module>
<module>cxf</module>
@@ -64,7 +63,7 @@
<maven.assembly.version>2.2-beta-4</maven.assembly.version>
<xfire.maven.plugin>4.1</xfire.maven.plugin>
<abdera.version>0.4.0-incubating_3</abdera.version>
- <activemq.version>5.3.2</activemq.version>
+ <activemq.version>5.4-SNAPSHOT</activemq.version>
<acegi.version>1.0.0</acegi.version>
<ant.version>1.7.0_3</ant.version>
<antlr2.version>2.7.7_2</antlr2.version>