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/04/25 18:37:53 UTC

svn commit: r164598 - in /incubator/hermes/trunk/src: java/org/apache/ws/notification/base/impl/ java/org/apache/ws/notification/base/impl/faults/ java/org/apache/ws/notification/base/v2004_6/ java/org/apache/ws/notification/base/v2004_6/impl/ java/org/apache/ws/notification/base/v2004_6/porttype/ java/org/apache/ws/notification/base/v2004_6/porttype/impl/ java/org/apache/ws/notification/tool/ java/org/apache/ws/notification/tool/v2004_06/ java/org/apache/ws/notification/topics/impl/ java/org/apache/ws/notification/topics/impl/faults/ templates/1_2_draft01/ templates/1_2_draft03/ test/org/apache/ws/notification/topics/ webapp/WEB-INF/classes/

Author: scamp
Date: Mon Apr 25 09:37:52 2005
New Revision: 164598

URL: http://svn.apache.org/viewcvs?rev=164598&view=rev
Log:
repackaging

Added:
    incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/BaseNotificationConstants.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/impl/SubscriptionHome.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/impl/SubscriptionResource.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/impl/SubscriptionService.java
Removed:
    incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/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/v2004_6/BaseNotification1_2Constants.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/impl/Subscription1_2Resource.java
Modified:
    incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/faults/PauseFailedFaultException.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/faults/ResumeFailedFaultException.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/faults/SubscribeCreationFailedFaultException.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/impl/WsnNamespaceVersionHolderImpl.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/porttype/NotificationConsumerPortType.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/porttype/NotificationProducerPortType.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/porttype/SubscriptionManagerPortType.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/porttype/impl/NotificationProducerPortTypeImpl.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/WsnWsdl2Java.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/v2004_06/NotificationConsumerPortType2JavaInfo.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/v2004_06/NotificationProducerPortType2JavaInfo.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/v2004_06/SubscriptionManagerPortType2JavaInfo.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/SimpleSubscriptionTopicListener.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/InvalidTopicExpressionFaultException.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/NoCurrentMessageOnTopicFaultException.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/TopicNotSupportedFaultException.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/TopicPathDialectUnknownFaultException.java
    incubator/hermes/trunk/src/templates/1_2_draft01/NotificationConsumerPortType.txt
    incubator/hermes/trunk/src/templates/1_2_draft01/NotificationProducerPortType.txt
    incubator/hermes/trunk/src/templates/1_2_draft03/NotificationConsumerPortType.txt
    incubator/hermes/trunk/src/templates/1_2_draft03/NotificationProducerPortType.txt
    incubator/hermes/trunk/src/test/org/apache/ws/notification/topics/SimpleSubscriptionTopicListenerTest.java
    incubator/hermes/trunk/src/webapp/WEB-INF/classes/jndi-config.xml

Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/faults/PauseFailedFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/faults/PauseFailedFaultException.java?rev=164598&r1=164597&r2=164598&view=diff
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/faults/PauseFailedFaultException.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/faults/PauseFailedFaultException.java Mon Apr 25 09:37:52 2005
@@ -2,7 +2,7 @@
 
 import org.apache.ws.resource.faults.AbstractBaseFaultException;
 import org.apache.ws.resource.properties.NamespaceVersionHolder;
-import org.apache.ws.notification.base.v2004_6.BaseNotification1_2Constants;
+import org.apache.ws.notification.base.v2004_6.BaseNotificationConstants;
 import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
 
 import javax.xml.namespace.QName;
@@ -18,7 +18,7 @@
     public PauseFailedFaultException(WsnNamespaceVersionHolder namespaceVersionHolder, String s)
     {
         super(namespaceVersionHolder, s);
-        m_name = new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(), "PauseFailedFaultException", BaseNotification1_2Constants.NSPREFIX_WSNT_SCHEMA );
+        m_name = new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(), "PauseFailedFaultException", BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
 
     }
 

Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/faults/ResumeFailedFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/faults/ResumeFailedFaultException.java?rev=164598&r1=164597&r2=164598&view=diff
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/faults/ResumeFailedFaultException.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/faults/ResumeFailedFaultException.java Mon Apr 25 09:37:52 2005
@@ -1,7 +1,7 @@
 package org.apache.ws.notification.base.impl.faults;
 
 import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
-import org.apache.ws.notification.base.v2004_6.BaseNotification1_2Constants;
+import org.apache.ws.notification.base.v2004_6.BaseNotificationConstants;
 import org.apache.ws.resource.faults.AbstractBaseFaultException;
 
 import javax.xml.namespace.QName;
@@ -17,7 +17,7 @@
     public ResumeFailedFaultException(WsnNamespaceVersionHolder namespaceVersionHolder, String s)
     {
         super(namespaceVersionHolder, s);
-        m_name = new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(), "ResumeFailedFaultException", BaseNotification1_2Constants.NSPREFIX_WSNT_SCHEMA );
+        m_name = new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(), "ResumeFailedFaultException", BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
     }
 
 

Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/faults/SubscribeCreationFailedFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/faults/SubscribeCreationFailedFaultException.java?rev=164598&r1=164597&r2=164598&view=diff
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/faults/SubscribeCreationFailedFaultException.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/faults/SubscribeCreationFailedFaultException.java Mon Apr 25 09:37:52 2005
@@ -1,7 +1,7 @@
 package org.apache.ws.notification.base.impl.faults;
 
 import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
-import org.apache.ws.notification.base.v2004_6.BaseNotification1_2Constants;
+import org.apache.ws.notification.base.v2004_6.BaseNotificationConstants;
 import org.apache.ws.resource.faults.AbstractBaseFaultException;
 
 import javax.xml.namespace.QName;
@@ -17,7 +17,7 @@
     public SubscribeCreationFailedFaultException(WsnNamespaceVersionHolder namespaceVersionHolder, String s)
     {
         super(namespaceVersionHolder, s);
-        m_name = new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(), "SubscribeCreationFailedFaultException", BaseNotification1_2Constants.NSPREFIX_WSNT_SCHEMA );
+        m_name = new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(), "SubscribeCreationFailedFaultException", BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
     }
 
     public QName getBaseFaultName()

