You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/08/28 22:08:21 UTC
svn commit: r1518348 - in /cxf/trunk: parent/ rt/transports/jms/
rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/
services/wsn/wsn-core/ systests/jaxrs/ systests/transport-jms/
systests/transports/ systests/uncategorized/ systests/ws-specs...
Author: dkulp
Date: Wed Aug 28 20:08:21 2013
New Revision: 1518348
URL: http://svn.apache.org/r1518348
Log:
Update to use ActiveMQ 5.8 for testing (and the pom changes should allow much easier change to 5.9
Modified:
cxf/trunk/parent/pom.xml
cxf/trunk/rt/transports/jms/pom.xml
cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/RequestResponseTest.java
cxf/trunk/services/wsn/wsn-core/pom.xml
cxf/trunk/systests/jaxrs/pom.xml
cxf/trunk/systests/transport-jms/pom.xml
cxf/trunk/systests/transports/pom.xml
cxf/trunk/systests/uncategorized/pom.xml
cxf/trunk/systests/ws-specs/pom.xml
cxf/trunk/testutils/pom.xml
cxf/trunk/testutils/src/main/resources/wsdl/jms_spec_testsuite.wsdl
Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1518348&r1=1518347&r2=1518348&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Wed Aug 28 20:08:21 2013
@@ -78,7 +78,7 @@
<!-- please maintain alphabetical order here -->
<cxf.abdera.version>1.1.3</cxf.abdera.version>
- <cxf.activemq.version>5.7.0</cxf.activemq.version>
+ <cxf.activemq.version>5.8.0</cxf.activemq.version>
<cxf.axiom.version>1.2.14</cxf.axiom.version>
<cxf.bcprov.version>1.49</cxf.bcprov.version>
<cxf.cglib.bundle.version>2.2_2</cxf.cglib.bundle.version>
@@ -1318,22 +1318,13 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
+ <version>${cxf.activemq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-client</artifactId>
<version>${cxf.activemq.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.fusesource.fuse-extra</groupId>
- <artifactId>fusemq-leveldb</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.fusesource.mqtt-client</groupId>
- <artifactId>mqtt-client</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -1341,6 +1332,11 @@
<version>${cxf.activemq.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-kahadb-store</artifactId>
+ <version>${cxf.activemq.version}</version>
+ </dependency>
+ <dependency>
<groupId>rhino</groupId>
<artifactId>js</artifactId>
<version>${cxf.rhino.version}</version>
Modified: cxf/trunk/rt/transports/jms/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/pom.xml?rev=1518348&r1=1518347&r2=1518348&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/pom.xml (original)
+++ cxf/trunk/rt/transports/jms/pom.xml Wed Aug 28 20:08:21 2013
@@ -93,13 +93,17 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pool</artifactId>
- <version>${cxf.activemq.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-kahadb-store</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java?rev=1518348&r1=1518347&r2=1518348&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java (original)
+++ cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java Wed Aug 28 20:08:21 2013
@@ -104,7 +104,7 @@ public abstract class AbstractJMSTester
try {
conduit.prepare(message);
} catch (IOException ex) {
- assertFalse("JMSConduit can't perpare to send out message", false);
+ assertFalse("JMSConduit can't prepare to send out message", false);
ex.printStackTrace();
}
OutputStream os = message.getContent(OutputStream.class);
@@ -146,6 +146,9 @@ public abstract class AbstractJMSTester
JMSConfiguration jmsConfig = new JMSOldConfigHolder()
.createJMSConfigurationFromEndpointInfo(bus, endpointInfo, null, true);
+ if (jmsConfig != null && jmsConfig.getReceiveTimeout() == null) {
+ jmsConfig.setReceiveTimeout(5000L);
+ }
JMSConduit jmsConduit = new JMSConduit(endpointInfo, target, jmsConfig, bus);
if (send) {
// setMessageObserver
Modified: cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/RequestResponseTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/RequestResponseTest.java?rev=1518348&r1=1518347&r2=1518348&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/RequestResponseTest.java (original)
+++ cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/RequestResponseTest.java Wed Aug 28 20:08:21 2013
@@ -201,45 +201,39 @@ public class RequestResponseTest extends
setupMessageHeader(outMessage, null);
final JMSDestination destination = setupJMSDestination(false);
- // set up MessageObserver for handling the conduit message
- MessageObserver observer = new MessageObserver() {
- public void onMessage(Message m) {
- Exchange exchange = new ExchangeImpl();
- exchange.setInMessage(m);
- m.setExchange(exchange);
- verifyReceivedMessage(m);
- verifyHeaders(m, outMessage);
- // setup the message for
- Conduit backConduit;
- try {
- backConduit = destination.getBackChannel(m);
- // wait for the message to be got from the conduit
- Message replyMessage = new MessageImpl();
- sendoutMessage(backConduit, replyMessage, true);
- } catch (Exception e) {
- throw new RuntimeException(e);
+ try {
+ // set up MessageObserver for handling the conduit message
+ MessageObserver observer = new MessageObserver() {
+ public void onMessage(Message m) {
+ Exchange exchange = new ExchangeImpl();
+ exchange.setInMessage(m);
+ m.setExchange(exchange);
+ verifyReceivedMessage(m);
+ verifyHeaders(m, outMessage);
+ // setup the message for
+ Conduit backConduit;
+ try {
+ backConduit = destination.getBackChannel(m);
+ // wait for the message to be got from the conduit
+ Message replyMessage = new MessageImpl();
+ sendoutMessage(backConduit, replyMessage, true);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
- }
- };
- destination.setMessageObserver(observer);
- // set is oneway false for get response from destination
- sendoutMessage(conduit, outMessage, false);
- // wait for the message to be got from the destination,
- // create the thread to handler the Destination incoming message
-
- waitForReceiveInMessage();
- verifyReceivedMessage(inMessage);
- // wait for a while for the jms session recycling
-
- inMessage = null;
- // Send a second message to check for an issue
- // Where the session was closed the second time
- sendoutMessage(conduit, outMessage, false);
- waitForReceiveInMessage();
- verifyReceivedMessage(inMessage);
-
- conduit.close();
- destination.shutdown();
+ };
+ destination.setMessageObserver(observer);
+ // set is oneway false for get response from destination
+ sendoutMessage(conduit, outMessage, false);
+ // wait for the message to be got from the destination,
+ // create the thread to handler the Destination incoming message
+
+ waitForReceiveInMessage();
+ verifyReceivedMessage(inMessage);
+ } finally {
+ conduit.close();
+ destination.shutdown();
+ }
}
Modified: cxf/trunk/services/wsn/wsn-core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/pom.xml?rev=1518348&r1=1518347&r2=1518348&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/pom.xml (original)
+++ cxf/trunk/services/wsn/wsn-core/pom.xml Wed Aug 28 20:08:21 2013
@@ -58,8 +58,7 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>${cxf.activemq.version}</version>
+ <artifactId>activemq-broker</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
Modified: cxf/trunk/systests/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/pom.xml?rev=1518348&r1=1518347&r2=1518348&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/pom.xml (original)
+++ cxf/trunk/systests/jaxrs/pom.xml Wed Aug 28 20:08:21 2013
@@ -141,7 +141,12 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-kahadb-store</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: cxf/trunk/systests/transport-jms/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transport-jms/pom.xml?rev=1518348&r1=1518347&r2=1518348&view=diff
==============================================================================
--- cxf/trunk/systests/transport-jms/pom.xml (original)
+++ cxf/trunk/systests/transport-jms/pom.xml Wed Aug 28 20:08:21 2013
@@ -251,16 +251,19 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pool</artifactId>
- <version>${cxf.activemq.version}</version>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-kahadb-store</artifactId>
+ </dependency>
+ <dependency>
<groupId>${cxf.asm.groupId}</groupId>
<artifactId>${cxf.asm.artifactId}</artifactId>
</dependency>
Modified: cxf/trunk/systests/transports/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/pom.xml?rev=1518348&r1=1518347&r2=1518348&view=diff
==============================================================================
--- cxf/trunk/systests/transports/pom.xml (original)
+++ cxf/trunk/systests/transports/pom.xml Wed Aug 28 20:08:21 2013
@@ -232,7 +232,12 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-kahadb-store</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: cxf/trunk/systests/uncategorized/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/pom.xml?rev=1518348&r1=1518347&r2=1518348&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/pom.xml (original)
+++ cxf/trunk/systests/uncategorized/pom.xml Wed Aug 28 20:08:21 2013
@@ -257,7 +257,12 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-kahadb-store</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: cxf/trunk/systests/ws-specs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/pom.xml?rev=1518348&r1=1518347&r2=1518348&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/pom.xml (original)
+++ cxf/trunk/systests/ws-specs/pom.xml Wed Aug 28 20:08:21 2013
@@ -110,10 +110,13 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-kahadb-store</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
Modified: cxf/trunk/testutils/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/pom.xml?rev=1518348&r1=1518347&r2=1518348&view=diff
==============================================================================
--- cxf/trunk/testutils/pom.xml (original)
+++ cxf/trunk/testutils/pom.xml Wed Aug 28 20:08:21 2013
@@ -49,7 +49,17 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: cxf/trunk/testutils/src/main/resources/wsdl/jms_spec_testsuite.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/resources/wsdl/jms_spec_testsuite.wsdl?rev=1518348&r1=1518347&r2=1518348&view=diff
==============================================================================
--- cxf/trunk/testutils/src/main/resources/wsdl/jms_spec_testsuite.wsdl (original)
+++ cxf/trunk/testutils/src/main/resources/wsdl/jms_spec_testsuite.wsdl Wed Aug 28 20:08:21 2013
@@ -237,6 +237,7 @@
<soapjms:jndiConnectionFactoryName>ConnectionFactory</soapjms:jndiConnectionFactoryName>
<soapjms:jndiInitialContextFactory>org.apache.activemq.jndi.ActiveMQInitialContextFactory</soapjms:jndiInitialContextFactory>
<soapjms:jndiURL>tcp://localhost:9001</soapjms:jndiURL>
+ <soapjms:deliveryMode>PERSISTENT</soapjms:deliveryMode>
<wsdl:port binding="tns:JMSSimplePortBinding" name="SimplePortQueueRequest">
<soap:address location="jms:queue:my.test.queue.request21"/>
</wsdl:port>