[jboss-svn-commits] JBL Code SVN: r17958 - labs/jbossesb/workspace/bramley/product/tools/console/management-web/src/main/webapp.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Jan 18 12:00:40 EST 2008


Author: tfennelly
Date: 2008-01-18 12:00:40 -0500 (Fri, 18 Jan 2008)
New Revision: 17958

Modified:
   labs/jbossesb/workspace/bramley/product/tools/console/management-web/src/main/webapp/collect.jsp
   labs/jbossesb/workspace/bramley/product/tools/console/management-web/src/main/webapp/collectcommands.jsp
   labs/jbossesb/workspace/bramley/product/tools/console/management-web/src/main/webapp/invoke.jsp
   labs/jbossesb/workspace/bramley/product/tools/console/management-web/src/main/webapp/manage.jsp
Log:
Fixup of console JSPs that I broke.

Modified: labs/jbossesb/workspace/bramley/product/tools/console/management-web/src/main/webapp/collect.jsp
===================================================================
--- labs/jbossesb/workspace/bramley/product/tools/console/management-web/src/main/webapp/collect.jsp	2008-01-18 16:29:10 UTC (rev 17957)
+++ labs/jbossesb/workspace/bramley/product/tools/console/management-web/src/main/webapp/collect.jsp	2008-01-18 17:00:40 UTC (rev 17958)
@@ -1,41 +1,37 @@
-<%@page import="org.jboss.soa.esb.message.body.content.BytesBody"%>
+<%@page import="org.hibernate.Session"%>
 <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
 <%@ page session="true" %>
 <%@ page import="
+		org.hibernate.Transaction,
+		org.jboss.internal.soa.esb.couriers.DeliverOnlyCourier,
 		org.jboss.soa.esb.addressing.EPR,
+		org.jboss.soa.esb.client.ServiceInvoker,
 		org.jboss.soa.esb.couriers.CourierFactory,
-		org.jboss.soa.esb.couriers.CourierUtil,			
-		org.jboss.internal.soa.esb.couriers.DeliverOnlyCourier,
+		org.jboss.soa.esb.couriers.CourierUtil,
 		org.jboss.soa.esb.listeners.RegistryUtil,
 		org.jboss.soa.esb.message.Message,
+		org.jboss.soa.esb.message.body.content.BytesBody,
 		org.jboss.soa.esb.message.body.content.MessageBodyTypeNames,
-		org.jboss.soa.esb.message.format.MessageFactory,
-		org.jboss.soa.esb.monitoring.server.FilerAction,
-		java.net.URI,
-		java.util.*
+		org.jboss.soa.esb.message.format.MessageFactory
 "%>
+<%@ page import="org.jboss.soa.esb.monitoring.MonitoringSessionFactory" %>
+<%@ page import="org.jboss.soa.esb.monitoring.pojo.JMXAttribute" %>
+<%@ page import="org.jboss.soa.esb.monitoring.server.FilerAction" %>
+<%@ page import="org.jboss.soa.esb.monitoring.server.StatisticsHelper" %>
+<%@ page import="java.net.URI" %>
+<%@ page import="java.util.Iterator" %>
+<%@ page import="java.util.List" %>
+<%@ page import="java.util.UUID" %>
 <%
-List list = RegistryUtil.getEprs(FilerAction.INTERNAL_CATEGORY, FilerAction.DATA_COLLECTOR_SERVICE_ACTION_NAME);
-if (list != null) {
-	for (int i = 0; i < list.size(); i++) {
-		EPR epr = (EPR)list.get(i); 
-		Message esbMessage = MessageFactory.getInstance().getMessage();
-		esbMessage.getProperties().setProperty(MessageBodyTypeNames.COMMAND_TYPE, MessageBodyTypeNames.STATISTICS_REQUEST); 
+ServiceInvoker invoker = new ServiceInvoker(FilerAction.INTERNAL_CATEGORY, FilerAction.DATA_COLLECTOR_SERVICE_ACTION_NAME);
+Message esbMessage = MessageFactory.getInstance().getMessage();
+URI uri = new URI(UUID.randomUUID().toString());
 
-		esbMessage.getBody().add(BytesBody.BYTES_LOCATION, MessageBodyTypeNames.STATISTICS_REQUEST.getBytes());
-		
-	    URI uri = new URI(UUID.randomUUID().toString());
-	    esbMessage.getHeader().getCall().setMessageID(uri);
+esbMessage.getProperties().setProperty(MessageBodyTypeNames.COMMAND_TYPE, MessageBodyTypeNames.STATISTICS_REQUEST); 
+esbMessage.getBody().add(BytesBody.BYTES_LOCATION, MessageBodyTypeNames.STATISTICS_REQUEST.getBytes());
+esbMessage.getHeader().getCall().setMessageID(uri);
 
-		DeliverOnlyCourier sender = null;
-		try {
-			sender = CourierFactory.getCourier(epr);
-		    sender.deliver(esbMessage);
-		} finally {
-			CourierUtil.cleanCourier(sender);
-		}
-	}
-}
+invoker.deliverAsync(esbMessage);
 
 RequestDispatcher disp;
 disp = getServletContext().getRequestDispatcher("/index.jsp"); 

