cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1004670 - in /cxf/branches/2.2.x-fixes: ./ parent/ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ systests/transports/src/test/java/org/apache/cxf/systest/jms/ systests/transports/src/test/java/org/apache/cxf/systest/jms/contin...
Date Tue, 05 Oct 2010 15:31:35 GMT
Author: dkulp
Date: Tue Oct  5 15:31:34 2010
New Revision: 1004670

URL: http://svn.apache.org/viewvc?rev=1004670&view=rev
Log:
Merged revisions 1004664 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1004664 | dkulp | 2010-10-05 11:08:16 -0400 (Tue, 05 Oct 2010) | 2 lines
  
  Update to latest ActiveMQ for testing.  Required the property name to be
  changed.
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/parent/pom.xml
    cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSJmsTest.java
    cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
    cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java
    cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
    cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
    cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/ProviderJMSContinuationTest.java
    cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java
    cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java
    cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java
    cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java

Propchange: cxf/branches/2.2.x-fixes/
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/parent/pom.xml?rev=1004670&r1=1004669&r2=1004670&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/parent/pom.xml Tue Oct  5 15:31:34 2010
@@ -46,7 +46,7 @@
         <saaj.impl.version>1.3.2</saaj.impl.version>
 
         <!-- please maintain alphabetical order here -->
-        <activemq.version>5.3.1</activemq.version>
+        <activemq.version>5.4.1</activemq.version>
         <abdera.version>1.1</abdera.version>
         <derby.version>10.2.2.0</derby.version>
         <jaxb.version>2.1</jaxb.version>
@@ -251,7 +251,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/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSJmsTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSJmsTest.java?rev=1004670&r1=1004669&r2=1004670&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSJmsTest.java
(original)
+++ cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSJmsTest.java
Tue Oct  5 15:31:34 2010
@@ -57,8 +57,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/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java?rev=1004670&r1=1004669&r2=1004670&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
(original)
+++ cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
Tue Oct  5 15:31:34 2010
@@ -104,8 +104,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/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java?rev=1004670&r1=1004669&r2=1004670&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java
(original)
+++ cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java
Tue Oct  5 15:31:34 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/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java?rev=1004670&r1=1004669&r2=1004670&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
(original)
+++ cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
Tue Oct  5 15:31:34 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/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java?rev=1004670&r1=1004669&r2=1004670&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
(original)
+++ cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
Tue Oct  5 15:31:34 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/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/ProviderJMSContinuationTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/ProviderJMSContinuationTest.java?rev=1004670&r1=1004669&r2=1004670&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/ProviderJMSContinuationTest.java
(original)
+++ cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/ProviderJMSContinuationTest.java
Tue Oct  5 15:31:34 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/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java?rev=1004670&r1=1004669&r2=1004670&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java
(original)
+++ cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java
Tue Oct  5 15:31:34 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/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java?rev=1004670&r1=1004669&r2=1004670&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java
(original)
+++ cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java
Tue Oct  5 15:31:34 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/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java?rev=1004670&r1=1004669&r2=1004670&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java
(original)
+++ cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java
Tue Oct  5 15:31:34 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/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java?rev=1004670&r1=1004669&r2=1004670&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java
(original)
+++ cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java
Tue Oct  5 15:31:34 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"));



Mime
View raw message