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 [6/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/notification/pubsub/Subscription.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/pubsub/Subscription.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/pubsub/Subscription.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/pubsub/Subscription.java Tue Aug 2 09:41:00 2005
@@ -13,48 +13,68 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*=============================================================================*/
-
package org.apache.ws.notification.pubsub;
+
import org.apache.commons.id.IdentifierUtils;
import org.apache.ws.addressing.XmlBeansEndpointReference;
import org.apache.ws.notification.base.impl.AbstractSubscription;
import org.apache.ws.pubsub.SubscriptionEndConsumer;
import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.SubscribeResponseDocument;
import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceType;
-
import java.util.Calendar;
+
/**
*
* @author Stefan Lischke
*/
-public class Subscription extends AbstractSubscription{
- private EndpointReferenceType sMan;
- //private static final Log LOG = LogFactory.getLog( Subscriber.class.getName() );
-
- /** Creates a new instance of Subscription */
- public Subscription() {
- m_id = IdentifierUtils.UUID_VERSION_FOUR_GENERATOR.nextIdentifier().toString();
- m_creationTime= Calendar.getInstance();
- }
-
- public void setSubscriptionManager(SubscribeResponseDocument.SubscribeResponse sresdom) {
- sMan = sresdom.getSubscriptionReference();
- super.setEndpointReference(new XmlBeansEndpointReference(sMan));
- }
-
- public void init() {
- }
- public void setResourcePropertySet(org.apache.ws.resource.properties.ResourcePropertySet propSet){
-
- }
-
- /**
- * Get the subscriptionEnd consumer associated with this subscription.
- *
- * @return the subscriptionEnd consumer
- */
- public SubscriptionEndConsumer getSubscriptionEndConsumer()
- {
- return null; //todo
- }
-}
+public class Subscription
+ extends AbstractSubscription
+{
+ private EndpointReferenceType sMan;
+
+ //private static final Log LOG = LogFactory.getLog( Subscriber.class.getName() );
+
+ /** Creates a new instance of Subscription */
+ public Subscription( )
+ {
+ m_id = IdentifierUtils.UUID_VERSION_FOUR_GENERATOR.nextIdentifier( ).toString( );
+ m_creationTime = Calendar.getInstance( );
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @param propSet DOCUMENT_ME
+ */
+ public void setResourcePropertySet( org.apache.ws.resource.properties.ResourcePropertySet propSet )
+ {
+ }
+
+ /**
+ * Get the subscriptionEnd consumer associated with this subscription.
+ *
+ * @return the subscriptionEnd consumer
+ */
+ public SubscriptionEndConsumer getSubscriptionEndConsumer( )
+ {
+ return null; //todo
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @param sresdom DOCUMENT_ME
+ */
+ public void setSubscriptionManager( SubscribeResponseDocument.SubscribeResponse sresdom )
+ {
+ sMan = sresdom.getSubscriptionReference( );
+ super.setEndpointReference( new XmlBeansEndpointReference( sMan ) );
+ }
+
+ /**
+ * DOCUMENT_ME
+ */
+ public void init( )
+ {
+ }
+}
\ No newline at end of file
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/pubsub/SubscriptionHome.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/pubsub/SubscriptionHome.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/pubsub/SubscriptionHome.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/pubsub/SubscriptionHome.java Tue Aug 2 09:41:00 2005
@@ -13,94 +13,124 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*=============================================================================*/
-
-
package org.apache.ws.notification.pubsub;
-import org.apache.ws.resource.JndiConstants;
import org.apache.ws.resource.IllegalResourceTypeException;
+import org.apache.ws.resource.JndiConstants;
import org.apache.ws.resource.impl.AbstractResourceHome;
-
import javax.xml.namespace.QName;
import java.util.Map;
+
/**
*
* @author Stefan Lischke
*/
-public class SubscriptionHome extends AbstractResourceHome {
-
- /** The service endpoint name as registered with the SOAP Platform. This is useful for building EPR's. **/
- public static final javax.xml.namespace.QName SERVICE_NAME = javax.xml.namespace.QName.valueOf("{http://ws.apache.org/notification/base/service/NotificationPort}NotificationPort");
-
-
- /** The management PortType associated with this resource. This is useful for building EPR's.**/
- public static final javax.xml.namespace.QName PORT_TYPE = javax.xml.namespace.QName.valueOf("http://ws.apache.org/notification/base/service/NotificationPort}NotificationPortPortType");
-
- /** The WSDL Port name associated with the resource. This is useful for building EPR's. **/
- public static final String PORT_NAME = "NotificationPort";
-
- /** The name of the resource key for this resource. **/
- public static final javax.xml.namespace.QName RESOURCE_KEY_NAME = javax.xml.namespace.QName.valueOf("{http://ws.apache.org/notification/base/service/NotificationPort}ResourceID");
-
- public static final String HOME_LOCATION = JndiConstants.CONTEXT_NAME_SERVICES + "/" + SERVICE_NAME.getLocalPart() + "/" + JndiConstants.ATOMIC_NAME_HOME;
-
- //private static final Log LOG = LogFactory.getLog( SubscriptionHome.class.getName() );
-
- public Subscription create(){
- Subscription s = new Subscription();
- try
- {
- add(s);
- }
- catch ( IllegalResourceTypeException irte )
- {
- throw new RuntimeException( irte );
- }
- return s;
- }
-
- public QName getServiceName()
- {
- return SERVICE_NAME;
- }
-
- public QName getPortType()
- {
- return PORT_TYPE;
- }
-
- public String getServicePortName()
- {
- return PORT_NAME;
- }
-
- public QName getResourceKeyNameQName()
- {
- return RESOURCE_KEY_NAME;
- }
-
- /**
- * Map containing all FilesystemResource instances - this map <em>must</em> be static for
- * compatibility with certain JNDI providers.
- */
- private static Map s_resources;
-
- /**
- * Returns a map of all FilesystemResource instances. Used by the {@link AbstractResourceHome}
- * superclass.
- */
- protected synchronized final Map getResourceMap()
- {
- if ( s_resources == null )
- {
- s_resources = AbstractResourceHome.createResourceMap( m_resourceIsPersistent );
- }
- return s_resources;
- }
-
- public org.apache.ws.resource.properties.NamespaceVersionHolder getNamespaceVersionHolder()
- {
- return null;//not sure what should go here.
- }
-
-}
+public class SubscriptionHome
+ extends AbstractResourceHome
+{
+ /** The service endpoint name as registered with the SOAP Platform. This is useful for building EPR's. **/
+ public static final javax.xml.namespace.QName SERVICE_NAME =
+ javax.xml.namespace.QName.valueOf( "{http://ws.apache.org/notification/base/service/NotificationPort}NotificationPort" );
+
+ /** The management PortType associated with this resource. This is useful for building EPR's.**/
+ public static final javax.xml.namespace.QName PORT_TYPE =
+ javax.xml.namespace.QName.valueOf( "http://ws.apache.org/notification/base/service/NotificationPort}NotificationPortPortType" );
+
+ /** The WSDL Port name associated with the resource. This is useful for building EPR's. **/
+ public static final String PORT_NAME = "NotificationPort";
+
+ /** The name of the resource key for this resource. **/
+ public static final javax.xml.namespace.QName RESOURCE_KEY_NAME =
+ javax.xml.namespace.QName.valueOf( "{http://ws.apache.org/notification/base/service/NotificationPort}ResourceID" );
+
+ /** DOCUMENT_ME */
+ public static final String HOME_LOCATION =
+ JndiConstants.CONTEXT_NAME_SERVICES + "/" + SERVICE_NAME.getLocalPart( ) + "/"
+ + JndiConstants.ATOMIC_NAME_HOME;
+
+ /**
+ * Map containing all FilesystemResource instances - this map <em>must</em> be static for
+ * compatibility with certain JNDI providers.
+ */
+ private static Map s_resources;
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public org.apache.ws.resource.properties.NamespaceVersionHolder getNamespaceVersionHolder( )
+ {
+ return null; //not sure what should go here.
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public QName getPortType( )
+ {
+ return PORT_TYPE;
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public QName getResourceKeyNameQName( )
+ {
+ return RESOURCE_KEY_NAME;
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public QName getServiceName( )
+ {
+ return SERVICE_NAME;
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public String getServicePortName( )
+ {
+ return PORT_NAME;
+ }
+
+ //private static final Log LOG = LogFactory.getLog( SubscriptionHome.class.getName() );
+ public Subscription create( )
+ {
+ Subscription s = new Subscription( );
+ try
+ {
+ add( s );
+ }
+ catch ( IllegalResourceTypeException irte )
+ {
+ throw new RuntimeException( irte );
+ }
+
+ return s;
+ }
+
+ /**
+ * Returns a map of all FilesystemResource instances. Used by the {@link AbstractResourceHome}
+ * superclass.
+ */
+ protected final synchronized Map getResourceMap( )
+ {
+ if ( s_resources == null )
+ {
+ s_resources = AbstractResourceHome.createResourceMap( m_resourceIsPersistent );
+ }
+
+ return s_resources;
+ }
+}
\ No newline at end of file
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/WsnWsdl2Java.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/WsnWsdl2Java.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/WsnWsdl2Java.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/WsnWsdl2Java.java Tue Aug 2 09:41:00 2005
@@ -1,149 +1,170 @@
-/*=============================================================================*
- * 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.tool;
-
-import org.apache.velocity.VelocityContext;
-import org.apache.ws.notification.base.v2004_06.impl.WsnNamespaceVersionHolderImpl;
-import org.apache.ws.notification.base.v2004_06.porttype.NotificationProducerPortType;
-import org.apache.ws.notification.tool.v2004_06.NotificationConsumerPortType2JavaInfo;
-import org.apache.ws.notification.tool.v2004_06.NotificationProducerPortType2JavaInfo;
-import org.apache.ws.notification.tool.v2004_06.SubscriptionManagerPortType2JavaInfo;
-import org.apache.ws.resource.ResourceDefinition;
-import org.apache.ws.resource.tool.Wsdl2Java;
-import org.apache.ws.resource.tool.velocity.ServiceProperties;
-
-import java.io.File;
-
-/**
- * Generates Java Web service types and skeletons from a WSRF/WSN WSDL.
- *
- * @author Ian Springer (ian DOT springer AT hp DOT com)
- */
-public class WsnWsdl2Java extends Wsdl2Java
-{
- protected String WEBAPP_NAME = "pubscribe";
- private static final String VCTY_CTX_PROP_CHANGE = "propChange";
- private static final String VCTY_CTX_RESOURCE_TERMINATION = "resourceTermination";
- private static final String VCTY_CTX_NOTIF_PRODUCER = "notificationProducer";
-
- public WsnWsdl2Java(File[] wsdlFiles, File outputDir, File[] classpath, Wsdl2JavaOptions options)
- throws Exception
- {
- super(wsdlFiles, outputDir, classpath, options);
- initPortTypeInfoMap();
- }
-
- private void initPortTypeInfoMap()
- {
- addPortType2JavaInfo(new NotificationConsumerPortType2JavaInfo());
- addPortType2JavaInfo(new NotificationProducerPortType2JavaInfo());
- addPortType2JavaInfo(new SubscriptionManagerPortType2JavaInfo());
- }
-
- /**
- * Adds to the {@link ServiceProperties} object by making a call to super and
- * then adding anything impl specific to be used by the VelocityContext for code generation.
- *
- * {@see Wsdl2Java#buildServiceProperties(ResourceDefinition resourceDefinition, File wsdlfile, File servicedir)}
- *
- * @param resourceDefinition The definition we are working on.
- * @param wsdlfile The wsdl file.
- * @param servicedir The directory we are generating to for this service.
- * @return the updated ServiceProperties
- */
- protected ServiceProperties buildServiceProperties(ResourceDefinition resourceDefinition, File wsdlfile, File servicedir)
- {
- ServiceProperties serviceProperties = super.buildServiceProperties(resourceDefinition, wsdlfile, servicedir);
- serviceProperties.setNamespaceVersionHolder(WsnNamespaceVersionHolderImpl.class);//make sure to add different ones as new versions comeout
-
- //tell service props which properties we handle for the user...
- if (hasNotificationProducer(resourceDefinition))
- {
- serviceProperties.addImplementedProperty(NotificationProducerPortType.PROP_QNAME_FIXED_TOPIC_SET);
- serviceProperties.addImplementedProperty(NotificationProducerPortType.PROP_QNAME_TOPIC);
- serviceProperties.addImplementedProperty(NotificationProducerPortType.PROP_QNAME_TOPIC_EXPRESSION_DIALECTS);
- }
- return serviceProperties;
- }
-
- /**
- * Returns the name of the webapp for use in generating code.
- *
- * @return the webapp name.
- */
- protected String getWebbappName()
- {
- return WEBAPP_NAME;
- }
-
- /**
- * Provides a hook for adding directly to the Velocity Context.
- *
- * @param context
- * @return VelocityContext
- */
- protected VelocityContext updateVelocityContext(VelocityContext context, ResourceDefinition resourceDef)
- {
- VelocityContext velocityContext = super.updateVelocityContext(context, resourceDef);
- if (hasPropChange(resourceDef))
- {
- velocityContext.put(VCTY_CTX_PROP_CHANGE, "true");
- }
-
- if (hasResourceTermination(resourceDef))
- {
- velocityContext.put(VCTY_CTX_RESOURCE_TERMINATION, "true");
- }
-
- if (hasNotificationProducer(resourceDef))
- {
- velocityContext.put(VCTY_CTX_NOTIF_PRODUCER, "true");
- }
-
- return velocityContext;
- }
-
-
- private boolean hasNotificationProducer(ResourceDefinition resourceDef)
- {
- return resourceDef.implementsResourceCapability(org.apache.ws.notification.base.v2004_06.porttype.NotificationProducerPortType.NAME);
- }
-
- private boolean hasResourceTermination(ResourceDefinition resourceDef)
- {
- if (resourceDef.implementsResourceCapability(org.apache.ws.resource.lifetime.v2004_06.porttype.ImmediateResourceTerminationPortType.NAME)
- || resourceDef.implementsResourceCapability(org.apache.ws.resource.lifetime.v2004_06.porttype.ScheduledResourceTerminationPortType.NAME)
- || resourceDef.implementsResourceCapability(org.apache.ws.resource.lifetime.v2004_11.porttype.ImmediateResourceTerminationPortType.NAME)
- || resourceDef.implementsResourceCapability(org.apache.ws.resource.lifetime.v2004_11.porttype.ScheduledResourceTerminationPortType.NAME))
- {
- return true;
- }
- return false;
- }
-
- private boolean hasPropChange(ResourceDefinition resourceDef)
- {
- if (resourceDef.implementsResourceCapability(org.apache.ws.resource.properties.v2004_06.porttype.SetResourcePropertiesPortType.NAME)
- || resourceDef.implementsResourceCapability(org.apache.ws.resource.properties.v2004_11.porttype.DeleteResourcePropertiesPortType.NAME)
- || resourceDef.implementsResourceCapability(org.apache.ws.resource.properties.v2004_11.porttype.InsertResourcePropertiesPortType.NAME)
- || resourceDef.implementsResourceCapability(org.apache.ws.resource.properties.v2004_11.porttype.SetResourcePropertiesPortType.NAME)
- || resourceDef.implementsResourceCapability(org.apache.ws.resource.properties.v2004_11.porttype.UpdateResourcePropertiesPortType.NAME))
- {
- return true;
- }
- return false;
- }
-}
+/*=============================================================================*
+ * 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.tool;
+
+import org.apache.velocity.VelocityContext;
+import org.apache.ws.notification.base.v2004_06.impl.WsnNamespaceVersionHolderImpl;
+import org.apache.ws.notification.base.v2004_06.porttype.NotificationProducerPortType;
+import org.apache.ws.notification.tool.v2004_06.NotificationConsumerPortType2JavaInfo;
+import org.apache.ws.notification.tool.v2004_06.NotificationProducerPortType2JavaInfo;
+import org.apache.ws.notification.tool.v2004_06.SubscriptionManagerPortType2JavaInfo;
+import org.apache.ws.resource.ResourceDefinition;
+import org.apache.ws.resource.tool.Wsdl2Java;
+import org.apache.ws.resource.tool.velocity.ServiceProperties;
+import java.io.File;
+
+/**
+ * Generates Java Web service types and skeletons from a WSRF/WSN WSDL.
+ *
+ * @author Ian Springer (ian DOT springer AT hp DOT com)
+ */
+public class WsnWsdl2Java
+ extends Wsdl2Java
+{
+ private static final String VCTY_CTX_PROP_CHANGE = "propChange";
+ private static final String VCTY_CTX_RESOURCE_TERMINATION = "resourceTermination";
+ private static final String VCTY_CTX_NOTIF_PRODUCER = "notificationProducer";
+
+ /** DOCUMENT_ME */
+ protected String WEBAPP_NAME = "pubscribe";
+
+ /**
+ * Creates a new {@link WsnWsdl2Java} object.
+ *
+ * @param wsdlFiles DOCUMENT_ME
+ * @param outputDir DOCUMENT_ME
+ * @param classpath DOCUMENT_ME
+ * @param options DOCUMENT_ME
+ *
+ * @throws Exception DOCUMENT_ME
+ */
+ public WsnWsdl2Java( File[] wsdlFiles,
+ File outputDir,
+ File[] classpath,
+ Wsdl2JavaOptions options )
+ throws Exception
+ {
+ super( wsdlFiles, outputDir, classpath, options );
+ initPortTypeInfoMap( );
+ }
+
+ /**
+ * Returns the name of the webapp for use in generating code.
+ *
+ * @return the webapp name.
+ */
+ protected String getWebbappName( )
+ {
+ return WEBAPP_NAME;
+ }
+
+ /**
+ * Adds to the {@link ServiceProperties} object by making a call to super and
+ * then adding anything impl specific to be used by the VelocityContext for code generation.
+ *
+ * {@see Wsdl2Java#buildServiceProperties(ResourceDefinition resourceDefinition, File wsdlfile, File servicedir)}
+ *
+ * @param resourceDefinition The definition we are working on.
+ * @param wsdlfile The wsdl file.
+ * @param servicedir The directory we are generating to for this service.
+ * @return the updated ServiceProperties
+ */
+ protected ServiceProperties buildServiceProperties( ResourceDefinition resourceDefinition,
+ File wsdlfile,
+ File servicedir )
+ {
+ ServiceProperties serviceProperties =
+ super.buildServiceProperties( resourceDefinition, wsdlfile, servicedir );
+ serviceProperties.setNamespaceVersionHolder( WsnNamespaceVersionHolderImpl.class ); //make sure to add different ones as new versions comeout
+
+ //tell service props which properties we handle for the user...
+ if ( hasNotificationProducer( resourceDefinition ) )
+ {
+ serviceProperties.addImplementedProperty( NotificationProducerPortType.PROP_QNAME_FIXED_TOPIC_SET );
+ serviceProperties.addImplementedProperty( NotificationProducerPortType.PROP_QNAME_TOPIC );
+ serviceProperties.addImplementedProperty( NotificationProducerPortType.PROP_QNAME_TOPIC_EXPRESSION_DIALECTS );
+ }
+
+ return serviceProperties;
+ }
+
+ /**
+ * Provides a hook for adding directly to the Velocity Context.
+ *
+ * @param context
+ * @return VelocityContext
+ */
+ protected VelocityContext updateVelocityContext( VelocityContext context,
+ ResourceDefinition resourceDef )
+ {
+ VelocityContext velocityContext = super.updateVelocityContext( context, resourceDef );
+ if ( hasPropChange( resourceDef ) )
+ {
+ velocityContext.put( VCTY_CTX_PROP_CHANGE, "true" );
+ }
+
+ if ( hasResourceTermination( resourceDef ) )
+ {
+ velocityContext.put( VCTY_CTX_RESOURCE_TERMINATION, "true" );
+ }
+
+ if ( hasNotificationProducer( resourceDef ) )
+ {
+ velocityContext.put( VCTY_CTX_NOTIF_PRODUCER, "true" );
+ }
+
+ return velocityContext;
+ }
+
+ private boolean hasNotificationProducer( ResourceDefinition resourceDef )
+ {
+ return resourceDef.implementsResourceCapability( org.apache.ws.notification.base.v2004_06.porttype.NotificationProducerPortType.NAME );
+ }
+
+ private boolean hasPropChange( ResourceDefinition resourceDef )
+ {
+ if ( resourceDef.implementsResourceCapability( org.apache.ws.resource.properties.v2004_06.porttype.SetResourcePropertiesPortType.NAME )
+ || resourceDef.implementsResourceCapability( org.apache.ws.resource.properties.v2004_11.porttype.DeleteResourcePropertiesPortType.NAME )
+ || resourceDef.implementsResourceCapability( org.apache.ws.resource.properties.v2004_11.porttype.InsertResourcePropertiesPortType.NAME )
+ || resourceDef.implementsResourceCapability( org.apache.ws.resource.properties.v2004_11.porttype.SetResourcePropertiesPortType.NAME )
+ || resourceDef.implementsResourceCapability( org.apache.ws.resource.properties.v2004_11.porttype.UpdateResourcePropertiesPortType.NAME ) )
+ {
+ return true;
+ }
+
+ return false;
+ }
+
+ private boolean hasResourceTermination( ResourceDefinition resourceDef )
+ {
+ if ( resourceDef.implementsResourceCapability( org.apache.ws.resource.lifetime.v2004_06.porttype.ImmediateResourceTerminationPortType.NAME )
+ || resourceDef.implementsResourceCapability( org.apache.ws.resource.lifetime.v2004_06.porttype.ScheduledResourceTerminationPortType.NAME )
+ || resourceDef.implementsResourceCapability( org.apache.ws.resource.lifetime.v2004_11.porttype.ImmediateResourceTerminationPortType.NAME )
+ || resourceDef.implementsResourceCapability( org.apache.ws.resource.lifetime.v2004_11.porttype.ScheduledResourceTerminationPortType.NAME ) )
+ {
+ return true;
+ }
+
+ return false;
+ }
+
+ private void initPortTypeInfoMap( )
+ {
+ addPortType2JavaInfo( new NotificationConsumerPortType2JavaInfo( ) );
+ addPortType2JavaInfo( new NotificationProducerPortType2JavaInfo( ) );
+ addPortType2JavaInfo( new SubscriptionManagerPortType2JavaInfo( ) );
+ }
+}
\ No newline at end of file
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/WsnWsdl2JavaTask.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/WsnWsdl2JavaTask.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/WsnWsdl2JavaTask.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/WsnWsdl2JavaTask.java Tue Aug 2 09:41:00 2005
@@ -1,57 +1,58 @@
-/*=============================================================================*
- * 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.tool;
-
-import org.apache.ws.resource.tool.Wsdl2JavaTask;
-import org.apache.ws.resource.tool.Wsdl2Java;
-
-import java.io.File;
-
-/**
- * Ant task that wraps {@link WsnWsdl2Java}.
- *
- * @author Ian Springer (ian DOT springer AT hp DOT com)
- */
-public class WsnWsdl2JavaTask extends Wsdl2JavaTask
-{
-
- /**
- * Returns a simple statement of what the task is.
- *
- * @return the simple string
- */
- public String toString()
- {
- return "WsnWsdl2Java Ant task";
- }
-
- /**
- * Method which builds the implementation of Wsdl2Java, which in this case is {@link WsnWsdl2Java}.
- *
- * @param wsdlFiles The wsdl files to be processed.
- * @param outputDir The directory where the generated code will go.
- * @param classpathFiles The classpath.
- * @param options {@link Wsdl2Java.Wsdl2JavaOptions}
- * @return The implementation of Wsdl2Java
- * @throws Exception
- */
- protected Wsdl2Java createWsdl2Java( File[] wsdlFiles, File outputDir, File[] classpathFiles, Wsdl2Java.Wsdl2JavaOptions options )
- throws Exception
- {
- return new WsnWsdl2Java( wsdlFiles, outputDir, classpathFiles, options );
- }
-
-}
+/*=============================================================================*
+ * 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.tool;
+
+import org.apache.ws.resource.tool.Wsdl2Java;
+import org.apache.ws.resource.tool.Wsdl2JavaTask;
+import java.io.File;
+
+/**
+ * Ant task that wraps {@link WsnWsdl2Java}.
+ *
+ * @author Ian Springer (ian DOT springer AT hp DOT com)
+ */
+public class WsnWsdl2JavaTask
+ extends Wsdl2JavaTask
+{
+ /**
+ * Returns a simple statement of what the task is.
+ *
+ * @return the simple string
+ */
+ public String toString( )
+ {
+ return "WsnWsdl2Java Ant task";
+ }
+
+ /**
+ * Method which builds the implementation of Wsdl2Java, which in this case is {@link WsnWsdl2Java}.
+ *
+ * @param wsdlFiles The wsdl files to be processed.
+ * @param outputDir The directory where the generated code will go.
+ * @param classpathFiles The classpath.
+ * @param options {@link Wsdl2Java.Wsdl2JavaOptions}
+ * @return The implementation of Wsdl2Java
+ * @throws Exception
+ */
+ protected Wsdl2Java createWsdl2Java( File[] wsdlFiles,
+ File outputDir,
+ File[] classpathFiles,
+ Wsdl2Java.Wsdl2JavaOptions options )
+ throws Exception
+ {
+ return new WsnWsdl2Java( wsdlFiles, outputDir, classpathFiles, options );
+ }
+}
\ No newline at end of file
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/v2004_06/NotificationConsumerPortType2JavaInfo.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/v2004_06/NotificationConsumerPortType2JavaInfo.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/v2004_06/NotificationConsumerPortType2JavaInfo.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/v2004_06/NotificationConsumerPortType2JavaInfo.java Tue Aug 2 09:41:00 2005
@@ -1,46 +1,59 @@
-/*=============================================================================*
- * 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.tool.v2004_06;
-
-import org.apache.ws.notification.base.v2004_06.porttype.NotificationConsumerPortType;
-import org.apache.ws.resource.tool.PortType2JavaInfo;
-
-import javax.xml.namespace.QName;
-
-/**
- *
- *
- * @author Ian Springer (ian DOT springer AT hp DOT com), Sal Campana
- */
-public class NotificationConsumerPortType2JavaInfo extends PortType2JavaInfo
-{
-
- public QName getName()
- {
- return NotificationConsumerPortType.NAME;
- }
-
- public String getServiceInterfaceName()
- {
- return NotificationConsumerPortType.class.getName();
- }
-
- public String getServiceTemplateFileName()
- {
- return "templates/v2004_06/NotificationConsumerPortType.txt";
- }
-
-}
+/*=============================================================================*
+ * 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.tool.v2004_06;
+
+import org.apache.ws.notification.base.v2004_06.porttype.NotificationConsumerPortType;
+import org.apache.ws.resource.tool.PortType2JavaInfo;
+import javax.xml.namespace.QName;
+
+/**
+ *
+ *
+ * @author Ian Springer (ian DOT springer AT hp DOT com), Sal Campana
+ */
+public class NotificationConsumerPortType2JavaInfo
+ extends PortType2JavaInfo
+{
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public QName getName( )
+ {
+ return NotificationConsumerPortType.NAME;
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public String getServiceInterfaceName( )
+ {
+ return NotificationConsumerPortType.class.getName( );
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public String getServiceTemplateFileName( )
+ {
+ return "templates/v2004_06/NotificationConsumerPortType.txt";
+ }
+}
\ No newline at end of file
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/v2004_06/NotificationProducerPortType2JavaInfo.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/v2004_06/NotificationProducerPortType2JavaInfo.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/v2004_06/NotificationProducerPortType2JavaInfo.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/v2004_06/NotificationProducerPortType2JavaInfo.java Tue Aug 2 09:41:00 2005
@@ -1,68 +1,101 @@
-/*=============================================================================*
- * 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.tool.v2004_06;
-
-import org.apache.ws.notification.base.v2004_06.porttype.NotificationProducerPortType;
-import org.apache.ws.notification.base.NotificationProducerResource;
-import org.apache.ws.resource.tool.PortType2JavaInfo;
-
-import javax.xml.namespace.QName;
-
-/**
- * A PortType2Java impl for the NotificationProducer portType which tells WsnWsdl2Java
- * information on how to implement this portType in the generated code.
- *
- * @author Ian Springer (ian DOT springer AT hp DOT com)
- */
-public class NotificationProducerPortType2JavaInfo extends PortType2JavaInfo
-{
-
- public QName getName()
- {
- return NotificationProducerPortType.NAME;
- }
-
- public String getResourceInterfaceName()
- {
- return NotificationProducerResource.class.getName();
- }
-
- public String getServiceInterfaceName()
- {
- return NotificationProducerPortType.class.getName();
- }
-
- public String getServiceTemplateFileName()
- {
- return "templates/v2004_06/NotificationProducerPortType.txt";
- }
-
- public String getResourceTemplateFileName()
- {
- return "templates/NotificationProducerResource.txt";
- }
-
- public String getAbstractResourceInitMethodIncludeLocation()
- {
- return "templates/NotificationProducer-AbstractResource_init.txt";
- }
-
- public String getResourceInitMethodIncludeLocation()
- {
- return "templates/NotificationProducer-Resource_init.txt";
- }
-
-}
+/*=============================================================================*
+ * 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.tool.v2004_06;
+
+import org.apache.ws.notification.base.NotificationProducerResource;
+import org.apache.ws.notification.base.v2004_06.porttype.NotificationProducerPortType;
+import org.apache.ws.resource.tool.PortType2JavaInfo;
+import javax.xml.namespace.QName;
+
+/**
+ * A PortType2Java impl for the NotificationProducer portType which tells WsnWsdl2Java
+ * information on how to implement this portType in the generated code.
+ *
+ * @author Ian Springer (ian DOT springer AT hp DOT com)
+ */
+public class NotificationProducerPortType2JavaInfo
+ extends PortType2JavaInfo
+{
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public String getAbstractResourceInitMethodIncludeLocation( )
+ {
+ return "templates/NotificationProducer-AbstractResource_init.txt";
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public QName getName( )
+ {
+ return NotificationProducerPortType.NAME;
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public String getResourceInitMethodIncludeLocation( )
+ {
+ return "templates/NotificationProducer-Resource_init.txt";
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public String getResourceInterfaceName( )
+ {
+ return NotificationProducerResource.class.getName( );
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public String getResourceTemplateFileName( )
+ {
+ return "templates/NotificationProducerResource.txt";
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public String getServiceInterfaceName( )
+ {
+ return NotificationProducerPortType.class.getName( );
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public String getServiceTemplateFileName( )
+ {
+ return "templates/v2004_06/NotificationProducerPortType.txt";
+ }
+}
\ No newline at end of file
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/v2004_06/SubscriptionManagerPortType2JavaInfo.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/v2004_06/SubscriptionManagerPortType2JavaInfo.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/v2004_06/SubscriptionManagerPortType2JavaInfo.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/v2004_06/SubscriptionManagerPortType2JavaInfo.java Tue Aug 2 09:41:00 2005
@@ -1,47 +1,60 @@
-/*=============================================================================*
- * 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.tool.v2004_06;
-
-import org.apache.ws.notification.base.v2004_06.porttype.SubscriptionManagerPortType;
-import org.apache.ws.resource.tool.PortType2JavaInfo;
-
-import javax.xml.namespace.QName;
-
-/**
- * A PortType2Java impl for the SubscriptionManager portType which tells WsnWsdl2Java
- * information on how to implement this portType in the generated code.
- *
- * @author Ian Springer (ian DOT springer AT hp DOT com)
- */
-public class SubscriptionManagerPortType2JavaInfo extends PortType2JavaInfo
-{
-
- public QName getName()
- {
- return SubscriptionManagerPortType.NAME;
- }
-
- public String getServiceInterfaceName()
- {
- return SubscriptionManagerPortType.class.getName();
- }
-
- public String getServiceTemplateFileName()
- {
- return "templates/v2004_06/SubscriptionManagerPortType.txt";
- }
-
-}
+/*=============================================================================*
+ * 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.tool.v2004_06;
+
+import org.apache.ws.notification.base.v2004_06.porttype.SubscriptionManagerPortType;
+import org.apache.ws.resource.tool.PortType2JavaInfo;
+import javax.xml.namespace.QName;
+
+/**
+ * A PortType2Java impl for the SubscriptionManager portType which tells WsnWsdl2Java
+ * information on how to implement this portType in the generated code.
+ *
+ * @author Ian Springer (ian DOT springer AT hp DOT com)
+ */
+public class SubscriptionManagerPortType2JavaInfo
+ extends PortType2JavaInfo
+{
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public QName getName( )
+ {
+ return SubscriptionManagerPortType.NAME;
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public String getServiceInterfaceName( )
+ {
+ return SubscriptionManagerPortType.class.getName( );
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public String getServiceTemplateFileName( )
+ {
+ return "templates/v2004_06/SubscriptionManagerPortType.txt";
+ }
+}
\ No newline at end of file
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/ResourcePropertyValueChangeTopic.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/ResourcePropertyValueChangeTopic.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/ResourcePropertyValueChangeTopic.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/ResourcePropertyValueChangeTopic.java Tue Aug 2 09:41:00 2005
@@ -1,28 +1,29 @@
-/*=============================================================================*
- * 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.topics;
-
-import org.apache.ws.resource.properties.ResourcePropertyValueChangeListener;
-
-/**
- * A topic that acts as a listener for resource property value change events.
- *
- * @author Sal Campana
- */
-public interface ResourcePropertyValueChangeTopic extends Topic, ResourcePropertyValueChangeListener
-{
-
-}
+/*=============================================================================*
+ * 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.topics;
+
+import org.apache.ws.resource.properties.ResourcePropertyValueChangeListener;
+
+/**
+ * A topic that acts as a listener for resource property value change events.
+ *
+ * @author Sal Campana
+ */
+public interface ResourcePropertyValueChangeTopic
+ extends Topic,
+ ResourcePropertyValueChangeListener
+{
+}
\ No newline at end of file
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/Topic.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/Topic.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/Topic.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/Topic.java Tue Aug 2 09:41:00 2005
@@ -1,111 +1,112 @@
-/*=============================================================================*
- * 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.topics;
-
-import org.apache.ws.notification.topics.expression.TopicExpression;
-
-import java.util.List;
-
-/**
- * Interface for representing a topic. A topic is either a child of a parent topic or in the case of root topics a
- * member of a topic list. Non-root topics have names without a namespace component.
- *
- * @see TopicSpace
- */
-public interface Topic extends TopicSet, TopicListenerList
-{
-
- /**
- * Get the name of this topic.
- *
- * @return the name of this topic
- */
- String getName();
-
- /**
- * Get the latest notification message published to this topic.
- *
- * @return an Object representing the latest notification message published to this topic, or null if no messages
- * have yet been published
- */
- Object getCurrentMessage();
-
- /**
- * Set the topic expression that resolves to a set of topics that this topic references.
- * Only used for reference topics.
- *
- * @param topicPath The topic expression to set.
- */
- void setTopicReference( TopicExpression topicPath );
-
- /**
- * Get the topic expression for the topic(s) that this topic references.
- *
- * @return The topic expression that this topic reference or null if this topic is not a reference.
- */
- TopicExpression getTopicReference();
-
- /**
- * Set the topic path. The topic path is represented as a ordered list of topic names
- *
- * @param topicPath The topic path to associate with this topic
- */
- void setTopicPath( List topicPath );
-
- /**
- * Get the topic path. The topic path is represented as a ordered list of topic names
- *
- * @return The topic path of this topic
- */
- List getTopicPath();
-
- /**
- * Publish a notification message to this topic.
- *
- * @param msg the notification message to be published
- *
- * @throws Exception on error
- */
- void publish( Object msg ) throws Exception;
-
- /**
- * Is this a topic reference?
- *
- * @return true if this topic is a reference to another topic, false if not
- */
- boolean isReference();
-
- /**
- * Set the TopicSpace this Topic is part of
- *
- * @param topicSpace The TopicSpace this Topic is part of
- */
- void setTopicSpace( TopicSpace topicSpace );
-
- /**
- * gets the TopicSpace this Topic is part of
- *
- * @return The TopicSpace this Topic is part of
- */
- TopicSpace getTopicSpace();
-
- /**
- * Returns whether this Topic is visible or not.
- *
- * @return true if the Topic is visible, else false.
- */
- boolean isVisible();
-}
+/*=============================================================================*
+ * 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.topics;
+
+import org.apache.ws.notification.topics.expression.TopicExpression;
+import java.util.List;
+
+/**
+ * Interface for representing a topic. A topic is either a child of a parent topic or in the case of root topics a
+ * member of a topic list. Non-root topics have names without a namespace component.
+ *
+ * @see TopicSpace
+ */
+public interface Topic
+ extends TopicSet,
+ TopicListenerList
+{
+ /**
+ * Get the latest notification message published to this topic.
+ *
+ * @return an Object representing the latest notification message published to this topic, or null if no messages
+ * have yet been published
+ */
+ Object getCurrentMessage( );
+
+ /**
+ * Get the name of this topic.
+ *
+ * @return the name of this topic
+ */
+ String getName( );
+
+ /**
+ * Is this a topic reference?
+ *
+ * @return true if this topic is a reference to another topic, false if not
+ */
+ boolean isReference( );
+
+ /**
+ * Set the topic path. The topic path is represented as a ordered list of topic names
+ *
+ * @param topicPath The topic path to associate with this topic
+ */
+ void setTopicPath( List topicPath );
+
+ /**
+ * Get the topic path. The topic path is represented as a ordered list of topic names
+ *
+ * @return The topic path of this topic
+ */
+ List getTopicPath( );
+
+ /**
+ * Set the topic expression that resolves to a set of topics that this topic references.
+ * Only used for reference topics.
+ *
+ * @param topicPath The topic expression to set.
+ */
+ void setTopicReference( TopicExpression topicPath );
+
+ /**
+ * Get the topic expression for the topic(s) that this topic references.
+ *
+ * @return The topic expression that this topic reference or null if this topic is not a reference.
+ */
+ TopicExpression getTopicReference( );
+
+ /**
+ * Set the TopicSpace this Topic is part of
+ *
+ * @param topicSpace The TopicSpace this Topic is part of
+ */
+ void setTopicSpace( TopicSpace topicSpace );
+
+ /**
+ * gets the TopicSpace this Topic is part of
+ *
+ * @return The TopicSpace this Topic is part of
+ */
+ TopicSpace getTopicSpace( );
+
+ /**
+ * Returns whether this Topic is visible or not.
+ *
+ * @return true if the Topic is visible, else false.
+ */
+ boolean isVisible( );
+
+ /**
+ * Publish a notification message to this topic.
+ *
+ * @param msg the notification message to be published
+ *
+ * @throws Exception on error
+ */
+ void publish( Object msg )
+ throws Exception;
+}
\ No newline at end of file
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicListener.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicListener.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicListener.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicListener.java Tue Aug 2 09:41:00 2005
@@ -1,32 +1,32 @@
-/*=============================================================================*
- * 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.topics;
-
-/**
- * Interface that should be implemented by parties interested in changes in topics and the list of root topics. It is
- * currently used to send notifications when the situation represented by a topic changes and for tracking the list of
- * currently supported topics (exposed as a resource property)
- */
-public interface TopicListener
-{
- /**
- * Called when the value of the topic changes
- *
- * @param topic The topic that changed
- */
- void topicChanged( Topic 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.topics;
+
+
+/**
+ * Interface that should be implemented by parties interested in changes in topics and the list of root topics. It is
+ * currently used to send notifications when the situation represented by a topic changes and for tracking the list of
+ * currently supported topics (exposed as a resource property)
+ */
+public interface TopicListener
+{
+ /**
+ * Called when the value of the topic changes
+ *
+ * @param topic The topic that changed
+ */
+ void topicChanged( Topic topic );
+}
\ No newline at end of file
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicListenerList.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicListenerList.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicListenerList.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicListenerList.java Tue Aug 2 09:41:00 2005
@@ -1,56 +1,56 @@
-/*=============================================================================*
- * 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.topics;
-
-import java.util.Iterator;
-
-/**
- * Interface used for managing a list of topic listeners. Currently inherited by the <code>TopicList</code> and
- * <code>Topic</code> interfaces.
- *
- * @see TopicListener
- * @see TopicSpace
- * @see Topic
- */
-public interface TopicListenerList
-{
- /**
- * Add a topic listener
- *
- * @param listener The topic listener to add
- *
- * @see TopicListener
- */
- void addTopicListener( TopicListener listener );
-
- /**
- * Remove a topic listener
- *
- * @param listener The topic listener to remove.
- *
- * @see TopicListener
- */
- void removeTopicListener( TopicListener listener );
-
- /**
- * Get a iterator for the list of TopicListeners
- *
- * @return The iterator
- *
- * @see TopicListener
- */
- Iterator topicListenerIterator();
-}
+/*=============================================================================*
+ * 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.topics;
+
+import java.util.Iterator;
+
+/**
+ * Interface used for managing a list of topic listeners. Currently inherited by the <code>TopicList</code> and
+ * <code>Topic</code> interfaces.
+ *
+ * @see TopicListener
+ * @see TopicSpace
+ * @see Topic
+ */
+public interface TopicListenerList
+{
+ /**
+ * Add a topic listener
+ *
+ * @param listener The topic listener to add
+ *
+ * @see TopicListener
+ */
+ void addTopicListener( TopicListener listener );
+
+ /**
+ * Remove a topic listener
+ *
+ * @param listener The topic listener to remove.
+ *
+ * @see TopicListener
+ */
+ void removeTopicListener( TopicListener listener );
+
+ /**
+ * Get a iterator for the list of TopicListeners
+ *
+ * @return The iterator
+ *
+ * @see TopicListener
+ */
+ Iterator topicListenerIterator( );
+}
\ No newline at end of file
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicSet.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicSet.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicSet.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicSet.java Tue Aug 2 09:41:00 2005
@@ -1,79 +1,77 @@
-/*=============================================================================*
- * 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.topics;
-
-import java.util.Iterator;
-
-/**
- * A set of {@link Topic}s.
- */
-public interface TopicSet
-{
-
- /**
- * Adds the specified topic to this set.
- *
- * If the Topic already exists it will be overwritten in the underlying Map
- *
- * @param topic the topic to add
- *
- * @throws IllegalStateException if the Reference TopicExpression is already set and someone attempts to add.
- */
- Topic addTopic( Topic topic );
-
- /**
- * Creates a new Topic object with the specified name and adds it to this set.
- *
- * If the Topic already exists it will be overwritten in the underlying Map
- *
- * @param name the name of the topic to add
- *
- */
- Topic addTopic( String name );
-
- /**
- * Removes the topic with the specified name from this set.
- *
- * @param name the name of the topic to remove
- */
- void removeTopic( String name );
-
- /**
- * Gets the topic with the specified name.
- *
- * @param name the name of the topic to get
- *
- * @return the topic, or null if no topic with the given name exists in this set
- */
- Topic getTopic( String name );
-
- /**
- * Returns <tt>true</tt> if this set contains a topic with the specified name.
- *
- * @param name the name
- *
- * @return <tt>true</tt> if this set contains a topic with the specified name
- */
- boolean containsTopic( String name );
-
- /**
- * Gets an iterator of the topics in this set.
- *
- * @return the iterator
- */
- Iterator topicIterator();
-
-}
+/*=============================================================================*
+ * 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.topics;
+
+import java.util.Iterator;
+
+/**
+ * A set of {@link Topic}s.
+ */
+public interface TopicSet
+{
+ /**
+ * Gets the topic with the specified name.
+ *
+ * @param name the name of the topic to get
+ *
+ * @return the topic, or null if no topic with the given name exists in this set
+ */
+ Topic getTopic( String name );
+
+ /**
+ * Adds the specified topic to this set.
+ *
+ * If the Topic already exists it will be overwritten in the underlying Map
+ *
+ * @param topic the topic to add
+ *
+ * @throws IllegalStateException if the Reference TopicExpression is already set and someone attempts to add.
+ */
+ Topic addTopic( Topic topic );
+
+ /**
+ * Creates a new Topic object with the specified name and adds it to this set.
+ *
+ * If the Topic already exists it will be overwritten in the underlying Map
+ *
+ * @param name the name of the topic to add
+ *
+ */
+ Topic addTopic( String name );
+
+ /**
+ * Returns <tt>true</tt> if this set contains a topic with the specified name.
+ *
+ * @param name the name
+ *
+ * @return <tt>true</tt> if this set contains a topic with the specified name
+ */
+ boolean containsTopic( String name );
+
+ /**
+ * Removes the topic with the specified name from this set.
+ *
+ * @param name the name of the topic to remove
+ */
+ void removeTopic( String name );
+
+ /**
+ * Gets an iterator of the topics in this set.
+ *
+ * @return the iterator
+ */
+ Iterator topicIterator( );
+}
\ No newline at end of file
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicSpace.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicSpace.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicSpace.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicSpace.java Tue Aug 2 09:41:00 2005
@@ -1,39 +1,39 @@
-/*=============================================================================*
- * 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.topics;
-
-/**
- * A topic space (a hierarchy of topics within a particular namespace).
- * Provides methods for managing the topics and performing queries on them.
- */
-public interface TopicSpace extends TopicSet
-{
-
- /**
- * Returns this topic space's target namespace.
- *
- * @return this topic space's target namespace
- */
- String getTargetNamespace();
-
- /**
- * Returns this topic space's name.
- *
- * @return this topic space's name
- */
- String getName();
-
-}
+/*=============================================================================*
+ * 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.topics;
+
+
+/**
+ * A topic space (a hierarchy of topics within a particular namespace).
+ * Provides methods for managing the topics and performing queries on them.
+ */
+public interface TopicSpace
+ extends TopicSet
+{
+ /**
+ * Returns this topic space's name.
+ *
+ * @return this topic space's name
+ */
+ String getName( );
+
+ /**
+ * Returns this topic space's target namespace.
+ *
+ * @return this topic space's target namespace
+ */
+ String getTargetNamespace( );
+}
\ No newline at end of file
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicSpaceSet.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicSpaceSet.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicSpaceSet.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicSpaceSet.java Tue Aug 2 09:41:00 2005
@@ -1,82 +1,82 @@
-/*=============================================================================*
- * 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.topics;
-
-import org.apache.ws.notification.topics.expression.TopicExpressionException;
-import org.apache.ws.notification.topics.expression.TopicExpressionException;
-import org.apache.ws.notification.topics.expression.TopicExpression;
-
-/**
- * The set of topics that a particular NotificationProducer supports.
- */
-public interface TopicSpaceSet
-{
-
- /**
- * Adds the TopicSpace to the TopicSpaceSet.
- *
- * Note. If the TopiSpace already exists, this method will add all the known Topics
- * to the passed-in TopicSpace and set it as the current TopicSpace in the TopicSpaceSet.
- * This will ensure there is only 1 TopicSpace in the set and it is complete...
- *
- * @param topicSpace
- */
- TopicSpace addTopicSpace( TopicSpace topicSpace );
-
- /**
- * Removes a TopicSpace from the TopicSpaceSet for a given namespace uri.
- *
- * @param namespaceURI
- */
- void removeTopicSpace( String namespaceURI );
-
- /**
- * Returns a TopicSpace for a given namespace uri.
- *
- * @param namespaceURI
- * @return the TopicSpace for the given uri, or null if there is no TopicSpace found.
- */
- TopicSpace getTopicSpace( String namespaceURI );
- /**
- * Resturns the TopicSpaces maintained by this TopicSpaceSet
- *
- * @return An array of TopicSpace objects.
- */
- TopicSpace[] getTopicSpaces();
-
- /**
- * Evaluates a {@link TopicExpression} against the TopicSpaceSet and returns an array of matching Topics.
- *
- * @param topicExpr The topicexpression (query) to be used to search againt the TopicSpaceSet.
- * @return An array of Topics which were found based on the topicexpression
- * @throws TopicExpressionException
- */
- Topic[] evaluateTopicExpression(TopicExpression topicExpr) throws TopicExpressionException;
-
- /**
- * Returns a boolean that indicates if this topic set is fixed as defined by
- * the WS-BaseNotification specification.
- */
- boolean isFixed();
-
- /**
- * Sets the boolean that indicates if this topic set is fixed as defined by
- * the WS-BaseNotification specification.
- *
- * @param fixed
- */
- void setFixed( boolean fixed );
-}
+/*=============================================================================*
+ * 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.topics;
+
+import org.apache.ws.notification.topics.expression.TopicExpression;
+import org.apache.ws.notification.topics.expression.TopicExpressionException;
+
+/**
+ * The set of topics that a particular NotificationProducer supports.
+ */
+public interface TopicSpaceSet
+{
+ /**
+ * Sets the boolean that indicates if this topic set is fixed as defined by
+ * the WS-BaseNotification specification.
+ *
+ * @param fixed
+ */
+ void setFixed( boolean fixed );
+
+ /**
+ * Returns a boolean that indicates if this topic set is fixed as defined by
+ * the WS-BaseNotification specification.
+ */
+ boolean isFixed( );
+
+ /**
+ * Returns a TopicSpace for a given namespace uri.
+ *
+ * @param namespaceURI
+ * @return the TopicSpace for the given uri, or null if there is no TopicSpace found.
+ */
+ TopicSpace getTopicSpace( String namespaceURI );
+
+ /**
+ * Resturns the TopicSpaces maintained by this TopicSpaceSet
+ *
+ * @return An array of TopicSpace objects.
+ */
+ TopicSpace[] getTopicSpaces( );
+
+ /**
+ * Adds the TopicSpace to the TopicSpaceSet.
+ *
+ * Note. If the TopiSpace already exists, this method will add all the known Topics
+ * to the passed-in TopicSpace and set it as the current TopicSpace in the TopicSpaceSet.
+ * This will ensure there is only 1 TopicSpace in the set and it is complete...
+ *
+ * @param topicSpace
+ */
+ TopicSpace addTopicSpace( TopicSpace topicSpace );
+
+ /**
+ * Evaluates a {@link TopicExpression} against the TopicSpaceSet and returns an array of matching Topics.
+ *
+ * @param topicExpr The topicexpression (query) to be used to search againt the TopicSpaceSet.
+ * @return An array of Topics which were found based on the topicexpression
+ * @throws TopicExpressionException
+ */
+ Topic[] evaluateTopicExpression( TopicExpression topicExpr )
+ throws TopicExpressionException;
+
+ /**
+ * Removes a TopicSpace from the TopicSpaceSet for a given namespace uri.
+ *
+ * @param namespaceURI
+ */
+ void removeTopicSpace( String namespaceURI );
+}
\ No newline at end of file
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/expression/InvalidTopicExpressionException.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/expression/InvalidTopicExpressionException.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/expression/InvalidTopicExpressionException.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/expression/InvalidTopicExpressionException.java Tue Aug 2 09:41:00 2005
@@ -1,4 +1,4 @@
-/*
+/*=============================================================================*
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,51 +12,53 @@
* 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.topics.expression;
/**
* This exception is raised when the topic expression is invalid.
*/
-public class InvalidTopicExpressionException extends TopicExpressionException
+public class InvalidTopicExpressionException
+ extends TopicExpressionException
{
- /**
- * Creates a InvalidTopicExpressionException without error message.
- */
- public InvalidTopicExpressionException()
- {
- }
+ /**
+ * Creates a InvalidTopicExpressionException without error message.
+ */
+ public InvalidTopicExpressionException( )
+ {
+ }
- /**
- * Creates a InvalidTopicExpressionException with a given error message.
- *
- * @param message error message
- */
- public InvalidTopicExpressionException(String message)
- {
- super(message);
- }
+ /**
+ * Creates a InvalidTopicExpressionException with a given error message.
+ *
+ * @param message error message
+ */
+ public InvalidTopicExpressionException( String message )
+ {
+ super( message );
+ }
- /**
- * Creates a InvalidTopicExpressionException with a given error message
- * and nested exception.
- *
- * @param message error message
- * @param exception nested exception/
- */
- public InvalidTopicExpressionException(String message, Throwable exception)
- {
- super(message, exception);
- }
+ /**
+ * Creates a InvalidTopicExpressionException with a given error message
+ * and nested exception.
+ *
+ * @param message error message
+ * @param exception nested exception/
+ */
+ public InvalidTopicExpressionException( String message,
+ Throwable exception )
+ {
+ super( message, exception );
+ }
- /**
- * Creates a InvalidTopicExpressionException from a nested exception.
- *
- * @param exception nested exception
- */
- public InvalidTopicExpressionException(Throwable exception)
- {
- super(exception);
- }
-}
+ /**
+ * Creates a InvalidTopicExpressionException from a nested exception.
+ *
+ * @param exception nested exception
+ */
+ public InvalidTopicExpressionException( Throwable exception )
+ {
+ super( exception );
+ }
+}
\ No newline at end of file
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/expression/TopicExpression.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/expression/TopicExpression.java?rev=227035&r1=227034&r2=227035&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/expression/TopicExpression.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/expression/TopicExpression.java Tue Aug 2 09:41:00 2005
@@ -1,44 +1,42 @@
-/*=============================================================================*
- * 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.topics.expression;
-
-import java.net.URI;
-
-/**
- * Java representation of the wsnt:TopicExpressionType XML schema type.
- *
- * @author Ian Springer (ian DOT springer AT hp DOT com)
- */
-public interface TopicExpression
-{
-
- /**
- * Returns the dialect of this topic expression.
- */
- URI getDialect();
-
- /**
- * Returns the content of this topic expression (typically a String).
- */
- Object getContent();
-
- /**
- * Returns a namespace context that can be used to resolve prefixes within this
- * query expression's content.
- */
- Object getNamespaceContext();
-
-}
+/*=============================================================================*
+ * 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.topics.expression;
+
+import java.net.URI;
+
+/**
+ * Java representation of the wsnt:TopicExpressionType XML schema type.
+ *
+ * @author Ian Springer (ian DOT springer AT hp DOT com)
+ */
+public interface TopicExpression
+{
+ /**
+ * Returns the content of this topic expression (typically a String).
+ */
+ Object getContent( );
+
+ /**
+ * Returns the dialect of this topic expression.
+ */
+ URI getDialect( );
+
+ /**
+ * Returns a namespace context that can be used to resolve prefixes within this
+ * query expression's content.
+ */
+ Object getNamespaceContext( );
+}
\ No newline at end of file