QPID-1581 : QMan Admin Console fixes.

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

6 files changed, 118 insertions, 53 deletions

diff --git a/qpid/java/management/client/src/main/java/muse.xml b/qpid/java/management/client/src/main/java/muse.xml
index 4aac63ff3e..cf651c34ac 100644
--- a/qpid/java/management/client/src/main/java/muse.xml
+++ b/qpid/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>FINE</log-level>

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

 		</logging>

 		<persistence>

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

diff --git a/qpid/java/management/client/src/main/java/org/apache/qpid/management/web/action/BrokerModel.java b/qpid/java/management/client/src/main/java/org/apache/qpid/management/web/action/BrokerModel.java
index 03e772b9b1..09b7309b96 100644
--- a/qpid/java/management/client/src/main/java/org/apache/qpid/management/web/action/BrokerModel.java
+++ b/qpid/java/management/client/src/main/java/org/apache/qpid/management/web/action/BrokerModel.java
@@ -30,12 +30,21 @@ import javax.management.ObjectName;
 

 import org.apache.qpid.management.Names;

 

+/**

+ * Value Object encapsulating a broker management domain model.

+ * 

+ * @author Andrea Gazzarini

+ */

 public class BrokerModel

 {

-	private Map<String, List<ObjectName>> objectsByType = new HashMap<String, List<ObjectName>>();

-	

-	private String id;

+	private Map<String, List<ObjectName>> _objectsByType = new HashMap<String, List<ObjectName>>();

+	private String _id;

 	

+	/**

+	 * Adds a new object to this domain model.

+	 * 

+	 * @param name the object name of the JMX entity.

+	 */

 	void addObject(ObjectName name)

 	{

 		String packageName = name.getKeyProperty(Names.PACKAGE);

@@ -44,37 +53,48 @@ public class BrokerModel
 		{

 			String fqn = packageName+"."+className;

 			

-			List<ObjectName> objects = objectsByType.get(fqn);

+			List<ObjectName> objects = _objectsByType.get(fqn);

 			if (objects == null)

 			{

 				objects = new ArrayList<ObjectName>();

-				objectsByType.put(fqn,objects);

+				_objectsByType.put(fqn,objects);

 			}

 			objects.add(name);		

 		}

 	}

 

+	/**

+	 * Gets the identifier of the owner of this model.

+	 * 

+	 * @return the identifier of the owner of this model.

+	 */

 	public String getId()

 	{

-		return id;

+		return _id;

 	}

 

+	/**

+	 * Sets the identifier of the owner of this model.

+	 * 

+	 * @param id the identifier of the owner of this model.

+	 */

 	public void setId(String id)

 	{

-		this.id = id;

+		this._id = id;

 	}

 	

-	public Set<String> getCategoryNames(){

-		return objectsByType.keySet();

+	public Set<String> getCategoryNames()

+	{

+		return _objectsByType.keySet();

 	}

 	

 	public List<ObjectName> getCategory(String name) 

 	{

-		return objectsByType.get(name);

+		return _objectsByType.get(name);

 	}

 	

 	public int getCategoryCount()

 	{

-		return objectsByType.keySet().size();

+		return _objectsByType.keySet().size();

 	}

 }
\ No newline at end of file
diff --git a/qpid/java/management/client/src/main/java/org/apache/qpid/management/web/action/BrokersManagementAction.java b/qpid/java/management/client/src/main/java/org/apache/qpid/management/web/action/BrokersManagementAction.java
index ae886767e2..509c86c08b 100644
--- a/qpid/java/management/client/src/main/java/org/apache/qpid/management/web/action/BrokersManagementAction.java
+++ b/qpid/java/management/client/src/main/java/org/apache/qpid/management/web/action/BrokersManagementAction.java
@@ -42,9 +42,10 @@ import org.apache.qpid.management.domain.services.QMan;
  * This controller is responsible to :

  * 

  * <ul>

- * <li> prepare data for the page that is showing all connected brokers.</li>.

- * </li> connect QMan with a broker on demand.

+ * 	<li> prepare data for the page that is showing all connected brokers.</li>.

+ * 	</li> connect QMan with a broker on demand.

  * </ul>

+ * 

  * @author Andrea Gazzarini

  */

 public class BrokersManagementAction extends HttpServlet

@@ -54,6 +55,11 @@ public class BrokersManagementAction extends HttpServlet
 	/**

 	 * Retrieves all connected brokers (their connection data) and prepare the model that

 	 * is then forwarded to the appropriate view page.

+	 * 

+	 * @param request the http request.

+	 * @param response the http response.

+	 * @throws ServletException in case of failure while forwarding to the view component.

+	 * @throws IOException in case of failure while forwarding to the view component.

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

@@ -87,7 +93,13 @@ public class BrokersManagementAction extends HttpServlet
 	}

 	

 	/**

-	 * Connects QMan with a new broker.

+	 * Connects QMan with a new broker and forwards to 

+	 * the brokers list view page.

+	 * 

+	 * @param request the http request.

+	 * @param response the http response.

+	 * @throws ServletException in case of failure while forwarding to the view component.

+	 * @throws IOException in case of failure while forwarding to the view component.

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

@@ -123,28 +135,32 @@ public class BrokersManagementAction extends HttpServlet
 				errors.add("Invalid value for \"virtualHost\" attribute. Must be not null.");				

 			}

 			

-			try{

+			try

+			{

 				port = Integer.parseInt(portString);

 			} catch(Exception exception) 

 			{

 				errors.add("Invalid value for \"port\" attribute. Must be not null and must be a number.");

 			}

 			

-			try{

+			try

+			{

 				initialPoolCapacity = Integer.parseInt(initialCapacityString);

 			} catch(Exception exception) 

 			{

 				errors.add("Invalid value for \"Initial Pool Capacity\" attribute. Must be not null and must be a number.");

 			}

 			

-			try{

+			try

+			{

 				maxPoolCapacity = Integer.parseInt(maxCapacityString);

 			} catch(Exception exception) 

 			{

 				errors.add("Invalid value for \"Max Pool Capacity\" attribute. Must be not null and must be a number.");

 			}

 

-			try{

+			try

+			{

 				maxWaitTimeout = Long.parseLong(maxWaitTimeoutString);

 			} catch(Exception exception) 

 			{

diff --git a/qpid/java/management/client/src/main/java/org/apache/qpid/management/web/action/WsdmPropertiesPerspectiveAction.java b/qpid/java/management/client/src/main/java/org/apache/qpid/management/web/action/WsdmPropertiesPerspectiveAction.java
index de479a00d6..e3a8eb50d7 100644
--- a/qpid/java/management/client/src/main/java/org/apache/qpid/management/web/action/WsdmPropertiesPerspectiveAction.java
+++ b/qpid/java/management/client/src/main/java/org/apache/qpid/management/web/action/WsdmPropertiesPerspectiveAction.java
@@ -43,15 +43,12 @@ import javax.xml.namespace.QName;
 import org.apache.muse.core.proxy.ProxyHandler;

 import org.apache.muse.core.proxy.ReflectionProxyHandler;

 import org.apache.muse.ws.addressing.EndpointReference;

-import org.apache.muse.ws.resource.remote.WsResourceClient;

 import org.apache.qpid.management.Names;

 import org.w3c.dom.Element;

 

 public class WsdmPropertiesPerspectiveAction extends HttpServlet

 {

 	private static final long serialVersionUID = -2411413147821629363L;

-	private static final Object [] WSDL_DIALECT = new Object[]{"http://schemas.xmlsoap.org/wsdl/"};

-	private static final Object [] RMD_DIALECT = new Object[]{"http://docs.oasis-open.org/wsrf/rmd-1"};

 	

 	private ProxyHandler proxyHandler;

 	

diff --git a/qpid/java/management/client/src/main/java/org/apache/qpid/management/web/action/WsdmRmdPerspectiveAction.java b/qpid/java/management/client/src/main/java/org/apache/qpid/management/web/action/WsdmRmdPerspectiveAction.java
index bafdc06633..b4c488e97c 100644
--- a/qpid/java/management/client/src/main/java/org/apache/qpid/management/web/action/WsdmRmdPerspectiveAction.java
+++ b/qpid/java/management/client/src/main/java/org/apache/qpid/management/web/action/WsdmRmdPerspectiveAction.java
@@ -35,6 +35,8 @@ import org.apache.muse.core.proxy.ProxyHandler;
 import org.apache.muse.core.proxy.ReflectionProxyHandler;

 import org.apache.muse.util.xml.XmlUtils;

 import org.apache.muse.ws.addressing.EndpointReference;

+import org.apache.muse.ws.metadata.WsxConstants;

+import org.apache.muse.ws.resource.metadata.WsrmdConstants;

 import org.apache.muse.ws.resource.remote.WsResourceClient;

 import org.apache.qpid.management.Names;

 import org.w3c.dom.Element;

@@ -42,7 +44,7 @@ import org.w3c.dom.Element;
 public class WsdmRmdPerspectiveAction extends HttpServlet

 {

 	private static final long serialVersionUID = -2411413147821629363L;

-	private static final Object [] DIALECT = new Object[]{"http://docs.oasis-open.org/wsrf/rmd-1"};

+	private static final Object [] RMD_DIALECT = new Object[]{WsrmdConstants.NAMESPACE_URI};

 	

 	private ProxyHandler proxyHandler;

 	

@@ -52,10 +54,14 @@ public class WsdmRmdPerspectiveAction extends HttpServlet
 	public void init() throws ServletException

 	{

 		proxyHandler  = new ReflectionProxyHandler();

-		proxyHandler.setAction("http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata");

-		proxyHandler.setRequestName(new QName("http://schemas.xmlsoap.org/ws/2004/09/mex", "GetMetadata", Names.PREFIX));

-		proxyHandler.setRequestParameterNames(new QName[]{new QName("http://schemas.xmlsoap.org/ws/2004/09/mex", "Dialect", Names.PREFIX)});

-		proxyHandler.setResponseName(new QName("http://schemas.xmlsoap.org/ws/2004/09/mex", "Metadata", Names.PREFIX));

+		proxyHandler.setAction(WsxConstants.GET_METADATA_URI);

+		proxyHandler.setRequestName(WsxConstants.GET_METADATA_QNAME);

+		proxyHandler.setRequestParameterNames(new QName[]{

+				new QName(

+						WsxConstants.NAMESPACE_URI, 

+						WsxConstants.DIALECT, 

+						WsxConstants.PREFIX)});

+		proxyHandler.setResponseName(WsxConstants.METADATA_QNAME);

 		proxyHandler.setReturnType(Element[].class);

 	}

 	

@@ -65,29 +71,49 @@ public class WsdmRmdPerspectiveAction extends HttpServlet
 	{

 		try 

 		{

-//			String resourceId = request.getParameter("resourceId");

-//			ObjectName objectName = new ObjectName(resourceId);

-//			

-//			String wsresourceid = objectName.getKeyProperty(Names.OBJECT_ID);

-//			EndpointReference resourceEndpointReference = new EndpointReference(getURI(request));

-//			resourceEndpointReference.addParameter(

-//					Names.RESOURCE_ID_QNAME, 

-//					wsresourceid);

-//			

-//			WsResourceClient resourceClient = new WsResourceClient(resourceEndpointReference);

-//			Element rmd = ((Element[])resourceClient.invoke(proxyHandler,DIALECT))[0];

-//						        		

-//        	String output = XmlUtils.toString(rmd);

-//        	

-//			String [] keyProperties = objectName.getKeyPropertyListString().split(",");

-//			

-//			request.setAttribute("resourceId", objectName);

-//			request.setAttribute("nameAttributes",keyProperties);

-//			request.setAttribute("rmd",output);

-			RequestDispatcher dispatcher = request.getRequestDispatcher("/tbd.jsp");

+			String resourceId = request.getParameter("resourceId");

+			ObjectName objectName = new ObjectName(resourceId);

+

+			String wsresourceid = objectName.getKeyProperty(Names.OBJECT_ID);

+			EndpointReference resourceEndpointReference = new EndpointReference(getURI(request));

+			

+			resourceEndpointReference.addParameter(

+					Names.RESOURCE_ID_QNAME, 

+					wsresourceid);

+			

+			WsResourceClient resourceClient = new WsResourceClient(resourceEndpointReference);

+			Element rmd = ((Element[])resourceClient.invoke(proxyHandler,RMD_DIALECT))[0];

+						

+//        	NodeList nodelist = wsdl.getChildNodes();

+//        	Element definitions = null;

+//        	for (int i = 0; i < nodelist.getLength(); i++)

+//        	{

+//        		Node node = nodelist.item(i);

+//        		switch (node.getNodeType())

+//        		{

+//        			case Node.ELEMENT_NODE:

+//        			{

+//        				Element element = (Element) node;

+//        				if (element.getNodeName().indexOf("definitions") != -1)

+//        				{

+//        					definitions = element;

+//        					break;

+//        				}

+//        			}

+//        		}

+//        	}

+        		

+        	String output = XmlUtils.toString(rmd);

+        	

+			String [] keyProperties = objectName.getKeyPropertyListString().split(",");

+			

+			request.setAttribute("resourceId", resourceId);

+			request.setAttribute("nameAttributes",keyProperties);

+			request.setAttribute("rmd",output);

+			RequestDispatcher dispatcher = request.getRequestDispatcher("/wsdm_rmd_perspective.jsp");

 			dispatcher.forward(request,response); 

 		} catch(Exception exception)

-		{

+		{			

 			request.setAttribute("errorMessage","Unable to detect the exact cause Please look at the reported stack trace below.");

 			request.setAttribute("exception",exception);

 			RequestDispatcher dispatcher = request.getRequestDispatcher("/error_page.jsp");

diff --git a/qpid/java/management/client/src/main/java/org/apache/qpid/management/web/action/WsdmWsdlPerspectiveAction.java b/qpid/java/management/client/src/main/java/org/apache/qpid/management/web/action/WsdmWsdlPerspectiveAction.java
index 9b47fe95b9..77a5237037 100644
--- a/qpid/java/management/client/src/main/java/org/apache/qpid/management/web/action/WsdmWsdlPerspectiveAction.java
+++ b/qpid/java/management/client/src/main/java/org/apache/qpid/management/web/action/WsdmWsdlPerspectiveAction.java
@@ -35,6 +35,7 @@ import org.apache.muse.core.proxy.ProxyHandler;
 import org.apache.muse.core.proxy.ReflectionProxyHandler;

 import org.apache.muse.util.xml.XmlUtils;

 import org.apache.muse.ws.addressing.EndpointReference;

+import org.apache.muse.ws.metadata.WsxConstants;

 import org.apache.muse.ws.resource.remote.WsResourceClient;

 import org.apache.qpid.management.Names;

 import org.w3c.dom.Element;

@@ -44,7 +45,7 @@ import org.w3c.dom.NodeList;
 public class WsdmWsdlPerspectiveAction extends HttpServlet

 {

 	private static final long serialVersionUID = -2411413147821629363L;

-	private static final Object [] WSDL_DIALECT = new Object[]{"http://schemas.xmlsoap.org/wsdl/"};

+	private static final Object [] WSDL_DIALECT = new Object[]{WsxConstants.WSDL_DIALECT};

 	

 	private ProxyHandler proxyHandler;

 	

@@ -54,10 +55,14 @@ public class WsdmWsdlPerspectiveAction extends HttpServlet
 	public void init() throws ServletException

 	{

 		proxyHandler  = new ReflectionProxyHandler();

-		proxyHandler.setAction("http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata");

-		proxyHandler.setRequestName(new QName("http://schemas.xmlsoap.org/ws/2004/09/mex", "GetMetadata", Names.PREFIX));

-		proxyHandler.setRequestParameterNames(new QName[]{new QName("http://schemas.xmlsoap.org/ws/2004/09/mex", "Dialect", Names.PREFIX)});

-		proxyHandler.setResponseName(new QName("http://schemas.xmlsoap.org/ws/2004/09/mex", "Metadata", Names.PREFIX));

+		proxyHandler.setAction(WsxConstants.GET_METADATA_URI);

+		proxyHandler.setRequestName(WsxConstants.GET_METADATA_QNAME);

+		proxyHandler.setRequestParameterNames(new QName[]{

+				new QName(

+						WsxConstants.NAMESPACE_URI, 

+						WsxConstants.DIALECT, 

+						WsxConstants.PREFIX)});

+		proxyHandler.setResponseName(WsxConstants.METADATA_QNAME);

 		proxyHandler.setReturnType(Element[].class);

 	}

 	

@@ -72,6 +77,7 @@ public class WsdmWsdlPerspectiveAction extends HttpServlet
 

 			String wsresourceid = objectName.getKeyProperty(Names.OBJECT_ID);

 			EndpointReference resourceEndpointReference = new EndpointReference(getURI(request));

+			

 			resourceEndpointReference.addParameter(

 					Names.RESOURCE_ID_QNAME, 

 					wsresourceid);