geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: incubator-geronimo/modules/web/src/java/org/apache/geronimo/webdav/jetty JettyConnectorImpl.java JettyDAVServer.java
Date Thu, 22 Jan 2004 02:46:28 GMT
dain        2004/01/21 18:46:28

  Modified:    modules/core/src/java/org/apache/geronimo/connector
                        ResourceAdapterWrapper.java
               modules/core/src/java/org/apache/geronimo/connector/outbound
                        ConnectionManagerDeployment.java
                        ManagedConnectionFactoryWrapper.java
               modules/core/src/java/org/apache/geronimo/security
                        AbstractModuleConfiguration.java
                        AbstractSecurityRealm.java
               modules/deployment/src/java/org/apache/geronimo/deployment/util
                        ExplicitDeployment.java
               modules/jetty/src/java/org/apache/geronimo/jetty
                        JettyContainerImpl.java
                        JettyWebApplicationContext.java
               modules/jetty/src/java/org/apache/geronimo/jetty/connector
                        JettyConnector.java
               modules/kernel/src/java/org/apache/geronimo/gbean GBean.java
                        GBeanInfo.java
               modules/kernel/src/java/org/apache/geronimo/gbean/jmx
                        GBeanMBean.java
               modules/kernel/src/java/org/apache/geronimo/kernel
                        Kernel.java
               modules/kernel/src/java/org/apache/geronimo/kernel/config
                        Configuration.java LocalConfigStore.java
               modules/web/src/java/org/apache/geronimo/web/jetty
                        JettyWebAccessLog.java JettyWebConnector.java
               modules/web/src/java/org/apache/geronimo/webdav
                        CatalinaDAVRepository.java
               modules/web/src/java/org/apache/geronimo/webdav/jetty
                        JettyConnectorImpl.java JettyDAVServer.java
  Log:
  Added 'void setGBeanContext(GBeanContext context)' to GBean interface
  
  Revision  Changes    Path
  1.2       +5 -1      incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/ResourceAdapterWrapper.java
  
  Index: ResourceAdapterWrapper.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/ResourceAdapterWrapper.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ResourceAdapterWrapper.java	21 Jan 2004 22:21:25 -0000	1.1
  +++ ResourceAdapterWrapper.java	22 Jan 2004 02:46:27 -0000	1.2
  @@ -72,6 +72,7 @@
   import org.apache.geronimo.gbean.GEndpointInfo;
   import org.apache.geronimo.gbean.GConstructorInfo;
   import org.apache.geronimo.gbean.GOperationInfo;
  +import org.apache.geronimo.gbean.GBeanContext;
   
   /**
    *
  @@ -122,6 +123,9 @@
   
       public void endpointDeactivation(MessageEndpointFactory messageEndpointFactory, ActivationSpec
activationSpec) {
           resourceAdapter.endpointDeactivation(messageEndpointFactory, activationSpec);
  +    }
  +
  +    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() throws WaitingException, Exception {
  
  
  
  1.14      +5 -1      incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/outbound/ConnectionManagerDeployment.java
  
  Index: ConnectionManagerDeployment.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/outbound/ConnectionManagerDeployment.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ConnectionManagerDeployment.java	21 Jan 2004 22:21:26 -0000	1.13
  +++ ConnectionManagerDeployment.java	22 Jan 2004 02:46:27 -0000	1.14
  @@ -71,6 +71,7 @@
   import org.apache.geronimo.gbean.GConstructorInfo;
   import org.apache.geronimo.gbean.GEndpointInfo;
   import org.apache.geronimo.gbean.GOperationInfo;
  +import org.apache.geronimo.gbean.GBeanContext;
   import org.apache.geronimo.kernel.KernelMBean;
   import org.apache.geronimo.kernel.service.GeronimoAttributeInfo;
   import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
  @@ -147,6 +148,9 @@
           this.name = name;
           this.connectionTracker = connectionTracker;
           this.kernel = kernel;
  +    }
  +
  +    public void setGBeanContext(GBeanContext context) {
       }
   
       public void setMBeanContext(GeronimoMBeanContext context) {
  
  
  
  1.2       +5 -2      incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java
  
  Index: ManagedConnectionFactoryWrapper.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ManagedConnectionFactoryWrapper.java	21 Jan 2004 22:21:26 -0000	1.1
  +++ ManagedConnectionFactoryWrapper.java	22 Jan 2004 02:46:27 -0000	1.2
  @@ -74,6 +74,7 @@
   import org.apache.geronimo.gbean.GEndpointInfo;
   import org.apache.geronimo.gbean.GOperationInfo;
   import org.apache.geronimo.gbean.WaitingException;
  +import org.apache.geronimo.gbean.GBeanContext;
   import org.apache.geronimo.naming.ger.GerContextManager;
   
   /**
  @@ -191,7 +192,9 @@
           this.connectionManagerFactory = connectionManagerFactory;
       }
   
  -    //GBean implementation
  +    public void setGBeanContext(GBeanContext context) {
  +    }
  +
       public void doStart() throws WaitingException, Exception {
           //register with resource adapter if not yet done
           if (!registered && resourceAdapterWrapper != null) {
  
  
  
  1.6       +10 -9     incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/AbstractModuleConfiguration.java
  
  Index: AbstractModuleConfiguration.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/AbstractModuleConfiguration.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractModuleConfiguration.java	20 Jan 2004 01:36:58 -0000	1.5
  +++ AbstractModuleConfiguration.java	22 Jan 2004 02:46:27 -0000	1.6
  @@ -57,21 +57,19 @@
   
   import java.util.Collection;
   import java.util.HashSet;
  -
  -import javax.management.InstanceNotFoundException;
  -import javax.management.MBeanRegistrationException;
   import javax.security.jacc.PolicyConfiguration;
   import javax.security.jacc.PolicyConfigurationFactory;
   import javax.security.jacc.PolicyContextException;
   
  -import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanTarget;
  +import org.apache.geronimo.gbean.GAttributeInfo;
  +import org.apache.geronimo.gbean.GBean;
  +import org.apache.geronimo.gbean.GBeanContext;
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
   import org.apache.geronimo.gbean.GOperationInfo;
  -import org.apache.geronimo.gbean.GAttributeInfo;
  -import org.apache.geronimo.gbean.GBean;
  +import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
  +import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
  +import org.apache.geronimo.kernel.service.GeronimoMBeanTarget;
   
   
   /**
  @@ -102,6 +100,9 @@
           } catch (PolicyContextException e) {
               throw new GeronimoSecurityException("Unable to find policy configuration with
that id", e);
           }
  +    }
  +
  +    public void setGBeanContext(GBeanContext context) {
       }
   
       /**
  
  
  
  1.6       +5 -1      incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/AbstractSecurityRealm.java
  
  Index: AbstractSecurityRealm.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/AbstractSecurityRealm.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractSecurityRealm.java	20 Jan 2004 01:36:59 -0000	1.5
  +++ AbstractSecurityRealm.java	22 Jan 2004 02:46:27 -0000	1.6
  @@ -63,6 +63,7 @@
   import org.apache.geronimo.gbean.GAttributeInfo;
   import org.apache.geronimo.gbean.GOperationInfo;
   import org.apache.geronimo.gbean.GConstructorInfo;
  +import org.apache.geronimo.gbean.GBeanContext;
   import org.apache.regexp.RE;
   
   
  @@ -96,6 +97,9 @@
   
       public void setMBeanContext(GeronimoMBeanContext context) {
           this.context = context;
  +    }
  +
  +    public void setGBeanContext(GBeanContext context) {
       }
   
       public boolean canStart() {
  
  
  
  1.2       +5 -1      incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/util/ExplicitDeployment.java
  
  Index: ExplicitDeployment.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/util/ExplicitDeployment.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ExplicitDeployment.java	19 Jan 2004 06:40:07 -0000	1.1
  +++ ExplicitDeployment.java	22 Jan 2004 02:46:27 -0000	1.2
  @@ -71,6 +71,7 @@
   import org.apache.geronimo.gbean.GConstructorInfo;
   import org.apache.geronimo.gbean.GEndpointInfo;
   import org.apache.geronimo.gbean.WaitingException;
  +import org.apache.geronimo.gbean.GBeanContext;
   import org.apache.geronimo.kernel.KernelMBean;
   import org.apache.geronimo.kernel.config.ConfigurationParent;
   import org.apache.geronimo.kernel.config.NoSuchConfigException;
  @@ -140,6 +141,9 @@
   
       public KernelMBean getKernel() {
           return kernel;
  +    }
  +
  +    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() throws WaitingException, Exception {
  
  
  
  1.2       +6 -1      incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainerImpl.java
  
  Index: JettyContainerImpl.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainerImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JettyContainerImpl.java	21 Jan 2004 20:01:52 -0000	1.1
  +++ JettyContainerImpl.java	22 Jan 2004 02:46:27 -0000	1.2
  @@ -60,6 +60,8 @@
   import org.apache.geronimo.gbean.GBeanInfoFactory;
   import org.apache.geronimo.gbean.GOperationInfo;
   import org.apache.geronimo.gbean.WaitingException;
  +import org.apache.geronimo.gbean.GBeanContext;
  +
   import org.mortbay.http.HttpContext;
   import org.mortbay.http.HttpListener;
   import org.mortbay.jetty.Server;
  @@ -90,6 +92,9 @@
   
       public void removeContext(HttpContext context) {
           server.removeContext(context);
  +    }
  +
  +    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() throws WaitingException, Exception {
  
  
  
  1.3       +5 -1      incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebApplicationContext.java
  
  Index: JettyWebApplicationContext.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebApplicationContext.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JettyWebApplicationContext.java	22 Jan 2004 00:52:22 -0000	1.2
  +++ JettyWebApplicationContext.java	22 Jan 2004 02:46:27 -0000	1.3
  @@ -81,6 +81,7 @@
   import org.apache.geronimo.gbean.GConstructorInfo;
   import org.apache.geronimo.gbean.GEndpointInfo;
   import org.apache.geronimo.gbean.WaitingException;
  +import org.apache.geronimo.gbean.GBeanContext;
   import org.apache.geronimo.naming.java.ReadOnlyContext;
   import org.apache.geronimo.naming.java.RootContext;
   import org.mortbay.http.HttpRequest;
  @@ -186,6 +187,9 @@
                   RootContext.setComponentContext(oldComponentContext);
               }
           }
  +    }
  +
  +    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() throws WaitingException, Exception {
  
  
  
  1.2       +5 -1      incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java
  
  Index: JettyConnector.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JettyConnector.java	21 Jan 2004 20:01:52 -0000	1.1
  +++ JettyConnector.java	22 Jan 2004 02:46:27 -0000	1.2
  @@ -61,6 +61,7 @@
   import org.apache.geronimo.gbean.GBeanInfoFactory;
   import org.apache.geronimo.gbean.WaitingException;
   import org.apache.geronimo.gbean.GEndpointInfo;
  +import org.apache.geronimo.gbean.GBeanContext;
   import org.apache.geronimo.jetty.JettyContainer;
   import org.mortbay.http.HttpListener;
   import org.mortbay.util.ThreadedServer;
  @@ -85,6 +86,9 @@
   
       public void setPort(int port) {
           listener.setPort(port);
  +    }
  +
  +    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() throws WaitingException, Exception {
  
  
  
  1.3       +2 -2      incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/GBean.java
  
  Index: GBean.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/GBean.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- GBean.java	20 Jan 2004 22:39:04 -0000	1.2
  +++ GBean.java	22 Jan 2004 02:46:27 -0000	1.3
  @@ -69,7 +69,7 @@
        * Sets the operating context for the GBean.
        * @param context the context object or null
        */
  -//    void setGBeanContext(GBeanContext context);
  +    void setGBeanContext(GBeanContext context);
   
       /**
        * Starts the GBean.  This informs the GBean that it is about to transition to the
running state.
  
  
  
  1.5       +6 -6      incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfo.java
  
  Index: GBeanInfo.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfo.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- GBeanInfo.java	16 Jan 2004 23:31:21 -0000	1.4
  +++ GBeanInfo.java	22 Jan 2004 02:46:27 -0000	1.5
  @@ -62,6 +62,7 @@
   import java.util.Iterator;
   import java.util.List;
   import java.util.Set;
  +import java.util.HashSet;
   
   import org.apache.geronimo.gbean.GAttributeInfo;
   
  @@ -113,16 +114,15 @@
       public GBeanInfo(String name, String className, Set attributes, GConstructorInfo constructor,
Set operations, Set endpoints, Set notifications) {
           this.name = name;
           this.className = className;
  -        this.attributes = Collections.unmodifiableSet(attributes);
  +        this.attributes = Collections.unmodifiableSet(new HashSet(attributes));
           if (constructor != null) {
               this.constructor = constructor;
           } else {
               this.constructor = new GConstructorInfo(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
           }
  -        this.operations = Collections.unmodifiableSet(operations);
  -        this.endpoints = Collections.unmodifiableSet(endpoints);
  -        this.notifications = Collections.unmodifiableSet(notifications);
  -
  +        this.operations = Collections.unmodifiableSet(new HashSet(operations));
  +        this.endpoints = Collections.unmodifiableSet(new HashSet(endpoints));
  +        this.notifications = Collections.unmodifiableSet(new HashSet(notifications));
       }
   
       public String getName() {
  
  
  
  1.5       +3 -3      incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/GBeanMBean.java
  
  Index: GBeanMBean.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/GBeanMBean.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- GBeanMBean.java	21 Jan 2004 19:44:29 -0000	1.4
  +++ GBeanMBean.java	22 Jan 2004 02:46:27 -0000	1.5
  @@ -311,7 +311,7 @@
               // we're now offically on line
               if (target instanceof GBean) {
                   GBean gbean = (GBean) target;
  -//                gbean.setGBeanContext(new GBeanMBeanContext(server, this, objectName));
  +                gbean.setGBeanContext(new GBeanMBeanContext(server, this, objectName));
               }
               offline = false;
           } else {
  @@ -341,7 +341,7 @@
   
           if (target instanceof GBean) {
               GBean gbean = (GBean) target;
  -//            gbean.setGBeanContext(null);
  +            gbean.setGBeanContext(null);
           }
   
           offline = true;
  
  
  
  1.7       +1 -13     incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java
  
  Index: Kernel.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Kernel.java	21 Jan 2004 22:53:42 -0000	1.6
  +++ Kernel.java	22 Jan 2004 02:46:27 -0000	1.7
  @@ -241,18 +241,6 @@
               throw new InvalidConfigException("Cannot set BaseURL", e);
           }
   
  -        // @todo replace this with use of the MBeanContext in the Configuration target
  -        try {
  -            config.setAttribute("MBeanServer", mbServer);
  -            config.setAttribute("ObjectName", configName);
  -        } catch (Exception e) {
  -            try {
  -                mbServer.unregisterMBean(configName);
  -            } catch (Exception e1) {
  -                // ignore
  -            }
  -            throw new InvalidConfigException("Cannot set MBeanServer info", e);
  -        }
           log.info("Loaded Configuration " + configName);
       }
   
  
  
  
  1.5       +32 -42    incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java
  
  Index: Configuration.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Configuration.java	16 Jan 2004 20:30:32 -0000	1.4
  +++ Configuration.java	22 Jan 2004 02:46:27 -0000	1.5
  @@ -89,7 +89,9 @@
   import org.apache.geronimo.gbean.GConstructorInfo;
   import org.apache.geronimo.gbean.GEndpointInfo;
   import org.apache.geronimo.gbean.jmx.GBeanMBean;
  +import org.apache.geronimo.gbean.jmx.GBeanMBeanContext;
   import org.apache.geronimo.gbean.GBean;
  +import org.apache.geronimo.gbean.GBeanContext;
   import org.apache.geronimo.kernel.Kernel;
   
   /**
  @@ -129,10 +131,9 @@
       private final List classPath;
       private final byte[] gbeanState;
   
  +    private GBeanMBeanContext context;
       private URL baseURL;
       private Map gbeans;
  -    private MBeanServer mbServer;
  -    private ObjectName objectName;
   
       private ClassLoader classLoader;
       private byte[] savedState;
  @@ -152,6 +153,10 @@
           this.classPath = classPath;
       }
   
  +    public void setGBeanContext(GBeanContext context) {
  +        this.context = (GBeanMBeanContext)context;
  +    }
  +
       public void doStart() throws Exception {
           // build classpath
           URL[] urls = new URL[classPath.size()];
  @@ -173,17 +178,19 @@
               Map.Entry entry = (Map.Entry) i.next();
               ObjectName name = (ObjectName) entry.getKey();
               GBeanMBean gbean = (GBeanMBean) entry.getValue();
  +            MBeanServer mbServer = context.getServer();
               mbServer.registerMBean(gbean, name);
  -            mbServer.invoke(Kernel.DEPENDENCY_SERVICE, "addDependency", new Object[] {
name, objectName}, new String[] {ObjectName.class.getName(), ObjectName.class.getName()});
  +            mbServer.invoke(Kernel.DEPENDENCY_SERVICE, "addDependency", new Object[] {
name, context.getObjectName()}, new String[] {ObjectName.class.getName(), ObjectName.class.getName()});
           }
       }
   
       public void doStop() {
           // unregister all GBeans
  +        MBeanServer mbServer = context.getServer();
           for (Iterator i = gbeans.keySet().iterator(); i.hasNext();) {
               ObjectName name = (ObjectName) i.next();
               try {
  -                mbServer.invoke(Kernel.DEPENDENCY_SERVICE, "removeDependency", new Object[]
{ name, objectName}, new String[] {ObjectName.class.getName(), ObjectName.class.getName()});
  +                mbServer.invoke(Kernel.DEPENDENCY_SERVICE, "removeDependency", new Object[]
{ name, context.getObjectName()}, new String[] {ObjectName.class.getName(), ObjectName.class.getName()});
               } catch (Exception e) {
                   // ignore
                   log.warn("Could not remove dependency for child "+name, e);
  @@ -236,22 +243,6 @@
           return classLoader;
       }
   
  -    public MBeanServer getMBeanServer() {
  -        return mbServer;
  -    }
  -
  -    public void setMBeanServer(MBeanServer mbServer) {
  -        this.mbServer = mbServer;
  -    }
  -
  -    public ObjectName getObjectName() {
  -        return objectName;
  -    }
  -
  -    public void setObjectName(ObjectName objectName) {
  -        this.objectName = objectName;
  -    }
  -
       public byte[] getSavedState() {
           return savedState;
       }
  @@ -361,30 +352,29 @@
       public static final GBeanInfo GBEAN_INFO;
   
       static {
  -        Set attrs = new HashSet();
  -        attrs.add(new GAttributeInfo("ID", true));
  -        attrs.add(new GAttributeInfo("ClassPath", true));
  -        attrs.add(new GAttributeInfo("GBeanState", true));
  -        attrs.add(new GAttributeInfo("BaseURL"));
  -        attrs.add(new GAttributeInfo("MBeanServer"));
  -        attrs.add(new GAttributeInfo("ObjectName"));
  -        attrs.add(new GAttributeInfo("ClassLoader"));
  -        attrs.add(new GAttributeInfo("SavedState"));
  -        List ctrNames = new ArrayList();
  -        ctrNames.add("ID");
  -        ctrNames.add("Parent");
  -        ctrNames.add("ClassPath");
  -        ctrNames.add("GBeanState");
  -        List ctrTypes = new ArrayList();
  -        ctrTypes.add(URI.class);
  -        ctrTypes.add(ConfigurationParent.class);
  -        ctrTypes.add(List.class);
  -        ctrTypes.add(byte[].class);
  -        GConstructorInfo ctr = new GConstructorInfo(ctrNames, ctrTypes);
  +        Set attributes = new HashSet();
  +        attributes.add(new GAttributeInfo("ID", true));
  +        attributes.add(new GAttributeInfo("ClassPath", true));
  +        attributes.add(new GAttributeInfo("GBeanState", true));
  +        attributes.add(new GAttributeInfo("BaseURL"));
  +        attributes.add(new GAttributeInfo("ObjectName"));
  +        attributes.add(new GAttributeInfo("ClassLoader"));
  +        attributes.add(new GAttributeInfo("SavedState"));
  +        List constructorNames = new ArrayList();
  +        constructorNames.add("ID");
  +        constructorNames.add("Parent");
  +        constructorNames.add("ClassPath");
  +        constructorNames.add("GBeanState");
  +        List constructorTypes = new ArrayList();
  +        constructorTypes.add(URI.class);
  +        constructorTypes.add(ConfigurationParent.class);
  +        constructorTypes.add(List.class);
  +        constructorTypes.add(byte[].class);
  +        GConstructorInfo constructor = new GConstructorInfo(constructorNames, constructorTypes);
           Set endpoints = new HashSet();
           endpoints.add(new GEndpointInfo("Parent", ConfigurationParent.class.getName()));
           Set operations = Collections.EMPTY_SET;
  -        GBEAN_INFO = new GBeanInfo(Configuration.class.getName(), attrs, ctr, operations,
endpoints, Collections.EMPTY_SET);
  +        GBEAN_INFO = new GBeanInfo(Configuration.class.getName(), attributes, constructor,
operations, endpoints, Collections.EMPTY_SET);
       }
   
       public static GBeanInfo getGBeanInfo() {
  
  
  
  1.4       +5 -1      incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/config/LocalConfigStore.java
  
  Index: LocalConfigStore.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/config/LocalConfigStore.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LocalConfigStore.java	14 Jan 2004 22:16:38 -0000	1.3
  +++ LocalConfigStore.java	22 Jan 2004 02:46:27 -0000	1.4
  @@ -83,6 +83,7 @@
   import org.apache.geronimo.gbean.WaitingException;
   import org.apache.geronimo.gbean.jmx.GBeanMBean;
   import org.apache.geronimo.gbean.GBean;
  +import org.apache.geronimo.gbean.GBeanContext;
   
   /**
    * Implementation of ConfigurationStore using the local filesystem.
  @@ -114,6 +115,9 @@
   
       public LocalConfigStore(File root) {
           this.root = root;
  +    }
  +
  +    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() throws WaitingException, FileNotFoundException, IOException {
  
  
  
  1.7       +5 -1      incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/jetty/JettyWebAccessLog.java
  
  Index: JettyWebAccessLog.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/jetty/JettyWebAccessLog.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JettyWebAccessLog.java	17 Jan 2004 17:02:38 -0000	1.6
  +++ JettyWebAccessLog.java	22 Jan 2004 02:46:27 -0000	1.7
  @@ -70,6 +70,7 @@
   import org.apache.geronimo.gbean.GConstructorInfo;
   import org.apache.geronimo.gbean.GOperationInfo;
   import org.apache.geronimo.gbean.GBean;
  +import org.apache.geronimo.gbean.GBeanContext;
   import org.apache.geronimo.kernel.service.GeronimoAttributeInfo;
   import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
   import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
  @@ -161,6 +162,9 @@
       }
   
       public void setMBeanContext(GeronimoMBeanContext context) {
  +    }
  +
  +    public void setGBeanContext(GBeanContext context) {
       }
   
       public boolean canStart() {
  
  
  
  1.11      +5 -1      incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/jetty/JettyWebConnector.java
  
  Index: JettyWebConnector.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/jetty/JettyWebConnector.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- JettyWebConnector.java	17 Jan 2004 17:02:38 -0000	1.10
  +++ JettyWebConnector.java	22 Jan 2004 02:46:27 -0000	1.11
  @@ -65,6 +65,7 @@
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
   import org.apache.geronimo.gbean.GOperationInfo;
  +import org.apache.geronimo.gbean.GBeanContext;
   import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
   import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
   import org.apache.geronimo.kernel.service.GeronimoMBeanTarget;
  @@ -143,6 +144,9 @@
       }
   
       public void setMBeanContext(GeronimoMBeanContext context) {
  +    }
  +
  +    public void setGBeanContext(GBeanContext context) {
       }
   
       public boolean canStart() {
  
  
  
  1.2       +5 -1      incubator-geronimo/modules/web/src/java/org/apache/geronimo/webdav/CatalinaDAVRepository.java
  
  Index: CatalinaDAVRepository.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/web/src/java/org/apache/geronimo/webdav/CatalinaDAVRepository.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CatalinaDAVRepository.java	20 Jan 2004 14:58:08 -0000	1.1
  +++ CatalinaDAVRepository.java	22 Jan 2004 02:46:28 -0000	1.2
  @@ -74,6 +74,7 @@
   import org.apache.geronimo.gbean.GBeanInfoFactory;
   import org.apache.geronimo.gbean.GConstructorInfo;
   import org.apache.geronimo.gbean.WaitingException;
  +import org.apache.geronimo.gbean.GBeanContext;
   import org.apache.naming.resources.FileDirContext;
   
   /**
  @@ -186,6 +187,9 @@
   
       public Map getServletInitParam() {
           return Collections.unmodifiableMap(servletInitParam);
  +    }
  +
  +    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() throws WaitingException, Exception {
  
  
  
  1.2       +11 -1     incubator-geronimo/modules/web/src/java/org/apache/geronimo/webdav/jetty/JettyConnectorImpl.java
  
  Index: JettyConnectorImpl.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/web/src/java/org/apache/geronimo/webdav/jetty/JettyConnectorImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JettyConnectorImpl.java	20 Jan 2004 14:58:08 -0000	1.1
  +++ JettyConnectorImpl.java	22 Jan 2004 02:46:28 -0000	1.2
  @@ -63,6 +63,7 @@
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
   import org.apache.geronimo.gbean.WaitingException;
  +import org.apache.geronimo.gbean.GBeanContext;
   import org.apache.geronimo.webdav.AbstractConnector;
   import org.mortbay.http.HttpListener;
   import org.mortbay.http.SocketListener;
  @@ -125,6 +126,9 @@
           }
       }
   
  +    public void setGBeanContext(GBeanContext context) {
  +    }
  +
       public void doStart() throws WaitingException, Exception {
           log.info("Starting Jetty Connector");
           lifeCycleState.doStart();
  @@ -154,6 +158,9 @@
       }
   
       private class DefinedListenerState implements GBean {
  +        public void setGBeanContext(GBeanContext context) {
  +        }
  +
           public void doStart() throws WaitingException, Exception {
               if ( listener.isStarted() ) {
                   return;            
  @@ -184,6 +191,9 @@
       }
   
       private class UndefinedListenerState implements GBean {
  +        public void setGBeanContext(GBeanContext context) {
  +        }
  +
           public void doStart() throws WaitingException, Exception {
               HttpListener tmpListener;
               try {
  
  
  
  1.2       +5 -1      incubator-geronimo/modules/web/src/java/org/apache/geronimo/webdav/jetty/JettyDAVServer.java
  
  Index: JettyDAVServer.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/web/src/java/org/apache/geronimo/webdav/jetty/JettyDAVServer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JettyDAVServer.java	20 Jan 2004 14:58:08 -0000	1.1
  +++ JettyDAVServer.java	22 Jan 2004 02:46:28 -0000	1.2
  @@ -71,6 +71,7 @@
   import org.apache.geronimo.gbean.GBeanInfoFactory;
   import org.apache.geronimo.gbean.GEndpointInfo;
   import org.apache.geronimo.gbean.WaitingException;
  +import org.apache.geronimo.gbean.GBeanContext;
   import org.apache.geronimo.webdav.DAVRepository;
   import org.apache.geronimo.webdav.DAVServer;
   import org.mortbay.http.HttpListener;
  @@ -272,6 +273,9 @@
   
       public Collection getConnectors() {
           return connectors;
  +    }
  +
  +    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() throws WaitingException, Exception {
  
  
  

Mime
View raw message