| Commit in servicemix/ws/jaxws/wspojo on MAIN | |||
| wsdl/Service-All.wsdl | +124 | -135 | 1.1 -> 1.2 |
| /Service-Consumer.wsdl | +2 | -2 | 1.1 -> 1.2 |
| build.xml | +12 | 1.1 -> 1.2 | |
| +138 | -137 | ||
a JAX-WS version of NotificationConsumer and NotificationProducer
servicemix/ws/jaxws/wspojo/wsdl
diff -u -r1.1 -r1.2 --- Service-All.wsdl 23 Aug 2005 09:56:26 -0000 1.1 +++ Service-All.wsdl 23 Aug 2005 10:52:59 -0000 1.2 @@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <wsdl:definitions name="Service-Consumer"
- targetNamespace="http://www.example.org/Service-Consumer/" - xmlns:tns="http://www.example.org/Service-Consumer/"
+ targetNamespace="http://servicemix.org/wspojo/notification/" + xmlns:tns="http://servicemix.org/wspojo/notification/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
@@ -26,10 +26,12 @@
<xsd:include
schemaLocation="WS-BaseNotification-1_2-Draft_01.xsd" />
+ <!-- +
<xsd:import
namespace="http://schemas.xmlsoap.org/ws/2003/03/addressing"
schemaLocation="WS-Addressing-2003_03.xsd" />
-
+
<xsd:import
namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd"
schemaLocation="WS-BaseFaults-1_2-Draft_01.xsd" />
@@ -40,6 +42,8 @@
<xsd:import
namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd"
schemaLocation="WS-ResourceLifetime-1_2-Draft_01.xsd" />
+ --> +
</xsd:schema> </wsdl:types> <wsdl:binding name="NotificationConsumerSOAP"
@@ -48,34 +52,18 @@
style="document" />
<wsdl:operation name="Notify">
<soap:operation />
- <wsdl:input></wsdl:input>
+ <wsdl:input> + <soap:body parts="Notify" use="literal" /> + </wsdl:input>
</wsdl:operation>
</wsdl:binding>
<wsdl:binding name="NotificationProducerSOAP"
type="wsntw:NotificationProducer">
<soap:binding transport="http://schemas.xmlsoap.org/soap/http"
style="document" />
- <wsdl:operation name="GetResourceProperty"> - <soap:operation - soapAction="http://www.example.org/Service-Consumer/GetResourceProperty" /> - <wsdl:input name="GetResourcePropertyRequest"> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output name="GetResourcePropertyResponse"> - <soap:body use="literal" /> - </wsdl:output> - <wsdl:fault name="ResourceUnknownFault"> - <soap:fault namespace="http://www.example.org/Service-Consumer/" - use="literal" name="ResourceUnknownFault" /> - </wsdl:fault> - <wsdl:fault name="InvalidResourcePropertyQNameFault"> - <soap:fault namespace="http://www.example.org/Service-Consumer/" - use="literal" name="InvalidResourcePropertyQNameFault" /> - </wsdl:fault> - </wsdl:operation>
<wsdl:operation name="Subscribe">
<soap:operation
- soapAction="http://www.example.org/Service-Consumer/Subscribe" />
+ soapAction="http://servicemix.org/wspojo/notification/Subscribe" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
@@ -83,21 +71,18 @@
<soap:body use="literal" />
</wsdl:output>
<wsdl:fault name="ResourceUnknownFault">
- <soap:fault namespace="http://www.example.org/Service-Consumer/" - use="literal" name="ResourceUnknownFault" />
+ <soap:fault use="literal" name="ResourceUnknownFault"/>
</wsdl:fault>
<wsdl:fault name="SubscribeCreationFailedFault">
- <soap:fault namespace="http://www.example.org/Service-Consumer/" - use="literal" name="SubscribeCreationFailedFault" />
+ <soap:fault use="literal" name="SubscribeCreationFailedFault" />
</wsdl:fault>
<wsdl:fault name="TopicPathDialectUnknownFault">
- <soap:fault namespace="http://www.example.org/Service-Consumer/" - use="literal" name="TopicPathDialectUnknownFault" />
+ <soap:fault use="literal" name="TopicPathDialectUnknownFault" />
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="GetCurrentMessage">
<soap:operation
- soapAction="http://www.example.org/Service-Consumer/GetCurrentMessage" />
+ soapAction="http://servicemix.org/wspojo/notification/GetCurrentMessage" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
@@ -105,135 +90,139 @@
<soap:body use="literal" />
</wsdl:output>
<wsdl:fault name="ResourceUnknownFault">
- <soap:fault namespace="http://www.example.org/Service-Consumer/" - use="literal" name="ResourceUnknownFault" />
+ <soap:fault use="literal" name="ResourceUnknownFault"/>
</wsdl:fault>
<wsdl:fault name="InvalidTopicExpressionFault">
- <soap:fault namespace="http://www.example.org/Service-Consumer/" - use="literal" name="InvalidTopicExpressionFault" />
+ <soap:fault use="literal" name="InvalidTopicExpressionFault" />
</wsdl:fault>
<wsdl:fault name="TopicNotSupportedFault">
- <soap:fault namespace="http://www.example.org/Service-Consumer/" - use="literal" name="TopicNotSupportedFault" />
+ <soap:fault use="literal" name="TopicNotSupportedFault" />
</wsdl:fault>
<wsdl:fault name="NoCurrentMessageOnTopicFault">
- <soap:fault namespace="http://www.example.org/Service-Consumer/" - use="literal" name="NoCurrentMessageOnTopicFault" />
+ <soap:fault use="literal" name="NoCurrentMessageOnTopicFault" />
</wsdl:fault>
</wsdl:operation>
- </wsdl:binding> - <wsdl:binding name="SubscriptionManagerSOAP"
+ <wsdl:operation name="GetResourceProperty"><soap:operation soapAction="http://servicemix.org/wspojo/notification/GetResourceProperty"/><wsdl:input name="GetResourcePropertyRequest"><soap:body use="literal"/></wsdl:input><wsdl:output name="GetResourcePropertyResponse"><soap:body use="literal"/></wsdl:output><wsdl:fault name="ResourceUnknownFault"><soap:fault namespace="http://servicemix.org/wspojo/notification/" use="literal" name="ResourceUnknownFault"/></wsdl:fault><wsdl:fault name="InvalidResourcePropertyQNameFault"><soap:fault namespace="http://servicemix.org/wspojo/notification/" use="literal" name="InvalidResourcePropertyQNameFault"/></wsdl:fault></wsdl:operation> + </wsdl:binding> + <!-- + <wsdl:binding name="SubscriptionManagerSOAP"
type="wsntw:SubscriptionManager">
<soap:binding transport="http://schemas.xmlsoap.org/soap/http"
- style="document" />
+ style="document" />
<wsdl:operation name="GetResourceProperty">
- <soap:operation - soapAction="http://www.example.org/Service-Consumer/GetResourceProperty" /> - <wsdl:input name="GetResourcePropertyRequest"> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output name="GetResourcePropertyResponse"> - <soap:body use="literal" /> - </wsdl:output> - <wsdl:fault name="ResourceUnknownFault"> - <soap:fault namespace="http://www.example.org/Service-Consumer/" - use="literal" name="ResourceUnknownFault" /> - </wsdl:fault> - <wsdl:fault name="InvalidResourcePropertyQNameFault"> - <soap:fault namespace="http://www.example.org/Service-Consumer/" - use="literal" name="InvalidResourcePropertyQNameFault" /> - </wsdl:fault>
+ <soap:operation + soapAction="http://servicemix.org/wspojo/notification/GetResourceProperty" /> + <wsdl:input name="GetResourcePropertyRequest"> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output name="GetResourcePropertyResponse"> + <soap:body use="literal" /> + </wsdl:output> + <wsdl:fault name="ResourceUnknownFault"> + <soap:fault + use="literal" name="ResourceUnknownFault" /> + </wsdl:fault> + <wsdl:fault name="InvalidResourcePropertyQNameFault"> + <soap:fault + use="literal" name="InvalidResourcePropertyQNameFault" /> + </wsdl:fault>
</wsdl:operation>
<wsdl:operation name="Destroy">
- <soap:operation - soapAction="http://www.example.org/Service-Consumer/Destroy" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - <wsdl:fault name="ResourceUnknownFault"> - <soap:fault namespace="http://www.example.org/Service-Consumer/" - use="literal" name="ResourceUnknownFault" /> - </wsdl:fault> - <wsdl:fault name="ResourceNotDestroyedFault"> - <soap:fault namespace="http://www.example.org/Service-Consumer/" - use="literal" name="ResourceNotDestroyedFault" /> - </wsdl:fault>
+ <soap:operation + soapAction="http://servicemix.org/wspojo/notification/Destroy" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + <wsdl:fault name="ResourceUnknownFault"> + <soap:fault + use="literal" name="ResourceUnknownFault" /> + </wsdl:fault> + <wsdl:fault name="ResourceNotDestroyedFault"> + <soap:fault + use="literal" name="ResourceNotDestroyedFault" /> + </wsdl:fault>
</wsdl:operation>
<wsdl:operation name="SetTerminationTime">
- <soap:operation - soapAction="http://www.example.org/Service-Consumer/SetTerminationTime" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - <wsdl:fault name="ResourceUnknownFault"> - <soap:fault namespace="http://www.example.org/Service-Consumer/" - use="literal" name="ResourceUnknownFault" /> - </wsdl:fault> - <wsdl:fault name="UnableToSetTerminationTimeFault"> - <soap:fault namespace="http://www.example.org/Service-Consumer/" - use="literal" name="UnableToSetTerminationTimeFault" /> - </wsdl:fault> - <wsdl:fault name="TerminationTimeChangeRejectedFault"> - <soap:fault namespace="http://www.example.org/Service-Consumer/" - use="literal" name="TerminationTimeChangeRejectedFault" /> - </wsdl:fault>
+ <soap:operation + soapAction="http://servicemix.org/wspojo/notification/SetTerminationTime" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + <wsdl:fault name="ResourceUnknownFault"> + <soap:fault + use="literal" name="ResourceUnknownFault" /> + </wsdl:fault> + <wsdl:fault name="UnableToSetTerminationTimeFault"> + <soap:fault + use="literal" name="UnableToSetTerminationTimeFault" /> + </wsdl:fault> + <wsdl:fault name="TerminationTimeChangeRejectedFault"> + <soap:fault + use="literal" name="TerminationTimeChangeRejectedFault" /> + </wsdl:fault>
</wsdl:operation>
<wsdl:operation name="PauseSubscription">
- <soap:operation - soapAction="http://www.example.org/Service-Consumer/PauseSubscription" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - <wsdl:fault name="ResourceUnknownFault"> - <soap:fault namespace="http://www.example.org/Service-Consumer/" - use="literal" name="ResourceUnknownFault" /> - </wsdl:fault> - <wsdl:fault name="PauseFailedFault"> - <soap:fault namespace="http://www.example.org/Service-Consumer/" - use="literal" name="PauseFailedFault" /> - </wsdl:fault>
+ <soap:operation + soapAction="http://servicemix.org/wspojo/notification/PauseSubscription" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + <wsdl:fault name="ResourceUnknownFault"> + <soap:fault + use="literal" name="ResourceUnknownFault" /> + </wsdl:fault> + <wsdl:fault name="PauseFailedFault"> + <soap:fault + use="literal" name="PauseFailedFault" /> + </wsdl:fault>
</wsdl:operation>
<wsdl:operation name="ResumeSubscription">
- <soap:operation - soapAction="http://www.example.org/Service-Consumer/ResumeSubscription" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - <wsdl:fault name="ResourceUnknownFault"> - <soap:fault namespace="http://www.example.org/Service-Consumer/" - use="literal" name="ResourceUnknownFault" /> - </wsdl:fault> - <wsdl:fault name="ResumeFailedFault"> - <soap:fault namespace="http://www.example.org/Service-Consumer/" - use="literal" name="ResumeFailedFault" /> - </wsdl:fault> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="NotificationConsumerSOAP"> - <wsdl:port name="Default" binding="tns:NotificationConsumerSOAP">
+ <soap:operation + soapAction="http://servicemix.org/wspojo/notification/ResumeSubscription" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + <wsdl:fault name="ResourceUnknownFault"> + <soap:fault + use="literal" name="ResourceUnknownFault" /> + </wsdl:fault> + <wsdl:fault name="ResumeFailedFault"> + <soap:fault + use="literal" name="ResumeFailedFault" /> + </wsdl:fault> + </wsdl:operation> + </wsdl:binding> + --> + <wsdl:service name="NotificationConsumerService"> + <wsdl:port name="SOAP" binding="tns:NotificationConsumerSOAP">
<soap:address location="http://www.example.org/" />
</wsdl:port>
</wsdl:service>
- <wsdl:service name="SubscriptionManagerSOAP"> - <wsdl:port name="Default" binding="tns:SubscriptionManagerSOAP">
+ <wsdl:service name="NotificationProducerService"> + <wsdl:port name="SOAP" binding="tns:NotificationProducerSOAP">
<soap:address location="http://www.example.org/" />
</wsdl:port>
</wsdl:service>
- <wsdl:service name="NotificationProducerSOAP"> - <wsdl:port name="Default" binding="tns:NotificationProducerSOAP"> - <soap:address location="http://www.example.org/" />
+ + <!-- + + <wsdl:service name="SubscriptionManagerSOAP"> + <wsdl:port name="Default" binding="tns:SubscriptionManagerSOAP"> + <soap:address location="http://www.example.org/" />
</wsdl:port>
- </wsdl:service>
+ </wsdl:service>
+ -->
+
</wsdl:definitions>
servicemix/ws/jaxws/wspojo/wsdl
diff -u -r1.1 -r1.2 --- Service-Consumer.wsdl 23 Aug 2005 09:56:26 -0000 1.1 +++ Service-Consumer.wsdl 23 Aug 2005 10:52:59 -0000 1.2 @@ -53,8 +53,8 @@
</wsdl:input>
</wsdl:operation>
</wsdl:binding>
- <wsdl:service name="NotificationConsumerSOAP"> - <wsdl:port name="Default" binding="tns:NotificationConsumerSOAP">
+ <wsdl:service name="NotificationConsumerService"> + <wsdl:port name="Consumer" binding="tns:NotificationConsumerSOAP">
<soap:address location="http://www.example.org/" />
</wsdl:port>
</wsdl:service>
servicemix/ws/jaxws/wspojo
diff -u -r1.1 -r1.2 --- build.xml 23 Aug 2005 09:56:31 -0000 1.1 +++ build.xml 23 Aug 2005 10:52:59 -0000 1.2 @@ -53,9 +53,21 @@
keep="${keep}"
sourceBase="${src.home}"
base="${build.classes.home}"
+ wsdlFile="${wsdl.home}/Service-All.wsdl">
+ <binding dir="${etc.home}" includes="${server.binding}"/>
+ </wsimport>
+ <!--
+ <wsimport
+ fork="true"
+ debug="${debug}"
+ verbose="${verbose}"
+ keep="${keep}"
+ sourceBase="${src.home}"
+ base="${build.classes.home}"
wsdlFile="${wsdl.home}/Service-Consumer.wsdl">
<binding dir="${etc.home}" includes="${server.binding}"/>
</wsimport>
+ -->
<!-- <wsimport
fork="true"
debug="${debug}"
