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/system/src/java/org/apache/geronimo/system/url GeronimoURLFactory.java
Date Sat, 05 Jun 2004 07:14:30 GMT
dain        2004/06/05 00:14:30

  Modified:    modules/connector/src/java/org/apache/geronimo/connector
                        AdminObjectWrapper.java ResourceAdapterWrapper.java
               modules/connector/src/java/org/apache/geronimo/connector/outbound
                        AbstractConnectionManager.java
                        ManagedConnectionFactoryWrapper.java
               modules/connector/src/java/org/apache/geronimo/connector/outbound/transactionlog
                        JDBCLog.java
               modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local
                        LocalServer.java
               modules/jetty/src/java/org/apache/geronimo/jetty/connector
                        JettyConnector.java
               modules/jetty/src/java/org/apache/geronimo/jetty
                        JAASJettyRealm.java JettyContainerImpl.java
                        JettyWebApplicationContext.java
               modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting
                        JMXConnector.java
               modules/kernel/src/java/org/apache/geronimo/gbean GBean.java
               modules/kernel/src/java/org/apache/geronimo/gbean/jmx
                        GBeanMBean.java
               modules/kernel/src/java/org/apache/geronimo/kernel/config
                        Configuration.java
               modules/kernel/src/test/org/apache/geronimo/gbean
                        GBeanInfoFactoryTest.java
               modules/network/src/java/org/apache/geronimo/network
                        SelectorManager.java
               modules/remoting/src/java/org/apache/geronimo/remoting/jmx
                        MBeanServerStub.java
               modules/remoting/src/java/org/apache/geronimo/remoting/router
                        AbstractInterceptorRouter.java
                        AbstractRouterRouter.java
               modules/remoting/src/java/org/apache/geronimo/remoting/transport
                        TransportLoader.java
               modules/security/src/java/org/apache/geronimo/security/jaas
                        ConfigurationEntry.java
                        GeronimoLoginConfiguration.java LoginService.java
               modules/security/src/java/org/apache/geronimo/security/jacc
                        AbstractModuleConfiguration.java
               modules/security/src/java/org/apache/geronimo/security/realm/providers
                        AbstractSecurityRealm.java
               modules/security/src/java/org/apache/geronimo/security/remoting/jmx
                        LoginServiceStub.java
               modules/security/src/java/org/apache/geronimo/security
                        SecurityService.java
               modules/system/src/java/org/apache/geronimo/system
                        ClockPool.java RMIRegistryService.java
                        ThreadPool.java
               modules/system/src/java/org/apache/geronimo/system/configuration
                        LocalConfigStore.java
               modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender
                        AbstractAppenderService.java
               modules/system/src/java/org/apache/geronimo/system/logging/log4j
                        Log4jService.java
               modules/system/src/java/org/apache/geronimo/system/repository
                        ReadOnlyRepository.java
               modules/system/src/java/org/apache/geronimo/system/url
                        GeronimoURLFactory.java
  Log:
  Removed setGBeanContext
  Replaced any use of gbeanContext with a GBean attribute
  
  Revision  Changes    Path
  1.8       +1 -6      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/AdminObjectWrapper.java
  
  Index: AdminObjectWrapper.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/AdminObjectWrapper.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AdminObjectWrapper.java	5 Jun 2004 01:40:09 -0000	1.7
  +++ AdminObjectWrapper.java	5 Jun 2004 07:14:29 -0000	1.8
  @@ -25,7 +25,6 @@
   import org.apache.geronimo.gbean.DynamicGBean;
   import org.apache.geronimo.gbean.DynamicGBeanDelegate;
   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.WaitingException;
  @@ -79,10 +78,6 @@
   
       public Object getMethodInterceptor() {
           return interceptor;
  -    }
  -
  -    //gbean implementation
  -    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() throws WaitingException, Exception {
  
  
  
  1.9       +2 -9      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterWrapper.java
  
  Index: ResourceAdapterWrapper.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterWrapper.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ResourceAdapterWrapper.java	2 Jun 2004 05:33:01 -0000	1.8
  +++ ResourceAdapterWrapper.java	5 Jun 2004 07:14:29 -0000	1.9
  @@ -26,17 +26,13 @@
   import org.apache.geronimo.gbean.DynamicGBean;
   import org.apache.geronimo.gbean.DynamicGBeanDelegate;
   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.WaitingException;
   
   /**
  - *
  - *
    * @version $Revision$ $Date$
  - *
  - * */
  + */
   public class ResourceAdapterWrapper implements GBean, DynamicGBean {
   
       public static final GBeanInfo GBEAN_INFO;
  @@ -80,9 +76,6 @@
   
       public void endpointDeactivation(MessageEndpointFactory messageEndpointFactory, ActivationSpec activationSpec) {
           resourceAdapter.endpointDeactivation(messageEndpointFactory, activationSpec);
  -    }
  -
  -    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() throws WaitingException, Exception {
  
  
  
  1.3       +5 -22     incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/AbstractConnectionManager.java
  
  Index: AbstractConnectionManager.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/AbstractConnectionManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractConnectionManager.java	2 Jun 2004 05:33:02 -0000	1.2
  +++ AbstractConnectionManager.java	5 Jun 2004 07:14:29 -0000	1.3
  @@ -24,27 +24,20 @@
   import javax.resource.spi.ManagedConnectionFactory;
   
   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.WaitingException;
   
   /**
  - *
  - *
    * @version $Revision$ $Date$
  - *
  - * */
  + */
   public abstract class AbstractConnectionManager implements ConnectionManagerFactory, GBean, ConnectionManager, LazyAssociatableConnectionManager {
       protected ConnectionInterceptor stack;
   
       public AbstractConnectionManager() {
       }
   
  -    public void setGBeanContext(GBeanContext context) {
  -    }
  -
  -    public void doStart()  throws WaitingException, Exception{
  +    public void doStart() throws WaitingException, Exception {
           setUpConnectionManager();
       }
   
  @@ -64,13 +57,8 @@
       /**
        * in: mcf != null, is a deployed mcf
        * out: useable connection object.
  -     * @param managedConnectionFactory
  -     * @param connectionRequestInfo
  -     * @return
  -     * @throws javax.resource.ResourceException
        */
  -    public Object allocateConnection(
  -            ManagedConnectionFactory managedConnectionFactory,
  +    public Object allocateConnection(ManagedConnectionFactory managedConnectionFactory,
               ConnectionRequestInfo connectionRequestInfo)
               throws ResourceException {
           ManagedConnectionInfo mci = new ManagedConnectionInfo(managedConnectionFactory, connectionRequestInfo);
  @@ -83,13 +71,8 @@
        * in: non-null connection object, from non-null mcf.
        * connection object is not associated with a managed connection
        * out: supplied connection object is assiciated with a non-null ManagedConnection from mcf.
  -     * @param connection
  -     * @param managedConnectionFactory
  -     * @param connectionRequestInfo
  -     * @throws javax.resource.ResourceException
        */
  -    public void associateConnection(
  -            Object connection,
  +    public void associateConnection(Object connection,
               ManagedConnectionFactory managedConnectionFactory,
               ConnectionRequestInfo connectionRequestInfo)
               throws ResourceException {
  
  
  
  1.12      +1 -5      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java
  
  Index: ManagedConnectionFactoryWrapper.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ManagedConnectionFactoryWrapper.java	5 Jun 2004 01:40:09 -0000	1.11
  +++ ManagedConnectionFactoryWrapper.java	5 Jun 2004 07:14:29 -0000	1.12
  @@ -32,7 +32,6 @@
   import org.apache.geronimo.gbean.DynamicGBean;
   import org.apache.geronimo.gbean.DynamicGBeanDelegate;
   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.WaitingException;
  @@ -153,9 +152,6 @@
   
       public void setConnectionManagerFactory(ConnectionManagerFactory connectionManagerFactory) {
           this.connectionManagerFactory = connectionManagerFactory;
  -    }
  -
  -    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() throws WaitingException, Exception {
  
  
  
  1.4       +5 -12     incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/transactionlog/JDBCLog.java
  
  Index: JDBCLog.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/transactionlog/JDBCLog.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JDBCLog.java	2 Jun 2004 05:33:02 -0000	1.3
  +++ JDBCLog.java	5 Jun 2004 07:14:29 -0000	1.4
  @@ -23,13 +23,11 @@
   import java.sql.SQLException;
   import java.util.ArrayList;
   import java.util.List;
  -
   import javax.sql.DataSource;
   import javax.transaction.xa.Xid;
   
   import org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrapper;
   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.WaitingException;
  @@ -38,11 +36,8 @@
   import org.apache.geronimo.transaction.manager.XidImpl;
   
   /**
  - *
  - *
    * @version $Revision$ $Date$
  - *
  - * */
  + */
   public class JDBCLog implements TransactionLog, GBean {
       private final static String INSERT_XID = "INSERT INTO TXLOG (SYSTEMID, FORMATID, GLOBALID, BRANCHID) VALUES (?, ?, ?, ?)";
       private final static String DELETE_XID = "DELETE FROM TXLOG WHERE SYSTEMID = ? AND FORMATID = ? AND GLOBALID = ? BRANCHID = ?";
  @@ -57,11 +52,8 @@
           this.managedConnectionFactoryWrapper = managedConnectionFactoryWrapper;
       }
   
  -    public void setGBeanContext(GBeanContext context) {
  -    }
  -
       public void doStart() throws WaitingException, Exception {
  -        dataSource = (DataSource)managedConnectionFactoryWrapper.getProxy();
  +        dataSource = (DataSource) managedConnectionFactoryWrapper.getProxy();
       }
   
       public void doStop() throws WaitingException, Exception {
  @@ -70,6 +62,7 @@
   
       public void doFail() {
       }
  +
       public void begin(Xid xid) throws LogException {
       }
   
  @@ -107,7 +100,7 @@
       }
   
       public void rollback(Xid xid) throws LogException {
  -            throw new LogException("JDBCLog does not support rollback of prepared transactions.  Use it only on servers that do not import transactions");
  +        throw new LogException("JDBCLog does not support rollback of prepared transactions.  Use it only on servers that do not import transactions");
       }
   
       public List recover() throws LogException {
  
  
  
  1.12      +1 -7      incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/LocalServer.java
  
  Index: LocalServer.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/LocalServer.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- LocalServer.java	2 Jun 2004 19:50:40 -0000	1.11
  +++ LocalServer.java	5 Jun 2004 07:14:29 -0000	1.12
  @@ -33,7 +33,6 @@
   import org.apache.geronimo.deployment.plugin.FailedProgressObject;
   import org.apache.geronimo.deployment.plugin.TargetImpl;
   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.WaitingException;
  @@ -47,8 +46,6 @@
   import org.apache.xmlbeans.XmlObject;
   
   /**
  - *
  - *
    * @version $Revision$ $Date$
    */
   public class LocalServer implements DeploymentServer, GBean {
  @@ -130,9 +127,6 @@
       }
   
       public void release() {
  -    }
  -
  -    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() throws WaitingException, Exception {
  
  
  
  1.7       +1 -9      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JettyConnector.java	2 Jun 2004 05:33:03 -0000	1.6
  +++ JettyConnector.java	5 Jun 2004 07:14:29 -0000	1.7
  @@ -17,20 +17,15 @@
   
   package org.apache.geronimo.jetty.connector;
   
  -import org.apache.geronimo.gbean.GAttributeInfo;
   import org.apache.geronimo.gbean.GBean;
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
   import org.apache.geronimo.gbean.WaitingException;
  -import org.apache.geronimo.gbean.GReferenceInfo;
  -import org.apache.geronimo.gbean.GBeanContext;
   import org.apache.geronimo.jetty.JettyContainer;
   import org.mortbay.http.HttpListener;
   import org.mortbay.util.ThreadedServer;
   
   /**
  - *
  - *
    * @version $Revision$ $Date$
    */
   public abstract class JettyConnector implements GBean {
  @@ -48,9 +43,6 @@
   
       public void setPort(int port) {
           listener.setPort(port);
  -    }
  -
  -    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() throws WaitingException, Exception {
  
  
  
  1.3       +1 -5      incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/JAASJettyRealm.java
  
  Index: JAASJettyRealm.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/JAASJettyRealm.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JAASJettyRealm.java	2 Jun 2004 05:33:03 -0000	1.2
  +++ JAASJettyRealm.java	5 Jun 2004 07:14:29 -0000	1.3
  @@ -24,7 +24,6 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   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.WaitingException;
  @@ -130,9 +129,6 @@
   
       public void logout(Principal user) {
           log.warn(LogSupport.NOT_IMPLEMENTED);
  -    }
  -
  -    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() throws WaitingException, Exception {
  
  
  
  1.7       +1 -5      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JettyContainerImpl.java	2 Jun 2004 05:33:03 -0000	1.6
  +++ JettyContainerImpl.java	5 Jun 2004 07:14:29 -0000	1.7
  @@ -18,7 +18,6 @@
   package org.apache.geronimo.jetty;
   
   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.WaitingException;
  @@ -60,9 +59,6 @@
   
       public void removeRealm(UserRealm realm) {
           server.removeRealm(realm.getName());
  -    }
  -
  -    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() throws WaitingException, Exception {
  
  
  
  1.20      +17 -21    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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- JettyWebApplicationContext.java	4 Jun 2004 17:47:31 -0000	1.19
  +++ JettyWebApplicationContext.java	5 Jun 2004 07:14:29 -0000	1.20
  @@ -21,7 +21,6 @@
   import java.net.MalformedURLException;
   import java.net.URI;
   import java.net.URL;
  -import java.util.Arrays;
   import java.util.Set;
   import javax.resource.ResourceException;
   import javax.security.jacc.PolicyConfiguration;
  @@ -32,9 +31,7 @@
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.apache.geronimo.transaction.DefaultInstanceContext;
   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.WaitingException;
  @@ -43,6 +40,7 @@
   import org.apache.geronimo.naming.java.RootContext;
   import org.apache.geronimo.security.GeronimoSecurityException;
   import org.apache.geronimo.security.deploy.Security;
  +import org.apache.geronimo.transaction.DefaultInstanceContext;
   import org.apache.geronimo.transaction.InstanceContext;
   import org.apache.geronimo.transaction.TrackedConnectionAssociator;
   import org.apache.geronimo.transaction.TransactionContext;
  @@ -85,15 +83,15 @@
       }
   
       public JettyWebApplicationContext(ConfigurationParent config,
  -                                      URI uri,
  -                                      JettyContainer container,
  -                                      ReadOnlyContext compContext,
  -                                      String policyContextID,
  -                                      Set unshareableResources,
  -                                      Set applicationManagedSecurityResources,
  -                                      TransactionManager txManager,
  -                                      TrackedConnectionAssociator associator,
  -                                      UserTransactionImpl userTransaction) {
  +            URI uri,
  +            JettyContainer container,
  +            ReadOnlyContext compContext,
  +            String policyContextID,
  +            Set unshareableResources,
  +            Set applicationManagedSecurityResources,
  +            TransactionManager txManager,
  +            TrackedConnectionAssociator associator,
  +            UserTransactionImpl userTransaction) {
           super();
           this.config = config;
           this.uri = uri;
  @@ -127,7 +125,7 @@
        * setContextPriorityClassLoader.
        *
        * @param b True if this context should give web application class in preference over the containers
  -     *          classes, as per the servlet specification recommendations.
  +     * classes, as per the servlet specification recommendations.
        */
       public void setContextPriorityClassLoader(boolean b) {
           contextPriorityClassLoader = b;
  @@ -156,14 +154,15 @@
           }
           super.initClassLoader(forceContextLoader);
   
  -        if (log.isDebugEnabled())
  +        if (log.isDebugEnabled()) {
               log.debug("classloader for " + getContextPath() + ": " + getClassLoader());
  +        }
       }
   
       public void handle(String pathInContext,
  -                       String pathParams,
  -                       HttpRequest httpRequest,
  -                       HttpResponse httpResponse)
  +            String pathParams,
  +            HttpRequest httpRequest,
  +            HttpResponse httpResponse)
               throws HttpException, IOException {
   
           // save previous state
  @@ -212,9 +211,6 @@
               return false;
           }
           return true;
  -    }
  -
  -    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() throws WaitingException, Exception {
  
  
  
  1.5       +1 -5      incubator-geronimo/modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/JMXConnector.java
  
  Index: JMXConnector.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/JMXConnector.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JMXConnector.java	5 Jun 2004 01:40:09 -0000	1.4
  +++ JMXConnector.java	5 Jun 2004 07:14:29 -0000	1.5
  @@ -25,7 +25,6 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   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.WaitingException;
  @@ -92,9 +91,6 @@
        */
       public void setURL(String url) {
           this.url = url;
  -    }
  -
  -    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() throws WaitingException, Exception {
  
  
  
  1.8       +1 -8      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- GBean.java	27 May 2004 01:05:58 -0000	1.7
  +++ GBean.java	5 Jun 2004 07:14:29 -0000	1.8
  @@ -26,13 +26,6 @@
    */
   public interface GBean {
       /**
  -     * Sets the operating context for the GBean.
  -     *
  -     * @param context the context object or null
  -     */
  -    void setGBeanContext(GBeanContext context);
  -
  -    /**
        * Starts the GBean.  This informs the GBean that it is about to transition to the running state.
        *
        * @throws org.apache.geronimo.gbean.WaitingException if the target is waiting for an external condition before it can fully start
  
  
  
  1.23      +4 -22     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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- GBeanMBean.java	5 Jun 2004 00:37:16 -0000	1.22
  +++ GBeanMBean.java	5 Jun 2004 07:14:29 -0000	1.23
  @@ -72,7 +72,7 @@
   
       private static final Log log = LogFactory.getLog(GBeanMBean.class);
       private final Constructor constructor;
  -    private GBeanMBeanContext gbeanContext;
  +    private final GBeanMBeanContext gbeanContext;
   
       /**
        * Gets the context class loader from the thread or the system class loader if there is no context class loader.
  @@ -261,6 +261,8 @@
                   (MBeanNotificationInfo[]) notifications.toArray(new MBeanNotificationInfo[notifications.size()]));
   
           rawInvoker = new RawInvoker(this);
  +
  +        gbeanContext = new GBeanMBeanContext(this);
       }
   
       /**
  @@ -431,7 +433,6 @@
       }
   
       public Object getTarget() {
  -        // todo this seems like a really realy bad idea
           return target;
       }
   
  @@ -476,7 +477,6 @@
       public synchronized ObjectName preRegister(MBeanServer server, ObjectName objectName) throws Exception {
           ObjectName returnValue = super.preRegister(server, objectName);
   
  -        gbeanContext = new GBeanMBeanContext(this);
           setAttribute("objectName", getObjectName());
           setAttribute("gbeanContext", gbeanContext);
           setAttribute("classLoader", classLoader);
  @@ -542,12 +542,6 @@
               }
           }
   
  -        // set the gbean context
  -        if (target instanceof GBean) {
  -            GBean gbean = (GBean) target;
  -            gbean.setGBeanContext(gbeanContext);
  -        }
  -
           return returnValue;
       }
   
  @@ -563,12 +557,6 @@
                   references[i].offline();
               }
   
  -            gbeanContext = null;
  -            if (target instanceof GBean) {
  -                GBean gbean = (GBean) target;
  -                gbean.setGBeanContext(null);
  -            }
  -
               // well that didn't work, ditch the instance
               target = null;
           }
  @@ -583,12 +571,6 @@
           // take all of the reference offline
           for (int i = 0; i < references.length; i++) {
               references[i].offline();
  -        }
  -
  -        gbeanContext = null;
  -        if (target instanceof GBean) {
  -            GBean gbean = (GBean) target;
  -            gbean.setGBeanContext(null);
           }
   
           offline = true;
  
  
  
  1.22      +1 -5      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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- Configuration.java	5 Jun 2004 00:37:16 -0000	1.21
  +++ Configuration.java	5 Jun 2004 07:14:29 -0000	1.22
  @@ -45,7 +45,6 @@
   import org.apache.commons.logging.LogFactory;
   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.GReferenceInfo;
  @@ -124,9 +123,6 @@
           this.classPath = classPath;
           this.dependencies = dependencies;
           this.repositories = repositories;
  -    }
  -
  -    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() throws Exception {
  
  
  
  1.6       +11 -11    incubator-geronimo/modules/kernel/src/test/org/apache/geronimo/gbean/GBeanInfoFactoryTest.java
  
  Index: GBeanInfoFactoryTest.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/test/org/apache/geronimo/gbean/GBeanInfoFactoryTest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- GBeanInfoFactoryTest.java	2 Jun 2004 05:33:03 -0000	1.5
  +++ GBeanInfoFactoryTest.java	5 Jun 2004 07:14:29 -0000	1.6
  @@ -36,7 +36,8 @@
           try {
               new GBeanInfoFactory((String) null);
               fail("IllegalArgumentException expected");
  -        } catch (IllegalArgumentException expected) {}
  +        } catch (IllegalArgumentException expected) {
  +        }
   
           final String gbeanName = "gbeanName";
           GBeanInfoFactory gbeanInfoFactory = new GBeanInfoFactory(gbeanName);
  @@ -52,7 +53,8 @@
           try {
               new GBeanInfoFactory((Class) null);
               fail("IllegalArgumentException expected");
  -        } catch (IllegalArgumentException expected) {}
  +        } catch (IllegalArgumentException expected) {
  +        }
   
           final Class className = String.class;
           GBeanInfoFactory gbeanInfoFactory = new GBeanInfoFactory(className);
  @@ -67,7 +69,8 @@
           try {
               new GBeanInfoFactory((Class) null, null);
               fail("IllegalArgumentException expected");
  -        } catch (IllegalArgumentException expected) {}
  +        } catch (IllegalArgumentException expected) {
  +        }
       }
   
       /*
  @@ -77,7 +80,8 @@
           try {
               new GBeanInfoFactory((Class) null, (GBeanInfo) null);
               fail("IllegalArgumentException expected");
  -        } catch (IllegalArgumentException expected) {}
  +        } catch (IllegalArgumentException expected) {
  +        }
   
           final Class className = String.class;
           GBeanInfoFactory gbeanInfoFactory = new GBeanInfoFactory(className, MockGBean.getGBeanInfo());
  @@ -101,18 +105,14 @@
           gbeanInfoFactory = new GBeanInfoFactory("");
           gbeanInfoFactory.addInterface(GBean.class);
           GBeanInfo gbeanInfo = gbeanInfoFactory.getBeanInfo();
  -        assertTrue(gbeanInfo.getAttributes().size() == 1);
  -        GAttributeInfo gattrInfo = (GAttributeInfo) gbeanInfo.getAttributes().iterator().next();
  -        assertEquals("GBeanContext", gattrInfo.getName());
  -        assertEquals("setGBeanContext", gattrInfo.getSetterName());
  -        assertNull(gattrInfo.getGetterName());
  +        assertTrue(gbeanInfo.getAttributes().size() == 0);
           assertTrue(gbeanInfo.getOperations().size() == 3);
   
           gbeanInfoFactory = new GBeanInfoFactory("");
           gbeanInfoFactory.addInterface(SetterOnlyInterface.class);
           gbeanInfo = gbeanInfoFactory.getBeanInfo();
           assertEquals(1, gbeanInfo.getAttributes().size());
  -        gattrInfo = (GAttributeInfo) gbeanInfo.getAttributes().iterator().next();
  +        GAttributeInfo gattrInfo = (GAttributeInfo) gbeanInfo.getAttributes().iterator().next();
           assertEquals("Int", gattrInfo.getName());
           assertEquals("setInt", gattrInfo.getSetterName());
           assertNull(gattrInfo.getGetterName());
  
  
  
  1.10      +1 -6      incubator-geronimo/modules/network/src/java/org/apache/geronimo/network/SelectorManager.java
  
  Index: SelectorManager.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/network/src/java/org/apache/geronimo/network/SelectorManager.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- SelectorManager.java	2 Jun 2004 05:33:04 -0000	1.9
  +++ SelectorManager.java	5 Jun 2004 07:14:29 -0000	1.10
  @@ -29,9 +29,7 @@
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -
   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.WaitingException;
  @@ -234,9 +232,6 @@
               selector.wakeup();
               selectorKey.interestOps(selectorKey.interestOps() | addOpts);
           }
  -    }
  -
  -    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() throws WaitingException, Exception {
  
  
  
  1.15      +1 -5      incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/jmx/MBeanServerStub.java
  
  Index: MBeanServerStub.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/jmx/MBeanServerStub.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- MBeanServerStub.java	4 Jun 2004 22:31:56 -0000	1.14
  +++ MBeanServerStub.java	5 Jun 2004 07:14:29 -0000	1.15
  @@ -21,7 +21,6 @@
   
   import org.apache.geronimo.core.service.Interceptor;
   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.kernel.Kernel;
  @@ -58,9 +57,6 @@
   
       public void setRouter(JMXRouter router) {
           this.router = router;
  -    }
  -
  -    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() {
  
  
  
  1.9       +6 -19     incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/router/AbstractInterceptorRouter.java
  
  Index: AbstractInterceptorRouter.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/router/AbstractInterceptorRouter.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- AbstractInterceptorRouter.java	10 Mar 2004 09:59:19 -0000	1.8
  +++ AbstractInterceptorRouter.java	5 Jun 2004 07:14:29 -0000	1.9
  @@ -18,28 +18,21 @@
   package org.apache.geronimo.remoting.router;
   
   import java.net.URI;
  -import java.util.Set;
  -import java.util.HashSet;
   
  +import EDU.oswego.cs.dl.util.concurrent.Latch;
  +import EDU.oswego.cs.dl.util.concurrent.Sync;
  +import EDU.oswego.cs.dl.util.concurrent.TimeoutSync;
   import org.apache.geronimo.core.service.Interceptor;
   import org.apache.geronimo.core.service.InvocationResult;
   import org.apache.geronimo.core.service.SimpleInvocation;
   import org.apache.geronimo.gbean.GBean;
  -import org.apache.geronimo.gbean.GBeanContext;
   import org.apache.geronimo.gbean.GBeanInfo;
  -import org.apache.geronimo.gbean.GReferenceInfo;
  -import org.apache.geronimo.gbean.GOperationInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
  -import org.apache.geronimo.gbean.jmx.GBeanMBeanContext;
   import org.apache.geronimo.remoting.InvocationSupport;
   import org.apache.geronimo.remoting.MarshalledObject;
   import org.apache.geronimo.remoting.transport.Msg;
   import org.apache.geronimo.remoting.transport.TransportException;
   
  -import EDU.oswego.cs.dl.util.concurrent.Latch;
  -import EDU.oswego.cs.dl.util.concurrent.Sync;
  -import EDU.oswego.cs.dl.util.concurrent.TimeoutSync;
  -
   /**
    * @version $Revision$ $Date$
    */
  @@ -51,8 +44,6 @@
        */
       private Sync routerLock = createNewRouterLock();
   
  -    protected GBeanMBeanContext context;
  -
       public long getStoppedRoutingTimeout() {
           return stoppedRoutingTimeout;
       }
  @@ -106,10 +97,6 @@
   
       abstract protected Interceptor lookupInterceptorFrom(URI to) throws Throwable;
   
  -    public void setGBeanContext(GBeanContext context) {
  -        this.context = (GBeanMBeanContext) context;
  -    }
  -
       public void doStart() {
           routerLock.release();
       }
  @@ -126,8 +113,8 @@
   
       static {
           GBeanInfoFactory infoFactory = new GBeanInfoFactory(AbstractInterceptorRouter.class);
  -        infoFactory.addOperation("sendRequest", new Class[] {URI.class, Msg.class});
  -        infoFactory.addOperation("sendDatagram", new Class[] {URI.class, Msg.class});
  +        infoFactory.addOperation("sendRequest", new Class[]{URI.class, Msg.class});
  +        infoFactory.addOperation("sendDatagram", new Class[]{URI.class, Msg.class});
           GBEAN_INFO = infoFactory.getBeanInfo();
       }
   
  
  
  
  1.6       +6 -11     incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/router/AbstractRouterRouter.java
  
  Index: AbstractRouterRouter.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/router/AbstractRouterRouter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractRouterRouter.java	10 Mar 2004 09:59:19 -0000	1.5
  +++ AbstractRouterRouter.java	5 Jun 2004 07:14:29 -0000	1.6
  @@ -19,17 +19,14 @@
   
   import java.net.URI;
   
  -import org.apache.geronimo.gbean.GBean;
  -import org.apache.geronimo.gbean.GBeanContext;
  -import org.apache.geronimo.remoting.transport.Msg;
  -import org.apache.geronimo.remoting.transport.TransportException;
  -
   import EDU.oswego.cs.dl.util.concurrent.Latch;
   import EDU.oswego.cs.dl.util.concurrent.Sync;
   import EDU.oswego.cs.dl.util.concurrent.TimeoutSync;
  +import org.apache.geronimo.gbean.GBean;
  +import org.apache.geronimo.remoting.transport.Msg;
  +import org.apache.geronimo.remoting.transport.TransportException;
   
   /**
  - *
    * @version $Revision$ $Date$
    */
   public abstract class AbstractRouterRouter implements GBean, Router {
  @@ -57,8 +54,9 @@
           try {
               routerLock.acquire();
               Router next = lookupRouterFrom(to);
  -            if (next == null)
  +            if (next == null) {
                   throw new TransportException("No route is available to: " + to);
  +            }
   
               return next.sendRequest(to, msg);
   
  @@ -79,9 +77,6 @@
       }
   
       abstract protected Router lookupRouterFrom(URI to);
  -
  -    public void setGBeanContext(GBeanContext context) {
  -    }
   
       public void doStart() {
           routerLock.release();
  
  
  
  1.11      +5 -8      incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/transport/TransportLoader.java
  
  Index: TransportLoader.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/transport/TransportLoader.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- TransportLoader.java	2 Jun 2004 05:33:04 -0000	1.10
  +++ TransportLoader.java	5 Jun 2004 07:14:30 -0000	1.11
  @@ -19,13 +19,12 @@
   
   import java.net.URI;
   
  +import org.apache.commons.logging.Log;
  +import org.apache.commons.logging.LogFactory;
   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.remoting.router.Router;
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
   
   /**
    * @version $Revision$ $Date$
  @@ -53,12 +52,10 @@
       }
   
       public URI getClientConnectURI() {
  -        if (transportServer == null)
  +        if (transportServer == null) {
               return null;
  +        }
           return transportServer.getClientConnectURI();
  -    }
  -
  -    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() throws Exception {
  
  
  
  1.9       +1 -5      incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/jaas/ConfigurationEntry.java
  
  Index: ConfigurationEntry.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/jaas/ConfigurationEntry.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ConfigurationEntry.java	4 Jun 2004 22:31:56 -0000	1.8
  +++ ConfigurationEntry.java	5 Jun 2004 07:14:30 -0000	1.9
  @@ -21,7 +21,6 @@
   import javax.security.auth.login.AppConfigurationEntry;
   
   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.WaitingException;
  @@ -87,9 +86,6 @@
   
       public void setOptions(Properties options) {
           this.options = options == null ? new Properties() : options;
  -    }
  -
  -    public void setGBeanContext(GBeanContext context) {
       }
   
       public abstract AppConfigurationEntry[] getAppConfigurationEntry();
  
  
  
  1.8       +3 -7      incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/jaas/GeronimoLoginConfiguration.java
  
  Index: GeronimoLoginConfiguration.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/jaas/GeronimoLoginConfiguration.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- GeronimoLoginConfiguration.java	31 May 2004 00:05:24 -0000	1.7
  +++ GeronimoLoginConfiguration.java	5 Jun 2004 07:14:30 -0000	1.8
  @@ -17,13 +17,12 @@
   
   package org.apache.geronimo.security.jaas;
   
  -import javax.security.auth.login.AppConfigurationEntry;
  -import javax.security.auth.login.Configuration;
   import java.util.Hashtable;
   import java.util.Map;
  +import javax.security.auth.login.AppConfigurationEntry;
  +import javax.security.auth.login.Configuration;
   
   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.WaitingException;
  @@ -63,9 +62,6 @@
           if (sm != null) sm.checkPermission(SecurityService.CONFIGURE);
   
           entries.remove(entry.getApplicationConfigName());
  -    }
  -
  -    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() throws WaitingException, Exception {
  
  
  
  1.7       +1 -5      incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/jaas/LoginService.java
  
  Index: LoginService.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/jaas/LoginService.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- LoginService.java	2 Jun 2004 05:33:04 -0000	1.6
  +++ LoginService.java	5 Jun 2004 07:14:30 -0000	1.7
  @@ -48,7 +48,6 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   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.WaitingException;
  @@ -400,9 +399,6 @@
                   ContextManager.unregisterSubject(loginModule.getSubject());
               }
           }
  -    }
  -
  -    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() throws WaitingException, Exception {
  
  
  
  1.5       +13 -13    incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/jacc/AbstractModuleConfiguration.java
  
  Index: AbstractModuleConfiguration.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/jacc/AbstractModuleConfiguration.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AbstractModuleConfiguration.java	2 Jun 2004 05:33:04 -0000	1.4
  +++ AbstractModuleConfiguration.java	5 Jun 2004 07:14:30 -0000	1.5
  @@ -19,22 +19,17 @@
   
   import java.util.Collection;
   import java.util.HashSet;
  -
   import javax.security.jacc.PolicyConfiguration;
   import javax.security.jacc.PolicyConfigurationFactory;
   import javax.security.jacc.PolicyContextException;
   
  -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.security.GeronimoSecurityException;
   
   
   /**
  - *
    * @version $Revision$ $Date$
    */
   public abstract class AbstractModuleConfiguration implements ModuleConfiguration, GBean {
  @@ -59,9 +54,6 @@
           }
       }
   
  -    public void setGBeanContext(GBeanContext context) {
  -    }
  -
       /**
        * Implement configuration from supplied metadata (dds) in subclasses.
        */
  @@ -79,6 +71,7 @@
   
       /**
        * This method returns this object's policy context identifier.
  +     *
        * @return this module's policy context identifier.
        */
       public String getContextID() {
  @@ -87,6 +80,7 @@
   
       /**
        * Used to notify the abstract base class that the concrete implementation has completed adding all the role names.
  +     *
        * @param configured the state of the configuration
        */
       protected void setConfigured(boolean configured) {
  @@ -95,6 +89,7 @@
   
       /**
        * This method returns the policy configuration that this bean is configuring.
  +     *
        * @return this object's policy configuration, <code>PolicyConfiguration</code>.
        */
       protected PolicyConfiguration getPolicyConfiguration() {
  @@ -103,6 +98,7 @@
   
       /**
        * This method returns the module's set of roles.
  +     *
        * @return the set of roles that are being used for this module.
        */
       public HashSet getRoles() {
  @@ -112,6 +108,7 @@
       /**
        * Add a mapping from a module's security roles to physical principals.  Mapping principals to the same role twice
        * will cause a <code>PolicyContextException</code> to be thrown.
  +     *
        * @param role The role that is to be mapped to a set of principals.
        * @param principals The set of principals that are to be mapped to to role.
        * @throws org.apache.geronimo.security.GeronimoSecurityException if the mapping principals to the same role twice occurs.
  @@ -137,10 +134,11 @@
        * mappings. <code>PolicyConfigurations</code> are linked to apply a common principal-to-role mapping to multiple
        * seperately manageable <code>PolicyConfigurations</code>, as is required when an application is composed of
        * multiple modules.</p>
  -     *
  +     * <p/>
        * <p>Note that the policy statements which comprise a role, or comprise the excluded or unchecked policy
        * collections in a <code>PolicyConfiguration</code> are unaffected by the configuration being linked to
        * another.</p>
  +     *
        * @param link a reference to a different PolicyConfiguration than this <code>PolicyConfiguration</code>.
        * <p>The relationship formed by this method is symetric, transitive and idempotent. If the argument
        * <code>PolicyConfiguration</code> does not have a different Policy context identifier than this
  @@ -179,7 +177,7 @@
        * state such that calling any method, other than <code>delete</code>, <code>getContextID</code>, or
        * <code>inService</code> on the <code>PolicyConfiguration</code> will be rejected and cause an
        * <code>UnsupportedOperationException</code> to be thrown.</p>
  -     *
  +     * <p/>
        * <p> This operation has no affect on any linked <code>PolicyConfigurations</code> other than removing any links
        * involving the deleted <code>PolicyConfiguration<code>.</p>
        *
  @@ -203,10 +201,11 @@
        * in the policy contexts processed by the <code>Policy.refresh</code> method. A policy context whose state is
        * "inService" may be returned to the "open" state by calling the <code>getPolicyConfiguration</code> method of the
        * <code>PolicyConfiguration</code> factory with the policy context identifier of the policy context.</p>
  -     *
  +     * <p/>
        * <p> When the state of a policy context is "inService", calling any method other than <code>commit</code>,
        * <code>delete</code>, <code>getContextID</code>, or <code>inService</code> on its <code>PolicyConfiguration</code>
        * Object will cause an <code>UnsupportedOperationException</code> to be thrown.</p>
  +     *
        * @throws java.lang.SecurityException if called by an <code>AccessControlContext</code> that has not been granted
        * the "setPolicy" <code>SecurityPermission</code>.
        * @throws java.lang.UnsupportedOperationException if the state of the policy context whose interface is this
  @@ -226,8 +225,9 @@
       /**
        * This method is used to determine if the policy context whose interface is this <code>PolicyConfiguration</code>
        * Object is in the "inService" state.
  +     *
        * @return <code>true</code> if the state of the associated policy context is "inService"; <code>false</code>
  -     * otherwise.
  +     *         otherwise.
        * @throws java.lang.SecurityException if called by an <code>AccessControlContext</code> that has not been granted
        * the "setPolicy" <code>SecurityPermission</code>.
        * @throws org.apache.geronimo.security.GeronimoSecurityException if the implementation throws a checked exception that has not been accounted for by the
  
  
  
  1.7       +1 -5      incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/realm/providers/AbstractSecurityRealm.java
  
  Index: AbstractSecurityRealm.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/realm/providers/AbstractSecurityRealm.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AbstractSecurityRealm.java	2 Jun 2004 05:33:04 -0000	1.6
  +++ AbstractSecurityRealm.java	5 Jun 2004 07:14:30 -0000	1.7
  @@ -18,7 +18,6 @@
   package org.apache.geronimo.security.realm.providers;
   
   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.security.realm.SecurityRealm;
  @@ -56,9 +55,6 @@
   
       public void setRealmName(String realmName) {
           this.realmName = realmName;
  -    }
  -
  -    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() {
  
  
  
  1.5       +1 -5      incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/LoginServiceStub.java
  
  Index: LoginServiceStub.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/LoginServiceStub.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- LoginServiceStub.java	4 Jun 2004 22:31:56 -0000	1.4
  +++ LoginServiceStub.java	5 Jun 2004 07:14:30 -0000	1.5
  @@ -21,7 +21,6 @@
   
   import org.apache.geronimo.core.service.Interceptor;
   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.kernel.Kernel;
  @@ -60,9 +59,6 @@
   
       public void setRouter(JMXRouter router) {
           this.router = router;
  -    }
  -
  -    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() throws Exception {
  
  
  
  1.8       +1 -5      incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/SecurityService.java
  
  Index: SecurityService.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/SecurityService.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- SecurityService.java	2 Jun 2004 05:33:04 -0000	1.7
  +++ SecurityService.java	5 Jun 2004 07:14:30 -0000	1.8
  @@ -25,7 +25,6 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   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.WaitingException;
  @@ -116,9 +115,6 @@
           this.moduleConfigurations = moduleConfigurations;
       }
   
  -
  -    public void setGBeanContext(GBeanContext context) {
  -    }
   
       public void doStart() throws WaitingException, Exception {
           log.info("Security service started");
  
  
  
  1.5       +1 -6      incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/ClockPool.java
  
  Index: ClockPool.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/ClockPool.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ClockPool.java	2 Jun 2004 05:33:05 -0000	1.4
  +++ ClockPool.java	5 Jun 2004 07:14:30 -0000	1.5
  @@ -19,11 +19,9 @@
   
   import EDU.oswego.cs.dl.util.concurrent.ClockDaemon;
   import EDU.oswego.cs.dl.util.concurrent.ThreadFactory;
  -
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   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.WaitingException;
  @@ -57,9 +55,6 @@
        */
       public ClockDaemon getClockDaemon() {
           return clockDaemon;
  -    }
  -
  -    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() throws WaitingException, Exception {
  
  
  
  1.3       +4 -13     incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/RMIRegistryService.java
  
  Index: RMIRegistryService.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/RMIRegistryService.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RMIRegistryService.java	2 Jun 2004 05:33:05 -0000	1.2
  +++ RMIRegistryService.java	5 Jun 2004 07:14:30 -0000	1.3
  @@ -20,13 +20,12 @@
   import java.rmi.registry.Registry;
   import java.rmi.server.UnicastRemoteObject;
   
  +import org.apache.commons.logging.Log;
  +import org.apache.commons.logging.LogFactory;
   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.WaitingException;
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
   
   /**
    * Thin GBean wrapper around the RMI Registry.
  @@ -34,9 +33,9 @@
    * @version $Revision$ $Date$
    */
   public class RMIRegistryService implements GBean {
  +    private static final Log log = LogFactory.getLog(RMIRegistryService.class);
       private int port = Registry.REGISTRY_PORT;
       private Registry registry;
  -    private Log log;
   
       public int getPort() {
           return port;
  @@ -44,14 +43,6 @@
   
       public void setPort(int port) {
           this.port = port;
  -    }
  -
  -    public void setGBeanContext(GBeanContext context) {
  -        if (context != null) {
  -            log = LogFactory.getLog(RMIRegistryService.class);
  -        } else {
  -            log = null;
  -        }
       }
   
       public void doStart() throws WaitingException, Exception {
  
  
  
  1.6       +1 -6      incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/ThreadPool.java
  
  Index: ThreadPool.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/ThreadPool.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ThreadPool.java	2 Jun 2004 05:33:05 -0000	1.5
  +++ ThreadPool.java	5 Jun 2004 07:14:30 -0000	1.6
  @@ -20,11 +20,9 @@
   import EDU.oswego.cs.dl.util.concurrent.Executor;
   import EDU.oswego.cs.dl.util.concurrent.PooledExecutor;
   import EDU.oswego.cs.dl.util.concurrent.ThreadFactory;
  -
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   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.WaitingException;
  @@ -83,9 +81,6 @@
   
       private int getNextWorkerID() {
           return nextWorkerID++;
  -    }
  -
  -    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() throws WaitingException, Exception {
  
  
  
  1.8       +1 -5      incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/configuration/LocalConfigStore.java
  
  Index: LocalConfigStore.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/configuration/LocalConfigStore.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- LocalConfigStore.java	5 Jun 2004 00:37:16 -0000	1.7
  +++ LocalConfigStore.java	5 Jun 2004 07:14:30 -0000	1.8
  @@ -38,7 +38,6 @@
   import java.util.zip.ZipInputStream;
   
   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.InvalidConfigurationException;
  @@ -78,9 +77,6 @@
           this.objectName = objectName;
           this.root = root;
           this.serverInfo = serverInfo;
  -    }
  -
  -    public void setGBeanContext(GBeanContext context) {
       }
   
       public String getObjectName() {
  
  
  
  1.5       +1 -8      incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/AbstractAppenderService.java
  
  Index: AbstractAppenderService.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/AbstractAppenderService.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AbstractAppenderService.java	2 Jun 2004 05:33:05 -0000	1.4
  +++ AbstractAppenderService.java	5 Jun 2004 07:14:30 -0000	1.5
  @@ -17,9 +17,7 @@
   
   package org.apache.geronimo.system.logging.log4j.appender;
   
  -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.system.logging.log4j.PatternLayout;
  @@ -28,8 +26,6 @@
   import org.apache.log4j.WriterAppender;
   
   /**
  - *
  - *
    * @version $Revision$ $Date$
    */
   public abstract class AbstractAppenderService implements GBean {
  @@ -38,9 +34,6 @@
       public AbstractAppenderService(WriterAppender appender) {
           this.appender = appender;
           appender.setLayout(new PatternLayout());
  -    }
  -
  -    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() {
  
  
  
  1.5       +6 -18     incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/logging/log4j/Log4jService.java
  
  Index: Log4jService.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/logging/log4j/Log4jService.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Log4jService.java	2 Jun 2004 05:33:05 -0000	1.4
  +++ Log4jService.java	5 Jun 2004 07:14:30 -0000	1.5
  @@ -26,14 +26,9 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogConfigurationException;
   import org.apache.commons.logging.LogFactory;
  -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.GConstructorInfo;
  -import org.apache.geronimo.gbean.GOperationInfo;
  -import org.apache.geronimo.gbean.GReferenceInfo;
   import org.apache.geronimo.kernel.log.GeronimoLogFactory;
   import org.apache.geronimo.system.serverinfo.ServerInfo;
   import org.apache.log4j.Level;
  @@ -42,7 +37,6 @@
   /**
    * A Log4j logging service.
    *
  - *
    * @version $Revision$ $Date$
    */
   public class Log4jService implements GBean {
  @@ -79,9 +73,8 @@
       /**
        * Construct a <code>Log4jService</code>.
        *
  -     * @param configURL       The configuration URL.
  -     * @param refreshPeroid    The refresh refreshPeroid (in seconds).
  -     *
  +     * @param configURL The configuration URL.
  +     * @param refreshPeroid The refresh refreshPeroid (in seconds).
        */
       public Log4jService(final URL configURL, final int refreshPeroid, ServerInfo serverInfo) {
           setRefreshPeriod(refreshPeroid);
  @@ -96,8 +89,7 @@
       /**
        * Gets the level of the logger of the give name.
        *
  -     * @param logger    The logger to inspect.
  -     *
  +     * @param logger The logger to inspect.
        */
       public String getLoggerLevel(final String logger) {
           if (logger == null) {
  @@ -116,9 +108,8 @@
       /**
        * Sets the level for a logger of the give name.
        *
  -     * @param logger    The logger to change level
  -     * @param level     The level to change the logger to.
  -     *
  +     * @param logger The logger to change level
  +     * @param level The level to change the logger to.
        */
       public void setLoggerLevel(final String logger, final String level) {
           if (logger == null) {
  @@ -206,9 +197,6 @@
               }
               task.run();
           }
  -    }
  -
  -    public void setGBeanContext(GBeanContext context) {
       }
   
       public void doStart() {
  
  
  
  1.7       +6 -15     incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/repository/ReadOnlyRepository.java
  
  Index: ReadOnlyRepository.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/repository/ReadOnlyRepository.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ReadOnlyRepository.java	2 Jun 2004 05:33:05 -0000	1.6
  +++ ReadOnlyRepository.java	5 Jun 2004 07:14:30 -0000	1.7
  @@ -23,22 +23,16 @@
   import java.net.URI;
   import java.net.URL;
   
  -import org.apache.geronimo.gbean.GAttributeInfo;
  +import org.apache.commons.logging.Log;
  +import org.apache.commons.logging.LogFactory;
   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.GConstructorInfo;
  -import org.apache.geronimo.gbean.GReferenceInfo;
   import org.apache.geronimo.gbean.WaitingException;
   import org.apache.geronimo.kernel.repository.Repository;
   import org.apache.geronimo.system.serverinfo.ServerInfo;
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
   
   /**
  - *
  - *
    * @version $Revision$ $Date$
    */
   public class ReadOnlyRepository implements Repository, GBean {
  @@ -81,14 +75,11 @@
           return rootURI.resolve(uri).toURL();
       }
   
  -    public void setGBeanContext(GBeanContext context) {
  -    }
  -
       public void doStart() throws WaitingException, Exception {
  -        if(rootURI == null) {
  +        if (rootURI == null) {
               rootURI = serverInfo.resolve(root);
           }
  -        log.info("Repository root is "+rootURI);
  +        log.info("Repository root is " + rootURI);
       }
   
       public void doStop() throws WaitingException, Exception {
  @@ -109,7 +100,7 @@
           infoFactory.addInterface(Repository.class);
   
           infoFactory.setConstructor(new String[]{"Root", "ServerInfo"});
  -        
  +
           GBEAN_INFO = infoFactory.getBeanInfo();
       }
   
  
  
  
  1.4       +7 -7      incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/url/GeronimoURLFactory.java
  
  Index: GeronimoURLFactory.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/url/GeronimoURLFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- GeronimoURLFactory.java	2 Jun 2004 05:33:05 -0000	1.3
  +++ GeronimoURLFactory.java	5 Jun 2004 07:14:30 -0000	1.4
  @@ -30,7 +30,6 @@
   import java.util.StringTokenizer;
   
   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.WaitingException;
  @@ -46,9 +45,6 @@
       private static final URLStreamHandlerFactory factory = new URLStreamHandlerFactory();
       private static boolean installed = false;
   
  -    public void setGBeanContext(GBeanContext context) {
  -    }
  -
       public void doStart() throws WaitingException, Exception {
           // verify that our factory is installed... if our factory can not be
           // installed the gbean will fail
  @@ -63,6 +59,7 @@
   
       /**
        * Assigns the handler to the specified protocol.
  +     *
        * @param protocol the prototcol name
        * @param handler the url handler for the protocol
        * @throws IllegalStateException if a handler is alreayd assigned to the protocol
  @@ -73,6 +70,7 @@
   
       /**
        * Gets the handler registered for the specified protocol
  +     *
        * @param protocol the protocol name
        * @return the registered handler or null if no handler is registerd for the protocol
        */
  @@ -82,6 +80,7 @@
   
       /**
        * Gets a map of all registered handlers keyed by protocol name.
  +     *
        * @return a map from protocol name to handler
        */
       public Map getRegisteredHandlers() {
  @@ -90,6 +89,7 @@
   
       /**
        * Is our factory installed?
  +     *
        * @return true if our factory is installed; false otherwise
        */
       public static boolean isInstalled() {
  @@ -99,7 +99,7 @@
       /**
        * Installs the factory into URL using the setURLStreamHandlerFactory method.
        * This will fail is some other code already installed a factory.
  -     *
  +     * <p/>
        * This should be called from your main method to assure the factory is installed
        * before another code has a chance to take the slot.
        *
  @@ -118,7 +118,7 @@
        * Field.setAccessable(true).  This is the "naughty" way of installing a factory but works
        * on most platforms.  If the platform is not using Sun's implementation of URL, this code is
        * likely to not work, but all known platforms use Sun's URL code.
  -     *
  +     * <p/>
        * You should not use this method unless you absolutely have to.
        *
        * @throws Error if the application has already set a factory
  
  
  

Mime
View raw message