You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pubscribe-dev@ws.apache.org by sc...@apache.org on 2005/03/22 18:22:42 UTC

svn commit: r158627 - in incubator/hermes/trunk: src/java/org/apache/ws/eventing/pubsub/ src/java/org/apache/ws/notification/base/impl/ src/java/org/apache/ws/notification/base/v1_2/impl/ src/java/org/apache/ws/notification/base/v1_2/porttype/impl/ src/java/org/apache/ws/notification/pubsub/ src/java/org/apache/ws/notification/tool/ wsn-xbeans/src/wsdl/wsn/

Author: scamp
Date: Tue Mar 22 09:22:37 2005
New Revision: 158627

URL: http://svn.apache.org/viewcvs?view=rev&rev=158627
Log:
fixes for compiling, version changes from Apollo, and bad wsdl/schema import paths

Modified:
    incubator/hermes/trunk/src/java/org/apache/ws/eventing/pubsub/SubscriptionHome.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/impl/WsnNamespaceVersionHolderImpl.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/pubsub/Subscription.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/WsnWsdl2Java.java
    incubator/hermes/trunk/wsn-xbeans/src/wsdl/wsn/WS-BaseNotification-1_2-Draft_01.wsdl
    incubator/hermes/trunk/wsn-xbeans/src/wsdl/wsn/WS-BaseNotification-1_2-Draft_01.xsd
    incubator/hermes/trunk/wsn-xbeans/src/wsdl/wsn/WS-BrokeredNotification-1_2.wsdl
    incubator/hermes/trunk/wsn-xbeans/src/wsdl/wsn/WS-BrokeredNotification-1_2.xsd
    incubator/hermes/trunk/wsn-xbeans/src/wsdl/wsn/WS-Topics-1_2.xsd

Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/pubsub/SubscriptionHome.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/pubsub/SubscriptionHome.java?view=diff&r1=158626&r2=158627
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/pubsub/SubscriptionHome.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/pubsub/SubscriptionHome.java Tue Mar 22 09:22:37 2005
@@ -83,8 +83,8 @@
     public String getWsdlTargetNamespace() {
     }*/
     
-    public void remove(org.apache.ws.resource.ResourceKey key) throws org.apache.ws.resource.ResourceException, org.apache.ws.resource.NoSuchResourceException, org.apache.ws.resource.InvalidResourceKeyException, org.apache.ws.resource.RemoveNotSupportedException {
-    }
+    public void remove(org.apache.ws.resource.ResourceKey key) throws org.apache.ws.resource.ResourceException,  org.apache.ws.resource.InvalidResourceKeyException, org.apache.ws.resource.RemoveNotSupportedException {
+    }           //todo I removed org.apache.ws.resource.NoSuchResourceException, from signature above to be able to compile
     /*
     public void setResourceClassName(String className) {
     }

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=158626&r2=158627
==============================================================================
--- 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 Tue Mar 22 09:22:37 2005
@@ -20,9 +20,9 @@
  * @author Sal Campana
  */
 public class SubscriptionService implements WsrfService  , SubscriptionManagerPortType,
-                                            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
+                                            org.apache.ws.resource.lifetime.v2004_06.porttype.ScheduledResourceTerminationPortType,
+                                            org.apache.ws.resource.properties.v2004_06.porttype.GetResourcePropertyPortType,
+                                            org.apache.ws.resource.lifetime.v2004_06.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_draft01.porttype.impl.ScheduledResourceTerminationPortTypeImpl( getResourceContext(  ) ).setTerminationTime( requestDoc );
+      return new org.apache.ws.resource.lifetime.v2004_06.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_draft01.porttype.impl.GetResourcePropertyPortTypeImpl( getResourceContext(  ) ).getResourceProperty( requestDoc );
+      return new org.apache.ws.resource.properties.v2004_06.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_draft01.porttype.impl.ImmediateResourceTerminationPortTypeImpl( getResourceContext(  ) ).destroy( requestDoc );
+      return new org.apache.ws.resource.lifetime.v2004_06.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=158626&r2=158627
==============================================================================
--- 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 Tue Mar 22 09:22:37 2005
@@ -16,6 +16,7 @@
 package org.apache.ws.notification.base.v1_2.impl;
 
 import org.apache.ws.XmlObjectWrapper;
+import org.apache.ws.pubsub.SubscriptionEndConsumer;
 import org.apache.ws.addressing.EndpointReference;
 import org.apache.ws.notification.base.impl.AbstractSubscription;
 import org.apache.ws.notification.base.impl.XmlBeansTopicExpression;
