You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2010/05/07 05:36:32 UTC
svn commit: r941991 - in /servicemix/smx4/features/trunk:
assembly/src/main/filtered-resources/
examples/itests/cxf-jms-osgi/src/main/resources/META-INF/spring/
examples/itests/tests/
examples/itests/tests/src/test/java/org/apache/servicemix/examples/
Author: ffang
Date: Fri May 7 03:36:31 2010
New Revision: 941991
URL: http://svn.apache.org/viewvc?rev=941991&view=rev
Log:
[SMX4-415|SMX4-455]add necessary bundles for activemq 5.3.2 and fix test failure
Modified:
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/examples/itests/tests/pom.xml
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
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=941991&r1=941990&r2=941991&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 Fri May 7 03:36:31 2010
@@ -45,6 +45,9 @@
<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:commons-lang/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:commons-collections/commons-collections/${commons-collections.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/${geronimo.j2ee.management.version}</bundle>
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=941991&r1=941990&r2=941991&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 Fri May 7 03:36:31 2010
@@ -103,13 +103,14 @@
<property name="brokerURL" value="tcp://localhost:61616" />
</bean>
- <bean id="pooledConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactoryBean">
+ <bean id="pooledConnectionFactoryFactory" class="org.apache.activemq.pool.PooledConnectionFactoryBean">
<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" />
Modified: servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/pom.xml?rev=941991&r1=941990&r2=941991&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/pom.xml Fri May 7 03:36:31 2010
@@ -301,7 +301,7 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
- <version>${commons-pool.activemq.version}</version>
+ <version>${commons-pool.version}</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
@@ -463,6 +463,28 @@
<version>${servicemix.specs.version}</version>
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons-lang-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.velocity</artifactId>
+ <version>${velocity.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.oro</artifactId>
+ <version>${oro.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.josql</artifactId>
+ <version>${josql.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
<version>${wss4j.version}</version>
Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=941991&r1=941990&r2=941991&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java Fri May 7 03:36:31 2010
@@ -88,7 +88,11 @@ public class IntegrationTest extends Abs
getBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
//for activemq
-
+ getBundle("commons-lang", "commons-lang"),
+ getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.josql"),
+ getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.oro"),
+ getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.velocity"),
+ getBundle("commons-collections", "commons-collections"),
getBundle("org.springframework", "spring-jms"),
getBundle("org.springframework", "spring-tx"),
getBundle("org.apache.geronimo.specs", "geronimo-j2ee-management_1.1_spec"),