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/07/13 08:26:45 UTC

svn commit: r963608 - in /servicemix/smx4/features/trunk/examples/itests: cxf-jms-osgi/src/main/resources/META-INF/spring/activemq-broker.xml tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java

Author: ffang
Date: Tue Jul 13 06:26:44 2010
New Revision: 963608

URL: http://svn.apache.org/viewvc?rev=963608&view=rev
Log:
[SMX4-544]fix itests failure

Modified:
    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/src/test/java/org/apache/servicemix/examples/IntegrationTest.java

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=963608&r1=963607&r2=963608&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 Tue Jul 13 06:26:44 2010
@@ -106,9 +106,7 @@
     <bean id="pooledConnectionFactoryFactory" 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" />
 

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=963608&r1=963607&r2=963608&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 Tue Jul 13 06:26:44 2010
@@ -227,7 +227,8 @@ public class IntegrationTest extends Abs
         mf.getMainAttributes().putValue(Constants.EXPORT_PACKAGE,
                                       exportP + ",org.apache.handlers, "
                                       + "org.apache.springcfg.handlers, "
-                                      + "org.apache.handlers.types,org.apache.servicemix.examples.cxf,"
+                                      + "org.apache.handlers.types, "
+                                      + "org.apache.servicemix.examples.cxf,"
                                       + "org.apache.servicemix.examples.cxf.soaphandler,"
                                       + "org.apache.servicemix.examples.cxf.springcfghandler,"
                                       + "org.apache.servicemix.examples.cxf.wsaddressing,"