cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1076203 - in /cxf/branches/2.3.x-fixes: ./ rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java rt/transports/jms/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xsd
Date Wed, 02 Mar 2011 13:04:06 GMT
Author: ningjiang
Date: Wed Mar  2 13:04:06 2011
New Revision: 1076203

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

........
  r1076196 | ningjiang | 2011-03-02 20:39:01 +0800 (Wed, 02 Mar 2011) | 1 line
  
  CXF-3368 Added topicReplyToNameType into the schema
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
    cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xsd

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar  2 13:04:06 2011
@@ -1 +1 @@
-/cxf/trunk:1076052,1076141-1076156
+/cxf/trunk:1076052,1076141-1076156,1076196

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

Modified: cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java?rev=1076203&r1=1076202&r2=1076203&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
Wed Mar  2 13:04:06 2011
@@ -47,6 +47,7 @@ import org.apache.cxf.transport.jms.wsdl
 import org.apache.cxf.transport.jms.wsdl.PriorityType;
 import org.apache.cxf.transport.jms.wsdl.ReplyToNameType;
 import org.apache.cxf.transport.jms.wsdl.TimeToLiveType;
+import org.apache.cxf.transport.jms.wsdl.TopicReplyToNameType;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
 import org.springframework.jms.support.destination.JndiDestinationResolver;
 import org.springframework.jndi.JndiTemplate;
@@ -405,6 +406,13 @@ public class JMSOldConfigHolder {
                 endpoint.setReplyToName(replyToNameType.getValue());
             }
         }
+        
+        if (!endpoint.isSetTopicReplyToName()) {
+            TopicReplyToNameType topicReplyToNameType = getWSDLExtensor(ei, TopicReplyToNameType.class);
+            if (topicReplyToNameType != null) {
+                endpoint.setTopicReplyToName(topicReplyToNameType.getValue());
+            }
+        }
     }
 
     public <T> T getWSDLExtensor(EndpointInfo ei, Class<T> cls) {

Modified: cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xsd?rev=1076203&r1=1076202&r2=1076203&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xsd
(original)
+++ cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xsd
Wed Mar  2 13:04:06 2011
@@ -28,7 +28,7 @@
 	<xs:element name="priority" type="soapjms:priorityType" />
 	<xs:element name="timeToLive" type="soapjms:timeToLiveType" />
 	<xs:element name="replyToName" type="soapjms:replyToNameType" />
-
+    <xs:element name="topicReplyToName" type="soapjms:topicReplyToNameType" />
 
 	<!-- JMS specification for wsdl-->
 	<xs:complexType name="jndiConnectionFactoryNameType">
@@ -90,4 +90,11 @@
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
+	
+	<xs:complexType name="topicReplyToNameType">
+		<xs:simpleContent>
+			<xs:extension base="xs:string">
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
 </xs:schema>



Mime
View raw message