Author: dkulp
Date: Tue Oct 5 15:08:16 2010
New Revision: 1004664
URL: http://svn.apache.org/viewvc?rev=1004664&view=rev
Log:
Update to latest ActiveMQ for testing. Required the property name to be
changed.
Modified:
cxf/trunk/parent/pom.xml
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSJmsTest.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/SOAPJMSTestSuiteTest.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/ProviderJMSContinuationTest.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/DecoupledJMSTest.java
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/NonDecoupledJMSTest.java
Modified: cxf/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1004664&r1=1004663&r2=1004664&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Tue Oct 5 15:08:16 2010
@@ -49,7 +49,7 @@
<!-- please maintain alphabetical order here -->
<abdera.version>1.1</abdera.version>
- <activemq.version>5.3.1</activemq.version>
+ <activemq.version>5.4.1</activemq.version>
<derby.version>10.2.2.0</derby.version>
<jaxb.version>2.1</jaxb.version>
<jaxb.impl.version>2.1.13</jaxb.impl.version>
@@ -262,7 +262,7 @@
<cxf.validateServiceSchemas>${cxf.validateServices}</cxf.validateServiceSchemas>
<java.awt.headless>${java.awt.headless}</java.awt.headless>
<java.util.logging.config.file>${basedir}/target/test-classes/logging.properties</java.util.logging.config.file>
-
<activemq.store.dir>${basedir}/target/ActiveMQ</activemq.store.dir>
+
<org.apache.activemq.default.directory.prefix>${basedir}/target/ActiveMQ/</org.apache.activemq.default.directory.prefix>
<derby.system.home>${basedir}/target/derby</derby.system.home>
<spring.validation.mode>${spring.validation.mode}</spring.validation.mode>
<server.launcher.vmargs>${server.launcher.vmargs}</server.launcher.vmargs>
Modified:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSJmsTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSJmsTest.java?rev=1004664&r1=1004663&r2=1004664&view=diff
==============================================================================
---
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSJmsTest.java
(original)
+++
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSJmsTest.java
Tue Oct 5 15:08:16 2010
@@ -56,8 +56,9 @@ public class JAXRSJmsTest extends Abstra
return;
}
Map<String, String> props = new HashMap<String, String>();
- if (System.getProperty("activemq.store.dir") != null) {
- props.put("activemq.store.dir",
System.getProperty("activemq.store.dir"));
+ if (System.getProperty("org.apache.activemq.default.directory.prefix")
!= null) {
+ props.put("org.apache.activemq.default.directory.prefix",
+
System.getProperty("org.apache.activemq.default.directory.prefix"));
}
props.put("java.util.logging.config.file",
System.getProperty("java.util.logging.config.file"));
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/SOAPJMSTestSuiteTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/SOAPJMSTestSuiteTest.java?rev=1004664&r1=1004663&r2=1004664&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/SOAPJMSTestSuiteTest.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/SOAPJMSTestSuiteTest.java
Tue Oct 5 15:08:16 2010
@@ -65,8 +65,9 @@ public class SOAPJMSTestSuiteTest extend
@BeforeClass
public static void startServers() throws Exception {
Map<String, String> props = new HashMap<String, String>();
- if (System.getProperty("activemq.store.dir") != null) {
- props.put("activemq.store.dir",
System.getProperty("activemq.store.dir"));
+ if (System.getProperty("org.apache.activemq.default.directory.prefix")
!= null) {
+ props.put("org.apache.activemq.default.directory.prefix",
+
System.getProperty("org.apache.activemq.default.directory.prefix"));
}
props.put("java.util.logging.config.file", System
.getProperty("java.util.logging.config.file"));
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java?rev=1004664&r1=1004663&r2=1004664&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
Tue Oct 5 15:08:16 2010
@@ -109,8 +109,9 @@ public class JMSClientServerTest extends
@BeforeClass
public static void startServers() throws Exception {
Map<String, String> props = new HashMap<String, String>();
- if (System.getProperty("activemq.store.dir") != null) {
- props.put("activemq.store.dir",
System.getProperty("activemq.store.dir"));
+ if (System.getProperty("org.apache.activemq.default.directory.prefix")
!= null) {
+ props.put("org.apache.activemq.default.directory.prefix",
+
System.getProperty("org.apache.activemq.default.directory.prefix"));
}
props.put("java.util.logging.config.file",
System.getProperty("java.util.logging.config.file"));
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java?rev=1004664&r1=1004663&r2=1004664&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java
Tue Oct 5 15:08:16 2010
@@ -54,8 +54,9 @@ public class HelloWorldContinuationsClie
return;
}
Map<String, String> props = new HashMap<String, String>();
- if (System.getProperty("activemq.store.dir") != null) {
- props.put("activemq.store.dir",
System.getProperty("activemq.store.dir"));
+ if (System.getProperty("org.apache.activemq.default.directory.prefix")
!= null) {
+ props.put("org.apache.activemq.default.directory.prefix",
+
System.getProperty("org.apache.activemq.default.directory.prefix"));
}
props.put("java.util.logging.config.file",
System.getProperty("java.util.logging.config.file"));
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java?rev=1004664&r1=1004663&r2=1004664&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
Tue Oct 5 15:08:16 2010
@@ -53,8 +53,9 @@ public class HelloWorldContinuationsThro
return;
}
Map<String, String> props = new HashMap<String, String>();
- if (System.getProperty("activemq.store.dir") != null) {
- props.put("activemq.store.dir",
System.getProperty("activemq.store.dir"));
+ if (System.getProperty("org.apache.activemq.default.directory.prefix")
!= null) {
+ props.put("org.apache.activemq.default.directory.prefix",
+
System.getProperty("org.apache.activemq.default.directory.prefix"));
}
props.put("java.util.logging.config.file",
System.getProperty("java.util.logging.config.file"));
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java?rev=1004664&r1=1004663&r2=1004664&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
Tue Oct 5 15:08:16 2010
@@ -44,8 +44,9 @@ public class JMSContinuationsClientServe
return;
}
Map<String, String> props = new HashMap<String, String>();
- if (System.getProperty("activemq.store.dir") != null) {
- props.put("activemq.store.dir",
System.getProperty("activemq.store.dir"));
+ if (System.getProperty("org.apache.activemq.default.directory.prefix")
!= null) {
+ props.put("org.apache.activemq.default.directory.prefix",
+
System.getProperty("org.apache.activemq.default.directory.prefix"));
}
props.put("java.util.logging.config.file",
System.getProperty("java.util.logging.config.file"));
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/ProviderJMSContinuationTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/ProviderJMSContinuationTest.java?rev=1004664&r1=1004663&r2=1004664&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/ProviderJMSContinuationTest.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/ProviderJMSContinuationTest.java
Tue Oct 5 15:08:16 2010
@@ -44,8 +44,9 @@ public class ProviderJMSContinuationTest
return;
}
Map<String, String> props = new HashMap<String, String>();
- if (System.getProperty("activemq.store.dir") != null) {
- props.put("activemq.store.dir",
System.getProperty("activemq.store.dir"));
+ if (System.getProperty("org.apache.activemq.default.directory.prefix")
!= null) {
+ props.put("org.apache.activemq.default.directory.prefix",
+
System.getProperty("org.apache.activemq.default.directory.prefix"));
}
props.put("java.util.logging.config.file",
System.getProperty("java.util.logging.config.file"));
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java?rev=1004664&r1=1004663&r2=1004664&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java
Tue Oct 5 15:08:16 2010
@@ -48,8 +48,9 @@ public class JMSTransactionClientServerT
return;
}
Map<String, String> props = new HashMap<String, String>();
- if (System.getProperty("activemq.store.dir") != null) {
- props.put("activemq.store.dir",
System.getProperty("activemq.store.dir"));
+ if (System.getProperty("org.apache.activemq.default.directory.prefix")
!= null) {
+ props.put("org.apache.activemq.default.directory.prefix",
+
System.getProperty("org.apache.activemq.default.directory.prefix"));
}
props.put("java.util.logging.config.file",
System.getProperty("java.util.logging.config.file"));
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java?rev=1004664&r1=1004663&r2=1004664&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java
Tue Oct 5 15:08:16 2010
@@ -77,8 +77,9 @@ public class MultiTransportClientServerT
@BeforeClass
public static void startServers() throws Exception {
Map<String, String> props = new HashMap<String, String>();
- if (System.getProperty("activemq.store.dir") != null) {
- props.put("activemq.store.dir",
System.getProperty("activemq.store.dir"));
+ if (System.getProperty("org.apache.activemq.default.directory.prefix")
!= null) {
+ props.put("org.apache.activemq.default.directory.prefix",
+
System.getProperty("org.apache.activemq.default.directory.prefix"));
}
props.put("java.util.logging.config.file",
System.getProperty("java.util.logging.config.file"));
Modified:
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java?rev=1004664&r1=1004663&r2=1004664&view=diff
==============================================================================
---
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java
(original)
+++
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java
Tue Oct 5 15:08:16 2010
@@ -71,8 +71,9 @@ public class MultiplexClientServerTest e
// requires ws-a support to propagate reference parameters
createStaticBus("org/apache/cxf/systest/factory_pattern/cxf_multiplex.xml");
Map<String, String> props = new HashMap<String, String>();
- if (System.getProperty("activemq.store.dir") != null) {
- props.put("activemq.store.dir",
System.getProperty("activemq.store.dir"));
+ if (System.getProperty("org.apache.activemq.default.directory.prefix")
!= null) {
+ props.put("org.apache.activemq.default.directory.prefix",
+
System.getProperty("org.apache.activemq.default.directory.prefix"));
}
props.put("java.util.logging.config.file",
System.getProperty("java.util.logging.config.file"));
Modified:
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java?rev=1004664&r1=1004663&r2=1004664&view=diff
==============================================================================
---
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java
(original)
+++
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java
Tue Oct 5 15:08:16 2010
@@ -61,8 +61,9 @@ public class ClientMtomXopWithJMSTest ex
@BeforeClass
public static void startServers() throws Exception {
Map<String, String> props = new HashMap<String, String>();
- if (System.getProperty("activemq.store.dir") != null) {
- props.put("activemq.store.dir",
System.getProperty("activemq.store.dir"));
+ if (System.getProperty("org.apache.activemq.default.directory.prefix")
!= null) {
+ props.put("org.apache.activemq.default.directory.prefix",
+
System.getProperty("org.apache.activemq.default.directory.prefix"));
}
props.put("java.util.logging.config.file",
System.getProperty("java.util.logging.config.file"));
Modified:
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/DecoupledJMSTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/DecoupledJMSTest.java?rev=1004664&r1=1004663&r2=1004664&view=diff
==============================================================================
---
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/DecoupledJMSTest.java
(original)
+++
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/DecoupledJMSTest.java
Tue Oct 5 15:08:16 2010
@@ -70,8 +70,9 @@ public class DecoupledJMSTest extends MA
public static void startServers() throws Exception {
Map<String, String> props = new HashMap<String, String>();
- if (System.getProperty("activemq.store.dir") != null) {
- props.put("activemq.store.dir",
System.getProperty("activemq.store.dir"));
+ if (System.getProperty("org.apache.activemq.default.directory.prefix")
!= null) {
+ props.put("org.apache.activemq.default.directory.prefix",
+
System.getProperty("org.apache.activemq.default.directory.prefix"));
}
props.put("java.util.logging.config.file", System
.getProperty("java.util.logging.config.file"));
Modified:
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/NonDecoupledJMSTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/NonDecoupledJMSTest.java?rev=1004664&r1=1004663&r2=1004664&view=diff
==============================================================================
---
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/NonDecoupledJMSTest.java
(original)
+++
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/NonDecoupledJMSTest.java
Tue Oct 5 15:08:16 2010
@@ -69,8 +69,9 @@ public class NonDecoupledJMSTest extends
public static void startServers() throws Exception {
Map<String, String> props = new HashMap<String, String>();
- if (System.getProperty("activemq.store.dir") != null) {
- props.put("activemq.store.dir",
System.getProperty("activemq.store.dir"));
+ if (System.getProperty("org.apache.activemq.default.directory.prefix")
!= null) {
+ props.put("org.apache.activemq.default.directory.prefix",
+
System.getProperty("org.apache.activemq.default.directory.prefix"));
}
props.put("java.util.logging.config.file", System
.getProperty("java.util.logging.config.file"));