Added: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/BaseNotificationConstants.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/BaseNotificationConstants.java?rev=164598&view=auto
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/BaseNotificationConstants.java (added)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/BaseNotificationConstants.java Mon Apr 25 09:37:52 2005
@@ -0,0 +1,49 @@
+/*=============================================================================*
+ *  Copyright 2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *=============================================================================*/
+package org.apache.ws.notification.base.v2004_6;
+
+/**
+ * Constants defined by the WS-BaseNotification 1.2 specification.
+ */
+public interface BaseNotificationConstants
+{
+
+    /**
+     * Namespace URI of the WS-BaseNotification 1.2 schema.
+     */
+    String NSURI_WSNT_SCHEMA = "http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd";
+
+    /**
+     * Namespace prefix of the WS-BaseNotification 1.2 schema.
+     */
+    String NSPREFIX_WSNT_SCHEMA = "wsnt";
+
+    /**
+     * Namespace URI of the WS-BaseNotification 1.2 WSDL.
+     */
+    String NSURI_WSNT_WSDL = "http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl";
+
+    /**
+     * Namespace prefix of the WS-BaseNotification 1.2 WSDL.
+     */
+    String NSPREFIX_WSNT_WSDL = "wsntw";
+
+    /**
+     * The value to use for the wsa:Action header in outgoing Notify messages.
+     */ 
+    String NOTIFY_ACTION_URL = BaseNotificationConstants.NSURI_WSNT_WSDL + "/Notify";
+
+}

Added: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/impl/SubscriptionHome.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/impl/SubscriptionHome.java?rev=164598&view=auto
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/impl/SubscriptionHome.java (added)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/impl/SubscriptionHome.java Mon Apr 25 09:37:52 2005
@@ -0,0 +1,131 @@
+/*=============================================================================*
+ *  Copyright 2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *=============================================================================*/
+package org.apache.ws.notification.base.v2004_6.impl;
+
+import org.apache.ws.addressing.EndpointReference;
+import org.apache.ws.addressing.XmlBeansEndpointReference;
+import org.apache.ws.notification.base.Subscription;
+import org.apache.ws.notification.topics.TopicExpression;
+import org.apache.ws.resource.JndiConstants;
+import org.apache.ws.resource.Resource;
+import org.apache.ws.resource.ResourceContext;
+import org.apache.ws.resource.ResourceContextException;
+import org.apache.ws.resource.ResourceException;
+import org.apache.ws.resource.ResourceKey;
+import org.apache.ws.resource.ResourceUnknownException;
+import org.apache.ws.resource.impl.AbstractResourceHome;
+import org.apache.ws.resource.impl.SimpleTypeResourceKey;
+import org.apache.ws.resource.properties.query.QueryExpression;
+import org.apache.ws.util.XmlBeanUtils;
+import org.apache.xmlbeans.XmlCursor;
+import org.apache.xmlbeans.XmlObject;
+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.EndpointReferenceType;
+import org.xmlsoap.schemas.ws.x2003.x03.addressing.ReferencePropertiesType;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.JAXRPCException;
+import java.lang.reflect.Constructor;
+import java.util.Calendar;
+
+/**
+ * TODO
+ */
+public class SubscriptionHome extends AbstractResourceHome
+{
+    private static final String SERVICE_NAME = "SubscriptionManager";
+    public static final String HOME_LOCATION = JndiConstants.CONTEXT_NAME_SERVICES + "/" + SERVICE_NAME + "/" + JndiConstants.ATOMIC_NAME_HOME;
+    /**
+     *
+     * @param resourceContext
+     * @return
+     * @throws ResourceException
+     * @throws ResourceContextException
+     * @throws ResourceUnknownException
+     */
+    public Resource getInstance( ResourceContext resourceContext ) throws ResourceException, ResourceContextException,
+            ResourceUnknownException
+    {
+        return find( resourceContext.getResourceKey() );
+    }
+
+    public Subscription create(  Class subscriptionResourceClass,
+                                 EndpointReference consumerReference,
+                                 EndpointReference producerReference,
+                                 Calendar initialTerminationTime,
+                                 Object policy,
+                                 QueryExpression precondition,
+                                 QueryExpression selector,
+                                 ResourceKey producerKey,
+                                 String producerHomeLocation,
+                                 TopicExpression topicExpression,
+                                 boolean useNotify ) throws ResourceException, ResourceContextException,
+            ResourceUnknownException
+    {
+        Subscription subscription;
+        EndpointReference epr;
+        try
+        {
+            Constructor constructor = subscriptionResourceClass.getConstructor(
+                           new Class[] {
+                            EndpointReference.class,
+                            EndpointReference.class,
+                            Calendar.class,
+                            Object.class,
+                            QueryExpression.class,
+                            QueryExpression.class,
+                            ResourceKey.class,
+                            String.class,
+                            TopicExpression.class,
+                            boolean.class } );
+            subscription = (Subscription) constructor.newInstance( new Object[] { consumerReference, producerReference, initialTerminationTime, policy, precondition, selector, producerKey, producerHomeLocation, topicExpression, new Boolean( useNotify ) } );
+            String id = (String) subscription.getID();
+
+            SimpleTypeResourceKey resourceKey = new SimpleTypeResourceKey( QName.valueOf( getResourceKeyName()), id);
+            add( resourceKey, subscription );
+            epr = getEPR(resourceKey, producerReference);
+            subscription.setEpr(epr);
+
+            //todo look into why we are not calling init!!!
+        }
+        catch ( Exception e )
+        {
+            throw new JAXRPCException( e );
+        }
+        return subscription;
+    }
+   public EndpointReference getEPR( ResourceKey resourceKey, EndpointReference producerReference )
+    {
+        //todo maybe make this build a new one a different way??
+
+        String producerAddress = producerReference.getAddress();
+        String subscriptionAddress = producerAddress.substring( 0, producerAddress.lastIndexOf( "/") + 1) + SERVICE_NAME;
+
+        EndpointReferenceDocument eprDoc = EndpointReferenceDocument.Factory.newInstance();
+        EndpointReferenceType epr = eprDoc.addNewEndpointReference();
+        AttributedURI address = epr.addNewAddress();
+        address.setStringValue( subscriptionAddress );
+        // TODO: set portType and serviceName! (read from config file)
+        ReferencePropertiesType refProps = epr.addNewReferenceProperties();
+       
+       XmlObject xmlObject = XmlBeanUtils.addChildElement( refProps, resourceKey.getName() );
+       XmlCursor xmlCursor = xmlObject.newCursor();
+       xmlCursor.setTextValue(resourceKey.getValue().toString());
+       xmlCursor.dispose();
+        return new XmlBeansEndpointReference(epr);
+    }
+}

