From c31de6ea2d65a3e8cb8002de2b6e608de972e0ea Mon Sep 17 00:00:00 2001
From: Andrea Gazzarini <agazzarini@apache.org>
Date: Mon, 16 Feb 2009 10:40:39 +0000
Subject: QPID-1604 : Implementation of wrsf-rp:PutResourcePropertyDocument
 interface

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@744885 13f79535-47bb-0310-9956-ffa450edef68
---
 java/management/client/src/main/java/muse.xml      |  12 +--
 .../management/wsdm/capabilities/WsdlBuilder.java  |   3 +-
 .../client/src/main/java/wsdl/QManAdapter.rmd      |  25 -----
 .../client/src/main/java/wsdl/QManAdapter.wsdl     |  21 +---
 .../client/src/main/java/wsdl/QManWsResource.rmd   |  12 ++-
 .../client/src/main/java/wsdl/QManWsResource.wsdl  | 113 +++++----------------
 6 files changed, 41 insertions(+), 145 deletions(-)

(limited to 'java/management/client/src/main')

diff --git a/java/management/client/src/main/java/muse.xml b/java/management/client/src/main/java/muse.xml
index 2b047d01f7..d2f499cef9 100644
--- a/java/management/client/src/main/java/muse.xml
+++ b/java/management/client/src/main/java/muse.xml
@@ -143,14 +143,6 @@
 			<capability-uri>http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata</capability-uri>
 			<java-capability-class>org.apache.qpid.management.wsdm.capabilities.QManMetadataExchangeCapability</java-capability-class>
 		</capability>
-		<capability>
-			<capability-uri>http://docs.oasis-open.org/wsrf/rlw-2/ImmediateResourceTermination</capability-uri>
-			<java-capability-class>org.apache.muse.ws.resource.lifetime.impl.SimpleImmediateTermination</java-capability-class>
-		</capability>
-		<capability>
-			<capability-uri>http://docs.oasis-open.org/wsrf/rlw-2/ScheduledResourceTermination</capability-uri>
-			<java-capability-class>org.apache.muse.ws.resource.lifetime.impl.SimpleScheduledTermination</java-capability-class>
-		</capability>
 		<capability>
 			<capability-uri>http://docs.oasis-open.org/wsrf/rpw-2/Get</capability-uri>
 			<java-capability-class>org.apache.muse.ws.resource.properties.get.impl.SimpleGetCapability</java-capability-class>
@@ -163,6 +155,10 @@
 			<capability-uri>http://docs.oasis-open.org/wsrf/rpw-2/Set</capability-uri>
 			<java-capability-class>org.apache.muse.ws.resource.properties.set.impl.SimpleSetCapability</java-capability-class>
 		</capability>
+		<capability>
+			<capability-uri>http://docs.oasis-open.org/wsrf/rpw-2/Put</capability-uri>
+			<java-capability-class>org.apache.muse.ws.resource.properties.set.impl.SimpleSetCapability</java-capability-class>
+		</capability>
 	</resource-type>
 	<resource-type>
 		<context-path>ServiceGroupEntry</context-path>
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/wsdm/capabilities/WsdlBuilder.java b/java/management/client/src/main/java/org/apache/qpid/management/wsdm/capabilities/WsdlBuilder.java
index bce0e30e62..02b25eb02f 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/wsdm/capabilities/WsdlBuilder.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/wsdm/capabilities/WsdlBuilder.java
@@ -96,7 +96,7 @@ class WsdlBuilder implements IArtifactBuilder {
 			propertyRef.setAttribute(
 					"ref", 
 					Names.PREFIX+":"+attributeMetadata.getName());
-			
+			propertyRef.setAttribute("minOccurs", "0");		
 			wsrpProperties.appendChild(propertyRef);
 			
 		} catch(Exception exception)
@@ -197,6 +197,7 @@ class WsdlBuilder implements IArtifactBuilder {
 			Element propertyDeclaration = XmlUtils.createElement(_document, XSD_ELEMENT_QNAME);
 			propertyDeclaration.setAttribute("name",attributeName);
 			propertyDeclaration.setAttribute("type", serializer.getXmlType(Class.forName(type)));
+				
 			return propertyDeclaration;
 		}			
 	}
diff --git a/java/management/client/src/main/java/wsdl/QManAdapter.rmd b/java/management/client/src/main/java/wsdl/QManAdapter.rmd
index 0663acb548..31e921a06b 100644
--- a/java/management/client/src/main/java/wsdl/QManAdapter.rmd
+++ b/java/management/client/src/main/java/wsdl/QManAdapter.rmd
@@ -4,7 +4,6 @@
 		xmlns:wsrf-sg="http://docs.oasis-open.org/wsrf/sg-2"
 		xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/rp-2"
 		xmlns:wsrl="http://docs.oasis-open.org/wsrf/rl-2" 	
-		xmlns:myns="http://ws.apache.org/muse/test/wsrf" 
 	    xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2" 
 	    xmlns:wst="http://docs.oasis-open.org/wsn/t-1" 
 	    xmlns:muws1="http://docs.oasis-open.org/wsdm/muws1-2.xsd" 
@@ -20,33 +19,9 @@
 		</Property>
 		<Property name="wsrf-sg:Entry" modifiability="read-only" mutability="mutable" />
 		<Property name="wsrf-rp:QueryExpressionDialect" modifiability="read-only" mutability="constant" />
-
-<!--
-		<Property name="wsrl:CurrentTime" modifiability="read-only" mutability="mutable" />
-		
-		<Property name="wsrl:TerminationTime" modifiability="read-only" mutability="mutable" />
--->		
 		<Property name="wsnt:FixedTopicSet" modifiability="read-only" mutability="constant" />
-		
 		<Property name="wst:TopicSet" modifiability="read-only" mutability="mutable" />
-		
 		<Property name="wsnt:TopicExpression" modifiability="read-only" mutability="mutable" />
-		
 		<Property name="wsnt:TopicExpressionDialect" modifiability="read-only" mutability="mutable" />
-<!--		
-		<Property name="muws1:ResourceId" modifiability="read-only" mutability="constant" />
-		
-		<Property name="muws1:ManageabilityCapability" modifiability="read-only" mutability="constant" />
-		
-		<Property name="muws2:Caption" modifiability="read-only" mutability="mutable" />
-		
-		<Property name="muws2:Description" modifiability="read-only" mutability="mutable" />
-		
-		<Property name="muws2:Version" modifiability="read-only" mutability="constant" />
-		
-		<Property name="myns:ServerName" modifiability="read-only" mutability="constant"/>
-		
-		<Property name="myns:MessageInterval" modifiability="read-write" mutability="mutable"/>
--->		
 	</MetadataDescriptor>
 </Definitions>
diff --git a/java/management/client/src/main/java/wsdl/QManAdapter.wsdl b/java/management/client/src/main/java/wsdl/QManAdapter.wsdl
index 9a956c22a2..4b26862604 100644
--- a/java/management/client/src/main/java/wsdl/QManAdapter.wsdl
+++ b/java/management/client/src/main/java/wsdl/QManAdapter.wsdl
@@ -61,32 +61,13 @@
 			<xsd:element name="WsDmAdapterResourceProperties">
 				<xsd:complexType>
 					<xsd:sequence>
-
-<!-- 
-						<xsd:element ref="wsrf-rl:CurrentTime" />
-						<xsd:element ref="wsrf-rl:TerminationTime" />
--->	
 						<xsd:element ref="wsrf-sg:Entry"/>
 						<xsd:element ref="wsrf-sg:MembershipContentRule"/>
-						<xsd:element
-							ref="wsrf-rp:QueryExpressionDialect" minOccurs="0"
-							maxOccurs="unbounded" />
-						
+						<xsd:element ref="wsrf-rp:QueryExpressionDialect" minOccurs="0" maxOccurs="unbounded" />
 						<xsd:element ref="wsnt:FixedTopicSet" />
 						<xsd:element ref="wst:TopicSet" minOccurs="0" />
 						<xsd:element ref="wsnt:TopicExpression" minOccurs="0" maxOccurs="unbounded" />
 						<xsd:element ref="wsnt:TopicExpressionDialect" minOccurs="0" maxOccurs="unbounded" />
