Author: ningjiang
Date: Wed Mar 2 12:39:01 2011
New Revision: 1076196
URL: http://svn.apache.org/viewvc?rev=1076196&view=rev
Log:
CXF-3368 Added topicReplyToNameType into the schema
Modified:
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xsd
Modified:
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java?rev=1076196&r1=1076195&r2=1076196&view=diff
==============================================================================
---
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
(original)
+++
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
Wed Mar 2 12:39:01 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/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xsd
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xsd?rev=1076196&r1=1076195&r2=1076196&view=diff
==============================================================================
---
cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xsd
(original)
+++
cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xsd
Wed Mar 2 12:39:01 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>
