QPID-1582 : Pausable Subscription Manager capability + WSDL Improvements.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@748511 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 33 insertions, 115 deletions

diff --git a/java/management/client/src/main/java/muse.xml b/java/management/client/src/main/java/muse.xml
index cf651c34ac..4aac63ff3e 100644
--- a/java/management/client/src/main/java/muse.xml
+++ b/java/management/client/src/main/java/muse.xml
@@ -32,7 +32,7 @@
 		<java-router-class>org.apache.muse.ws.resource.impl.WsResourceRouter</java-router-class>

 		<logging>

 			<log-file>log/muse.log</log-file>

-			<log-level>SEVERE</log-level>

+			<log-level>FINE</log-level>

 		</logging>

 		<persistence>

 			<java-persistence-class>org.apache.muse.core.routing.RouterFilePersistence</java-persistence-class>

diff --git a/java/management/client/src/main/java/org/apache/qpid/management/wsdm/capabilities/MBeanCapability.java b/java/management/client/src/main/java/org/apache/qpid/management/wsdm/capabilities/MBeanCapability.java
index b3ce0f0587..37ecc0c031 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/wsdm/capabilities/MBeanCapability.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/wsdm/capabilities/MBeanCapability.java
@@ -179,10 +179,7 @@ public abstract class MBeanCapability extends AbstractWsResourceCapability
 						params, 

 						signature);

 			

-		return new Result(

-					output.getReturnCode(),

-					output.getStatusText(),

-					output.getOutputSection());

