[prev in list] [next in list] [prev in thread] [next in thread]
List: pubscribe-commits
Subject: svn commit: r292777 - in /webservices/pubscribe/trunk: ./
From: scamp () apache ! org
Date: 2005-09-30 15:38:52
Message-ID: 20050930153854.17915.qmail () minotaur ! apache ! org
[Download RAW message or body]
Author: scamp
Date: Fri Sep 30 08:38:48 2005
New Revision: 292777
URL: http://svn.apache.org/viewcvs?rev=292777&view=rev
Log:
Wired in the new resource prop for ProducerReference in the SubscriptionResource.java \
and extracted some strings into a constant class
Added:
webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/CustomBaseNotificationConstants.java
Modified:
webservices/pubscribe/trunk/maven.xml
webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java
webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionHome.java
webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionResource.java
webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionService.java
webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/porttype/SubscriptionManagerPortType.java
Modified: webservices/pubscribe/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/maven.xml?rev=292777&r1=292776&r2=292777&view=diff
==============================================================================
--- webservices/pubscribe/trunk/maven.xml (original)
+++ webservices/pubscribe/trunk/maven.xml Fri Sep 30 08:38:48 2005
@@ -80,6 +80,17 @@
</goal>
<!-- ================================================================== -->
+ <!-- J A R : J A R -->
+ <!-- P R E - G O A L -->
+ <!-- ================================================================== -->
+ <preGoal name="jar:jar">
+ <mkdir dir="${maven.build.dest}/wsdl" />
+ <!-- Extract SubMgr Wsdl from Generated Jar -->
+ <j:set var="wsdljar" value="${pom.getDependencyPath('wsn:submgr-xbeans')}"/>
+ <attainGoal name="extract-wsdl-jar"/>
+ </preGoal>
+
+ <!-- ================================================================== -->
<!-- W A R : W E B A P P -->
<!-- P R E - G O A L -->
<!-- ================================================================== -->
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java?rev=292777&r1=292776&r2=292777&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java \
(original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java \
Fri Sep 30 08:38:48 2005 @@ -24,6 +24,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.ws.addressing.EndpointReference;
import org.apache.ws.notification.base.v2004_06.impl.WsnNamespaceVersionHolderImpl;
+import org.apache.ws.notification.base.CustomBaseNotificationConstants;
import org.apache.ws.pubsub.Filter;
import org.apache.ws.resource.JndiConstants;
import org.apache.ws.resource.ResourceException;
@@ -45,25 +46,13 @@
{
private static final Log LOG = LogFactory.getLog( SubscriptionHome.class.getName( \
) );
- /** The service endpoint name as registered with the SOAP Platform. This is \
useful for building EPR's. **/
- public static final javax.xml.namespace.QName SERVICE_NAME =
- javax.xml.namespace.QName.valueOf( \
"{http://ws.apache.org/notification/base/service/SubscriptionManager}SubscriptionManager" \
);
-
- /** The management PortType associated with this resource. This is useful for \
building EPR's.**/
- public static final javax.xml.namespace.QName PORT_TYPE =
- javax.xml.namespace.QName.valueOf( \
"http://ws.apache.org/notification/base/service/SubscriptionManager}SubscriptionManagerPortType" \
);
-
- /** The WSDL Port name associated with the resource. This is useful for building \
EPR's. **/
- public static final String PORT_NAME = "SubscriptionManager";
-
- /** The name of the resource key for this resource. **/
- public static final javax.xml.namespace.QName RESOURCE_KEY_NAME =
- javax.xml.namespace.QName.valueOf( \
"{http://ws.apache.org/notification/base/service/SubscriptionManager}ResourceID" ); + \
/** The WSDL Port name associated with the resource. This is useful for building \
EPR's. **/ + public static final String PORT_NAME = "SubscriptionManager";
- /** DOCUMENT_ME */
- public static final String HOME_LOCATION =
- JndiConstants.CONTEXT_NAME_SERVICES + "/" + SERVICE_NAME.getLocalPart( ) + \
"/"
- + JndiConstants.ATOMIC_NAME_HOME;
+ /** DOCUMENT_ME */
+ public static final String HOME_LOCATION =
+ JndiConstants.CONTEXT_NAME_SERVICES + "/" + \
CustomBaseNotificationConstants.SERVICE_NAME.getLocalPart( ) + "/" + + \
JndiConstants.ATOMIC_NAME_HOME; private static final NamespaceVersionHolder \
SPEC_NAMESPACE_SET = new WsnNamespaceVersionHolderImpl( );
/**
@@ -110,7 +99,7 @@
*/
public QName getPortType( )
{
- return PORT_TYPE;
+ return CustomBaseNotificationConstants.PORT_TYPE;
}
/**
@@ -120,7 +109,7 @@
*/
public QName getResourceKeyNameQName( )
{
- return RESOURCE_KEY_NAME;
+ return CustomBaseNotificationConstants.RESOURCE_KEY_NAME;
}
/**
@@ -130,7 +119,7 @@
*/
public QName getServiceName( )
{
- return SERVICE_NAME;
+ return CustomBaseNotificationConstants.SERVICE_NAME;
}
/**
Added: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/CustomBaseNotificationConstants.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/CustomBaseNotificationConstants.java?rev=292777&view=auto
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/CustomBaseNotificationConstants.java \
(added)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/CustomBaseNotificationConstants.java \
Fri Sep 30 08:38:48 2005 @@ -0,0 +1,22 @@
+package org.apache.ws.notification.base;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Constants for our impl of SubscriptionManager
+ *
+ * @author Sal Campana
+ */
+public interface CustomBaseNotificationConstants
+{
+ String TARGET_NAMESPACE = \
"http://ws.apache.org/notification/base/service/SubscriptionManager"; + /** The \
service endpoint name as registered with the SOAP Platform. This is useful for \
building EPR's. **/ + javax.xml.namespace.QName SERVICE_NAME = new \
QName(TARGET_NAMESPACE,"SubscriptionManager" ); +
+ /** The management PortType associated with this resource. This is useful for \
building EPR's.**/ + javax.xml.namespace.QName PORT_TYPE = new \
QName(TARGET_NAMESPACE,"SubscriptionManagerPortType" ); +
+ /** The name of the resource key for this resource. **/
+ javax.xml.namespace.QName RESOURCE_KEY_NAME = new \
QName(TARGET_NAMESPACE,"ResourceID" ); +
+}
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionHome.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/ \
notification/base/v2004_06/impl/SubscriptionHome.java?rev=292777&r1=292776&r2=292777&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionHome.java \
(original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionHome.java \
Fri Sep 30 08:38:48 2005 @@ -18,6 +18,7 @@
import org.apache.ws.addressing.EndpointReference;
import org.apache.ws.notification.base.Subscription;
import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
+import org.apache.ws.notification.base.CustomBaseNotificationConstants;
import org.apache.ws.notification.topics.expression.TopicExpression;
import org.apache.ws.resource.ResourceException;
import org.apache.ws.resource.impl.AbstractResourceHome;
@@ -37,28 +38,12 @@
public class SubscriptionHome
extends AbstractResourceHome
{
- /**
- * The service endpoint name as registered with the SOAP Platform. This is useful \
for building EPRs.
- */
- public static final javax.xml.namespace.QName SERVICE_NAME =
- javax.xml.namespace.QName.valueOf( \
"{http://ws.apache.org/notification/base/service/SubscriptionManager}SubscriptionManager" \
);
-
- /**
- * The management PortType associated with this resource. This is useful for \
building EPRs.
- */
- public static final javax.xml.namespace.QName PORT_TYPE =
- javax.xml.namespace.QName.valueOf( \
"{http://ws.apache.org/notification/base/service/SubscriptionManager}SubscriptionManagerPortType" \
);
/**
* The WSDL Port name associated with the resource. This is useful for building \
EPRs.
*/
public static final String PORT_NAME = "SubscriptionManager";
- /**
- * The name of the resource key for this resource. *
- */
- public static final javax.xml.namespace.QName RESOURCE_KEY_NAME =
- javax.xml.namespace.QName.valueOf( \
"{http://ws.apache.org/notification/base/service/SubscriptionManager}ResourceID" );
private static final NamespaceVersionHolder SPEC_NAMESPACE_SET = new \
WsnNamespaceVersionHolderImpl( );
@@ -86,7 +71,7 @@
*/
public QName getPortType( )
{
- return PORT_TYPE;
+ return CustomBaseNotificationConstants.PORT_TYPE;
}
/**
@@ -96,7 +81,7 @@
*/
public QName getResourceKeyNameQName( )
{
- return RESOURCE_KEY_NAME;
+ return CustomBaseNotificationConstants.RESOURCE_KEY_NAME;
}
/**
@@ -106,7 +91,7 @@
*/
public QName getServiceName( )
{
- return SERVICE_NAME;
+ return CustomBaseNotificationConstants.SERVICE_NAME;
}
/**
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionResource.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/ \
notification/base/v2004_06/impl/SubscriptionResource.java?rev=292777&r1=292776&r2=292777&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionResource.java \
(original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionResource.java \
Fri Sep 30 08:38:48 2005 @@ -21,6 +21,8 @@
import org.apache.ws.addressing.v2003_03.AddressingConstants;
import org.apache.ws.notification.base.impl.AbstractSubscription;
import org.apache.ws.notification.base.v2004_06.porttype.SubscriptionManagerPortType;
+import org.apache.ws.notification.base.service.subscriptionManager.SubscriptionManagerRPDocument;
+import org.apache.ws.notification.base.service.subscriptionManager.ProducerReferenceDocument;
import org.apache.ws.notification.topics.TopicsTypeWriter;
import org.apache.ws.notification.topics.expression.TopicExpression;
import org.apache.ws.notification.topics.v2004_06.TopicsConstants;
@@ -36,7 +38,6 @@
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;
@@ -90,6 +91,7 @@
*/
public void init()
{
+
SubscriptionManagerRPDocument propsDoc = \
SubscriptionManagerRPDocument.Factory.newInstance(); ResourcePropertySetMetaData \
propSetMetaData =
new XmlBeansResourcePropertySetMetaData( propsDoc.schemaType(), \
READ_ONLY_PROP_NAMES ); @@ -108,6 +110,12 @@
TerminationTimeDocument termTimeDoc = \
TerminationTimeDocument.Factory.newInstance(); termTimeDoc.setTerminationTime( \
getTerminationTime() ); prop.add( termTimeDoc );
+
+ //Custom Prop
+ prop = m_propSet.get(SubscriptionManagerPortType.PROP_QNAME_PRODUCER_REFERENCE);
+ ProducerReferenceDocument producerRefDoc = \
ProducerReferenceDocument.Factory.newInstance(); + \
producerRefDoc.setProducerReference((EndpointReferenceType) ( \
(XmlBeansEndpointReference) m_producerReference ) + .getXmlObject( \
AddressingConstants.NSURI_ADDRESSING_SCHEMA ) );
// wsntw:SubscriptionManager props
prop = m_propSet.get( \
SubscriptionManagerPortType.PROP_QNAME_CONSUMER_REFERENCE );
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionService.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/ \
notification/base/v2004_06/impl/SubscriptionService.java?rev=292777&r1=292776&r2=292777&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionService.java \
(original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionService.java \
Fri Sep 30 08:38:48 2005 @@ -17,6 +17,7 @@
import org.apache.ws.notification.base.v2004_06.porttype.SubscriptionManagerPortType;
import org.apache.ws.notification.base.v2004_06.porttype.impl.SubscriptionManagerPortTypeImpl;
+import org.apache.ws.notification.base.CustomBaseNotificationConstants;
import org.apache.ws.resource.ResourceContext;
import org.apache.ws.resource.handler.ServiceSoapMethodNameMap;
import org.apache.ws.resource.handler.SoapMethodNameMap;
@@ -38,8 +39,7 @@
org.apache.ws.resource.lifetime.v2004_06.porttype.ImmediateResourceTerminationPortType
{
/** DOCUMENT_ME */
- public static final String TARGET_NSURI =
- "http://ws.apache.org/notification/base/service/SubscriptionManager";
+ public static final String TARGET_NSURI = \
CustomBaseNotificationConstants.TARGET_NAMESPACE;
/** DOCUMENT_ME */
public static final String TARGET_NSPREFIX = "SubscriptionManager";
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/porttype/SubscriptionManagerPortType.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/ \
notification/base/v2004_06/porttype/SubscriptionManagerPortType.java?rev=292777&r1=292776&r2=292777&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/porttype/SubscriptionManagerPortType.java \
(original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/porttype/SubscriptionManagerPortType.java \
Fri Sep 30 08:38:48 2005 @@ -48,6 +48,14 @@
new QName( BaseNotificationConstants.NSURI_WSNT_SCHEMA.toString(), \
"ConsumerReference", BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA );
+ /**
+ * ProducerReference property name.
+ */
+ QName PROP_QNAME_PRODUCER_REFERENCE =
+ new QName("http://ws.apache.org/notification/base/service/SubscriptionManager", \
"ProducerReference", + \
BaseNotificationConstants.NSPREFIX_WSNT_SCHEMA ); +
+
/**
* TopicExpression property name.
*/
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic