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/10/17 18:36:58 UTC

svn commit: r325923 [1/6] - in /webservices/pubscribe/trunk: ./ src/java/org/apache/ws/ src/java/org/apache/ws/eventing/ src/java/org/apache/ws/eventing/porttype/impl/ src/java/org/apache/ws/eventing/pubsub/ src/java/org/apache/ws/notification/ src/jav...

Author: scamp
Date: Mon Oct 17 09:36:17 2005
New Revision: 325923

URL: http://svn.apache.org/viewcvs?rev=325923&view=rev
Log: (empty)

Modified:
    webservices/pubscribe/trunk/   (props changed)
    webservices/pubscribe/trunk/src/java/org/apache/ws/UnsupportedNamespaceException.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/AbstractSubscription.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/EchoConsumer.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/impl/EventSourcePortTypeImpl.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/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/notification/WsnException.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/WsnRuntime.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/CustomBaseNotificationConstants.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/NotificationProducerResource.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/PauseFailedException.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/ResumeFailedException.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/Subscription.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/SubscriptionManager.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/faults/NoCurrentMessageOnTopicFaultException.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/MessageTypeNotSupportedException.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/impl/NoCurrentMessageOnTopicException.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/impl/NotificationProducerHelper.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/impl/SubscribeCreationFailedException.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/impl/TopicNotSupportedException.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/callback/ConsumerReferenceResourcePropertyCallback.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/callback/PreconditionResourcePropertyCallback.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/callback/SelectorResourcePropertyCallback.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/callback/SubscriptionPolicyResourcePropertyCallback.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/callback/TopicExpressionResourcePropertyCallback.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/callback/UseNotifyResourcePropertyCallback.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/porttype/NotificationConsumerPortType.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/Subscriber.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/pubsub/Subscription.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/Topic.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicNamespace.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicNamespaceRegistry.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicSet.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicsTypeFactory.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicsTypeReader.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicsTypeWriter.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/expression/ConcreteTopicExpression.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/expression/FullTopicExpression.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/expression/SimpleTopicExpression.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/impl/AbstractTopicExpression.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/impl/ResourcePropertyValueChangeListenerImpl.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/ResourceTerminationListenerImpl.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/TopicNamespaceImpl.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSetImpl.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/TopicsConstants.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/v2004_06/TopicsTypeFactoryImpl.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/v2004_06/TopicsTypeReaderImpl.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/v2004_06/TopicsTypeWriterImpl.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/FilterFactory.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/PublisherFactory.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/TopicFilter.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/emitter/EmitterTask.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/emitter/SoapMessageEmitter.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/emitter/SoapMessageEmitterEngine.java

Propchange: webservices/pubscribe/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Oct 17 09:36:17 2005
@@ -5,3 +5,5 @@
 *.log
 *.iml
 *.bak
+.project
+.classpath

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/UnsupportedNamespaceException.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/UnsupportedNamespaceException.java?rev=325923&r1=325922&r2=325923&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/UnsupportedNamespaceException.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/UnsupportedNamespaceException.java Mon Oct 17 09:36:17 2005
@@ -1,29 +1,34 @@
-/*=============================================================================*
- *  Copyright 2005 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;
-
-/**
- * TODO
- */
-public class UnsupportedNamespaceException extends RuntimeException
-{
-
-    public UnsupportedNamespaceException( String message )
-    {
-        super( message );
-    }
-
-}
+/*=============================================================================*
+ *  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;
+
+
+/**
+ * TODO
+ */
+public class UnsupportedNamespaceException
+   extends RuntimeException
+{
+   /**
+    * Creates a new {@link UnsupportedNamespaceException} object.
+    *
+    * @param message DOCUMENT_ME
+    */
+   public UnsupportedNamespaceException( String message )
+   {
+      super( message );
+   }
+}
\ No newline at end of file

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=325923&r1=325922&r2=325923&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 Mon Oct 17 09:36:17 2005
@@ -34,19 +34,19 @@
               org.apache.ws.resource.Resource
 {
    /** DOCUMENT_ME */
-   protected NotificationConsumer    consumer;
+   protected NotificationConsumer consumer;
 
    /** DOCUMENT_ME */
    protected SubscriptionEndConsumer endconsumer;
 
    /** DOCUMENT_ME */
-   protected String       m_id;
+   protected String m_id;
 
    /** DOCUMENT_ME */
-   protected Calendar     m_terminationTime;
+   protected Calendar m_terminationTime;
 
    /** DOCUMENT_ME */
-   protected Calendar     m_creationTime;
+   protected Calendar m_creationTime;
 
    /** DOCUMENT_ME */
    protected ResourceHome rH;

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=325923&r1=325922&r2=325923&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 Mon Oct 17 09:36:17 2005
@@ -39,7 +39,7 @@
    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 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(  );

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=325923&r1=325922&r2=325923&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 Mon Oct 17 09:36:17 2005
@@ -21,7 +21,6 @@
 import org.apache.ws.pubsub.Filter;
 import org.apache.ws.resource.NamespaceVersionHolder;
 import org.apache.ws.resource.lifetime.ScheduledResourceTerminationResource;
-
 import java.util.Calendar;
 
 /**
@@ -32,7 +31,7 @@
    extends AbstractSubscription
    implements ScheduledResourceTerminationResource
 {
-   private static final Log LOG = LogFactory.getLog( Subscription.class.getName(  ) );
+   private static final Log LOG        = LogFactory.getLog( Subscription.class.getName(  ) );
    private String           QueryID;
    private Filter           m_filter;
    private java.net.URI     m_delivery;
@@ -82,6 +81,16 @@
    /**
     * DOCUMENT_ME
     *
+    * @return DOCUMENT_ME
+    */
+   public NamespaceVersionHolder getNamespaceSet(  )
+   {
+      return null; // TODO
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
     * @param q DOCUMENT_ME
     */
    public void setQueryID( String q )
@@ -145,9 +154,4 @@
 
       destroy(  );
    }
-
-    public NamespaceVersionHolder getNamespaceSet()
-    {
-        return null;  // TODO
-    }
 }

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=325923&r1=325922&r2=325923&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 Mon Oct 17 09:36:17 2005
@@ -23,14 +23,14 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.ws.addressing.EndpointReference;
-import org.apache.ws.notification.base.v2004_06.impl.WsnNamespaceVersionHolderImpl;
 import org.apache.ws.notification.base.CustomBaseNotificationConstants;