-<!-- 
-						<xsd:element ref="muws1:ResourceId" />
-						<xsd:element ref="muws1:ManageabilityCapability"
-							minOccurs="0" maxOccurs="unbounded" />
-						<xsd:element ref="muws2:Caption" minOccurs="0"
-							maxOccurs="unbounded" />
-						<xsd:element ref="muws2:Description"
-							minOccurs="0" maxOccurs="unbounded" />
-						<xsd:element ref="muws2:Version" minOccurs="0" />
-						<xsd:element ref="muws2:OperationalStatus" />
--->						
 					</xsd:sequence>
 				</xsd:complexType>
 			</xsd:element>
diff --git a/java/management/client/src/main/java/wsdl/QManWsResource.rmd b/java/management/client/src/main/java/wsdl/QManWsResource.rmd
index 397a134a79..c4944440e0 100644
--- a/java/management/client/src/main/java/wsdl/QManWsResource.rmd
+++ b/java/management/client/src/main/java/wsdl/QManWsResource.rmd
@@ -1,13 +1,17 @@
 <?xml version="1.0"?>
 <Definitions xmlns="http://docs.oasis-open.org/wsrf/rmd-1" >
 	<MetadataDescriptor 
-						xmlns:wsrl="http://docs.oasis-open.org/wsrf/rl-2" 
-                        xmlns:qman="http://amqp.apache.org/qpid/management/qman" 
+						xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/rp-2"
+						xmlns:wsrl="http://docs.oasis-open.org/wsrf/rl-2" 	
+					    xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2" 
+					    xmlns:wst="http://docs.oasis-open.org/wsn/t-1" 
+					    xmlns:muws1="http://docs.oasis-open.org/wsdm/muws1-2.xsd" 
+					    xmlns:muws2="http://docs.oasis-open.org/wsdm/muws2-2.xsd"
+						xmlns:qman="http://amqp.apache.org/qpid/management/qman"                        
                         name="QManWsResourceMetadata" 
 	                    interface="qman:QManWsResourcePortType" 
 	                    wsdlLocation="http://ws.apache.org/muse/test/wsrf QManWsResource.wsdl" >
-		<Property name="wsrl:CurrentTime" modifiability="read-only" mutability="mutable" />
-		<Property name="wsrl:TerminationTime" modifiability="read-only" mutability="mutable" />
+		<Property name="wsrf-rp:QueryExpressionDialect" modifiability="read-only" mutability="constant" />
 	</MetadataDescriptor>
 	
 </Definitions>
\ No newline at end of file
diff --git a/java/management/client/src/main/java/wsdl/QManWsResource.wsdl b/java/management/client/src/main/java/wsdl/QManWsResource.wsdl
index f3ad6c6012..69647521ba 100644
--- a/java/management/client/src/main/java/wsdl/QManWsResource.wsdl
+++ b/java/management/client/src/main/java/wsdl/QManWsResource.wsdl
@@ -54,9 +54,7 @@
 			<xsd:element name="QManWsResourceProperties">
 				<xsd:complexType>
 					<xsd:sequence>
-						<xsd:element ref="wsrf-rl:CurrentTime" />
-						<xsd:element ref="wsrf-rl:TerminationTime" />
-						<xsd:element ref="wsrf-rp:QueryExpressionDialect" minOccurs="0" maxOccurs="unbounded"/>
+						<xsd:element ref="wsrf-rp:QueryExpressionDialect" minOccurs="0" maxOccurs="unbounded" />
 					</xsd:sequence>
 				</xsd:complexType>
 			</xsd:element>
@@ -118,17 +116,14 @@
 	<wsdl:message name="ResourceUnavailableFault">
 		<wsdl:part name="ResourceUnavailableFault" element="wsrf-r:ResourceUnavailableFault" />
 	</wsdl:message>
-	<wsdl:message name="SetTerminationTimeRequest">
-		<wsdl:part name="SetTerminationTimeRequest" element="wsrf-rl:SetTerminationTime" />
+	<wsdl:message name="UnableToPutResourcePropertyDocumentFault">
+		<wsdl:part name="UnableToPutResourcePropertyDocumentFault" element="wsrf-rp:UnableToPutResourcePropertyDocumentFault" />
 	</wsdl:message>
-	<wsdl:message name="SetTerminationTimeResponse">
-		<wsdl:part name="SetTerminationTimeResponse" element="wsrf-rl:SetTerminationTimeResponse" />
+	<wsdl:message name="PutResourcePropertyDocumentRequest">
+		<wsdl:part name="PutResourcePropertyDocumentRequest" element="wsrf-rp:PutResourcePropertyDocument"/>
 	</wsdl:message>