Modified: labs/jbossesb/workspace/bramley/product/tools/console/management-web/src/main/webapp/collectcommands.jsp
===================================================================
--- labs/jbossesb/workspace/bramley/product/tools/console/management-web/src/main/webapp/collectcommands.jsp	2008-01-18 16:29:10 UTC (rev 17957)
+++ labs/jbossesb/workspace/bramley/product/tools/console/management-web/src/main/webapp/collectcommands.jsp	2008-01-18 17:00:40 UTC (rev 17958)
@@ -1,42 +1,31 @@
-<%@page import="org.jboss.soa.esb.message.body.content.BytesBody"%>
+<%@page import="org.jboss.internal.soa.esb.couriers.DeliverOnlyCourier"%>
 <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
 <%@ page session="true" %>
 <%@ page import="
 		org.jboss.soa.esb.addressing.EPR,
+		org.jboss.soa.esb.client.ServiceInvoker,
 		org.jboss.soa.esb.couriers.CourierFactory,
-		org.jboss.soa.esb.couriers.CourierUtil,		
-		org.jboss.internal.soa.esb.couriers.DeliverOnlyCourier,
+		org.jboss.soa.esb.couriers.CourierUtil,
 		org.jboss.soa.esb.listeners.RegistryUtil,
 		org.jboss.soa.esb.message.Message,
+		org.jboss.soa.esb.message.body.content.BytesBody,
 		org.jboss.soa.esb.message.body.content.MessageBodyTypeNames,
 		org.jboss.soa.esb.message.format.MessageFactory,
 		org.jboss.soa.esb.monitoring.server.FilerAction,
-		java.net.URI,
-		java.util.*
+		java.net.URI
 "%>
+<%@ page import="java.util.List" %>
+<%@ page import="java.util.UUID" %>
 <%
-List list = RegistryUtil.getEprs(FilerAction.INTERNAL_CATEGORY, FilerAction.DATA_COLLECTOR_SERVICE_ACTION_NAME);
-if (list != null) {
-	for (int i = 0; i < list.size(); i++) {
-		EPR epr = (EPR)list.get(i); 
-		Message esbMessage = MessageFactory.getInstance().getMessage();
-		esbMessage.getProperties().setProperty(MessageBodyTypeNames.COMMAND_TYPE, MessageBodyTypeNames.STATISTICS_REQUEST); 
+ServiceInvoker invoker = new ServiceInvoker(FilerAction.INTERNAL_CATEGORY, FilerAction.DATA_COLLECTOR_SERVICE_ACTION_NAME);
+Message esbMessage = MessageFactory.getInstance().getMessage();
+URI uri = new URI(UUID.randomUUID().toString());
 
-		esbMessage.getBody().add(BytesBody.BYTES_LOCATION, MessageBodyTypeNames.STATISTICS_REQUEST.getBytes());
-		
-	    URI uri = new URI(UUID.randomUUID().toString());
-	    esbMessage.getHeader().getCall().setMessageID(uri);
+esbMessage.getProperties().setProperty(MessageBodyTypeNames.COMMAND_TYPE, MessageBodyTypeNames.STATISTICS_REQUEST);
+esbMessage.getBody().add(BytesBody.BYTES_LOCATION, MessageBodyTypeNames.STATISTICS_REQUEST.getBytes());
+esbMessage.getHeader().getCall().setMessageID(uri);
 
-	    DeliverOnlyCourier sender = null;
-	    
-	    try {
-		    sender =CourierFactory.getCourier(epr);
-		    sender.deliver(esbMessage);
-	    } finally {
-	    	CourierUtil.cleanCourier(sender);
-	    }
-	}
-}
+invoker.deliverAsync(esbMessage);
 
 RequestDispatcher disp;
 disp = getServletContext().getRequestDispatcher("/index.jsp"); 

