You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/02/13 10:31:45 UTC
svn commit: r377326 [3/3] - in
/incubator/servicemix/trunk/servicemix-wsn2005/src:
main/java/org/apache/servicemix/wsn/
main/java/org/apache/servicemix/wsn/client/
main/java/org/apache/servicemix/wsn/component/
main/java/org/apache/servicemix/wsn/jbi/ ...
Added: incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/t-1.xsd
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/t-1.xsd?rev=377326&view=auto
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/t-1.xsd (added)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/t-1.xsd Mon Feb 13 01:31:41 2006
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
+
+OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
+
+Copyright (C) OASIS Open (2004-2005). All Rights Reserved.
+
+This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English.
+
+The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.
+
+This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+-->
+
+
+<xsd:schema
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:wstop = "http://docs.oasis-open.org/wsn/t-1"
+ targetNamespace = "http://docs.oasis-open.org/wsn/t-1"
+ elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+<!-- =============== utility type definitions ==================== -->
+ <xsd:complexType name="Documentation" mixed="true">
+ <xsd:sequence>
+ <xsd:any processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" namespace="##any"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="ExtensibleDocumented" abstract="true"
+ mixed="false">
+ <xsd:sequence>
+ <xsd:element name="documentation" type="wstop:Documentation"
+ minOccurs="0" />
+ </xsd:sequence>
+ <xsd:anyAttribute namespace="##other" processContents="lax" />
+</xsd:complexType>
+
+<xsd:complexType name="QueryExpressionType" mixed="true">
+ <xsd:sequence>
+ <xsd:any minOccurs="0" maxOccurs="1" processContents="lax" />
+ </xsd:sequence>
+ <xsd:attribute name="Dialect" type="xsd:anyURI" use="required"/>
+</xsd:complexType>
+
+<!-- ================== Topic-Namespace Related ================ -->
+ <xsd:complexType name="TopicNamespaceType">
+ <xsd:complexContent>
+ <xsd:extension base="wstop:ExtensibleDocumented">
+ <xsd:sequence>
+ <xsd:element name="Topic"
+ minOccurs="0" maxOccurs="unbounded">
+ <xsd:complexType>
+ <xsd:complexContent>
+ <xsd:extension base="wstop:TopicType">
+ <xsd:attribute name="parent" type="wstop:ConcreteTopicExpression" />
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:any namespace="##other"
+ minOccurs="0" maxOccurs="unbounded"
+ processContents="lax"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:NCName"/>
+ <xsd:attribute name="targetNamespace" type="xsd:anyURI"
+ use="required"/>
+ <xsd:attribute name="final" type="xsd:boolean"
+ default="false"/>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+
+ <xsd:element name="TopicNamespace" type="wstop:TopicNamespaceType">
+ <xsd:unique name="rootTopicUniqueness">
+ <xsd:selector xpath="wstop:Topic"/>
+ <xsd:field xpath="@name"/>
+ </xsd:unique>
+ </xsd:element>
+
+ <xsd:attribute name="topicNamespaceLocation" type="xsd:anyURI"/>
+
+
+
+<!-- ===================== Topic Related ========================= -->
+
+ <xsd:complexType name="TopicType">
+ <xsd:complexContent>
+ <xsd:extension base="wstop:ExtensibleDocumented">
+ <xsd:sequence>
+ <xsd:element name="MessagePattern"
+ type="wstop:QueryExpressionType"
+ minOccurs="0" maxOccurs="1" />
+ <xsd:element name="Topic" type="wstop:TopicType"
+ minOccurs="0" maxOccurs="unbounded">
+ <xsd:unique name="childTopicUniqueness">
+ <xsd:selector xpath="wstop:topic"/>
+ <xsd:field xpath="@name"/>
+ </xsd:unique>
+ </xsd:element>
+ <xsd:any namespace="##other" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:NCName"/>
+ <xsd:attribute name="messageTypes">
+ <xsd:simpleType>
+ <xsd:list itemType="xsd:QName"/>
+ </xsd:simpleType>
+ </xsd:attribute>
+ <xsd:attribute name="final" type="xsd:boolean"
+ default="false"/>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+
+<!-- ================ Topic Set Related =================== -->
+
+ <xsd:complexType name="TopicSetType">
+ <xsd:complexContent>
+ <xsd:extension base="wstop:ExtensibleDocumented">
+ <xsd:sequence>
+ <xsd:any namespace="##other"
+ minOccurs="0" maxOccurs="unbounded"
+ processContents="lax"/>
+ </xsd:sequence>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+
+ <xsd:element name="TopicSet" type="wstop:TopicSetType"/>
+<xsd:attribute name="topic" type="xsd:boolean" default="false"/>
+
+<!-- ================ Topic Expression Related =================== -->
+
+ <xsd:simpleType name="FullTopicExpression">
+ <xsd:restriction base="xsd:token">
+ <xsd:annotation>
+ <xsd:documentation>
+ TopicPathExpression ::= TopicPath ( '|' TopicPath )*
+ TopicPath ::= RootTopic ChildTopicExpression*
+ RootTopic ::= NamespacePrefix? ('//')? (NCName | '*')
+ NamespacePrefix ::= NCName ':'
+ ChildTopicExpression ::= '/' '/'? (QName | NCName | '*'| '.')
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:pattern value=
+ "([\i-[:]][\c-[:]]*:)?(//)?([\i-[:]][\c-[:]]*|\*)((/|//)(([\i-[:]][\c-[:]]*:)?[\i-[:]][\c-[:]]*|\*|[.]))*(\|([\i-[:]][\c-[:]]*:)?(//)?([\i-[:]][\c-[:]]*|\*)((/|//)(([\i-[:]][\c-[:]]*:)?[\i-[:]][\c-[:]]*|\*|[.]))*)*">
+ </xsd:pattern>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:simpleType name="ConcreteTopicExpression">
+ <xsd:restriction base="xsd:token">
+ <xsd:annotation>
+ <xsd:documentation>
+ The pattern allows strings matching the following EBNF:
+ ConcreteTopicPath ::= RootTopic ChildTopic*
+ RootTopic ::= QName
+ ChildTopic ::= '/' (QName | NCName)
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:pattern value=
+"(([\i-[:]][\c-[:]]*:)?[\i-[:]][\c-[:]]*)(/([\i-[:]][\c-[:]]*:)?[\i-[:]][\c-[:]]*)*" >
+ </xsd:pattern>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:simpleType name="SimpleTopicExpression">
+ <xsd:restriction base="xsd:QName">
+ <xsd:annotation>
+ <xsd:documentation>
+ The pattern allows strings matching the following EBNF:
+ RootTopic ::= QName
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+</xsd:schema>
\ No newline at end of file
Added: incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/ws-addr.xsd
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/ws-addr.xsd?rev=377326&view=auto
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/ws-addr.xsd (added)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/ws-addr.xsd Mon Feb 13 01:31:41 2006
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd">
+<!--
+ W3C XML Schema defined in the Web Services Addressing 1.0 specification
+ http://www.w3.org/TR/ws-addr-core
+
+ Copyright © 2005 World Wide Web Consortium,
+
+ (Massachusetts Institute of Technology, European Research Consortium for
+ Informatics and Mathematics, Keio University). All Rights Reserved. This
+ work is distributed under the W3C® Software License [1] in the hope that
+ it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+ $Id: ws-addr.xsd,v 1.3 2005/08/09 13:17:35 hugo Exp $
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.w3.org/2005/08/addressing" targetNamespace="http://www.w3.org/2005/08/addressing" blockDefault="#all" elementFormDefault="qualified" finalDefault="" attributeFormDefault="unqualified">
+
+ <!-- Constructs from the WS-Addressing Core -->
+
+ <xs:element name="EndpointReference" type="tns:EndpointReferenceType"/>
+ <xs:complexType name="EndpointReferenceType" mixed="false">
+ <xs:sequence>
+ <xs:element name="Address" type="tns:AttributedURIType"/>
+ <xs:element name="ReferenceParameters" type="tns:ReferenceParametersType" minOccurs="0"/>
+ <xs:element ref="tns:Metadata" minOccurs="0"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+
+ <xs:complexType name="ReferenceParametersType" mixed="false">
+ <xs:sequence>
+ <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+
+ <xs:element name="Metadata" type="tns:MetadataType"/>
+ <xs:complexType name="MetadataType" mixed="false">
+ <xs:sequence>
+ <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+
+ <xs:element name="MessageID" type="tns:AttributedURIType"/>
+ <xs:element name="RelatesTo" type="tns:RelatesToType"/>
+ <xs:complexType name="RelatesToType" mixed="false">
+ <xs:simpleContent>
+ <xs:extension base="xs:anyURI">
+ <xs:attribute name="RelationshipType" type="tns:RelationshipTypeOpenEnum" use="optional" default="http://www.w3.org/2005/08/addressing/reply"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:simpleType name="RelationshipTypeOpenEnum">
+ <xs:union memberTypes="tns:RelationshipType xs:anyURI"/>
+ </xs:simpleType>
+
+ <xs:simpleType name="RelationshipType">
+ <xs:restriction base="xs:anyURI">
+ <xs:enumeration value="http://www.w3.org/2005/08/addressing/reply"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:element name="ReplyTo" type="tns:EndpointReferenceType"/>
+ <xs:element name="From" type="tns:EndpointReferenceType"/>
+ <xs:element name="FaultTo" type="tns:EndpointReferenceType"/>
+ <xs:element name="To" type="tns:AttributedURIType"/>
+ <xs:element name="Action" type="tns:AttributedURIType"/>
+
+ <xs:complexType name="AttributedURIType" mixed="false">
+ <xs:simpleContent>
+ <xs:extension base="xs:anyURI">
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <!-- Constructs from the WS-Addressing SOAP binding -->
+
+ <xs:attribute name="IsReferenceParameter" type="xs:boolean"/>
+
+ <xs:simpleType name="FaultCodesOpenEnumType">
+ <xs:union memberTypes="tns:FaultCodesType xs:QName"/>
+ </xs:simpleType>
+
+ <xs:simpleType name="FaultCodesType">
+ <xs:restriction base="xs:QName">
+ <xs:enumeration value="tns:InvalidAddressingHeader"/>
+ <xs:enumeration value="tns:InvalidAddress"/>
+ <xs:enumeration value="tns:InvalidEPR"/>
+ <xs:enumeration value="tns:InvalidCardinality"/>
+ <xs:enumeration value="tns:MissingAddressInEPR"/>
+ <xs:enumeration value="tns:DuplicateMessageID"/>
+ <xs:enumeration value="tns:ActionMismatch"/>
+ <xs:enumeration value="tns:MessageAddressingHeaderRequired"/>
+ <xs:enumeration value="tns:DestinationUnreachable"/>
+ <xs:enumeration value="tns:ActionNotSupported"/>
+ <xs:enumeration value="tns:EndpointUnavailable"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:element name="RetryAfter" type="tns:AttributedUnsignedLongType"/>
+ <xs:complexType name="AttributedUnsignedLongType" mixed="false">
+ <xs:simpleContent>
+ <xs:extension base="xs:unsignedLong">
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="ProblemHeaderQName" type="tns:AttributedQNameType"/>
+ <xs:complexType name="AttributedQNameType" mixed="false">
+ <xs:simpleContent>
+ <xs:extension base="xs:QName">
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="ProblemHeader" type="tns:AttributedAnyType"/>
+ <xs:complexType name="AttributedAnyType" mixed="false">
+ <xs:sequence>
+ <xs:any namespace="##any" processContents="lax" minOccurs="1" maxOccurs="1"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+
+ <xs:element name="ProblemIRI" type="tns:AttributedURIType"/>
+
+ <xs:element name="ProblemAction" type="tns:ProblemActionType"/>
+ <xs:complexType name="ProblemActionType" mixed="false">
+ <xs:sequence>
+ <xs:element ref="tns:Action" minOccurs="0"/>
+ <xs:element name="SoapAction" minOccurs="0" type="xs:anyURI"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+
+</xs:schema>
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/wsn.wsdl
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/wsn.wsdl?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/wsn.wsdl (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/wsn.wsdl Mon Feb 13 01:31:41 2006
@@ -5,18 +5,22 @@
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:wsa="http://www.w3.org/2005/03/addressing"
- xmlns:wsn-br="http://docs.oasis-open.org/wsn/br-1"
- xmlns:wsn-brw="http://docs.oasis-open.org/wsn/brw-1"
- xmlns:wsn-b="http://docs.oasis-open.org/wsn/b-1"
- xmlns:wsn-bw="http://docs.oasis-open.org/wsn/bw-1"
- xmlns:wsrf-bf="http://docs.oasis-open.org/wsrf/bf-1"
- xmlns:wsrf-rw="http://docs.oasis-open.org/wsrf/rw-1"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
+ xmlns:wsn-br="http://docs.oasis-open.org/wsn/br-2"
+ xmlns:wsn-brw="http://docs.oasis-open.org/wsn/brw-2"
+ xmlns:wsn-b="http://docs.oasis-open.org/wsn/b-2"
+ xmlns:wsn-bw="http://docs.oasis-open.org/wsn/bw-2"
+ xmlns:wsrf-bf="http://docs.oasis-open.org/wsrf/bf-2"
+ xmlns:wsrf-rw="http://docs.oasis-open.org/wsrf/rw-2"
xmlns:tns="http://servicemix.apache.org/wsn/jaxws"
targetNamespace="http://servicemix.apache.org/wsn/jaxws">
- <wsdl:import namespace="http://docs.oasis-open.org/wsn/brw-1"
- location="brw-1.wsdl">
+ <wsdl:import namespace="http://docs.oasis-open.org/wsn/brw-2"
+ location="brw-2.wsdl">
+ </wsdl:import>
+
+ <wsdl:import namespace="http://docs.oasis-open.org/wsn/bw-2"
+ location="bw-2.wsdl">
</wsdl:import>
<wsdl:binding name="NotificationConsumerJBI"
@@ -73,10 +77,6 @@
<soap:fault use="literal"
name="InvalidMessageContentExpressionFault" />
</wsdl:fault>
- <wsdl:fault name="InvalidUseRawValueFault">
- <soap:fault use="literal"
- name="InvalidUseRawValueFault" />
- </wsdl:fault>
<wsdl:fault
name="UnacceptableInitialTerminationTimeFault">
<soap:fault use="literal"
@@ -163,10 +163,6 @@
<soap:fault use="literal"
name="InvalidMessageContentExpressionFault" />
</wsdl:fault>
- <wsdl:fault name="InvalidUseRawValueFault">
- <soap:fault use="literal"
- name="InvalidUseRawValueFault" />
- </wsdl:fault>
<wsdl:fault
name="UnacceptableInitialTerminationTimeFault">
<soap:fault use="literal"
@@ -233,6 +229,7 @@
name="PublisherRegistrationFailedFault" />
</wsdl:fault>
</wsdl:operation>
+ <!--
<wsdl:operation name="CreatePullPoint">
<wsdl:input name="CreatePullPointRequest">
<soap:body use="literal" />
@@ -249,6 +246,7 @@
name="PullNotificationNotSupportedFault" />
</wsdl:fault>
</wsdl:operation>
+ -->
</wsdl:binding>
<wsdl:service name="NotificationBrokerService">
<wsdl:port name="JBI" binding="tns:NotificationBrokerJBI">
@@ -375,11 +373,11 @@
type="wsn-brw:PublisherRegistrationManager">
<soap:binding transport="http://schemas.xmlsoap.org/soap/http"
style="document" />
- <wsdl:operation name="Destroy">
- <wsdl:input name="DestroyRequest">
+ <wsdl:operation name="DestroyRegistration">
+ <wsdl:input name="DestroyRegistrationRequest">
<soap:body use="literal" />
</wsdl:input>
- <wsdl:output name="DestroyResponse">
+ <wsdl:output name="DestroyRegistrationResponse">
<soap:body use="literal" />
</wsdl:output>
<wsdl:fault name="ResourceUnknownFault">
@@ -410,9 +408,9 @@
<wsdl:output name="CreatePullPointResponse">
<soap:body use="literal" />
</wsdl:output>
- <wsdl:fault name="UnableToCreatePullPoint">
+ <wsdl:fault name="UnableToCreatePullPointFault">
<soap:fault use="literal"
- name="UnableToCreatePullPoint" />
+ name="UnableToCreatePullPointFault" />
</wsdl:fault>
</wsdl:operation>
</wsdl:binding>
@@ -438,17 +436,22 @@
<soap:fault use="literal" name="ResourceUnknownFault" />
</wsdl:fault>
</wsdl:operation>
- <wsdl:operation name="Destroy">
+ <wsdl:operation name="DestroyPullPoint">
<wsdl:input name="DestroyRequest">
<soap:body use="literal" />
</wsdl:input>
<wsdl:output name="DestroyResponse">
<soap:body use="literal" />
</wsdl:output>
- <wsdl:fault name="UnableToDestroyPullPoint">
+ <wsdl:fault name="UnableToDestroyPullPointFault">
<soap:fault use="literal"
- name="UnableToDestroyPullPoint" />
+ name="UnableToDestroyPullPointFault" />
</wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="Notify">
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="PullPointService">
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/test/java/org/apache/servicemix/wsn/SubscriptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/test/java/org/apache/servicemix/wsn/SubscriptionTest.java?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/test/java/org/apache/servicemix/wsn/SubscriptionTest.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/test/java/org/apache/servicemix/wsn/SubscriptionTest.java Mon Feb 13 01:31:41 2006
@@ -25,8 +25,6 @@
import junit.framework.TestCase;
-import org.apache.servicemix.wsn.AbstractSubscription;
-import org.oasis_open.docs.wsn.b_1.Subscribe;
import org.apache.servicemix.wsn.jaxws.InvalidFilterFault;
import org.apache.servicemix.wsn.jaxws.InvalidProducerPropertiesExpressionFault;
import org.apache.servicemix.wsn.jaxws.PauseFailedFault;
@@ -34,6 +32,7 @@
import org.apache.servicemix.wsn.jaxws.SubscribeCreationFailedFault;
import org.apache.servicemix.wsn.jaxws.UnacceptableInitialTerminationTimeFault;
import org.apache.servicemix.wsn.jaxws.UnacceptableTerminationTimeFault;
+import org.oasis_open.docs.wsn.b_2.Subscribe;
public class SubscriptionTest extends TestCase {
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/test/java/org/apache/servicemix/wsn/component/WSNComponentTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/test/java/org/apache/servicemix/wsn/component/WSNComponentTest.java?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/test/java/org/apache/servicemix/wsn/component/WSNComponentTest.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/test/java/org/apache/servicemix/wsn/component/WSNComponentTest.java Mon Feb 13 01:31:41 2006
@@ -45,18 +45,19 @@
import org.apache.servicemix.tck.Receiver;
import org.apache.servicemix.tck.ReceiverComponent;
import org.apache.servicemix.wsn.client.AbstractWSAClient;
+import org.apache.servicemix.wsn.client.CreatePullPoint;
import org.apache.servicemix.wsn.client.NotificationBroker;
import org.apache.servicemix.wsn.client.Publisher;
import org.apache.servicemix.wsn.client.PullPoint;
import org.apache.servicemix.wsn.client.Subscription;
-import org.oasis_open.docs.wsn.b_1.NotificationMessageHolderType;
-import org.oasis_open.docs.wsn.b_1.Notify;
-import org.oasis_open.docs.wsn.b_1.Subscribe;
-import org.oasis_open.docs.wsn.b_1.SubscribeResponse;
-import org.oasis_open.docs.wsn.b_1.Unsubscribe;
-import org.oasis_open.docs.wsn.b_1.UnsubscribeResponse;
-import org.w3._2005._03.addressing.AttributedURIType;
-import org.w3._2005._03.addressing.EndpointReferenceType;
+import org.oasis_open.docs.wsn.b_2.NotificationMessageHolderType;
+import org.oasis_open.docs.wsn.b_2.Notify;
+import org.oasis_open.docs.wsn.b_2.Subscribe;
+import org.oasis_open.docs.wsn.b_2.SubscribeResponse;
+import org.oasis_open.docs.wsn.b_2.Unsubscribe;
+import org.oasis_open.docs.wsn.b_2.UnsubscribeResponse;
+import org.w3._2005._08.addressing.AttributedURIType;
+import org.w3._2005._08.addressing.EndpointReferenceType;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -69,6 +70,7 @@
private JBIContainer jbi;
private BrokerService jmsBroker;
private NotificationBroker wsnBroker;
+ private CreatePullPoint wsnCreatePullPoint;
private WSNComponent wsnComponent;
protected void setUp() throws Exception {
@@ -90,6 +92,7 @@
jbi.activateComponent(as);
wsnBroker = new NotificationBroker(jbi);
+ wsnCreatePullPoint = new CreatePullPoint(jbi);
}
protected void tearDown() throws Exception {
@@ -151,7 +154,7 @@
}
public void testUnsubscribe() throws Exception {
- PullPoint pullPoint = wsnBroker.createPullPoint();
+ PullPoint pullPoint = wsnCreatePullPoint.createPullPoint();
Subscription subscription = wsnBroker.subscribe(pullPoint.getEndpoint(), "myTopic", null);
wsnBroker.notify("myTopic", new Notify());
@@ -173,7 +176,7 @@
}
public void testPauseResume() throws Exception {
- PullPoint pullPoint = wsnBroker.createPullPoint();
+ PullPoint pullPoint = wsnCreatePullPoint.createPullPoint();
Subscription subscription = wsnBroker.subscribe(pullPoint.getEndpoint(), "myTopic", null);
wsnBroker.notify("myTopic", new Notify());
@@ -203,7 +206,7 @@
}
public void testPull() throws Exception {
- PullPoint pullPoint = wsnBroker.createPullPoint();
+ PullPoint pullPoint = wsnCreatePullPoint.createPullPoint();
wsnBroker.subscribe(pullPoint.getEndpoint(), "myTopic", null);
wsnBroker.notify("myTopic", new Notify());
@@ -219,8 +222,8 @@
}
public void testPullWithFilter() throws Exception {
- PullPoint pullPoint1 = wsnBroker.createPullPoint();
- PullPoint pullPoint2 = wsnBroker.createPullPoint();
+ PullPoint pullPoint1 = wsnCreatePullPoint.createPullPoint();
+ PullPoint pullPoint2 = wsnCreatePullPoint.createPullPoint();
wsnBroker.subscribe(pullPoint1.getEndpoint(), "myTopic", "@type = 'a'");
wsnBroker.subscribe(pullPoint2.getEndpoint(), "myTopic", "@type = 'b'");
@@ -257,7 +260,7 @@
Thread.sleep(50);
assertNull(publisherComponent.getSubscription());
- PullPoint pullPoint = wsnBroker.createPullPoint();
+ PullPoint pullPoint = wsnCreatePullPoint.createPullPoint();
Subscription subscription = wsnBroker.subscribe(pullPoint.getEndpoint(), "myTopic", null);
Thread.sleep(500);
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-abs-itt.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-abs-itt.xml?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-abs-itt.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-abs-itt.xml Mon Feb 13 01:31:41 2006
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<wsnt:Subscribe
- xmlns:wsnt="http://docs.oasis-open.org/wsn/b-1"
- xmlns:wsa="http://www.w3.org/2005/03/addressing"
+ xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
xmlns:ncex="http://www.consumer.org"
xmlns:npex="http://www.producer.org">
<wsnt:ConsumerReference>
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-empty-itt.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-empty-itt.xml?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-empty-itt.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-empty-itt.xml Mon Feb 13 01:31:41 2006
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<wsnt:Subscribe
- xmlns:wsnt="http://docs.oasis-open.org/wsn/b-1"
- xmlns:wsa="http://www.w3.org/2005/03/addressing"
+ xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
xmlns:ncex="http://www.consumer.org"
xmlns:npex="http://www.producer.org"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-epr.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-epr.xml?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-epr.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-epr.xml Mon Feb 13 01:31:41 2006
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<wsnt:Subscribe
- xmlns:wsnt="http://docs.oasis-open.org/wsn/b-1"
- xmlns:wsa="http://www.w3.org/2005/03/addressing"
+ xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
xmlns:ncex="http://www.consumer.org"
xmlns:npex="http://www.producer.org">
<wsnt:ConsumerReference>
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-nil-itt.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-nil-itt.xml?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-nil-itt.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-nil-itt.xml Mon Feb 13 01:31:41 2006
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<wsnt:Subscribe
- xmlns:wsnt="http://docs.oasis-open.org/wsn/b-1"
- xmlns:wsa="http://www.w3.org/2005/03/addressing"
+ xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
xmlns:ncex="http://www.consumer.org"
xmlns:npex="http://www.producer.org"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-no-itt.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-no-itt.xml?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-no-itt.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-no-itt.xml Mon Feb 13 01:31:41 2006
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<wsnt:Subscribe
- xmlns:wsnt="http://docs.oasis-open.org/wsn/b-1"
- xmlns:wsa="http://www.w3.org/2005/03/addressing"
+ xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
xmlns:ncex="http://www.consumer.org"
xmlns:npex="http://www.producer.org">
<wsnt:ConsumerReference>
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-no-topic.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-no-topic.xml?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-no-topic.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-no-topic.xml Mon Feb 13 01:31:41 2006
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<wsnt:Subscribe
- xmlns:wsnt="http://docs.oasis-open.org/wsn/b-1"
- xmlns:wsa="http://www.w3.org/2005/03/addressing"
+ xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
xmlns:ncex="http://www.consumer.org"
xmlns:npex="http://www.producer.org">
<wsnt:ConsumerReference>
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-pp.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-pp.xml?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-pp.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-pp.xml Mon Feb 13 01:31:41 2006
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<wsnt:Subscribe
- xmlns:wsnt="http://docs.oasis-open.org/wsn/b-1"
- xmlns:wsa="http://www.w3.org/2005/03/addressing"
+ xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
xmlns:ncex="http://www.consumer.org"
xmlns:npex="http://www.producer.org">
<wsnt:ConsumerReference>
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-raw.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-raw.xml?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-raw.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-raw.xml Mon Feb 13 01:31:41 2006
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<wsnt:Subscribe
- xmlns:wsnt="http://docs.oasis-open.org/wsn/b-1"
- xmlns:wsa="http://www.w3.org/2005/03/addressing"
+ xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
xmlns:ncex="http://www.consumer.org"
xmlns:npex="http://www.producer.org">
<wsnt:ConsumerReference>
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/pullpoint/pullpoint.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/pullpoint/pullpoint.xml?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/pullpoint/pullpoint.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/pullpoint/pullpoint.xml Mon Feb 13 01:31:41 2006
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<wsnt:CreatePullPoint xmlns:wsnt="http://docs.oasis-open.org/wsn/b-1"
+<wsnt:CreatePullPoint xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
xmlns:sm="http://servicemix.apache.org/wsn2005/1.0">
<sm:address>
http://www.consumer.org/service/endpoint
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/pullpoint/subscribe.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/pullpoint/subscribe.xml?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/pullpoint/subscribe.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/pullpoint/subscribe.xml Mon Feb 13 01:31:41 2006
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<wsnt:Subscribe
- xmlns:wsnt="http://docs.oasis-open.org/wsn/b-1"
- xmlns:wsa="http://www.w3.org/2005/03/addressing"
+ xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
xmlns:ncex="http://www.consumer.org"
xmlns:npex="http://www.producer.org">
<wsnt:ConsumerReference>
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/subscription/subscribe.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/subscription/subscribe.xml?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/subscription/subscribe.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/subscription/subscribe.xml Mon Feb 13 01:31:41 2006
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<wsnt:Subscribe
- xmlns:wsnt="http://docs.oasis-open.org/wsn/b-1"
- xmlns:wsa="http://www.w3.org/2005/03/addressing"
+ xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
xmlns:ncex="http://www.consumer.org"
xmlns:npex="http://www.producer.org">
<wsnt:ConsumerReference>