You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pubscribe-commits@ws.apache.org by sc...@apache.org on 2005/08/02 18:41:44 UTC

svn commit: r227035 [1/12] - in /webservices/pubscribe/trunk: ./ src/java/org/apache/ws/eventing/ src/java/org/apache/ws/eventing/porttype/ src/java/org/apache/ws/eventing/porttype/impl/ src/java/org/apache/ws/eventing/pubsub/ src/java/org/apache/ws/ev...

Author: scamp
Date: Tue Aug  2 09:41:00 2005
New Revision: 227035

URL: http://svn.apache.org/viewcvs?rev=227035&view=rev
Log:
jalopy

Modified:
    webservices/pubscribe/trunk/project.properties
    webservices/pubscribe/trunk/project.xml
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/AbstractSubscription.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/AbstractSubscriptionHome.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/EchoConsumer.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/ForwardConsumer.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/ForwardEndConsumer.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/Subscription.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/EventSourcePortType.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/NotificationPortType.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/SubscriptionEndPortType.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/SubscriptionManagerPortType.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/impl/EventSourcePortTypeImpl.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/impl/NotificationPortTypeImpl.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/impl/SimpleNotificationPortTypeImpl.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/impl/SubscriptionEndPortTypeImpl.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/impl/SubscriptionManagerPortTypeImpl.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/Publisher.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/Subscriber.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/Subscription.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/SubscriptionHome.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/services/AbstractService.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/services/BrokerService.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/services/PublisherService.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/services/SubscriberService.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/FixedTopicSetResourcePropertyCallback.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/NotificationProducerResource.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/Subscription.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/TopicExpressionDialectsResourcePropertyCallback.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/TopicResourcePropertyCallback.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/WsnNamespaceVersionHolder.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/InvalidTopicExpressionFaultException.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/NoCurrentMessageOnTopicFaultException.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/PauseFailedFaultException.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/ResumeFailedFaultException.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/SubscribeCreationFailedFaultException.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/TopicNotSupportedFaultException.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/TopicPathDialectUnknownFaultException.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/impl/AbstractSubscription.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/impl/XmlBeansTopicExpression.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/BaseNotificationConstants.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionHome.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionResource.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionService.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/WsnNamespaceVersionHolderImpl.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/porttype/NotificationConsumerPortType.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/porttype/NotificationProducerPortType.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/porttype/SubscriptionManagerPortType.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/porttype/impl/NotificationProducerPortTypeImpl.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/porttype/impl/SubscriptionManagerPortTypeImpl.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/pubsub/Publisher.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/pubsub/Subscriber.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/pubsub/Subscription.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/pubsub/SubscriptionHome.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/WsnWsdl2Java.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/WsnWsdl2JavaTask.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/v2004_06/NotificationConsumerPortType2JavaInfo.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/v2004_06/NotificationProducerPortType2JavaInfo.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/v2004_06/SubscriptionManagerPortType2JavaInfo.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/ResourcePropertyValueChangeTopic.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/Topic.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicListener.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicListenerList.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicSet.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicSpace.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicSpaceSet.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/expression/InvalidTopicExpressionException.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/expression/TopicExpression.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/expression/TopicExpressionEngine.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/expression/TopicExpressionEvaluator.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/expression/TopicExpressionException.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/expression/TopicExpressionResolutionException.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/expression/TopicPathDialectUnknownException.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/expression/impl/AbstractTopicExpressionEvaluator.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/expression/impl/ConcreteTopicExpressionEvaluator.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/expression/impl/FullTopicExpressionEvaluator.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/expression/impl/SimpleTopicExpressionEvaluator.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/expression/impl/TopicExpressionEngineImpl.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/ResourcePropertyValueChangeTopicImpl.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/ResourceTerminationTopicImpl.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/SubscriptionTopicListener.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/TopicImpl.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceImpl.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceSetImpl.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/util/TopicSpaceParser.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/util/TopicUtils.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/v2004_06/AbstractTopicExpression.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/v2004_06/TopicsConstants.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/AbstractFilter.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/DeliveryMode.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/Filter.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/FilterFactory.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/NotificationConsumer.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/NotificationProducer.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/NotificationProducerFactory.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/Publisher.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/PublisherFactory.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/Subscription.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/SubscriptionEndConsumer.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/TopicFilter.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/XPathFilter.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/emitter/EmitterException.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/emitter/EmitterTask.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/emitter/file/FileEmitterTask.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/emitter/http/HttpEmitterTask.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/i18n/Keys.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/i18n/MessagesImpl.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/wsaSOAPConnection.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/util/test/PortListen.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/util/thread/NamedThread.java
    webservices/pubscribe/trunk/src/test/org/apache/ws/notification/base/impl/UnitExampleHome.java
    webservices/pubscribe/trunk/src/test/org/apache/ws/notification/base/impl/UnitResource.java
    webservices/pubscribe/trunk/src/test/org/apache/ws/notification/base/impl/UnitResourceContext.java
    webservices/pubscribe/trunk/src/test/org/apache/ws/notification/base/v2004_06/porttype/impl/NotificationProducerPortTypeImplTest.java
    webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/NotifProducer.java
    webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/SubscriptionTopicListenerTestCase.java
    webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/TopicListenerTestObj.java
    webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/impl/ConcreteTopicExpressionEvaluatorTestCase.java
    webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/impl/FullTopicExpressionEvaluatorTestCase.java
    webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/impl/SimpleTopicExpressionEvaluatorTestCase.java

Modified: webservices/pubscribe/trunk/project.properties
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/project.properties?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/project.properties (original)
+++ webservices/pubscribe/trunk/project.properties Tue Aug  2 09:41:00 2005
@@ -34,6 +34,7 @@
 #################
 # Jalopy code style configuration file
 maven.jalopy.style = jalopy-config.xml
+maven.jalopy.fileFormat = UNIX
 
 # XDOC PLUGIN
 ###############

Modified: webservices/pubscribe/trunk/project.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/project.xml?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/project.xml (original)
+++ webservices/pubscribe/trunk/project.xml Tue Aug  2 09:41:00 2005
@@ -12,7 +12,7 @@
   <id>pubscribe</id>
   <name>Pubscribe</name>
   <groupId>pubscribe</groupId>
-  <currentVersion>1.0-SNAPSHOT</currentVersion>
+  <currentVersion>1.0</currentVersion>
   <organization>
     <name>Apache Software Foundation</name>
     <url>http://www.apache.org/</url>
