ws-pubscribe-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i..@apache.org
Subject svn commit: r156671 - in incubator/hermes/trunk/src/java/org/apache/ws: eventing/porttype/impl/ notification/base/impl/ notification/base/v1_2/impl/ notification/base/v1_2/porttype/impl/ notification/tool/v1_2/
Date Wed, 09 Mar 2005 19:19:05 GMT
Author: ips
Date: Wed Mar  9 11:19:00 2005
New Revision: 156671

URL: http://svn.apache.org/viewcvs?view=rev&rev=156671
Log:
fixed compile errors caused by recent changes to Apollo

Modified:
    incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/impl/NotificationPortTypeImpl.java
    incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/impl/SubscriptionEndPortTypeImpl.java
    incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/impl/SubscriptionManagerPortTypeImpl.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/SubscriptionService.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/impl/Subscription1_2Resource.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/porttype/impl/NotificationProducerPortTypeImpl.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/porttype/impl/SubscriptionManagerPortTypeImpl.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/v1_2/NotificationConsumerPortType2JavaInfo.java

Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/impl/NotificationPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/impl/NotificationPortTypeImpl.java?view=diff&r1=156670&r2=156671
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/impl/NotificationPortTypeImpl.java
(original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/impl/NotificationPortTypeImpl.java
Wed Mar  9 11:19:00 2005
@@ -17,7 +17,8 @@
 package org.apache.ws.eventing.porttype.impl;
 
 import org.apache.axis.message.SOAPEnvelope;
-import org.apache.ws.resource.properties.v1_2.porttype.impl.AbstractResourcePropertiesPortType;
+import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
+import org.apache.ws.resource.properties.NamespaceVersionHolder;
 import org.apache.ws.resource.ResourceContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -59,6 +60,11 @@
             //TODO
             e.printStackTrace();
         }
