| Commit in servicemix/ws/jaxws/wspojo on MAIN | |||
| wsdl/Service-All.wsdl | +113 | -108 | 1.2 -> 1.3 |
| /WS-BaseNotification-1_2-Draft_01.wsdl | +25 | -1 | 1.2 -> 1.3 |
| build.xml | +1 | -1 | 1.2 -> 1.3 |
| +139 | -110 | ||
hacked the WSDL somewhat to get the SubscriptionManager working too
servicemix/ws/jaxws/wspojo/wsdl
diff -u -r1.2 -r1.3 --- Service-All.wsdl 23 Aug 2005 10:52:59 -0000 1.2 +++ Service-All.wsdl 23 Aug 2005 11:18:26 -0000 1.3 @@ -26,24 +26,24 @@
<xsd:include
schemaLocation="WS-BaseNotification-1_2-Draft_01.xsd" />
- <!-- - - <xsd:import
+ <!-- + + <xsd:import
namespace="http://schemas.xmlsoap.org/ws/2003/03/addressing"
schemaLocation="WS-Addressing-2003_03.xsd" />
- <xsd:import
+ <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" />
- - <xsd:import
+ + <xsd:import
namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd"
schemaLocation="WS-ResourceProperties-1_2-Draft_01.xsd" />
- <xsd:import
+ <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"
@@ -71,7 +71,7 @@
<soap:body use="literal" />
</wsdl:output>
<wsdl:fault name="ResourceUnknownFault">
- <soap:fault use="literal" name="ResourceUnknownFault"/>
+ <soap:fault use="literal" name="ResourceUnknownFault" />
</wsdl:fault>
<wsdl:fault name="SubscribeCreationFailedFault">
<soap:fault use="literal" name="SubscribeCreationFailedFault" />
@@ -90,7 +90,7 @@
<soap:body use="literal" />
</wsdl:output>
<wsdl:fault name="ResourceUnknownFault">
- <soap:fault use="literal" name="ResourceUnknownFault"/>
+ <soap:fault use="literal" name="ResourceUnknownFault" />
</wsdl:fault>
<wsdl:fault name="InvalidTopicExpressionFault">
<soap:fault use="literal" name="InvalidTopicExpressionFault" />
@@ -102,109 +102,117 @@
<soap:fault use="literal" name="NoCurrentMessageOnTopicFault" />
</wsdl:fault>
</wsdl:operation>
- <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"
+ <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 use="literal" name="ResourceUnknownFault" /> + </wsdl:fault> + <wsdl:fault name="InvalidResourcePropertyQNameFault"> + <soap:fault 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://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>
+ <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://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>
+ <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://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>
+ <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://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>
+ <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://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>
+ <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:binding> +
<wsdl:service name="NotificationConsumerService">
<wsdl:port name="SOAP" binding="tns:NotificationConsumerSOAP">
<soap:address location="http://www.example.org/" />
@@ -216,13 +224,10 @@
</wsdl:port> </wsdl:service>
- <!-- - - <wsdl:service name="SubscriptionManagerSOAP">
+ <wsdl:service name="SubscriptionManagerSOAP">
<wsdl:port name="Default" binding="tns:SubscriptionManagerSOAP">
- <soap:address location="http://www.example.org/" />
+ <soap:address location="http://www.example.org/" />
</wsdl:port>
- </wsdl:service> - -->
+ </wsdl:service>
</wsdl:definitions>
servicemix/ws/jaxws/wspojo/wsdl
diff -u -r1.2 -r1.3 --- WS-BaseNotification-1_2-Draft_01.wsdl 23 Aug 2005 10:51:18 -0000 1.2 +++ WS-BaseNotification-1_2-Draft_01.wsdl 23 Aug 2005 11:18:26 -0000 1.3 @@ -431,7 +431,13 @@
<wsdl:operation name="Subscribe">
<wsdl:input message="wsntw:SubscribeRequest"/>
<wsdl:output message="wsntw:SubscribeResponse"/>
+ + <!-- TODO changed namespace to avoid JAX-WS error! --> +<!-- + <wsdl:fault name="ResourceUnknownFault" message="wsntw:ResourceUnknownFault"/> +-->
<wsdl:fault name="ResourceUnknownFault" message="wsntw:ResourceUnknownFault"/>
+
<wsdl:fault name="SubscribeCreationFailedFault" message="wsntw:SubscribeCreationFailedFault"/>
<wsdl:fault name="TopicPathDialectUnknownFault" message="wsntw:TopicPathDialectUnknownFault"/>
</wsdl:operation>
@@ -457,18 +463,30 @@
message="wsrpw:GetResourcePropertyRequest"/>
<wsdl:output name="GetResourcePropertyResponse"
message="wsrpw:GetResourcePropertyResponse"/>
+ + <!-- TODO changed namespace to avoid JAX-WS error! --> +<!--
<wsdl:fault name="ResourceUnknownFault"
message="wsrpw:ResourceUnknownFault"/>
+--> + <wsdl:fault name="ResourceUnknownFault" message="wsntw:ResourceUnknownFault"/> +
<wsdl:fault name="InvalidResourcePropertyQNameFault"
message="wsrpw:InvalidResourcePropertyQNameFault"/>
</wsdl:operation>
-
+
<!-- === extends wsrlw:ImmediateResourceTermination ========== -->
<wsdl:operation name="Destroy">
<wsdl:input message="wsrlw:DestroyRequest"/>
<wsdl:output message="wsrlw:DestroyResponse"/>
+ + <!-- TODO changed namespace to avoid JAX-WS error! --> +<!--
<wsdl:fault name="ResourceUnknownFault"
message="wsrlw:ResourceUnknownFault"/>
+--> + <wsdl:fault name="ResourceUnknownFault" message="wsntw:ResourceUnknownFault"/> +
<wsdl:fault name="ResourceNotDestroyedFault"
message="wsrlw:ResourceNotDestroyedFault"/>
</wsdl:operation>
@@ -477,8 +495,14 @@
<wsdl:operation name="SetTerminationTime">
<wsdl:input message="wsrlw:SetTerminationTimeRequest"/>
<wsdl:output message="wsrlw:SetTerminationTimeResponse"/>
+ + <!-- TODO changed namespace to avoid JAX-WS error! --> +<!--
<wsdl:fault name="ResourceUnknownFault"
message="wsrlw:ResourceUnknownFault"/>
+--> + <wsdl:fault name="ResourceUnknownFault" message="wsntw:ResourceUnknownFault"/> +
<wsdl:fault name="UnableToSetTerminationTimeFault"
message="wsrlw:UnableToSetTerminationTimeFault"/>
<wsdl:fault name="TerminationTimeChangeRejectedFault"
servicemix/ws/jaxws/wspojo
diff -u -r1.2 -r1.3 --- build.xml 23 Aug 2005 10:52:59 -0000 1.2 +++ build.xml 23 Aug 2005 11:18:26 -0000 1.3 @@ -8,7 +8,7 @@
-->
<property name="wsdl.home" value="${basedir}/wsdl"/>
<property name="etc.home" value="${basedir}/etc"/>
- <property name="build.home" value="${basedir}/target"/>
+ <property name="build.home" value="${basedir}/build"/>
<property name="src.home" value="${build.home}/java"/>