Added: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/impl/SubscriptionResource.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/impl/SubscriptionResource.java?rev=164598&view=auto
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/impl/SubscriptionResource.java (added)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/impl/SubscriptionResource.java Mon Apr 25 09:37:52 2005
@@ -0,0 +1,135 @@
+/*=============================================================================*
+ *  Copyright 2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *=============================================================================*/
+package org.apache.ws.notification.base.v2004_6.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;
+import org.apache.ws.notification.base.v2004_6.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.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;
+import org.apache.ws.resource.properties.query.impl.XmlBeansQueryExpression;
+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;
+import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.SelectorDocument;
+import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.SubscriptionManagerRPDocument;
+import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.SubscriptionPolicyDocument;
+import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.TopicExpressionDocument;
+import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.TopicExpressionType;
+import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.UseNotifyDocument;
+import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.CurrentTimeDocument;
+import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.TerminationTimeDocument;
+import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.QueryExpressionType;
+import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceType;
+
+import javax.xml.namespace.QName;
+import java.util.Calendar;
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * TODO
+ */
+public class SubscriptionResource extends AbstractSubscription
+{
+
+    private static final QName[] READ_ONLY_PROP_NAMES =
+            {
+                ScheduledResourceTerminationPortType.PROP_QNAME_CURRENT_TIME,
+                ScheduledResourceTerminationPortType.PROP_QNAME_TERMINATION_TIME,
+                SubscriptionManagerPortType.PROP_QNAME_CREATION_TIME
+            };
+
+
+
+    public SubscriptionResource( EndpointReference consumerReference, EndpointReference producerReference,
+                                    Calendar initialTerminationTime, Object policy, QueryExpression precondition,
+                                    QueryExpression selector, ResourceKey producerKey, String producerHomeLocation,
+                                    TopicExpression topicExpression, boolean useNotify )
+    {
+        super( consumerReference, producerReference, initialTerminationTime, policy, precondition, selector,
+                producerKey, producerHomeLocation, topicExpression, useNotify );
+    }
+
+    public void init()
+    {
+        SubscriptionManagerRPDocument propsDoc = SubscriptionManagerRPDocument.Factory.newInstance();
+        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 );
+        CurrentTimeDocument currTimeDoc = CurrentTimeDocument.Factory.newInstance();
+        currTimeDoc.setCurrentTime( Calendar.getInstance() );
+        prop.add( currTimeDoc );
+        prop.setCallback( new CurrentTimeCallback() );
+        prop = m_propSet.get( ScheduledResourceTerminationPortType.PROP_QNAME_TERMINATION_TIME );
+        TerminationTimeDocument termTimeDoc = TerminationTimeDocument.Factory.newInstance();
+        termTimeDoc.setNilTerminationTime();
+
+        // wsntw:SubscriptionManager props
+        prop = m_propSet.get( SubscriptionManagerPortType.PROP_QNAME_CONSUMER_REFERENCE );
+        ConsumerReferenceDocument consumerRefDoc = ConsumerReferenceDocument.Factory.newInstance();
+        consumerRefDoc.setConsumerReference( (EndpointReferenceType) ((XmlObjectWrapper)m_consumerReference).getXmlObject() );
+        prop = m_propSet.get( SubscriptionManagerPortType.PROP_QNAME_CREATION_TIME );
+        CreationTimeDocument creationTimeDoc = CreationTimeDocument.Factory.newInstance();
+        creationTimeDoc.setCreationTime( m_creationTime );
+        prop = m_propSet.get( SubscriptionManagerPortType.PROP_QNAME_PRECONDITION );
+        PreconditionDocument preconditionDoc = PreconditionDocument.Factory.newInstance();
+        preconditionDoc.setPrecondition(
+                (QueryExpressionType) ( (XmlBeansQueryExpression) m_precondition ).getXmlObject() );
+        prop = m_propSet.get( SubscriptionManagerPortType.PROP_QNAME_SELECTOR );
+        SelectorDocument selectorDoc = SelectorDocument.Factory.newInstance();
+        selectorDoc.setSelector( (QueryExpressionType) ( (XmlBeansQueryExpression) m_selector ).getXmlObject() );
+        prop = m_propSet.get( SubscriptionManagerPortType.PROP_QNAME_SUBSCRIPTION_POLICY );
+        SubscriptionPolicyDocument subPolicyDoc = SubscriptionPolicyDocument.Factory.newInstance();
+        subPolicyDoc.setSubscriptionPolicy( null );
+        prop = m_propSet.get( SubscriptionManagerPortType.PROP_QNAME_TOPIC_EXPRESSION );
+        TopicExpressionDocument topicExprDoc = TopicExpressionDocument.Factory.newInstance();
+        topicExprDoc.setTopicExpression( (TopicExpressionType) ( (XmlBeansTopicExpression) m_selector ).getXmlObject() );
+        prop = m_propSet.get( SubscriptionManagerPortType.PROP_QNAME_USE_NOTIFY );
+        UseNotifyDocument useNotifyDoc = UseNotifyDocument.Factory.newInstance();
+        useNotifyDoc.setUseNotify( m_useNotify );
+    }
+
+
+    public void setResourcePropertySet(ResourcePropertySet resourcePropertySet)
+    {
+         //todo
+    }
+
+    /**
+     * Get the subscriptionEnd consumer associated with this subscription.
+     *
+     * @return the subscriptionEnd consumer
+     */
+    public SubscriptionEndConsumer getSubscriptionEndConsumer()
+    {
+        return null;   //todo
+    }
+}