+    }
+
+    protected NamespaceVersionHolder getNamespaceSet()
+    {
+        return null; // not currently used - will be needed once we need to support multiple
spec versions
     }
 }
 

Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/impl/SubscriptionEndPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/impl/SubscriptionEndPortTypeImpl.java?view=diff&r1=156670&r2=156671
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/impl/SubscriptionEndPortTypeImpl.java
(original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/impl/SubscriptionEndPortTypeImpl.java
Wed Mar  9 11:19:00 2005
@@ -19,11 +19,12 @@
 import java.rmi.RemoteException;
 import org.apache.ws.eventing.porttype.SubscriptionEndPortType;
 import org.apache.ws.eventing.Subscription;
-
-import org.apache.ws.resource.properties.v1_2.porttype.impl.AbstractResourcePropertiesPortType;
+import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
+import org.apache.ws.resource.properties.NamespaceVersionHolder;
 import org.apache.ws.resource.ResourceContext;
 
 public class SubscriptionEndPortTypeImpl extends AbstractResourcePropertiesPortType implements
SubscriptionEndPortType{
+
     public SubscriptionEndPortTypeImpl( ResourceContext resourceContext )
     {        
         super( resourceContext );
@@ -33,4 +34,10 @@
        Subscription subscription = (Subscription) getResource();
        subscription.destroy();
     }
+
+    protected NamespaceVersionHolder getNamespaceSet()
+    {
+        return null; // not currently used - will be needed once we need to support multiple
spec versions
+    }
+
 }

Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/impl/SubscriptionManagerPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/impl/SubscriptionManagerPortTypeImpl.java?view=diff&r1=156670&r2=156671
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/impl/SubscriptionManagerPortTypeImpl.java
(original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/impl/SubscriptionManagerPortTypeImpl.java
Wed Mar  9 11:19:00 2005
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 package org.apache.ws.eventing.porttype.impl;
-import org.apache.ws.addressing.*;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import javax.xml.soap.SOAPHeader;
 
 import org.apache.ws.eventing.RemoteSubscription;
-
-import org.xmlsoap.schemas.ws.x2004.x08.eventing.*;
-import java.rmi.RemoteException;
 import org.apache.ws.eventing.porttype.SubscriptionManagerPortType;
 import org.apache.ws.resource.ResourceContext;
-import org.apache.ws.resource.properties.v1_2.porttype.impl.AbstractResourcePropertiesPortType;
+import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
+import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.xmlsoap.schemas.ws.x2004.x08.eventing.GetStatusDocument;
+import org.xmlsoap.schemas.ws.x2004.x08.eventing.GetStatusResponseDocument;
+import org.xmlsoap.schemas.ws.x2004.x08.eventing.RenewDocument;
+import org.xmlsoap.schemas.ws.x2004.x08.eventing.RenewResponseDocument;
+import org.xmlsoap.schemas.ws.x2004.x08.eventing.UnsubscribeDocument;
+
+import java.rmi.RemoteException;
 
 public class SubscriptionManagerPortTypeImpl extends AbstractResourcePropertiesPortType implements
SubscriptionManagerPortType {
 
@@ -64,5 +64,9 @@
         subscription.unsubscribe();
     }
     
+    protected NamespaceVersionHolder getNamespaceSet()
+    {
+        return null; // not currently used - will be needed once we need to support multiple
spec versions
+    }
     
 }

Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/SubscriptionService.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/SubscriptionService.java?view=diff&r1=156670&r2=156671
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/SubscriptionService.java
(original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/SubscriptionService.java
Wed Mar  9 11:19:00 2005
@@ -20,9 +20,9 @@
  * @author Sal Campana
  */
 public class SubscriptionService implements WsrfService  , SubscriptionManagerPortType,
-                                            org.apache.ws.resource.lifetime.v1_2.porttype.ScheduledResourceTerminationPortType,
-                                            org.apache.ws.resource.properties.v1_2.porttype.GetResourcePropertyPortType,
-                                            org.apache.ws.resource.lifetime.v1_2.porttype.ImmediateResourceTerminationPortType
+                                            org.apache.ws.resource.lifetime.v1_2_draft01.porttype.ScheduledResourceTerminationPortType,
+                                            org.apache.ws.resource.properties.v1_2_draft01.porttype.GetResourcePropertyPortType,
+                                            org.apache.ws.resource.lifetime.v1_2_draft01.porttype.ImmediateResourceTerminationPortType
 {
     public static final String TARGET_NSURI = "http://ws.apache.org/notification/base/service/SubscriptionManager";
     public static final String TARGET_NSPREFIX = "SubscriptionManager";
@@ -115,7 +115,7 @@
     */
    public org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.SetTerminationTimeResponseDocument
setTerminationTime( org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.SetTerminationTimeDocument
requestDoc )
    {
-      return new org.apache.ws.resource.lifetime.v1_2.porttype.impl.ScheduledResourceTerminationPortTypeImpl(
getResourceContext(  ) ).setTerminationTime( requestDoc );
+      return new org.apache.ws.resource.lifetime.v1_2_draft01.porttype.impl.ScheduledResourceTerminationPortTypeImpl(
getResourceContext(  ) ).setTerminationTime( requestDoc );
    }
    /**
     * DOCUMENT_ME
@@ -126,7 +126,7 @@
     */
    public org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetResourcePropertyResponseDocument
getResourceProperty( org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetResourcePropertyDocument
requestDoc )
    {
-      return new org.apache.ws.resource.properties.v1_2.porttype.impl.GetResourcePropertyProvider(
getResourceContext(  ) ).getResourceProperty( requestDoc );
+      return new org.apache.ws.resource.properties.v1_2_draft01.porttype.impl.GetResourcePropertyPortTypeImpl(
getResourceContext(  ) ).getResourceProperty( requestDoc );
    }
 
 
@@ -139,7 +139,7 @@
     */
    public org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.DestroyResponseDocument
destroy( org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.DestroyDocument
requestDoc )
    {
-      return new org.apache.ws.resource.lifetime.v1_2.porttype.impl.ImmediateResourceTerminationPortTypeImpl(
getResourceContext(  ) ).destroy( requestDoc );
+      return new org.apache.ws.resource.lifetime.v1_2_draft01.porttype.impl.ImmediateResourceTerminationPortTypeImpl(
getResourceContext(  ) ).destroy( requestDoc );
    }
 
     /**

Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/impl/Subscription1_2Resource.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/impl/Subscription1_2Resource.java?view=diff&r1=156670&r2=156671
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/impl/Subscription1_2Resource.java
(original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/impl/Subscription1_2Resource.java
Wed Mar  9 11:19:00 2005
@@ -15,19 +15,21 @@
  *=============================================================================*/
 package org.apache.ws.notification.base.v1_2.impl;
 
+import org.apache.ws.XmlObjectWrapper;
+import org.apache.ws.addressing.EndpointReference;
 import org.apache.ws.notification.base.impl.AbstractSubscription;
 import org.apache.ws.notification.base.impl.XmlBeansTopicExpression;
 import org.apache.ws.notification.base.v1_2.porttype.SubscriptionManagerPortType;
 import org.apache.ws.notification.topics.TopicExpression;
 import org.apache.ws.resource.ResourceKey;
 import org.apache.ws.resource.lifetime.callback.CurrentTimeCallback;
-import org.apache.ws.resource.lifetime.v1_2.porttype.ScheduledResourceTerminationPortType;
+import org.apache.ws.resource.lifetime.v1_2_draft01.porttype.ScheduledResourceTerminationPortType;
 import org.apache.ws.resource.properties.ResourceProperty;
+import org.apache.ws.resource.properties.ResourcePropertySetMetaData;
 import org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySet;
+import org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySetMetaData;
 import org.apache.ws.resource.properties.query.QueryExpression;
 import org.apache.ws.resource.properties.query.impl.XmlBeansQueryExpression;
-import org.apache.ws.addressing.EndpointReference;
-import org.apache.ws.XmlObjectWrapper;
 import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.ConsumerReferenceDocument;
 import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.CreationTimeDocument;
 import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.PreconditionDocument;
@@ -70,8 +72,8 @@
     public void init()
     {
         SubscriptionManagerRPDocument propsDoc = SubscriptionManagerRPDocument.Factory.newInstance();
-        m_propSet =
-                new XmlBeansResourcePropertySet( propsDoc, READ_ONLY_PROP_NAMES );
+        ResourcePropertySetMetaData propSetMetaData = new XmlBeansResourcePropertySetMetaData(
propsDoc.schemaType(), READ_ONLY_PROP_NAMES );
+        m_propSet = new XmlBeansResourcePropertySet( propsDoc, propSetMetaData );
 
         // wsrlw:ScheduledResourceTermination props
         ResourceProperty prop = m_propSet.get( ScheduledResourceTerminationPortType.PROP_QNAME_CURRENT_TIME
);

Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/porttype/impl/NotificationProducerPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/porttype/impl/NotificationProducerPortTypeImpl.java?view=diff&r1=156670&r2=156671
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/porttype/impl/NotificationProducerPortTypeImpl.java
(original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/porttype/impl/NotificationProducerPortTypeImpl.java
Wed Mar  9 11:19:00 2005
@@ -15,6 +15,9 @@
  *=============================================================================*/
 package org.apache.ws.notification.base.v1_2.porttype.impl;
 
+import org.apache.ws.XmlObjectWrapper;
+import org.apache.ws.addressing.EndpointReference;
+import org.apache.ws.addressing.XmlBeansEndpointReference;
 import org.apache.ws.notification.base.NotificationProducerResource;
 import org.apache.ws.notification.base.Subscription;
 import org.apache.ws.notification.base.impl.SubscriptionHome;
@@ -26,20 +29,18 @@
 import org.apache.ws.notification.topics.TopicSpaceSet;
 import org.apache.ws.notification.topics.impl.SimpleSubscriptionTopicListener;
 import org.apache.ws.notification.topics.topicexpression.impl.TopicExpressionException;
+import org.apache.ws.pubsub.DeliveryMode;
+import org.apache.ws.pubsub.Filter;
+import org.apache.ws.pubsub.NotificationConsumer;
+import org.apache.ws.pubsub.NotificationProducer;
 import org.apache.ws.resource.ResourceContext;
 import org.apache.ws.resource.ResourceContextException;
 import org.apache.ws.resource.impl.AbstractResourceContext;
+import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
 import org.apache.ws.resource.properties.query.QueryExpression;
 import org.apache.ws.resource.properties.query.impl.XmlBeansQueryExpression;
-import org.apache.ws.resource.properties.v1_2.porttype.impl.AbstractResourcePropertiesPortType;
 import org.apache.ws.util.XmlBeanUtils;
-import org.apache.ws.addressing.XmlBeansEndpointReference;
-import org.apache.ws.addressing.EndpointReference;
-import org.apache.ws.XmlObjectWrapper;
-import org.apache.ws.pubsub.NotificationProducer;
-import org.apache.ws.pubsub.Filter;
-import org.apache.ws.pubsub.NotificationConsumer;
-import org.apache.ws.pubsub.DeliveryMode;
 import org.apache.xmlbeans.XmlObject;
 import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.GetCurrentMessageDocument;
 import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.GetCurrentMessageResponseDocument;
@@ -48,13 +49,12 @@
 import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.TopicExpressionType;
 import org.xmlsoap.schemas.ws.x2003.x03.addressing.AttributedURI;
 import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceDocument;
-import org.xmlsoap.schemas.ws.x2003.x03.addressing.ReferencePropertiesType;
 import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceType;
+import org.xmlsoap.schemas.ws.x2003.x03.addressing.ReferencePropertiesType;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.xml.rpc.JAXRPCException;
-import javax.xml.soap.SOAPException;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.Iterator;
@@ -141,7 +141,6 @@
     }
 
     private Collection evaluateTopicExpression(TopicExpression topicExpr)
-            throws SOAPException
     {
         NotificationProducerResource resource = (NotificationProducerResource) getResource();
         TopicSpaceSet topicSpaceSet = resource.getTopicSpaceSet();
@@ -245,4 +244,10 @@
     {
         return null;
     }
+
+    protected NamespaceVersionHolder getNamespaceSet()
+    {
+        return null; // not currently used - will be needed once we need to support multiple
spec versions
+    }
+
 }

Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/porttype/impl/SubscriptionManagerPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/porttype/impl/SubscriptionManagerPortTypeImpl.java?view=diff&r1=156670&r2=156671
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/porttype/impl/SubscriptionManagerPortTypeImpl.java
(original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/porttype/impl/SubscriptionManagerPortTypeImpl.java
Wed Mar  9 11:19:00 2005
@@ -18,7 +18,8 @@
 import org.apache.ws.notification.base.Subscription;
 import org.apache.ws.notification.base.v1_2.porttype.SubscriptionManagerPortType;
 import org.apache.ws.resource.ResourceContext;
-import org.apache.ws.resource.properties.v1_2.porttype.impl.AbstractResourcePropertiesPortType;
+import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
 import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.PauseSubscriptionDocument;
 import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.PauseSubscriptionResponseDocument;
 import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.ResumeSubscriptionDocument;
@@ -80,6 +81,11 @@
                 ResumeSubscriptionResponseDocument.Factory.newInstance();
         responseDoc.addNewResumeSubscriptionResponse();
         return responseDoc;
+    }
+
+    protected NamespaceVersionHolder getNamespaceSet()
+    {
+        return null; // not currently used - will be needed once we need to support multiple
spec versions
     }
 
 }

Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/v1_2/NotificationConsumerPortType2JavaInfo.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/v1_2/NotificationConsumerPortType2JavaInfo.java?view=diff&r1=156670&r2=156671
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/v1_2/NotificationConsumerPortType2JavaInfo.java
(original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/v1_2/NotificationConsumerPortType2JavaInfo.java
Wed Mar  9 11:19:00 2005
@@ -16,7 +16,6 @@
 package org.apache.ws.notification.tool.v1_2;
 
 import org.apache.ws.notification.base.v1_2.porttype.NotificationConsumerPortType;
-import org.apache.ws.resource.properties.v1_2.porttype.GetMultipleResourcePropertiesPortType;
 import org.apache.ws.resource.tool.PortType2JavaInfo;
 
 import javax.xml.namespace.QName;



---------------------------------------------------------------------
To unsubscribe, e-mail: hermes-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: hermes-dev-help@ws.apache.org


Mime
View raw message