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 [1/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/ ...
Author: gnodet
Date: Mon Feb 13 01:31:41 2006
New Revision: 377326
URL: http://svn.apache.org/viewcvs?rev=377326&view=rev
Log:
SM-303: Upgrade wsn2005 to Public Review Draft 02
Added:
incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractCreatePullPoint.java
incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/CreatePullPoint.java
incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsCreatePullPoint.java
incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/b-2.xsd
incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/bf-2.xsd
incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/br-2.xsd
incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/brw-2.wsdl
incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/bw-2.wsdl
incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/r-2.xsd
incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/rw-2.wsdl
incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/t-1.xsd
incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/ws-addr.xsd
Removed:
incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/b-1.xsd
incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/bf-1.xsd
incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/br-1.xsd
incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/brw-1.wsdl
incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/bw-1.wsdl
incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/r-1.xsd
incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/rw-1.wsdl
incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/wsa.xsd
Modified:
incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractEndpoint.java
incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractNotificationBroker.java
incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractPublisher.java
incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractPullPoint.java
incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractSubscription.java
incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/AbstractWSAClient.java
incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/NotificationBroker.java
incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/Publisher.java
incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/PullPoint.java
incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/Subscription.java
incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNDeployer.java
incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNEndpoint.java
incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNLifeCycle.java
incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jbi/JbiPublisher.java
incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jbi/JbiSubscription.java
incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsNotificationBroker.java
incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsPublisher.java
incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsPullPoint.java
incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsSubscription.java
incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsTopicExpressionConverter.java
incubator/servicemix/trunk/servicemix-wsn2005/src/main/wsdl/wsn.wsdl
incubator/servicemix/trunk/servicemix-wsn2005/src/test/java/org/apache/servicemix/wsn/SubscriptionTest.java
incubator/servicemix/trunk/servicemix-wsn2005/src/test/java/org/apache/servicemix/wsn/component/WSNComponentTest.java
incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-abs-itt.xml
incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-empty-itt.xml
incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-epr.xml
incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-nil-itt.xml
incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-no-itt.xml
incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-no-topic.xml
incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-pp.xml
incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-raw.xml
incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/pullpoint/pullpoint.xml
incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/pullpoint/subscribe.xml
incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/subscription/subscribe.xml
Added: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractCreatePullPoint.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractCreatePullPoint.java?rev=377326&view=auto
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractCreatePullPoint.java (added)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractCreatePullPoint.java Mon Feb 13 01:31:41 2006
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.servicemix.wsn;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+import org.apache.activemq.util.IdGenerator;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.servicemix.jbi.util.DOMUtil;
+import org.apache.servicemix.wsn.jaxws.CreatePullPoint;
+import org.apache.servicemix.wsn.jaxws.UnableToCreatePullPointFault;
+import org.apache.servicemix.wsn.jaxws.UnableToDestroyPullPointFault;
+import org.oasis_open.docs.wsn.b_2.CreatePullPointResponse;
+import org.oasis_open.docs.wsn.b_2.UnableToCreatePullPointFaultType;
+import org.w3c.dom.Element;
+
+@WebService(endpointInterface = "org.apache.servicemix.wsn.jaxws.CreatePullPoint")
+public abstract class AbstractCreatePullPoint extends AbstractEndpoint implements CreatePullPoint {
+
+ private static Log log = LogFactory.getLog(AbstractCreatePullPoint.class);
+
+ private IdGenerator idGenerator;
+
+ private Map<String, AbstractPullPoint> pullPoints;
+
+ public AbstractCreatePullPoint(String name) {
+ super(name);
+ idGenerator = new IdGenerator();
+ pullPoints = new ConcurrentHashMap<String, AbstractPullPoint>();
+ }
+
+ public void init() throws Exception {
+ register();
+ }
+
+ @Override
+ protected String createAddress() {
+ return "http://servicemix.org/wsnotification/CreatePullPoint/" + getName();
+ }
+
+ @WebMethod(operationName = "CreatePullPoint")
+ @WebResult(name = "CreatePullPointResponse", targetNamespace = "http://docs.oasis-open.org/wsn/b-2", partName = "CreatePullPointResponse")
+ public CreatePullPointResponse createPullPoint(
+ @WebParam(name = "CreatePullPoint", targetNamespace = "http://docs.oasis-open.org/wsn/b-2", partName = "CreatePullPointRequest")
+ org.oasis_open.docs.wsn.b_2.CreatePullPoint createPullPointRequest)
+ throws UnableToCreatePullPointFault {
+
+ log.debug("CreatePullEndpoint");
+ return handleCreatePullPoint(createPullPointRequest, null);
+ }
+
+ public CreatePullPointResponse handleCreatePullPoint(org.oasis_open.docs.wsn.b_2.CreatePullPoint createPullPointRequest, EndpointManager manager)
+ throws UnableToCreatePullPointFault {
+ AbstractPullPoint pullPoint = null;
+ boolean success = false;
+ try {
+ pullPoint = createPullPoint(idGenerator.generateSanitizedId());
+ for (Iterator it = createPullPointRequest.getAny().iterator(); it.hasNext();) {
+ Element el = (Element) it.next();
+ if ("address".equals(el.getLocalName())
+ && "http://servicemix.apache.org/wsn2005/1.0".equals(el.getNamespaceURI())) {
+ String address = DOMUtil.getElementText(el).trim();
+ pullPoint.setAddress(address);
+ }
+ }
+ pullPoint.setCreatePullPoint(this);
+ pullPoints.put(pullPoint.getAddress(), pullPoint);
+ pullPoint.create(createPullPointRequest);
+ if (manager != null) {
+ pullPoint.setManager(manager);
+ }
+ pullPoint.register();
+ CreatePullPointResponse response = new CreatePullPointResponse();
+ response.setPullPoint(createEndpointReference(pullPoint.getAddress()));
+ success = true;
+ return response;
+ } catch (EndpointRegistrationException e) {
+ UnableToCreatePullPointFaultType fault = new UnableToCreatePullPointFaultType();
+ throw new UnableToCreatePullPointFault("Unable to register new endpoint", fault, e);
+ } finally {
+ if (!success && pullPoint != null) {
+ pullPoints.remove(pullPoint.getAddress());
+ try {
+ pullPoint.destroy();
+ } catch (UnableToDestroyPullPointFault e) {
+ log.info("Error destroying pullPoint", e);
+ }
+ }
+ }
+ }
+
+ public void destroyPullPoint(String address) throws UnableToDestroyPullPointFault {
+ AbstractPullPoint pullPoint = pullPoints.remove(address);
+ if (pullPoint != null) {
+ pullPoint.destroy();
+ }
+ }
+
+ protected abstract AbstractPullPoint createPullPoint(String name);
+
+}
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractEndpoint.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractEndpoint.java?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractEndpoint.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractEndpoint.java Mon Feb 13 01:31:41 2006
@@ -15,6 +15,9 @@
*/
package org.apache.servicemix.wsn;
+import org.w3._2005._08.addressing.AttributedURIType;
+import org.w3._2005._08.addressing.EndpointReferenceType;
+
public abstract class AbstractEndpoint {
protected String name;
@@ -62,5 +65,13 @@
}
protected abstract String createAddress();
+
+ public static EndpointReferenceType createEndpointReference(String address) {
+ EndpointReferenceType epr = new EndpointReferenceType();
+ AttributedURIType addressUri = new AttributedURIType();
+ addressUri.setValue(address);
+ epr.setAddress(addressUri);
+ return epr;
+ }
}
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractNotificationBroker.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractNotificationBroker.java?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractNotificationBroker.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractNotificationBroker.java Mon Feb 13 01:31:41 2006
@@ -15,7 +15,6 @@
*/
package org.apache.servicemix.wsn;
-import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -28,55 +27,43 @@
import org.apache.activemq.util.IdGenerator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.oasis_open.docs.wsn.b_1.CreatePullPoint;
-import org.oasis_open.docs.wsn.b_1.CreatePullPointResponse;
-import org.oasis_open.docs.wsn.b_1.GetCurrentMessage;
-import org.oasis_open.docs.wsn.b_1.GetCurrentMessageResponse;
-import org.oasis_open.docs.wsn.b_1.NoCurrentMessageOnTopicFaultType;
-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.SubscribeCreationFailedFaultType;
-import org.oasis_open.docs.wsn.b_1.SubscribeResponse;
-import org.oasis_open.docs.wsn.b_1.UnableToCreatePullPointType;
-import org.oasis_open.docs.wsn.br_1.PublisherRegistrationFailedFaultType;
-import org.oasis_open.docs.wsn.br_1.RegisterPublisher;
-import org.oasis_open.docs.wsn.br_1.RegisterPublisherResponse;
-import org.apache.servicemix.jbi.util.DOMUtil;
import org.apache.servicemix.wsn.jaxws.InvalidFilterFault;
import org.apache.servicemix.wsn.jaxws.InvalidMessageContentExpressionFault;
import org.apache.servicemix.wsn.jaxws.InvalidProducerPropertiesExpressionFault;
import org.apache.servicemix.wsn.jaxws.InvalidTopicExpressionFault;
-import org.apache.servicemix.wsn.jaxws.InvalidUseRawValueFault;
import org.apache.servicemix.wsn.jaxws.MultipleTopicsSpecifiedFault;
import org.apache.servicemix.wsn.jaxws.NoCurrentMessageOnTopicFault;
import org.apache.servicemix.wsn.jaxws.NotificationBroker;
-import org.apache.servicemix.wsn.jaxws.NotificationConsumer;
import org.apache.servicemix.wsn.jaxws.PublisherRegistrationFailedFault;
import org.apache.servicemix.wsn.jaxws.PublisherRegistrationRejectedFault;
-import org.apache.servicemix.wsn.jaxws.PullNotificationNotSupportedFault;
import org.apache.servicemix.wsn.jaxws.ResourceNotDestroyedFault;
import org.apache.servicemix.wsn.jaxws.ResourceUnknownFault;
import org.apache.servicemix.wsn.jaxws.SubscribeCreationFailedFault;
import org.apache.servicemix.wsn.jaxws.TopicExpressionDialectUnknownFault;
import org.apache.servicemix.wsn.jaxws.TopicNotSupportedFault;
-import org.apache.servicemix.wsn.jaxws.UnableToCreatePullPoint;
-import org.apache.servicemix.wsn.jaxws.UnableToDestroyPullPoint;
import org.apache.servicemix.wsn.jaxws.UnableToDestroySubscriptionFault;
import org.apache.servicemix.wsn.jaxws.UnacceptableInitialTerminationTimeFault;
-import org.w3._2005._03.addressing.AttributedURIType;
-import org.w3._2005._03.addressing.EndpointReferenceType;
-import org.w3c.dom.Element;
+import org.oasis_open.docs.wsn.b_2.GetCurrentMessage;
+import org.oasis_open.docs.wsn.b_2.GetCurrentMessageResponse;
+import org.oasis_open.docs.wsn.b_2.NoCurrentMessageOnTopicFaultType;
+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.SubscribeCreationFailedFaultType;
+import org.oasis_open.docs.wsn.b_2.SubscribeResponse;
+import org.oasis_open.docs.wsn.br_2.PublisherRegistrationFailedFaultType;
+import org.oasis_open.docs.wsn.br_2.RegisterPublisher;
+import org.oasis_open.docs.wsn.br_2.RegisterPublisherResponse;
+import org.w3._2005._08.addressing.EndpointReferenceType;
@WebService(endpointInterface = "org.apache.servicemix.wsn.jaxws.NotificationBroker")
-public abstract class AbstractNotificationBroker extends AbstractEndpoint implements NotificationBroker, NotificationConsumer {
+public abstract class AbstractNotificationBroker extends AbstractEndpoint implements NotificationBroker {
- private static Log log = LogFactory.getLog(AbstractPullPoint.class);
+ private static Log log = LogFactory.getLog(AbstractNotificationBroker.class);
private IdGenerator idGenerator;
private AbstractPublisher anonymousPublisher;
private Map<String,AbstractPublisher> publishers;
- private Map<String,AbstractPullPoint> pullPoints;
private Map<String,AbstractSubscription> subscriptions;
public AbstractNotificationBroker(String name) {
@@ -84,7 +71,6 @@
idGenerator = new IdGenerator();
subscriptions = new ConcurrentHashMap<String,AbstractSubscription>();
publishers = new ConcurrentHashMap<String, AbstractPublisher>();
- pullPoints = new ConcurrentHashMap<String, AbstractPullPoint>();
}
public void init() throws Exception {
@@ -156,14 +142,14 @@
public SubscribeResponse subscribe(
@WebParam(name = "Subscribe", targetNamespace = "http://docs.oasis-open.org/wsn/b-1", partName = "SubscribeRequest")
Subscribe subscribeRequest)
- throws InvalidFilterFault, InvalidMessageContentExpressionFault, InvalidProducerPropertiesExpressionFault, InvalidTopicExpressionFault, InvalidUseRawValueFault, ResourceUnknownFault, SubscribeCreationFailedFault, TopicExpressionDialectUnknownFault, TopicNotSupportedFault, UnacceptableInitialTerminationTimeFault {
+ throws InvalidFilterFault, InvalidMessageContentExpressionFault, InvalidProducerPropertiesExpressionFault, InvalidTopicExpressionFault, ResourceUnknownFault, SubscribeCreationFailedFault, TopicExpressionDialectUnknownFault, TopicNotSupportedFault, UnacceptableInitialTerminationTimeFault {
log.debug("Subscribe");
return handleSubscribe(subscribeRequest, null);
}
public SubscribeResponse handleSubscribe(Subscribe subscribeRequest,
- EndpointManager manager) throws InvalidFilterFault, InvalidMessageContentExpressionFault, InvalidProducerPropertiesExpressionFault, InvalidTopicExpressionFault, InvalidUseRawValueFault, SubscribeCreationFailedFault, TopicExpressionDialectUnknownFault, TopicNotSupportedFault, UnacceptableInitialTerminationTimeFault {
+ EndpointManager manager) throws InvalidFilterFault, InvalidMessageContentExpressionFault, InvalidProducerPropertiesExpressionFault, InvalidTopicExpressionFault, SubscribeCreationFailedFault, TopicExpressionDialectUnknownFault, TopicNotSupportedFault, UnacceptableInitialTerminationTimeFault {
AbstractSubscription subscription = null;
boolean success = false;
try {
@@ -283,85 +269,7 @@
}
}
- /**
- *
- * @param createPullPointRequest
- * @return
- * returns org.oasis_open.docs.wsn.b_1.CreatePullPointResponse
- * @throws UnableToCreatePullPoint
- * @throws PullNotificationNotSupportedFault
- */
- @WebMethod(operationName = "CreatePullPoint")
- @WebResult(name = "CreatePullPointResponse", targetNamespace = "http://docs.oasis-open.org/wsn/b-1", partName = "CreatePullPointResponse")
- public CreatePullPointResponse createPullPoint(
- @WebParam(name = "CreatePullPoint", targetNamespace = "http://docs.oasis-open.org/wsn/b-1", partName = "CreatePullPointRequest")
- CreatePullPoint createPullPointRequest)
- throws PullNotificationNotSupportedFault, UnableToCreatePullPoint {
-
- log.debug("CreatePullEndpoint");
- return handleCreatePullPoint(createPullPointRequest, null);
- }
-
- public CreatePullPointResponse handleCreatePullPoint(
- CreatePullPoint createPullPointRequest,
- EndpointManager manager)
- throws PullNotificationNotSupportedFault, UnableToCreatePullPoint {
- AbstractPullPoint pullPoint = null;
- boolean success = false;
- try {
- pullPoint = createPullPoint(idGenerator.generateSanitizedId());
- for (Iterator it = createPullPointRequest.getAny().iterator(); it.hasNext();) {
- Element el = (Element) it.next();
- if ("address".equals(el.getLocalName()) &&
- "http://servicemix.apache.org/wsn2005/1.0".equals(el.getNamespaceURI())) {
- String address = DOMUtil.getElementText(el).trim();
- pullPoint.setAddress(address);
- }
- }
- pullPoint.setBroker(this);
- pullPoints.put(pullPoint.getAddress(), pullPoint);
- pullPoint.create(createPullPointRequest);
- if (manager != null) {
- pullPoint.setManager(manager);
- }
- pullPoint.register();
- CreatePullPointResponse response = new CreatePullPointResponse();
- response.setPullPoint(createEndpointReference(pullPoint.getAddress()));
- success = true;
- return response;
- } catch (EndpointRegistrationException e) {
- UnableToCreatePullPointType fault = new UnableToCreatePullPointType();
- throw new UnableToCreatePullPoint("Unable to register new endpoint", fault, e);
- } finally {
- if (!success && pullPoint != null) {
- pullPoints.remove(pullPoint.getAddress());
- try {
- pullPoint.destroy();
- } catch (UnableToDestroyPullPoint e) {
- log.info("Error destroying pullPoint", e);
- }
- }
- }
- }
-
- public void destroyPullPoint(String address) throws UnableToDestroyPullPoint {
- AbstractPullPoint pullPoint = pullPoints.remove(address);
- if (pullPoint != null) {
- pullPoint.destroy();
- }
- }
-
- protected EndpointReferenceType createEndpointReference(String address) {
- EndpointReferenceType epr = new EndpointReferenceType();
- AttributedURIType addressUri = new AttributedURIType();
- addressUri.setValue(address);
- epr.setAddress(addressUri);
- return epr;
- }
-
protected abstract AbstractPublisher createPublisher(String name);
-
- protected abstract AbstractPullPoint createPullPoint(String name);
protected abstract AbstractSubscription createSubcription(String name);
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractPublisher.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractPublisher.java?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractPublisher.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractPublisher.java Mon Feb 13 01:31:41 2006
@@ -22,14 +22,14 @@
import javax.jws.WebResult;
import javax.jws.WebService;
-import org.oasis_open.docs.wsn.b_1.InvalidTopicExpressionFaultType;
-import org.oasis_open.docs.wsn.b_1.NotificationMessageHolderType;
-import org.oasis_open.docs.wsn.b_1.TopicExpressionType;
-import org.oasis_open.docs.wsn.br_1.Destroy;
-import org.oasis_open.docs.wsn.br_1.DestroyResponse;
-import org.oasis_open.docs.wsn.br_1.PublisherRegistrationFailedFaultType;
-import org.oasis_open.docs.wsn.br_1.RegisterPublisher;
-import org.oasis_open.docs.wsn.br_1.ResourceNotDestroyedFaultType;
+import org.oasis_open.docs.wsn.b_2.InvalidTopicExpressionFaultType;
+import org.oasis_open.docs.wsn.b_2.NotificationMessageHolderType;
+import org.oasis_open.docs.wsn.b_2.TopicExpressionType;
+import org.oasis_open.docs.wsn.br_2.DestroyRegistration;
+import org.oasis_open.docs.wsn.br_2.DestroyRegistrationResponse;
+import org.oasis_open.docs.wsn.br_2.PublisherRegistrationFailedFaultType;
+import org.oasis_open.docs.wsn.br_2.RegisterPublisher;
+import org.oasis_open.docs.wsn.br_2.ResourceNotDestroyedFaultType;
import org.apache.servicemix.wsn.jaxws.InvalidTopicExpressionFault;
import org.apache.servicemix.wsn.jaxws.PublisherRegistrationFailedFault;
import org.apache.servicemix.wsn.jaxws.PublisherRegistrationManager;
@@ -37,7 +37,7 @@
import org.apache.servicemix.wsn.jaxws.ResourceNotDestroyedFault;
import org.apache.servicemix.wsn.jaxws.ResourceUnknownFault;
import org.apache.servicemix.wsn.jaxws.TopicNotSupportedFault;
-import org.w3._2005._03.addressing.EndpointReferenceType;
+import org.w3._2005._08.addressing.EndpointReferenceType;
@WebService(endpointInterface = "org.apache.servicemix.wsn.jaxws.PublisherRegistrationManager")
public abstract class AbstractPublisher extends AbstractEndpoint
@@ -59,15 +59,15 @@
* @throws ResourceNotDestroyedFault
* @throws ResourceUnknownFault
*/
- @WebMethod(operationName = "Destroy")
- @WebResult(name = "DestroyResponse", targetNamespace = "http://docs.oasis-open.org/wsn/br-1", partName = "DestroyResponse")
- public DestroyResponse destroy(
- @WebParam(name = "Destroy", targetNamespace = "http://docs.oasis-open.org/wsn/br-1", partName = "DestroyRequest")
- Destroy destroyRequest)
+ @WebMethod(operationName = "DestroyRegistration")
+ @WebResult(name = "DestroyRegistrationResponse", targetNamespace = "http://docs.oasis-open.org/wsn/br-2", partName = "DestroyRegistrationResponse")
+ public DestroyRegistrationResponse destroyRegistration(
+ @WebParam(name = "DestroyRegistration", targetNamespace = "http://docs.oasis-open.org/wsn/br-2", partName = "DestroyRegistrationRequest")
+ DestroyRegistration destroyRegistrationRequest)
throws ResourceNotDestroyedFault, ResourceUnknownFault {
destroy();
- return new DestroyResponse();
+ return new DestroyRegistrationResponse();
}
public abstract void notify(NotificationMessageHolderType messageHolder);
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractPullPoint.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractPullPoint.java?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractPullPoint.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractPullPoint.java Mon Feb 13 01:31:41 2006
@@ -26,19 +26,19 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.oasis_open.docs.wsn.b_1.CreatePullPoint;
-import org.oasis_open.docs.wsn.b_1.Destroy;
-import org.oasis_open.docs.wsn.b_1.DestroyResponse;
-import org.oasis_open.docs.wsn.b_1.GetMessages;
-import org.oasis_open.docs.wsn.b_1.GetMessagesResponse;
-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.UnableToDestroyPullPointType;
+import org.oasis_open.docs.wsn.b_2.CreatePullPoint;
+import org.oasis_open.docs.wsn.b_2.DestroyPullPoint;
+import org.oasis_open.docs.wsn.b_2.DestroyPullPointResponse;
+import org.oasis_open.docs.wsn.b_2.GetMessages;
+import org.oasis_open.docs.wsn.b_2.GetMessagesResponse;
+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.UnableToDestroyPullPointFaultType;
import org.apache.servicemix.wsn.jaxws.NotificationConsumer;
import org.apache.servicemix.wsn.jaxws.PullPoint;
import org.apache.servicemix.wsn.jaxws.ResourceUnknownFault;
-import org.apache.servicemix.wsn.jaxws.UnableToCreatePullPoint;
-import org.apache.servicemix.wsn.jaxws.UnableToDestroyPullPoint;
+import org.apache.servicemix.wsn.jaxws.UnableToCreatePullPointFault;
+import org.apache.servicemix.wsn.jaxws.UnableToDestroyPullPointFault;
@WebService(endpointInterface = "org.apache.servicemix.wsn.PullPointConsumer")
public abstract class AbstractPullPoint extends AbstractEndpoint
@@ -46,7 +46,7 @@
private static Log log = LogFactory.getLog(AbstractPullPoint.class);
- protected AbstractNotificationBroker broker;
+ protected AbstractCreatePullPoint createPullPoint;
public AbstractPullPoint(String name) {
super(name);
@@ -97,31 +97,31 @@
* returns org.oasis_open.docs.wsn.b_1.DestroyResponse
* @throws UnableToDestroyPullPoint
*/
- @WebMethod(operationName = "Destroy")
- @WebResult(name = "DestroyResponse", targetNamespace = "http://docs.oasis-open.org/wsn/b-1", partName = "DestroyResponse")
- public DestroyResponse destroy(
- @WebParam(name = "Destroy", targetNamespace = "http://docs.oasis-open.org/wsn/b-1", partName = "DestroyRequest")
- Destroy destroyRequest)
- throws UnableToDestroyPullPoint {
+ @WebMethod(operationName = "DestroyPullPoint")
+ @WebResult(name = "DestroyPullPointResponse", targetNamespace = "http://docs.oasis-open.org/wsn/b-2", partName = "DestroyPullPointResponse")
+ public DestroyPullPointResponse destroyPullPoint(
+ @WebParam(name = "DestroyPullPoint", targetNamespace = "http://docs.oasis-open.org/wsn/b-2", partName = "DestroyPullPointRequest")
+ DestroyPullPoint destroyPullPointRequest)
+ throws UnableToDestroyPullPointFault {
log.debug("Destroy");
- broker.destroyPullPoint(getAddress());
- return new DestroyResponse();
+ createPullPoint.destroyPullPoint(getAddress());
+ return new DestroyPullPointResponse();
}
- public void create(CreatePullPoint createPullPointRequest) throws UnableToCreatePullPoint {
+ public void create(CreatePullPoint createPullPointRequest) throws UnableToCreatePullPointFault {
}
protected abstract void store(NotificationMessageHolderType messageHolder);
protected abstract List<NotificationMessageHolderType> getMessages(int max) throws ResourceUnknownFault;
- protected void destroy() throws UnableToDestroyPullPoint {
+ protected void destroy() throws UnableToDestroyPullPointFault {
try {
unregister();
} catch (EndpointRegistrationException e) {
- UnableToDestroyPullPointType fault = new UnableToDestroyPullPointType();
- throw new UnableToDestroyPullPoint("Error unregistering endpoint", fault, e);
+ UnableToDestroyPullPointFaultType fault = new UnableToDestroyPullPointFaultType();
+ throw new UnableToDestroyPullPointFault("Error unregistering endpoint", fault, e);
}
}
@@ -129,11 +129,11 @@
return "http://servicemix.org/wsnotification/PullPoint/" + getName();
}
- public AbstractNotificationBroker getBroker() {
- return broker;
+ public AbstractCreatePullPoint getCreatePullPoint() {
+ return createPullPoint;
}
- public void setBroker(AbstractNotificationBroker broker) {
- this.broker = broker;
+ public void setCreatePullPoint(AbstractCreatePullPoint createPullPoint) {
+ this.createPullPoint = createPullPoint;
}
}
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractSubscription.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractSubscription.java?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractSubscription.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractSubscription.java Mon Feb 13 01:31:41 2006
@@ -29,31 +29,30 @@
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.namespace.QName;
-import org.oasis_open.docs.wsn.b_1.InvalidFilterFaultType;
-import org.oasis_open.docs.wsn.b_1.InvalidMessageContentExpressionFaultType;
-import org.oasis_open.docs.wsn.b_1.InvalidProducerPropertiesExpressionFaultType;
-import org.oasis_open.docs.wsn.b_1.InvalidTopicExpressionFaultType;
-import org.oasis_open.docs.wsn.b_1.PauseSubscription;
-import org.oasis_open.docs.wsn.b_1.PauseSubscriptionResponse;
-import org.oasis_open.docs.wsn.b_1.QueryExpressionType;
-import org.oasis_open.docs.wsn.b_1.Renew;
-import org.oasis_open.docs.wsn.b_1.RenewResponse;
-import org.oasis_open.docs.wsn.b_1.ResumeSubscription;
-import org.oasis_open.docs.wsn.b_1.ResumeSubscriptionResponse;
-import org.oasis_open.docs.wsn.b_1.Subscribe;
-import org.oasis_open.docs.wsn.b_1.SubscribeCreationFailedFaultType;
-import org.oasis_open.docs.wsn.b_1.TopicExpressionType;
-import org.oasis_open.docs.wsn.b_1.UnableToDestroySubscriptionFaultType;
-import org.oasis_open.docs.wsn.b_1.UnacceptableInitialTerminationTimeFaultType;
-import org.oasis_open.docs.wsn.b_1.UnacceptableTerminationTimeFaultType;
-import org.oasis_open.docs.wsn.b_1.Unsubscribe;
-import org.oasis_open.docs.wsn.b_1.UnsubscribeResponse;
-import org.oasis_open.docs.wsn.b_1.UseRaw;
+import org.oasis_open.docs.wsn.b_2.InvalidFilterFaultType;
+import org.oasis_open.docs.wsn.b_2.InvalidMessageContentExpressionFaultType;
+import org.oasis_open.docs.wsn.b_2.InvalidProducerPropertiesExpressionFaultType;
+import org.oasis_open.docs.wsn.b_2.InvalidTopicExpressionFaultType;
+import org.oasis_open.docs.wsn.b_2.PauseSubscription;
+import org.oasis_open.docs.wsn.b_2.PauseSubscriptionResponse;
+import org.oasis_open.docs.wsn.b_2.QueryExpressionType;
+import org.oasis_open.docs.wsn.b_2.Renew;
+import org.oasis_open.docs.wsn.b_2.RenewResponse;
+import org.oasis_open.docs.wsn.b_2.ResumeSubscription;
+import org.oasis_open.docs.wsn.b_2.ResumeSubscriptionResponse;
+import org.oasis_open.docs.wsn.b_2.Subscribe;
+import org.oasis_open.docs.wsn.b_2.SubscribeCreationFailedFaultType;
+import org.oasis_open.docs.wsn.b_2.TopicExpressionType;
+import org.oasis_open.docs.wsn.b_2.UnableToDestroySubscriptionFaultType;
+import org.oasis_open.docs.wsn.b_2.UnacceptableInitialTerminationTimeFaultType;
+import org.oasis_open.docs.wsn.b_2.UnacceptableTerminationTimeFaultType;
+import org.oasis_open.docs.wsn.b_2.Unsubscribe;
+import org.oasis_open.docs.wsn.b_2.UnsubscribeResponse;
+import org.oasis_open.docs.wsn.b_2.UseRaw;
import org.apache.servicemix.wsn.jaxws.InvalidFilterFault;
import org.apache.servicemix.wsn.jaxws.InvalidMessageContentExpressionFault;
import org.apache.servicemix.wsn.jaxws.InvalidProducerPropertiesExpressionFault;
import org.apache.servicemix.wsn.jaxws.InvalidTopicExpressionFault;
-import org.apache.servicemix.wsn.jaxws.InvalidUseRawValueFault;
import org.apache.servicemix.wsn.jaxws.PausableSubscriptionManager;
import org.apache.servicemix.wsn.jaxws.PauseFailedFault;
import org.apache.servicemix.wsn.jaxws.ResourceUnknownFault;
@@ -64,13 +63,13 @@
import org.apache.servicemix.wsn.jaxws.UnableToDestroySubscriptionFault;
import org.apache.servicemix.wsn.jaxws.UnacceptableInitialTerminationTimeFault;
import org.apache.servicemix.wsn.jaxws.UnacceptableTerminationTimeFault;
-import org.w3._2005._03.addressing.EndpointReferenceType;
+import org.w3._2005._08.addressing.EndpointReferenceType;
@WebService(endpointInterface = "org.apache.servicemix.wsn.jaxws.PausableSubscriptionManager")
public abstract class AbstractSubscription extends AbstractEndpoint
implements PausableSubscriptionManager {
- public static final String WSN_URI = "http://docs.oasis-open.org/wsn/b-1";
+ public static final String WSN_URI = "http://docs.oasis-open.org/wsn/b-2";
public static final String XPATH1_URI = "http://www.w3.org/TR/1999/REC-xpath-19991116";
public static final QName QNAME_TOPIC_EXPRESSION = new QName(WSN_URI, "TopicExpression");
public static final QName QNAME_PRODUCER_PROPERTIES = new QName(WSN_URI, "ProducerProperties");
@@ -103,9 +102,9 @@
* @throws ResourceUnknownFault
*/
@WebMethod(operationName = "Renew")
- @WebResult(name = "RenewResponse", targetNamespace = "http://docs.oasis-open.org/wsn/b-1", partName = "RenewResponse")
+ @WebResult(name = "RenewResponse", targetNamespace = "http://docs.oasis-open.org/wsn/b-2", partName = "RenewResponse")
public RenewResponse renew(
- @WebParam(name = "Renew", targetNamespace = "http://docs.oasis-open.org/wsn/b-1", partName = "RenewRequest")
+ @WebParam(name = "Renew", targetNamespace = "http://docs.oasis-open.org/wsn/b-2", partName = "RenewRequest")
Renew renewRequest)
throws ResourceUnknownFault, UnacceptableTerminationTimeFault {
@@ -126,9 +125,9 @@
* @throws ResourceUnknownFault
*/
@WebMethod(operationName = "Unsubscribe")
- @WebResult(name = "UnsubscribeResponse", targetNamespace = "http://docs.oasis-open.org/wsn/b-1", partName = "UnsubscribeResponse")
+ @WebResult(name = "UnsubscribeResponse", targetNamespace = "http://docs.oasis-open.org/wsn/b-2", partName = "UnsubscribeResponse")
public UnsubscribeResponse unsubscribe(
- @WebParam(name = "Unsubscribe", targetNamespace = "http://docs.oasis-open.org/wsn/b-1", partName = "UnsubscribeRequest")
+ @WebParam(name = "Unsubscribe", targetNamespace = "http://docs.oasis-open.org/wsn/b-2", partName = "UnsubscribeRequest")
Unsubscribe unsubscribeRequest)
throws ResourceUnknownFault, UnableToDestroySubscriptionFault {
@@ -145,9 +144,9 @@
* @throws ResourceUnknownFault
*/
@WebMethod(operationName = "PauseSubscription")
- @WebResult(name = "PauseSubscriptionResponse", targetNamespace = "http://docs.oasis-open.org/wsn/b-1", partName = "PauseSubscriptionResponse")
+ @WebResult(name = "PauseSubscriptionResponse", targetNamespace = "http://docs.oasis-open.org/wsn/b-2", partName = "PauseSubscriptionResponse")
public PauseSubscriptionResponse pauseSubscription(
- @WebParam(name = "PauseSubscription", targetNamespace = "http://docs.oasis-open.org/wsn/b-1", partName = "PauseSubscriptionRequest")
+ @WebParam(name = "PauseSubscription", targetNamespace = "http://docs.oasis-open.org/wsn/b-2", partName = "PauseSubscriptionRequest")
PauseSubscription pauseSubscriptionRequest)
throws PauseFailedFault, ResourceUnknownFault {
@@ -164,9 +163,9 @@
* @throws ResourceUnknownFault
*/
@WebMethod(operationName = "ResumeSubscription")
- @WebResult(name = "ResumeSubscriptionResponse", targetNamespace = "http://docs.oasis-open.org/wsn/b-1", partName = "ResumeSubscriptionResponse")
+ @WebResult(name = "ResumeSubscriptionResponse", targetNamespace = "http://docs.oasis-open.org/wsn/b-2", partName = "ResumeSubscriptionResponse")
public ResumeSubscriptionResponse resumeSubscription(
- @WebParam(name = "ResumeSubscription", targetNamespace = "http://docs.oasis-open.org/wsn/b-1", partName = "ResumeSubscriptionRequest")
+ @WebParam(name = "ResumeSubscription", targetNamespace = "http://docs.oasis-open.org/wsn/b-2", partName = "ResumeSubscriptionRequest")
ResumeSubscription resumeSubscriptionRequest)
throws ResourceUnknownFault, ResumeFailedFault {
@@ -251,7 +250,7 @@
this.terminationTime = terminationTime;
}
- public void create(Subscribe subscribeRequest) throws InvalidFilterFault, InvalidMessageContentExpressionFault, InvalidProducerPropertiesExpressionFault, InvalidTopicExpressionFault, InvalidUseRawValueFault, SubscribeCreationFailedFault, TopicExpressionDialectUnknownFault, TopicNotSupportedFault, UnacceptableInitialTerminationTimeFault {
+ public void create(Subscribe subscribeRequest) throws InvalidFilterFault, InvalidMessageContentExpressionFault, InvalidProducerPropertiesExpressionFault, InvalidTopicExpressionFault, SubscribeCreationFailedFault, TopicExpressionDialectUnknownFault, TopicNotSupportedFault, UnacceptableInitialTerminationTimeFault {
validateSubscription(subscribeRequest);
start();
}
@@ -277,7 +276,7 @@
return "http://servicemix.org/wsnotification/Subscription/" + getName();
}
- protected void validateSubscription(Subscribe subscribeRequest) throws InvalidFilterFault, InvalidMessageContentExpressionFault, InvalidProducerPropertiesExpressionFault, InvalidTopicExpressionFault, InvalidUseRawValueFault, SubscribeCreationFailedFault, TopicExpressionDialectUnknownFault, TopicNotSupportedFault, UnacceptableInitialTerminationTimeFault {
+ protected void validateSubscription(Subscribe subscribeRequest) throws InvalidFilterFault, InvalidMessageContentExpressionFault, InvalidProducerPropertiesExpressionFault, InvalidTopicExpressionFault, SubscribeCreationFailedFault, TopicExpressionDialectUnknownFault, TopicNotSupportedFault, UnacceptableInitialTerminationTimeFault {
// Check consumer reference
consumerReference = subscribeRequest.getConsumerReference();
// Check terminationTime
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/AbstractWSAClient.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/AbstractWSAClient.java?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/AbstractWSAClient.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/AbstractWSAClient.java Mon Feb 13 01:31:41 2006
@@ -27,10 +27,10 @@
import org.apache.servicemix.jbi.container.JBIContainer;
import org.apache.servicemix.jbi.resolver.EndpointResolver;
import org.apache.servicemix.jbi.resolver.ServiceAndEndpointNameResolver;
-import org.oasis_open.docs.wsn.b_1.Subscribe;
-import org.oasis_open.docs.wsn.br_1.RegisterPublisher;
-import org.w3._2005._03.addressing.AttributedURIType;
-import org.w3._2005._03.addressing.EndpointReferenceType;
+import org.oasis_open.docs.wsn.b_2.Subscribe;
+import org.oasis_open.docs.wsn.br_2.RegisterPublisher;
+import org.w3._2005._08.addressing.AttributedURIType;
+import org.w3._2005._08.addressing.EndpointReferenceType;
public abstract class AbstractWSAClient {
Added: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/CreatePullPoint.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/CreatePullPoint.java?rev=377326&view=auto
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/CreatePullPoint.java (added)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/CreatePullPoint.java Mon Feb 13 01:31:41 2006
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.servicemix.wsn.client;
+
+import javax.jbi.JBIException;
+import javax.jbi.component.ComponentContext;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.namespace.QName;
+
+import org.apache.servicemix.client.ServiceMixClient;
+import org.apache.servicemix.client.ServiceMixClientFacade;
+import org.apache.servicemix.jbi.container.JBIContainer;
+import org.apache.servicemix.jbi.resolver.ServiceNameEndpointResolver;
+import org.oasis_open.docs.wsn.b_2.CreatePullPointResponse;
+import org.oasis_open.docs.wsn.b_2.Subscribe;
+import org.oasis_open.docs.wsn.br_2.RegisterPublisher;
+
+public class CreatePullPoint extends AbstractWSAClient {
+
+ public static String WSN_URI = "http://servicemix.org/wsnotification";
+ public static String WSN_SERVICE = "CreatePullPoint";
+
+ public static QName NOTIFICATION_BROKER = new QName(WSN_URI, WSN_SERVICE);
+
+ public CreatePullPoint(ComponentContext context) throws JAXBException {
+ ServiceMixClientFacade client = new ServiceMixClientFacade(context);
+ client.setMarshaler(new JAXBMarshaller(JAXBContext.newInstance(Subscribe.class, RegisterPublisher.class)));
+ setClient(client);
+ setResolver(new ServiceNameEndpointResolver(NOTIFICATION_BROKER));
+ }
+
+ public CreatePullPoint(ComponentContext context, String brokerName) throws JAXBException {
+ setClient(createJaxbClient(context));
+ setEndpoint(createWSA(WSN_URI + "/" + WSN_SERVICE + "/" + brokerName));
+ setResolver(resolveWSA(getEndpoint()));
+ }
+
+ public CreatePullPoint(JBIContainer container) throws JBIException, JAXBException {
+ setClient(createJaxbClient(container));
+ setResolver(new ServiceNameEndpointResolver(NOTIFICATION_BROKER));
+ }
+
+ public CreatePullPoint(JBIContainer container, String brokerName) throws JBIException, JAXBException {
+ setClient(createJaxbClient(container));
+ setEndpoint(createWSA(WSN_URI + "/" + WSN_SERVICE + "/" + brokerName));
+ setResolver(resolveWSA(getEndpoint()));
+ }
+
+ public CreatePullPoint(ServiceMixClient client) {
+ setClient(client);
+ setResolver(new ServiceNameEndpointResolver(NOTIFICATION_BROKER));
+ }
+
+ public CreatePullPoint(ServiceMixClient client, String brokerName) {
+ setClient(client);
+ setEndpoint(createWSA(WSN_URI + "/" + WSN_SERVICE + "/" + brokerName));
+ setResolver(resolveWSA(getEndpoint()));
+ }
+
+ public PullPoint createPullPoint() throws JBIException {
+ CreatePullPointResponse response = (CreatePullPointResponse) request(new org.oasis_open.docs.wsn.b_2.CreatePullPoint());
+ return new PullPoint(response.getPullPoint(), getClient());
+ }
+
+}
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/NotificationBroker.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/NotificationBroker.java?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/NotificationBroker.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/NotificationBroker.java Mon Feb 13 01:31:41 2006
@@ -29,21 +29,19 @@
import org.apache.servicemix.jbi.container.JBIContainer;
import org.apache.servicemix.jbi.resolver.ServiceNameEndpointResolver;
import org.apache.servicemix.wsn.AbstractSubscription;
-import org.oasis_open.docs.wsn.b_1.CreatePullPoint;
-import org.oasis_open.docs.wsn.b_1.CreatePullPointResponse;
-import org.oasis_open.docs.wsn.b_1.FilterType;
-import org.oasis_open.docs.wsn.b_1.GetCurrentMessage;
-import org.oasis_open.docs.wsn.b_1.GetCurrentMessageResponse;
-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.QueryExpressionType;
-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.TopicExpressionType;
-import org.oasis_open.docs.wsn.b_1.UseRaw;
-import org.oasis_open.docs.wsn.br_1.RegisterPublisher;
-import org.oasis_open.docs.wsn.br_1.RegisterPublisherResponse;
-import org.w3._2005._03.addressing.EndpointReferenceType;
+import org.oasis_open.docs.wsn.b_2.FilterType;
+import org.oasis_open.docs.wsn.b_2.GetCurrentMessage;
+import org.oasis_open.docs.wsn.b_2.GetCurrentMessageResponse;
+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.QueryExpressionType;
+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.TopicExpressionType;
+import org.oasis_open.docs.wsn.b_2.UseRaw;
+import org.oasis_open.docs.wsn.br_2.RegisterPublisher;
+import org.oasis_open.docs.wsn.br_2.RegisterPublisherResponse;
+import org.w3._2005._08.addressing.EndpointReferenceType;
public class NotificationBroker extends AbstractWSAClient {
@@ -164,11 +162,6 @@
registerPublisherRequest.setDemand(Boolean.valueOf(demand));
RegisterPublisherResponse response = (RegisterPublisherResponse) request(registerPublisherRequest);
return new Publisher(response.getPublisherRegistrationReference(), getClient());
- }
-
- public PullPoint createPullPoint() throws JBIException {
- CreatePullPointResponse response = (CreatePullPointResponse) request(new CreatePullPoint());
- return new PullPoint(response.getPullPoint(), getClient());
}
}
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/Publisher.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/Publisher.java?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/Publisher.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/Publisher.java Mon Feb 13 01:31:41 2006
@@ -17,9 +17,9 @@
import javax.jbi.JBIException;
-import org.oasis_open.docs.wsn.br_1.Destroy;
import org.apache.servicemix.client.ServiceMixClient;
-import org.w3._2005._03.addressing.EndpointReferenceType;
+import org.oasis_open.docs.wsn.br_2.DestroyRegistration;
+import org.w3._2005._08.addressing.EndpointReferenceType;
public class Publisher extends AbstractWSAClient {
@@ -28,7 +28,7 @@
}
public void destroy() throws JBIException {
- request(new Destroy());
+ request(new DestroyRegistration());
}
}
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/PullPoint.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/PullPoint.java?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/PullPoint.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/PullPoint.java Mon Feb 13 01:31:41 2006
@@ -23,11 +23,11 @@
import org.apache.servicemix.client.ServiceMixClient;
import org.apache.servicemix.jbi.container.JBIContainer;
-import org.oasis_open.docs.wsn.b_1.Destroy;
-import org.oasis_open.docs.wsn.b_1.GetMessages;
-import org.oasis_open.docs.wsn.b_1.GetMessagesResponse;
-import org.oasis_open.docs.wsn.b_1.NotificationMessageHolderType;
-import org.w3._2005._03.addressing.EndpointReferenceType;
+import org.oasis_open.docs.wsn.b_2.DestroyPullPoint;
+import org.oasis_open.docs.wsn.b_2.GetMessages;
+import org.oasis_open.docs.wsn.b_2.GetMessagesResponse;
+import org.oasis_open.docs.wsn.b_2.NotificationMessageHolderType;
+import org.w3._2005._08.addressing.EndpointReferenceType;
public class PullPoint extends AbstractWSAClient {
@@ -47,7 +47,7 @@
}
public void destroy() throws JBIException {
- request(new Destroy());
+ request(new DestroyPullPoint());
}
}
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/Subscription.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/Subscription.java?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/Subscription.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/client/Subscription.java Mon Feb 13 01:31:41 2006
@@ -17,11 +17,11 @@
import javax.jbi.JBIException;
-import org.oasis_open.docs.wsn.b_1.PauseSubscription;
-import org.oasis_open.docs.wsn.b_1.ResumeSubscription;
-import org.oasis_open.docs.wsn.b_1.Unsubscribe;
+import org.oasis_open.docs.wsn.b_2.PauseSubscription;
+import org.oasis_open.docs.wsn.b_2.ResumeSubscription;
+import org.oasis_open.docs.wsn.b_2.Unsubscribe;
import org.apache.servicemix.client.ServiceMixClient;
-import org.w3._2005._03.addressing.EndpointReferenceType;
+import org.w3._2005._08.addressing.EndpointReferenceType;
public class Subscription extends AbstractWSAClient {
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNDeployer.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNDeployer.java?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNDeployer.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNDeployer.java Mon Feb 13 01:31:41 2006
@@ -37,10 +37,11 @@
import org.apache.servicemix.wsn.EndpointRegistrationException;
import org.apache.servicemix.wsn.jaxws.NotificationBroker;
import org.apache.servicemix.wsn.jbi.JbiNotificationBroker;
-import org.oasis_open.docs.wsn.b_1.CreatePullPoint;
-import org.oasis_open.docs.wsn.b_1.CreatePullPointResponse;
-import org.oasis_open.docs.wsn.b_1.Subscribe;
-import org.oasis_open.docs.wsn.b_1.SubscribeResponse;
+import org.apache.servicemix.wsn.jms.JmsCreatePullPoint;
+import org.oasis_open.docs.wsn.b_2.CreatePullPoint;
+import org.oasis_open.docs.wsn.b_2.CreatePullPointResponse;
+import org.oasis_open.docs.wsn.b_2.Subscribe;
+import org.oasis_open.docs.wsn.b_2.SubscribeResponse;
public class WSNDeployer extends AbstractDeployer implements Deployer {
@@ -159,14 +160,14 @@
@Override
public void activate() throws Exception {
- JbiNotificationBroker broker = ((WSNLifeCycle) serviceUnit.getComponent().getLifeCycle()).getNotificationBroker();
- response = broker.createPullPoint(request);
+ JmsCreatePullPoint createPullPoint = ((WSNLifeCycle) serviceUnit.getComponent().getLifeCycle()).getCreatePullPoint();
+ response = createPullPoint.createPullPoint(request);
}
@Override
public void deactivate() throws Exception {
- JbiNotificationBroker broker = ((WSNLifeCycle) serviceUnit.getComponent().getLifeCycle()).getNotificationBroker();
- broker.destroyPullPoint(response.getPullPoint().getAddress().getValue());
+ JmsCreatePullPoint createPullPoint = ((WSNLifeCycle) serviceUnit.getComponent().getLifeCycle()).getCreatePullPoint();
+ createPullPoint.destroyPullPoint(response.getPullPoint().getAddress().getValue());
}
@Override
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNEndpoint.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNEndpoint.java?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNEndpoint.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNEndpoint.java Mon Feb 13 01:31:41 2006
@@ -40,10 +40,10 @@
import javax.xml.namespace.QName;
import javax.xml.ws.WebFault;
-import org.oasis_open.docs.wsrf.bf_1.BaseFaultType;
import org.apache.servicemix.common.Endpoint;
import org.apache.servicemix.common.ExchangeProcessor;
import org.apache.servicemix.jbi.jaxp.StringSource;
+import org.oasis_open.docs.wsrf.bf_2.BaseFaultType;
public class WSNEndpoint extends Endpoint implements ExchangeProcessor {
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNLifeCycle.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNLifeCycle.java?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNLifeCycle.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNLifeCycle.java Mon Feb 13 01:31:41 2006
@@ -28,10 +28,12 @@
import org.apache.servicemix.wsn.EndpointManager;
import org.apache.servicemix.wsn.EndpointRegistrationException;
import org.apache.servicemix.wsn.jbi.JbiNotificationBroker;
+import org.apache.servicemix.wsn.jms.JmsCreatePullPoint;
public class WSNLifeCycle extends BaseLifeCycle {
private JbiNotificationBroker notificationBroker;
+ private JmsCreatePullPoint createPullPoint;
private WSNConfiguration configuration;
private ConnectionFactory connectionFactory;
private ServiceUnit serviceUnit;
@@ -50,14 +52,23 @@
@Override
protected void doInit() throws Exception {
super.doInit();
- notificationBroker = new JbiNotificationBroker(configuration.getBrokerName());
- notificationBroker.setContext(context);
- notificationBroker.setManager(new WSNEndpointManager());
- if (connectionFactory == null) {
- connectionFactory = lookupConnectionFactory();
- }
- notificationBroker.setConnectionFactory(connectionFactory);
- notificationBroker.init();
+ // Notification Broker
+ notificationBroker = new JbiNotificationBroker(configuration.getBrokerName());
+ notificationBroker.setContext(context);
+ notificationBroker.setManager(new WSNEndpointManager());
+ if (connectionFactory == null) {
+ connectionFactory = lookupConnectionFactory();
+ }
+ notificationBroker.setConnectionFactory(connectionFactory);
+ notificationBroker.init();
+ // Create PullPoint
+ createPullPoint = new JmsCreatePullPoint(configuration.getBrokerName());
+ createPullPoint.setManager(new WSNEndpointManager());
+ if (connectionFactory == null) {
+ connectionFactory = lookupConnectionFactory();
+ }
+ createPullPoint.setConnectionFactory(connectionFactory);
+ createPullPoint.init();
}
@Override
@@ -137,6 +148,10 @@
public JbiNotificationBroker getNotificationBroker() {
return notificationBroker;
+ }
+
+ public JmsCreatePullPoint getCreatePullPoint() {
+ return createPullPoint;
}
}
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jbi/JbiPublisher.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jbi/JbiPublisher.java?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jbi/JbiPublisher.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jbi/JbiPublisher.java Mon Feb 13 01:31:41 2006
@@ -24,14 +24,14 @@
import org.apache.servicemix.wsn.client.AbstractWSAClient;
import org.apache.servicemix.wsn.client.NotificationBroker;
import org.apache.servicemix.wsn.client.Subscription;
-import org.apache.servicemix.wsn.jms.JmsPublisher;
-import org.oasis_open.docs.wsn.br_1.PublisherRegistrationFailedFaultType;
-import org.oasis_open.docs.wsn.br_1.RegisterPublisher;
import org.apache.servicemix.wsn.jaxws.InvalidTopicExpressionFault;
import org.apache.servicemix.wsn.jaxws.PublisherRegistrationFailedFault;
import org.apache.servicemix.wsn.jaxws.PublisherRegistrationRejectedFault;
import org.apache.servicemix.wsn.jaxws.ResourceUnknownFault;
import org.apache.servicemix.wsn.jaxws.TopicNotSupportedFault;
+import org.apache.servicemix.wsn.jms.JmsPublisher;
+import org.oasis_open.docs.wsn.br_2.PublisherRegistrationFailedFaultType;
+import org.oasis_open.docs.wsn.br_2.RegisterPublisher;
public class JbiPublisher extends JmsPublisher {
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jbi/JbiSubscription.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jbi/JbiSubscription.java?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jbi/JbiSubscription.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jbi/JbiSubscription.java Mon Feb 13 01:31:41 2006
@@ -27,18 +27,17 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.wsn.jms.JmsSubscription;
-import org.oasis_open.docs.wsn.b_1.Subscribe;
-import org.oasis_open.docs.wsn.b_1.SubscribeCreationFailedFaultType;
import org.apache.servicemix.wsn.jaxws.InvalidFilterFault;
import org.apache.servicemix.wsn.jaxws.InvalidMessageContentExpressionFault;
import org.apache.servicemix.wsn.jaxws.InvalidProducerPropertiesExpressionFault;
import org.apache.servicemix.wsn.jaxws.InvalidTopicExpressionFault;
-import org.apache.servicemix.wsn.jaxws.InvalidUseRawValueFault;
import org.apache.servicemix.wsn.jaxws.SubscribeCreationFailedFault;
import org.apache.servicemix.wsn.jaxws.TopicExpressionDialectUnknownFault;
import org.apache.servicemix.wsn.jaxws.TopicNotSupportedFault;
import org.apache.servicemix.wsn.jaxws.UnacceptableInitialTerminationTimeFault;
+import org.apache.servicemix.wsn.jms.JmsSubscription;
+import org.oasis_open.docs.wsn.b_2.Subscribe;
+import org.oasis_open.docs.wsn.b_2.SubscribeCreationFailedFaultType;
import org.w3c.dom.Element;
public class JbiSubscription extends JmsSubscription {
@@ -58,7 +57,7 @@
}
@Override
- protected void validateSubscription(Subscribe subscribeRequest) throws InvalidFilterFault, InvalidMessageContentExpressionFault, InvalidProducerPropertiesExpressionFault, InvalidTopicExpressionFault, InvalidUseRawValueFault, SubscribeCreationFailedFault, TopicExpressionDialectUnknownFault, TopicNotSupportedFault, UnacceptableInitialTerminationTimeFault {
+ protected void validateSubscription(Subscribe subscribeRequest) throws InvalidFilterFault, InvalidMessageContentExpressionFault, InvalidProducerPropertiesExpressionFault, InvalidTopicExpressionFault, SubscribeCreationFailedFault, TopicExpressionDialectUnknownFault, TopicNotSupportedFault, UnacceptableInitialTerminationTimeFault {
super.validateSubscription(subscribeRequest);
String[] parts = split(consumerReference.getAddress().getValue().trim());
endpoint = context.getEndpoint(new QName(parts[0], parts[1]), parts[2]);
Added: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsCreatePullPoint.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsCreatePullPoint.java?rev=377326&view=auto
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsCreatePullPoint.java (added)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsCreatePullPoint.java Mon Feb 13 01:31:41 2006
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.servicemix.wsn.jms;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+
+import org.apache.servicemix.wsn.AbstractCreatePullPoint;
+import org.apache.servicemix.wsn.AbstractPullPoint;
+
+public class JmsCreatePullPoint extends AbstractCreatePullPoint {
+
+ private ConnectionFactory connectionFactory;
+ private Connection connection;
+
+ public JmsCreatePullPoint(String name) {
+ super(name);
+ }
+
+ public void init() throws Exception {
+ if (connection == null) {
+ connection = connectionFactory.createConnection();
+ connection.start();
+ }
+ super.init();
+ }
+
+ @Override
+ protected AbstractPullPoint createPullPoint(String name) {
+ JmsPullPoint pullPoint = new JmsPullPoint(name);
+ pullPoint.setManager(getManager());
+ pullPoint.setConnection(connection);
+ return pullPoint;
+ }
+
+ public ConnectionFactory getConnectionFactory() {
+ return connectionFactory;
+ }
+
+ public void setConnectionFactory(ConnectionFactory connectionFactory) {
+ this.connectionFactory = connectionFactory;
+ }
+
+}
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsNotificationBroker.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsNotificationBroker.java?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsNotificationBroker.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsNotificationBroker.java Mon Feb 13 01:31:41 2006
@@ -20,7 +20,6 @@
import org.apache.servicemix.wsn.AbstractNotificationBroker;
import org.apache.servicemix.wsn.AbstractPublisher;
-import org.apache.servicemix.wsn.AbstractPullPoint;
import org.apache.servicemix.wsn.AbstractSubscription;
public abstract class JmsNotificationBroker extends AbstractNotificationBroker {
@@ -46,14 +45,6 @@
publisher.setManager(getManager());
publisher.setConnection(connection);
return publisher;
- }
-
- @Override
- protected AbstractPullPoint createPullPoint(String name) {
- JmsPullPoint pullPoint = new JmsPullPoint(name);
- pullPoint.setManager(getManager());
- pullPoint.setConnection(connection);
- return pullPoint;
}
@Override
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsPublisher.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsPublisher.java?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsPublisher.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsPublisher.java Mon Feb 13 01:31:41 2006
@@ -32,18 +32,18 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.wsn.AbstractPublisher;
-import org.oasis_open.docs.wsn.b_1.InvalidTopicExpressionFaultType;
-import org.oasis_open.docs.wsn.b_1.NotificationMessageHolderType;
-import org.oasis_open.docs.wsn.b_1.Notify;
-import org.oasis_open.docs.wsn.br_1.PublisherRegistrationFailedFaultType;
-import org.oasis_open.docs.wsn.br_1.RegisterPublisher;
-import org.oasis_open.docs.wsn.br_1.ResourceNotDestroyedFaultType;
import org.apache.servicemix.wsn.jaxws.InvalidTopicExpressionFault;
import org.apache.servicemix.wsn.jaxws.PublisherRegistrationFailedFault;
import org.apache.servicemix.wsn.jaxws.PublisherRegistrationRejectedFault;
import org.apache.servicemix.wsn.jaxws.ResourceNotDestroyedFault;
import org.apache.servicemix.wsn.jaxws.ResourceUnknownFault;
import org.apache.servicemix.wsn.jaxws.TopicNotSupportedFault;
+import org.oasis_open.docs.wsn.b_2.InvalidTopicExpressionFaultType;
+import org.oasis_open.docs.wsn.b_2.NotificationMessageHolderType;
+import org.oasis_open.docs.wsn.b_2.Notify;
+import org.oasis_open.docs.wsn.br_2.PublisherRegistrationFailedFaultType;
+import org.oasis_open.docs.wsn.br_2.RegisterPublisher;
+import org.oasis_open.docs.wsn.br_2.ResourceNotDestroyedFaultType;
public abstract class JmsPublisher extends AbstractPublisher implements ConsumerListener {
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsPullPoint.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsPullPoint.java?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsPullPoint.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsPullPoint.java Mon Feb 13 01:31:41 2006
@@ -34,10 +34,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.wsn.AbstractPullPoint;
-import org.oasis_open.docs.wsn.b_1.NotificationMessageHolderType;
-import org.oasis_open.docs.wsn.b_1.Notify;
-import org.oasis_open.docs.wsrf.r_1.ResourceUnknownFaultType;
import org.apache.servicemix.wsn.jaxws.ResourceUnknownFault;
+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;
public class JmsPullPoint extends AbstractPullPoint {
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsSubscription.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsSubscription.java?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsSubscription.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsSubscription.java Mon Feb 13 01:31:41 2006
@@ -36,18 +36,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.wsn.AbstractSubscription;
-import org.oasis_open.docs.wsn.b_1.InvalidTopicExpressionFaultType;
-import org.oasis_open.docs.wsn.b_1.PauseFailedFaultType;
-import org.oasis_open.docs.wsn.b_1.ResumeFailedFaultType;
-import org.oasis_open.docs.wsn.b_1.Subscribe;
-import org.oasis_open.docs.wsn.b_1.SubscribeCreationFailedFaultType;
-import org.oasis_open.docs.wsn.b_1.UnableToDestroySubscriptionFaultType;
-import org.oasis_open.docs.wsn.b_1.UnacceptableTerminationTimeFaultType;
import org.apache.servicemix.wsn.jaxws.InvalidFilterFault;
import org.apache.servicemix.wsn.jaxws.InvalidMessageContentExpressionFault;
import org.apache.servicemix.wsn.jaxws.InvalidProducerPropertiesExpressionFault;
import org.apache.servicemix.wsn.jaxws.InvalidTopicExpressionFault;
-import org.apache.servicemix.wsn.jaxws.InvalidUseRawValueFault;
import org.apache.servicemix.wsn.jaxws.PauseFailedFault;
import org.apache.servicemix.wsn.jaxws.ResumeFailedFault;
import org.apache.servicemix.wsn.jaxws.SubscribeCreationFailedFault;
@@ -56,6 +48,13 @@
import org.apache.servicemix.wsn.jaxws.UnableToDestroySubscriptionFault;
import org.apache.servicemix.wsn.jaxws.UnacceptableInitialTerminationTimeFault;
import org.apache.servicemix.wsn.jaxws.UnacceptableTerminationTimeFault;
+import org.oasis_open.docs.wsn.b_2.InvalidTopicExpressionFaultType;
+import org.oasis_open.docs.wsn.b_2.PauseFailedFaultType;
+import org.oasis_open.docs.wsn.b_2.ResumeFailedFaultType;
+import org.oasis_open.docs.wsn.b_2.Subscribe;
+import org.oasis_open.docs.wsn.b_2.SubscribeCreationFailedFaultType;
+import org.oasis_open.docs.wsn.b_2.UnableToDestroySubscriptionFaultType;
+import org.oasis_open.docs.wsn.b_2.UnacceptableTerminationTimeFaultType;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.InputSource;
@@ -86,7 +85,7 @@
}
@Override
- protected void validateSubscription(Subscribe subscribeRequest) throws InvalidFilterFault, InvalidMessageContentExpressionFault, InvalidProducerPropertiesExpressionFault, InvalidTopicExpressionFault, InvalidUseRawValueFault, SubscribeCreationFailedFault, TopicExpressionDialectUnknownFault, TopicNotSupportedFault, UnacceptableInitialTerminationTimeFault {
+ protected void validateSubscription(Subscribe subscribeRequest) throws InvalidFilterFault, InvalidMessageContentExpressionFault, InvalidProducerPropertiesExpressionFault, InvalidTopicExpressionFault, SubscribeCreationFailedFault, TopicExpressionDialectUnknownFault, TopicNotSupportedFault, UnacceptableInitialTerminationTimeFault {
super.validateSubscription(subscribeRequest);
try {
jmsTopic = topicConverter.toActiveMQTopic(topic);
@@ -168,8 +167,8 @@
factory.setNamespaceAware(true);
Document doc = factory.newDocumentBuilder().parse(new InputSource(new StringReader(text.getText())));
Element root = doc.getDocumentElement();
- Element holder = (Element) root.getElementsByTagNameNS("http://docs.oasis-open.org/wsn/b-1", "NotificationMessage").item(0);
- Element message = (Element) holder.getElementsByTagNameNS("http://docs.oasis-open.org/wsn/b-1", "Message").item(0);
+ Element holder = (Element) root.getElementsByTagNameNS(WSN_URI, "NotificationMessage").item(0);
+ Element message = (Element) holder.getElementsByTagNameNS(WSN_URI, "Message").item(0);
Element content = null;
for (int i = 0; i < message.getChildNodes().getLength(); i++) {
if (message.getChildNodes().item(i) instanceof Element) {
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsTopicExpressionConverter.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsTopicExpressionConverter.java?rev=377326&r1=377325&r2=377326&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsTopicExpressionConverter.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsTopicExpressionConverter.java Mon Feb 13 01:31:41 2006
@@ -22,7 +22,7 @@
import javax.xml.namespace.QName;
import org.apache.activemq.command.ActiveMQTopic;
-import org.oasis_open.docs.wsn.b_1.TopicExpressionType;
+import org.oasis_open.docs.wsn.b_2.TopicExpressionType;
public class JmsTopicExpressionConverter {