Added: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/impl/SubscriptionService.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/impl/SubscriptionService.java?rev=164598&view=auto
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/impl/SubscriptionService.java (added)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/impl/SubscriptionService.java Mon Apr 25 09:37:52 2005
@@ -0,0 +1,163 @@
+package org.apache.ws.notification.base.v2004_6.impl;
+
+import org.apache.ws.resource.handler.SoapMethodNameMap;
+import org.apache.ws.resource.handler.ServiceSoapMethodNameMap;
+import org.apache.ws.resource.handler.WsrfService;
+import org.apache.ws.resource.ResourceContext;
+import org.apache.ws.notification.base.v2004_6.porttype.SubscriptionManagerPortType;
+import org.apache.ws.notification.base.v2004_6.porttype.impl.SubscriptionManagerPortTypeImpl;
+import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.PauseSubscriptionResponseDocument;
+import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.PauseSubscriptionDocument;
+import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.ResumeSubscriptionResponseDocument;
+import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.ResumeSubscriptionDocument;
+
+import javax.xml.namespace.QName;
+
+
+/**
+ * Implementation of the SubscriptionService
+ * 
+ * @author Sal Campana
+ */
+public class SubscriptionService implements WsrfService  , SubscriptionManagerPortType,
+                                            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";
+    private ResourceContext m_resourceContext;
+    /**
+       * DOCUMENT_ME
+       */
+      private ServiceSoapMethodNameMap m_methodNameMap;
+
+      /**
+       * DOCUMENT_ME
+       */
+      private boolean m_isInitialized;
+
+   /**
+    * Creates a new {@link SubscriptionService } object.
+    *
+    * @param resourceContext DOCUMENT_ME
+    */
+   public SubscriptionService( ResourceContext resourceContext )
+   {
+      m_resourceContext = resourceContext;
+      init();
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param requestQname DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public String getMethodName( QName requestQname )
+   {
+      if ( !m_isInitialized )
+      {
+         init(  );
+      }
+
+      return m_methodNameMap.getMethodName( requestQname );
+   }
+
+  /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public ResourceContext getResourceContext(  )
+   {
+      return m_resourceContext;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public final SoapMethodNameMap getMethodNameMap(  )
+   {
+      return m_methodNameMap;
+   }
+
+      /**
+       * DOCUMENT_ME
+       */
+   public void init(  )
+   {
+      m_methodNameMap    = new ServiceSoapMethodNameMap( getResourceContext(  ) );
+      m_isInitialized      = true;
+   }
+
+
+      /**
+       * DOCUMENT_ME
+       *
+       * @return DOCUMENT_ME
+       */
+   protected final boolean isInitialized(  )
+   {
+         return m_isInitialized;
+   }
+
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param requestDoc DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   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.v2004_06.porttype.impl.ScheduledResourceTerminationPortTypeImpl( getResourceContext(  ) ).setTerminationTime( requestDoc );
+   }
+   /**
+    * DOCUMENT_ME
+    *
+    * @param requestDoc DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   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.v2004_06.porttype.impl.GetResourcePropertyPortTypeImpl( getResourceContext(  ) ).getResourceProperty( requestDoc );
+   }
+
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param requestDoc DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   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.v2004_06.porttype.impl.ImmediateResourceTerminationPortTypeImpl( getResourceContext(  ) ).destroy( requestDoc );
+   }
+
+    /**
+     * @param requestDoc
+     * @return
+     */
+    public PauseSubscriptionResponseDocument pauseSubscription(PauseSubscriptionDocument requestDoc)
+    {
+        return new SubscriptionManagerPortTypeImpl(getResourceContext()).pauseSubscription(requestDoc);
+    }
+
+    /**
+     * @param requestDoc
+     * @return
+     */
+    public ResumeSubscriptionResponseDocument resumeSubscription(ResumeSubscriptionDocument requestDoc)
+    {
+        return new SubscriptionManagerPortTypeImpl(getResourceContext()).resumeSubscription(requestDoc);
+
+    }
+}

Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/impl/WsnNamespaceVersionHolderImpl.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/impl/WsnNamespaceVersionHolderImpl.java?rev=164598&r1=164597&r2=164598&view=diff
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/impl/WsnNamespaceVersionHolderImpl.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/impl/WsnNamespaceVersionHolderImpl.java Mon Apr 25 09:37:52 2005
@@ -1,8 +1,8 @@
 package org.apache.ws.notification.base.v2004_6.impl;
 
 import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
-import org.apache.ws.notification.base.v2004_6.BaseNotification1_2Constants;
-import org.apache.ws.notification.topics.v1_2.Topics1_2Constants;
+import org.apache.ws.notification.base.v2004_6.BaseNotificationConstants;
+import org.apache.ws.notification.topics.v2004_06.Topics1_2Constants;
 import org.apache.ws.resource.properties.v2004_06.impl.NamespaceVersionHolderImpl;
 
 
@@ -18,7 +18,7 @@
 
     public String getBaseNotificationXsdNamespace()
     {
-        return BaseNotification1_2Constants.NSURI_WSNT_SCHEMA;
+        return BaseNotificationConstants.NSURI_WSNT_SCHEMA;
     }
 
     public String getBrokeredNotificationXsdNamespace()

Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/porttype/NotificationConsumerPortType.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/porttype/NotificationConsumerPortType.java?rev=164598&r1=164597&r2=164598&view=diff
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/porttype/NotificationConsumerPortType.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/porttype/NotificationConsumerPortType.java Mon Apr 25 09:37:52 2005
@@ -16,7 +16,7 @@
 package org.apache.ws.notification.base.v2004_6.porttype;
 
 import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.NotifyDocument;
-import org.apache.ws.notification.base.v2004_6.BaseNotification1_2Constants;
+import org.apache.ws.notification.base.v2004_6.BaseNotificationConstants;
 
 import javax.xml.namespace.QName;
 
