You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pubscribe-dev@ws.apache.org by sc...@apache.org on 2005/02/02 21:46:09 UTC
svn commit: r151049 - in incubator/hermes/trunk/src/java/org/apache/ws:
addressing/ eventing/ eventing/app/ eventing/services/broker/
eventing/services/publisher/ eventing/services/subscriber/
notification/base/ notification/base/impl/ notification/base/v1_2/impl/
notification/base/v1_2/porttype/impl/ notification/topics/impl/
pubsub/emitter/ util/thread/
Author: scamp
Date: Wed Feb 2 12:45:59 2005
New Revision: 151049
URL: http://svn.apache.org/viewcvs?view=rev&rev=151049
Log:
Added refactorings for new EndpointReference
Modified:
incubator/hermes/trunk/src/java/org/apache/ws/addressing/EndpointReference.java
incubator/hermes/trunk/src/java/org/apache/ws/addressing/XmlBeansEndpointReference.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/EchoConsumer.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/Filter.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/ForwardConsumer.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/Publisher.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/Subscriber.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/SubscriberStore.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/Subscription.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/XPathFilter.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/YFilterStore.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/PopUpConsumer.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/PubSubWSmanager.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/PubSubWSsemantic.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/PubSubWSsyntactic.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/TestApp.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/broker/BrokerWrapper.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/broker/EventSourceBindingImpl.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/broker/SubscriptionManagerBindingImpl.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/publisher/EventSourceBindingImpl.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/publisher/SubscriptionManagerBindingImpl.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/subscriber/Notifier.java
incubator/hermes/trunk/src/java/org/apache/ws/notification/base/Subscription.java
incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/AbstractSubscription.java
incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/SubscriptionHome.java
incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/impl/Subscription1_2Resource.java
incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/porttype/impl/NotificationProducerPortTypeImpl.java
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/SimpleSubscriptionTopicListener.java
incubator/hermes/trunk/src/java/org/apache/ws/pubsub/emitter/EmitterTask.java
incubator/hermes/trunk/src/java/org/apache/ws/util/thread/NamedThread.java
Modified: incubator/hermes/trunk/src/java/org/apache/ws/addressing/EndpointReference.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/addressing/EndpointReference.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/addressing/EndpointReference.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/addressing/EndpointReference.java Wed Feb 2 12:45:59 2005
@@ -51,7 +51,7 @@
*
* @return Object The ReferenceProperties
*/
- Object getReferenceProperties( );
+ Object[] getReferenceProperties( );
/**
* Service QName
Modified: incubator/hermes/trunk/src/java/org/apache/ws/addressing/XmlBeansEndpointReference.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/addressing/XmlBeansEndpointReference.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/addressing/XmlBeansEndpointReference.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/addressing/XmlBeansEndpointReference.java Wed Feb 2 12:45:59 2005
@@ -16,6 +16,7 @@
package org.apache.ws.addressing;
import org.apache.ws.XmlObjectWrapper;
+import org.apache.ws.util.XmlBeanUtils;
import org.apache.xmlbeans.XmlObject;
import javax.xml.namespace.QName;
@@ -38,7 +39,7 @@
private QName m_portTypeQName;
private String m_servicePortName;
private QName m_serviceQName;
- private Object m_referenceProps;
+ private Object[] m_referenceProps;
/**
* Creates a new {@link XmlBeansEndpointReference} object.
@@ -52,7 +53,7 @@
m_portTypeQName = epr.getPortType( ).getQNameValue( );
m_servicePortName = epr.getServiceName( ).getPortName( );
m_serviceQName = epr.getServiceName( ).getQNameValue( );
- m_referenceProps = epr.getReferenceProperties( );
+ m_referenceProps = XmlBeanUtils.getChildElements(epr.getReferenceProperties());
}
/**
@@ -89,9 +90,9 @@
* Returns the ReferenceProperties directly from the underlying XmlBean-generated class.
* The signature returns Object to make it generic for other impls.
*
- * @return ReferencePropertiesType
+ * @return Object[] containing the Reference Property elements
*/
- public Object getReferenceProperties( )
+ public Object[] getReferenceProperties( )
{
return m_referenceProps;
}
Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/EchoConsumer.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/EchoConsumer.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/EchoConsumer.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/EchoConsumer.java Wed Feb 2 12:45:59 2005
@@ -14,8 +14,8 @@
* limitations under the License.
*/
package org.apache.ws.eventing;
-import org.apache.axis.message.addressing.*;
import org.apache.axis.message.SOAPEnvelope;
+import org.apache.axis.message.addressing.EndpointReference;
public class EchoConsumer implements org.apache.ws.pubsub.NotificationConsumer {
private EndpointReference epr;
Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/Filter.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/Filter.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/Filter.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/Filter.java Wed Feb 2 12:45:59 2005
@@ -16,7 +16,6 @@
package org.apache.ws.eventing;
import org.apache.ws.eventing.base.FilterType;
-import org.apache.axis.message.MessageElement;
/**
*
* @author Stefan Lischke
Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/ForwardConsumer.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/ForwardConsumer.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/ForwardConsumer.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/ForwardConsumer.java Wed Feb 2 12:45:59 2005
@@ -14,8 +14,8 @@
* limitations under the License.
*/
package org.apache.ws.eventing;
-import org.apache.axis.message.addressing.*;
import org.apache.axis.message.SOAPEnvelope;
+import org.apache.axis.message.addressing.EndpointReference;
public class ForwardConsumer implements org.apache.ws.pubsub.NotificationConsumer {
private EndpointReference epr;
/*
Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/Publisher.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/Publisher.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/Publisher.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/Publisher.java Wed Feb 2 12:45:59 2005
@@ -16,31 +16,19 @@
package org.apache.ws.eventing;
-import javax.xml.namespace.QName;
import org.apache.axis.client.Call;
import org.apache.axis.client.Service;
-import org.apache.axis.message.addressing.*;
-
-import org.apache.axis.types.URI;
import org.apache.axis.configuration.FileProvider;
-import org.w3c.dom.*;
-
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPBody;
-
-import org.apache.axis.client.Call;
-import org.apache.axis.client.Service;
-import org.apache.axis.message.*;
-import org.apache.axis.utils.Options;
+import org.apache.axis.message.MessageElement;
+import org.apache.axis.message.SOAPBodyElement;
+import org.apache.axis.message.addressing.Action;
+import org.apache.axis.message.addressing.AddressingHeaders;
+import org.apache.axis.message.addressing.Constants;
+import org.apache.axis.message.addressing.EndpointReference;
+import org.apache.axis.types.URI;
import org.apache.axis.utils.XMLUtils;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import java.net.URL;
-import java.util.Vector;
+import javax.xml.soap.SOAPElement;
public class Publisher {
Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/Subscriber.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/Subscriber.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/Subscriber.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/Subscriber.java Wed Feb 2 12:45:59 2005
@@ -15,15 +15,13 @@
*/
package org.apache.ws.eventing;
-import org.apache.ws.eventing.services.EventSource;
-import org.apache.ws.eventing.services.subscriber.*;
-import org.apache.ws.eventing.base.*;
-
import org.apache.axis.configuration.FileProvider;
-
-import org.apache.axis.message.addressing.*;
+import org.apache.axis.message.addressing.EndpointReference;
+import org.apache.ws.eventing.base.DeliveryType;
+import org.apache.ws.eventing.base.ExpirationType;
+import org.apache.ws.eventing.services.EventSource;
+import org.apache.ws.eventing.services.subscriber.SubscriberServiceLocator;
import org.apache.ws.pubsub.NotificationProducer;
-
import java.util.Calendar;
public class Subscriber implements NotificationProducer {
Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/SubscriberStore.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/SubscriberStore.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/SubscriberStore.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/SubscriberStore.java Wed Feb 2 12:45:59 2005
@@ -16,8 +16,6 @@
package org.apache.ws.eventing;
-import org.apache.axis.message.*;
-import javax.xml.soap.*;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
/**
Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/Subscription.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/Subscription.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/Subscription.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/Subscription.java Wed Feb 2 12:45:59 2005
@@ -16,17 +16,17 @@
package org.apache.ws.eventing;
import org.apache.axis.configuration.FileProvider;
-
import org.apache.axis.message.MessageElement;
-import org.apache.axis.message.addressing.*;
-
-import org.apache.ws.eventing.base.*;
-import org.apache.ws.eventing.services.*;
+import org.apache.axis.message.addressing.EndpointReferenceType;
+import org.apache.axis.message.addressing.ReferenceParametersType;
+import org.apache.ws.eventing.base.DeliveryType;
+import org.apache.ws.eventing.base.ExpirationType;
+import org.apache.ws.eventing.base.Subscribe;
+import org.apache.ws.eventing.base.Unsubscribe;
+import org.apache.ws.eventing.services.SubscriptionManager;
import org.apache.ws.eventing.services.subscriber.SubscriberServiceLocator;
-
-import org.apache.ws.pubsub.*;
-
-import edu.berkeley.cs.db.yfilterplus.queryparser.Query;
+import org.apache.ws.pubsub.NotificationConsumer;
+import org.apache.ws.pubsub.NotificationProducer;
public class Subscription extends Subscribe implements org.apache.ws.pubsub.Subscription{
Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/XPathFilter.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/XPathFilter.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/XPathFilter.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/XPathFilter.java Wed Feb 2 12:45:59 2005
@@ -15,8 +15,7 @@
*/
package org.apache.ws.eventing;
-import org.apache.ws.eventing.*;
-import org.apache.axis.message.MessageElement;
+
/**
*
* @author Stefan Lischke
Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/YFilterStore.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/YFilterStore.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/YFilterStore.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/YFilterStore.java Wed Feb 2 12:45:59 2005
@@ -14,21 +14,10 @@
* limitations under the License.
*/
package org.apache.ws.eventing;
-import org.w3c.dom.Element;
-
-import java.util.List;
-
-import org.apache.axis.utils.XMLUtils;
-
-import org.apache.axis.message.addressing.*;
-import org.apache.axis.message.*;
-
-
import edu.berkeley.cs.db.yfilter.filter.*;
import edu.berkeley.cs.db.yfilterplus.queryparser.*;
import edu.berkeley.cs.db.yfilterplus.xmltree.*;
-
-import org.apache.ws.pubsub.*;
+import org.apache.axis.utils.XMLUtils;
public class YFilterStore implements org.apache.ws.pubsub.SubscriptionStore{
public int c=0;
Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/PopUpConsumer.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/PopUpConsumer.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/PopUpConsumer.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/PopUpConsumer.java Wed Feb 2 12:45:59 2005
@@ -20,7 +20,7 @@
*
* @author Stefan Lischke
*/
-import javax.swing.*;
+
public class PopUpConsumer extends org.apache.ws.eventing.EchoConsumer{
SubListModel comp;
Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/PubSubWSmanager.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/PubSubWSmanager.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/PubSubWSmanager.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/PubSubWSmanager.java Wed Feb 2 12:45:59 2005
@@ -15,8 +15,8 @@
*/
package org.apache.ws.eventing.app;
-import org.apache.ws.pubsub.NotificationProducer;
import org.apache.ws.eventing.Subscriber;
+import org.apache.ws.pubsub.NotificationProducer;
public class PubSubWSmanager {
public NotificationProducer nprod;
Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/PubSubWSsemantic.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/PubSubWSsemantic.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/PubSubWSsemantic.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/PubSubWSsemantic.java Wed Feb 2 12:45:59 2005
@@ -15,12 +15,15 @@
*/
package org.apache.ws.eventing.app;
+import org.apache.ws.eventing.Publisher;
+
import javax.swing.*;
import java.awt.*;
-import java.awt.event.*;
-
-import org.apache.ws.eventing.*;
-import org.apache.ws.pubsub.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
public class PubSubWSsemantic extends JPanel{
public JTabbedPane notebook = null ;
Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/PubSubWSsyntactic.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/PubSubWSsyntactic.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/PubSubWSsyntactic.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/PubSubWSsyntactic.java Wed Feb 2 12:45:59 2005
@@ -15,12 +15,15 @@
*/
package org.apache.ws.eventing.app;
+import org.apache.ws.eventing.Publisher;
+
import javax.swing.*;
import java.awt.*;
-import java.awt.event.*;
-
-import org.apache.ws.eventing.*;
-import org.apache.ws.pubsub.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
public class PubSubWSsyntactic extends JPanel{
public JTabbedPane notebook = null ;
Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/TestApp.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/TestApp.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/TestApp.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/TestApp.java Wed Feb 2 12:45:59 2005
@@ -16,12 +16,20 @@
package org.apache.ws.eventing.app;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
+import javax.swing.*;
+import javax.swing.border.TitledBorder;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import javax.swing.plaf.basic.BasicButtonListener;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableColumn;
+import javax.swing.table.TableModel;
+import javax.swing.text.AttributeSet;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Document;
+import javax.swing.text.PlainDocument;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.ByteArrayInputStream;
@@ -40,40 +48,6 @@
import java.util.Iterator;
import java.util.ResourceBundle;
import java.util.Vector;
-
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.BoxLayout;
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JScrollPane;
-import javax.swing.JSplitPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JTable;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.ListSelectionModel;
-import javax.swing.SwingConstants;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.border.TitledBorder;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import javax.swing.plaf.basic.BasicButtonListener;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableColumn;
-import javax.swing.table.TableModel;
-import javax.swing.text.AttributeSet;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.Document;
-import javax.swing.text.PlainDocument;
/**
Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/broker/BrokerWrapper.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/broker/BrokerWrapper.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/broker/BrokerWrapper.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/broker/BrokerWrapper.java Wed Feb 2 12:45:59 2005
@@ -15,8 +15,7 @@
*/
package org.apache.ws.eventing.services.broker;
-import org.apache.axis.message.*;
-
+import org.apache.axis.message.SOAPEnvelope;
import org.apache.ws.eventing.YFilterStore;
Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/broker/EventSourceBindingImpl.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/broker/EventSourceBindingImpl.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/broker/EventSourceBindingImpl.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/broker/EventSourceBindingImpl.java Wed Feb 2 12:45:59 2005
@@ -21,14 +21,13 @@
*/
package org.apache.ws.eventing.services.broker;
-import org.apache.axis.message.addressing.*;
-import org.apache.ws.eventing.base.*;
-import org.apache.ws.eventing.YFilterStore;
-
-
-
-import org.apache.axis.utils.XMLUtils;
import org.apache.axis.message.MessageElement;
+import org.apache.axis.message.addressing.EndpointReference;
+import org.apache.axis.message.addressing.ReferenceParametersType;
+import org.apache.axis.utils.XMLUtils;
+import org.apache.ws.eventing.YFilterStore;
+import org.apache.ws.eventing.base.ExpirationType;
+import org.apache.ws.eventing.base.SubscribeResponse;
public class EventSourceBindingImpl implements org.apache.ws.eventing.services.EventSource{
public org.apache.ws.eventing.base.SubscribeResponse subscribeMsg(org.apache.ws.eventing.Subscription body) throws java.rmi.RemoteException {
Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/broker/SubscriptionManagerBindingImpl.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/broker/SubscriptionManagerBindingImpl.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/broker/SubscriptionManagerBindingImpl.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/broker/SubscriptionManagerBindingImpl.java Wed Feb 2 12:45:59 2005
@@ -21,16 +21,16 @@
*/
package org.apache.ws.eventing.services.broker;
-import org.apache.ws.eventing.base.*;
import org.apache.axis.MessageContext;
import org.apache.axis.message.MessageElement;
-
+import org.apache.ws.eventing.Subscription;
+import org.apache.ws.eventing.YFilterStore;
+import org.apache.ws.eventing.base.ExpirationType;
+import org.apache.ws.eventing.base.GetStatusResponse;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import javax.xml.soap.SOAPHeader;
-import org.apache.ws.eventing.Subscription;
-import org.apache.ws.eventing.YFilterStore;
+import javax.xml.soap.SOAPHeader;
public class SubscriptionManagerBindingImpl implements org.apache.ws.eventing.services.SubscriptionManager{
Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/publisher/EventSourceBindingImpl.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/publisher/EventSourceBindingImpl.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/publisher/EventSourceBindingImpl.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/publisher/EventSourceBindingImpl.java Wed Feb 2 12:45:59 2005
@@ -6,14 +6,13 @@
*/
package org.apache.ws.eventing.services.publisher;
-import org.apache.axis.message.addressing.*;
-import org.apache.ws.eventing.base.*;
-import org.apache.ws.eventing.YFilterStore;
-
-
-
-import org.apache.axis.utils.XMLUtils;
import org.apache.axis.message.MessageElement;
+import org.apache.axis.message.addressing.EndpointReference;
+import org.apache.axis.message.addressing.ReferenceParametersType;
+import org.apache.axis.utils.XMLUtils;
+import org.apache.ws.eventing.YFilterStore;
+import org.apache.ws.eventing.base.ExpirationType;
+import org.apache.ws.eventing.base.SubscribeResponse;
public class EventSourceBindingImpl implements org.apache.ws.eventing.services.EventSource{
public org.apache.ws.eventing.base.SubscribeResponse subscribeMsg(org.apache.ws.eventing.Subscription body) throws java.rmi.RemoteException {
Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/publisher/SubscriptionManagerBindingImpl.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/publisher/SubscriptionManagerBindingImpl.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/publisher/SubscriptionManagerBindingImpl.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/publisher/SubscriptionManagerBindingImpl.java Wed Feb 2 12:45:59 2005
@@ -6,16 +6,16 @@
*/
package org.apache.ws.eventing.services.publisher;
-import org.apache.ws.eventing.base.*;
import org.apache.axis.MessageContext;
import org.apache.axis.message.MessageElement;
-
+import org.apache.ws.eventing.Subscription;
+import org.apache.ws.eventing.YFilterStore;
+import org.apache.ws.eventing.base.ExpirationType;
+import org.apache.ws.eventing.base.GetStatusResponse;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import javax.xml.soap.SOAPHeader;
-import org.apache.ws.eventing.Subscription;
-import org.apache.ws.eventing.YFilterStore;
+import javax.xml.soap.SOAPHeader;
public class SubscriptionManagerBindingImpl implements org.apache.ws.eventing.services.SubscriptionManager{
Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/subscriber/Notifier.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/subscriber/Notifier.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/subscriber/Notifier.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/subscriber/Notifier.java Wed Feb 2 12:45:59 2005
@@ -1,7 +1,6 @@
package org.apache.ws.eventing.services.subscriber;
-import org.apache.axis.message.*;
-
+import org.apache.axis.message.SOAPEnvelope;
import org.apache.ws.eventing.SubscriberStore;
Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/Subscription.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/base/Subscription.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/Subscription.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/Subscription.java Wed Feb 2 12:45:59 2005
@@ -19,7 +19,7 @@
import org.apache.ws.resource.properties.query.QueryExpression;
import org.apache.ws.resource.lifetime.ScheduledResourceTerminationResource;
import org.apache.ws.notification.topics.TopicExpression;
-import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceType;
+import org.apache.ws.addressing.EndpointReference;
/**
* Interface to be implemented by subscription resources. Exposes the information
@@ -64,7 +64,7 @@
*/
Resource getResource() throws Exception;
- void setEpr(EndpointReferenceType epr);
+ void setEpr(EndpointReference epr);
- EndpointReferenceType getEpr();
+ EndpointReference getEpr();
}
Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/AbstractSubscription.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/AbstractSubscription.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/AbstractSubscription.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/AbstractSubscription.java Wed Feb 2 12:45:59 2005
@@ -36,7 +36,7 @@
import org.apache.ws.resource.properties.query.QueryExpression;
import org.apache.ws.util.uuid.UuidGenerator;
import org.apache.ws.util.uuid.UuidGeneratorFactory;
-import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceType;
+import org.apache.ws.addressing.EndpointReference;
import javax.naming.Context;
import javax.naming.InitialContext;
@@ -55,8 +55,8 @@
private static final Log LOG =
LogFactory.getLog( AbstractSubscription.class.getName() );
- protected EndpointReferenceType m_consumerReference;
- protected EndpointReferenceType m_producerReference;
+ protected EndpointReference m_consumerReference;
+ protected EndpointReference m_producerReference;
protected Object m_policy;
protected QueryExpression m_precondition;
protected QueryExpression m_selector;
@@ -69,7 +69,7 @@
protected Calendar m_creationTime;
protected String m_id = null;
- protected EndpointReferenceType m_epr;
+ protected EndpointReference m_epr;
transient protected ResourcePropertySet m_propSet;
@@ -101,7 +101,7 @@
return m_creationTime;
}
- public EndpointReferenceType getConsumerReference()
+ public EndpointReference getConsumerReference()
{
return m_consumerReference;
}
@@ -116,7 +116,7 @@
return m_precondition;
}
- public EndpointReferenceType getProducerReference()
+ public EndpointReference getProducerReference()
{
return m_producerReference;
}
@@ -177,8 +177,8 @@
* @param topicExpression The topic expression for this subscription
* @param useNotify Whether to use raw notifications or not.
*/
- public AbstractSubscription( EndpointReferenceType consumerReference,
- EndpointReferenceType producerReference,
+ public AbstractSubscription( EndpointReference consumerReference,
+ EndpointReference producerReference,
Calendar initialTerminationTime,
Object policy,
QueryExpression precondition,
@@ -319,12 +319,12 @@
return null; //To change body of implemented methods use File | Settings | File Templates.
}
- public EndpointReferenceType getEpr()
+ public EndpointReference getEpr()
{
return m_epr;
}
- public void setEpr(EndpointReferenceType epr)
+ public void setEpr(EndpointReference epr)
{
m_epr = epr;
}
Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/SubscriptionHome.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/SubscriptionHome.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/SubscriptionHome.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/SubscriptionHome.java Wed Feb 2 12:45:59 2005
@@ -28,12 +28,15 @@
import org.apache.ws.notification.base.Subscription;
import org.apache.ws.notification.topics.TopicExpression;
import org.apache.ws.util.XmlBeanUtils;
+import org.apache.ws.addressing.EndpointReference;
+import org.apache.ws.addressing.XmlBeansEndpointReference;
+import org.apache.ws.XmlObjectWrapper;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlCursor;
-import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceType;
import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceDocument;
import org.xmlsoap.schemas.ws.x2003.x03.addressing.AttributedURI;
import org.xmlsoap.schemas.ws.x2003.x03.addressing.ReferencePropertiesType;
+import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceType;
import javax.xml.rpc.JAXRPCException;
import javax.xml.namespace.QName;
@@ -64,8 +67,8 @@
}
public Subscription create( Class subscriptionResourceClass,
- EndpointReferenceType consumerReference,
- EndpointReferenceType producerReference,
+ EndpointReference consumerReference,
+ EndpointReference producerReference,
Calendar initialTerminationTime,
Object policy,
QueryExpression precondition,
@@ -77,13 +80,13 @@
ResourceUnknownException
{
Subscription subscription;
- EndpointReferenceType epr;
+ EndpointReference epr;
try
{
Constructor constructor = subscriptionResourceClass.getConstructor(
new Class[] {
- EndpointReferenceType.class,
- EndpointReferenceType.class,
+ EndpointReference.class,
+ EndpointReference.class,
Calendar.class,
Object.class,
QueryExpression.class,
@@ -106,9 +109,11 @@
}
return subscription;
}
- public EndpointReferenceType getEPR( ResourceKey resourceKey, EndpointReferenceType producerReference )
+ public EndpointReference getEPR( ResourceKey resourceKey, EndpointReference producerReference )
{
- String producerAddress = producerReference.getAddress().getStringValue();
+ //todo maybe make this build a new one a different way??
+
+ String producerAddress = producerReference.getAddress();
String subscriptionAddress = producerAddress.substring( 0, producerAddress.lastIndexOf( "/") + 1) + SERVICE_NAME;
EndpointReferenceDocument eprDoc = EndpointReferenceDocument.Factory.newInstance();
@@ -122,6 +127,6 @@
XmlCursor xmlCursor = xmlObject.newCursor();
xmlCursor.setTextValue(resourceKey.getValue().toString());
xmlCursor.dispose();
- return epr;
+ return new XmlBeansEndpointReference(epr);
}
}
Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/impl/Subscription1_2Resource.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/impl/Subscription1_2Resource.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/impl/Subscription1_2Resource.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/impl/Subscription1_2Resource.java Wed Feb 2 12:45:59 2005
@@ -15,7 +15,6 @@
*=============================================================================*/
package org.apache.ws.notification.base.v1_2.impl;
-import org.apache.ws.notification.topics.TopicExpression;
import org.apache.ws.notification.base.impl.AbstractSubscription;
import org.apache.ws.notification.base.impl.XmlBeansTopicExpression;
import org.apache.ws.notification.base.v1_2.porttype.SubscriptionManagerPortType;
@@ -27,6 +26,8 @@
import org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySet;
import org.apache.ws.resource.properties.query.QueryExpression;
import org.apache.ws.resource.properties.query.impl.XmlBeansQueryExpression;
+import org.apache.ws.addressing.EndpointReference;
+import org.apache.ws.XmlObjectWrapper;
import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.ConsumerReferenceDocument;
import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.CreationTimeDocument;
import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.PreconditionDocument;
@@ -57,7 +58,7 @@
SubscriptionManagerPortType.PROP_QNAME_CREATION_TIME
};
- public Subscription1_2Resource( EndpointReferenceType consumerReference, EndpointReferenceType producerReference,
+ public Subscription1_2Resource( EndpointReference consumerReference, EndpointReference producerReference,
Calendar initialTerminationTime, Object policy, QueryExpression precondition,
QueryExpression selector, ResourceKey producerKey, String producerHomeLocation,
TopicExpression topicExpression, boolean useNotify )
@@ -85,7 +86,7 @@
// wsntw:SubscriptionManager props
prop = m_propSet.get( SubscriptionManagerPortType.PROP_QNAME_CONSUMER_REFERENCE );
ConsumerReferenceDocument consumerRefDoc = ConsumerReferenceDocument.Factory.newInstance();
- consumerRefDoc.setConsumerReference( m_consumerReference );
+ consumerRefDoc.setConsumerReference( (EndpointReferenceType) ((XmlObjectWrapper)m_consumerReference).getXmlObject() );
prop = m_propSet.get( SubscriptionManagerPortType.PROP_QNAME_CREATION_TIME );
CreationTimeDocument creationTimeDoc = CreationTimeDocument.Factory.newInstance();
creationTimeDoc.setCreationTime( m_creationTime );
Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/porttype/impl/NotificationProducerPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/porttype/impl/NotificationProducerPortTypeImpl.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/porttype/impl/NotificationProducerPortTypeImpl.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/porttype/impl/NotificationProducerPortTypeImpl.java Wed Feb 2 12:45:59 2005
@@ -15,27 +15,27 @@
*=============================================================================*/
package org.apache.ws.notification.base.v1_2.porttype.impl;
-import org.apache.ws.notification.topics.TopicExpression;
-import org.apache.ws.notification.base.Subscription;
import org.apache.ws.notification.base.NotificationProducerResource;
-import org.apache.ws.notification.base.impl.XmlBeansTopicExpression;
+import org.apache.ws.notification.base.Subscription;
import org.apache.ws.notification.base.impl.SubscriptionHome;
+import org.apache.ws.notification.base.impl.XmlBeansTopicExpression;
import org.apache.ws.notification.base.v1_2.impl.Subscription1_2Resource;
import org.apache.ws.notification.base.v1_2.porttype.NotificationProducerPortType;
+import org.apache.ws.notification.topics.Topic;
import org.apache.ws.notification.topics.TopicExpression;
import org.apache.ws.notification.topics.TopicSpaceSet;
-import org.apache.ws.notification.topics.Topic;
-import org.apache.ws.notification.topics.topicexpression.impl.TopicExpressionException;
import org.apache.ws.notification.topics.impl.SimpleSubscriptionTopicListener;
+import org.apache.ws.notification.topics.topicexpression.impl.TopicExpressionException;
import org.apache.ws.resource.ResourceContext;
import org.apache.ws.resource.ResourceContextException;
-import org.apache.ws.resource.Resource;
-import org.apache.ws.resource.ResourceException;
import org.apache.ws.resource.impl.AbstractResourceContext;
import org.apache.ws.resource.properties.query.QueryExpression;
import org.apache.ws.resource.properties.query.impl.XmlBeansQueryExpression;
import org.apache.ws.resource.properties.v1_2.porttype.impl.AbstractResourcePropertiesPortType;
import org.apache.ws.util.XmlBeanUtils;
+import org.apache.ws.addressing.XmlBeansEndpointReference;
+import org.apache.ws.addressing.EndpointReference;
+import org.apache.ws.XmlObjectWrapper;
import org.apache.xmlbeans.XmlObject;
import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.GetCurrentMessageDocument;
import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.GetCurrentMessageResponseDocument;
@@ -44,15 +44,13 @@
import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.TopicExpressionType;
import org.xmlsoap.schemas.ws.x2003.x03.addressing.AttributedURI;
import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceDocument;
-import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceType;
import org.xmlsoap.schemas.ws.x2003.x03.addressing.ReferencePropertiesType;
+import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceType;
-import javax.xml.rpc.JAXRPCException;
-import javax.xml.soap.SOAPException;
import javax.naming.Context;
import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.naming.directory.SchemaViolationException;
+import javax.xml.rpc.JAXRPCException;
+import javax.xml.soap.SOAPException;
import java.util.Calendar;
import java.util.Collection;
import java.util.Iterator;
@@ -108,13 +106,13 @@
TopicExpression topicExpr = new XmlBeansTopicExpression( request.getTopicExpression() );
//this prop has default values in schema..it "should" get a value either way if not explicitly set in request
boolean useNotify = request.getUseNotify();
- EndpointReferenceType producerEPR = buildEPR( getResourceContext() );
+ EndpointReference producerEPR = buildEPR( getResourceContext() );
Context initialContext = new InitialContext( );
SubscriptionHome subscriptionHome = (SubscriptionHome) initialContext.lookup( SubscriptionHome.HOME_LOCATION );
- Subscription subscription = subscriptionHome.create(Subscription1_2Resource.class, consumerEPR, producerEPR, initialTerminationTime,subPolicy, precondition, selector,getResourceKey(), ((AbstractResourceContext)getResourceContext()).getResourceHomeLocation(),topicExpr,useNotify );
- epr = subscription.getEpr();
+ Subscription subscription = subscriptionHome.create(Subscription1_2Resource.class, new XmlBeansEndpointReference(consumerEPR), producerEPR, initialTerminationTime,subPolicy, precondition, selector,getResourceKey(), ((AbstractResourceContext)getResourceContext()).getResourceHomeLocation(),topicExpr,useNotify );
+ epr = (EndpointReferenceType) ((XmlObjectWrapper)subscription.getEpr()).getXmlObject();
Collection collection = evaluateTopicExpression(topicExpr);
@@ -155,7 +153,7 @@
return collection;
}
- private static EndpointReferenceType buildEPR( ResourceContext resourceContext )
+ private static XmlBeansEndpointReference buildEPR( ResourceContext resourceContext )
{
EndpointReferenceDocument eprDoc = EndpointReferenceDocument.Factory.newInstance();
EndpointReferenceType epr = eprDoc.addNewEndpointReference();
@@ -171,7 +169,7 @@
{
throw new JAXRPCException( rce );
}
- return epr;
+ return new XmlBeansEndpointReference(epr);
}
public GetCurrentMessageResponseDocument getCurrentMessage( GetCurrentMessageDocument requestDoc )
Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/SimpleSubscriptionTopicListener.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/SimpleSubscriptionTopicListener.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/SimpleSubscriptionTopicListener.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/SimpleSubscriptionTopicListener.java Wed Feb 2 12:45:59 2005
@@ -16,37 +16,35 @@
package org.apache.ws.notification.topics.impl;
+import EDU.oswego.cs.dl.util.concurrent.PooledExecutor;
+import org.apache.axis.message.addressing.EndpointReference;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.ws.XmlObjectWrapper;
import org.apache.ws.notification.base.Subscription;
import org.apache.ws.notification.topics.Topic;
-import org.apache.ws.notification.topics.TopicListener;
-import org.apache.ws.notification.topics.TopicExpressionEngine;
import org.apache.ws.notification.topics.TopicExpression;
+import org.apache.ws.notification.topics.TopicExpressionEngine;
import org.apache.ws.notification.topics.TopicExpressionEvaluator;
+import org.apache.ws.notification.topics.TopicListener;
import org.apache.ws.notification.topics.topicexpression.impl.TopicExpressionException;
import org.apache.ws.pubsub.NotificationConsumer;
import org.apache.ws.pubsub.emitter.EmitterTask;
import org.apache.ws.util.thread.NamedThread;
-import org.apache.ws.XmlObjectWrapper;
-import org.apache.axis.message.addressing.EndpointReference;
import org.apache.xmlbeans.XmlObject;
-import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceType;
-import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.NotifyDocument;
import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.NotificationMessageHolderType;
+import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.NotifyDocument;
import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.TopicExpressionType;
import org.w3c.dom.Document;
+import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceType;
-import java.io.Serializable;
-import java.util.List;
-import java.net.URL;
-
-import EDU.oswego.cs.dl.util.concurrent.PooledExecutor;
-
-import javax.xml.soap.SOAPMessage;
import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPHeader;
import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPHeader;
+import javax.xml.soap.SOAPMessage;
+import java.io.Serializable;
+import java.net.URL;
+import java.util.List;
/**
* Topic listener implementation that will trigger notifications when a topic
@@ -155,9 +153,9 @@
//assumes xmlobject for msg...this needs to change
notificationMessageHolderType.setMessage((XmlObject) msg);
- EndpointReferenceType endpointReferenceType = notificationMessageHolderType.addNewProducerReference();
+
//todo once epr is resolved
- //notificationMessageHolderType.setProducerReference(subscription.getNotificationProducer());
+ notificationMessageHolderType.setProducerReference((EndpointReferenceType) ((XmlObjectWrapper)subscription.getNotificationProducer().getEPR()).getXmlObject());
TopicExpressionEngine engine =
TopicExpressionEngineImpl.getInstance();
Modified: incubator/hermes/trunk/src/java/org/apache/ws/pubsub/emitter/EmitterTask.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/pubsub/emitter/EmitterTask.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/pubsub/emitter/EmitterTask.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/pubsub/emitter/EmitterTask.java Wed Feb 2 12:45:59 2005
@@ -35,8 +35,7 @@
* protocol for the given destination; this factory method must be used to create emitter tasks.
* All subclasses to this class will be responsible for sending notifications over particular protocol
* transports. Each subclass must have a constructor that takes a XML string (the notification message itself),
- * a destination URL and a destination EPR as a
- * {@link org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceType}; these constructors are called by this class' factory method.
+ * a destination URL these constructors are called by this class' factory method.
*/
public abstract class EmitterTask
implements Runnable
Modified: incubator/hermes/trunk/src/java/org/apache/ws/util/thread/NamedThread.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/util/thread/NamedThread.java?view=diff&r1=151048&r2=151049
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/util/thread/NamedThread.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/util/thread/NamedThread.java Wed Feb 2 12:45:59 2005
@@ -31,7 +31,7 @@
extends Thread
{
/** all thread names will have this string as a prefix */
- public static final String THREAD_NAME_PREFIX = "muse.thread.";
+ public static final String THREAD_NAME_PREFIX = "hermes.thread.";
/** number of named threads that have been created */
private static long s_threadCount = 0L;
---------------------------------------------------------------------
To unsubscribe, e-mail: hermes-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: hermes-dev-help@ws.apache.org