[jboss-cvs] JBossAS SVN: r82780 - branches/Branch_5_x/ejb3/src/main/org/jboss/ejb3/deployers.

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

Author: ALRubinger
Date: 2009-01-12 11:49:06 -0500 (Mon, 12 Jan 2009)
New Revision: 82780

Modified:
   branches/Branch_5_x/ejb3/src/main/org/jboss/ejb3/deployers/JBossASKernel.java
Log:
[EJBTHREE-655] merge r82684 and r82689 from trunk/ejb3/..JBossASKernel into Branch_5_x

Modified: branches/Branch_5_x/ejb3/src/main/org/jboss/ejb3/deployers/JBossASKernel.java
===================================================================
--- branches/Branch_5_x/ejb3/src/main/org/jboss/ejb3/deployers/JBossASKernel.java	2009-01-12 16:41:43 UTC (rev 82779)
+++ branches/Branch_5_x/ejb3/src/main/org/jboss/ejb3/deployers/JBossASKernel.java	2009-01-12 16:49:06 UTC (rev 82780)
@@ -27,13 +27,10 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanException;
 import javax.management.MBeanInfo;
 import javax.management.MBeanOperationInfo;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
-import javax.management.ReflectionException;
 
 import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
 import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
@@ -125,7 +122,7 @@
       log.info("  and demands:");
       for(DemandMetaData dmd : policy.getDemands())
       {
-         log.info("\t" + dmd.getDemand());
+         log.info("\t" + dmd.getDemand() + "; Required: " + dmd.getWhenRequired().getStateString());
       }
       log.info("  and supplies:");
       for(SupplyMetaData smd : policy.getSupplies())
@@ -170,11 +167,6 @@
       {
          mbeanServer.registerMBean(service, on);
          install(on.getCanonicalName(), dependencies, null, service);
-         
-         // EJBTHREE-606: emulate the ServiceController calls
-         MBeanInfo info = mbeanServer.getMBeanInfo(on); // redundant call for speed
-         invokeOptionalMethod(on, info, "create");
-         invokeOptionalMethod(on, info, "start");
       }
       catch (Exception e)
       {
@@ -213,25 +205,6 @@
    {
       try
       {
-         // EJBTHREE-606: emulate the ServiceController calls
-         MBeanInfo info = mbeanServer.getMBeanInfo(on); // redundant call for speed
-         try
-         {
-            invokeOptionalMethod(on, info, "stop");
-         }
-         catch(Exception e)
-         {
-            log.warn("stop on " + on + " failed", e);
-         }
-         try
-         {
-            invokeOptionalMethod(on, info, "destroy");
-         }
-         catch(Exception e)
-         {
-            log.warn("destroy on " + on + " failed", e);
-         }
-         
          mbeanServer.unregisterMBean(on);
       }
       catch (Exception e)
@@ -278,14 +251,6 @@
       
       return false;
    }
-   private void invokeOptionalMethod(ObjectName on, MBeanInfo info, String operationName)
-      throws InstanceNotFoundException, MBeanException, ReflectionException
-   {
-      Object params[] = { };
-      String signature[] = { };
-      if(hasOperation(info, operationName))
-         mbeanServer.invoke(on, operationName, params, signature);
-   }
 
    public static class AlreadyInstantiated extends AbstractConstructorMetaData
    {