You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pubscribe-commits@ws.apache.org by sc...@apache.org on 2005/07/28 20:06:11 UTC
svn commit: r225833 - in /webservices/pubscribe/trunk/src: examples/broker/
examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/
examples/pubsubclient/ java/org/apache/ws/notification/base/v2004_06/impl/
webapp/WEB-INF/classes/ wsdl/
Author: scamp
Date: Thu Jul 28 11:06:01 2005
New Revision: 225833
URL: http://svn.apache.org/viewcvs?rev=225833&view=rev
Log:
fixed config files for change from resourceKeyName to resourceIdentifierReferenceParameterName
updated submgr to support metada exchange
Modified:
webservices/pubscribe/trunk/src/examples/broker/jndi-config.xml
webservices/pubscribe/trunk/src/examples/broker/jndi-config_wse.xml
webservices/pubscribe/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/Filesystem_jndi-config.xml
webservices/pubscribe/trunk/src/examples/pubsubclient/jndi-config_wse.xml
webservices/pubscribe/trunk/src/examples/pubsubclient/jndi-config_wsn.xml
webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionService.java
webservices/pubscribe/trunk/src/webapp/WEB-INF/classes/jndi-config.xml
webservices/pubscribe/trunk/src/wsdl/SubscriptionManager.wsdl
Modified: webservices/pubscribe/trunk/src/examples/broker/jndi-config.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/examples/broker/jndi-config.xml?rev=225833&r1=225832&r2=225833&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/examples/broker/jndi-config.xml (original)
+++ webservices/pubscribe/trunk/src/examples/broker/jndi-config.xml Thu Jul 28 11:06:01 2005
@@ -81,7 +81,7 @@
<value>http://ws.apache.org/eventing/services/SubscriptionManager</value>
</parameter>
<parameter>
- <name>resourceKeyName</name>
+ <name>resourceIdentifierReferenceParameterName</name>
<value>{http://schemas.xmlsoap.org/ws/2004/08/eventing}Identifier</value>
</parameter>
</resourceParams>
@@ -116,7 +116,7 @@
</parameter>
<!--
<parameter>
- <name>resourceKeyName</name>
+ <name>resourceIdentifierReferenceParameterName</name>
<value>{http://schemas.xmlsoap.org/ws/2004/08/eventing}Identifier</value>
</parameter>
-->
@@ -152,7 +152,7 @@
</parameter>
<!--
<parameter>
- <name>resourceKeyName</name>
+ <name>resourceIdentifierReferenceParameterName</name>
<value>{http://schemas.xmlsoap.org/ws/2004/08/eventing}Identifier</value>
</parameter>
-->
Modified: webservices/pubscribe/trunk/src/examples/broker/jndi-config_wse.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/examples/broker/jndi-config_wse.xml?rev=225833&r1=225832&r2=225833&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/examples/broker/jndi-config_wse.xml (original)
+++ webservices/pubscribe/trunk/src/examples/broker/jndi-config_wse.xml Thu Jul 28 11:06:01 2005
@@ -73,7 +73,7 @@
<value>http://ws.apache.org/eventing/services/SubscriptionManager</value>
</parameter>
<parameter>
- <name>resourceKeyName</name>
+ <name>resourceIdentifierReferenceParameterName</name>
<value>{http://schemas.xmlsoap.org/ws/2004/08/eventing}Identifier</value>
</parameter>
</resourceParams>
@@ -108,7 +108,7 @@
</parameter>
<!--
<parameter>
- <name>resourceKeyName</name>
+ <name>resourceIdentifierReferenceParameterName</name>
<value>{http://schemas.xmlsoap.org/ws/2004/08/eventing}Identifier</value>
</parameter>
-->
@@ -143,7 +143,7 @@
<value>http://ws.apache.org/eventing/services/NotificationPort</value>
</parameter>
<parameter>
- <name>resourceKeyName</name>
+ <name>resourceIdentifierReferenceParameterName</name>
<value>{http://schemas.xmlsoap.org/ws/2004/08/eventing}Identifier</value>
</parameter>
</resourceParams>
Modified: webservices/pubscribe/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/Filesystem_jndi-config.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/Filesystem_jndi-config.xml?rev=225833&r1=225832&r2=225833&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/Filesystem_jndi-config.xml (original)
+++ webservices/pubscribe/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/Filesystem_jndi-config.xml Thu Jul 28 11:06:01 2005
@@ -31,7 +31,7 @@
</parameter>
<parameter>
- <name>resourceKeyName</name>
+ <name>resourceIdentifierReferenceParameterName</name>
<value>{http://ws.apache.org/resource/example/filesystem}ResourceIdentifier</value>
</parameter>
Modified: webservices/pubscribe/trunk/src/examples/pubsubclient/jndi-config_wse.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/examples/pubsubclient/jndi-config_wse.xml?rev=225833&r1=225832&r2=225833&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/examples/pubsubclient/jndi-config_wse.xml (original)
+++ webservices/pubscribe/trunk/src/examples/pubsubclient/jndi-config_wse.xml Thu Jul 28 11:06:01 2005
@@ -74,7 +74,7 @@
<value>http://ws.apache.org/eventing/services/SubscriptionEndPort</value>
</parameter>
<parameter>
- <name>resourceKeyName</name>
+ <name>resourceIdentifierReferenceParameterName</name>
<value>{http://schemas.xmlsoap.org/ws/2004/08/eventing}Identifier</value>
</parameter>
</resourceParams>
@@ -111,7 +111,7 @@
<value>http://ws.apache.org/eventing/services/NotificationPort</value>
</parameter>
<parameter>
- <name>resourceKeyName</name>
+ <name>resourceIdentifierReferenceParameterName</name>
<value>{http://schemas.xmlsoap.org/ws/2004/08/eventing}Identifier</value>
</parameter>
</resourceParams>
Modified: webservices/pubscribe/trunk/src/examples/pubsubclient/jndi-config_wsn.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/examples/pubsubclient/jndi-config_wsn.xml?rev=225833&r1=225832&r2=225833&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/examples/pubsubclient/jndi-config_wsn.xml (original)
+++ webservices/pubscribe/trunk/src/examples/pubsubclient/jndi-config_wsn.xml Thu Jul 28 11:06:01 2005
@@ -75,7 +75,7 @@
<value>http://ws.apache.org/notification/services/NotificationPort</value>
</parameter>
<parameter>
- <name>resourceKeyName</name>
+ <name>resourceIdentifierReferenceParameterName</name>
<value>{http://www.ibm.com/xmlns/stdwip/web-services/WS-BaseNotification}Identifier</value>
</parameter>
</resourceParams>
@@ -109,7 +109,7 @@
<value>http://ws.apache.org/notification/services/NotificationPort</value>
</parameter>
<parameter>
- <name>resourceKeyName</name>
+ <name>resourceIdentifierReferenceParameterName</name>
<value>{http://www.ibm.com/xmlns/stdwip/web-services/WS-BaseNotification}Identifier</value>
</parameter>
</resourceParams>
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=225833&r1=225832&r2=225833&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 Thu Jul 28 11:06:01 2005
@@ -187,5 +187,15 @@
return new SubscriptionManagerPortTypeImpl( getResourceContext() ).resumeSubscription( requestDoc );
}
+
+ public org.xmlsoap.schemas.ws.x2004.x09.mex.MetadataDocument getMetadata(org.xmlsoap.schemas.ws.x2004.x09.mex.GetMetadataDocument request)
+ {
+ return new org.apache.ws.resource.metadataexchange.v2004_09.porttype.impl.MetadataExchangePortTypeImpl(getResourceContext()).getMetadata(request);
+ }
+
+ public org.xmlsoap.schemas.ws.x2004.x09.mex.AnyXmlType get()
+ {
+ return new org.apache.ws.resource.metadataexchange.v2004_09.porttype.impl.MetadataExchangePortTypeImpl(getResourceContext()).get();
+ }
}
Modified: webservices/pubscribe/trunk/src/webapp/WEB-INF/classes/jndi-config.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/webapp/WEB-INF/classes/jndi-config.xml?rev=225833&r1=225832&r2=225833&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/webapp/WEB-INF/classes/jndi-config.xml (original)
+++ webservices/pubscribe/trunk/src/webapp/WEB-INF/classes/jndi-config.xml Thu Jul 28 11:06:01 2005
@@ -91,11 +91,21 @@
<value>http://ws.apache.org/notification/base/service/SubscriptionManager</value>
</parameter>
<parameter>
- <name>resourceKeyName</name>
+ <name>resourceIdentifierReferenceParameterName</name>
<value>{http://ws.apache.org/notification/base/service/SubscriptionManager}ResourceIdentifier</value>
</parameter>
</resourceParams>
</resource>
+
+ <resource name="metadata" type="org.apache.ws.util.jndi.tools.MetadataConfig">
+ <metadataConfig>
+ <!-- classpath -->
+ <metadata dialect="http://schemas.xmlsoap.org/wsdl/" identifier="http://ws.apache.org/notification/base/service/SubscriptionManager/wsdl">
+ <location>wsdl/SubscriptionManager.wsdl</location>
+ </metadata>
+ </metadataConfig>
+ </resource>
+
</service>
</jndiConfig>
Modified: webservices/pubscribe/trunk/src/wsdl/SubscriptionManager.wsdl
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/wsdl/SubscriptionManager.wsdl?rev=225833&r1=225832&r2=225833&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/wsdl/SubscriptionManager.wsdl (original)
+++ webservices/pubscribe/trunk/src/wsdl/SubscriptionManager.wsdl Thu Jul 28 11:06:01 2005
@@ -11,7 +11,9 @@
xmlns:wsrlw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl"
xmlns:wsnt="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd"
xmlns:wsntw="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl"
- xmlns:tns="http://ws.apache.org/notification/base/service/SubscriptionManager">
+ xmlns:tns="http://ws.apache.org/notification/base/service/SubscriptionManager"
+ xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex"
+ xmlns:wsa04="http://schemas.xmlsoap.org/ws/2004/08/addressing">
<import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl"
location="../spec/wsrf/WS-ResourceProperties-1_2-Draft_01.wsdl"/>
@@ -21,6 +23,9 @@
<import namespace="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl"
location="../spec/wsn/WS-BaseNotification-1_2-Draft_01.wsdl"/>
+
+ <import namespace="http://schemas.xmlsoap.org/ws/2004/09/mex"
+ location="../spec/wsx/WS-MetadataExchange-2004_09.wsdl" />
<portType name="SubscriptionManagerPortType" wsrp:ResourceProperties="wsnt:SubscriptionManagerRP">
@@ -77,6 +82,19 @@
<fault name="ResumeFailedFault" message="wsntw:ResumeFailedFault"/>
</operation>
+ <operation name="GetMetadata" >
+ <input message="wsx:GetMetadataMsg"
+ wsa04:Action="http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata/Request" />
+ <output message="wsx:GetMetadataResponseMsg"
+ wsa04:Action="http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata/Response" />
+ </operation>
+ <operation name="Get" >
+ <input message="wsx:GetMsg"
+ wsa04:Action="http://schemas.xmlsoap.org/ws/2004/09/mex/Get/Request" />
+ <output message="wsx:GetResponseMsg"
+ wsa04:Action="http://schemas.xmlsoap.org/ws/2004/09/mex/Get/Response" />
+ </operation>
+
</portType>
<binding name="SubscriptionManagerHttpBinding" type="tns:SubscriptionManagerPortType">
@@ -206,6 +224,26 @@
<soap:fault name="ResumeFailedFault" use="literal"/>
</fault>
</operation>
+
+ <operation name="GetMetadata" >
+ <soap:operation style="document"/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+
+ <operation name="Get" >
+ <soap:operation style="document"/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
</binding>