[jboss-svn-commits] JBL Code SVN: r22780 - in labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners: lifecycle and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: kevin.conner at jboss.com
Date: 2008-09-15 12:49:33 -0400 (Mon, 15 Sep 2008)
New Revision: 22780

Modified:
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployment.java
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/LifecycleController.java
Log:
Revert change 22759 (JBESB-2034 and JBESB-2038)

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployment.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployment.java	2008-09-15 16:14:18 UTC (rev 22779)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployment.java	2008-09-15 16:49:33 UTC (rev 22780)
@@ -22,18 +22,9 @@
 package org.jboss.soa.esb.listeners.config;
 
 import java.util.List;
-import java.util.Set;
 
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanRegistrationException;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
 import org.jboss.internal.soa.esb.publish.ContractReferencePublisher;
-import org.jboss.mx.util.MBeanServerLocator;
 import org.jboss.soa.esb.lifecycle.LifecycleResourceManager;
-import org.jboss.soa.esb.listeners.ListenerTagNames;
 import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycleController;
 import org.jboss.system.ServiceMBeanSupport;
 
@@ -105,7 +96,6 @@
       {
          Thread.currentThread().setContextClassLoader(classloader);
          LifecycleResourceManager.getSingleton().associateDeployment(deploymentName) ;
-         unregisterMBeans(deploymentName);
          controller = Configuration.create(jbossEsbXml, serviceName, publishers);
          controller.start();
       }
@@ -116,33 +106,6 @@
 
    }
 
-   /**
-    * Unregisters all MBeans that may have been associated with a previous version of the ESB deployment.
-    * 
-    * @param deploymentName name of the deployment (ex:  jbossesb.esb)
-    * @throws Exception
-    */
-   private void unregisterMBeans(String deployment) throws Exception {
-	   MBeanServer mbeanServer = MBeanServerLocator.locateJBoss();
-	   Set<ObjectName> listenerControllers = mbeanServer.queryNames(new ObjectName("jboss.esb:*"), null);
-	   for (ObjectName controller : listenerControllers) {
-		   if (controller.toString().indexOf("deployment="+deployment)>0) {
-			   if ((controller.toString().indexOf("listener-name=")>0) || (controller.toString().indexOf("gateway-name=")>0)) {
-				   mbeanServer.unregisterMBean(controller);											
-			   }
-		   }
-	   }
-	   
-	   Set<ObjectName> counterControllers = mbeanServer.queryNames(new ObjectName("jboss.esb:*"), null);
-	   	for (ObjectName controller : counterControllers) {
-	   		if (controller.toString().indexOf("category=MessageCounter," + ListenerTagNames.DEPLOYMENT_NAME_TAG + "=" + deploymentName)>0) {
-	   			if (controller.toString().indexOf(ListenerTagNames.SERVICE_NAME_TAG + "=")>0) {
-	   				mbeanServer.unregisterMBean(controller);											
-	   			}
-	   		}
-		}
-   }
-   
    @Override
    public void stopService() throws Exception
    {

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/LifecycleController.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/LifecycleController.java	2008-09-15 16:14:18 UTC (rev 22779)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/LifecycleController.java	2008-09-15 16:49:33 UTC (rev 22780)
@@ -163,25 +163,14 @@
 			return;
 		}
 		
-		String deployment = null;
-		String listenerName = null;
 		ObjectName listObjectName = null;
 		try {
-			deployment = m_config.getParent().getAttribute("deployment");
-			listenerName = m_config.getName();
-
 			String categoryName = m_config.getAttribute(ListenerTagNames.SERVICE_CATEGORY_NAME_TAG);
 			String serviceName = m_config.getAttribute(ListenerTagNames.SERVICE_NAME_TAG);
+			String listenerName = m_config.getName();
 
 			StringBuffer objectName = new StringBuffer();
-			if (deployment != null) {
-				objectName.append(ListenerTagNames.DEPLOYMENT_NAME_TAG + "=" + deployment);
-			}
-			
 			if (categoryName != null) {
-				if (objectName.length() > 0) {
-					objectName.append(",");
-				}
 				objectName.append(ListenerTagNames.SERVICE_CATEGORY_NAME_TAG + "=" + categoryName);
 			}
 			
@@ -191,7 +180,7 @@
 				}
 				objectName.append(ListenerTagNames.SERVICE_NAME_TAG + "=" + serviceName);
 			}
-
+			
 			if (listenerName != null) {
 				if (objectName.length() > 0) {
 					objectName.append(",");
@@ -206,29 +195,29 @@
 			
 			listObjectName = new ObjectName("jboss.esb:" + objectName.toString());
 		} catch (MalformedObjectNameException e1) {
-			logger.warn("", e1);
+			logger.error("", e1);
 		} catch (NullPointerException e1) {
-			logger.warn("", e1);
+			logger.error("", e1);
 		}
-
+		
 		if (mbeanServer.isRegistered(listObjectName)) {
 	    	try {
 	    		mbeanServer.unregisterMBean(listObjectName);
 			} catch (InstanceNotFoundException e) {
-				logger.warn("", e);
+				logger.error("", e);
 			} catch (MBeanRegistrationException e) {
-				logger.warn("", e);
+				logger.error("", e);
 			}
         }
 		
 	    try {
 	    	mbeanServer.registerMBean(this, listObjectName);
 		} catch (InstanceAlreadyExistsException e) {
-			logger.warn("", e);
+			logger.error("", e);
 		} catch (MBeanRegistrationException e) {
-			logger.warn("", e);
+			logger.error("", e);
 		} catch (NotCompliantMBeanException e) {
-			logger.warn("", e);
+			logger.error("", e);
 		}
 	}
 
@@ -329,7 +318,7 @@
 			try {
 				start();
 			} catch (ManagedLifecycleException e) {
-				logger.warn("", e);
+				logger.error("", e);
 				return "Error invoking " + method + ": " + e.toString();
 			}
 			return "Invoking the " + method + " on the lifecycle.";
@@ -337,7 +326,7 @@
 			try {
 				initialise();
 			} catch (ManagedLifecycleException e) {
-				logger.warn("", e);
+				logger.error("", e);
 				return "Error invoking " + method + ": " + e.toString();
 			}
 			return "Invoking the " + method + " on the lifecycle.";
@@ -345,7 +334,7 @@
 			try {
 				stop();
 			} catch (ManagedLifecycleException e) {
-				logger.warn("", e);
+				logger.error("", e);
 				return "Error invoking " + method + ": " + e.toString();
 			}
 			return "Invoking the " + method + " on the lifecycle.";
@@ -353,7 +342,7 @@
 			try {
 				destroy();
 			} catch (ManagedLifecycleException e) {
-				logger.warn("", e);
+				logger.error("", e);
 				return "Error invoking " + method + ": " + e.toString();
 			}
 			return "Invoking the " + method + " on the lifecycle.";