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/27 18:26:04 UTC

svn commit: r225548 - in /webservices/pubscribe/trunk/src: examples/broker/ examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/ java/org/apache/ws/eventing/ java/org/apache/ws/eventing/pubsub/ java/org/apache/ws/notification/base/v2...

Author: scamp
Date: Wed Jul 27 09:25:56 2005
New Revision: 225548

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

Modified:
    webservices/pubscribe/trunk/src/examples/broker/BrokerHome.java
    webservices/pubscribe/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/FilesystemHome.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/AbstractSubscription.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/Subscription.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/Subscription.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/SubscriptionHome.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionHome.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/pubsub/SubscriptionHome.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/notification/topics/v2004_06/AbstractTopicExpression.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/emitter/EmitterTask.java
    webservices/pubscribe/trunk/src/java/org/apache/ws/util/uuid/UuidGeneratorFactory.java
    webservices/pubscribe/trunk/src/test/org/apache/ws/notification/base/impl/UnitExampleHome.java

Modified: webservices/pubscribe/trunk/src/examples/broker/BrokerHome.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/examples/broker/BrokerHome.java?rev=225548&r1=225547&r2=225548&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/examples/broker/BrokerHome.java (original)
+++ webservices/pubscribe/trunk/src/examples/broker/BrokerHome.java Wed Jul 27 09:25:56 2005
@@ -36,5 +36,10 @@
     public org.apache.ws.resource.Resource getInstance(org.apache.ws.resource.ResourceContext resourceContext) throws org.apache.ws.resource.ResourceException, org.apache.ws.resource.ResourceContextException, org.apache.ws.resource.ResourceUnknownException {
         return null;
     }
-    
+
+    public org.apache.ws.resource.properties.NamespaceVersionHolder getNamespaceVersionHolder()
+    {
+        return null;
+    }
+
 }

Modified: webservices/pubscribe/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/FilesystemHome.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/FilesystemHome.java?rev=225548&r1=225547&r2=225548&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/FilesystemHome.java (original)
+++ webservices/pubscribe/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/FilesystemHome.java Wed Jul 27 09:25:56 2005
@@ -113,4 +113,10 @@
     {
         return RESOURCE_KEY_NAME;
     }
+
+    public org.apache.ws.resource.properties.NamespaceVersionHolder getNamespaceVersionHolder()
+    {
+        return SPEC_NAMESPACE_SET;
+    }
+
 }

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/AbstractSubscription.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/AbstractSubscription.java?rev=225548&r1=225547&r2=225548&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/AbstractSubscription.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/AbstractSubscription.java Wed Jul 27 09:25:56 2005
@@ -97,5 +97,15 @@
     {
         return m_endpointReference;
     }
+    /**
+     * Sets the EndpointReference associated with this Resource.
+     *
+     * @param epr The EndpointReference for the Resource.
+     */
+    public void setEndpointReference(org.apache.ws.addressing.EndpointReference epr)
+    {
+       m_endpointReference = epr;
+    }
+
 
 }

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/Subscription.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/Subscription.java?rev=225548&r1=225547&r2=225548&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/Subscription.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/Subscription.java Wed Jul 27 09:25:56 2005
@@ -81,8 +81,4 @@
         return Calendar.getInstance();
     }
 
-    public EndpointReference getEndpointReference()
-    {
-        return null; // TODO
-    }
 }

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java?rev=225548&r1=225547&r2=225548&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java Wed Jul 27 09:25:56 2005
@@ -20,16 +20,17 @@
 import edu.berkeley.cs.db.yfilterplus.queryparser.Query;
 import edu.berkeley.cs.db.yfilterplus.queryparser.XPQuery;
 import edu.berkeley.cs.db.yfilterplus.xmltree.XMLTree;
+import org.apache.axis.message.addressing.Constants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.ws.addressing.EndpointReference;
+import org.apache.ws.notification.base.v2004_06.impl.WsnNamespaceVersionHolderImpl;
 import org.apache.ws.pubsub.Filter;