@@ -26,7 +26,7 @@
 public interface NotificationConsumerPortType
 {
 
-    QName NAME = new QName( BaseNotification1_2Constants.NSURI_WSNT_WSDL, "NotificationConsumer", BaseNotification1_2Constants.NSPREFIX_WSNT_WSDL );
+    QName NAME = new QName( BaseNotificationConstants.NSURI_WSNT_WSDL, "NotificationConsumer", BaseNotificationConstants.NSPREFIX_WSNT_WSDL );
             
     /**
      * @param requestDoc

Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/porttype/NotificationProducerPortType.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/porttype/NotificationProducerPortType.java?rev=164598&r1=164597&r2=164598&view=diff
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/porttype/NotificationProducerPortType.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/porttype/NotificationProducerPortType.java Mon Apr 25 09:37:52 2005
@@ -19,7 +19,7 @@
 import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.SubscribeDocument;
 import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.GetCurrentMessageResponseDocument;
 import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.GetCurrentMessageDocument;
-import org.apache.ws.notification.base.v2004_6.BaseNotification1_2Constants;
+import org.apache.ws.notification.base.v2004_6.BaseNotificationConstants;
 
 import javax.xml.namespace.QName;
 
@@ -29,26 +29,26 @@
 public interface NotificationProducerPortType
 {
 
-    QName NAME = new QName( BaseNotification1_2Constants.NSURI_WSNT_WSDL, "NotificationProducer", BaseNotification1_2Constants.NSPREFIX_WSNT_WSDL );
-    QName PROPS_DOC_NAME = new QName( BaseNotification1_2Constants.NSURI_WSNT_SCHEMA, "NotificationProducerRP", BaseNotification1_2Constants.NSPREFIX_WSNT_SCHEMA );
+    QName NAME = new QName( BaseNotificationConstants.NSURI_WSNT_WSDL, "NotificationProducer", BaseNotificationConstants.NSPREFIX_WSNT_WSDL );
+    QName PROPS_DOC_NAME = new QName( BaseNotificationConstants.NSURI_WSNT_SCHEMA, "NotificationProducerRP", BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
 
     /**
      * Topic property name.
      */
-    QName PROP_QNAME_TOPIC = new QName( BaseNotification1_2Constants.NSURI_WSNT_SCHEMA,
-            "Topic", BaseNotification1_2Constants.NSPREFIX_WSNT_SCHEMA );
+    QName PROP_QNAME_TOPIC = new QName( BaseNotificationConstants.NSURI_WSNT_SCHEMA,
+            "Topic", BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
 
     /**
      * FixedTopicSet property name.
      */
-    QName PROP_QNAME_FIXED_TOPIC_SET = new QName( BaseNotification1_2Constants.NSURI_WSNT_SCHEMA,
-            "FixedTopicSet", BaseNotification1_2Constants.NSPREFIX_WSNT_SCHEMA );
+    QName PROP_QNAME_FIXED_TOPIC_SET = new QName( BaseNotificationConstants.NSURI_WSNT_SCHEMA,
+            "FixedTopicSet", BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
 
     /**
      * TopicExpressionDialects property name.
      */
-    QName PROP_QNAME_TOPIC_EXPRESSION_DIALECTS = new QName( BaseNotification1_2Constants.NSURI_WSNT_SCHEMA,
-            "TopicExpressionDialects", BaseNotification1_2Constants.NSPREFIX_WSNT_SCHEMA );
+    QName PROP_QNAME_TOPIC_EXPRESSION_DIALECTS = new QName( BaseNotificationConstants.NSURI_WSNT_SCHEMA,
+            "TopicExpressionDialects", BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
 
     /**
      *

Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/porttype/SubscriptionManagerPortType.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/porttype/SubscriptionManagerPortType.java?rev=164598&r1=164597&r2=164598&view=diff
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/porttype/SubscriptionManagerPortType.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/porttype/SubscriptionManagerPortType.java Mon Apr 25 09:37:52 2005
@@ -15,7 +15,7 @@
  *=============================================================================*/
 package org.apache.ws.notification.base.v2004_6.porttype;
 
-import org.apache.ws.notification.base.v2004_6.BaseNotification1_2Constants;
+import org.apache.ws.notification.base.v2004_6.BaseNotificationConstants;
 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;
@@ -29,52 +29,52 @@
 public interface SubscriptionManagerPortType
 {
 
-    QName NAME = new QName( BaseNotification1_2Constants.NSURI_WSNT_WSDL, "SubscriptionManager",
-            BaseNotification1_2Constants.NSPREFIX_WSNT_WSDL );
-    QName PROPS_DOC_NAME = new QName( BaseNotification1_2Constants.NSURI_WSNT_SCHEMA, "SubscriptionManagerRP",
-            BaseNotification1_2Constants.NSPREFIX_WSNT_SCHEMA );
+    QName NAME = new QName( BaseNotificationConstants.NSURI_WSNT_WSDL, "SubscriptionManager",
+            BaseNotificationConstants.NSPREFIX_WSNT_WSDL );
+    QName PROPS_DOC_NAME = new QName( BaseNotificationConstants.NSURI_WSNT_SCHEMA, "SubscriptionManagerRP",
+            BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
 
     /**
      * ConsumerReference property name.
      */
-    QName PROP_QNAME_CONSUMER_REFERENCE = new QName( BaseNotification1_2Constants.NSURI_WSNT_SCHEMA,
-            "ConsumerReference", BaseNotification1_2Constants.NSPREFIX_WSNT_SCHEMA );
+    QName PROP_QNAME_CONSUMER_REFERENCE = new QName( BaseNotificationConstants.NSURI_WSNT_SCHEMA,
+            "ConsumerReference", BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
 
     /**
      * TopicExpression property name.
      */
-    QName PROP_QNAME_TOPIC_EXPRESSION = new QName( BaseNotification1_2Constants.NSURI_WSNT_SCHEMA, "TopicExpression",
-            BaseNotification1_2Constants.NSPREFIX_WSNT_SCHEMA );
+    QName PROP_QNAME_TOPIC_EXPRESSION = new QName( BaseNotificationConstants.NSURI_WSNT_SCHEMA, "TopicExpression",
+            BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
 
     /**
      * UseNotify property name.
      */
-    QName PROP_QNAME_USE_NOTIFY = new QName( BaseNotification1_2Constants.NSURI_WSNT_SCHEMA, "UseNotify",
-            BaseNotification1_2Constants.NSPREFIX_WSNT_SCHEMA );
+    QName PROP_QNAME_USE_NOTIFY = new QName( BaseNotificationConstants.NSURI_WSNT_SCHEMA, "UseNotify",
+            BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
 
     /**
      * Precondition property name.
      */
-    QName PROP_QNAME_PRECONDITION = new QName( BaseNotification1_2Constants.NSURI_WSNT_SCHEMA, "Precondition",
-            BaseNotification1_2Constants.NSPREFIX_WSNT_SCHEMA );
+    QName PROP_QNAME_PRECONDITION = new QName( BaseNotificationConstants.NSURI_WSNT_SCHEMA, "Precondition",
+            BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
 
     /**
      * Selector property name.
      */
-    QName PROP_QNAME_SELECTOR = new QName( BaseNotification1_2Constants.NSURI_WSNT_SCHEMA, "Selector",
-            BaseNotification1_2Constants.NSPREFIX_WSNT_SCHEMA );
+    QName PROP_QNAME_SELECTOR = new QName( BaseNotificationConstants.NSURI_WSNT_SCHEMA, "Selector",
+            BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
 
     /**
      * SubscriptionPolicy property name.
      */
-    QName PROP_QNAME_SUBSCRIPTION_POLICY = new QName( BaseNotification1_2Constants.NSURI_WSNT_SCHEMA,
-            "SubscriptionPolicy", BaseNotification1_2Constants.NSPREFIX_WSNT_SCHEMA );
+    QName PROP_QNAME_SUBSCRIPTION_POLICY = new QName( BaseNotificationConstants.NSURI_WSNT_SCHEMA,
+            "SubscriptionPolicy", BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
 
     /**
      * CreationTime property name.
      */
-    QName PROP_QNAME_CREATION_TIME = new QName( BaseNotification1_2Constants.NSURI_WSNT_SCHEMA, "CreationTime",
-            BaseNotification1_2Constants.NSPREFIX_WSNT_SCHEMA );
+    QName PROP_QNAME_CREATION_TIME = new QName( BaseNotificationConstants.NSURI_WSNT_SCHEMA, "CreationTime",
+            BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
 
     /**
      * @param requestDoc

Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/porttype/impl/NotificationProducerPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/porttype/impl/NotificationProducerPortTypeImpl.java?rev=164598&r1=164597&r2=164598&view=diff
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/porttype/impl/NotificationProducerPortTypeImpl.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/porttype/impl/NotificationProducerPortTypeImpl.java Mon Apr 25 09:37:52 2005
@@ -20,11 +20,12 @@
 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;
+import org.apache.ws.notification.base.v2004_6.impl.SubscriptionHome;
 import org.apache.ws.notification.base.impl.XmlBeansTopicExpression;
 import org.apache.ws.notification.base.impl.faults.SubscribeCreationFailedFaultException;
-import org.apache.ws.notification.base.v2004_6.impl.Subscription1_2Resource;
+import org.apache.ws.notification.base.v2004_6.impl.SubscriptionResource;
 import org.apache.ws.notification.base.v2004_6.impl.WsnNamespaceVersionHolderImpl;
+import org.apache.ws.notification.base.v2004_6.impl.SubscriptionHome;
 import org.apache.ws.notification.base.v2004_6.porttype.NotificationProducerPortType;
 import org.apache.ws.notification.topics.Topic;
 import org.apache.ws.notification.topics.TopicExpression;
@@ -120,7 +121,7 @@
             Context initialContext = new InitialContext(  );
             SubscriptionHome subscriptionHome = (SubscriptionHome) initialContext.lookup( SubscriptionHome.HOME_LOCATION );
           
-            Subscription subscription = subscriptionHome.create(Subscription1_2Resource.class, new XmlBeansEndpointReference(request.getConsumerReference()), producerEPR, initialTerminationTime,subPolicy, precondition, selector,getResourceKey(), ((AbstractResourceContext)getResourceContext()).getResourceHomeLocation(),topicExpr,useNotify );
+            Subscription subscription = subscriptionHome.create(SubscriptionResource.class, new XmlBeansEndpointReference(request.getConsumerReference()), producerEPR, initialTerminationTime,subPolicy, precondition, selector,getResourceKey(), ((AbstractResourceContext)getResourceContext()).getResourceHomeLocation(),topicExpr,useNotify );
             subscription.setNotificationProducer(this);
             epr = (EndpointReferenceType) ((XmlObjectWrapper)subscription.getEpr()).getXmlObject();
 

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?rev=164598&r1=164597&r2=164598&view=diff
==============================================================================
--- 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 Mon Apr 25 09:37:52 2005
@@ -15,9 +15,9 @@
  *=============================================================================*/
 package org.apache.ws.notification.tool;
 
-import org.apache.ws.notification.tool.v1_2.NotificationConsumerPortType2JavaInfo;
-import org.apache.ws.notification.tool.v1_2.NotificationProducerPortType2JavaInfo;
-import org.apache.ws.notification.tool.v1_2.SubscriptionManagerPortType2JavaInfo;
+import org.apache.ws.notification.tool.v2004_06.NotificationConsumerPortType2JavaInfo;
+import org.apache.ws.notification.tool.v2004_06.NotificationProducerPortType2JavaInfo;
+import org.apache.ws.notification.tool.v2004_06.SubscriptionManagerPortType2JavaInfo;
 import org.apache.ws.notification.base.v2004_6.impl.WsnNamespaceVersionHolderImpl;
 import org.apache.ws.resource.tool.Wsdl2Java;
 import org.apache.ws.resource.tool.velocity.ServiceProperties;

Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/v2004_06/NotificationConsumerPortType2JavaInfo.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/v2004_06/NotificationConsumerPortType2JavaInfo.java?rev=164598&r1=164597&r2=164598&view=diff
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/v2004_06/NotificationConsumerPortType2JavaInfo.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/v2004_06/NotificationConsumerPortType2JavaInfo.java Mon Apr 25 09:37:52 2005
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  *=============================================================================*/
-package org.apache.ws.notification.tool.v1_2;
+package org.apache.ws.notification.tool.v2004_06;
 
 import org.apache.ws.notification.base.v2004_6.porttype.NotificationConsumerPortType;
 import org.apache.ws.resource.tool.PortType2JavaInfo;

Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/v2004_06/NotificationProducerPortType2JavaInfo.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/v2004_06/NotificationProducerPortType2JavaInfo.java?rev=164598&r1=164597&r2=164598&view=diff
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/v2004_06/NotificationProducerPortType2JavaInfo.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/v2004_06/NotificationProducerPortType2JavaInfo.java Mon Apr 25 09:37:52 2005
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  *=============================================================================*/
-package org.apache.ws.notification.tool.v1_2;
+package org.apache.ws.notification.tool.v2004_06;
 
 import org.apache.ws.notification.base.v2004_6.porttype.NotificationProducerPortType;
 import org.apache.ws.notification.base.NotificationProducerResource;

Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/v2004_06/SubscriptionManagerPortType2JavaInfo.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/v2004_06/SubscriptionManagerPortType2JavaInfo.java?rev=164598&r1=164597&r2=164598&view=diff
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/v2004_06/SubscriptionManagerPortType2JavaInfo.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/v2004_06/SubscriptionManagerPortType2JavaInfo.java Mon Apr 25 09:37:52 2005
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  *=============================================================================*/
-package org.apache.ws.notification.tool.v1_2;
+package org.apache.ws.notification.tool.v2004_06;
 
 import org.apache.ws.notification.base.v2004_6.porttype.SubscriptionManagerPortType;
 import org.apache.ws.resource.tool.PortType2JavaInfo;

Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/SimpleSubscriptionTopicListener.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/SimpleSubscriptionTopicListener.java?rev=164598&r1=164597&r2=164598&view=diff
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/SimpleSubscriptionTopicListener.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/SimpleSubscriptionTopicListener.java Mon Apr 25 09:37:52 2005
@@ -22,7 +22,7 @@
 import org.apache.ws.addressing.Addressing_03_2003_Constants;
 import org.apache.ws.addressing.EndpointReference;
 import org.apache.ws.notification.base.Subscription;
-import org.apache.ws.notification.base.v2004_6.BaseNotification1_2Constants;
+import org.apache.ws.notification.base.v2004_6.BaseNotificationConstants;
 import org.apache.ws.notification.topics.Topic;
 import org.apache.ws.notification.topics.TopicExpression;
 import org.apache.ws.notification.topics.TopicListener;
@@ -296,7 +296,7 @@
       h = header.addHeaderElement( factory.createName( Addressing_03_2003_Constants.ACTION,
                                                        Addressing_03_2003_Constants.NSPREFIX_WSRL_SCHEMA,
                                                        Addressing_03_2003_Constants.NSURI_WSRL_SCHEMA ) );
-      h.addTextNode( BaseNotification1_2Constants.NOTIFY_ACTION_URL );
+      h.addTextNode( BaseNotificationConstants.NOTIFY_ACTION_URL );
 
       ReferencePropertiesType props = consumerEPR.getReferenceProperties(  );
       if ( props != null )

Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/InvalidTopicExpressionFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/InvalidTopicExpressionFaultException.java?rev=164598&r1=164597&r2=164598&view=diff
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/InvalidTopicExpressionFaultException.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/InvalidTopicExpressionFaultException.java Mon Apr 25 09:37:52 2005
@@ -1,7 +1,7 @@
 package org.apache.ws.notification.topics.impl.faults;
 
 import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
-import org.apache.ws.notification.base.v2004_6.BaseNotification1_2Constants;
+import org.apache.ws.notification.base.v2004_6.BaseNotificationConstants;
 import org.apache.ws.resource.faults.AbstractBaseFaultException;
 
 import javax.xml.namespace.QName;
@@ -17,7 +17,7 @@
     public InvalidTopicExpressionFaultException(WsnNamespaceVersionHolder namespaceVersionHolder, String s)
     {
         super(namespaceVersionHolder, s);
-        m_name = new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(), "InvalidTopicExpressionFaultException", BaseNotification1_2Constants.NSPREFIX_WSNT_SCHEMA );
+        m_name = new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(), "InvalidTopicExpressionFaultException", BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
     }
 
     public QName getBaseFaultName()

Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/NoCurrentMessageOnTopicFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/NoCurrentMessageOnTopicFaultException.java?rev=164598&r1=164597&r2=164598&view=diff
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/NoCurrentMessageOnTopicFaultException.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/NoCurrentMessageOnTopicFaultException.java Mon Apr 25 09:37:52 2005
@@ -1,7 +1,7 @@
 package org.apache.ws.notification.topics.impl.faults;
 
 import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
-import org.apache.ws.notification.base.v2004_6.BaseNotification1_2Constants;
+import org.apache.ws.notification.base.v2004_6.BaseNotificationConstants;
 import org.apache.ws.resource.faults.AbstractBaseFaultException;
 
 import javax.xml.namespace.QName;
@@ -17,7 +17,7 @@
     public NoCurrentMessageOnTopicFaultException(WsnNamespaceVersionHolder namespaceVersionHolder, String s)
     {
         super(namespaceVersionHolder, s);
-        m_name = new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(), "NoCurrentMessageOnTopicFaultException", BaseNotification1_2Constants.NSPREFIX_WSNT_SCHEMA );
+        m_name = new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(), "NoCurrentMessageOnTopicFaultException", BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
     }
 
 

Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/TopicNotSupportedFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/TopicNotSupportedFaultException.java?rev=164598&r1=164597&r2=164598&view=diff
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/TopicNotSupportedFaultException.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/TopicNotSupportedFaultException.java Mon Apr 25 09:37:52 2005
@@ -1,7 +1,7 @@
 package org.apache.ws.notification.topics.impl.faults;
 
 import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
-import org.apache.ws.notification.base.v2004_6.BaseNotification1_2Constants;
+import org.apache.ws.notification.base.v2004_6.BaseNotificationConstants;
 import org.apache.ws.resource.faults.AbstractBaseFaultException;
 
 import javax.xml.namespace.QName;
@@ -17,7 +17,7 @@
     public TopicNotSupportedFaultException(WsnNamespaceVersionHolder namespaceVersionHolder, String s)
     {
         super(namespaceVersionHolder, s);
-        m_name = new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(), "TopicNotSupportedFaultException", BaseNotification1_2Constants.NSPREFIX_WSNT_SCHEMA );
+        m_name = new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(), "TopicNotSupportedFaultException", BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
     }
 
     public QName getBaseFaultName()

Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/TopicPathDialectUnknownFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/TopicPathDialectUnknownFaultException.java?rev=164598&r1=164597&r2=164598&view=diff
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/TopicPathDialectUnknownFaultException.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/TopicPathDialectUnknownFaultException.java Mon Apr 25 09:37:52 2005
@@ -1,7 +1,7 @@
 package org.apache.ws.notification.topics.impl.faults;
 
 import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
-import org.apache.ws.notification.base.v2004_6.BaseNotification1_2Constants;
+import org.apache.ws.notification.base.v2004_6.BaseNotificationConstants;
 import org.apache.ws.resource.faults.AbstractBaseFaultException;
 
 import javax.xml.namespace.QName;
@@ -17,7 +17,7 @@
     public TopicPathDialectUnknownFaultException(WsnNamespaceVersionHolder namespaceVersionHolder, String s)
     {
         super(namespaceVersionHolder, s);
-        m_name = new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(), "TopicPathDialectUnknownFaultException", BaseNotification1_2Constants.NSPREFIX_WSNT_SCHEMA );
+        m_name = new QName( namespaceVersionHolder.getBaseNotificationXsdNamespace(), "TopicPathDialectUnknownFaultException", BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
     }
 
 

Modified: incubator/hermes/trunk/src/templates/1_2_draft01/NotificationConsumerPortType.txt
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/templates/1_2_draft01/NotificationConsumerPortType.txt?rev=164598&r1=164597&r2=164598&view=diff
==============================================================================
--- incubator/hermes/trunk/src/templates/1_2_draft01/NotificationConsumerPortType.txt (original)
+++ incubator/hermes/trunk/src/templates/1_2_draft01/NotificationConsumerPortType.txt Mon Apr 25 09:37:52 2005
@@ -5,5 +5,5 @@
     */
    void subscribe( org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.NotifyDocument requestDoc )
    {
-      new org.apache.ws.notification.base.v1_2.porttype.impl.NotificationConsumerPortTypeImpl( getResourceContext(  ) ).subscribe( requestDoc );
+      new org.apache.ws.notification.base.v2004_6.porttype.impl.NotificationConsumerPortTypeImpl( getResourceContext(  ) ).subscribe( requestDoc );
    }

Modified: incubator/hermes/trunk/src/templates/1_2_draft01/NotificationProducerPortType.txt
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/templates/1_2_draft01/NotificationProducerPortType.txt?rev=164598&r1=164597&r2=164598&view=diff
==============================================================================
--- incubator/hermes/trunk/src/templates/1_2_draft01/NotificationProducerPortType.txt (original)
+++ incubator/hermes/trunk/src/templates/1_2_draft01/NotificationProducerPortType.txt Mon Apr 25 09:37:52 2005
@@ -7,7 +7,7 @@
     */
    public org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.SubscribeResponseDocument subscribe( org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.SubscribeDocument requestDoc )
    {        
-       return new org.apache.ws.notification.base.v1_2.porttype.impl.NotificationProducerPortTypeImpl( getResourceContext(  ) ).subscribe( requestDoc );
+       return new org.apache.ws.notification.base.v2004_6.porttype.impl.NotificationProducerPortTypeImpl( getResourceContext(  ) ).subscribe( requestDoc );
    }
 
    /**
@@ -19,6 +19,6 @@
     */
    public org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.GetCurrentMessageResponseDocument getCurrentMessage( org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.GetCurrentMessageDocument requestDoc )
    {
-       return new org.apache.ws.notification.base.v1_2.porttype.impl.NotificationProducerPortTypeImpl( getResourceContext(  ) ).getCurrentMessage( requestDoc );
+       return new org.apache.ws.notification.base.v2004_6.porttype.impl.NotificationProducerPortTypeImpl( getResourceContext(  ) ).getCurrentMessage( requestDoc );
    }
     

Modified: incubator/hermes/trunk/src/templates/1_2_draft03/NotificationConsumerPortType.txt
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/templates/1_2_draft03/NotificationConsumerPortType.txt?rev=164598&r1=164597&r2=164598&view=diff
==============================================================================
--- incubator/hermes/trunk/src/templates/1_2_draft03/NotificationConsumerPortType.txt (original)
+++ incubator/hermes/trunk/src/templates/1_2_draft03/NotificationConsumerPortType.txt Mon Apr 25 09:37:52 2005
@@ -5,5 +5,5 @@
     */
    void subscribe( org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft03.NotifyDocument requestDoc )
    {
-      new org.apache.ws.notification.base.v1_2.porttype.impl.NotificationConsumerPortTypeImpl( getResourceContext(  ) ).subscribe( requestDoc );
+      new org.apache.ws.notification.base.v2004_6.porttype.impl.NotificationConsumerPortTypeImpl( getResourceContext(  ) ).subscribe( requestDoc );
    }

Modified: incubator/hermes/trunk/src/templates/1_2_draft03/NotificationProducerPortType.txt
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/templates/1_2_draft03/NotificationProducerPortType.txt?rev=164598&r1=164597&r2=164598&view=diff
==============================================================================
--- incubator/hermes/trunk/src/templates/1_2_draft03/NotificationProducerPortType.txt (original)
+++ incubator/hermes/trunk/src/templates/1_2_draft03/NotificationProducerPortType.txt Mon Apr 25 09:37:52 2005
@@ -7,7 +7,7 @@
     */
    public org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft03.SubscribeResponseDocument subscribe( org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft03.SubscribeDocument requestDoc )
    {        
-       return new org.apache.ws.notification.base.v1_2.porttype.impl.NotificationProducerPortTypeImpl( getResourceContext(  ) ).subscribe( requestDoc );
+       return new org.apache.ws.notification.base.v2004_6.porttype.impl.NotificationProducerPortTypeImpl( getResourceContext(  ) ).subscribe( requestDoc );
    }
 
    /**
@@ -19,6 +19,6 @@
     */
    public org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft03.GetCurrentMessageResponseDocument getCurrentMessage( org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft03.GetCurrentMessageDocument requestDoc )
    {
-       return new org.apache.ws.notification.base.v1_2.porttype.impl.NotificationProducerPortTypeImpl( getResourceContext(  ) ).getCurrentMessage( requestDoc );
+       return new org.apache.ws.notification.base.v2004_6.porttype.impl.NotificationProducerPortTypeImpl( getResourceContext(  ) ).getCurrentMessage( requestDoc );
    }
     

Modified: incubator/hermes/trunk/src/test/org/apache/ws/notification/topics/SimpleSubscriptionTopicListenerTest.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/test/org/apache/ws/notification/topics/SimpleSubscriptionTopicListenerTest.java?rev=164598&r1=164597&r2=164598&view=diff
==============================================================================
--- incubator/hermes/trunk/src/test/org/apache/ws/notification/topics/SimpleSubscriptionTopicListenerTest.java (original)
+++ incubator/hermes/trunk/src/test/org/apache/ws/notification/topics/SimpleSubscriptionTopicListenerTest.java Mon Apr 25 09:37:52 2005
@@ -3,8 +3,8 @@
 import junit.framework.TestCase;
 import org.apache.ws.notification.topics.impl.SimpleSubscriptionTopicListener;
 import org.apache.ws.notification.topics.impl.ResourcePropertyValueChangeTopicImpl;
-import org.apache.ws.notification.base.v1_2.impl.Subscription1_2Resource;
-import org.apache.ws.notification.base.v1_2.porttype.impl.NotificationProducerPortTypeImpl;
+import org.apache.ws.notification.base.v2004_6.impl.SubscriptionResource;
+import org.apache.ws.notification.base.v2004_6.porttype.impl.NotificationProducerPortTypeImpl;
 import org.apache.ws.notification.base.impl.XmlBeansTopicExpression;
 import org.apache.ws.pubsub.Subscription;
 import org.apache.ws.resource.properties.impl.XmlBeansResourceProperty;
@@ -53,7 +53,7 @@
         //topicExprType.setDialect("http://foobar");
 
         XmlBeansTopicExpression topicExpr = new XmlBeansTopicExpression(topicExprType.getTopicExpression());
-        Subscription1_2Resource sub = new Subscription1_2Resource(epr,epr,Calendar.getInstance(),null,null,null,null,"",topicExpr,false);
+        SubscriptionResource sub = new SubscriptionResource(epr,epr,Calendar.getInstance(),null,null,null,null,"",topicExpr,false);
         sub.setNotificationProducer(new NotifProducer());
 
        /* EndpointReference consumerReference, EndpointReference producerReference,

Modified: incubator/hermes/trunk/src/webapp/WEB-INF/classes/jndi-config.xml
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/webapp/WEB-INF/classes/jndi-config.xml?rev=164598&r1=164597&r2=164598&view=diff
==============================================================================
--- incubator/hermes/trunk/src/webapp/WEB-INF/classes/jndi-config.xml (original)
+++ incubator/hermes/trunk/src/webapp/WEB-INF/classes/jndi-config.xml Mon Apr 25 09:37:52 2005
@@ -47,15 +47,15 @@
    </global>
 
    <service name="SubscriptionManager">
-      <resource name="home" type="org.apache.ws.notification.base.impl.SubscriptionHome">
+      <resource name="home" type="org.apache.ws.notification.base.v2004_6.impl.SubscriptionHome">
          <resourceParams>
             <parameter>
                <name>serviceClassName</name>
-               <value>org.apache.ws.notification.base.impl.SubscriptionService</value>
+               <value>org.apache.ws.notification.base.v2004_6.impl.SubscriptionService</value>
             </parameter>
             <parameter>
                <name>resourceClassName</name>
-               <value>org.apache.ws.notification.base.v1_2.impl.Subscription1_2Resource</value>
+               <value>org.apache.ws.notification.base.v2004_6.impl.SubscriptionResource</value>
             </parameter>
             <parameter>
                <name>wsdlTargetNamespace</name>



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