-	<wsdl:message name="UnableToSetTerminationTimeFault">
-		<wsdl:part name="UnableToSetTerminationTimeFault" element="wsrf-rl:UnableToSetTerminationTimeFault" />
-	</wsdl:message>
-	<wsdl:message name="TerminationTimeChangeRejectedFault">
-		<wsdl:part name="TerminationTimeChangeRejectedFault" element="wsrf-rl:TerminationTimeChangeRejectedFault" />
+	<wsdl:message name="PutResourcePropertyDocumentResponse">
+		<wsdl:part name="PutResourcePropertyDocumentResponse" element="wsrf-rp:PutResourcePropertyDocumentResponse"/>
 	</wsdl:message>
 	<wsdl:message name="GetResourcePropertyDocumentRequest">
 		<wsdl:part name="GetResourcePropertyDocumentRequest" element="wsrf-rp:GetResourcePropertyDocument"/>
@@ -196,33 +191,6 @@
 				name="GetMetadataResponseMsg" 
 				message="qman:GetMetadataResponseMsg"/>
 		</wsdl:operation>
-		<wsdl:operation name="Destroy">
-			<wsdl:input 
-				wsa:Action="http://docs.oasis-open.org/wsrf/rlw-2/ImmediateResourceTermination/DestroyRequest" 
-			    name="DestroyRequest" 
-			    message="qman:DestroyRequest" />
-			<wsdl:output 
-				wsa:Action="http://docs.oasis-open.org/wsrf/rlw-2/ImmediateResourceTermination/DestroyResponse" 
-				name="DestroyResponse" 
-				message="qman:DestroyResponse" />
-			<wsdl:fault name="ResourceNotDestroyedFault" message="qman:ResourceNotDestroyedFault" />
-			<wsdl:fault name="ResourceUnknownFault" message="qman:ResourceUnknownFault" />
-			<wsdl:fault name="ResourceUnavailableFault" message="qman:ResourceUnavailableFault"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetTerminationTime">
-			<wsdl:input 
-				wsa:Action="http://docs.oasis-open.org/wsrf/rlw-2/ScheduledResourceTermination/SetTerminationTimeRequest" 
-			    name="SetTerminationTimeRequest" 
-			    message="qman:SetTerminationTimeRequest" />
-			<wsdl:output 
-				wsa:Action="http://docs.oasis-open.org/wsrf/rlw-2/ScheduledResourceTermination/SetTerminationTimeResponse" 
-			    name="SetTerminationTimeResponse" 
-			    message="qman:SetTerminationTimeResponse" />
-			<wsdl:fault name="UnableToSetTerminationTimeFault" message="qman:UnableToSetTerminationTimeFault" />
-			<wsdl:fault name="ResourceUnknownFault" message="qman:ResourceUnknownFault" />
-			<wsdl:fault name="ResourceUnavailableFault" message="qman:ResourceUnavailableFault"/>
-			<wsdl:fault name="TerminationTimeChangeRejectedFault" message="qman:TerminationTimeChangeRejectedFault" />
-		</wsdl:operation>
 		<wsdl:operation name="GetResourcePropertyDocument">
 			<wsdl:input 
 				wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/GetResourcePropertyDocument/GetResourcePropertyDocumentRequest" 
@@ -234,6 +202,19 @@
 				message="qman:GetResourcePropertyDocumentResponse"/>
 			<wsdl:fault name="ResourceUnknownFault" message="qman:ResourceUnknownFault"/>
 			<wsdl:fault name="ResourceUnavailableFault" message="qman:ResourceUnavailableFault"/>
