[jboss-svn-commits] JBL Code SVN: r15588 - in labs/jbossesb/trunk/product/tools/console: management/src/main/java/org/jboss/soa/esb/monitoring/client and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Oct 4 18:01:47 EDT 2007
Author: tcunning
Date: 2007-10-04 18:01:47 -0400 (Thu, 04 Oct 2007)
New Revision: 15588
Removed:
labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/OperationsBean.java
Modified:
labs/jbossesb/trunk/product/tools/console/management-web/src/main/webapp/invoke.jsp
labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/OperationsData.java
labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/Invoker.java
labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/InvokerAction.java
labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/OperationsCollector.java
labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/OperationsFiler.java
Log:
bug:JBESB-1107
Remove OperationsBean and all references to it, change to ServiceControlCommand
which is within the ESB and will allow users to send invocations through
the ESB without the use of the management console.
Deleted: labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/OperationsBean.java
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/OperationsBean.java 2007-10-04 21:59:55 UTC (rev 15587)
+++ labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/OperationsBean.java 2007-10-04 22:01:47 UTC (rev 15588)
@@ -1,202 +0,0 @@
-package org.jboss.soa.esb.monitoring;
-
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * OperationsBean is a serializable bean that contains JMX Attribute information.
- * This data is passed in a command message from the OperationsCollector to the
- * OperationsFiler.
- *
- * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
- * @since Version 4.2
- */
-public class OperationsBean implements Serializable {
- private static final long serialVersionUID = -3039074516951343026L;
- private String objectName;
- private String attribute;
- private String server;
- private Date collectionTime;
- private String operation;
- private String description;
- private String returntype;
- private Long id;
-
- /**
- * Constructor.
- * @param f_objectName object name
- * @param f_server server name
- * @param f_collectionTime collection date
- * @param f_operation operation
- * @param f_description operation description
- * @param f_returntype operation return type
- */
- public OperationsBean(String f_objectName, String f_server, Date f_collectionTime, String f_operation,
- String f_description, String f_returntype) {
- operation = f_operation;
- objectName = f_objectName;
- server = f_server;
- collectionTime = f_collectionTime;
- description = f_description;
- returntype = f_returntype;
- }
-
- /**
- * Id name getter.
- * @return id id
- */
- public Long getId() {
- return id;
- }
-
- /**
- * Id name mutator.
- * @param id id
- */
- public void setId(Long id) {
- this.id = id;
- }
-
- /**
- * Attribute name getter.
- * @return attribute name
- */
- public String getAttribute() {
- return attribute;
- }
-
- /**
- * Attribute name mutator.
- * @param attribute attribute name
- */
- public void setAttribute(String attribute) {
- this.attribute = attribute;
- }
-
- /**
- * Collection time getter.
- * @return collection time
- */
- public Date getCollectionTime() {
- return collectionTime;
- }
-
- /**
- * Collection time mutator.
- * @param collectionTime collection time
- */
- public void setCollectionTime(Date collectionTime) {
- this.collectionTime = collectionTime;
- }
-
- /**
- * Object data getter.
- * @return data
- */
- public String getOperation() {
- return operation;
- }
-
- /**
- * Object data mutator.
- * @param data data
- */
- public void setOperation(String operation) {
- this.operation = operation;
- }
-
- /**
- * Object name getter.
- * @return object name
- */
- public String getObjectName() {
- return objectName;
- }
-
- /**
- * Object name setter.
- * @param objectName object name
- */
- public void setObjectName(String objectName) {
- this.objectName = objectName;
- }
-
- /**
- * Server name getter.
- * @return server name
- */
- public String getServer() {
- return server;
- }
-
- /**
- * Server name mutator.
- * @param server server name
- */
- public void setServer(String server) {
- this.server = server;
- }
-
- /**
- * Description name getter.
- * @return server name
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Description name mutator.
- * @param server server name
- */
- public void setDescription(String description) {
- this.description = description;
- }
-
- /**
- * Return type name getter.
- * @return server name
- */
- public String getReturntype() {
- return returntype;
- }
-
- /**
- * Return type name mutator.
- * @param server server name
- */
- public void setReturntype(String returntype) {
- this.returntype = returntype;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return "objectName[" + objectName +"] attribute[" + attribute
- + "] server[" + server + "] collectionTime[" + collectionTime
- + "] operation[" + operation + "]";
- }
-}
Modified: labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/OperationsData.java
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/OperationsData.java 2007-10-04 21:59:55 UTC (rev 15587)
+++ labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/OperationsData.java 2007-10-04 22:01:47 UTC (rev 15588)
@@ -27,9 +27,10 @@
import java.util.List;
import org.apache.log4j.Logger;
+import org.jboss.soa.esb.message.body.content.ServiceControlCommand;
/**
- * OperationsData is a serializable collection of OperationsBeans. The
+ * OperationsData is a serializable collection of ServiceControlCommands. The
* OperationsData is object is the sole object that is passed in a command
* message from the DataCollector to the DataFiler.
*
@@ -39,13 +40,13 @@
public class OperationsData implements Serializable {
private static final Logger logger = Logger.getLogger(OperationsData.class);
private static final long serialVersionUID = -2081662961582149106L;
- private List<OperationsBean> list;
+ private List<ServiceControlCommand> list;
/**
* Constructor which creates the list of StatisticsBeans.
*/
public OperationsData() {
- list = new ArrayList<OperationsBean>();
+ list = new ArrayList<ServiceControlCommand>();
}
/**
@@ -61,7 +62,7 @@
*/
public void print() {
for (int i = 0; i < list.size(); i++) {
- OperationsBean ob = list.get(i);
+ ServiceControlCommand ob = list.get(i);
logger.debug(ob.toString());
}
}
Modified: labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/Invoker.java
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/Invoker.java 2007-10-04 21:59:55 UTC (rev 15587)
+++ labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/Invoker.java 2007-10-04 22:01:47 UTC (rev 15588)
@@ -13,7 +13,7 @@
import javax.naming.NamingException;
import org.apache.log4j.Logger;
-import org.jboss.soa.esb.monitoring.OperationsBean;
+import org.jboss.soa.esb.message.body.content.ServiceControlCommand;
public class Invoker {
Logger logger = Logger.getLogger(Invoker.class);
@@ -29,7 +29,7 @@
}
}
- public Object invoke(OperationsBean obean) {
+ public Object invoke(ServiceControlCommand obean) {
ObjectName on = null;
try {
on = new ObjectName(obean.getObjectName());
Modified: labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/InvokerAction.java
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/InvokerAction.java 2007-10-04 21:59:55 UTC (rev 15587)
+++ labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/InvokerAction.java 2007-10-04 22:01:47 UTC (rev 15588)
@@ -37,9 +37,9 @@
import org.jboss.soa.esb.listeners.RegistryUtil;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.body.content.MessageBodyTypeNames;
+import org.jboss.soa.esb.message.body.content.ServiceControlCommand;
import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.monitoring.OperationsBean;
import org.jboss.soa.esb.monitoring.pojo.JMXOperation;
import org.jboss.soa.esb.monitoring.pojo.JMXOperationResult;
@@ -67,7 +67,7 @@
*/
public Message invokeOperation(Message message) throws Exception {
if (message.getProperties().getProperty(MessageBodyTypeNames.COMMAND_TYPE) != null) {
- OperationsBean obean = (OperationsBean) message.getBody().get();
+ ServiceControlCommand obean = (ServiceControlCommand) message.getBody().get();
Invoker inv = new Invoker();
Object result = inv.invoke(obean);
JMXOperation jmxo = new JMXOperation(obean.getObjectName(), obean.getServer(),
Modified: labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/OperationsCollector.java
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/OperationsCollector.java 2007-10-04 21:59:55 UTC (rev 15587)
+++ labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/OperationsCollector.java 2007-10-04 22:01:47 UTC (rev 15588)
@@ -22,8 +22,8 @@
import org.apache.log4j.Logger;
import org.hibernate.Session;
+import org.jboss.soa.esb.message.body.content.ServiceControlCommand;
import org.jboss.soa.esb.monitoring.MonitoringSessionFactory;
-import org.jboss.soa.esb.monitoring.OperationsBean;
import org.jboss.soa.esb.monitoring.OperationsData;
import org.jboss.soa.esb.monitoring.pojo.JMXPattern;
@@ -116,11 +116,11 @@
info = server.getMBeanInfo(on);
MBeanOperationInfo[] moi = info.getOperations();
for (int i = 0; i < moi.length; i++) {
- OperationsBean ob = new OperationsBean(on.toString(), serverString,
+ ServiceControlCommand ob = new ServiceControlCommand(on.toString(), serverString,
date, moi[i].getName(), moi[i].getDescription(),
moi[i].getReturnType());
if (moi[i].getSignature().length == 0) {
- ArrayList<OperationsBean> list = (ArrayList<OperationsBean>) data.getList();
+ ArrayList<ServiceControlCommand> list = (ArrayList<ServiceControlCommand>) data.getList();
list.add(ob);
}
}
Modified: labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/OperationsFiler.java
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/OperationsFiler.java 2007-10-04 21:59:55 UTC (rev 15587)
+++ labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/OperationsFiler.java 2007-10-04 22:01:47 UTC (rev 15588)
@@ -28,9 +28,9 @@
import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.Transaction;
+import org.jboss.soa.esb.message.body.content.ServiceControlCommand;
import org.jboss.soa.esb.monitoring.MonitoringSessionFactory;
import org.jboss.soa.esb.monitoring.OperationsData;
-import org.jboss.soa.esb.monitoring.OperationsBean;
import org.jboss.soa.esb.monitoring.pojo.JMXOperation;
/**
@@ -90,7 +90,7 @@
* Create a JMXAttribute object based on the StatisticBean info and stores it.
* @param f_sb statistics bean
*/
- public void insertOperations(OperationsBean f_ob) {
+ public void insertOperations(ServiceControlCommand f_ob) {
Session sess = null;
Transaction tx = null;
try {
@@ -161,7 +161,7 @@
if (data != null) {
List list = data.getList();
for (int i = 0; i < list.size(); i++) {
- OperationsBean bean = (OperationsBean) list.get(i);
+ ServiceControlCommand bean = (ServiceControlCommand) list.get(i);
if ((i == 0) && (bean != null)) {
updateActiveFlag(bean.getServer());
}
Modified: labs/jbossesb/trunk/product/tools/console/management-web/src/main/webapp/invoke.jsp
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management-web/src/main/webapp/invoke.jsp 2007-10-04 21:59:55 UTC (rev 15587)
+++ labs/jbossesb/trunk/product/tools/console/management-web/src/main/webapp/invoke.jsp 2007-10-04 22:01:47 UTC (rev 15588)
@@ -14,7 +14,7 @@
org.hibernate.Session,
org.hibernate.Transaction,
org.jboss.soa.esb.monitoring.MonitoringSessionFactory,
- org.jboss.soa.esb.monitoring.OperationsBean,
+ org.jboss.soa.esb.message.body.content.ServiceControlCommand,
org.jboss.soa.esb.monitoring.pojo.*,
org.jboss.soa.esb.monitoring.server.FilerAction
"%>
@@ -45,13 +45,13 @@
Long id = new Long(idString);
Session sess = null;
Transaction tx = null;
-OperationsBean obean = null;
+ServiceControlCommand obean = null;
try {
sess = MonitoringSessionFactory.getInstance().openSession();
tx = sess.beginTransaction();
JMXOperation jmxo = (JMXOperation) sess.load(JMXOperation.class, id);
- obean = new OperationsBean(jmxo.getObjectname(), jmxo.getServername(), null,
+ obean = new ServiceControlCommand(jmxo.getObjectname(), jmxo.getServername(), null,
jmxo.getOperation(), jmxo.getDescription(), jmxo.getReturntype());
obean.setId(id);
tx.commit();
More information about the jboss-svn-commits
mailing list