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 [3/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...

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/services/BrokerService.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/services/BrokerService.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/services/BrokerService.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/services/BrokerService.java Tue Aug  2 09:41:00 2005
@@ -1,59 +1,137 @@
-/*
- * 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.services;
 
+import org.apache.ws.eventing.porttype.*;
+import org.apache.ws.eventing.porttype.impl.*;
 import org.apache.ws.eventing.services.AbstractService;
 import org.apache.ws.resource.ResourceContext;
 
-import org.apache.ws.eventing.porttype.*;
-import org.apache.ws.eventing.porttype.impl.*;
- 
-public class BrokerService extends AbstractService implements SubscriptionEndPortType, NotificationPortType,EventSourcePortType, SubscriptionManagerPortType {
+/**
+ * DOCUMENT_ME
+ *
+ * @version $Revision: 1.8 $
+ * @author $author$
+ */
+public class BrokerService
+   extends AbstractService
+   implements SubscriptionEndPortType,
+              NotificationPortType,
+              EventSourcePortType,
+              SubscriptionManagerPortType
+{
+   /**
+    * Creates a new {@link BrokerService} object.
+    */
+   public BrokerService(  )
+   {
+   }
 
-    public BrokerService(){
-    }
-    public BrokerService(ResourceContext resourceContext)
+   /**
+    * Creates a new {@link BrokerService} object.
+    *
+    * @param resourceContext DOCUMENT_ME
+    */
+   public BrokerService( ResourceContext resourceContext )
    {
       m_resourceContext = resourceContext;
-      init();
+      init(  );
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param body DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    *
+    * @throws java.rmi.RemoteException DOCUMENT_ME
+    */
+   public org.xmlsoap.schemas.ws.x2004.x08.eventing.GetStatusResponseDocument getStatus( org.xmlsoap.schemas.ws.x2004.x08.eventing.GetStatusDocument body )
+   throws java.rmi.RemoteException
+   {
+      return new SubscriptionManagerPortTypeImpl( getResourceContext(  ) ).getStatus( body );
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param req DOCUMENT_ME
+    * @param resp DOCUMENT_ME
+    */
+   public void filter( org.apache.axis.message.SOAPEnvelope req,
+                       org.apache.axis.message.SOAPEnvelope resp )
+   {
+      new SimpleNotificationPortTypeImpl(  ).filter( req, resp );
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param body DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    *
+    * @throws java.rmi.RemoteException DOCUMENT_ME
+    */
+   public org.xmlsoap.schemas.ws.x2004.x08.eventing.RenewResponseDocument renew( org.xmlsoap.schemas.ws.x2004.x08.eventing.RenewDocument body )
+   throws java.rmi.RemoteException
+   {
+      return new SubscriptionManagerPortTypeImpl( getResourceContext(  ) ).renew( body );
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param body DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    *
+    * @throws java.rmi.RemoteException DOCUMENT_ME
+    */
+   public org.xmlsoap.schemas.ws.x2004.x08.eventing.SubscribeResponseDocument subscribe( org.xmlsoap.schemas.ws.x2004.x08.eventing.SubscribeDocument body )
+   throws java.rmi.RemoteException
+   {
+      return new EventSourcePortTypeImpl(  /*getResourceContext()*/
+       ).subscribe( body );
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param body DOCUMENT_ME
+    *
+    * @throws java.rmi.RemoteException DOCUMENT_ME
+    */
+   public void subscriptionEnd( org.xmlsoap.schemas.ws.x2004.x08.eventing.SubscriptionEndDocument body )
+   throws java.rmi.RemoteException
+   {
+      new SubscriptionEndPortTypeImpl( getResourceContext(  ) ).subscriptionEnd( body );
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param body DOCUMENT_ME
+    *
+    * @throws java.rmi.RemoteException DOCUMENT_ME
+    */
+   public void unsubscribe( org.xmlsoap.schemas.ws.x2004.x08.eventing.UnsubscribeDocument body )
+   throws java.rmi.RemoteException
+   {
+      new SubscriptionManagerPortTypeImpl( getResourceContext(  ) ).unsubscribe( body );
    }
-    public org.xmlsoap.schemas.ws.x2004.x08.eventing.SubscribeResponseDocument subscribe(org.xmlsoap.schemas.ws.x2004.x08.eventing.SubscribeDocument body) throws java.rmi.RemoteException {
-        return new EventSourcePortTypeImpl(/*getResourceContext()*/).subscribe(body);
-    }
-    
-    public org.xmlsoap.schemas.ws.x2004.x08.eventing.GetStatusResponseDocument getStatus(org.xmlsoap.schemas.ws.x2004.x08.eventing.GetStatusDocument body) throws java.rmi.RemoteException {
-        return new SubscriptionManagerPortTypeImpl(getResourceContext()).getStatus(body);
-    }
-
-    public org.xmlsoap.schemas.ws.x2004.x08.eventing.RenewResponseDocument renew(org.xmlsoap.schemas.ws.x2004.x08.eventing.RenewDocument body) throws java.rmi.RemoteException {
-        return new SubscriptionManagerPortTypeImpl(getResourceContext()).renew(body);
-    }
-
-    
-    public void unsubscribe(org.xmlsoap.schemas.ws.x2004.x08.eventing.UnsubscribeDocument body) throws java.rmi.RemoteException {
-        new SubscriptionManagerPortTypeImpl(getResourceContext()).unsubscribe(body); 
-    }
-    
-    public void subscriptionEnd(org.xmlsoap.schemas.ws.x2004.x08.eventing.SubscriptionEndDocument body) throws java.rmi.RemoteException {
-        new SubscriptionEndPortTypeImpl(getResourceContext()).subscriptionEnd(body);
-    }    
-    
-    public void filter(org.apache.axis.message.SOAPEnvelope req, org.apache.axis.message.SOAPEnvelope resp) {
-        new SimpleNotificationPortTypeImpl().filter(req, resp);
-    }    
-    
-}
+}
\ No newline at end of file

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/services/PublisherService.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/services/PublisherService.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/services/PublisherService.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/services/PublisherService.java Tue Aug  2 09:41:00 2005
@@ -1,54 +1,105 @@
-/*
- * 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.services;
 
-import org.apache.ws.eventing.services.AbstractService;
-import org.apache.ws.resource.ResourceContext;
-
 import org.apache.ws.eventing.porttype.EventSourcePortType;
-import org.apache.ws.eventing.porttype.impl.EventSourcePortTypeImpl;
-
 import org.apache.ws.eventing.porttype.SubscriptionManagerPortType;
+import org.apache.ws.eventing.porttype.impl.EventSourcePortTypeImpl;
 import org.apache.ws.eventing.porttype.impl.SubscriptionManagerPortTypeImpl;
+import org.apache.ws.eventing.services.AbstractService;
+import org.apache.ws.resource.ResourceContext;
 
-public class PublisherService extends AbstractService implements  EventSourcePortType, SubscriptionManagerPortType {
-    
+/**
+ * DOCUMENT_ME
+ *
+ * @version $Revision: 1.8 $
+ * @author $author$
+ */
+public class PublisherService
+   extends AbstractService
+   implements EventSourcePortType,
+              SubscriptionManagerPortType
+{
+   /**
+    * Creates a new {@link PublisherService} object.
+    *
+    * @param resourceContext DOCUMENT_ME
+    */
    public PublisherService( ResourceContext resourceContext )
    {
       m_resourceContext = resourceContext;
-      init();
+      init(  );
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param body DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    *
+    * @throws java.rmi.RemoteException DOCUMENT_ME
+    */
+   public org.xmlsoap.schemas.ws.x2004.x08.eventing.GetStatusResponseDocument getStatus( org.xmlsoap.schemas.ws.x2004.x08.eventing.GetStatusDocument body )
+   throws java.rmi.RemoteException
+   {
+      return new SubscriptionManagerPortTypeImpl( getResourceContext(  ) ).getStatus( body );
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param body DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    *
+    * @throws java.rmi.RemoteException DOCUMENT_ME
+    */
+   public org.xmlsoap.schemas.ws.x2004.x08.eventing.RenewResponseDocument renew( org.xmlsoap.schemas.ws.x2004.x08.eventing.RenewDocument body )
+   throws java.rmi.RemoteException
+   {
+      return new SubscriptionManagerPortTypeImpl( getResourceContext(  ) ).renew( body );
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param body DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    *
+    * @throws java.rmi.RemoteException DOCUMENT_ME
+    */
+   public org.xmlsoap.schemas.ws.x2004.x08.eventing.SubscribeResponseDocument subscribe( org.xmlsoap.schemas.ws.x2004.x08.eventing.SubscribeDocument body )
+   throws java.rmi.RemoteException
+   {
+      return new EventSourcePortTypeImpl(  /*getResourceContext()*/
+       ).subscribe( body );
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param body DOCUMENT_ME
+    *
+    * @throws java.rmi.RemoteException DOCUMENT_ME
+    */
+   public void unsubscribe( org.xmlsoap.schemas.ws.x2004.x08.eventing.UnsubscribeDocument body )
+   throws java.rmi.RemoteException
+   {
+      new SubscriptionManagerPortTypeImpl( getResourceContext(  ) ).unsubscribe( body );
    }
-      
-    
-    public org.xmlsoap.schemas.ws.x2004.x08.eventing.SubscribeResponseDocument subscribe(org.xmlsoap.schemas.ws.x2004.x08.eventing.SubscribeDocument body) throws java.rmi.RemoteException {
-        return new EventSourcePortTypeImpl(/*getResourceContext()*/).subscribe(body);
-    }
-    
-    public org.xmlsoap.schemas.ws.x2004.x08.eventing.GetStatusResponseDocument getStatus(org.xmlsoap.schemas.ws.x2004.x08.eventing.GetStatusDocument body) throws java.rmi.RemoteException {
-        return new SubscriptionManagerPortTypeImpl(getResourceContext()).getStatus(body);
-    }
-
-    public org.xmlsoap.schemas.ws.x2004.x08.eventing.RenewResponseDocument renew(org.xmlsoap.schemas.ws.x2004.x08.eventing.RenewDocument body) throws java.rmi.RemoteException {
-        return new SubscriptionManagerPortTypeImpl(getResourceContext()).renew(body);
-    }
-
-    
-    public void unsubscribe(org.xmlsoap.schemas.ws.x2004.x08.eventing.UnsubscribeDocument body) throws java.rmi.RemoteException {
-        new SubscriptionManagerPortTypeImpl(getResourceContext()).unsubscribe(body); 
-    }
-    
-}
+}
\ No newline at end of file

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/services/SubscriberService.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/services/SubscriberService.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/services/SubscriberService.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/services/SubscriberService.java Tue Aug  2 09:41:00 2005
@@ -1,44 +1,71 @@
-/*
- * 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.services;
 
-import org.apache.ws.eventing.services.AbstractService;
-import org.apache.ws.resource.ResourceContext;
-
 import org.apache.ws.eventing.porttype.NotificationPortType;
-import org.apache.ws.eventing.porttype.impl.NotificationPortTypeImpl;
-
 import org.apache.ws.eventing.porttype.SubscriptionEndPortType;
+import org.apache.ws.eventing.porttype.impl.NotificationPortTypeImpl;
 import org.apache.ws.eventing.porttype.impl.SubscriptionEndPortTypeImpl;
- 
-public class SubscriberService extends AbstractService implements SubscriptionEndPortType, NotificationPortType {
-    
-    public SubscriberService(ResourceContext resourceContext)
+import org.apache.ws.eventing.services.AbstractService;
+import org.apache.ws.resource.ResourceContext;
+
+/**
+ * DOCUMENT_ME
+ *
+ * @version $Revision: 1.8 $
+ * @author $author$
+ */
+public class SubscriberService
+   extends AbstractService
+   implements SubscriptionEndPortType,
+              NotificationPortType
+{
+   /**
+    * Creates a new {@link SubscriberService} object.
+    *
+    * @param resourceContext DOCUMENT_ME
+    */
+   public SubscriberService( ResourceContext resourceContext )
    {
       m_resourceContext = resourceContext;
-      init();
+      init(  );
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param req DOCUMENT_ME
+    * @param resp DOCUMENT_ME
+    */
+   public void filter( org.apache.axis.message.SOAPEnvelope req,
+                       org.apache.axis.message.SOAPEnvelope resp )
+   {
+      new NotificationPortTypeImpl( getResourceContext(  ) ).filter( req, resp );
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param body DOCUMENT_ME
+    *
+    * @throws java.rmi.RemoteException DOCUMENT_ME
+    */
+   public void subscriptionEnd( org.xmlsoap.schemas.ws.x2004.x08.eventing.SubscriptionEndDocument body )
+   throws java.rmi.RemoteException
+   {
+      new SubscriptionEndPortTypeImpl( getResourceContext(  ) ).subscriptionEnd( body );
    }
-      
-    public void subscriptionEnd(org.xmlsoap.schemas.ws.x2004.x08.eventing.SubscriptionEndDocument body) throws java.rmi.RemoteException {
-        new SubscriptionEndPortTypeImpl(getResourceContext()).subscriptionEnd(body);
-    }    
-    
-    public void filter(org.apache.axis.message.SOAPEnvelope req, org.apache.axis.message.SOAPEnvelope resp) {
-        new NotificationPortTypeImpl(getResourceContext()).filter(req, resp);
-    }    
-    
-}
+}
\ No newline at end of file

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/FixedTopicSetResourcePropertyCallback.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/FixedTopicSetResourcePropertyCallback.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/FixedTopicSetResourcePropertyCallback.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/FixedTopicSetResourcePropertyCallback.java Tue Aug  2 09:41:00 2005
@@ -1,77 +1,78 @@
-/*=============================================================================*
- *  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.porttype.NotificationProducerPortType;
-import org.apache.ws.notification.topics.TopicSpaceSet;
-import org.apache.ws.resource.properties.ResourceProperty;
-import org.apache.ws.resource.properties.ResourcePropertyCallback;
-import org.apache.ws.resource.properties.impl.CallbackFailedException;
-import org.apache.xmlbeans.XmlBoolean;
-import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.FixedTopicSetDocument;
-
-import javax.xml.namespace.QName;
-
-/**
- * A callback for the FixedTopicSet resource property from the WS-BaseNotification NotificationProducer portType.
- */
-public class FixedTopicSetResourcePropertyCallback implements ResourcePropertyCallback
-{
-
-    private TopicSpaceSet m_topicSet;
-
-    /**
-     * Creates a new {@link TopicResourcePropertyCallback} for the specified topic set.
-     *
-     * @param topicSet the producer's topic set
-     */
-    public FixedTopicSetResourcePropertyCallback( TopicSpaceSet topicSet )
-    {
-        m_topicSet = topicSet;
-    }
-
-    /**
-     * Refreshes the value of the wsnt:FixedTopicSet resource property so that it
-     * reflects the fixed flag on the producer resource's topic set.
-     *
-     * @param prop the wsnt:FixedTopicSet resource property
-     *
-     * @return the wsnt:FixedTopicSet 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_FIXED_TOPIC_SET ) )
-        {
-            throw new IllegalArgumentException( "Unsupported property: " + propName );
-        }
-        if ( prop.isEmpty() )
-        {
-            FixedTopicSetDocument fixedTopicSetDoc = FixedTopicSetDocument.Factory.newInstance();
-            fixedTopicSetDoc.setFixedTopicSet( m_topicSet.isFixed() );
-            prop.add( fixedTopicSetDoc );
-        }
-        else
-        {
-            XmlBoolean fixedTopicSetPropElem = (XmlBoolean) prop.get( 0 );
-            fixedTopicSetPropElem.setBooleanValue( m_topicSet.isFixed() );
-        }
-        return prop;
-    }
-
-}
+/*=============================================================================*
+ *  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.porttype.NotificationProducerPortType;
+import org.apache.ws.notification.topics.TopicSpaceSet;
+import org.apache.ws.resource.properties.ResourceProperty;
+import org.apache.ws.resource.properties.ResourcePropertyCallback;
+import org.apache.ws.resource.properties.impl.CallbackFailedException;
+import org.apache.xmlbeans.XmlBoolean;
+import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.FixedTopicSetDocument;
+import javax.xml.namespace.QName;
+
+/**
+ * A callback for the FixedTopicSet resource property from the WS-BaseNotification NotificationProducer portType.
+ */
+public class FixedTopicSetResourcePropertyCallback
+   implements ResourcePropertyCallback
+{
+   private TopicSpaceSet m_topicSet;
+
+   /**
+    * Creates a new {@link TopicResourcePropertyCallback} for the specified topic set.
+    *
+    * @param topicSet the producer's topic set
+    */
+   public FixedTopicSetResourcePropertyCallback( TopicSpaceSet topicSet )
+   {
+      m_topicSet = topicSet;
+   }
+
+   /**
+    * Refreshes the value of the wsnt:FixedTopicSet resource property so that it
+    * reflects the fixed flag on the producer resource's topic set.
+    *
+    * @param prop the wsnt:FixedTopicSet resource property
+    *
+    * @return the wsnt:FixedTopicSet 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_FIXED_TOPIC_SET ) )
+      {
+         throw new IllegalArgumentException( "Unsupported property: " + propName );
+      }
+
+      if ( prop.isEmpty(  ) )
+      {
+         FixedTopicSetDocument fixedTopicSetDoc = FixedTopicSetDocument.Factory.newInstance(  );
+         fixedTopicSetDoc.setFixedTopicSet( m_topicSet.isFixed(  ) );
+         prop.add( fixedTopicSetDoc );
+      }
+      else
+      {
+         XmlBoolean fixedTopicSetPropElem = (XmlBoolean) prop.get( 0 );
+         fixedTopicSetPropElem.setBooleanValue( m_topicSet.isFixed(  ) );
+      }
+
+      return prop;
+   }
+}
\ 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=227035&r1=227034&r2=227035&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 Tue Aug  2 09:41:00 2005
@@ -1,35 +1,35 @@
-/*=============================================================================*
- *  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.topics.TopicSpaceSet;
-import org.apache.ws.resource.PropertiesResource;
-
-/**
- * A resource that implements the WS-BaseNotification NotificationProducer
- * portType. Provides access to the resource's {@link TopicSpaceSet} and
- * {@link org.apache.ws.resource.properties.ResourcePropertySet}.
- */
-public interface NotificationProducerResource extends PropertiesResource
-{
-    /**
-     * Returns the TopicSpaceSet for the NotificationProducer
-     *
-     * @return the TopicSpaceSet for this NotificationProducer
-     */
-    TopicSpaceSet getTopicSpaceSet();
-
-}
+/*=============================================================================*
+ *  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.topics.TopicSpaceSet;
+import org.apache.ws.resource.PropertiesResource;
+
+/**
+ * A resource that implements the WS-BaseNotification NotificationProducer
+ * portType. Provides access to the resource's {@link TopicSpaceSet} and
+ * {@link org.apache.ws.resource.properties.ResourcePropertySet}.
+ */
+public interface NotificationProducerResource
+   extends PropertiesResource
+{
+   /**
+    * Returns the TopicSpaceSet for the NotificationProducer
+    *
+    * @return the TopicSpaceSet for this NotificationProducer
+    */
+   TopicSpaceSet getTopicSpaceSet(  );
+}
\ 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=227035&r1=227034&r2=227035&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 Tue Aug  2 09:41:00 2005
@@ -1,143 +1,146 @@
-/*=============================================================================*
- *  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.addressing.EndpointReference;
-import org.apache.ws.notification.topics.expression.TopicExpression;
-import org.apache.ws.pubsub.NotificationConsumer;
-import org.apache.ws.pubsub.NotificationProducer;
-import org.apache.ws.resource.PropertiesResource;
-import org.apache.ws.resource.lifetime.ScheduledResourceTerminationResource;
-import org.apache.ws.resource.properties.query.QueryExpression;
-
-/**
- * Interface to be implemented by subscription resources. Exposes the information
- * associated with a subscription request, as well as resource lifetime-related
- * state.
- */
-public interface Subscription extends PropertiesResource, org.apache.ws.pubsub.Subscription, ScheduledResourceTerminationResource
-{
-
-    /**
-     * Gets the topic expression associated with this subscription.
-     *
-     * @return the topic expression
-     */
-    TopicExpression getTopicExpression();
-
-    /**
-     * 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 selector associated with this subscription.
-     *
-     * @return the selector, or null if no selector was specified in the subscribe request
-     */
-    QueryExpression getSelector();
-
-    /**
-     * Wrap notification messages in the notify element?
-     *
-     * @return true (default) if notify should be used, or false if not
-     */
-    boolean getUseNotify();
-
-    /**
-     * Returns true if this subscription is currently paused, or false otherwise.
-     *
-     * @return true if this subscription is currently paused, or false otherwise
-     */
-    boolean isPaused();
-
-    /**
-     * Temporarily suspends the delivery of notification messages for this subscription.
-     *
-     * @throws Exception if unable to suspend message delivery
-     */
-    void pause() throws Exception;
-
-    /**
-     * Resumes the delivery of notification messages for this subscription.
-     *
-     * @throws Exception if unable to resume message delivery
-     */
-    void resume() throws Exception;
-
-    /**
-     * Gets the producer resource associated with this subscription.
-     *
-     * @return the producer resource
-     */
-    NotificationProducerResource getProducerResource();
-
-    //TODO: remove this method once getEPR() method is added to Resource interface
-    void setEndpointReference(EndpointReference epr);
-
-    /**
-     * This method exists for abstraction layer
-     *
-     * @param notificationConsumer
-     */
-    void setNotificationConsumer(NotificationConsumer notificationConsumer);
-
-    /**
-     * This method exists for abstraction layer
-     *
-     * @param notificationProducer
-     */
-    void setNotificationProducer(NotificationProducer notificationProducer);
-
-    /**
-     * Gets the consumer EPR associated with this subscription.
-     *
-     * @return the consumer EPR associated with this subscription
-     */
-    EndpointReference getConsumerReference();
-
-    /**
-     * Sets the policy for the subscription
-     *
-     * @param policy
-     */
-    void setPolicy( Object policy );
-
-    /**
-     * Sets the precondition for the subscription.
-     *
-     * @param precondition
-     */
-    void setPrecondition( QueryExpression precondition );
-
-    /**
-     * Sets the selector for the subscription
-     *
-     * @param selector
-     */
-    void setSelector( QueryExpression selector );
-
-    /**
-     * 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 );
-
-}
+/*=============================================================================*
+ *  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.addressing.EndpointReference;
+import org.apache.ws.notification.topics.expression.TopicExpression;
+import org.apache.ws.pubsub.NotificationConsumer;
+import org.apache.ws.pubsub.NotificationProducer;
+import org.apache.ws.resource.PropertiesResource;
+import org.apache.ws.resource.lifetime.ScheduledResourceTerminationResource;
+import org.apache.ws.resource.properties.query.QueryExpression;
+
+/**
+ * Interface to be implemented by subscription resources. Exposes the information
+ * associated with a subscription request, as well as resource lifetime-related
+ * state.
+ */
+public interface Subscription
+   extends PropertiesResource,
+           org.apache.ws.pubsub.Subscription,
+           ScheduledResourceTerminationResource
+{
+   /**
+    * Gets the consumer EPR associated with this subscription.
+    *
+    * @return the consumer EPR associated with this subscription
+    */
+   EndpointReference getConsumerReference(  );
+
+   //TODO: remove this method once getEPR() method is added to Resource interface
+   void setEndpointReference( EndpointReference epr );
+
+   /**
+    * This method exists for abstraction layer
+    *
+    * @param notificationConsumer
+    */
+   void setNotificationConsumer( NotificationConsumer notificationConsumer );
+
+   /**
+    * This method exists for 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 );
+
+   /**
+    * 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(  );
+
+   /**
+    * Gets the topic expression associated with this subscription.
+    *
+    * @return the topic expression
+    */
+   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 Exception if unable to suspend message delivery
+    */
+   void pause(  )
+   throws Exception;
+
+   /**
+    * Resumes the delivery of notification messages for this subscription.
+    *
+    * @throws Exception if unable to resume message delivery
+    */
+   void resume(  )
+   throws Exception;
+}
\ 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=227035&r1=227034&r2=227035&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 Tue Aug  2 09:41:00 2005
@@ -1,64 +1,66 @@
-/*=============================================================================*
- *  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.porttype.NotificationProducerPortType;
-import org.apache.ws.notification.topics.expression.impl.TopicExpressionEngineImpl;
-import org.apache.ws.resource.properties.ResourceProperty;
-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;
-
-/**
- * A callback for the TopicExpressionDialects resource property from the WS-BaseNotification NotificationProducer
- * portType.
- */
-public class TopicExpressionDialectsResourcePropertyCallback implements ResourcePropertyCallback
-{
-
-    /**
-     * Initializes the value of the wsnt:TopicExpressionDialects resource property so that it
-     * reflects the topic expression dialects supported by the topic expression engine.
-     *
-     * @param prop the wsnt:TopicExpressionDialects resource property
-     *
-     * @return the wsnt:TopicExpressionDialects 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_EXPRESSION_DIALECTS ) )
-        {
-            throw new IllegalArgumentException( "Unsupported property: " + propName );
-        }
-        if ( prop.isEmpty() )
-        {
-            String[] supportedDialects = TopicExpressionEngineImpl.getInstance().getSupportedDialects();
-            for ( int i = 0; i < supportedDialects.length; i++ )
-            {
-                TopicExpressionDialectsDocument topicExpressionDialectsDocument = TopicExpressionDialectsDocument.Factory.newInstance();
-                topicExpressionDialectsDocument.setTopicExpressionDialects( supportedDialects[i] );
-                prop.add( topicExpressionDialectsDocument );
-            }
-        }
-        return prop;
-    }
-
-}
+/*=============================================================================*
+ *  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.porttype.NotificationProducerPortType;
+import org.apache.ws.notification.topics.expression.impl.TopicExpressionEngineImpl;
+import org.apache.ws.resource.properties.ResourceProperty;
+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;
+
+/**
+ * A callback for the TopicExpressionDialects resource property from the WS-BaseNotification NotificationProducer
+ * portType.
+ */
+public class TopicExpressionDialectsResourcePropertyCallback
+   implements ResourcePropertyCallback
+{
+   /**
+    * Initializes the value of the wsnt:TopicExpressionDialects resource property so that it
+    * reflects the topic expression dialects supported by the topic expression engine.
+    *
+    * @param prop the wsnt:TopicExpressionDialects resource property
+    *
+    * @return the wsnt:TopicExpressionDialects 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_EXPRESSION_DIALECTS ) )
+      {
+         throw new IllegalArgumentException( "Unsupported property: " + propName );
+      }
+
+      if ( prop.isEmpty(  ) )
+      {
+         String[] supportedDialects = TopicExpressionEngineImpl.getInstance(  ).getSupportedDialects(  );
+         for ( int i = 0; i < supportedDialects.length; i++ )
+         {
+            TopicExpressionDialectsDocument topicExpressionDialectsDocument =
+               TopicExpressionDialectsDocument.Factory.newInstance(  );
+            topicExpressionDialectsDocument.setTopicExpressionDialects( supportedDialects[i] );
+            prop.add( topicExpressionDialectsDocument );
+         }
+      }
+
+      return prop;
+   }
+}
\ No newline at end of file

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=227035&r1=227034&r2=227035&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 Tue Aug  2 09:41:00 2005
@@ -1,134 +1,140 @@
-/*=============================================================================*
- *  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.porttype.NotificationProducerPortType;
-import org.apache.ws.notification.topics.Topic;
-import org.apache.ws.notification.topics.TopicSpace;
-import org.apache.ws.notification.topics.TopicSpaceSet;
-import org.apache.ws.notification.topics.v2004_06.TopicsConstants;
-import org.apache.ws.resource.properties.ResourceProperty;
-import org.apache.ws.resource.properties.ResourcePropertyCallback;
-import org.apache.ws.resource.properties.impl.CallbackFailedException;
-import org.apache.ws.util.XmlBeanUtils;
-import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.TopicDocument;
-import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.TopicExpressionType;
-
-import javax.xml.namespace.QName;
-import java.util.Iterator;
-
-/**
- * A callback for the Topic resource property from the WS-BaseNotification
- * NotificationProducer portType.
- */
-public class TopicResourcePropertyCallback implements ResourcePropertyCallback
-{
-
-    private TopicSpaceSet m_topicSet;
-
-    /**
-     * Creates a new {@link TopicResourcePropertyCallback} for the specified topic set.
-     *
-     * @param topicSet the producer's topic set
-     */
-    public TopicResourcePropertyCallback( TopicSpaceSet 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 );
-        }
-        prop.clear();
-        TopicSpace[] topicSpaces = m_topicSet.getTopicSpaces();
-        for ( int i = 0; i < topicSpaces.length; i++ )
-        {
-            TopicSpace topicSpace = topicSpaces[i];
-            String targetNamespace = topicSpace.getTargetNamespace();
-            Iterator iterator = topicSpace.topicIterator();
-            while ( iterator.hasNext() )
-            {
-                Topic topic = (Topic) iterator.next();
-                String topicName = topic.getName();
-                QName rootTopicQName = new QName( targetNamespace, topicName );
-
-                if ( topic.isVisible() )
-                {
-                    addSimpleTopicExpression( prop, rootTopicQName );
-                }
-
-                Iterator subTopics = topic.topicIterator();
-                while ( subTopics.hasNext() )
-                {
-                    Topic subTopic = (Topic) subTopics.next();
-                    addConcreteTopicExpressions( prop, rootTopicQName, subTopic );
-                }
-            }
-        }
-        return prop;
-    }
-
-    private static void addSimpleTopicExpression( ResourceProperty topicProp, QName rootTopicName )
-    {
-        TopicDocument topicDocument = TopicDocument.Factory.newInstance();
-        TopicExpressionType topicExpressionType = topicDocument.addNewTopic();
-        topicExpressionType.setDialect(TopicsConstants.TOPIC_EXPR_DIALECT_SIMPLE);
-        XmlBeanUtils.setValueAsQName(topicExpressionType, rootTopicName);
-        topicProp.add(topicDocument);
-    }
-
-    /**
-     * Recursively adds Concrete topic expressions to the Topic resource property.
-     *
-     * @param topicProp  The ResourceProperty associated with the Topic being added to.
-     * @param rootTopicName The QName of the parent topic.
-     * @param subTopic  The current topic being added.
-     */
-    private static void addConcreteTopicExpressions( ResourceProperty topicProp, QName rootTopicName, Topic subTopic )
-    {
-        TopicDocument topicDocument = TopicDocument.Factory.newInstance();
-        String topicName = subTopic.getName();
-        QName concreteTopicName = new QName(rootTopicName.getNamespaceURI(), rootTopicName.getLocalPart() + "/" + topicName);
-        if (subTopic.isVisible())
-        {
-            TopicExpressionType topicExpressionType = topicDocument.addNewTopic();
-            topicExpressionType.setDialect(TopicsConstants.TOPIC_EXPR_DIALECT_CONCRETE);
-            XmlBeanUtils.setValueAsQName(topicExpressionType, concreteTopicName);
-            topicProp.add(topicDocument);
-        }
-        Iterator iterator = subTopic.topicIterator();
-        while (iterator.hasNext())
-        {
-            Topic topic = (Topic) iterator.next();
-            addConcreteTopicExpressions( topicProp, concreteTopicName, topic );
-        }
-    }
-
-}
+/*=============================================================================*
+ *  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.porttype.NotificationProducerPortType;
+import org.apache.ws.notification.topics.Topic;
+import org.apache.ws.notification.topics.TopicSpace;
+import org.apache.ws.notification.topics.TopicSpaceSet;
+import org.apache.ws.notification.topics.v2004_06.TopicsConstants;
+import org.apache.ws.resource.properties.ResourceProperty;
+import org.apache.ws.resource.properties.ResourcePropertyCallback;
+import org.apache.ws.resource.properties.impl.CallbackFailedException;
+import org.apache.ws.util.XmlBeanUtils;
+import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.TopicDocument;
+import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.TopicExpressionType;
+import javax.xml.namespace.QName;
+import java.util.Iterator;
+
+/**
+ * A callback for the Topic resource property from the WS-BaseNotification
+ * NotificationProducer portType.
+ */
+public class TopicResourcePropertyCallback
+   implements ResourcePropertyCallback
+{
+   private TopicSpaceSet m_topicSet;
+
+   /**
+    * Creates a new {@link TopicResourcePropertyCallback} for the specified topic set.
+    *
+    * @param topicSet the producer's topic set
+    */
+   public TopicResourcePropertyCallback( TopicSpaceSet 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 );
+      }
+
+      prop.clear(  );
+      TopicSpace[] topicSpaces = m_topicSet.getTopicSpaces(  );
+      for ( int i = 0; i < topicSpaces.length; i++ )
+      {
+         TopicSpace topicSpace      = topicSpaces[i];
+         String     targetNamespace = topicSpace.getTargetNamespace(  );
+         Iterator   iterator        = topicSpace.topicIterator(  );
+         while ( iterator.hasNext(  ) )
+         {
+            Topic  topic          = (Topic) iterator.next(  );
+            String topicName      = topic.getName(  );
+            QName  rootTopicQName = new QName( targetNamespace, topicName );
+
+            if ( topic.isVisible(  ) )
+            {
+               addSimpleTopicExpression( prop, rootTopicQName );
+            }
+
+            Iterator subTopics = topic.topicIterator(  );
+            while ( subTopics.hasNext(  ) )
+            {
+               Topic subTopic = (Topic) subTopics.next(  );
+               addConcreteTopicExpressions( prop, rootTopicQName, subTopic );
+            }
+         }
+      }
+
+      return prop;
+   }
+
+   /**
+    * Recursively adds Concrete topic expressions to the Topic resource property.
+    *
+    * @param topicProp  The ResourceProperty associated with the Topic being added to.
+    * @param rootTopicName The QName of the parent topic.
+    * @param subTopic  The current topic being added.
+    */
+   private static void addConcreteTopicExpressions( ResourceProperty topicProp,
+                                                    QName            rootTopicName,
+                                                    Topic            subTopic )
+   {
+      TopicDocument topicDocument     = TopicDocument.Factory.newInstance(  );
+      String        topicName         = subTopic.getName(  );
+      QName         concreteTopicName =
+         new QName( rootTopicName.getNamespaceURI(  ), rootTopicName.getLocalPart(  ) + "/" + topicName );
+      if ( subTopic.isVisible(  ) )
+      {
+         TopicExpressionType topicExpressionType = topicDocument.addNewTopic(  );
+         topicExpressionType.setDialect( TopicsConstants.TOPIC_EXPR_DIALECT_CONCRETE );
+         XmlBeanUtils.setValueAsQName( topicExpressionType, concreteTopicName );
+         topicProp.add( topicDocument );
+      }
+
+      Iterator iterator = subTopic.topicIterator(  );
+      while ( iterator.hasNext(  ) )
+      {
+         Topic topic = (Topic) iterator.next(  );
+         addConcreteTopicExpressions( topicProp, concreteTopicName, topic );
+      }
+   }
+
+   private static void addSimpleTopicExpression( ResourceProperty topicProp,
+                                                 QName            rootTopicName )
+   {
+      TopicDocument       topicDocument       = TopicDocument.Factory.newInstance(  );
+      TopicExpressionType topicExpressionType = topicDocument.addNewTopic(  );
+      topicExpressionType.setDialect( TopicsConstants.TOPIC_EXPR_DIALECT_SIMPLE );
+      XmlBeanUtils.setValueAsQName( topicExpressionType, rootTopicName );
+      topicProp.add( topicDocument );
+   }
+}
\ No newline at end of file

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/WsnNamespaceVersionHolder.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/WsnNamespaceVersionHolder.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/WsnNamespaceVersionHolder.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/WsnNamespaceVersionHolder.java Tue Aug  2 09:41:00 2005
@@ -1,33 +1,51 @@
-package org.apache.ws.notification.base;
-
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
-
-/**
- * An extension of the {@link NamespaceVersionHolder}  which adds WSN-specific
- * getters for the WSN namespaces.
- *
- * Implementations of this interface are used to provide an object which contains all the
- * namespaces supported by a given Resource.  This allows us to group the properly associated versioned
- * namespaces together in one place.
- *
- * @author Sal Campana
- */
-public interface WsnNamespaceVersionHolder extends NamespaceVersionHolder
-{
-    /**
-     * Returns the namespace for the Topics Spec
-     *
-     * @return  Topic namespace
-     */
-    String getTopicsXsdNamespace();
-    /**
-     * Returns the BaseNotification namespace
-     * @return  BaseNotification namespace
-     */
-    String getBaseNotificationXsdNamespace();
-    /**
-     * Returns the Brokered Notification namespace
-     * @return Brokered Notification namespace
-     */
-    String getBrokeredNotificationXsdNamespace();
-}
+/*=============================================================================*
+ *  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.resource.properties.NamespaceVersionHolder;
+
+/**
+ * An extension of the {@link NamespaceVersionHolder}  which adds WSN-specific
+ * getters for the WSN namespaces.
+ *
+ * Implementations of this interface are used to provide an object which contains all the
+ * namespaces supported by a given Resource.  This allows us to group the properly associated versioned
+ * namespaces together in one place.
+ *
+ * @author Sal Campana
+ */
+public interface WsnNamespaceVersionHolder
+   extends NamespaceVersionHolder
+{
+   /**
+    * Returns the BaseNotification namespace
+    * @return  BaseNotification namespace
+    */
+   String getBaseNotificationXsdNamespace(  );
+
+   /**
+    * Returns the Brokered Notification namespace
+    * @return Brokered Notification namespace
+    */
+   String getBrokeredNotificationXsdNamespace(  );
+
+   /**
+    * Returns the namespace for the Topics Spec
+    *
+    * @return  Topic namespace
+    */
+   String getTopicsXsdNamespace(  );
+}
\ No newline at end of file

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/InvalidTopicExpressionFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/InvalidTopicExpressionFaultException.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/InvalidTopicExpressionFaultException.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/InvalidTopicExpressionFaultException.java Tue Aug  2 09:41:00 2005
@@ -1,30 +1,55 @@
-package org.apache.ws.notification.base.faults;
-
-import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
-import org.apache.ws.notification.base.v2004_06.BaseNotificationConstants;
-import org.apache.ws.resource.faults.AbstractBaseFaultException;
-
-import javax.xml.namespace.QName;
-
-/**
- * The WS-BaseN InvalidTopicExpressionFault (thrown by GetCurrentMessage operation).
- */
-public class InvalidTopicExpressionFaultException extends AbstractBaseFaultException
-{
-    private QName m_name;
-
-    public InvalidTopicExpressionFaultException(WsnNamespaceVersionHolder namespaceVersionHolder, String faultString)
-    {
-        super(namespaceVersionHolder, faultString);
-        m_name = new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(), "InvalidTopicExpressionFault", BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
-    }
-
-    /**
-     * Returns the {@link QName} of this fault
-     * @return fault QName
-     */
-    public QName getBaseFaultName()
-    {
-        return m_name;
-    }
-}
+/*=============================================================================*
+ *  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.faults;
+
+import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
+import org.apache.ws.notification.base.v2004_06.BaseNotificationConstants;
+import org.apache.ws.resource.faults.AbstractBaseFaultException;
+import javax.xml.namespace.QName;
+
+/**
+ * The WS-BaseN InvalidTopicExpressionFault (thrown by GetCurrentMessage operation).
+ */
+public class InvalidTopicExpressionFaultException
+   extends AbstractBaseFaultException
+{
+   private QName m_name;
+
+   /**
+    * Creates a new {@link InvalidTopicExpressionFaultException} object.
+    *
+    * @param namespaceVersionHolder DOCUMENT_ME
+    * @param faultString DOCUMENT_ME
+    */
+   public InvalidTopicExpressionFaultException( WsnNamespaceVersionHolder namespaceVersionHolder,
+                                                String                    faultString )
+   {
+      super( namespaceVersionHolder, faultString );
+      m_name =
+         new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(  ),
+                    "InvalidTopicExpressionFault",
+                    BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
+   }
+
+   /**
+    * Returns the {@link QName} of this fault
+    * @return fault QName
+    */
+   public QName getBaseFaultName(  )
+   {
+      return m_name;
+   }
+}
\ No newline at end of file

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=227035&r1=227034&r2=227035&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 Tue Aug  2 09:41:00 2005
@@ -1,30 +1,54 @@
-package org.apache.ws.notification.base.faults;
-
-import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
-import org.apache.ws.notification.base.v2004_06.BaseNotificationConstants;
-import org.apache.ws.resource.faults.AbstractBaseFaultException;
-
-import javax.xml.namespace.QName;
-
-/**
- * The WS-BaseN NoCurrentMessageOnTopicFault (thrown by GetCurrentMessage operation).
- */
-public class NoCurrentMessageOnTopicFaultException extends AbstractBaseFaultException
-{
-    private QName m_name;
-
-    public NoCurrentMessageOnTopicFaultException(WsnNamespaceVersionHolder namespaceVersionHolder)
-    {
-        super(namespaceVersionHolder, "The specified Topic is supported, but there is no notification message currently available on it.");
-        m_name = new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(), "NoCurrentMessageOnTopicFault", BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
-    }
-
-    /**
-     * Returns the {@link QName} of this fault
-     * @return fault QName
-     */
-    public QName getBaseFaultName()
-    {
-        return m_name;
-    }
-}
+/*=============================================================================*
+ *  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.faults;
+
+import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
+import org.apache.ws.notification.base.v2004_06.BaseNotificationConstants;
+import org.apache.ws.resource.faults.AbstractBaseFaultException;
+import javax.xml.namespace.QName;
+
+/**
+ * The WS-BaseN NoCurrentMessageOnTopicFault (thrown by GetCurrentMessage operation).
+ */
+public class NoCurrentMessageOnTopicFaultException
+   extends AbstractBaseFaultException
+{
+   private QName m_name;
+
+   /**
+    * Creates a new {@link NoCurrentMessageOnTopicFaultException} object.
+    *
+    * @param namespaceVersionHolder DOCUMENT_ME
+    */
+   public NoCurrentMessageOnTopicFaultException( WsnNamespaceVersionHolder namespaceVersionHolder )
+   {
+      super( namespaceVersionHolder,
+             "The specified Topic is supported, but there is no notification message currently available on it." );
+      m_name =
+         new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(  ),
+                    "NoCurrentMessageOnTopicFault",
+                    BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
+   }
+
+   /**
+    * Returns the {@link QName} of this fault
+    * @return fault QName
+    */
+   public QName getBaseFaultName(  )
+   {
+      return m_name;
+   }
+}
\ No newline at end of file

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/PauseFailedFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/PauseFailedFaultException.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/PauseFailedFaultException.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/PauseFailedFaultException.java Tue Aug  2 09:41:00 2005
@@ -1,31 +1,55 @@
-package org.apache.ws.notification.base.faults;
-
-import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
-import org.apache.ws.notification.base.v2004_06.BaseNotificationConstants;
-import org.apache.ws.resource.faults.AbstractBaseFaultException;
-
-import javax.xml.namespace.QName;
-
-/**
- * The WS-BaseN PauseFailedFault (thrown by Pause operation).
- */
-public class PauseFailedFaultException extends AbstractBaseFaultException
-{
-    private QName m_name;
-
-    public PauseFailedFaultException( WsnNamespaceVersionHolder namespaceVersionHolder, String faultString )
-    {
-        super( namespaceVersionHolder, faultString );
-        m_name =
-                new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(), "PauseFailedFault",
-                        BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
-    }
-    /**
-     * Returns the {@link QName} of this fault
-     * @return fault QName
-     */
-    public QName getBaseFaultName()
-    {
-        return m_name;
-    }
-}
+/*=============================================================================*
+ *  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.faults;
+
+import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
+import org.apache.ws.notification.base.v2004_06.BaseNotificationConstants;
+import org.apache.ws.resource.faults.AbstractBaseFaultException;
+import javax.xml.namespace.QName;
+
+/**
+ * The WS-BaseN PauseFailedFault (thrown by Pause operation).
+ */
+public class PauseFailedFaultException
+   extends AbstractBaseFaultException
+{
+   private QName m_name;
+
+   /**
+    * Creates a new {@link PauseFailedFaultException} object.
+    *
+    * @param namespaceVersionHolder DOCUMENT_ME
+    * @param faultString DOCUMENT_ME
+    */
+   public PauseFailedFaultException( WsnNamespaceVersionHolder namespaceVersionHolder,
+                                     String                    faultString )
+   {
+      super( namespaceVersionHolder, faultString );
+      m_name =
+         new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(  ),
+                    "PauseFailedFault",
+                    BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
+   }
+
+   /**
+    * Returns the {@link QName} of this fault
+    * @return fault QName
+    */
+   public QName getBaseFaultName(  )
+   {
+      return m_name;
+   }
+}
\ No newline at end of file

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/ResumeFailedFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/ResumeFailedFaultException.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/ResumeFailedFaultException.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/ResumeFailedFaultException.java Tue Aug  2 09:41:00 2005
@@ -1,31 +1,55 @@
-package org.apache.ws.notification.base.faults;
-
-import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
-import org.apache.ws.notification.base.v2004_06.BaseNotificationConstants;
-import org.apache.ws.resource.faults.AbstractBaseFaultException;
-
-import javax.xml.namespace.QName;
-
-/**
- * The WS-BaseN ResumeFailedFault (thrown by Resume operation).
- */
-public class ResumeFailedFaultException extends AbstractBaseFaultException
-{
-    private QName m_name;
-
-    public ResumeFailedFaultException( WsnNamespaceVersionHolder namespaceVersionHolder, String faultString )
-    {
-        super( namespaceVersionHolder, faultString );
-        m_name =
-                new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(), "ResumeFailedFault",
-                        BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
-    }
-    /**
-     * Returns the {@link QName} of this fault
-     * @return fault QName
-     */
-    public QName getBaseFaultName()
-    {
-        return m_name;
-    }
-}
+/*=============================================================================*
+ *  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.faults;
+
+import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
+import org.apache.ws.notification.base.v2004_06.BaseNotificationConstants;
+import org.apache.ws.resource.faults.AbstractBaseFaultException;
+import javax.xml.namespace.QName;
+
+/**
+ * The WS-BaseN ResumeFailedFault (thrown by Resume operation).
+ */
+public class ResumeFailedFaultException
+   extends AbstractBaseFaultException
+{
+   private QName m_name;
+
+   /**
+    * Creates a new {@link ResumeFailedFaultException} object.
+    *
+    * @param namespaceVersionHolder DOCUMENT_ME
+    * @param faultString DOCUMENT_ME
+    */
+   public ResumeFailedFaultException( WsnNamespaceVersionHolder namespaceVersionHolder,
+                                      String                    faultString )
+   {
+      super( namespaceVersionHolder, faultString );
+      m_name =
+         new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(  ),
+                    "ResumeFailedFault",
+                    BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
+   }
+
+   /**
+    * Returns the {@link QName} of this fault
+    * @return fault QName
+    */
+   public QName getBaseFaultName(  )
+   {
+      return m_name;
+   }
+}
\ No newline at end of file

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/SubscribeCreationFailedFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/SubscribeCreationFailedFaultException.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/SubscribeCreationFailedFaultException.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/SubscribeCreationFailedFaultException.java Tue Aug  2 09:41:00 2005
@@ -1,29 +1,53 @@
-package org.apache.ws.notification.base.faults;
-
-import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
-import org.apache.ws.notification.base.v2004_06.BaseNotificationConstants;
-import org.apache.ws.resource.faults.AbstractBaseFaultException;
-
-import javax.xml.namespace.QName;
-
-/**
- * The WS-BaseN SubscribeCreationFailedFault (thrown by Subscribe operation).
- */
-public class SubscribeCreationFailedFaultException extends AbstractBaseFaultException
-{
-    private QName m_name;
-
-    public SubscribeCreationFailedFaultException(WsnNamespaceVersionHolder namespaceVersionHolder)
-    {
-        super(namespaceVersionHolder, "Unable to create subscription due to internal server error.");
-        m_name = new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(), "SubscribeCreationFailedFault", BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
-    }
-    /**
-     * Returns the {@link QName} of this fault
-     * @return fault QName
-     */
-    public QName getBaseFaultName()
-    {
-        return m_name;
-    }
-}
+/*=============================================================================*
+ *  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.faults;
+
+import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
+import org.apache.ws.notification.base.v2004_06.BaseNotificationConstants;
+import org.apache.ws.resource.faults.AbstractBaseFaultException;
+import javax.xml.namespace.QName;
+
+/**
+ * The WS-BaseN SubscribeCreationFailedFault (thrown by Subscribe operation).
+ */
+public class SubscribeCreationFailedFaultException
+   extends AbstractBaseFaultException
+{
+   private QName m_name;
+
+   /**
+    * Creates a new {@link SubscribeCreationFailedFaultException} object.
+    *
+    * @param namespaceVersionHolder DOCUMENT_ME
+    */
+   public SubscribeCreationFailedFaultException( WsnNamespaceVersionHolder namespaceVersionHolder )
+   {
+      super( namespaceVersionHolder, "Unable to create subscription due to internal server error." );
+      m_name =
+         new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(  ),
+                    "SubscribeCreationFailedFault",
+                    BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
+   }
+
+   /**
+    * Returns the {@link QName} of this fault
+    * @return fault QName
+    */
+   public QName getBaseFaultName(  )
+   {
+      return m_name;
+   }
+}
\ No newline at end of file

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/TopicNotSupportedFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/TopicNotSupportedFaultException.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/TopicNotSupportedFaultException.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/TopicNotSupportedFaultException.java Tue Aug  2 09:41:00 2005
@@ -1,29 +1,55 @@
-package org.apache.ws.notification.base.faults;
-
-import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
-import org.apache.ws.notification.base.v2004_06.BaseNotificationConstants;
-import org.apache.ws.resource.faults.AbstractBaseFaultException;
-
-import javax.xml.namespace.QName;
-
-/**
- * The WS-BaseN TopicNotSupportedFault (thrown by GetCurrentMessage operation).
- */
-public class TopicNotSupportedFaultException extends AbstractBaseFaultException
-{
-    private QName m_name;
-
-    public TopicNotSupportedFaultException(WsnNamespaceVersionHolder namespaceVersionHolder, String faultString)
-    {
-        super(namespaceVersionHolder, faultString);
-        m_name = new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(), "TopicNotSupportedFault", BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
-    }
-    /**
-     * Returns the {@link QName} of this fault
-     * @return fault QName
-     */
-    public QName getBaseFaultName()
-    {
-        return m_name;
-    }
-}
+/*=============================================================================*
+ *  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.faults;
+
+import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
+import org.apache.ws.notification.base.v2004_06.BaseNotificationConstants;
+import org.apache.ws.resource.faults.AbstractBaseFaultException;
+import javax.xml.namespace.QName;
+
+/**
+ * The WS-BaseN TopicNotSupportedFault (thrown by GetCurrentMessage operation).
+ */
+public class TopicNotSupportedFaultException
+   extends AbstractBaseFaultException
+{
+   private QName m_name;
+
+   /**
+    * Creates a new {@link TopicNotSupportedFaultException} object.
+    *
+    * @param namespaceVersionHolder DOCUMENT_ME
+    * @param faultString DOCUMENT_ME
+    */
+   public TopicNotSupportedFaultException( WsnNamespaceVersionHolder namespaceVersionHolder,
+                                           String                    faultString )
+   {
+      super( namespaceVersionHolder, faultString );
+      m_name =
+         new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(  ),
+                    "TopicNotSupportedFault",
+                    BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
+   }
+
+   /**
+    * Returns the {@link QName} of this fault
+    * @return fault QName
+    */
+   public QName getBaseFaultName(  )
+   {
+      return m_name;
+   }
+}
\ No newline at end of file

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/TopicPathDialectUnknownFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/TopicPathDialectUnknownFaultException.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/TopicPathDialectUnknownFaultException.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/faults/TopicPathDialectUnknownFaultException.java Tue Aug  2 09:41:00 2005
@@ -1,29 +1,55 @@
-package org.apache.ws.notification.base.faults;
-
-import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
-import org.apache.ws.notification.base.v2004_06.BaseNotificationConstants;
-import org.apache.ws.resource.faults.AbstractBaseFaultException;
-
-import javax.xml.namespace.QName;
-
-/**
- * The WS-BaseN TopicPathDialectUnknownFault (thrown by Subscribe operation).
- */
-public class TopicPathDialectUnknownFaultException extends AbstractBaseFaultException
-{
-    private QName m_name;
-
-    public TopicPathDialectUnknownFaultException(WsnNamespaceVersionHolder namespaceVersionHolder, String faultString)
-    {
-        super(namespaceVersionHolder, faultString);
-        m_name = new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(), "TopicPathDialectUnknownFault", BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
-    }
-    /**
-     * Returns the {@link QName} of this fault
-     * @return fault QName
-     */
-    public QName getBaseFaultName()
-    {
-        return m_name;
-    }
-}
+/*=============================================================================*
+ *  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.faults;
+
+import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
+import org.apache.ws.notification.base.v2004_06.BaseNotificationConstants;
+import org.apache.ws.resource.faults.AbstractBaseFaultException;
+import javax.xml.namespace.QName;
+
+/**
+ * The WS-BaseN TopicPathDialectUnknownFault (thrown by Subscribe operation).
+ */
+public class TopicPathDialectUnknownFaultException
+   extends AbstractBaseFaultException
+{
+   private QName m_name;
+
+   /**
+    * Creates a new {@link TopicPathDialectUnknownFaultException} object.
+    *
+    * @param namespaceVersionHolder DOCUMENT_ME
+    * @param faultString DOCUMENT_ME
+    */
+   public TopicPathDialectUnknownFaultException( WsnNamespaceVersionHolder namespaceVersionHolder,
+                                                 String                    faultString )
+   {
+      super( namespaceVersionHolder, faultString );
+      m_name =
+         new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(  ),
+                    "TopicPathDialectUnknownFault",
+                    BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
+   }
+
+   /**
+    * Returns the {@link QName} of this fault
+    * @return fault QName
+    */
+   public QName getBaseFaultName(  )
+   {
+      return m_name;
+   }
+}
\ No newline at end of file