@@ -23,10 +24,11 @@
 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_draft01.porttype.ScheduledResourceTerminationPortType;
+import org.apache.ws.resource.lifetime.v2004_06.porttype.ScheduledResourceTerminationPortType;
 import org.apache.ws.resource.lifetime.ResourceTerminationListener;
 import org.apache.ws.resource.properties.ResourceProperty;
 import org.apache.ws.resource.properties.ResourcePropertySetMetaData;
+import org.apache.ws.resource.properties.ResourcePropertySet;
 import org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySet;
 import org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySetMetaData;
 import org.apache.ws.resource.properties.query.QueryExpression;
@@ -116,4 +118,18 @@
     }
 
 
+    public void setResourcePropertySet(ResourcePropertySet resourcePropertySet)
+    {
+         //todo
+    }
+
+    /**
+     * Get the subscriptionEnd consumer associated with this subscription.
+     *
+     * @return the subscriptionEnd consumer
+     */
+    public SubscriptionEndConsumer getSubscriptionEndConsumer()
+    {
+        return null;   //todo
+    }
 }

Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/impl/WsnNamespaceVersionHolderImpl.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/impl/WsnNamespaceVersionHolderImpl.java?view=diff&r1=158626&r2=158627
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/impl/WsnNamespaceVersionHolderImpl.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/impl/WsnNamespaceVersionHolderImpl.java Tue Mar 22 09:22:37 2005
@@ -3,7 +3,7 @@
 import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
 import org.apache.ws.notification.base.v1_2.BaseNotification1_2Constants;
 import org.apache.ws.notification.topics.v1_2.Topics1_2Constants;
