Author: gnodet
Date: Thu Mar 29 07:43:20 2007
New Revision: 523728
URL: http://svn.apache.org/viewvc?view=rev&rev=523728
Log:
SM-907: Upgrade to the latest version of WS-Notification 1.3
Modified:
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/pom.xml
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractPullPoint.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsPullPoint.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/resources/org/apache/servicemix/wsn/b-2.xsd
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/resources/org/apache/servicemix/wsn/br-2.xsd
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/resources/org/apache/servicemix/wsn/brw-2.wsdl
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/resources/org/apache/servicemix/wsn/bw-2.wsdl
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/resources/org/apache/servicemix/wsn/t-1.xsd
Modified:
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/pom.xml?view=diff&rev=523728&r1=523727&r2=523728
==============================================================================
---
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/pom.xml
(original)
+++
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/pom.xml
Thu Mar 29 07:43:20 2007
@@ -118,14 +118,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>jbi-maven-plugin</artifactId>
<configuration>
Modified:
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractPullPoint.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractPullPoint.java?view=diff&rev=523728&r1=523727&r2=523728
==============================================================================
---
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractPullPoint.java
(original)
+++
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractPullPoint.java
Thu Mar 29 07:43:20 2007
@@ -40,6 +40,7 @@
import org.apache.servicemix.wsn.jaxws.ResourceUnknownFault;
import org.apache.servicemix.wsn.jaxws.UnableToCreatePullPointFault;
import org.apache.servicemix.wsn.jaxws.UnableToDestroyPullPointFault;
+import org.apache.servicemix.wsn.jaxws.UnableToGetMessagesFault;
@WebService(endpointInterface = "org.apache.servicemix.wsn.PullPointConsumer")
public abstract class AbstractPullPoint extends AbstractEndpoint
@@ -81,7 +82,7 @@
public GetMessagesResponse getMessages(
@WebParam(name = "GetMessages", targetNamespace =
"http://docs.oasis-open.org/wsn/b-1";, partName = "GetMessagesRequest")
GetMessages getMessagesRequest)
- throws ResourceUnknownFault {
+ throws ResourceUnknownFault, UnableToGetMessagesFault {
log.debug("GetMessages");
BigInteger max = getMessagesRequest.getMaximumNumber();
@@ -103,7 +104,7 @@
public DestroyPullPointResponse destroyPullPoint(
@WebParam(name = "DestroyPullPoint", targetNamespace =
"http://docs.oasis-open.org/wsn/b-2";, partName = "DestroyPullPointRequest")
DestroyPullPoint destroyPullPointRequest)
- throws UnableToDestroyPullPointFault {
+ throws ResourceUnknownFault, UnableToDestroyPullPointFault {
log.debug("Destroy");
createPullPoint.destroyPullPoint(getAddress());
@@ -115,7 +116,7 @@
protected abstract void store(NotificationMessageHolderType
messageHolder);
- protected abstract List<NotificationMessageHolderType> getMessages(int
max) throws ResourceUnknownFault;
+ protected abstract List<NotificationMessageHolderType> getMessages(int
max) throws ResourceUnknownFault, UnableToGetMessagesFault;
protected void destroy() throws UnableToDestroyPullPointFault {
try {
Modified:
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsPullPoint.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsPullPoint.java?view=diff&rev=523728&r1=523727&r2=523728
==============================================================================
---
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsPullPoint.java
(original)
+++
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsPullPoint.java
Thu Mar 29 07:43:20 2007
@@ -36,9 +36,10 @@
import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.wsn.AbstractPullPoint;
import org.apache.servicemix.wsn.jaxws.ResourceUnknownFault;
+import org.apache.servicemix.wsn.jaxws.UnableToGetMessagesFault;
import org.oasis_open.docs.wsn.b_2.NotificationMessageHolderType;
import org.oasis_open.docs.wsn.b_2.Notify;
-import org.oasis_open.docs.wsrf.r_2.ResourceUnknownFaultType;
+import org.oasis_open.docs.wsn.b_2.UnableToGetMessagesFaultType;
public class JmsPullPoint extends AbstractPullPoint {
@@ -96,7 +97,7 @@
}
@Override
- protected synchronized List<NotificationMessageHolderType>
getMessages(int max) throws ResourceUnknownFault {
+ protected synchronized List<NotificationMessageHolderType>
getMessages(int max) throws ResourceUnknownFault, UnableToGetMessagesFault {
Session session = null;
try {
if (max == 0) {
@@ -126,12 +127,12 @@
session = null;
}
}
- ResourceUnknownFaultType fault = new
ResourceUnknownFaultType();
- throw new ResourceUnknownFault("Unable to retrieve
messages", fault, e);
+ UnableToGetMessagesFaultType fault = new
UnableToGetMessagesFaultType();
+ throw new UnableToGetMessagesFault("Unable to retrieve
messages", fault, e);
} catch (JAXBException e) {
log.info("Error retrieving messages", e);
- ResourceUnknownFaultType fault = new
ResourceUnknownFaultType();
- throw new ResourceUnknownFault("Unable to retrieve
messages", fault, e);
+ UnableToGetMessagesFaultType fault = new
UnableToGetMessagesFaultType();
+ throw new UnableToGetMessagesFault("Unable to retrieve
messages", fault, e);
}
}
Modified:
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/resources/org/apache/servicemix/wsn/b-2.xsd
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/resources/org/apache/servicemix/wsn/b-2.xsd?view=diff&rev=523728&r1=523727&r2=523728
==============================================================================
---
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/resources/org/apache/servicemix/wsn/b-2.xsd
(original)
+++
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/resources/org/apache/servicemix/wsn/b-2.xsd
Thu Mar 29 07:43:20 2007
@@ -5,7 +5,7 @@
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.
+Copyright (C) OASIS Open (2004-2006). 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.
@@ -21,7 +21,7 @@
xmlns:wsa="http://www.w3.org/2005/08/addressing";
xmlns:wsrf-bf="http://docs.oasis-open.org/wsrf/bf-2";
xmlns:wstop="http://docs.oasis-open.org/wsn/t-1";
-xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified" attributeFormDefault="unqualified">
<!-- ======================== Imports ============================ -->
@@ -366,7 +366,8 @@
<xsd:complexType>
<xsd:sequence>
<xsd:element name="MaximumNumber"
- type="xsd:nonNegativeInteger"/>
+ type="xsd:nonNegativeInteger"
+ minOccurs="0"/>
<xsd:any namespace="##other" processContents="lax"
minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
@@ -406,11 +407,21 @@
</xsd:complexType>
</xsd:element>
- <xsd:complexType name="UnableToDestroyPullPointFaultType">
+ <xsd:complexType name="UnableToGetMessagesFaultType">
<xsd:complexContent>
<xsd:extension base="wsrf-bf:BaseFaultType"/>
</xsd:complexContent>
</xsd:complexType>
+
+ <xsd:element name="UnableToGetMessagesFault"
+ type="wsnt:UnableToGetMessagesFaultType"/>
+
+<xsd:complexType name="UnableToDestroyPullPointFaultType">
+ <xsd:complexContent>
+ <xsd:extension base="wsrf-bf:BaseFaultType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+
<xsd:element name="UnableToDestroyPullPointFault"
type="wsnt:UnableToDestroyPullPointFaultType"/>
@@ -566,4 +577,4 @@
<xsd:element name="ResumeFailedFault"
type="wsnt:ResumeFailedFaultType"/>
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
Modified:
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/resources/org/apache/servicemix/wsn/br-2.xsd
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/resources/org/apache/servicemix/wsn/br-2.xsd?view=diff&rev=523728&r1=523727&r2=523728
==============================================================================
---
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/resources/org/apache/servicemix/wsn/br-2.xsd
(original)
+++
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/resources/org/apache/servicemix/wsn/br-2.xsd
Thu Mar 29 07:43:20 2007
@@ -4,7 +4,7 @@
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 (2005). All Rights Reserved.
+Copyright (C) OASIS Open (2004-2006). 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.
@@ -27,16 +27,16 @@
<!-- ======================== Imports ============================ -->
- <xsd:import namespace="http://www.w3.org/2005/08/addressing";
+ <xsd:import namespace="http://www.w3.org/2005/08/addressing";
schemaLocation="ws-addr.xsd"/>
- <xsd:import namespace="http://docs.oasis-open.org/wsrf/bf-2";
+ <xsd:import namespace="http://docs.oasis-open.org/wsrf/bf-2";
schemaLocation="bf-2.xsd"/>
- <xsd:import namespace="http://docs.oasis-open.org/wsn/b-2";
+ <xsd:import namespace="http://docs.oasis-open.org/wsn/b-2";
schemaLocation="b-2.xsd"/>
- <xsd:import namespace="http://docs.oasis-open.org/wsn/t-1";
+ <xsd:import namespace="http://docs.oasis-open.org/wsn/t-1";
schemaLocation="t-1.xsd"/>
<!-- ======== Resource Properties for NotificationBroker ========== -->
@@ -45,7 +45,7 @@
<!-- ====== Resource Properties for PublisherRegistration ========= -->
<xsd:element name="PublisherReference"
type="wsa:EndpointReferenceType"/>
- <xsd:element name="ConsumerReference"
+ <xsd:element name="ConsumerReference"
type="wsa:EndpointReferenceType"/>
<xsd:element name="Topic"
type="wsn-b:TopicExpressionType"/>
@@ -53,7 +53,7 @@
type="xsd:boolean"/>
<xsd:element name="CreationTime"
type="xsd:dateTime"/>
-<xsd:element name="NotificationBrokerRP">
+ <xsd:element name="NotificationBrokerRP">
<xsd:complexType>
<xsd:sequence>
<!-- From NotificationProducer -->
@@ -76,13 +76,6 @@
<xsd:element name="PublisherRegistrationRP">
<xsd:complexType>
<xsd:sequence>
- <!-- From WS-ResourceLifetime ScheduledResourceTermination -->
- <xsd:element ref="wsn-b:CurrentTime"
- minOccurs="0" maxOccurs="1" />
- <xsd:element ref="wsn-b:TerminationTime"
- minOccurs="1" maxOccurs="1" />
-
- <!-- PublisherRegistration specific -->
<xsd:element ref="wsn-br:PublisherReference"
minOccurs="0" maxOccurs="1" />
<xsd:element ref="wsn-br:Topic"
@@ -177,4 +170,4 @@
<xsd:element name="ResourceNotDestroyedFault"
type="wsn-br:ResourceNotDestroyedFaultType"/>
- </xsd:schema>
\ No newline at end of file
+ </xsd:schema>
Modified:
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/resources/org/apache/servicemix/wsn/brw-2.wsdl
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/resources/org/apache/servicemix/wsn/brw-2.wsdl?view=diff&rev=523728&r1=523727&r2=523728
==============================================================================
---
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/resources/org/apache/servicemix/wsn/brw-2.wsdl
(original)
+++
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/resources/org/apache/servicemix/wsn/brw-2.wsdl
Thu Mar 29 07:43:20 2007
@@ -4,7 +4,7 @@
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 (2005). All Rights Reserved.
+Copyright (C) OASIS Open (2004-2006). 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.
@@ -192,4 +192,4 @@
message="wsn-brw:ResourceNotDestroyedFault" />
</wsdl:operation>
</wsdl:portType>
-</wsdl:definitions>
\ No newline at end of file
+</wsdl:definitions>
Modified:
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/resources/org/apache/servicemix/wsn/bw-2.wsdl
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/resources/org/apache/servicemix/wsn/bw-2.wsdl?view=diff&rev=523728&r1=523727&r2=523728
==============================================================================
---
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/resources/org/apache/servicemix/wsn/bw-2.wsdl
(original)
+++
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/resources/org/apache/servicemix/wsn/bw-2.wsdl
Thu Mar 29 07:43:20 2007
@@ -5,7 +5,7 @@
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.
+Copyright (C) OASIS Open (2004-2006). 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.
@@ -157,6 +157,12 @@
element="wsnt:GetMessagesResponse"/>
</wsdl:message>
+ <wsdl:message name="UnableToGetMessagesFault">
+ <wsdl:part name="UnableToGetMessagesFault"
+ element="wsnt:UnableToGetMessagesFault"/>
+ </wsdl:message>
+
+
<!-- ========== PullPoint::DestroyPullPoint ===========
DestroyPullPoint()
returns: void
@@ -336,7 +342,9 @@
<wsdl:output name="GetMessagesResponse"
message="wsntw:GetMessagesResponse" />
<wsdl:fault name="ResourceUnknownFault"
- message="wsrf-rw:ResourceUnknownFault" />
+ message="wsrf-rw:ResourceUnknownFault" />
+ <wsdl:fault name="UnableToGetMessagesFault"
+ message="wsntw:UnableToGetMessagesFault" />
</wsdl:operation>
<wsdl:operation name="DestroyPullPoint">
@@ -344,6 +352,8 @@
message="wsntw:DestroyPullPointRequest" />
<wsdl:output name="DestroyPullPointResponse"
message="wsntw:DestroyPullPointResponse" />
+ <wsdl:fault name="ResourceUnknownFault"
+ message="wsrf-rw:ResourceUnknownFault"/>
<wsdl:fault name="UnableToDestroyPullPointFault"
message="wsntw:UnableToDestroyPullPointFault" />
</wsdl:operation>
@@ -435,4 +445,4 @@
message="wsntw:ResumeFailedFault" />
</wsdl:operation>
</wsdl:portType>
-</wsdl:definitions>
\ No newline at end of file
+</wsdl:definitions>
Modified:
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/resources/org/apache/servicemix/wsn/t-1.xsd
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/resources/org/apache/servicemix/wsn/t-1.xsd?view=diff&rev=523728&r1=523727&r2=523728
==============================================================================
---
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/resources/org/apache/servicemix/wsn/t-1.xsd
(original)
+++
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/resources/org/apache/servicemix/wsn/t-1.xsd
Thu Mar 29 07:43:20 2007
@@ -5,7 +5,7 @@
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.
+Copyright (C) OASIS Open (2004-2006). 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.