+import org.apache.ws.notification.base.v2004_06.impl.WsnNamespaceVersionHolderImpl;
 import org.apache.ws.pubsub.Filter;
 import org.apache.ws.resource.JndiConstants;
+import org.apache.ws.resource.NamespaceVersionHolder;
 import org.apache.ws.resource.ResourceException;
 import org.apache.ws.resource.ResourceUnknownException;
 import org.apache.ws.resource.impl.AbstractResourceHome;
-import org.apache.ws.resource.NamespaceVersionHolder;
 import javax.xml.namespace.QName;
 import java.util.Calendar;
 import java.util.Map;
@@ -46,13 +46,13 @@
 {
    private static final Log LOG = LogFactory.getLog( SubscriptionHome.class.getName(  ) );
 
-    /** The WSDL Port name associated with the resource. This is useful for building EPR's. **/
-    public static final String PORT_NAME = "SubscriptionManager";
+   /** The WSDL Port name associated with the resource. This is useful for building EPR's. **/
+   public static final String PORT_NAME = "SubscriptionManager";
 
-    /** DOCUMENT_ME */
-    public static final String HOME_LOCATION =
-       JndiConstants.CONTEXT_NAME_SERVICES + "/" + CustomBaseNotificationConstants.SERVICE_NAME.getLocalPart(  ) + "/"
-       + JndiConstants.ATOMIC_NAME_HOME;
+   /** DOCUMENT_ME */
+   public static final String HOME_LOCATION =
+      JndiConstants.CONTEXT_NAME_SERVICES + "/" + CustomBaseNotificationConstants.SERVICE_NAME.getLocalPart(  )
+      + "/" + JndiConstants.ATOMIC_NAME_HOME;
    private static final NamespaceVersionHolder SPEC_NAMESPACE_SET = new WsnNamespaceVersionHolderImpl(  );
 
    /**
@@ -147,7 +147,7 @@
    {
       Subscription rs = new Subscription( filter, expires, delivery );
       rs.setResourceHome( this );
-      EndpointReference subscriptionEPR = getEndpointReference( rs.getID() );
+      EndpointReference subscriptionEPR = getEndpointReference( rs.getID(  ) );
       rs.setEpr( subscriptionEPR );
       addSubscription( rs );
       return rs;

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/impl/EventSourcePortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/impl/EventSourcePortTypeImpl.java?rev=325923&r1=325922&r2=325923&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/impl/EventSourcePortTypeImpl.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/impl/EventSourcePortTypeImpl.java Mon Oct 17 09:36:17 2005
@@ -30,7 +30,6 @@
 import org.xmlsoap.schemas.ws.x2004.x08.addressing.EndpointReferenceType;
 import org.xmlsoap.schemas.ws.x2004.x08.eventing.SubscribeDocument;
 import org.xmlsoap.schemas.ws.x2004.x08.eventing.SubscribeResponseDocument;
-
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import java.rmi.RemoteException;

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/impl/SubscriptionEndPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/impl/SubscriptionEndPortTypeImpl.java?rev=325923&r1=325922&r2=325923&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/impl/SubscriptionEndPortTypeImpl.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/impl/SubscriptionEndPortTypeImpl.java Mon Oct 17 09:36:17 2005
@@ -19,8 +19,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.ws.eventing.porttype.SubscriptionEndPortType;
 import org.apache.ws.eventing.pubsub.Subscription;
-import org.apache.ws.resource.ResourceContext;
 import org.apache.ws.resource.NamespaceVersionHolder;
+import org.apache.ws.resource.ResourceContext;
 import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
 import java.rmi.RemoteException;
 

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/impl/SubscriptionManagerPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/impl/SubscriptionManagerPortTypeImpl.java?rev=325923&r1=325922&r2=325923&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/impl/SubscriptionManagerPortTypeImpl.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/porttype/impl/SubscriptionManagerPortTypeImpl.java Mon Oct 17 09:36:17 2005
@@ -17,8 +17,8 @@
 
 import org.apache.ws.eventing.Subscription;
 import org.apache.ws.eventing.porttype.SubscriptionManagerPortType;
-import org.apache.ws.resource.ResourceContext;
 import org.apache.ws.resource.NamespaceVersionHolder;
+import org.apache.ws.resource.ResourceContext;
 import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
 import org.xmlsoap.schemas.ws.x2004.x08.eventing.GetStatusDocument;
 import org.xmlsoap.schemas.ws.x2004.x08.eventing.GetStatusResponseDocument;

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/Subscriber.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/Subscriber.java?rev=325923&r1=325922&r2=325923&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/Subscriber.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/Subscriber.java Mon Oct 17 09:36:17 2005
@@ -59,7 +59,7 @@
    /**
     * DOCUMENT_ME
     */
-   private static final Log  LOG = LogFactory.getLog( Subscriber.class.getName(  ) );
+   private static final Log  LOG              = LogFactory.getLog( Subscriber.class.getName(  ) );
    private static String     WRAPPED_MODE_URI = "http://ws.apache.org/ws-fx/pubscribe/pubsub/wrapped";
    private EndpointReference epr;
    private SubscriptionHome  sH;
@@ -77,7 +77,7 @@
          init( configfile );
 
          //create EPR TODO clean
-         org.xmlsoap.schemas.ws.x2004.x08.addressing.EndpointReferenceType e    =
+         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(  );

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/Subscription.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/Subscription.java?rev=325923&r1=325922&r2=325923&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/Subscription.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/Subscription.java Mon Oct 17 09:36:17 2005
@@ -50,6 +50,16 @@
    /**
     * DOCUMENT_ME
     *
+    * @return DOCUMENT_ME
+    */
+   public NamespaceVersionHolder getNamespaceSet(  )
+   {
+      return null; // TODO
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
     * @param epr DOCUMENT_ME
     */
    public void setSubscriptionManager( EndpointReference epr )
@@ -156,10 +166,4 @@
          e.printStackTrace(  );
       }
    }
-
-    public NamespaceVersionHolder getNamespaceSet()
-    {
-        return null;  // TODO
-    }
-
 }

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/SubscriptionHome.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/SubscriptionHome.java?rev=325923&r1=325922&r2=325923&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/SubscriptionHome.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/SubscriptionHome.java Mon Oct 17 09:36:17 2005
@@ -20,8 +20,8 @@
 import org.apache.ws.notification.base.v2004_06.impl.WsnNamespaceVersionHolderImpl;
 import org.apache.ws.resource.IllegalResourceTypeException;
 import org.apache.ws.resource.JndiConstants;
