User: d_jencks
  Date: 02/02/22 14:54:25

  Modified:    src/main/org/jboss/ejb Container.java EJBDeployer.java
                        EjbModule.java
  Log:
  made jndi view and bean cache monitor work again.  Added listSnapshots method to 
bean cache monitor so you can actually see the results via jmx
  
  Revision  Changes    Path
  1.79      +8 -8      jboss/src/main/org/jboss/ejb/Container.java
  
  Index: Container.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/Container.java,v
  retrieving revision 1.78
  retrieving revision 1.79
  diff -u -r1.78 -r1.79
  --- Container.java    22 Feb 2002 04:24:54 -0000      1.78
  +++ Container.java    22 Feb 2002 22:54:24 -0000      1.79
  @@ -8,10 +8,6 @@
   package org.jboss.ejb;
   
   
  -
  -
  -
  -
   import java.lang.reflect.Method;
   import java.net.MalformedURLException;
   import java.net.URL;
  @@ -85,7 +81,8 @@
   * @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
   * @author <a href="mailto:[EMAIL PROTECTED]";>Scott Stark</a>.
   * @author <a href="[EMAIL PROTECTED]">Bill Burke</a>
  -* @version $Revision: 1.78 $
  +* @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a>
  +* @version $Revision: 1.79 $
   ** <p><b>Revisions:</b>
   *
   * <p><b>2001/07/26 bill burke:</b>
  @@ -105,6 +102,9 @@
   public abstract class Container implements MBeanRegistration, DynamicMBean
   {
      // Constants -----------------------------------------------------
  +   public final static String BASE_EJB_CONTAINER_NAME = "jboss.j2ee:service=EJB";
  +
  +   public final static ObjectName EJB_CONTAINER_QUERY_NAME = 
ObjectNameFactory.create(BASE_EJB_CONTAINER_NAME + ",*");
      
      // Attributes ----------------------------------------------------
      
  @@ -335,9 +335,9 @@
      }
      
      /**
  -    * Returns the application for this container.
  +    * Describe <code>getEjbModule</code> method here.
       *
  -    * @return
  +    * @return the <code>EjbModule</code> parent for this Container
       */
      public EjbModule getEjbModule()
      {
  @@ -462,7 +462,7 @@
         } // end of if ()
         if (jmxName == null) 
         {
  -         jmxName = 
ObjectNameFactory.create("jboss.j2ee:service=EJB,jndiName="+jndiName);
  +         jmxName = ObjectNameFactory.create(BASE_EJB_CONTAINER_NAME + ",jndiName=" 
+ jndiName);
         } // end of if ()
         return jmxName;
      }
  
  
  
  1.13      +3 -2      jboss/src/main/org/jboss/ejb/EJBDeployer.java
  
  Index: EJBDeployer.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/EJBDeployer.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- EJBDeployer.java  22 Feb 2002 07:02:53 -0000      1.12
  +++ EJBDeployer.java  22 Feb 2002 22:54:24 -0000      1.13
  @@ -65,7 +65,7 @@
   * @author <a href="mailto:[EMAIL PROTECTED]";>Peter Antman</a>.
   * @author <a href="mailto:[EMAIL PROTECTED]";>Scott Stark</a>
   * @author <a href="mailto:[EMAIL PROTECTED]";>Sacha Labourey</a>
  -* @version $Revision: 1.12 $ 
  +* @version $Revision: 1.13 $ 
   */
   public class EJBDeployer
   extends ServiceMBeanSupport
  @@ -374,7 +374,8 @@
         NDC.pop();
         
         // Create application
  -      ObjectName ejbModule = 
ObjectNameFactory.create("jboss.j2ee:service=EjbModule,url=" + di.url.getPath());
  +      //ObjectName ejbModule = 
ObjectNameFactory.create("jboss.j2ee:service=EjbModule,url=" + di.url.getPath());
  +      ObjectName ejbModule = 
ObjectNameFactory.create(EjbModule.BASE_EJB_MODULE_NAME + ",url=" + di.url.getPath());
   
         try
         {
  
  
  
  1.3       +9 -1      jboss/src/main/org/jboss/ejb/EjbModule.java
  
  Index: EjbModule.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/EjbModule.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- EjbModule.java    22 Feb 2002 07:02:53 -0000      1.2
  +++ EjbModule.java    22 Feb 2002 22:54:24 -0000      1.3
  @@ -53,6 +53,8 @@
   import javax.naming.NamingException;
   import javax.transaction.TransactionManager;
   
  +import org.jboss.util.jmx.ObjectNameFactory;
  +
   /**
    * An Application represents a collection of beans that are deployed as a
    * unit.
  @@ -64,7 +66,8 @@
    * @see EJBDeployer
    * 
    * @author <a href="mailto:[EMAIL PROTECTED]";>Rickard �berg</a>
  - * @version $Revision: 1.2 $
  + * @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a>
  + * @version $Revision: 1.3 $
    *
    * @jmx:mbean extends="org.jboss.system.ServiceMBean"
    */
  @@ -72,6 +75,11 @@
      extends ServiceMBeanSupport
      implements EjbModuleMBean
   {
  +
  +   public static final String BASE_EJB_MODULE_NAME ="jboss.j2ee:service=EjbModule";
  +
  +   public static final ObjectName EJB_MODULE_QUERY_NAME = 
ObjectNameFactory.create(BASE_EJB_MODULE_NAME + ",*");
  +
      public static String DEFAULT_STATELESS_CONFIGURATION = "Default Stateless 
SessionBean";
      public static String DEFAULT_STATEFUL_CONFIGURATION = "Default Stateful 
SessionBean";
      public static String DEFAULT_ENTITY_BMP_CONFIGURATION = "Default BMP EntityBean";
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to