-import org.apache.ws.resource.InvalidResourceKeyException;
 import org.apache.ws.resource.JndiConstants;
 import org.apache.ws.resource.ResourceException;
 import org.apache.ws.resource.ResourceUnknownException;
 import org.apache.ws.resource.impl.AbstractResourceHome;
-import org.apache.axis.message.addressing.Constants;
+import org.apache.ws.resource.properties.NamespaceVersionHolder;
 
 import javax.xml.namespace.QName;
 import java.util.Calendar;
@@ -60,6 +61,7 @@
     private String[] queries;
 
     EXfilterBasic yfilter;
+    private static final NamespaceVersionHolder SPEC_NAMESPACE_SET = new WsnNamespaceVersionHolderImpl();
 
     /** Creates a new instance of ResourceHome */
     public SubscriptionHome() {
@@ -197,6 +199,10 @@
             s_resources = AbstractResourceHome.createResourceMap( m_resourceIsPersistent );
         }
         return s_resources;
+    }
+    public org.apache.ws.resource.properties.NamespaceVersionHolder getNamespaceVersionHolder()
+    {
+        return SPEC_NAMESPACE_SET;
     }
 
 }

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/Subscription.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/Subscription.java?rev=225548&r1=225547&r2=225548&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/Subscription.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/Subscription.java Wed Jul 27 09:25:56 2005
@@ -103,8 +103,5 @@
         super.setEpr(epr);
     }
 
-    public EndpointReference getEndpointReference()
-    {
-        return null; // TODO
-    }
+
 }

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/SubscriptionHome.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/SubscriptionHome.java?rev=225548&r1=225547&r2=225548&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/SubscriptionHome.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/SubscriptionHome.java Wed Jul 27 09:25:56 2005
@@ -20,7 +20,9 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.ws.resource.JndiConstants;
 import org.apache.ws.resource.IllegalResourceTypeException;
+import org.apache.ws.resource.properties.NamespaceVersionHolder;
 import org.apache.ws.resource.impl.AbstractResourceHome;
+import org.apache.ws.notification.base.v2004_06.impl.WsnNamespaceVersionHolderImpl;
 
 import javax.xml.namespace.QName;
 import java.util.Map;
@@ -48,6 +50,7 @@
     public static final String HOME_LOCATION = JndiConstants.CONTEXT_NAME_SERVICES + "/" + SERVICE_NAME.getLocalPart() + "/" + JndiConstants.ATOMIC_NAME_HOME;
     private static int num=0;
     private static final Log LOG = LogFactory.getLog( SubscriptionHome.class.getName() );
+    private static final NamespaceVersionHolder SPEC_NAMESPACE_SET = new WsnNamespaceVersionHolderImpl();
 
     public SubscriptionHome(){
         num++;
@@ -145,4 +148,10 @@
         }
         return s_resources;
     }
+    
+    public org.apache.ws.resource.properties.NamespaceVersionHolder getNamespaceVersionHolder()
+    {
+        return SPEC_NAMESPACE_SET; 
+    }
+    
 }

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionHome.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionHome.java?rev=225548&r1=225547&r2=225548&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionHome.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionHome.java Wed Jul 27 09:25:56 2005
@@ -24,6 +24,7 @@
 import org.apache.ws.resource.ResourceException;
 import org.apache.ws.resource.impl.AbstractResourceHome;
 import org.apache.ws.resource.properties.query.QueryExpression;
+import org.apache.ws.resource.properties.NamespaceVersionHolder;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;
@@ -67,6 +68,7 @@
     public static final String HOME_LOCATION = JndiConstants.CONTEXT_NAME_SERVICES + "/" + SERVICE_NAME.getLocalPart() +
             "/" +
             JndiConstants.ATOMIC_NAME_HOME;
