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 2008/09/01 21:37:23 UTC
svn commit: r691039 - in
/servicemix/components/engines/servicemix-wsn2005/trunk: pom.xml
src/main/java/org/apache/servicemix/wsn/spring/PublisherComponent.java
src/main/java/org/apache/servicemix/wsn/spring/PublisherProxyBean.java
Author: gnodet
Date: Mon Sep 1 12:37:23 2008
New Revision: 691039
URL: http://svn.apache.org/viewvc?rev=691039&view=rev
Log:
SM-1539: implement a new version of the PublisherComponent that does not use lightweight components
Added:
servicemix/components/engines/servicemix-wsn2005/trunk/src/main/java/org/apache/servicemix/wsn/spring/PublisherProxyBean.java
Modified:
servicemix/components/engines/servicemix-wsn2005/trunk/pom.xml
servicemix/components/engines/servicemix-wsn2005/trunk/src/main/java/org/apache/servicemix/wsn/spring/PublisherComponent.java
Modified: servicemix/components/engines/servicemix-wsn2005/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-wsn2005/trunk/pom.xml?rev=691039&r1=691038&r2=691039&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-wsn2005/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-wsn2005/trunk/pom.xml Mon Sep 1 12:37:23 2008
@@ -48,6 +48,7 @@
<cxf-version>2.1.3-SNAPSHOT</cxf-version>
<servicemix.osgi.import>
+ javax.annotation;resolution:=optional,
org.apache.servicemix;resolution:=optional,
org.apache.servicemix.client*;resolution:=optional,
org.apache.servicemix.common,
@@ -135,6 +136,11 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
<!-- TODO: make sure this gets down to test scope -->
<dependency>
<groupId>org.apache.servicemix</groupId>
Modified: servicemix/components/engines/servicemix-wsn2005/trunk/src/main/java/org/apache/servicemix/wsn/spring/PublisherComponent.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-wsn2005/trunk/src/main/java/org/apache/servicemix/wsn/spring/PublisherComponent.java?rev=691039&r1=691038&r2=691039&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-wsn2005/trunk/src/main/java/org/apache/servicemix/wsn/spring/PublisherComponent.java (original)
+++ servicemix/components/engines/servicemix-wsn2005/trunk/src/main/java/org/apache/servicemix/wsn/spring/PublisherComponent.java Mon Sep 1 12:37:23 2008
@@ -30,10 +30,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.MessageExchangeListener;
import org.apache.servicemix.components.util.ComponentSupport;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
+import org.apache.servicemix.jbi.listener.MessageExchangeListener;
import org.apache.servicemix.wsn.client.AbstractWSAClient;
import org.apache.servicemix.wsn.client.NotificationBroker;
import org.oasis_open.docs.wsn.b_2.Subscribe;
@@ -42,10 +42,15 @@
import org.oasis_open.docs.wsn.b_2.UnsubscribeResponse;
/**
- *
+ * This class is a lightweight component that can be used to act as a WS-Notification publisher.
+ * All messages sent to it will be forwarded to the NotificationBroker in Notify requests.
+ *
+ *
* @author gnodet
* @version $Revision: 376451 $
* @org.apache.xbean.XBean element="publisher"
+ * @deprecated
+ * @see {@link PublisherProxyBean}
*/
public class PublisherComponent extends ComponentSupport implements MessageExchangeListener {
@@ -164,7 +169,7 @@
exchange.setMessage(out, "out");
send(exchange);
} else {
- throw new Exception("Unkown request");
+ throw new Exception("Unknown request");
}
} catch (Exception e) {
fail(exchange, e);
Added: servicemix/components/engines/servicemix-wsn2005/trunk/src/main/java/org/apache/servicemix/wsn/spring/PublisherProxyBean.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-wsn2005/trunk/src/main/java/org/apache/servicemix/wsn/spring/PublisherProxyBean.java?rev=691039&view=auto
==============================================================================
--- servicemix/components/engines/servicemix-wsn2005/trunk/src/main/java/org/apache/servicemix/wsn/spring/PublisherProxyBean.java (added)
+++ servicemix/components/engines/servicemix-wsn2005/trunk/src/main/java/org/apache/servicemix/wsn/spring/PublisherProxyBean.java Mon Sep 1 12:37:23 2008
@@ -0,0 +1,100 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.spring;
+
+import javax.jbi.JBIException;
+import javax.jbi.component.ComponentContext;
+import javax.jbi.messaging.ExchangeStatus;
+import javax.jbi.messaging.MessageExchange;
+import javax.jbi.messaging.MessagingException;
+import javax.annotation.Resource;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+
+import org.w3c.dom.Element;
+
+import org.apache.servicemix.jbi.listener.MessageExchangeListener;
+import org.apache.servicemix.jbi.jaxp.SourceTransformer;
+import org.apache.servicemix.wsn.client.NotificationBroker;
+
+/**
+ * A simple bean acting as a WS-Notification publisher.
+ * All messages sent to it will be forwarded to the NotificationBroker as Notify requests.
+ * This beans should be used and deployed onto servicemix-bean as a pojo for a bean endpoint.
+ *
+ * @author gnodet
+ * @version $Revision: 376451 $
+ * @org.apache.xbean.XBean element="publisher-proxy"
+ */
+public class PublisherProxyBean implements MessageExchangeListener {
+
+ private NotificationBroker wsnBroker;
+
+ private String topic;
+
+ //private Publisher publisher;
+
+ @Resource
+ private ComponentContext context;
+
+ private SourceTransformer sourceTransformer = new SourceTransformer();
+
+
+ /**
+ * @return Returns the topic.
+ */
+ public String getTopic() {
+ return topic;
+ }
+
+ /**
+ * @param topic The topic to set.
+ */
+ public void setTopic(String topic) {
+ this.topic = topic;
+ }
+
+ @PostConstruct
+ public void start() throws JBIException {
+ wsnBroker = new NotificationBroker(context);
+ //publisher = wsnBroker.registerPublisher(null, topic, false);
+ }
+
+ @PreDestroy
+ public void stop() throws JBIException {
+ //publisher.destroy();
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.servicemix.MessageExchangeListener#onMessageExchange(javax.jbi.messaging.MessageExchange)
+ */
+ public void onMessageExchange(MessageExchange exchange) throws MessagingException {
+ if (exchange.getStatus() != ExchangeStatus.ACTIVE) {
+ return;
+ }
+ // This is a notification from the WSN broker
+ try {
+ Element elem = sourceTransformer.toDOMElement(exchange.getMessage("in"));
+ wsnBroker.notify(topic, elem);
+ exchange.setStatus(ExchangeStatus.DONE);
+ } catch (Exception e) {
+ exchange.setError(e);
+ }
+ context.getDeliveryChannel().send(exchange);
+ }
+
+}