Modified: labs/jbossesb/workspace/bramley/product/tools/console/management-web/src/main/webapp/invoke.jsp
===================================================================
--- labs/jbossesb/workspace/bramley/product/tools/console/management-web/src/main/webapp/invoke.jsp	2008-01-18 16:29:10 UTC (rev 17957)
+++ labs/jbossesb/workspace/bramley/product/tools/console/management-web/src/main/webapp/invoke.jsp	2008-01-18 17:00:40 UTC (rev 17958)
@@ -1,24 +1,30 @@
 <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
 <%@ page session="true" %>
 <%@ page import="
+		org.hibernate.Session,
+		org.hibernate.Transaction,
+		org.jboss.internal.soa.esb.couriers.DeliverOnlyCourier,
 		org.jboss.soa.esb.addressing.EPR,
+		org.jboss.soa.esb.client.ServiceInvoker,
 		org.jboss.soa.esb.couriers.CourierFactory,
-		org.jboss.soa.esb.couriers.CourierUtil,		
-		org.jboss.internal.soa.esb.couriers.DeliverOnlyCourier,
+		org.jboss.soa.esb.couriers.CourierUtil,
 		org.jboss.soa.esb.listeners.RegistryUtil,
 		org.jboss.soa.esb.message.Message,
+		org.jboss.soa.esb.message.body.content.BytesBody,
 		org.jboss.soa.esb.message.body.content.MessageBodyTypeNames,
+		org.jboss.soa.esb.message.body.content.ServiceControlCommand,
 		org.jboss.soa.esb.message.format.MessageFactory,
-		java.net.URI,	
-		java.util.List,
-		java.util.UUID,
-		org.hibernate.Session,
-		org.hibernate.Transaction,
 		org.jboss.soa.esb.monitoring.MonitoringSessionFactory,
-		org.jboss.soa.esb.message.body.content.ServiceControlCommand,
-		org.jboss.soa.esb.monitoring.pojo.*,
-		org.jboss.soa.esb.monitoring.server.FilerAction
+		org.jboss.soa.esb.monitoring.client.OperationsCollectorAction,
+		org.jboss.soa.esb.monitoring.pojo.JMXOperation,
+		org.jboss.soa.esb.monitoring.pojo.JMXOperationResult
 "%>
+<%@ page import="org.jboss.soa.esb.monitoring.server.FilerAction" %>
+<%@ page import="org.jboss.soa.esb.monitoring.server.OperationsHelper" %>
+<%@ page import="org.jboss.soa.esb.monitoring.server.StatisticsHelper" %>
+<%@ page import="java.net.URI" %>
+<%@ page import="java.util.List" %>
+<%@ page import="java.util.UUID" %>
 <html>
 <head>
    <title>JBoss ESB Monitoring Console</title>
@@ -70,27 +76,16 @@
 	sess = null;
 }
 
-List list = RegistryUtil.getEprs(FilerAction.INTERNAL_CATEGORY, FilerAction.INVOKER_SERVICE_ACTION_NAME);
-if (list != null) {
-	for (int i = 0; i < list.size(); i++) {
-		EPR epr = (EPR)list.get(i); 
-		Message esbMessage = MessageFactory.getInstance().getMessage();
-		esbMessage.getProperties().setProperty(MessageBodyTypeNames.COMMAND_TYPE, MessageBodyTypeNames.INVOKER_REQUEST); 
-		esbMessage.getBody().add(obean);
-		
-	    URI uri = new URI(UUID.randomUUID().toString());
-	    esbMessage.getHeader().getCall().setMessageID(uri);
+ServiceInvoker invoker = new ServiceInvoker(FilerAction.INTERNAL_CATEGORY, FilerAction.INVOKER_SERVICE_ACTION_NAME);
+Message esbMessage = MessageFactory.getInstance().getMessage();
+URI uri = new URI(UUID.randomUUID().toString());
 
-	    DeliverOnlyCourier sender = null;
-	    try {
-		    sender = CourierFactory.getCourier(epr);
-		    sender.deliver(esbMessage);
-	    } finally {
-	    	CourierUtil.cleanCourier(sender);
-	    }
-	}
-}
+esbMessage.getProperties().setProperty(MessageBodyTypeNames.COMMAND_TYPE, MessageBodyTypeNames.INVOKER_REQUEST);
+esbMessage.getBody().add(obean);
+esbMessage.getHeader().getCall().setMessageID(uri);
 
+invoker.deliverAsync(esbMessage);
+
 RequestDispatcher disp;
 disp = getServletContext().getRequestDispatcher("/operations.jsp"); 
 disp.forward(request, response);

