cvs commit: incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service GeronimoMBeanContext.java GeronimoMBeanEndpoint.java GeronimoMBeanInfo.java GeronimoParameterInfo.java

[ch...@apache.org]

chirino     2003/11/16 15:32:29

  Modified:    modules/kernel/src/java/org/apache/geronimo/kernel/service
                        GeronimoMBeanContext.java
                        GeronimoMBeanEndpoint.java GeronimoMBeanInfo.java
                        GeronimoParameterInfo.java
  Log:
  Made the GeronimoMBeanInfo related classes a little easier to build by hand.
  
  Revision  Changes    Path
  1.4       +12 -1     incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service/GeronimoMBeanContext.java
  
  Index: GeronimoMBeanContext.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service/GeronimoMBeanContext.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- GeronimoMBeanContext.java	8 Nov 2003 22:21:45 -0000	1.3
  +++ GeronimoMBeanContext.java	16 Nov 2003 23:32:29 -0000	1.4
  @@ -113,6 +113,17 @@
       }
   
       /**
  +     * Gets the state of this component as an int.
  +     * The int return is required by the JSR77 specification.
  +     * 
  +     * @return the current state of this component
  +     * @throws Exception if a problem occurs while starting the component
  +     */
  +    public int getState() throws Exception {
  +        return geronimoMBean.getState();
  +    }
  +    
  +    /**
        * Attempts to bring the component into the fully running state. If an Exception occurs while
        * starting the component, the component is automaticaly failed.
        *
  
  
  
  1.5       +13 -1     incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service/GeronimoMBeanEndpoint.java
  
  Index: GeronimoMBeanEndpoint.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service/GeronimoMBeanEndpoint.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- GeronimoMBeanEndpoint.java	11 Nov 2003 16:39:58 -0000	1.4
  +++ GeronimoMBeanEndpoint.java	16 Nov 2003 23:32:29 -0000	1.5
  @@ -186,14 +186,26 @@
           this(name, type, Collections.EMPTY_SET, false);
       }
   
  +    public GeronimoMBeanEndpoint(String name, Class type) {
  +        this(name, type.getName(), Collections.EMPTY_SET, false);
  +    }
  +
       public GeronimoMBeanEndpoint(String name, String type, ObjectName pattern) {
           this(name, type, Collections.singleton(pattern), false);
       }
   
  +    public GeronimoMBeanEndpoint(String name, Class type, ObjectName pattern) {
  +        this(name, type.getName(), Collections.singleton(pattern), false);
  +    }
  +    
       public GeronimoMBeanEndpoint(String name, String type, ObjectName pattern, boolean required) {
           this(name, type, Collections.singleton(pattern), required);
       }
   
  +    public GeronimoMBeanEndpoint(String name, Class type, ObjectName pattern, boolean required) {
  +        this(name, type.getName(), Collections.singleton(pattern), required);
  +    }    
  +    
       public GeronimoMBeanEndpoint(String name, String type, ObjectName pattern, boolean required, String target) {
           this(name, type, Collections.singleton(pattern), required, target);
       }
  
  
  
  1.9       +5 -1      incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service/GeronimoMBeanInfo.java
  
  Index: GeronimoMBeanInfo.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service/GeronimoMBeanInfo.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- GeronimoMBeanInfo.java	16 Nov 2003 00:44:26 -0000	1.8
  +++ GeronimoMBeanInfo.java	16 Nov 2003 23:32:29 -0000	1.9
  @@ -202,6 +202,10 @@
           return (String) targetClasses.get(DEFAULT_TARGET_NAME);
       }
   
  +    public void setTargetClass(Class clazz) {
  +       setTargetClass(clazz.getName());
  +    }
  +    
       public void setTargetClass(String className) {
           if (immutable) {
               throw new IllegalStateException("Data is no longer mutable");
  
  
  
  1.4       +7 -3      incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service/GeronimoParameterInfo.java
  
  Index: GeronimoParameterInfo.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service/GeronimoParameterInfo.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- GeronimoParameterInfo.java	14 Nov 2003 16:17:33 -0000	1.3
  +++ GeronimoParameterInfo.java	16 Nov 2003 23:32:29 -0000	1.4
  @@ -75,11 +75,15 @@
       private final Class typeClass;
   
       public GeronimoParameterInfo() {
  -        this(null, null, null);
  +        this(null, (String)null, null);
  +    }
  +
  +    public GeronimoParameterInfo(String name, Class type, String description) {
  +        this(name, type.getName(), description);
       }
   
       public GeronimoParameterInfo(String name, String type, String description) {
  -        super(null, null, null);
  +        super("Ignore", "Ignore", null);
           immutable = false;
           typeClass = null;
           this.name = name;