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/07/26 19:23:50 UTC
svn commit: r225355 - in /webservices/pubscribe/trunk/src:
java/org/apache/ws/notification/base/
java/org/apache/ws/notification/base/impl/
java/org/apache/ws/notification/base/v2004_06/impl/
java/org/apache/ws/notification/tool/v2004_06/ java/org/apac...
Author: scamp
Date: Tue Jul 26 10:23:25 2005
New Revision: 225355
URL: http://svn.apache.org/viewcvs?rev=225355&view=rev
Log:
Handling of TODOs
Removed:
webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/AbstractTopicSet.java
Modified:
webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/Subscription.java
webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/impl/AbstractSubscription.java
webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionResource.java
webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/v2004_06/NotificationProducerPortType2JavaInfo.java
webservices/pubscribe/trunk/src/java/org/apache/ws/notification/tool/v2004_06/SubscriptionManagerPortType2JavaInfo.java
webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicListener.java
webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/TopicSpace.java
webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/ResourcePropertyValueChangeTopicImpl.java
webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/ResourceTerminationTopicImpl.java
webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/SubscriptionTopicListener.java
webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/TopicImpl.java
webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceImpl.java
webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceSetImpl.java
webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/util/TopicUtils.java
webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/v2004_06/AbstractTopicExpression.java
webservices/pubscribe/trunk/src/test/org/apache/ws/notification/base/v2004_06/porttype/impl/NotificationProducerPortTypeImplTest.java
webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/NotifProducer.java
webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/TopicListenerTestObj.java
webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/impl/ConcreteTopicExpressionEvaluatorTestCase.java
webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/impl/FullTopicExpressionEvaluatorTestCase.java
webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/impl/SimpleTopicExpressionEvaluatorTestCase.java
webservices/pubscribe/trunk/src/webapp/fingerprint.jsp
webservices/pubscribe/trunk/src/webapp/happyaxis.jsp
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=225355&r1=225354&r2=225355&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 Jul 26 10:23:25 2005
@@ -90,10 +90,18 @@
//TODO: remove this method once getEPR() method is added to Resource interface
void setEndpointReference(EndpointReference epr);
- // TODO: figure out if we need this...
+ /**
+ * This method exists for abstraction layer
+ *
+ * @param notificationConsumer
+ */
void setNotificationConsumer(NotificationConsumer notificationConsumer);
- // TODO: figure out if we need this...
+ /**
+ * This method exists for abstraction layer
+ *
+ * @param notificationProducer
+ */
void setNotificationProducer(NotificationProducer notificationProducer);
/**
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/impl/AbstractSubscription.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/impl/AbstractSubscription.java?rev=225355&r1=225354&r2=225355&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/impl/AbstractSubscription.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/impl/AbstractSubscription.java Tue Jul 26 10:23:25 2005
@@ -31,6 +31,9 @@
import org.apache.ws.resource.PropertiesResource;
import org.apache.ws.resource.Resource;
import org.apache.ws.resource.ResourceHome;
+import org.apache.ws.resource.ResourceException;
+import org.apache.ws.resource.PersistenceResource;
+import org.apache.ws.resource.faults.FaultException;
import org.apache.ws.resource.lifetime.ResourceTerminationEvent;
import org.apache.ws.resource.lifetime.ResourceTerminationListener;
import org.apache.ws.resource.lifetime.impl.ResourceTerminationEventImpl;
@@ -38,6 +41,9 @@
import org.apache.ws.resource.properties.query.QueryExpression;
import org.apache.ws.util.uuid.UuidGenerator;
import org.apache.ws.util.uuid.UuidGeneratorFactory;
+import org.apache.ws.Soap1_1Constants;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import javax.naming.InitialContext;
import javax.xml.rpc.JAXRPCException;
@@ -48,12 +54,11 @@
import java.util.List;
/**
- * TODO
+ * An Abstract Base class for Subscription Implementations.
*/
public abstract class AbstractSubscription implements Subscription, PropertiesResource
{
-
- //private static final Log LOG = LogFactory.getLog( AbstractSubscription.class.getName() );
+ private static final Log LOG = LogFactory.getLog(AbstractSubscription.class);
protected EndpointReference m_consumerReference;
protected EndpointReference m_producerReference;
@@ -110,6 +115,9 @@
{
return m_propSet;
}
+ public void setResourcePropertySet(ResourcePropertySet resourcePropertySet) {
+ m_propSet = resourcePropertySet;
+ }
public void setTerminationTime( Calendar time )
{
@@ -226,19 +234,9 @@
return;
}
- //todo fix!
- //TopicSpaceSet topicSpaceSet = ( (NotificationProducerResource) producerResource ).getTopicSpaceSet();
Topic[] topics = null;
- try
- {
- //TopicSpace topicSpace = topicSpaceSet.getTopicSpace();
- //topics = topicSpace.getTopics( m_topicExpression );
- topics = evaluateTopicExpression();
- }
- catch ( Exception e )
- {
- // TODO...
- }
+ topics = evaluateTopicExpression();
+
synchronized ( producerResource )
{
@@ -246,20 +244,18 @@
boolean removed = removeListener( topics );
//persists the resource
- //todo sjc --ips was this removed?
- /* if ( removed && producerResource instanceof PersistenceCallback )
+ if ( removed && producerResource instanceof PersistenceResource )
{
try
{
- ( (PersistenceCallback) producerResource ).store();
+ ( (PersistenceResource) producerResource ).store();
}
catch ( ResourceException e )
{
- ;
+ LOG.debug("Unable to persist the resource: " + producerResource + " with id: " + producerResource.getID(), e);
}
- } */
- //end todo sjc --ips was this removed?
+ }
}
//notify listeners that this subscription expired.
@@ -273,7 +269,7 @@
}
- private Topic[] evaluateTopicExpression() throws Exception
+ private Topic[] evaluateTopicExpression()
{
NotificationProducerResource resource = (NotificationProducerResource) getProducerResource();
TopicSpaceSet topicSpaceSet = resource.getTopicSpaceSet();
@@ -283,7 +279,8 @@
}
catch ( TopicExpressionException e )
{
- throw new JAXRPCException( "An exception occurred during subscription. ", e );
+ LOG.debug("Failed to evaluate TopicExpression.",e);
+ throw new FaultException( Soap1_1Constants.FAULT_CLIENT, "An exception occurred evaluating the topic expression. ");
}
}
@@ -325,13 +322,13 @@
public Filter getFilters()
{
- // TODO. remove?
+ // TODO. *SJC* This is provided for pubsub abstraction layer
return null;
}
public URI getDeliveryMode()
{
- // TODO. remove?
+ // TODO. *SJC* This is provided for pubsub abstraction layer
return null;
}
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionResource.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionResource.java?rev=225355&r1=225354&r2=225355&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionResource.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionResource.java Tue Jul 26 10:23:25 2005
@@ -118,9 +118,6 @@
}
}
- public void setResourcePropertySet(ResourcePropertySet resourcePropertySet) {
- //todo
- }
/**
* Get the subscriptionEnd consumer associated with this subscription.
@@ -128,6 +125,6 @@
* @return the subscriptionEnd consumer
*/
public SubscriptionEndConsumer getSubscriptionEndConsumer() {
- return null; //todo
+ return null; //todo *SJC* pubsub stuff
}
}
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=225355&r1=225354&r2=225355&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 Jul 26 10:23:25 2005
@@ -22,7 +22,8 @@
import javax.xml.namespace.QName;
/**
- * TODO
+ * 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)
*/
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=225355&r1=225354&r2=225355&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 Jul 26 10:23:25 2005
@@ -21,7 +21,8 @@
import javax.xml.namespace.QName;
/**
- * TODO
+ * 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)
*/
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=225355&r1=225354&r2=225355&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 Jul 26 10:23:25 2005
@@ -29,17 +29,4 @@
*/
void topicChanged( Topic topic );
- /**
- * Called when a topic is added
- *
- * @param topic The topic being added
- */
- void topicAdded( Topic topic );
-
- /**
- * Called when a topic is removed
- *
- * @param topic The topic being removed
- */
- void topicRemoved( Topic topic );
}
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=225355&r1=225354&r2=225355&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 Jul 26 10:23:25 2005
@@ -19,7 +19,7 @@
* A topic space (i.e. a hierarchy of topics within a particular namespace).
* Provides methods for managing the topics and performing queries on them.
*/
-public interface TopicSpace extends TopicSet, TopicListenerList
+public interface TopicSpace extends TopicSet
{
/**
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/ResourcePropertyValueChangeTopicImpl.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/ResourcePropertyValueChangeTopicImpl.java?rev=225355&r1=225354&r2=225355&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/ResourcePropertyValueChangeTopicImpl.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/ResourcePropertyValueChangeTopicImpl.java Tue Jul 26 10:23:25 2005
@@ -19,12 +19,18 @@
import org.apache.ws.resource.properties.ResourceProperty;
import org.apache.ws.resource.properties.ResourcePropertyValueChangeEvent;
import org.apache.ws.XmlObjectWrapper;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
- * TODO
+ * A Topic implementation used for handling ResourcePropertyValueChange Events.
+ *
+ * This topic should be registered for each resource property which will be exposed to emit
+ * the ResourcePropertyValueChange Event.
*/
public class ResourcePropertyValueChangeTopicImpl extends TopicImpl implements ResourcePropertyValueChangeTopic
{
+ private static final Log LOG = LogFactory.getLog(ResourcePropertyValueChangeTopicImpl.class);
private ResourceProperty m_prop;
public ResourcePropertyValueChangeTopicImpl( ResourceProperty prop )
@@ -55,8 +61,8 @@
}
catch ( Exception e )
{
- // TODO: do we want to throw this and cause the SetRP request to fault?
- e.printStackTrace();
+ LOG.debug("A exception occurred while publishing a ResourcePropertyValueChangeEvent: ",e);
+ // TODO: *SJC* This is tricky, we may need to devise a List of Exceptions to collect any exceptions. The other thing to consider is where does the exception go?
}
}
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/ResourceTerminationTopicImpl.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/ResourceTerminationTopicImpl.java?rev=225355&r1=225354&r2=225355&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/ResourceTerminationTopicImpl.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/ResourceTerminationTopicImpl.java Tue Jul 26 10:23:25 2005
@@ -4,12 +4,15 @@
import org.apache.ws.resource.lifetime.ResourceTerminationListener;
import org.apache.ws.resource.lifetime.impl.ResourceTerminationEventImpl;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* @author Sal Campana
*/
public class ResourceTerminationTopicImpl extends TopicImpl implements ResourceTerminationListener
{
+ private static final Log LOG = LogFactory.getLog(ResourceTerminationTopicImpl.class);
public static final String TOPIC_NAME = "ResourceTermination";
/**
@@ -35,8 +38,8 @@
}
catch ( Exception e )
{
- // TODO: do we want to throw this and cause the SetRP request to fault?
- e.printStackTrace();
+ LOG.debug("A exception occurred while publishing a ResourceTerminationEvent: ",e);
+ // TODO: *SJC* This is tricky, we may need to devise a List of Exceptions to collect any exceptions. The other thing to consider is where does the exception go?
}
}
}
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/SubscriptionTopicListener.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/SubscriptionTopicListener.java?rev=225355&r1=225354&r2=225355&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/SubscriptionTopicListener.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/SubscriptionTopicListener.java Tue Jul 26 10:23:25 2005
@@ -245,25 +245,6 @@
}
}
- /**
- * DOCUMENT_ME
- *
- * @param topic DOCUMENT_ME
- */
- public void topicAdded( Topic topic )
- {
- //todo
- }
-
- /**
- * DOCUMENT_ME
- *
- * @param topic DOCUMENT_ME
- */
- public void topicRemoved( Topic topic )
- {
- //todo
- }
/*
* Add WS-Addressing headers to a notification.
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/TopicImpl.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/TopicImpl.java?rev=225355&r1=225354&r2=225355&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/TopicImpl.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/TopicImpl.java Tue Jul 26 10:23:25 2005
@@ -18,9 +18,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ws.notification.topics.Topic;
-import org.apache.ws.notification.topics.TopicSpace;
-import org.apache.ws.notification.topics.expression.TopicExpression;
import org.apache.ws.notification.topics.TopicListener;
+import org.apache.ws.notification.topics.TopicSpace;
import org.apache.ws.notification.topics.expression.TopicExpression;
import java.util.Collection;
@@ -70,7 +69,6 @@
topic.setTopicSpace(m_topicSpace);
((TopicImpl)topic).setParent( this );
- this.topicAdded( topic );
return topic;
}
@@ -144,7 +142,6 @@
{
m_subTopics.remove( topic.getName() );
topic.removeTopicListener( this );
- this.topicRemoved( topic );
}
public synchronized void removeTopicListener( TopicListener listener )
@@ -207,17 +204,7 @@
}
}
- public synchronized void topicAdded( Topic topic )
- {
- Iterator listenerIterator = this.m_listeners.iterator();
- TopicListener listener;
- while ( listenerIterator.hasNext() )
- {
- listener = (TopicListener) listenerIterator.next();
- listener.topicAdded( topic );
- }
- }
public synchronized void topicChanged( Topic topic )
{
@@ -226,20 +213,10 @@
while ( listenerIterator.hasNext() )
{
listener = (TopicListener) listenerIterator.next();
- listener.topicChanged( this );
+ listener.topicChanged( topic );
}
}
- public synchronized void topicRemoved( Topic topic )
- {
- Iterator listenerIterator = this.m_listeners.iterator();
- TopicListener listener;
- while ( listenerIterator.hasNext() )
- {
- listener = (TopicListener) listenerIterator.next();
- listener.topicRemoved( topic );
- }
- }
void setParent( Topic parent )
{
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceImpl.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceImpl.java?rev=225355&r1=225354&r2=225355&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceImpl.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceImpl.java Tue Jul 26 10:23:25 2005
@@ -16,7 +16,6 @@
package org.apache.ws.notification.topics.impl;
import org.apache.ws.notification.topics.Topic;
-import org.apache.ws.notification.topics.TopicListener;
import org.apache.ws.notification.topics.TopicSpace;
import java.util.HashMap;
@@ -24,7 +23,7 @@
import java.util.Map;
/**
- * TODO
+ * An implementation of a TopicSpace.
*/
public class TopicSpaceImpl implements TopicSpace
{
@@ -83,21 +82,6 @@
public Iterator topicIterator()
{
return m_rootTopicMap.values().iterator();
- }
-
- public void addTopicListener( TopicListener listener )
- {
- // TODO: either remove, or implement
- }
-
- public void removeTopicListener( TopicListener listener )
- {
- // TODO: either remove, or implement
- }
-
- public Iterator topicListenerIterator()
- {
- return null; // TODO: either remove, or implement
}
}
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceSetImpl.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceSetImpl.java?rev=225355&r1=225354&r2=225355&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceSetImpl.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceSetImpl.java Tue Jul 26 10:23:25 2005
@@ -1,14 +1,11 @@
package org.apache.ws.notification.topics.impl;
import org.apache.ws.notification.topics.Topic;
-import org.apache.ws.notification.topics.expression.TopicExpression;
-import org.apache.ws.notification.topics.expression.TopicExpressionEngine;
import org.apache.ws.notification.topics.TopicSpace;
import org.apache.ws.notification.topics.TopicSpaceSet;
-import org.apache.ws.notification.topics.expression.TopicExpressionException;
-import org.apache.ws.notification.topics.expression.TopicExpressionException;
import org.apache.ws.notification.topics.expression.TopicExpression;
import org.apache.ws.notification.topics.expression.TopicExpressionEngine;
+import org.apache.ws.notification.topics.expression.TopicExpressionException;
import org.apache.ws.notification.topics.expression.impl.TopicExpressionEngineImpl;
import java.util.Hashtable;
@@ -22,7 +19,7 @@
{
private static final TopicExpressionEngine TOPIC_EXPR_ENGINE =
- TopicExpressionEngineImpl.getInstance(); // TODO: look up from JNDI
+ TopicExpressionEngineImpl.getInstance();
private Map m_topicSpaces = new Hashtable();
private boolean m_fixed;
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/util/TopicUtils.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/util/TopicUtils.java?rev=225355&r1=225354&r2=225355&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/util/TopicUtils.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/util/TopicUtils.java Tue Jul 26 10:23:25 2005
@@ -44,7 +44,9 @@
import java.util.Iterator;
/**
- * TODO
+ * A utility class containing static methods used as helpers for working with Topics.
+ *
+ * @author Sal Campana
*/
public class TopicUtils
{
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/v2004_06/AbstractTopicExpression.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/v2004_06/AbstractTopicExpression.java?rev=225355&r1=225354&r2=225355&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/v2004_06/AbstractTopicExpression.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/v2004_06/AbstractTopicExpression.java Tue Jul 26 10:23:25 2005
@@ -23,7 +23,7 @@
import java.net.URISyntaxException;
/**
- * TODO
+ * Provides an Abstract base class for TopicExpressions
*
* @author Ian Springer (ian DOT springer AT hp DOT com)
*/
Modified: webservices/pubscribe/trunk/src/test/org/apache/ws/notification/base/v2004_06/porttype/impl/NotificationProducerPortTypeImplTest.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/test/org/apache/ws/notification/base/v2004_06/porttype/impl/NotificationProducerPortTypeImplTest.java?rev=225355&r1=225354&r2=225355&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/test/org/apache/ws/notification/base/v2004_06/porttype/impl/NotificationProducerPortTypeImplTest.java (original)
+++ webservices/pubscribe/trunk/src/test/org/apache/ws/notification/base/v2004_06/porttype/impl/NotificationProducerPortTypeImplTest.java Tue Jul 26 10:23:25 2005
@@ -127,7 +127,7 @@
notifyDoc instanceof NotifyDocument.Notify);
}
else //unwrapped
- { //todo see what this should be
+ { //see what this should be
XmlObject bodyElems[] = XmlBeanUtils.getChildElements(body,
new QName(BaseNotificationConstants.NSURI_WSNT_SCHEMA, "Notify"));
}
@@ -156,7 +156,7 @@
public void testGetCurrentMessage() throws Exception
{
- //TODO: Test goes here...
+
}
Modified: webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/NotifProducer.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/NotifProducer.java?rev=225355&r1=225354&r2=225355&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/NotifProducer.java (original)
+++ webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/NotifProducer.java Tue Jul 26 10:23:25 2005
@@ -50,7 +50,7 @@
*/
public Subscription subscribe(NotificationConsumer notificationConsumer, SubscriptionEndConsumer subscriptionEndConsumer, TopicFilter tf, XPathFilter xf, Calendar initialTerminationTime, boolean UseNotify)
{
- return null; //todo implement
+ return null; //todo *SJC* implement
}
/**
Modified: webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/TopicListenerTestObj.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/TopicListenerTestObj.java?rev=225355&r1=225354&r2=225355&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/TopicListenerTestObj.java (original)
+++ webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/TopicListenerTestObj.java Tue Jul 26 10:23:25 2005
@@ -19,23 +19,5 @@
}
- /**
- * Called when a topic is added
- *
- * @param topic The topic being added
- */
- public void topicAdded(Topic topic)
- {
- }
-
- /**
- * Called when a topic is removed
- *
- * @param topic The topic being removed
- */
- public void topicRemoved(Topic topic)
- {
-
- }
}
Modified: webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/impl/ConcreteTopicExpressionEvaluatorTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/impl/ConcreteTopicExpressionEvaluatorTestCase.java?rev=225355&r1=225354&r2=225355&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/impl/ConcreteTopicExpressionEvaluatorTestCase.java (original)
+++ webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/impl/ConcreteTopicExpressionEvaluatorTestCase.java Tue Jul 26 10:23:25 2005
@@ -28,7 +28,7 @@
import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.TopicExpressionType;
/**
- * TODO
+ * Testcase for {@link ConcreteTopicExpressionEvaluator}
*/
public class ConcreteTopicExpressionEvaluatorTestCase extends TestCase
{
Modified: webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/impl/FullTopicExpressionEvaluatorTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/impl/FullTopicExpressionEvaluatorTestCase.java?rev=225355&r1=225354&r2=225355&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/impl/FullTopicExpressionEvaluatorTestCase.java (original)
+++ webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/impl/FullTopicExpressionEvaluatorTestCase.java Tue Jul 26 10:23:25 2005
@@ -28,7 +28,7 @@
import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.TopicExpressionType;
/**
- * TODO
+ * Testcase for {@link FullTopicExpressionEvaluator}
*/
public class FullTopicExpressionEvaluatorTestCase extends TestCase
{
Modified: webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/impl/SimpleTopicExpressionEvaluatorTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/impl/SimpleTopicExpressionEvaluatorTestCase.java?rev=225355&r1=225354&r2=225355&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/impl/SimpleTopicExpressionEvaluatorTestCase.java (original)
+++ webservices/pubscribe/trunk/src/test/org/apache/ws/notification/topics/impl/SimpleTopicExpressionEvaluatorTestCase.java Tue Jul 26 10:23:25 2005
@@ -28,7 +28,7 @@
import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.TopicExpressionType;
/**
- * TODO
+ * Testcase for {@link SimpleTopicExpressionEvaluator}
*/
public class SimpleTopicExpressionEvaluatorTestCase extends TestCase
{
Modified: webservices/pubscribe/trunk/src/webapp/fingerprint.jsp
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/webapp/fingerprint.jsp?rev=225355&r1=225354&r2=225355&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/webapp/fingerprint.jsp (original)
+++ webservices/pubscribe/trunk/src/webapp/fingerprint.jsp Tue Jul 26 10:23:25 2005
@@ -34,7 +34,7 @@
key+= "<td>"+timestamp.toString()+"</td>";
return key;
- /* TODO: implement
+ /*
String value=versionProps.getProperty(key);
if (value==null) {
// make it possible to have jars without version nos
@@ -52,7 +52,7 @@
/**
* Split up a classpath-like variable. Returns a list of files.
- * TODO: this can't cope with relative paths. I think theres code in BCEL that
+ *
* can be used for this?
*/
File[] splitClasspath(String path) throws IOException {
@@ -265,7 +265,7 @@
"weblogic.httpd.servlet.classpath",
null);
} else {
- //TODO: identify more servlet engine classpaths.
+
}
%>
</body>
Modified: webservices/pubscribe/trunk/src/webapp/happyaxis.jsp
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/webapp/happyaxis.jsp?rev=225355&r1=225354&r2=225355&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/webapp/happyaxis.jsp (original)
+++ webservices/pubscribe/trunk/src/webapp/happyaxis.jsp Tue Jul 26 10:23:25 2005
@@ -40,7 +40,7 @@
/**
* Get a string providing install information.
- * TODO: make this platform aware and give specific hints
+ *
*/
public String getInstallHints(HttpServletRequest request) {