+    private static final NamespaceVersionHolder SPEC_NAMESPACE_SET = new WsnNamespaceVersionHolderImpl();
 
     /**
      * Do not modify this method.
@@ -174,6 +176,10 @@
             s_resources = AbstractResourceHome.createResourceMap( m_resourceIsPersistent );
         }
         return s_resources;
+    }
+    public org.apache.ws.resource.properties.NamespaceVersionHolder getNamespaceVersionHolder()
+    {
+        return SPEC_NAMESPACE_SET; 
     }
 
 }

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=225548&r1=225547&r2=225548&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 Wed Jul 27 09:25:56 2005
@@ -98,4 +98,9 @@
         return s_resources;
     }
 
+    public org.apache.ws.resource.properties.NamespaceVersionHolder getNamespaceVersionHolder()
+    {
+        return null;//not sure what should go here.
+    }
+
 }

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=225548&r1=225547&r2=225548&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 Wed Jul 27 09:25:56 2005
@@ -46,11 +46,21 @@
         }
     }
 
+    /**
+     * Returna the URI for the dialect associated with this topic expression
+     *
+     * @return  dialect {@link URI}
+     */
     public URI getDialect()
     {
         return m_dialect;
     }
 
+    /**
+     * Returns the expression object associated with this topic expression.
+     *
+     * @return expression object.
+     */
     public Object getExpression()
     {
         return m_expr;

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/emitter/EmitterTask.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/emitter/EmitterTask.java?rev=225548&r1=225547&r2=225548&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/emitter/EmitterTask.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/pubsub/emitter/EmitterTask.java Wed Jul 27 09:25:56 2005
@@ -197,6 +197,8 @@
    }
 
    /**
+    * Returns the destination URL where the notification will be sent
+    *
     * @return the destination URL where the notification will be sent
     */
    protected URL getDestinationUrl(  )
@@ -205,6 +207,8 @@
    }
 
    /**
+    * Returns the actual notification object that is to be emitted.
+    *
     * @return the actual notification object that is to be emitted.
     */
    protected SOAPMessage getNotification(  )

Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/util/uuid/UuidGeneratorFactory.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/util/uuid/UuidGeneratorFactory.java?rev=225548&r1=225547&r2=225548&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/util/uuid/UuidGeneratorFactory.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/util/uuid/UuidGeneratorFactory.java Wed Jul 27 09:25:56 2005
@@ -26,11 +26,26 @@
         
     public static final String DEFAULT_IMPL_CLASSNAME = "org.apache.ws.util.uuid.impl.FastUuidGenerator";
 
+    /**
+     * Creates a default {@linkUuidGenerator}
+     *
+     * @return UuidGenerator implementation
+     * @throws RuntimeException
+     */
     public static UuidGenerator createUUIdGenerator() throws RuntimeException
     {
         return createUUIdGenerator( DEFAULT_IMPL_CLASSNAME );
     }
 
+    /**
+     * Creates an instance of UuidGenerator given the provided Class file.
+     *
+     * The provided class should be an implementation of UuidGenerator.
+     *
+     * @param implClass which implements UuidGenerator
+     * @return UuidGenerator implementation
+     * @throws RuntimeException  if something fails when calling newInstance and casting to UuidGenerator.
+     */
     public static UuidGenerator createUUIdGenerator( Class implClass ) throws RuntimeException
     {
         try
@@ -43,6 +58,15 @@
         }
     }
 
+    /**
+     * Creates an instance of UuidGenerator given the provided Class name.
+     *
+     * The provided Class name should be an implementation of UuidGenerator and be availble in the classpath.
+     *
+     * @param implClassname classname of a Class which implements UuidGenerator
+     * @return UuidGenerator implementation
+     * @throws RuntimeException  if something fails when calling Class.forName.
+     */
     public static UuidGenerator createUUIdGenerator( String implClassname ) throws RuntimeException
     {
         try

Modified: webservices/pubscribe/trunk/src/test/org/apache/ws/notification/base/impl/UnitExampleHome.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/test/org/apache/ws/notification/base/impl/UnitExampleHome.java?rev=225548&r1=225547&r2=225548&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/test/org/apache/ws/notification/base/impl/UnitExampleHome.java (original)
+++ webservices/pubscribe/trunk/src/test/org/apache/ws/notification/base/impl/UnitExampleHome.java Wed Jul 27 09:25:56 2005
@@ -105,4 +105,9 @@
         return s_resources;
     }
 
+    public org.apache.ws.resource.properties.NamespaceVersionHolder getNamespaceVersionHolder()
+    {
+        return m_namespaceSet;
+    }
+
 }