+		return new Result(output.getOutputSection());

 

 		} catch (InstanceNotFoundException exception)

 		{

diff --git a/java/management/client/src/main/java/org/apache/qpid/management/wsdm/capabilities/Result.java b/java/management/client/src/main/java/org/apache/qpid/management/wsdm/capabilities/Result.java
index b8e22b4bc7..a00d2665ae 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/wsdm/capabilities/Result.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/wsdm/capabilities/Result.java
@@ -29,11 +29,9 @@ import java.util.*;
  * 

  * @author Andrea Gazzarini

  */

-public class Result

+public final class Result

 {

-	private long _statusCode;

-	private String _statusText;

-	private Map<String,Object> _outputParameters;

+	private final Map<String,Object> _outputParameters;

 	

 	/**

 	 * Builds a new result DTO with the given parameters.

@@ -42,53 +40,11 @@ public class Result
 	 * @param statusText the status message.

 	 * @param outputParameters the output parameters.

 	 */

-	public Result(long statusCode, String statusText,Map<String, Object> outputParameters)

+	public Result(Map<String, Object> outputParameters)

 	{

-		this._statusCode = statusCode;

-		this._statusText = statusText;

 		this._outputParameters = outputParameters;

 	}

-	

-	/**

-	 * Returns the status code.

-	 * 

-	 * @return the status code.

-	 */

-	public long getStatusCode()

-	{

-		return _statusCode;

-	}

-	

-	/**

-	 * Sets the status code.

-	 * 

-	 * @param statusCode the status code.

-	 */

-	void setStatusCode(long statusCode)

-	{

-		this._statusCode = statusCode;

-	}

-	

-	/**

-	 * Returns the status text.

-	 * 

-	 * @return the status text.

-	 */

-	public String getStatusText()

-	{

-		return _statusText;

-	}

-	

-	/**

-	 * Sets the status text.

-	 * 

-	 * @param statusText the status text.

-	 */

-	void setStatusText(String statusText)

-	{

-		this._statusText = statusText;

-	}

-	

+		

 	/**

 	 * Returns the output parameterss.

 	 * 

@@ -98,14 +54,4 @@ public class Result
 	{

 		return _outputParameters;

 	}

-	

-	/**

-	 * Sets the output parameters.

-	 * 

-	 * @param outputParameters the output parameters.

-	 */

-	void setOutputParameters(Map<String, Object> outputParameters)

-	{

-		this._outputParameters = outputParameters;

-	}

-}

+}
\ No newline at end of file
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/serializer/InvocationResultSerializer.java b/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/serializer/InvocationResultSerializer.java
index 0af570eacf..b819d52ad1 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/serializer/InvocationResultSerializer.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/serializer/InvocationResultSerializer.java
@@ -38,8 +38,6 @@ import org.w3c.dom.Element;
  */

 public class InvocationResultSerializer implements Serializer 

 {	

-	private Serializer _longSerializer = SerializerRegistry.getInstance().getSerializer(long.class);

-	private Serializer _stringSerializer = SerializerRegistry.getInstance().getSerializer(String.class);

 	private Serializer _mapSerializer = SerializerRegistry.getInstance().getSerializer(Map.class);

 	

 	/**

@@ -51,26 +49,8 @@ public class InvocationResultSerializer implements Serializer
 	@SuppressWarnings("unchecked")

 	public Object fromXML(Element elementData) throws SoapFault 

 	{

-		long statusCode = 0;

-		String statusText = null;

-		Map<String, Object> outputSection = null;

-		

-		Element[] elements = XmlUtils.getAllElements(elementData);

-		for (Element element : elements)

-		{

-			if ("statusCode".equals(element.getNodeName()))

-			{

-				statusCode = (Long) _longSerializer.fromXML(element);

-			} else if ("statusText".equals(element.getNodeName()))

-			{

-				statusText = (String) _stringSerializer.fromXML(element);

-			} else if ("outputParameters".equals(element.getNodeName()))

-			{

-				outputSection = (Map<String, Object>) _mapSerializer.fromXML(element);

-			} 

-		}

-		

-		return new Result(statusCode,statusText,outputSection);

+		Element outputParameters = XmlUtils.getFirstElement(elementData);

+		return new Result((Map<String, Object>) _mapSerializer.fromXML(outputParameters));

 	}

 

 	/**

@@ -95,17 +75,11 @@ public class InvocationResultSerializer implements Serializer
 	{

 		Result result = (Result) obj;

 		Element root = XmlUtils.createElement(qname);

-		Element statusCode = SerializerRegistry.getInstance().getSerializer(long.class).toXML(result.getStatusCode(), new QName("statusCode"));

-		Element statusText = SerializerRegistry.getInstance().getSerializer(String.class).toXML(result.getStatusText(), new QName("statusText"));		

-		

-		root.appendChild(statusCode);

-		root.appendChild(statusText);

 		if (result.getOutputParameters() != null)

 		{

 			Element outputSection = SerializerRegistry.getInstance().getSerializer(Map.class).toXML(result.getOutputParameters(), new QName("outputParameters"));

 			root.appendChild(outputSection);

 		}

-		return root;

-		

+		return root;	

 	}

 }
\ No newline at end of file
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/serializer/MapSerializer.java b/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/serializer/MapSerializer.java
index 1d0d02c669..07e1dfdc56 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/serializer/MapSerializer.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/serializer/MapSerializer.java
@@ -62,25 +62,29 @@ public class MapSerializer implements Serializer
 	public Object fromXML(Element xml) throws SoapFault 

 	{

 		Map<Object,Object> result = new HashMap<Object,Object>();

-		Element[] children = XmlUtils.getAllElements(xml);

-		Serializer objectDeserializer = SerializerRegistry.getInstance().getSerializer(Object.class);

 

-		for (Element entry : children) 

+		if (xml != null)

 		{

-			Element[] keysAndValues = XmlUtils.getAllElements(entry);

-			Object key = null;

-			Object value = null;

-			for (Element element : keysAndValues) 

+			Element[] children = XmlUtils.getAllElements(xml);

+			Serializer objectDeserializer = SerializerRegistry.getInstance().getSerializer(Object.class);

+	

+			for (Element entry : children) 

 			{

-				if (Names.KEY.equals(element.getLocalName()))

-				{

-					key = _stringSerializer.fromXML(element);

-				} else if (Names.VALUE.equals(element.getLocalName()))

+				Element[] keysAndValues = XmlUtils.getAllElements(entry);

+				Object key = null;

+				Object value = null;

+				for (Element element : keysAndValues) 

 				{

-					value = objectDeserializer.fromXML(element);

+					if (Names.KEY.equals(element.getLocalName()))

+					{

+						key = _stringSerializer.fromXML(element);

+					} else if (Names.VALUE.equals(element.getLocalName()))

+					{

+						value = objectDeserializer.fromXML(element);

+					}

 				}

+				result.put(key, value);

 			}

-			result.put(key, value);

 		}

 		return result;

 	}

diff --git a/java/management/client/src/main/java/wsdl/QManWsResource.wsdl b/java/management/client/src/main/java/wsdl/QManWsResource.wsdl
index 20df95e2b1..16169c9b78 100644
--- a/java/management/client/src/main/java/wsdl/QManWsResource.wsdl
+++ b/java/management/client/src/main/java/wsdl/QManWsResource.wsdl
@@ -115,8 +115,6 @@
 

 			<xsd:complexType name="result">

 				<xsd:sequence>

-					<xsd:element name="statusCode" type="xsd:long" />

-					<xsd:element name="statusText" type="xsd:string" />

 					<xsd:element name="outputParameters" type="qman:map"/>

 				</xsd:sequence>

 			</xsd:complexType>

diff --git a/java/management/client/src/main/java/wsdl/WS-BaseNotification-1_3.wsdl b/java/management/client/src/main/java/wsdl/WS-BaseNotification-1_3.wsdl
index 8764c18fc9..d53bf60f3a 100644
--- a/java/management/client/src/main/java/wsdl/WS-BaseNotification-1_3.wsdl
+++ b/java/management/client/src/main/java/wsdl/WS-BaseNotification-1_3.wsdl
@@ -424,23 +424,22 @@ This document and the information contained herein is provided on an "AS IS" bas
 			<wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrf-rpw:InvalidResourcePropertyQNameFault" />

     	</wsdl:operation>

                   

-    </wsdl:portType> 

+<!--     </wsdl:portType> 

 

-<!-- ====== PausableSubscriptionManager PortType Definition ======= -->

    <wsdl:portType name="PausableSubscriptionManager">

-

+-->

       <!-- === PausableSubscriptionManager specific operations === -->

       <wsdl:operation name="PauseSubscription">

-         <wsdl:input  message="wsntw:PauseSubscriptionRequest"/>

-         <wsdl:output message="wsntw:PauseSubscriptionResponse"/>

+         <wsdl:input  message="wsntw:PauseSubscriptionRequest" wsa:Action="http://docs.oasis-open.org/wsn/bw-2/SubscriptionManager/PauseSubscriptionRequest"/>

+         <wsdl:output message="wsntw:PauseSubscriptionResponse" wsa:Action="http://docs.oasis-open.org/wsn/bw-2/SubscriptionManager/PauseSubscriptionResponse"/>

          <wsdl:fault  name="ResourceUnknownFault" 

                       message="wsrf-rw:ResourceUnknownFault" />

          <wsdl:fault  name="PauseFailedFault"

                       message="wsntw:PauseFailedFault" />        

       </wsdl:operation>

       <wsdl:operation name="ResumeSubscription">

-         <wsdl:input  message="wsntw:ResumeSubscriptionRequest"/>

-         <wsdl:output message="wsntw:ResumeSubscriptionResponse"/>

+         <wsdl:input  message="wsntw:ResumeSubscriptionRequest" wsa:Action="http://docs.oasis-open.org/wsn/bw-2/SubscriptionManager/ResumeSubscriptionRequest"/>

+         <wsdl:output message="wsntw:ResumeSubscriptionResponse" wsa:Action="http://docs.oasis-open.org/wsn/bw-2/SubscriptionManager/ResumeSubscriptionResponse"/>

          <wsdl:fault  name="ResourceUnknownFault" 

                       message="wsrf-rw:ResourceUnknownFault" />

          <wsdl:fault  name="ResumeFailedFault"