cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r817329 - in /cxf/branches/2.1.x-fixes: ./ systests/transports/src/test/java/org/apache/cxf/systest/jms/ systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/ systests/transports/src/test/java/org/apache/cxf/systest/jm...
Date Mon, 21 Sep 2009 17:26:14 GMT
Author: dkulp
Date: Mon Sep 21 17:26:13 2009
New Revision: 817329

URL: http://svn.apache.org/viewvc?rev=817329&view=rev
Log:
Merged revisions 817321-817322 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes

........
  r817321 | dkulp | 2009-09-21 13:08:36 -0400 (Mon, 21 Sep 2009) | 2 lines
  
  Somehow, the jms tests got removed on 2.2.x in the systest refactor
........
  r817322 | dkulp | 2009-09-21 13:12:28 -0400 (Mon, 21 Sep 2009) | 2 lines
  
  Forgot the wsdl update
........

Added:
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/
      - copied from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterByteMessageImpl.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterByteMessageImpl.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplDoc.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplDoc.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplDocBase.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplDocBase.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplQueueDecoupledOneWays.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplQueueDecoupledOneWays.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplQueueDecoupledOneWaysDeferredReply.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplQueueDecoupledOneWaysDeferredReply.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplQueueOneWay.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplQueueOneWay.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplTopicOneWay.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplTopicOneWay.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMS.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMS.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMSAppCorrelationIDEng.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMSAppCorrelationIDEng.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMSAppCorrelationIDNoPrefix.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMSAppCorrelationIDNoPrefix.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMSAppCorrelationIDSales.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMSAppCorrelationIDSales.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMSAppCorrelationIDStaticPrefixEng.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMSAppCorrelationIDStaticPrefixEng.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMSAppCorrelationIDStaticPrefixSales.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMSAppCorrelationIDStaticPrefixSales.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMSRuntimeCorrelationIDDynamicPrefix.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMSRuntimeCorrelationIDDynamicPrefix.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMSRuntimeCorrelationIDStaticPrefixEng.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMSRuntimeCorrelationIDStaticPrefixEng.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMSRuntimeCorrelationIDStaticPrefixSales.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMSRuntimeCorrelationIDStaticPrefixSales.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/Hello.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/Hello.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/HelloImpl.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/HelloImpl.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClients.xml
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClients.xml
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSMTOMImpl.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSMTOMImpl.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/JmsDestPubSubImpl.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/JmsDestPubSubImpl.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/Server.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/Server.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/SoapService6SoapPort6Impl.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/SoapService6SoapPort6Impl.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/TwoWayJMSImplBase.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/TwoWayJMSImplBase.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/
      - copied from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/GreeterImplWithContinuationsJMS.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/GreeterImplWithContinuationsJMS.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldWithContinuationsJMS.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldWithContinuationsJMS.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldWithContinuationsJMS2.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldWithContinuationsJMS2.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server2.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server2.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server3.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server3.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/jms_test.wsdl
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/jms_test.wsdl
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/jms_test_config.xml
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/jms_test_config.xml
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/test.wsdl
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/test.wsdl
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/test2.wsdl
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/test2.wsdl
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/
      - copied from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/GreeterImplWithTransaction.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/GreeterImplWithTransaction.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/Server.java
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/Server.java
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/jms_server_config.xml
      - copied unchanged from r817322, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/jms_server_config.xml
Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/testutils/src/main/resources/wsdl/jms_test.wsdl

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/branches/2.2.x-fixes:817321-817322

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

Modified: cxf/branches/2.1.x-fixes/testutils/src/main/resources/wsdl/jms_test.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/testutils/src/main/resources/wsdl/jms_test.wsdl?rev=817329&r1=817328&r2=817329&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/testutils/src/main/resources/wsdl/jms_test.wsdl (original)
+++ cxf/branches/2.1.x-fixes/testutils/src/main/resources/wsdl/jms_test.wsdl Mon Sep 21 17:26:13
2009
@@ -351,6 +351,27 @@
                <jms:server durableSubscriberName="CXF_subscriber"/>
            </port>
     </service>
+        
+    <service name="HelloWorldServiceAppCorrelationID">
+        <port binding="tns:HelloWorldPortBinding" name="HelloWorldPortAppCorrelationIDEng">
+               <jms:address
+                   jndiConnectionFactoryName="ConnectionFactory" 
+                   jndiDestinationName="dynamicQueues/test.jmstransport.text.app.correlation.id"
+                   jndiReplyDestinationName="dynamicQueues/test.jmstransport.text.app.correlation.id.reply">
+                   <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
+                   <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
+               </jms:address>
+        </port>
+        <port binding="tns:HelloWorldPortBinding" name="HelloWorldPortAppCorrelationIDSales">
+               <jms:address
+                   jndiConnectionFactoryName="ConnectionFactory" 
+                   jndiDestinationName="dynamicQueues/test.jmstransport.text.app.correlation.id"
+                   jndiReplyDestinationName="dynamicQueues/test.jmstransport.text.app.correlation.id.reply">
+                   <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
+                   <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
+               </jms:address>
+        </port>
+    </service>
     
     <service name="HelloWorldServiceAppCorrelationIDStaticPrefix">
         <port binding="tns:HelloWorldPortBinding" name="HelloWorldPortAppCorrelationIDStaticPrefixEng">
@@ -380,7 +401,7 @@
     <service name="HelloWorldServiceAppCorrelationIDNoPrefix">
         <port binding="tns:HelloWorldPortBinding" name="HelloWorldPortAppCorrelationIDNoPrefix">
             <jms:clientConfig clientReceiveTimeout = "5000"
-                              useConduitIdSelector="false"/>
+                              useConduitIdSelector="true"/>
             <jms:address
                    jndiConnectionFactoryName="ConnectionFactory" 
                    jndiDestinationName="dynamicQueues/test.jmstransport.text.app.correlation.id.no.prefix"
@@ -436,7 +457,7 @@
             <jms:address
                 jndiConnectionFactoryName="ConnectionFactory" 
                 jndiDestinationName="dynamicQueues/test.jmstransport.binary"
-                jndiReplyDestinationName="dynamicQueues/test.jmstransport.binary">
+                jndiReplyDestinationName="dynamicQueues/test.jmstransport.binary.reply">
                 <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
                 <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
             </jms:address>



Mime
View raw message