Modified: cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/jms/testsuite/testcases/SOAPJMSTestSuiteTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/jms/testsuite/testcases/SOAPJMSTestSuiteTest.java?rev=1567186&r1=1567185&r2=1567186&view=diff ============================================================================== --- cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/jms/testsuite/testcases/SOAPJMSTestSuiteTest.java (original) +++ cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/jms/testsuite/testcases/SOAPJMSTestSuiteTest.java Tue Feb 11 15:45:30 2014 @@ -25,6 +25,7 @@ import java.lang.reflect.Proxy; import java.net.URL; import java.util.Map; +import javax.jms.Connection; import javax.jms.DeliveryMode; import javax.jms.Destination; import javax.jms.JMSException; @@ -642,7 +643,9 @@ public class SOAPJMSTestSuiteTest extend ResourceCloser closer = new ResourceCloser(); try { - Session session = JMSFactory.createJmsSessionFactory(jmsConfig, closer).createSession(); + Connection connection = closer.register(JMSFactory.createConnection(jmsConfig)); + connection.start(); + Session session = closer.register(connection.createSession(false, Session.AUTO_ACKNOWLEDGE)); Destination targetDest = jmsConfig.getTargetDestination(session); Destination replyToDestination = jmsConfig.getReplyToDestination(session, null); JMSSender sender = JMSFactory.createJmsSender(jmsConfig, null);
Modified: cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/jms/testsuite/util/JMSTestUtil.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/jms/testsuite/util/JMSTestUtil.java?rev=1567186&r1=1567185&r2=1567186&view=diff ============================================================================== --- cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/jms/testsuite/util/JMSTestUtil.java (original) +++ cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/jms/testsuite/util/JMSTestUtil.java Tue Feb 11 15:45:30 2014 @@ -44,7 +44,7 @@ import org.apache.cxf.transport.jms.spec import org.apache.cxf.transport.jms.uri.JMSEndpoint; import org.apache.cxf.transport.jms.uri.JMSEndpointParser; import org.apache.cxf.transport.jms.uri.JMSURIConstants; -import org.springframework.jms.support.destination.JndiDestinationResolver; +import org.apache.cxf.transport.jms.util.JMSDestinationResolver; import org.springframework.jndi.JndiTemplate; /** @@ -141,7 +141,7 @@ public final class JMSTestUtil { boolean useJndi = endpoint.getJmsVariant().equals(JMSURIConstants.JNDI); if (useJndi) { // Setup Destination jndi destination resolver - final JndiDestinationResolver jndiDestinationResolver = new JndiDestinationResolver(); + final JMSDestinationResolver jndiDestinationResolver = new JMSDestinationResolver(); jndiDestinationResolver.setJndiTemplate(jt); jmsConfig.setDestinationResolver(jndiDestinationResolver); jmsConfig.setTargetDestination(endpoint.getDestinationName()); Modified: cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java?rev=1567186&r1=1567185&r2=1567186&view=diff ============================================================================== --- cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java (original) +++ cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java Tue Feb 11 15:45:30 2014 @@ -897,7 +897,7 @@ public class JMSClientServerTest extends jmsConfig.setJndiConfig(jndiConfig); TestReceiver receiver = new TestReceiver(jmsConfig.getConnectionFactory(), - "dynamicQueues/SoapService7.replyto.queue"); + "dynamicQueues/SoapService7.replyto.queue", false); receiver.setStaticReplyQueue("dynamicQueues/SoapService7.reply.queue"); receiver.runAsync(); Modified: cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java?rev=1567186&r1=1567185&r2=1567186&view=diff ============================================================================== --- cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java (original) +++ cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java Tue Feb 11 15:45:30 2014 @@ -40,7 +40,6 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.jms.connection.JmsTransactionManager; /** * Test transactions based on spring transactions. @@ -69,7 +68,6 @@ public class JMSTransactionClientServerT jmsConfig.setTargetDestination("greeter.queue.noaop"); jmsConfig.setSessionTransacted(true); jmsConfig.setPubSubDomain(false); - jmsConfig.setTransactionManager(new JmsTransactionManager(connectionFactory)); jmsConfig.setCacheLevel(3); JMSConfigFeature jmsConfigFeature = new JMSConfigFeature();