+		</wsdl:operation>
+			<wsdl:operation name="PutResourcePropertyDocument">
+			<wsdl:input 
+				wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/PutResourcePropertyDocument/PutResourcePropertyDocumentRequest" 
+			    name="PutResourcePropertyDocumentRequest" 
+			    message="qman:PutResourcePropertyDocumentRequest"/>
+			<wsdl:output 
+				wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/PutResourcePropertyDocument/PutResourcePropertyDocumentResponse" 
+				name="PutResourcePropertyDocumentResponse" 
+				message="qman:PutResourcePropertyDocumentResponse"/>
+			<wsdl:fault name="ResourceUnknownFault" message="qman:ResourceUnknownFault"/>
+			<wsdl:fault name="ResourceUnavailableFault" message="qman:ResourceUnavailableFault"/>
+			<wsdl:fault name="UnableToPutResourcePropertyDocumentFault" message="qman:UnableToPutResourcePropertyDocumentFault"/>
 		</wsdl:operation>
 		<wsdl:operation name="GetResourceProperty">
 			<wsdl:input 
@@ -308,50 +289,18 @@
 					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
 			</wsdl:output>
 		</wsdl:operation>
-        <wsdl:operation name="Destroy">
-        	<wsdl-soap:operation soapAction="Destroy"/>
-        	<wsdl:input name="DestroyRequest">
+        <wsdl:operation name="PutResourcePropertyDocument">
+        	<wsdl-soap:operation soapAction="PutResourcePropertyDocument"/>
+        	<wsdl:input name="PutResourcePropertyDocumentRequest">
         		<wsdl-soap:body 
         			use="literal"
 					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
         	</wsdl:input>
-        	<wsdl:output name="DestroyResponse">
-        		<wsdl-soap:body 
-        			use="literal"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-        	</wsdl:output>
-        	<wsdl:fault name="ResourceNotDestroyedFault">
-        		<wsdl-soap:fault 
-        			use="literal" 
-        			name="ResourceNotDestroyedFault"/>
-        	</wsdl:fault>
-        	<wsdl:fault name="ResourceUnknownFault">
-        		<wsdl-soap:fault 
-        			use="literal" 
-        			name="ResourceUnknownFault"/>
-        	</wsdl:fault>
-        	<wsdl:fault name="ResourceUnavailableFault">
-        		<wsdl-soap:fault 
-        			use="literal" 
-        			name="ResourceUnavailableFault"/>
-        	</wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="SetTerminationTime">
-        	<wsdl-soap:operation soapAction="SetTerminationTime"/>
-        	<wsdl:input name="SetTerminationTimeRequest">
-        		<wsdl-soap:body 
-        			use="literal"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-        	</wsdl:input><wsdl:output name="SetTerminationTimeResponse">
+        		<wsdl:output name="PutResourcePropertyDocumentResponse">
         		<wsdl-soap:body 
         			use="literal" 
 					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
         	</wsdl:output>
-        	<wsdl:fault name="UnableToSetTerminationTimeFault">
-        		<wsdl-soap:fault 
-        			use="literal" 
-        			name="UnableToSetTerminationTimeFault"/>
-        	</wsdl:fault>
         	<wsdl:fault name="ResourceUnknownFault">
         		<wsdl-soap:fault 
         			use="literal" 
@@ -362,10 +311,10 @@
         			use="literal" 
         			name="ResourceUnavailableFault"/>
         	</wsdl:fault>
-        	<wsdl:fault name="TerminationTimeChangeRejectedFault">
+        	<wsdl:fault name="UnableToPutResourcePropertyDocumentFault">
         		<wsdl-soap:fault 
         			use="literal" 
-        			name="TerminationTimeChangeRejectedFault"/>
+        			name="UnableToPutResourcePropertyDocumentFault"/>
         	</wsdl:fault>
         </wsdl:operation>
         <wsdl:operation name="GetResourcePropertyDocument">
@@ -523,16 +472,6 @@
         			name="SetResourcePropertyRequestFailedFault"/>
         	</wsdl:fault>
         </wsdl:operation>
-        <wsdl:operation name="GetMetadata">
-        	<wsdl-soap:operation
-        		soapAction="http://ws.apache.org/muse/test/wsrf/GetMetadata" />
-        	<wsdl:input name="GetMetadataMsg">
-        		<wsdl-soap:body use="literal" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-        	</wsdl:input>
-        	<wsdl:output name="GetMetadataResponseMsg">
-        		<wsdl-soap:body use="literal" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-        	</wsdl:output>
-        </wsdl:operation>
 	</wsdl:binding>
 	<wsdl:service name="QManWsResourceService">
     	<wsdl:port name="QManWsResourcePort" binding="qman:QManWsResourceBinding">
-- 
cgit v1.2.1