-import org.apache.ws.resource.impl.AbstractResourceHome;
 import org.apache.ws.resource.NamespaceVersionHolder;
+import org.apache.ws.resource.impl.AbstractResourceHome;
 import javax.xml.namespace.QName;
 import java.util.Map;
 
@@ -50,12 +50,11 @@
    //private static Map m_resources=new java.util.HashMap(); 
 
    /** DOCUMENT_ME */
-   public static final String                  HOME_LOCATION      =
+   public static final String HOME_LOCATION =
       JndiConstants.CONTEXT_NAME_SERVICES + "/" + SERVICE_NAME.getLocalPart(  ) + "/"
       + JndiConstants.ATOMIC_NAME_HOME;
-   private static int                          num                = 0;
-   private static final Log                    LOG                =
-      LogFactory.getLog( SubscriptionHome.class.getName(  ) );
+   private static int         num = 0;
+   private static final Log   LOG = LogFactory.getLog( SubscriptionHome.class.getName(  ) );
    private static final NamespaceVersionHolder SPEC_NAMESPACE_SET = new WsnNamespaceVersionHolderImpl(  );
 
    /**

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/WsnException.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/WsnException.java?rev=325923&r1=325922&r2=325923&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/WsnException.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/WsnException.java Mon Oct 17 09:36:17 2005
@@ -1,24 +1,25 @@
-/*=============================================================================*
- *  Copyright 2005 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.notification;
-
-/**
- * TODO
- */
-public class WsnException extends Exception
-{
-
-}
+/*=============================================================================*
+ *  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.notification;
+
+
+/**
+ * TODO
+ */
+public class WsnException
+   extends Exception
+{
+}
\ No newline at end of file

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/WsnRuntime.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/WsnRuntime.java?rev=325923&r1=325922&r2=325923&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/WsnRuntime.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/WsnRuntime.java Mon Oct 17 09:36:17 2005
@@ -1,55 +1,72 @@
-/*=============================================================================*
- *  Copyright 2005 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.notification;
-
-import org.apache.ws.notification.topics.expression.TopicExpressionEngine;
-
-/**
- * A singleton respresenting the WSN runtime.
- */
-public class WsnRuntime
-{
-
-    private static final WsnRuntime INSTANCE = new WsnRuntime();
-    private static final String VERSION = "1.1";
-
-    private TopicExpressionEngine m_topicExprEngine;
-
-    private WsnRuntime()
-    {
-    }
-
-    public static WsnRuntime getRuntime()
-    {
-        return INSTANCE;
-    }
-
-    public String getVersion()
-    {
-        return VERSION;
-    }
-
-    public TopicExpressionEngine getTopicExpressionEngine()
-    {
-        return m_topicExprEngine;
-    }
-
-    public void setTopicExpressionEngine( TopicExpressionEngine topicExprEngine )
-    {
-        m_topicExprEngine = topicExprEngine;
-    }
-
-}
+/*=============================================================================*
+ *  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.notification;
+
+import org.apache.ws.notification.topics.expression.TopicExpressionEngine;
+
+/**
+ * A singleton respresenting the WSN runtime.
+ */
+public class WsnRuntime
+{
+   private static final WsnRuntime INSTANCE = new WsnRuntime(  );
+   private static final String     VERSION = "1.1";
+   private TopicExpressionEngine   m_topicExprEngine;
+
+   private WsnRuntime(  )
+   {
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public static WsnRuntime getRuntime(  )
+   {
+      return INSTANCE;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param topicExprEngine DOCUMENT_ME
+    */
+   public void setTopicExpressionEngine( TopicExpressionEngine topicExprEngine )
+   {
+      m_topicExprEngine = topicExprEngine;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public TopicExpressionEngine getTopicExpressionEngine(  )
+   {
+      return m_topicExprEngine;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public String getVersion(  )
+   {
+      return VERSION;
+   }
+}
\ No newline at end of file

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/CustomBaseNotificationConstants.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/CustomBaseNotificationConstants.java?rev=325923&r1=325922&r2=325923&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/CustomBaseNotificationConstants.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/CustomBaseNotificationConstants.java Mon Oct 17 09:36:17 2005
@@ -1,22 +1,38 @@
-package org.apache.ws.notification.base;
-
-import javax.xml.namespace.QName;
-
-/**
- * Constants for our impl of SubscriptionManager
- * 
- * @author Sal Campana
- */
-public interface CustomBaseNotificationConstants
-{
-    String TARGET_NAMESPACE = "http://ws.apache.org/notification/base/service/SubscriptionManager";
-    /**  The service endpoint name as registered with the SOAP Platform.  This is useful for building EPR's. **/
-    javax.xml.namespace.QName SERVICE_NAME = new QName(TARGET_NAMESPACE,"SubscriptionManager" );
-
-    /** The management PortType associated with this resource. This is useful for building EPR's.**/
-    javax.xml.namespace.QName PORT_TYPE = new QName(TARGET_NAMESPACE,"SubscriptionManagerPortType" );
-
-    /** The name of the resource key for this resource. **/
-    javax.xml.namespace.QName RESOURCE_KEY_NAME = new QName(TARGET_NAMESPACE,"ResourceID" );
-
-}
+/*=============================================================================*
+ *  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.notification.base;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Constants for our impl of SubscriptionManager
+ *
+ * @author Sal Campana
+ */
+public interface CustomBaseNotificationConstants
+{
+   /** DOCUMENT_ME */
+   String TARGET_NAMESPACE = "http://ws.apache.org/notification/base/service/SubscriptionManager";
+
+   /**  The service endpoint name as registered with the SOAP Platform.  This is useful for building EPR's. **/
+   javax.xml.namespace.QName SERVICE_NAME = new QName( TARGET_NAMESPACE, "SubscriptionManager" );
+
+   /** The management PortType associated with this resource. This is useful for building EPR's.**/
+   javax.xml.namespace.QName PORT_TYPE = new QName( TARGET_NAMESPACE, "SubscriptionManagerPortType" );
+
+   /** The name of the resource key for this resource. **/
+   javax.xml.namespace.QName RESOURCE_KEY_NAME = new QName( TARGET_NAMESPACE, "ResourceID" );
+}
\ No newline at end of file

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/NotificationProducerResource.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/NotificationProducerResource.java?rev=325923&r1=325922&r2=325923&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/NotificationProducerResource.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/NotificationProducerResource.java Mon Oct 17 09:36:17 2005
@@ -26,7 +26,6 @@
 import org.apache.ws.notification.topics.expression.TopicPathDialectUnknownException;
 import org.apache.ws.resource.PropertiesResource;
 import org.apache.ws.resource.properties.query.QueryExpression;
-
 import java.util.Calendar;
 
 /**
@@ -35,55 +34,62 @@
  * {@link org.apache.ws.resource.properties.ResourcePropertySet}.
  */
 public interface NotificationProducerResource
-        extends PropertiesResource
+   extends PropertiesResource
 {
-
-    /**
-     * Returns the set of topics supported by this NotificationProducer.
-     *
-     * @return the set of topics supported by this NotificationProducer
-     */
-    TopicSet getTopicSet();
-
-    /**
-     * Publishes the given message to the topic identified by the given topic expression.
-     *
-     * @param topic a topic expression describing EXACTLY ONE topic
-     * @param msg   the notification message to be published - may be a {@link org.w3c.dom.Node}
-     *              or an {@link org.apache.xmlbeans.XmlObject}
-     */
-    void publish( TopicExpression topic, Object msg ) throws
-            TopicNotSupportedException,
-            InvalidTopicExpressionException,
-            MessageTypeNotSupportedException;
-
-    /**
-     * Subscribe to the topic(s) indicated by the specified topic expression.
-     * Notifications for the subscription will be sent to the specified
-     * consumer EPR. Other optional parameters may also be specified.
-     *
-     * @param consumerEPR
-     * @param topicExpr
-     * @param useNotify
-     * @param precondition
-     * @param selector
-     * @param subscriptionPolicy
-     * @param initialTerminationtime
-     *
-     * @return
-     */
-    EndpointReference subscribe( EndpointReference consumerEPR, TopicExpression topicExpr, Boolean useNotify, QueryExpression precondition, QueryExpression selector, Object subscriptionPolicy, Calendar initialTerminationtime )
-            throws SubscribeCreationFailedException, InvalidTopicExpressionException, TopicPathDialectUnknownException;
-
-    /**
-     * Returns the current message for the specified topic (i.e. the last message that was published to the topic).
-     *
-     * @param topicExpr a topic expression describing EXACTLY ONE topic
-     * @return
-     */
-    Object getCurrentMessage( org.apache.ws.notification.topics.expression.TopicExpression topicExpr )
-            throws InvalidTopicExpressionException,
-            TopicNotSupportedException,
-            NoCurrentMessageOnTopicException;
-
+   /**
+    * Returns the current message for the specified topic (i.e. the last message that was published to the topic).
+    *
+    * @param topicExpr a topic expression describing EXACTLY ONE topic
+    * @return
+    */
+   Object getCurrentMessage( org.apache.ws.notification.topics.expression.TopicExpression topicExpr )
+   throws InvalidTopicExpressionException, 
+          TopicNotSupportedException, 
+          NoCurrentMessageOnTopicException;
+
+   /**
+    * Returns the set of topics supported by this NotificationProducer.
+    *
+    * @return the set of topics supported by this NotificationProducer
+    */
+   TopicSet getTopicSet(  );
+
+   /**
+    * Publishes the given message to the topic identified by the given topic expression.
+    *
+    * @param topic a topic expression describing EXACTLY ONE topic
+    * @param msg   the notification message to be published - may be a {@link org.w3c.dom.Node}
+    *              or an {@link org.apache.xmlbeans.XmlObject}
+    */
+   void publish( TopicExpression topic,
+                 Object          msg )
+   throws TopicNotSupportedException, 
+          InvalidTopicExpressionException, 
+          MessageTypeNotSupportedException;
+
+   /**
+    * Subscribe to the topic(s) indicated by the specified topic expression.
+    * Notifications for the subscription will be sent to the specified
+    * consumer EPR. Other optional parameters may also be specified.
+    *
+    * @param consumerEPR
+    * @param topicExpr
+    * @param useNotify
+    * @param precondition
+    * @param selector
+    * @param subscriptionPolicy
+    * @param initialTerminationtime
+    *
+    * @return
+    */
+   EndpointReference subscribe( EndpointReference consumerEPR,
+                                TopicExpression   topicExpr,
+                                Boolean           useNotify,
+                                QueryExpression   precondition,
+                                QueryExpression   selector,
+                                Object            subscriptionPolicy,
+                                Calendar          initialTerminationtime )
+   throws SubscribeCreationFailedException, 
+          InvalidTopicExpressionException, 
+          TopicPathDialectUnknownException;
 }

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/PauseFailedException.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/PauseFailedException.java?rev=325923&r1=325922&r2=325923&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/PauseFailedException.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/PauseFailedException.java Mon Oct 17 09:36:17 2005
@@ -1,33 +1,41 @@
-/*=============================================================================*
- *  Copyright 2005 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.notification.base;
-
-/**
- * TODO
- */
-public class PauseFailedException extends Exception
-{
-
-    public PauseFailedException( Throwable cause )
-    {
-        super( cause );
-    }
-
-    public PauseFailedException()
-    {
-    }
-
-}
+/*=============================================================================*
+ *  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.notification.base;
+
+
+/**
+ * TODO
+ */
+public class PauseFailedException
+   extends Exception
+{
+   /**
+    * Creates a new {@link PauseFailedException} object.
+    *
+    * @param cause DOCUMENT_ME
+    */
+   public PauseFailedException( Throwable cause )
+   {
+      super( cause );
+   }
+
+   /**
+    * Creates a new {@link PauseFailedException} object.
+    */
+   public PauseFailedException(  )
+   {
+   }
+}
\ No newline at end of file

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/ResumeFailedException.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/ResumeFailedException.java?rev=325923&r1=325922&r2=325923&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/ResumeFailedException.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/ResumeFailedException.java Mon Oct 17 09:36:17 2005
@@ -1,33 +1,41 @@
-/*=============================================================================*
- *  Copyright 2005 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.notification.base;
-
-/**
- * TODO
- */
-public class ResumeFailedException extends Exception
-{
-
-    public ResumeFailedException( Throwable cause )
-    {
-        super( cause );
-    }
-
-    public ResumeFailedException()
-    {
-    }
-    
-}
+/*=============================================================================*
+ *  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.notification.base;
+
+
+/**
+ * TODO
+ */
+public class ResumeFailedException
+   extends Exception
+{
+   /**
+    * Creates a new {@link ResumeFailedException} object.
+    *
+    * @param cause DOCUMENT_ME
+    */
+   public ResumeFailedException( Throwable cause )
+   {
+      super( cause );
+   }
+
+   /**
+    * Creates a new {@link ResumeFailedException} object.
+    */
+   public ResumeFailedException(  )
+   {
+   }
+}
\ No newline at end of file

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/Subscription.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/Subscription.java?rev=325923&r1=325922&r2=325923&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/Subscription.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/Subscription.java Mon Oct 17 09:36:17 2005
@@ -28,143 +28,143 @@
  * resource lifetime-related state.
  */
 public interface Subscription
-        extends PropertiesResource,
-        org.apache.ws.pubsub.Subscription,
-        ScheduledResourceTerminationResource
+   extends PropertiesResource,
+           org.apache.ws.pubsub.Subscription,
+           ScheduledResourceTerminationResource
 {
-
-    /**
-     * Gets the producer EPR associated with this subscription. Note, the producer EPR property is read-only.
-     *
-     * @return the producer EPR associated with this subscription
-     */
-    EndpointReference getProducerReference();
-
-    /**
-     * Gets the consumer EPR associated with this subscription.
-     *
-     * @return the consumer EPR associated with this subscription
-     */
-    EndpointReference getConsumerReference();
-
-    /**
-     * Sets the consumer EPR associated with this subscription.
-     *
-     * @param consumerRef the consumer EPR to be associated with this subscription
-     */
-    void setConsumerReference( EndpointReference consumerRef );
-
-    /**
-     * Gets the topic expression associated with this subscription.
-     *
-     * @return the topic expression associated with this subscription
-     */
-    TopicExpression getTopicExpression();
-
-    /**
-     * Sets the topic expression associated with this subscription.
-     *
-     * @param topicExpr the topic expression to be associated with this subscription
-     */
-    void setTopicExpression( TopicExpression topicExpr );
-
-    /**
-     * Sets the policy for the subscription
-     *
-     * @param policy
-     */
-    void setPolicy( Object policy );
-
-    /**
-     * Gets the policy for this subscription.
-     *
-     * @return the policy for the subscription, or null if no policy is defined
-     */
-    Object getPolicy();
-
-    /**
-     * Sets the precondition for the subscription.
-     *
-     * @param precondition
-     */
-    void setPrecondition( QueryExpression precondition );
-
-    /**
-     * Gets the precondition associated with this subscription.
-     *
-     * @return the precondition, or null if no precondition was specified in the subscribe request
-     */
-    QueryExpression getPrecondition();
-
-    /**
-     * Gets the producer resource associated with this subscription.
-     *
-     * @return the producer resource
-     */
-    NotificationProducerResource getProducerResource();
-
-    /**
-     * Sets the selector for the subscription
-     *
-     * @param selector
-     */
-    void setSelector( QueryExpression selector );
-
-    /**
-     * Gets the selector associated with this subscription.
-     *
-     * @return the selector, or null if no selector was specified in the subscribe request
-     */
-    QueryExpression getSelector();
-
-    /**
-     * Sets the boolean useNotify flag on the subscription to determine if the notification is wrapped in a Notify
-     * element.
-     *
-     * @param useNotify
-     */
-    void setUseNotify( boolean useNotify );
-
-    /**
-     * Wrap notification messages in the notify element?
-     *
-     * @return true (default) if notify should be used, or false if not
-     */
-    boolean getUseNotify();
-
-    /**
-     * Temporarily suspends the delivery of notification messages for this subscription.
-     *
-     * @throws PauseFailedException if unable to suspend message delivery
-     */
-    void pause() throws PauseFailedException;
-
-    /**
-     * Resumes the delivery of notification messages for this subscription.
-     *
-     * @throws ResumeFailedException if unable to resume message delivery
-     */
-    void resume() throws ResumeFailedException;
-
-    /**
-     * Returns true if this subscription is currently paused, or false otherwise.
-     *
-     * @return true if this subscription is currently paused, or false otherwise
-     */
-    boolean isPaused();
-
-    /**
-     * This method exists for the Pubsub abstraction layer.
-     *
-     * @param notificationConsumer
-     */
-    void setNotificationConsumer( NotificationConsumer notificationConsumer );
-
-    /**
-     * This method exists for the Pubsub abstraction layer.
-     *
-     * @param notificationProducer
-     */
-    void setNotificationProducer( NotificationProducer notificationProducer );
-
+   /**
+    * Sets the consumer EPR associated with this subscription.
+    *
+    * @param consumerRef the consumer EPR to be associated with this subscription
+    */
+   void setConsumerReference( EndpointReference consumerRef );
+
+   /**
+    * Gets the consumer EPR associated with this subscription.
+    *
+    * @return the consumer EPR associated with this subscription
+    */
+   EndpointReference getConsumerReference(  );
+
+   /**
+    * This method exists for the Pubsub abstraction layer.
+    *
+    * @param notificationConsumer
+    */
+   void setNotificationConsumer( NotificationConsumer notificationConsumer );
+
+   /**
+    * This method exists for the Pubsub abstraction layer.
+    *
+    * @param notificationProducer
+    */
+   void setNotificationProducer( NotificationProducer notificationProducer );
+
+   /**
+    * Returns true if this subscription is currently paused, or false otherwise.
+    *
+    * @return true if this subscription is currently paused, or false otherwise
+    */
+   boolean isPaused(  );
+
+   /**
+    * Sets the policy for the subscription
+    *
+    * @param policy
+    */
+   void setPolicy( Object policy );
+
+   /**
+    * Gets the policy for this subscription.
+    *
+    * @return the policy for the subscription, or null if no policy is defined
+    */
+   Object getPolicy(  );
+
+   /**
+    * Sets the precondition for the subscription.
+    *
+    * @param precondition
+    */
+   void setPrecondition( QueryExpression precondition );
+
+   /**
+    * Gets the precondition associated with this subscription.
+    *
+    * @return the precondition, or null if no precondition was specified in the subscribe request
+    */
+   QueryExpression getPrecondition(  );
+
+   /**
+    * Gets the producer EPR associated with this subscription. Note, the producer EPR property is read-only.
+    *
+    * @return the producer EPR associated with this subscription
+    */
+   EndpointReference getProducerReference(  );
+
+   /**
+    * Gets the producer resource associated with this subscription.
+    *
+    * @return the producer resource
+    */
+   NotificationProducerResource getProducerResource(  );
+
+   /**
+    * Sets the selector for the subscription
+    *
+    * @param selector
+    */
+   void setSelector( QueryExpression selector );
+
+   /**
+    * Gets the selector associated with this subscription.
+    *
+    * @return the selector, or null if no selector was specified in the subscribe request
+    */
+   QueryExpression getSelector(  );
+
+   /**
+    * Sets the topic expression associated with this subscription.
+    *
+    * @param topicExpr the topic expression to be associated with this subscription
+    */
+   void setTopicExpression( TopicExpression topicExpr );
+
+   /**
+    * Gets the topic expression associated with this subscription.
+    *
+    * @return the topic expression associated with this subscription
+    */
+   TopicExpression getTopicExpression(  );
+
+   /**
+    * Sets the boolean useNotify flag on the subscription to determine if the notification is wrapped in a Notify
+    * element.
+    *
+    * @param useNotify
+    */
+   void setUseNotify( boolean useNotify );
+
+   /**
+    * Wrap notification messages in the notify element?
+    *
+    * @return true (default) if notify should be used, or false if not
+    */
+   boolean getUseNotify(  );
+
+   /**
+    * Temporarily suspends the delivery of notification messages for this subscription.
+    *
+    * @throws PauseFailedException if unable to suspend message delivery
+    */
+   void pause(  )
+   throws PauseFailedException;
+
+   /**
+    * Resumes the delivery of notification messages for this subscription.
+    *
+    * @throws ResumeFailedException if unable to resume message delivery
+    */
+   void resume(  )
+   throws ResumeFailedException;
 }

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/SubscriptionManager.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/SubscriptionManager.java?rev=325923&r1=325922&r2=325923&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/SubscriptionManager.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/SubscriptionManager.java Mon Oct 17 09:36:17 2005
@@ -1,169 +1,189 @@
-/*=============================================================================*
- *  Copyright 2005 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.notification.base;
-
-import org.apache.ws.notification.base.v2004_06.BaseNotificationConstants;
-import org.apache.ws.notification.base.v2004_06.impl.SubscriptionHome;
-import org.apache.ws.notification.topics.Topic;
-import org.apache.ws.resource.ResourceException;
-import org.apache.ws.resource.ResourceHome;
-import org.apache.ws.resource.WsrfRuntime;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * A singleton that manages all subscriptions.
- */
-public class SubscriptionManager
-{
-
-    private static final SubscriptionManager INSTANCE = new SubscriptionManager();
-
-    /*
-     * Maps producer {@link EndpointReference}s to {@link Map}s of {@link Topic}s to
-     * the ids of the {@link Subscription}s associated with those Topics.
-     */
-    private final Map m_producerToTopicToSubscriptionsMap = Collections.synchronizedMap( new HashMap() );
-
-    private SubscriptionManager()
-    {
-    }
-
-    public static SubscriptionManager getInstance()
-    {
-        return INSTANCE;
-    }
-
-    /**
-     * @param subscription
-     * @param topics
-     */
-    public void addSubscription( Subscription subscription, Topic[] topics )
-    {
-        Map topicToSubscriptionMap = getTopicToSubscriptionMap( subscription );
-        for ( int i = 0; i < topics.length; i++ )
-        {
-            Topic topic = topics[i];
-            List subscriptionIds = (List) topicToSubscriptionMap.get( topic );
-            if ( subscriptionIds == null )
-            {
-                subscriptionIds = new ArrayList();
-                topicToSubscriptionMap.put( topic, subscriptionIds );
-            }
-            synchronized ( subscriptionIds )
-            {
-                subscriptionIds.add( subscription.getID() );
-            }
-        }
-    }
-
-    /**
-     * @param subscription
-     * @param topics
-     */
-    public void removeSubscription( Subscription subscription, Topic[] topics )
-    {
-        Map topicToSubscriptionMap = getTopicToSubscriptionMap( subscription );
-        for ( int i = 0; i < topics.length; i++ )
-        {
-            Topic topic = topics[i];
-            List subscriptionIds = (List) topicToSubscriptionMap.get( topic );
-            synchronized ( subscriptionIds )
-            {
-                subscriptionIds.remove( subscription.getID() );
-            }
-        }
-    }
-
-    /**
-     * @param producerResource
-     * @param topic
-     *
-     * @return the subscriptions associated with the specified topics on the specified producer
-     */
-    public Subscription[] getSubscriptions( NotificationProducerResource producerResource, Topic topic )
-    {
-        List subscriptions = new ArrayList();
-        Map topicToSubscriptionMap = (Map) m_producerToTopicToSubscriptionsMap.get(
-                producerResource.getEndpointReference() );
-        if ( topicToSubscriptionMap != null )
-        {
-            List subscriptionIds = (List) topicToSubscriptionMap.get( topic );
-            if ( subscriptionIds != null )
-            {
-                ResourceHome subMgrHome = getSubscriptionManagerHome( producerResource );
-                synchronized ( subscriptionIds )
-                {
-                    for ( int i = 0; i < subscriptionIds.size(); i++ )
-                    {
-                        String subscriptionId = (String) subscriptionIds.get( i );
-                        Subscription subscription;
-                        try
-                        {
-                            subscription =
-                                    (Subscription) subMgrHome.find( subscriptionId );
-                        }
-                        catch ( ResourceException re )
-                        {
-                            subscriptionIds.remove( i );  // remove stale subscription id from list
-                            continue;
-                        }
-                        subscriptions.add( subscription );
-                    }
-                }
-            }
-        }
-        return (Subscription[]) subscriptions.toArray( new Subscription[0] );
-    }
-
-    public ResourceHome getSubscriptionManagerHome( NotificationProducerResource producerResource )
-    {
-        String baseNotifXsdNsURI = ((WsnNamespaceVersionHolder)producerResource.getNamespaceSet()).getBaseNotificationXsdNamespace();
-        String subMgrServiceName;
-        if ( baseNotifXsdNsURI.equals( BaseNotificationConstants.NSURI_WSNT_SCHEMA ) )
-        {
-            subMgrServiceName = "SubscriptionManager";
-        }
-        else
-        {
-            throw new IllegalArgumentException( "Unsupported WS-BaseNotification XSD namespace URI: " + baseNotifXsdNsURI );
-        }
-        try
-        {
-            return (SubscriptionHome) WsrfRuntime.getRuntime().getResourceHome( subMgrServiceName );
-        }
-        catch ( ResourceException re )
-        {
-            throw new RuntimeException( "Failed to obtain subscription manager home.", re );
-        }
-    }
-
-    private Map getTopicToSubscriptionMap( Subscription subscription )
-    {
-        Map topicToSubscriptionMap = (Map) m_producerToTopicToSubscriptionsMap.get( subscription.getProducerReference() );
-        if ( topicToSubscriptionMap == null )
-        {
-            topicToSubscriptionMap = Collections.synchronizedMap( new HashMap() );
-            m_producerToTopicToSubscriptionsMap.put( subscription.getProducerReference(), topicToSubscriptionMap );
-        }
-        return topicToSubscriptionMap;
-    }
-    
-}
+/*=============================================================================*
+ *  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.notification.base;
+
+import org.apache.ws.notification.base.v2004_06.BaseNotificationConstants;
+import org.apache.ws.notification.base.v2004_06.impl.SubscriptionHome;
+import org.apache.ws.notification.topics.Topic;
+import org.apache.ws.resource.ResourceException;
+import org.apache.ws.resource.ResourceHome;
+import org.apache.ws.resource.WsrfRuntime;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * A singleton that manages all subscriptions.
+ */
+public class SubscriptionManager
+{
+   private static final SubscriptionManager INSTANCE = new SubscriptionManager(  );
+
+   /*
+    * Maps producer {@link EndpointReference}s to {@link Map}s of {@link Topic}s to
+    * the ids of the {@link Subscription}s associated with those Topics.
+    */
+   private final Map m_producerToTopicToSubscriptionsMap = Collections.synchronizedMap( new HashMap(  ) );
+
+   private SubscriptionManager(  )
+   {
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public static SubscriptionManager getInstance(  )
+   {
+      return INSTANCE;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param producerResource DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public ResourceHome getSubscriptionManagerHome( NotificationProducerResource producerResource )
+   {
+      String baseNotifXsdNsURI =
+         ( (WsnNamespaceVersionHolder) producerResource.getNamespaceSet(  ) ).getBaseNotificationXsdNamespace(  );
+      String subMgrServiceName;
+      if ( baseNotifXsdNsURI.equals( BaseNotificationConstants.NSURI_WSNT_SCHEMA ) )
+      {
+         subMgrServiceName = "SubscriptionManager";
+      }
+      else
+      {
+         throw new IllegalArgumentException( "Unsupported WS-BaseNotification XSD namespace URI: "
+                                             + baseNotifXsdNsURI );
+      }
+
+      try
+      {
+         return (SubscriptionHome) WsrfRuntime.getRuntime(  ).getResourceHome( subMgrServiceName );
+      }
+      catch ( ResourceException re )
+      {
+         throw new RuntimeException( "Failed to obtain subscription manager home.", re );
+      }
+   }
+
+   /**
+    * @param producerResource
+    * @param topic
+    *
+    * @return the subscriptions associated with the specified topics on the specified producer
+    */
+   public Subscription[] getSubscriptions( NotificationProducerResource producerResource,
+                                           Topic                        topic )
+   {
+      List subscriptions          = new ArrayList(  );
+      Map  topicToSubscriptionMap =
+         (Map) m_producerToTopicToSubscriptionsMap.get( producerResource.getEndpointReference(  ) );
+      if ( topicToSubscriptionMap != null )
+      {
+         List subscriptionIds = (List) topicToSubscriptionMap.get( topic );
+         if ( subscriptionIds != null )
+         {
+            ResourceHome subMgrHome = getSubscriptionManagerHome( producerResource );
+            synchronized ( subscriptionIds )
+            {
+               for ( int i = 0; i < subscriptionIds.size(  ); i++ )
+               {
+                  String       subscriptionId = (String) subscriptionIds.get( i );
+                  Subscription subscription;
+                  try
+                  {
+                     subscription = (Subscription) subMgrHome.find( subscriptionId );
+                  }
+                  catch ( ResourceException re )
+                  {
+                     subscriptionIds.remove( i ); // remove stale subscription id from list
+                     continue;
+                  }
+
+                  subscriptions.add( subscription );
+               }
+            }
+         }
+      }
+
+      return (Subscription[]) subscriptions.toArray( new Subscription[0] );
+   }
+
+   /**
+    * @param subscription
+    * @param topics
+    */
+   public void addSubscription( Subscription subscription,
+                                Topic[]      topics )
+   {
+      Map topicToSubscriptionMap = getTopicToSubscriptionMap( subscription );
+      for ( int i = 0; i < topics.length; i++ )
+      {
+         Topic topic           = topics[i];
+         List  subscriptionIds = (List) topicToSubscriptionMap.get( topic );
+         if ( subscriptionIds == null )
+         {
+            subscriptionIds = new ArrayList(  );
+            topicToSubscriptionMap.put( topic, subscriptionIds );
+         }
+
+         synchronized ( subscriptionIds )
+         {
+            subscriptionIds.add( subscription.getID(  ) );
+         }
+      }
+   }
+
+   /**
+    * @param subscription
+    * @param topics
+    */
+   public void removeSubscription( Subscription subscription,
+                                   Topic[]      topics )
+   {
+      Map topicToSubscriptionMap = getTopicToSubscriptionMap( subscription );
+      for ( int i = 0; i < topics.length; i++ )
+      {
+         Topic topic           = topics[i];
+         List  subscriptionIds = (List) topicToSubscriptionMap.get( topic );
+         synchronized ( subscriptionIds )
+         {
+            subscriptionIds.remove( subscription.getID(  ) );
+         }
+      }
+   }
+
+   private Map getTopicToSubscriptionMap( Subscription subscription )
+   {
+      Map topicToSubscriptionMap =
+         (Map) m_producerToTopicToSubscriptionsMap.get( subscription.getProducerReference(  ) );
+      if ( topicToSubscriptionMap == null )
+      {
+         topicToSubscriptionMap = Collections.synchronizedMap( new HashMap(  ) );
+         m_producerToTopicToSubscriptionsMap.put( subscription.getProducerReference(  ),
+                                                  topicToSubscriptionMap );
+      }
+
+      return topicToSubscriptionMap;
+   }
+}
\ No newline at end of file

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/TopicExpressionDialectsResourcePropertyCallback.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/TopicExpressionDialectsResourcePropertyCallback.java?rev=325923&r1=325922&r2=325923&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/TopicExpressionDialectsResourcePropertyCallback.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/TopicExpressionDialectsResourcePropertyCallback.java Mon Oct 17 09:36:17 2005
@@ -21,7 +21,6 @@
 import org.apache.ws.resource.properties.ResourcePropertyCallback;
 import org.apache.ws.resource.properties.impl.CallbackFailedException;
 import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.TopicExpressionDialectsDocument;
-
 import javax.xml.namespace.QName;
 
 /**
@@ -49,17 +48,20 @@
       {
          throw new IllegalArgumentException( "Unsupported property: " + propName );
       }
+
       if ( prop.isEmpty(  ) )
       {
-         String[] supportedDialects = WsnRuntime.getRuntime().getTopicExpressionEngine().getSupportedDialects();
+         String[] supportedDialects =
+            WsnRuntime.getRuntime(  ).getTopicExpressionEngine(  ).getSupportedDialects(  );
          for ( int i = 0; i < supportedDialects.length; i++ )
          {
             TopicExpressionDialectsDocument topicExpressionDialectsDocument =
                TopicExpressionDialectsDocument.Factory.newInstance(  );
-            topicExpressionDialectsDocument.setTopicExpressionDialects( supportedDialects[i].toString() );
+            topicExpressionDialectsDocument.setTopicExpressionDialects( supportedDialects[i].toString(  ) );
             prop.add( topicExpressionDialectsDocument );
          }
       }
+
       return prop;
    }
 }

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/TopicResourcePropertyCallback.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/TopicResourcePropertyCallback.java?rev=325923&r1=325922&r2=325923&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/TopicResourcePropertyCallback.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/TopicResourcePropertyCallback.java Mon Oct 17 09:36:17 2005
@@ -24,64 +24,64 @@
 import org.apache.ws.resource.properties.ResourceProperty;
 import org.apache.ws.resource.properties.ResourcePropertyCallback;
 import org.apache.ws.resource.properties.impl.CallbackFailedException;
-
 import javax.xml.namespace.QName;
 
 /**
  * A callback for the Topic resource property from the WS-BaseNotification NotificationProducer portType.
  */
 public class TopicResourcePropertyCallback
-        implements ResourcePropertyCallback
+   implements ResourcePropertyCallback
 {
-    
-    private TopicSet m_topicSet;
+   private TopicSet m_topicSet;
+
+   /**
+    * Creates a new {@link TopicResourcePropertyCallback} for the specified topic set.
+    *
+    * @param topicSet the producer's topic set
+    */
+   public TopicResourcePropertyCallback( TopicSet topicSet )
+   {
+      m_topicSet = topicSet;
+   }
 
-    /**
-     * Creates a new {@link TopicResourcePropertyCallback} for the specified topic set.
-     *
-     * @param topicSet the producer's topic set
-     */
-    public TopicResourcePropertyCallback( TopicSet topicSet )
-    {
-        m_topicSet = topicSet;
-    }
+   /**
+    * Refreshes the value of the wsnt:Topic resource property so that it reflects the topics contained in the producer
+    * resource's topic set.
+    *
+    * @param prop the wsnt:Topic resource property
+    *
+    * @return the wsnt:Topic resource property
+    *
+    * @throws org.apache.ws.resource.properties.impl.CallbackFailedException
+    *
+    */
+   public ResourceProperty refreshProperty( ResourceProperty prop )
+   throws CallbackFailedException
+   {
+      QName propName = prop.getMetaData(  ).getName(  );
+      if ( !propName.equals( NotificationProducerPortType.PROP_QNAME_TOPIC ) )
+      {
+         throw new IllegalArgumentException( "Unsupported property: " + propName );
+      }
 
-    /**
-     * Refreshes the value of the wsnt:Topic resource property so that it reflects the topics contained in the producer
-     * resource's topic set.
-     *
-     * @param prop the wsnt:Topic resource property
-     *
-     * @return the wsnt:Topic resource property
-     *
-     * @throws org.apache.ws.resource.properties.impl.CallbackFailedException
-     *
-     */
-    public ResourceProperty refreshProperty( ResourceProperty prop )
-            throws CallbackFailedException
-    {
-        QName propName = prop.getMetaData().getName();
-        if ( !propName.equals( NotificationProducerPortType.PROP_QNAME_TOPIC ) )
-        {
-            throw new IllegalArgumentException( "Unsupported property: " + propName );
-        }
-        if ( prop.isEmpty() || !m_topicSet.isFixed() )
-        {
-            prop.clear();
-            TopicExpression[] topicExprs = m_topicSet.getTopicExpressions();
-            for ( int i = 0; i < topicExprs.length; i++ )
-            {                
-                try
-                {
-                    prop.add( TopicsTypeWriter.newInstance( TopicsConstants.NSURI_WSTOP_SCHEMA ).toXmlObject( topicExprs[i], NotificationProducerPortType.PROP_QNAME_TOPIC ) );
-                }
-                catch ( UnsupportedNamespaceException une )
-                {
-                    throw new CallbackFailedException( une );
-                }
+      if ( prop.isEmpty(  ) || !m_topicSet.isFixed(  ) )
+      {
+         prop.clear(  );
+         TopicExpression[] topicExprs = m_topicSet.getTopicExpressions(  );
+         for ( int i = 0; i < topicExprs.length; i++ )
+         {
+            try
+            {
+               prop.add( TopicsTypeWriter.newInstance( TopicsConstants.NSURI_WSTOP_SCHEMA ).toXmlObject( topicExprs[i],
+                                                                                                         NotificationProducerPortType.PROP_QNAME_TOPIC ) );
+            }
+            catch ( UnsupportedNamespaceException une )
+            {
+               throw new CallbackFailedException( une );
             }
-        }
-        return prop;
-    }
+         }
+      }
 
+      return prop;
+   }
 }

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/NoCurrentMessageOnTopicFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/NoCurrentMessageOnTopicFaultException.java?rev=325923&r1=325922&r2=325923&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/NoCurrentMessageOnTopicFaultException.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/NoCurrentMessageOnTopicFaultException.java Mon Oct 17 09:36:17 2005
@@ -33,11 +33,12 @@
     *
     * @param namespaceVersionHolder DOCUMENT_ME
     */
-   public NoCurrentMessageOnTopicFaultException( WsnNamespaceVersionHolder namespaceVersionHolder, String msg )
+   public NoCurrentMessageOnTopicFaultException( WsnNamespaceVersionHolder namespaceVersionHolder,
+                                                 String                    msg )
    {
       super( namespaceVersionHolder, msg );
       m_name =
-         new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(),
+         new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(  ),
                     "NoCurrentMessageOnTopicFault",
                     BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
    }