@@ -112,7 +112,7 @@
     <dependency>
       <groupId>wsrf</groupId>
       <artifactId>wsrf</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.0</version>
       <url>http://ws.apache.org/ws-fx/wsrf/</url>
       <properties>
         <license>ApacheLicense-2.0.txt</license>

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/AbstractSubscription.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/AbstractSubscription.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/AbstractSubscription.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/AbstractSubscription.java Tue Aug  2 09:41:00 2005
@@ -1,111 +1,221 @@
-/*
- * Copyright 2001-2004 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.ws.eventing;
-
-import org.apache.ws.addressing.EndpointReference;
-import org.apache.ws.pubsub.NotificationConsumer;
-import org.apache.ws.pubsub.NotificationProducer;
-import org.apache.ws.pubsub.SubscriptionEndConsumer;
-import org.apache.ws.resource.ResourceHome;
-import org.apache.ws.resource.lifetime.ResourceTerminationListener;
-
-import java.util.Calendar;
-
-public abstract class AbstractSubscription implements org.apache.ws.pubsub.Subscription, org.apache.ws.resource.Resource {
-    
-    protected NotificationConsumer consumer;
-    protected SubscriptionEndConsumer endconsumer;
-
-    protected String m_id;
-    protected Calendar m_terminationTime;     
-    protected Calendar m_creationTime;  
-    protected ResourceHome rH;
-    protected boolean m_usenotify;
-    /** The EndpointReference for this resource **/
-    protected EndpointReference m_endpointReference;
-    
-    public void setResourceHome(ResourceHome rH){
-        this.rH=rH;
-    }
-    public void setEpr(EndpointReference epr){
-        this.m_endpointReference=epr;
-    }
-    
-    public Object getID(){
-        return this.m_id;
-    }
-    public void setID(Object id){
-        this.m_id=(String)id;
-    }
-    
-    public void setNotificationConsumer(NotificationConsumer consumer) {
-        this.consumer = consumer;
-    }
-    
-    public void setSubscriptionEndConsumer(SubscriptionEndConsumer endconsumer) {
-        this.endconsumer = endconsumer;
-    }
-     
-    public NotificationConsumer getNotificationConsumer() {
-        return this.consumer;
-    }
-    public SubscriptionEndConsumer getSubscriptionEndConsumer() {
-        return this.endconsumer;
-    }
-    public NotificationProducer getNotificationProducer() {
-        return null;
-    }
-    public java.util.Calendar getCreationTime() {
-        return m_creationTime;
-    }
-    
-    public boolean getUseNotify(){
-        return m_usenotify;
-    }
-    public org.apache.ws.pubsub.Filter getFilters(){
-        return null;
-    }
-    
-    public java.util.Calendar getTerminationTime(){
-        return m_terminationTime;
-    }     
-    public void addTerminationListener(ResourceTerminationListener resourceTerminationListener)
-    {
-        //this is a no op  todo Stefan I need to know if you want to leverege this
-    }
-    /**
-     * Returns the EndpointReference associated with this Resource.
-     *
-     * @return The Resource's EndpointReference or null if the EndpointReference has not been set.
-     *
-     * Note: It is the responsibility of the Resource creator to set the EndpointReference (i.e. ResourceHome impl)
-     */
-    public org.apache.ws.addressing.EndpointReference getEndpointReference()
-    {
-        return m_endpointReference;
-    }
-    /**
-     * Sets the EndpointReference associated with this Resource.
-     *
-     * @param epr The EndpointReference for the Resource.
-     */
-    public void setEndpointReference(org.apache.ws.addressing.EndpointReference epr)
-    {
-       m_endpointReference = epr;
-    }
-
-
-}
+/*=============================================================================*
+ *  Copyright 2004 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.ws.eventing;
+
+import org.apache.ws.addressing.EndpointReference;
+import org.apache.ws.pubsub.NotificationConsumer;
+import org.apache.ws.pubsub.NotificationProducer;
+import org.apache.ws.pubsub.SubscriptionEndConsumer;
+import org.apache.ws.resource.ResourceHome;
+import org.apache.ws.resource.lifetime.ResourceTerminationListener;
+import java.util.Calendar;
+
+/**
+ * DOCUMENT_ME
+ *
+ * @version $Revision: 1.8 $
+ * @author $author$
+ */
+public abstract class AbstractSubscription
+   implements org.apache.ws.pubsub.Subscription,
+              org.apache.ws.resource.Resource
+{
+   /** DOCUMENT_ME */
+   protected NotificationConsumer    consumer;
+
+   /** DOCUMENT_ME */
+   protected SubscriptionEndConsumer endconsumer;
+
+   /** DOCUMENT_ME */
+   protected String       m_id;
+
+   /** DOCUMENT_ME */
+   protected Calendar     m_terminationTime;
+
+   /** DOCUMENT_ME */
+   protected Calendar     m_creationTime;
+
+   /** DOCUMENT_ME */
+   protected ResourceHome rH;
+
+   /** DOCUMENT_ME */
+   protected boolean m_usenotify;
+
+   /** The EndpointReference for this resource **/
+   protected EndpointReference m_endpointReference;
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public java.util.Calendar getCreationTime(  )
+   {
+      return m_creationTime;
+   }
+
+   /**
+    * Sets the EndpointReference associated with this Resource.
+    *
+    * @param epr The EndpointReference for the Resource.
+    */
+   public void setEndpointReference( org.apache.ws.addressing.EndpointReference epr )
+   {
+      m_endpointReference = epr;
+   }
+
+   /**
+    * Returns the EndpointReference associated with this Resource.
+    *
+    * @return The Resource's EndpointReference or null if the EndpointReference has not been set.
+    *
+    * Note: It is the responsibility of the Resource creator to set the EndpointReference (i.e. ResourceHome impl)
+    */
+   public org.apache.ws.addressing.EndpointReference getEndpointReference(  )
+   {
+      return m_endpointReference;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param epr DOCUMENT_ME
+    */
+   public void setEpr( EndpointReference epr )
+   {
+      this.m_endpointReference = epr;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public org.apache.ws.pubsub.Filter getFilters(  )
+   {
+      return null;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param id DOCUMENT_ME
+    */
+   public void setID( Object id )
+   {
+      this.m_id = (String) id;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public Object getID(  )
+   {
+      return this.m_id;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param consumer DOCUMENT_ME
+    */
+   public void setNotificationConsumer( NotificationConsumer consumer )
+   {
+      this.consumer = consumer;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public NotificationConsumer getNotificationConsumer(  )
+   {
+      return this.consumer;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public NotificationProducer getNotificationProducer(  )
+   {
+      return null;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param rH DOCUMENT_ME
+    */
+   public void setResourceHome( ResourceHome rH )
+   {
+      this.rH = rH;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param endconsumer DOCUMENT_ME
+    */
+   public void setSubscriptionEndConsumer( SubscriptionEndConsumer endconsumer )
+   {
+      this.endconsumer = endconsumer;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public SubscriptionEndConsumer getSubscriptionEndConsumer(  )
+   {
+      return this.endconsumer;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public java.util.Calendar getTerminationTime(  )
+   {
+      return m_terminationTime;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public boolean getUseNotify(  )
+   {
+      return m_usenotify;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param resourceTerminationListener DOCUMENT_ME
+    */
+   public void addTerminationListener( ResourceTerminationListener resourceTerminationListener )
+   {
+      //this is a no op  todo Stefan I need to know if you want to leverege this
+   }
+}
\ No newline at end of file

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/AbstractSubscriptionHome.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/AbstractSubscriptionHome.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/AbstractSubscriptionHome.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/AbstractSubscriptionHome.java Tue Aug  2 09:41:00 2005
@@ -1,51 +1,65 @@
-package org.apache.ws.eventing;
-
-import org.apache.ws.resource.impl.AbstractResourceHome;
-import org.apache.commons.collections.map.ReferenceMap;
-
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Collections;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-/**
- * This class should not be modified.
- * <p/>
- * The class acts as an extension of the AbstractResourceHome which
- * maintains a reference to the STATIC map needed for accessing resources via JNDI.
- * <p/>
- * This ensures the resources will be accessible if serialized via JNDI in certain platforms.
- */
-abstract class AbstractSubscriptionHome extends AbstractResourceHome
-{
-    /**
-     * The static reference which is maintained and used by the AbstractResourceHome.
-     * <p/>
-     * Do not modify.
-     */
-    private static Map m_resource;
-
-    /**
-     * Do not modify this method.
-     */
-    protected final Map initResourceMap()
-            throws NamingException
-    {
-        Context initialContext = new InitialContext();
-        if (m_resourceIsPersistent)
-        {
-            m_resources = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.SOFT, true);
-            initCachePolicy(initialContext);
-        }
-        else
-        {
-            m_resources = new HashMap();
-        }
-
-        m_resources = Collections.synchronizedMap(m_resources);
-        return m_resources;
-    }
-
-}
+/*=============================================================================*
+ *  Copyright 2004 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.ws.eventing;
+
+import org.apache.commons.collections.map.ReferenceMap;
+import org.apache.ws.resource.impl.AbstractResourceHome;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * This class should not be modified.
+ * <p/>
+ * The class acts as an extension of the AbstractResourceHome which
+ * maintains a reference to the STATIC map needed for accessing resources via JNDI.
+ * <p/>
+ * This ensures the resources will be accessible if serialized via JNDI in certain platforms.
+ */
+abstract class AbstractSubscriptionHome
+   extends AbstractResourceHome
+{
+   /**
+    * The static reference which is maintained and used by the AbstractResourceHome.
+    * <p/>
+    * Do not modify.
+    */
+   private static Map m_resource;
+
+   /**
+    * Do not modify this method.
+    */
+   protected final Map initResourceMap(  )
+   throws NamingException
+   {
+      Context initialContext = new InitialContext(  );
+      if ( m_resourceIsPersistent )
+      {
+         m_resources = new ReferenceMap( ReferenceMap.HARD, ReferenceMap.SOFT, true );
+         initCachePolicy( initialContext );
+      }
+      else
+      {
+         m_resources = new HashMap(  );
+      }
+
+      m_resources = Collections.synchronizedMap( m_resources );
+      return m_resources;
+   }
+}
\ No newline at end of file

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/EchoConsumer.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/EchoConsumer.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/EchoConsumer.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/EchoConsumer.java Tue Aug  2 09:41:00 2005
@@ -1,62 +1,126 @@
-/*
- * Copyright 2001-2004 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.ws.eventing; 
-import org.apache.ws.addressing.*;
-import org.apache.axis.message.SOAPEnvelope;
-public class EchoConsumer implements org.apache.ws.pubsub.NotificationConsumer {
-    
-    private EndpointReference epr; 
-   
-    public EchoConsumer(String epr)throws org.apache.axis.types.URI.MalformedURIException{
-        org.xmlsoap.schemas.ws.x2004.x08.addressing.EndpointReferenceType e = org.xmlsoap.schemas.ws.x2004.x08.addressing.EndpointReferenceType.Factory.newInstance();
-        org.xmlsoap.schemas.ws.x2004.x08.addressing.AttributedURI auri = org.xmlsoap.schemas.ws.x2004.x08.addressing.AttributedURI.Factory.newInstance(); 
-        auri.setStringValue(epr);
-        e.setAddress(auri);    
-        //wrapper
-        this.epr= new XmlBeansEndpointReference(e);
-    }
-    public EndpointReference getEPR(){
-        return epr;
-    }
-
-    public void setEPR( EndpointReference epr ){
-        this.epr=epr; 
-    }
-
-    public int getMode(){
-        return 0;
-    }
-
-    public void setMode( int mode ){
-        
-    }
-
-    public void notify(org.apache.ws.pubsub.Subscription subscription, Object message ){
-         try{
-             SOAPEnvelope env=(SOAPEnvelope)message;
-             System.out.println("--got notification --");
-             System.out.println(env.toString());
-        }catch(Exception e){
-            e.printStackTrace();
-        }       
-    }
-    
-
-    public void end( org.apache.ws.pubsub.Subscription subscription, java.net.URI status, String reason ){
-        System.out.println("end notification");  
-    }
-    
-}
+/*=============================================================================*
+ *  Copyright 2004 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.ws.eventing;
+
+import org.apache.axis.message.SOAPEnvelope;
+import org.apache.ws.addressing.*;
+
+/**
+ * DOCUMENT_ME
+ *
+ * @version $Revision: 1.8 $
+ * @author $author$
+ */
+public class EchoConsumer
+   implements org.apache.ws.pubsub.NotificationConsumer
+{
+   private EndpointReference epr;
+
+   /**
+    * Creates a new {@link EchoConsumer} object.
+    *
+    * @param epr DOCUMENT_ME
+    *
+    * @throws org.apache.axis.types.URI.MalformedURIException DOCUMENT_ME
+    */
+   public EchoConsumer( String epr )
+   throws org.apache.axis.types.URI.MalformedURIException
+   {
+      org.xmlsoap.schemas.ws.x2004.x08.addressing.EndpointReferenceType e    =
+         org.xmlsoap.schemas.ws.x2004.x08.addressing.EndpointReferenceType.Factory.newInstance(  );
+      org.xmlsoap.schemas.ws.x2004.x08.addressing.AttributedURI         auri =
+         org.xmlsoap.schemas.ws.x2004.x08.addressing.AttributedURI.Factory.newInstance(  );
+      auri.setStringValue( epr );
+      e.setAddress( auri );
+
+      //wrapper
+      this.epr = new XmlBeansEndpointReference( e );
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param epr DOCUMENT_ME
+    */
+   public void setEPR( EndpointReference epr )
+   {
+      this.epr = epr;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public EndpointReference getEPR(  )
+   {
+      return epr;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param mode DOCUMENT_ME
+    */
+   public void setMode( int mode )
+   {
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public int getMode(  )
+   {
+      return 0;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param subscription DOCUMENT_ME
+    * @param status DOCUMENT_ME
+    * @param reason DOCUMENT_ME
+    */
+   public void end( org.apache.ws.pubsub.Subscription subscription,
+                    java.net.URI                      status,
+                    String                            reason )
+   {
+      System.out.println( "end notification" );
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param subscription DOCUMENT_ME
+    * @param message DOCUMENT_ME
+    */
+   public void notify( org.apache.ws.pubsub.Subscription subscription,
+                       Object                            message )
+   {
+      try
+      {
+         SOAPEnvelope env = (SOAPEnvelope) message;
+         System.out.println( "--got notification --" );
+         System.out.println( env.toString(  ) );
+      }
+      catch ( Exception e )
+      {
+         e.printStackTrace(  );
+      }
+   }
+}
\ No newline at end of file

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/ForwardConsumer.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/ForwardConsumer.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/ForwardConsumer.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/ForwardConsumer.java Tue Aug  2 09:41:00 2005
@@ -1,71 +1,110 @@
-/*
- * Copyright 2001-2004 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.ws.eventing;
-import org.apache.ws.addressing.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.ws.pubsub.*;
-
-import javax.xml.soap.*;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-
-public class ForwardConsumer implements org.apache.ws.pubsub.NotificationConsumer {
-    private static final Log LOG = LogFactory.getLog( ForwardConsumer.class.getName() );
-
-    public EndpointReference epr;
-    
-    public ForwardConsumer(EndpointReference epr){        
-        this.epr=epr;        
-    }
-    
-    public EndpointReference getEPR(){
-        return this.epr;
-    }
-
-    public void setEPR( EndpointReference epr ){
-        this.epr=epr;
-    }
-
-
-    public void notify( org.apache.ws.pubsub.Subscription subscription, Object message ){
-        LOG.info("ForwardConsumer :"+this.epr.getAddress()); 
-        try{
-            //now call 
-            wsaSOAPConnection sconn = wsaSOAPConnection.newInstance();
-            MessageFactory mf = MessageFactory.newInstance();
-            SOAPMessage soapm = mf.createMessage();
-            
-            //DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-            //org.w3c.dom.Document dom            = builder.parse(new java.io.ByteArrayInputStream(((String) message).getBytes()));            
-
-            //put Message into SOAPBody
-            if(subscription.getUseNotify()==true){
-                SOAPElement se = soapm.getSOAPBody().addChildElement("http://schemas.xmlsoap.org/ws/2004/08/eventing","Notify");
-                se.addChildElement((SOAPElement)((org.apache.axis.message.SOAPBody)message).getChildElements().next());
-            }else
-                soapm.getSOAPBody().addChildElement((SOAPElement)((org.apache.axis.message.SOAPBody)message).getChildElements().next());
-
-            sconn.call(soapm, epr);
-        }catch(Exception e){
-            e.printStackTrace();
-        }           
-    }
-
-}
+/*=============================================================================*
+ *  Copyright 2004 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.ws.eventing;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ws.addressing.*;
+import org.apache.ws.pubsub.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.soap.*;
+
+/**
+ * DOCUMENT_ME
+ *
+ * @version $Revision: 1.8 $
+ * @author $author$
+ */
+public class ForwardConsumer
+   implements org.apache.ws.pubsub.NotificationConsumer
+{
+   private static final Log LOG = LogFactory.getLog( ForwardConsumer.class.getName(  ) );
+
+   /** DOCUMENT_ME */
+   public EndpointReference epr;
+
+   /**
+    * Creates a new {@link ForwardConsumer} object.
+    *
+    * @param epr DOCUMENT_ME
+    */
+   public ForwardConsumer( EndpointReference epr )
+   {
+      this.epr = epr;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param epr DOCUMENT_ME
+    */
+   public void setEPR( EndpointReference epr )
+   {
+      this.epr = epr;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public EndpointReference getEPR(  )
+   {
+      return this.epr;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param subscription DOCUMENT_ME
+    * @param message DOCUMENT_ME
+    */
+   public void notify( org.apache.ws.pubsub.Subscription subscription,
+                       Object                            message )
+   {
+      LOG.info( "ForwardConsumer :" + this.epr.getAddress(  ) );
+      try
+      {
+         //now call 
+         wsaSOAPConnection sconn = wsaSOAPConnection.newInstance(  );
+         MessageFactory    mf    = MessageFactory.newInstance(  );
+         SOAPMessage       soapm = mf.createMessage(  );
+
+         //DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+         //org.w3c.dom.Document dom            = builder.parse(new java.io.ByteArrayInputStream(((String) message).getBytes()));            
+         //put Message into SOAPBody
+         if ( subscription.getUseNotify(  ) == true )
+         {
+            SOAPElement se =
+               soapm.getSOAPBody(  ).addChildElement( "http://schemas.xmlsoap.org/ws/2004/08/eventing", "Notify" );
+            se.addChildElement( (SOAPElement) ( (org.apache.axis.message.SOAPBody) message ).getChildElements(  )
+                                                .next(  ) );
+         }
+         else
+         {
+            soapm.getSOAPBody(  ).addChildElement( (SOAPElement) ( (org.apache.axis.message.SOAPBody) message ).getChildElements(  )
+                                                                   .next(  ) );
+         }
+
+         sconn.call( soapm, epr );
+      }
+      catch ( Exception e )
+      {
+         e.printStackTrace(  );
+      }
+   }
+}
\ No newline at end of file

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/ForwardEndConsumer.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/ForwardEndConsumer.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/ForwardEndConsumer.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/ForwardEndConsumer.java Tue Aug  2 09:41:00 2005
@@ -1,76 +1,111 @@
-/*
- * Copyright 2001-2004 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.ws.eventing;
-import org.apache.ws.addressing.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.ws.pubsub.*;
-
-import javax.xml.soap.*;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.xmlsoap.schemas.ws.x2004.x08.eventing.SubscriptionEndDocument;
-import org.xmlsoap.schemas.ws.x2004.x08.eventing.SubscriptionEndDocument.SubscriptionEnd;
-import org.xmlsoap.schemas.ws.x2004.x08.eventing.LanguageSpecificStringType;
-
-public class ForwardEndConsumer implements  org.apache.ws.pubsub.SubscriptionEndConsumer {
-    private static final Log LOG = LogFactory.getLog( ForwardEndConsumer.class.getName() );
-
-    public EndpointReference epr;
- 
-    
-    public ForwardEndConsumer(EndpointReference epr){        
-        this.epr=epr;          
-    }
-    
-    public EndpointReference getEPR(){
-        return this.epr;
-    }
-
-    public void setEPR( EndpointReference epr ){
-        this.epr=epr;
-    }
-
-    public void end(org.apache.ws.pubsub.Subscription subscription, String reason){
-        //TODO maybe unsubscribe myself
-        if(epr==null){
-            LOG.info("SubscriptionEnd without notification");
-            return;
-        }
-        //send SubscriptionEnd Notification
-        SubscriptionEndDocument sedom = SubscriptionEndDocument.Factory.newInstance();
-        SubscriptionEndDocument.SubscriptionEnd se = sedom.addNewSubscriptionEnd();
-        LanguageSpecificStringType reasont = se.addNewReason();
-        reasont.setStringValue(reason);
-        try{
-            //now call 
-            wsaSOAPConnection sconn = wsaSOAPConnection.newInstance();
-            MessageFactory mf = MessageFactory.newInstance();
-            SOAPMessage soapm = mf.createMessage();
-            //put XMLbean into SOAPBody
-            soapm.getSOAPBody().addDocument((org.w3c.dom.Document) sedom.newDomNode());
-
-            sconn.call(soapm, epr);
-        }catch(Exception e){
-            e.printStackTrace();
-        }        
-    }
-    
-    
-}
+/*=============================================================================*
+ *  Copyright 2004 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.ws.eventing;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ws.addressing.*;
+import org.apache.ws.pubsub.*;
+import org.xmlsoap.schemas.ws.x2004.x08.eventing.LanguageSpecificStringType;
+import org.xmlsoap.schemas.ws.x2004.x08.eventing.SubscriptionEndDocument;
+import org.xmlsoap.schemas.ws.x2004.x08.eventing.SubscriptionEndDocument.SubscriptionEnd;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.soap.*;
+
+/**
+ * DOCUMENT_ME
+ *
+ * @version $Revision: 1.8 $
+ * @author $author$
+ */
+public class ForwardEndConsumer
+   implements org.apache.ws.pubsub.SubscriptionEndConsumer
+{
+   private static final Log LOG = LogFactory.getLog( ForwardEndConsumer.class.getName(  ) );
+
+   /** DOCUMENT_ME */
+   public EndpointReference epr;
+
+   /**
+    * Creates a new {@link ForwardEndConsumer} object.
+    *
+    * @param epr DOCUMENT_ME
+    */
+   public ForwardEndConsumer( EndpointReference epr )
+   {
+      this.epr = epr;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param epr DOCUMENT_ME
+    */
+   public void setEPR( EndpointReference epr )
+   {
+      this.epr = epr;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public EndpointReference getEPR(  )
+   {
+      return this.epr;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param subscription DOCUMENT_ME
+    * @param reason DOCUMENT_ME
+    */
+   public void end( org.apache.ws.pubsub.Subscription subscription,
+                    String                            reason )
+   {
+      //TODO maybe unsubscribe myself
+      if ( epr == null )
+      {
+         LOG.info( "SubscriptionEnd without notification" );
+         return;
+      }
+
+      //send SubscriptionEnd Notification
+      SubscriptionEndDocument                 sedom   = SubscriptionEndDocument.Factory.newInstance(  );
+      SubscriptionEndDocument.SubscriptionEnd se      = sedom.addNewSubscriptionEnd(  );
+      LanguageSpecificStringType              reasont = se.addNewReason(  );
+      reasont.setStringValue( reason );
+      try
+      {
+         //now call 
+         wsaSOAPConnection sconn = wsaSOAPConnection.newInstance(  );
+         MessageFactory    mf    = MessageFactory.newInstance(  );
+         SOAPMessage       soapm = mf.createMessage(  );
+
+         //put XMLbean into SOAPBody
+         soapm.getSOAPBody(  ).addDocument( (org.w3c.dom.Document) sedom.newDomNode(  ) );
+
+         sconn.call( soapm, epr );
+      }
+      catch ( Exception e )
+      {
+         e.printStackTrace(  );
+      }
+   }
+}
\ No newline at end of file

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/Subscription.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/Subscription.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/Subscription.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/Subscription.java Tue Aug  2 09:41:00 2005
@@ -1,18 +1,18 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
+/*=============================================================================*
+ *  Copyright 2004 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
+ *  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.
- */ 
+ *  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.ws.eventing;
 
 import org.apache.commons.id.IdentifierUtils;
@@ -20,62 +20,127 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.ws.pubsub.Filter;
 import org.apache.ws.resource.lifetime.ScheduledResourceTerminationResource;
-
 import java.util.Calendar;
+
 /**
  *
  * @author  Stefan Lischke
  */
-public class Subscription extends AbstractSubscription implements ScheduledResourceTerminationResource{
-    private static final Log LOG = LogFactory.getLog( Subscription.class.getName() );
+public class Subscription
+   extends AbstractSubscription
+   implements ScheduledResourceTerminationResource
+{
+   private static final Log LOG = LogFactory.getLog( Subscription.class.getName(  ) );
+   private String           QueryID;
+   private Filter           m_filter;
+   private java.net.URI     m_delivery;
+
+   /**
+    * Creates a new {@link Subscription} object.
+    *
+    * @param filter DOCUMENT_ME
+    * @param expires DOCUMENT_ME
+    * @param delivery DOCUMENT_ME
+    */
+   public Subscription( Filter       filter,
+                        Calendar     expires,
+                        java.net.URI delivery )
+   {
+      m_id              = IdentifierUtils.UUID_VERSION_FOUR_GENERATOR.nextIdentifier(  ).toString(  );
+      m_creationTime    = Calendar.getInstance(  );
+      m_filter          = filter;
+      setTerminationTime( expires );
+      m_delivery = delivery;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public Calendar getCurrentTime(  )
+   {
+      return Calendar.getInstance(  );
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    *
+    * @throws Exception DOCUMENT_ME
+    */
+   public Filter getFilter(  )
+   throws Exception
+   {
+      //        LOG.info("getFilterString : "+this.subdom.getSubscribe().getFilter().newCursor().getTextValue());
+      return this.m_filter;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param q DOCUMENT_ME
+    */
+   public void setQueryID( String q )
+   {
+      this.QueryID = q;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public String getQueryID(  )
+   {
+      return QueryID;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param terminationTime DOCUMENT_ME
+    */
+   public void setTerminationTime( java.util.Calendar terminationTime )
+   {
+      LOG.info( "Remote setTerminationTime " + terminationTime );
+      m_terminationTime = terminationTime;
+   }
+
+   /**
+    * DOCUMENT_ME
+    */
+   public void destroy(  )
+   {
+      getSubscriptionEndConsumer(  ).end( this, "killya" );
+      LOG.info( "destroyed" );
+   }
+
+   /**
+    * DOCUMENT_ME
+    */
+   public void init(  )
+   {
+      LOG.info( "init" );
+   }
+
+   /**
+    * DOCUMENT_ME
+    */
+   public void unsubscribe(  )
+   {
+      try
+      {
+         this.rH.remove( getID(  ) );
+      }
+      catch ( Exception e )
+      {
+         e.printStackTrace(  );
 
-    private String QueryID;    
-    private Filter m_filter;
-    private java.net.URI m_delivery;
-    public Subscription(Filter filter, Calendar expires, java.net.URI delivery){
-        m_id = IdentifierUtils.UUID_VERSION_FOUR_GENERATOR.nextIdentifier().toString();
-        m_creationTime= Calendar.getInstance();
-        m_filter = filter;
-        setTerminationTime(expires);
-        m_delivery=delivery;
-    }  
-    public Filter getFilter()throws Exception{
-//        LOG.info("getFilterString : "+this.subdom.getSubscribe().getFilter().newCursor().getTextValue());
-        return this.m_filter;
-    }        
-    public String getQueryID(){
-        return QueryID;
-    }
-    public void setQueryID(String q){
-        this.QueryID = q;
-    }
-    public void unsubscribe(){
-        try{
-            this.rH.remove(getID());
-        }catch(Exception e){
-            e.printStackTrace();
-            //TODO
-        }
-        destroy();
-    }
-    
-    public void destroy() {
-        getSubscriptionEndConsumer().end(this,"killya");
-        LOG.info("destroyed");
-    }
-    
-    public void init() {
-        LOG.info("init");
-    }
-
-    public void setTerminationTime(java.util.Calendar terminationTime) {
-        LOG.info("Remote setTerminationTime "+terminationTime);
-        m_terminationTime = terminationTime;        
-    }
-    
-    public Calendar getCurrentTime()
-    {
-        return Calendar.getInstance();
-    }
+         //TODO
+      }
 
-}
+      destroy(  );
+   }
+}
\ No newline at end of file

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java Tue Aug  2 09:41:00 2005
@@ -1,18 +1,18 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
+/*=============================================================================*
+ *  Copyright 2004 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
+ *  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.
- */
+ *  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.ws.eventing;
 
 import edu.berkeley.cs.db.yfilter.filter.EXfilterBasic;
@@ -31,178 +31,260 @@
 import org.apache.ws.resource.ResourceUnknownException;
 import org.apache.ws.resource.impl.AbstractResourceHome;
 import org.apache.ws.resource.properties.NamespaceVersionHolder;
-
 import javax.xml.namespace.QName;
 import java.util.Calendar;
 import java.util.Map;
 
-public class SubscriptionHome extends AbstractResourceHome{
-    private static final Log LOG = LogFactory.getLog( SubscriptionHome.class.getName() );
-    /**  The service endpoint name as registered with the SOAP Platform.  This is useful for building EPR's. **/
-    public static final javax.xml.namespace.QName SERVICE_NAME = javax.xml.namespace.QName.valueOf("{http://ws.apache.org/notification/base/service/SubscriptionManager}SubscriptionManager");
-
-
-    /** The management PortType associated with this resource. This is useful for building EPR's.**/
-    public static final javax.xml.namespace.QName PORT_TYPE = javax.xml.namespace.QName.valueOf("http://ws.apache.org/notification/base/service/SubscriptionManager}SubscriptionManagerPortType");
-
-    /** The WSDL Port name associated with the resource. This is useful for building EPR's. **/
-    public static final String PORT_NAME = "SubscriptionManager";
-
-    /** The name of the resource key for this resource. **/
-    public static final javax.xml.namespace.QName RESOURCE_KEY_NAME = javax.xml.namespace.QName.valueOf("{http://ws.apache.org/notification/base/service/SubscriptionManager}ResourceID");
-
-
-    public static final String HOME_LOCATION = JndiConstants.CONTEXT_NAME_SERVICES + "/" + SERVICE_NAME.getLocalPart() + "/" + JndiConstants.ATOMIC_NAME_HOME;
-
-    public int c=0;
-
-//    private java.util.HashMap subs;
-    private java.util.HashMap queriesBack;
-    private String[] queries;
-
-    EXfilterBasic yfilter;
-    private static final NamespaceVersionHolder SPEC_NAMESPACE_SET = new WsnNamespaceVersionHolderImpl();
-
-    /** Creates a new instance of ResourceHome */
-    public SubscriptionHome() {
-        yfilter = new EXfilterBasic();
- //       subs=  new java.util.HashMap();
-        queriesBack=  new java.util.HashMap();
-        queries=  new String[1000000];
-        LOG.info("ResourceHome"+this.toString());
-    }
-
-    public Subscription create(Filter filter, Calendar expires, java.net.URI delivery){
-        Subscription rs = new Subscription(filter,expires, delivery);
-        rs.setResourceHome(this);
-        String id = (String) rs.getID();
-        //TODO !!!!! woher kommt publisher epr url ??? HACK for tcpmon 12345-8080
-        String subscriptionAddress = "http://localhost:12345/axis/services/SubscriptionManager";
-        EndpointReference subscriptionEPR = getEndpointReference( id );
-        rs.setEpr(subscriptionEPR);
-        addSubscription(rs);
-        return rs;
-    }
-
-/*
- *-------------------------------------------------------------------
+/**
+ * DOCUMENT_ME
+ *
+ * @version $Revision: 1.8 $
+ * @author $author$
  */
+public class SubscriptionHome
+   extends AbstractResourceHome
+{
+   private static final Log LOG = LogFactory.getLog( SubscriptionHome.class.getName(  ) );
+
+   /**  The service endpoint name as registered with the SOAP Platform.  This is useful for building EPR's. **/
+   public static final javax.xml.namespace.QName SERVICE_NAME =
+      javax.xml.namespace.QName.valueOf( "{http://ws.apache.org/notification/base/service/SubscriptionManager}SubscriptionManager" );
+
+   /** The management PortType associated with this resource. This is useful for building EPR's.**/
+   public static final javax.xml.namespace.QName PORT_TYPE =
+      javax.xml.namespace.QName.valueOf( "http://ws.apache.org/notification/base/service/SubscriptionManager}SubscriptionManagerPortType" );
+
+   /** The WSDL Port name associated with the resource. This is useful for building EPR's. **/
+   public static final String PORT_NAME = "SubscriptionManager";
+
+   /** The name of the resource key for this resource. **/
+   public static final javax.xml.namespace.QName RESOURCE_KEY_NAME =
+      javax.xml.namespace.QName.valueOf( "{http://ws.apache.org/notification/base/service/SubscriptionManager}ResourceID" );
+
+   /** DOCUMENT_ME */
+   public static final String HOME_LOCATION =
+      JndiConstants.CONTEXT_NAME_SERVICES + "/" + SERVICE_NAME.getLocalPart(  ) + "/"
+      + JndiConstants.ATOMIC_NAME_HOME;
+   private static final NamespaceVersionHolder SPEC_NAMESPACE_SET = new WsnNamespaceVersionHolderImpl(  );
+
+   /**
+    * Map containing all FilesystemResource instances - this map <em>must</em> be static for
+    * compatibility with certain JNDI providers.
+    */
+   private static Map s_resources;
 
-    private void addSubscription(Subscription s){
-        try{
-            c++;
-            Query query = XPQuery.parseQuery((String)s.getFilter().getExpression(),c);
-            LOG.info("addSubscription "+s.getID()+" query :"+query);
-            yfilter.addQuery(query);
-            add(s);
-            queriesBack.put(s.getID(),query);
-            queries[c]=(String)s.getID();
-        }catch(Exception e){
-            e.printStackTrace();
-        }
-    }
-    /*
-    public Resource find( ResourceKey key ) throws ResourceException {
-        LOG.info("find "+ key.getValue()+" have "+subs.size());
-        if(subs.containsKey(key.getValue())){
-            RemoteSubscription s = (RemoteSubscription)subs.get(key.getValue());
-            return s;
-        }else
-            throw new ResourceUnknownException();
-    }
-    */
-    /**
-     * Removes a resource.
-     *
-     * @throws ResourceUnknownException    if no resource exists with the given key
-     * @throws ResourceException           if any other error occurs.
-     */
-    public void remove( Object id ) throws ResourceException {
-        LOG.info("removeSubscription : "+id);
-        Query q=(Query)queriesBack.get(id);
-        yfilter.deleteQuery(q,q.getQueryId());
-        //TODO remove from Hashmap
-        super.remove(id);
-    }
-
-    public void notify(Object message) {
-        //first check dialect
-        try{
-            org.apache.axis.message.SOAPEnvelope env = (org.apache.axis.message.SOAPEnvelope)message;
-            String xml = org.apache.axis.utils.XMLUtils.ElementToString(env.getBody());
-            LOG.info("Notify: ");
-            LOG.info("--"+xml+"--");
-            //copy
-
-            //first parse and drive YFilter,
-            XMLTree tree = new XMLTree(new java.io.StringReader(xml));
-            yfilter.setEventSequence(tree.getEvents());
-            yfilter.startParsing();
-
-            // print the matched queries //
-            if (SystemGlobals.hasQueries) {
-                yfilter.printQueryResults(System.out);
-            }else{
-                LOG.info("no match");
-            }
-            //get matches
-            java.util.Iterator it= yfilter.getMatchedQueries().iterator();
-            while(it.hasNext()){
-                Integer qid = (Integer) it.next();
-                String sid = queries[qid.intValue()];
-                Subscription s = (Subscription)super.find(sid);
-                //notify matches
-                LOG.info("notify : "+sid);
-                s.getNotificationConsumer().notify(s,env.getBody());
-            }
-            yfilter.clear();
-
-        }catch(Exception e){
-            e.printStackTrace();
-        }
-    }
-
-    public QName getServiceName()
-    {
-        return SERVICE_NAME;
-    }
-
-    public QName getPortType()
-    {
-        return PORT_TYPE;
-    }
-
-    public String getServicePortName()
-    {
-        return PORT_NAME;
-    }
-
-    public QName getResourceKeyNameQName()
-    {
-        return RESOURCE_KEY_NAME;
-    }
-
-    /**
-     * Map containing all FilesystemResource instances - this map <em>must</em> be static for
-     * compatibility with certain JNDI providers.
-     */
-    private static Map s_resources;
-
-    /**
-     * Returns a map of all FilesystemResource instances. Used by the {@link AbstractResourceHome}
-     * superclass.
-     */
-    protected synchronized final Map getResourceMap()
-    {
-        if ( s_resources == null )
-        {
-            s_resources = AbstractResourceHome.createResourceMap( m_resourceIsPersistent );
-        }
-        return s_resources;
-    }
-    public org.apache.ws.resource.properties.NamespaceVersionHolder getNamespaceVersionHolder()
-    {
-        return SPEC_NAMESPACE_SET;
-    }
+   /** DOCUMENT_ME */
+   public int c = 0;
 
-}
+   //    private java.util.HashMap subs;
+   private java.util.HashMap queriesBack;
+   private String[]          queries;
+
+   /** DOCUMENT_ME */
+   EXfilterBasic yfilter;
+
+   /** Creates a new instance of ResourceHome */
+   public SubscriptionHome(  )
+   {
+      yfilter    = new EXfilterBasic(  );
+
+      //       subs=  new java.util.HashMap();
+      queriesBack    = new java.util.HashMap(  );
+      queries        = new String[1000000];
+      LOG.info( "ResourceHome" + this.toString(  ) );
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public org.apache.ws.resource.properties.NamespaceVersionHolder getNamespaceVersionHolder(  )
+   {
+      return SPEC_NAMESPACE_SET;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public QName getPortType(  )
+   {
+      return PORT_TYPE;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public QName getResourceKeyNameQName(  )
+   {
+      return RESOURCE_KEY_NAME;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public QName getServiceName(  )
+   {
+      return SERVICE_NAME;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public String getServicePortName(  )
+   {
+      return PORT_NAME;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param filter DOCUMENT_ME
+    * @param expires DOCUMENT_ME
+    * @param delivery DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public Subscription create( Filter       filter,
+                               Calendar     expires,
+                               java.net.URI delivery )
+   {
+      Subscription rs = new Subscription( filter, expires, delivery );
+      rs.setResourceHome( this );
+      String id = (String) rs.getID(  );
+
+      //TODO !!!!! woher kommt publisher epr url ??? HACK for tcpmon 12345-8080
+      String            subscriptionAddress = "http://localhost:12345/axis/services/SubscriptionManager";
+      EndpointReference subscriptionEPR = getEndpointReference( id );
+      rs.setEpr( subscriptionEPR );
+      addSubscription( rs );
+      return rs;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param message DOCUMENT_ME
+    */
+   public void notify( Object message )
+   {
+      //first check dialect
+      try
+      {
+         org.apache.axis.message.SOAPEnvelope env = (org.apache.axis.message.SOAPEnvelope) message;
+         String                               xml =
+            org.apache.axis.utils.XMLUtils.ElementToString( env.getBody(  ) );
+         LOG.info( "Notify: " );
+         LOG.info( "--" + xml + "--" );
+
+         //copy
+         //first parse and drive YFilter,
+         XMLTree tree = new XMLTree( new java.io.StringReader( xml ) );
+         yfilter.setEventSequence( tree.getEvents(  ) );
+         yfilter.startParsing(  );
+
+         // print the matched queries //
+         if ( SystemGlobals.hasQueries )
+         {
+            yfilter.printQueryResults( System.out );
+         }
+         else
+         {
+            LOG.info( "no match" );
+         }
+
+         //get matches
+         java.util.Iterator it = yfilter.getMatchedQueries(  ).iterator(  );
+         while ( it.hasNext(  ) )
+         {
+            Integer      qid = (Integer) it.next(  );
+            String       sid = queries[qid.intValue(  )];
+            Subscription s   = (Subscription) super.find( sid );
+
+            //notify matches
+            LOG.info( "notify : " + sid );
+            s.getNotificationConsumer(  ).notify( s,
+                                                  env.getBody(  ) );
+         }
+
+         yfilter.clear(  );
+      }
+      catch ( Exception e )
+      {
+         e.printStackTrace(  );
+      }
+   }
+
+   /*
+      public Resource find( ResourceKey key ) throws ResourceException {
+          LOG.info("find "+ key.getValue()+" have "+subs.size());
+          if(subs.containsKey(key.getValue())){
+              RemoteSubscription s = (RemoteSubscription)subs.get(key.getValue());
+              return s;
+          }else
+              throw new ResourceUnknownException();
+      }
+    */
+
+   /**
+    * Removes a resource.
+    *
+    * @throws ResourceUnknownException    if no resource exists with the given key
+    * @throws ResourceException           if any other error occurs.
+    */
+   public void remove( Object id )
+   throws ResourceException
+   {
+      LOG.info( "removeSubscription : " + id );
+      Query q = (Query) queriesBack.get( id );
+      yfilter.deleteQuery( q,
+                           q.getQueryId(  ) );
+
+      //TODO remove from Hashmap
+      super.remove( id );
+   }
+
+   /**
+    * Returns a map of all FilesystemResource instances. Used by the {@link AbstractResourceHome}
+    * superclass.
+    */
+   protected final synchronized Map getResourceMap(  )
+   {
+      if ( s_resources == null )
+      {
+         s_resources = AbstractResourceHome.createResourceMap( m_resourceIsPersistent );
+      }
+
+      return s_resources;
+   }
+
+   /*
+    *-------------------------------------------------------------------
+    */
+   private void addSubscription( Subscription s )
+   {
+      try
+      {
+         c++;
+         Query query = XPQuery.parseQuery( (String) s.getFilter(  ).getExpression(  ), c );
+         LOG.info( "addSubscription " + s.getID(  ) + " query :" + query );
+         yfilter.addQuery( query );
+         add( s );
+         queriesBack.put( s.getID(  ),
+                          query );
+         queries[c] = (String) s.getID(  );
+      }
+      catch ( Exception e )
+      {
+         e.printStackTrace(  );
+      }
+   }
+}
\ No newline at end of file

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/EventSourcePortType.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/EventSourcePortType.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/EventSourcePortType.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/EventSourcePortType.java Tue Aug  2 09:41:00 2005
@@ -1,35 +1,36 @@
-/*
- * Copyright 2001-2004 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.ws.eventing.porttype;
-
-import java.rmi.RemoteException;
-
-import org.xmlsoap.schemas.ws.x2004.x08.eventing.SubscribeDocument;
-import org.xmlsoap.schemas.ws.x2004.x08.eventing.SubscribeResponseDocument;
-
-/**
- * This is the Port of the Publisher,
- * it enables Subscriptions.
- */
-public interface EventSourcePortType {
-    /**
-     * Subscribe
-     * @param body
-     * @throws RemoteException
-     * @return
-     */    
-    SubscribeResponseDocument subscribe(SubscribeDocument body) throws RemoteException;
-}
+/*=============================================================================*
+ *  Copyright 2004 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.ws.eventing.porttype;
+
+import org.xmlsoap.schemas.ws.x2004.x08.eventing.SubscribeDocument;
+import org.xmlsoap.schemas.ws.x2004.x08.eventing.SubscribeResponseDocument;
+import java.rmi.RemoteException;
+
+/**
+ * This is the Port of the Publisher,
+ * it enables Subscriptions.
+ */
+public interface EventSourcePortType
+{
+   /**
+    * Subscribe
+    * @param body
+    * @throws RemoteException
+    * @return
+    */
+   SubscribeResponseDocument subscribe( SubscribeDocument body )
+   throws RemoteException;
+}
\ No newline at end of file

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/NotificationPortType.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/NotificationPortType.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/NotificationPortType.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/NotificationPortType.java Tue Aug  2 09:41:00 2005
@@ -1,22 +1,36 @@
-/*
- * Copyright 2001-2004 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.ws.eventing.porttype;
-import org.apache.axis.message.SOAPEnvelope;
-
-public interface NotificationPortType {
-    void filter(SOAPEnvelope req, SOAPEnvelope resp);
-}
+/*=============================================================================*
+ *  Copyright 2004 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.ws.eventing.porttype;
+
+import org.apache.axis.message.SOAPEnvelope;
+
+/**
+ * DOCUMENT_ME
+ *
+ * @version $Revision: 1.8 $
+ * @author $author$
+ */
+public interface NotificationPortType
+{
+   /**
+    * DOCUMENT_ME
+    *
+    * @param req DOCUMENT_ME
+    * @param resp DOCUMENT_ME
+    */
+   void filter( SOAPEnvelope req,
+                SOAPEnvelope resp );
+}
\ No newline at end of file

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/SubscriptionEndPortType.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/SubscriptionEndPortType.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/SubscriptionEndPortType.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/SubscriptionEndPortType.java Tue Aug  2 09:41:00 2005
@@ -1,23 +1,38 @@
-/*
- * Copyright 2001-2004 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.ws.eventing.porttype;
-
-import java.rmi.RemoteException;
-import org.xmlsoap.schemas.ws.x2004.x08.eventing.SubscriptionEndDocument;
-
-public interface SubscriptionEndPortType {
-    void subscriptionEnd(SubscriptionEndDocument body) throws RemoteException;
-}
+/*=============================================================================*
+ *  Copyright 2004 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.ws.eventing.porttype;
+
+import org.xmlsoap.schemas.ws.x2004.x08.eventing.SubscriptionEndDocument;
+import java.rmi.RemoteException;
+
+/**
+ * DOCUMENT_ME
+ *
+ * @version $Revision: 1.8 $
+ * @author $author$
+ */
+public interface SubscriptionEndPortType
+{
+   /**
+    * DOCUMENT_ME
+    *
+    * @param body DOCUMENT_ME
+    *
+    * @throws RemoteException DOCUMENT_ME
+    */
+   void subscriptionEnd( SubscriptionEndDocument body )
+   throws RemoteException;
+}
\ No newline at end of file

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/SubscriptionManagerPortType.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/SubscriptionManagerPortType.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/SubscriptionManagerPortType.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/SubscriptionManagerPortType.java Tue Aug  2 09:41:00 2005
@@ -1,32 +1,66 @@
-/*
- * Copyright 2001-2004 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.ws.eventing.porttype;
-
-import java.rmi.RemoteException;
-import org.xmlsoap.schemas.ws.x2004.x08.eventing.RenewDocument;
-import org.xmlsoap.schemas.ws.x2004.x08.eventing.RenewResponseDocument;
-import org.xmlsoap.schemas.ws.x2004.x08.eventing.UnsubscribeDocument;
-import org.xmlsoap.schemas.ws.x2004.x08.eventing.GetStatusDocument;
-import org.xmlsoap.schemas.ws.x2004.x08.eventing.GetStatusResponseDocument;
-
-
-public interface SubscriptionManagerPortType {
-    RenewResponseDocument renew(RenewDocument body) throws RemoteException;
-
-    void unsubscribe(UnsubscribeDocument body) throws RemoteException;
-
-    GetStatusResponseDocument getStatus(GetStatusDocument body) throws RemoteException;
-}
+/*=============================================================================*
+ *  Copyright 2004 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.ws.eventing.porttype;
+
+import org.xmlsoap.schemas.ws.x2004.x08.eventing.GetStatusDocument;
+import org.xmlsoap.schemas.ws.x2004.x08.eventing.GetStatusResponseDocument;
+import org.xmlsoap.schemas.ws.x2004.x08.eventing.RenewDocument;
+import org.xmlsoap.schemas.ws.x2004.x08.eventing.RenewResponseDocument;
+import org.xmlsoap.schemas.ws.x2004.x08.eventing.UnsubscribeDocument;
+import java.rmi.RemoteException;
+
+/**
+ * DOCUMENT_ME
+ *
+ * @version $Revision: 1.8 $
+ * @author $author$
+ */
+public interface SubscriptionManagerPortType
+{
+   /**
+    * DOCUMENT_ME
+    *
+    * @param body DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    *
+    * @throws RemoteException DOCUMENT_ME
+    */
+   GetStatusResponseDocument getStatus( GetStatusDocument body )
+   throws RemoteException;
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param body DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    *
+    * @throws RemoteException DOCUMENT_ME
+    */
+   RenewResponseDocument renew( RenewDocument body )
+   throws RemoteException;
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param body DOCUMENT_ME
+    *
+    * @throws RemoteException DOCUMENT_ME
+    */
+   void unsubscribe( UnsubscribeDocument body )
+   throws RemoteException;
+}
\ No newline at end of file