Modified: labs/jbossesb/workspace/bramley/product/tools/console/management-web/src/main/webapp/manage.jsp
===================================================================
--- labs/jbossesb/workspace/bramley/product/tools/console/management-web/src/main/webapp/manage.jsp	2008-01-18 16:29:10 UTC (rev 17957)
+++ labs/jbossesb/workspace/bramley/product/tools/console/management-web/src/main/webapp/manage.jsp	2008-01-18 17:00:40 UTC (rev 17958)
@@ -1,43 +1,37 @@
-<%@page import="org.jboss.soa.esb.message.body.content.BytesBody"%>
+<%@page import="org.hibernate.Session"%>
 <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
 <%@ page session="true" %>
 <%@ page import="
-		org.jboss.soa.esb.addressing.EPR,
-		org.jboss.soa.esb.couriers.CourierFactory,
-		org.jboss.soa.esb.couriers.CourierUtil,
+		org.hibernate.Transaction,
 		org.jboss.internal.soa.esb.couriers.DeliverOnlyCourier,
-		org.jboss.soa.esb.listeners.RegistryUtil,
+		org.jboss.soa.esb.addressing.EPR,
+		org.jboss.soa.esb.client.ServiceInvoker,
 		org.jboss.soa.esb.message.Message,
+		org.jboss.soa.esb.message.body.content.BytesBody,
 		org.jboss.soa.esb.message.body.content.MessageBodyTypeNames,
-		org.jboss.soa.esb.message.format.MessageFactory,
-		org.jboss.soa.esb.monitoring.client.OperationsCollectorAction,
-		java.net.URI,
-		java.util.*,
-		java.util.List
+		org.jboss.soa.esb.message.body.content.ServiceControlCommand,
+		org.jboss.soa.esb.message.format.MessageFactory
 "%>
+<%@ page import="org.jboss.soa.esb.monitoring.MonitoringSessionFactory" %>
+<%@ page import="org.jboss.soa.esb.monitoring.client.OperationsCollectorAction" %>
+<%@ page import="org.jboss.soa.esb.monitoring.pojo.JMXOperation" %>
+<%@ page import="org.jboss.soa.esb.monitoring.pojo.JMXOperationResult" %>
+<%@ page import="org.jboss.soa.esb.monitoring.server.FilerAction" %>
+<%@ page import="org.jboss.soa.esb.monitoring.server.OperationsHelper" %>
+<%@ page import="org.jboss.soa.esb.monitoring.server.StatisticsHelper" %>
+<%@ page import="java.net.URI" %>
+<%@ page import="java.util.List" %>
+<%@ page import="java.util.UUID" %>
 <%
-List list = RegistryUtil.getEprs(OperationsCollectorAction.INTERNAL_CATEGORY, OperationsCollectorAction.OPERATIONSCOLLECTORSERVICE_ACTION_NAME);
-if (list != null) {
-	for (int i = 0; i < list.size(); i++) {
-		EPR epr = (EPR)list.get(i); 
-		Message esbMessage = MessageFactory.getInstance().getMessage();
-		esbMessage.getProperties().setProperty(MessageBodyTypeNames.COMMAND_TYPE, MessageBodyTypeNames.OPERATIONS_REQUEST); 
+ServiceInvoker invoker = new ServiceInvoker(OperationsCollectorAction.INTERNAL_CATEGORY, OperationsCollectorAction.OPERATIONSCOLLECTORSERVICE_ACTION_NAME);
+Message esbMessage = MessageFactory.getInstance().getMessage();
+URI uri = new URI(UUID.randomUUID().toString());
 
-		esbMessage.getBody().add(BytesBody.BYTES_LOCATION, MessageBodyTypeNames.OPERATIONS_REQUEST.getBytes());
-		
-	    URI uri = new URI(UUID.randomUUID().toString());
-	    esbMessage.getHeader().getCall().setMessageID(uri);
+esbMessage.getProperties().setProperty(MessageBodyTypeNames.COMMAND_TYPE, MessageBodyTypeNames.OPERATIONS_REQUEST);
+esbMessage.getBody().add(BytesBody.BYTES_LOCATION, MessageBodyTypeNames.OPERATIONS_REQUEST.getBytes());
+esbMessage.getHeader().getCall().setMessageID(uri);
 
-		DeliverOnlyCourier sender = null;
-		try {
-			sender = CourierFactory.getCourier(epr);
-			sender.deliver(esbMessage);
-		} finally {
-			CourierUtil.cleanCourier(sender);
-		}
-	
-	}
-}
+invoker.deliverAsync(esbMessage);
 
 RequestDispatcher disp;
 disp = getServletContext().getRequestDispatcher("/operations.jsp"); 




More information about the jboss-svn-commits mailing list