-import org.apache.ws.resource.properties.v1_2_draft01.impl.NamespaceVersionHolderImpl;
+import org.apache.ws.resource.properties.v2004_06.impl.NamespaceVersionHolderImpl;
 
 
 /**

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=158626&r2=158627
==============================================================================
--- 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 Tue Mar 22 09:22:37 2005
@@ -33,6 +33,9 @@
 import org.apache.ws.pubsub.Filter;
 import org.apache.ws.pubsub.NotificationConsumer;
 import org.apache.ws.pubsub.NotificationProducer;
+import org.apache.ws.pubsub.SubscriptionEndConsumer;
+import org.apache.ws.pubsub.TopicFilter;
+import org.apache.ws.pubsub.XPathFilter;
 import org.apache.ws.resource.ResourceContext;
 import org.apache.ws.resource.ResourceContextException;
 import org.apache.ws.resource.impl.AbstractResourceContext;
@@ -217,6 +220,21 @@
     public EndpointReference getEPR()
     {
         return buildEPR(getResourceContext());
+    }
+
+    /**
+     * Subscribe to notifications from this producer.
+     *
+     * @param notificationConsumer
+     * @param subscriptionEndConsumer the callback Interface for SubscriptionEnd Notifications, or null if no SubscriptionEnd should be send
+     * @param filters
+     * @param initialTerminationTime
+     * @param deliveryMode            the notification delivery mode, or null to use default mode
+     * @return the subscription
+     */
+    public org.apache.ws.pubsub.Subscription subscribe(NotificationConsumer notificationConsumer, SubscriptionEndConsumer subscriptionEndConsumer, TopicFilter tf, XPathFilter xf, Calendar initialTerminationTime, boolean UseNotify)
+    {
+        return null;    //todo
     }
 
     /**

Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/pubsub/Subscription.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/pubsub/Subscription.java?view=diff&r1=158626&r2=158627
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/pubsub/Subscription.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/pubsub/Subscription.java Tue Mar 22 09:22:37 2005
@@ -26,6 +26,8 @@
 
 import org.apache.ws.util.uuid.UuidGenerator;
 import org.apache.ws.util.uuid.UuidGeneratorFactory;
+import org.apache.ws.pubsub.SubscriptionEndConsumer;
+
 import java.util.Calendar;
 /**
  *
@@ -53,5 +55,15 @@
     }
     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
     }
 }

Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/WsnWsdl2Java.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/WsnWsdl2Java.java?view=diff&r1=158626&r2=158627
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/WsnWsdl2Java.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/WsnWsdl2Java.java Tue Mar 22 09:22:37 2005
@@ -74,10 +74,10 @@
 
     private boolean hasResourceTermination(ResourceDefinition resourceDef)
     {
-        if(resourceDef.implementsResourceCapability(org.apache.ws.resource.lifetime.v1_2_draft01.porttype.ImmediateResourceTerminationPortType.NAME)
-            || resourceDef.implementsResourceCapability(org.apache.ws.resource.lifetime.v1_2_draft01.porttype.ScheduledResourceTerminationPortType.NAME)
-            || resourceDef.implementsResourceCapability(org.apache.ws.resource.lifetime.v1_2_draft04.porttype.ImmediateResourceTerminationPortType.NAME)
-            || resourceDef.implementsResourceCapability(org.apache.ws.resource.lifetime.v1_2_draft04.porttype.ScheduledResourceTerminationPortType.NAME) )
+        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;
         }
@@ -86,11 +86,11 @@
 
     private boolean hasPropChange(ResourceDefinition resourceDef)
     {
-        if(resourceDef.implementsResourceCapability(org.apache.ws.resource.properties.v1_2_draft01.porttype.SetResourcePropertiesPortType.NAME)
-            || resourceDef.implementsResourceCapability(org.apache.ws.resource.properties.v1_2_draft05.porttype.DeleteResourcePropertiesPortType.NAME)
-            || resourceDef.implementsResourceCapability(org.apache.ws.resource.properties.v1_2_draft05.porttype.InsertResourcePropertiesPortType.NAME)
-            || resourceDef.implementsResourceCapability(org.apache.ws.resource.properties.v1_2_draft05.porttype.SetResourcePropertiesPortType.NAME)
-            || resourceDef.implementsResourceCapability(org.apache.ws.resource.properties.v1_2_draft05.porttype.UpdateResourcePropertiesPortType.NAME))
+        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;
         }

Modified: incubator/hermes/trunk/wsn-xbeans/src/wsdl/wsn/WS-BaseNotification-1_2-Draft_01.wsdl
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/wsn-xbeans/src/wsdl/wsn/WS-BaseNotification-1_2-Draft_01.wsdl?view=diff&r1=158626&r2=158627
==============================================================================
--- incubator/hermes/trunk/wsn-xbeans/src/wsdl/wsn/WS-BaseNotification-1_2-Draft_01.wsdl (original)
+++ incubator/hermes/trunk/wsn-xbeans/src/wsdl/wsn/WS-BaseNotification-1_2-Draft_01.wsdl Tue Mar 22 09:22:37 2005
@@ -45,13 +45,13 @@
       namespace=
       "http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl"
       location=
-      "../wsrf/WS-ResourceProperties-1_2.wsdl"/>
+      "../wsrf/WS-ResourceProperties-1_2-Draft_01.wsdl"/>
 
    <wsdl:import
       namespace=
       "http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl"
       location=
-      "../wsrf/WS-ResourceLifetime-1_2.wsdl"/>
+      "../wsrf/WS-ResourceLifetime-1_2-Draft_01.wsdl"/>
 
    <!-- ===================== Types Definitions ====================== -->
    <wsdl:types>
@@ -73,19 +73,19 @@
             namespace=
             "http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd"
             schemaLocation=
-            "../wsrf/WS-BaseFaults-1_2.xsd"
+            "../wsrf/WS-BaseFaults-1_2-Draft_01.xsd"
             />
 
          <xsd:import namespace=
   "http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd"
             schemaLocation=
-            "../wsrf/WS-ResourceProperties-1_2.xsd"
+            "../wsrf/WS-ResourceProperties-1_2-Draft_01.xsd"
             />
          <xsd:import
             namespace=
             "http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd"
             schemaLocation=
-            "../wsrf/WS-ResourceLifetime-1_2.xsd"
+            "../wsrf/WS-ResourceLifetime-1_2-Draft_01.xsd"
             />
 
          <!-- =============== Resource Property Related  =================== -->

Modified: incubator/hermes/trunk/wsn-xbeans/src/wsdl/wsn/WS-BaseNotification-1_2-Draft_01.xsd
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/wsn-xbeans/src/wsdl/wsn/WS-BaseNotification-1_2-Draft_01.xsd?view=diff&r1=158626&r2=158627
==============================================================================
--- incubator/hermes/trunk/wsn-xbeans/src/wsdl/wsn/WS-BaseNotification-1_2-Draft_01.xsd (original)
+++ incubator/hermes/trunk/wsn-xbeans/src/wsdl/wsn/WS-BaseNotification-1_2-Draft_01.xsd Tue Mar 22 09:22:37 2005
@@ -36,7 +36,7 @@
    <xsd:import namespace=
      "http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd"
       schemaLocation=
-      "../wsrf/WS-ResourceProperties-1_2.xsd"
+      "../wsrf/WS-ResourceProperties-1_2-Draft_01.xsd"
       />
 
    <!-- ================= Topic Expression Container ================= -->

Modified: incubator/hermes/trunk/wsn-xbeans/src/wsdl/wsn/WS-BrokeredNotification-1_2.wsdl
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/wsn-xbeans/src/wsdl/wsn/WS-BrokeredNotification-1_2.wsdl?view=diff&r1=158626&r2=158627
==============================================================================
--- incubator/hermes/trunk/wsn-xbeans/src/wsdl/wsn/WS-BrokeredNotification-1_2.wsdl (original)
+++ incubator/hermes/trunk/wsn-xbeans/src/wsdl/wsn/WS-BrokeredNotification-1_2.wsdl Tue Mar 22 09:22:37 2005
@@ -46,19 +46,19 @@
       namespace=
       "http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl"
       location=
-      "../wsrf/WS-ResourceProperties-1_2.wsdl"/>
+      "../wsrf/WS-ResourceProperties-1_2-Draft_01.wsdl"/>
 
    <wsdl:import
       namespace=
       "http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl"
       location=
-      "../wsrf/WS-ResourceLifetime-1_2.wsdl"/>
+      "../wsrf/WS-ResourceLifetime-1_2-Draft_01.wsdl"/>
 
    <wsdl:import
       namespace=
       "http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl"
       location=
-      "WS-BaseNotification-1_2.wsdl"/>
+      "WS-BaseNotification-1_2-Draft_01.wsdl"/>
 
    <!-- ===================== Types Definitions ====================== -->
    <wsdl:types>
@@ -79,27 +79,27 @@
          <xsd:import namespace=
   "http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd"
             schemaLocation=
-            "WS-BaseNotification-1_2.xsd"
+            "WS-BaseNotification-1_2-Draft_01.xsd"
             />
 
          <xsd:import
             namespace=
             "http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd"
             schemaLocation=
-            "../wsrf/WS-BaseFaults-1_2.xsd"
+            "../wsrf/WS-BaseFaults-1_2-Draft_01.xsd"
             />
 
          <xsd:import namespace=
   "http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd"
             schemaLocation=
-            "../wsrf/WS-ResourceProperties-1_2.xsd"
+            "../wsrf/WS-ResourceProperties-1_2-Draft_01.xsd"
             />
 
          <xsd:import
             namespace=
             "http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd"
             schemaLocation=
-            "../wsrf/WS-ResourceLifetime-1_2.xsd"
+            "../wsrf/WS-ResourceLifetime-1_2-Draft_01.xsd"
             />
 
          <!-- =============== Resource Property Related  =================== -->

Modified: incubator/hermes/trunk/wsn-xbeans/src/wsdl/wsn/WS-BrokeredNotification-1_2.xsd
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/wsn-xbeans/src/wsdl/wsn/WS-BrokeredNotification-1_2.xsd?view=diff&r1=158626&r2=158627
==============================================================================
--- incubator/hermes/trunk/wsn-xbeans/src/wsdl/wsn/WS-BrokeredNotification-1_2.xsd (original)
+++ incubator/hermes/trunk/wsn-xbeans/src/wsdl/wsn/WS-BrokeredNotification-1_2.xsd Tue Mar 22 09:22:37 2005
@@ -37,7 +37,7 @@
    <xsd:import namespace=
    "http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd"
       schemaLocation=
-      "WS-BaseNotification-1_2.xsd"
+      "WS-BaseNotification-1_2-Draft_01.xsd"
       />
 
    <!-- ======== Resource Properties for NotificationBroker ========== -->

Modified: incubator/hermes/trunk/wsn-xbeans/src/wsdl/wsn/WS-Topics-1_2.xsd
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/wsn-xbeans/src/wsdl/wsn/WS-Topics-1_2.xsd?view=diff&r1=158626&r2=158627
==============================================================================
--- incubator/hermes/trunk/wsn-xbeans/src/wsdl/wsn/WS-Topics-1_2.xsd (original)
+++ incubator/hermes/trunk/wsn-xbeans/src/wsdl/wsn/WS-Topics-1_2.xsd Tue Mar 22 09:22:37 2005
@@ -28,10 +28,10 @@
    <!-- ======================== Imports  ============================ -->
 
    <xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd"
-               schemaLocation="../wsrf/WS-ResourceProperties-1_2.xsd"/>
+               schemaLocation="../wsrf/WS-ResourceProperties-1_2-Draft_01.xsd"/>
                
    <xsd:import namespace="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd"
-               schemaLocation="WS-BaseNotification-1_2.xsd"/>
+               schemaLocation="WS-BaseNotification-1_2-Draft_01.xsd"/>
 
    <!-- =============== utility type definitions  ==================== -->
    <xsd:complexType name="Documentation" mixed="true">



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