dain 2004/06/05 00:53:23
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/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
Added: modules/kernel/src/java/org/apache/geronimo/gbean
GBeanLifecycle.java
Removed: modules/kernel/src/java/org/apache/geronimo/gbean GBean.java
Log:
Renamed GBean to GBeanLifecycle
Revision Changes Path
1.9 +3 -3
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AdminObjectWrapper.java 5 Jun 2004 07:14:29 -0000 1.8
+++ AdminObjectWrapper.java 5 Jun 2004 07:53:21 -0000 1.9
@@ -24,16 +24,16 @@
import net.sf.cglib.proxy.MethodInterceptor;
import org.apache.geronimo.gbean.DynamicGBean;
import org.apache.geronimo.gbean.DynamicGBeanDelegate;
-import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.WaitingException;
import org.apache.geronimo.kernel.Kernel;
/**
* @version $Revision$ $Date$
*/
-public class AdminObjectWrapper implements GBean, DynamicGBean {
+public class AdminObjectWrapper implements GBeanLifecycle, DynamicGBean {
public static final GBeanInfo GBEAN_INFO;
1.10 +3 -3
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ResourceAdapterWrapper.java 5 Jun 2004 07:14:29 -0000 1.9
+++ ResourceAdapterWrapper.java 5 Jun 2004 07:53:21 -0000 1.10
@@ -25,15 +25,15 @@
import org.apache.geronimo.gbean.DynamicGBean;
import org.apache.geronimo.gbean.DynamicGBeanDelegate;
-import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.WaitingException;
/**
* @version $Revision$ $Date$
*/
-public class ResourceAdapterWrapper implements GBean, DynamicGBean {
+public class ResourceAdapterWrapper implements GBeanLifecycle, DynamicGBean {
public static final GBeanInfo GBEAN_INFO;
1.4 +3 -3
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractConnectionManager.java 5 Jun 2004 07:14:29 -0000 1.3
+++ AbstractConnectionManager.java 5 Jun 2004 07:53:21 -0000 1.4
@@ -23,15 +23,15 @@
import javax.resource.spi.LazyAssociatableConnectionManager;
import javax.resource.spi.ManagedConnectionFactory;
-import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.WaitingException;
/**
* @version $Revision$ $Date$
*/
-public abstract class AbstractConnectionManager implements
ConnectionManagerFactory, GBean, ConnectionManager,
LazyAssociatableConnectionManager {
+public abstract class AbstractConnectionManager implements
ConnectionManagerFactory, GBeanLifecycle, ConnectionManager,
LazyAssociatableConnectionManager {
protected ConnectionInterceptor stack;
public AbstractConnectionManager() {
1.13 +3 -3
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ManagedConnectionFactoryWrapper.java 5 Jun 2004 07:14:29 -0000
1.12
+++ ManagedConnectionFactoryWrapper.java 5 Jun 2004 07:53:21 -0000
1.13
@@ -31,9 +31,9 @@
import
org.apache.geronimo.connector.outbound.security.ManagedConnectionFactoryListener;
import org.apache.geronimo.gbean.DynamicGBean;
import org.apache.geronimo.gbean.DynamicGBeanDelegate;
-import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.WaitingException;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.naming.geronimo.GeronimoContextManager;
@@ -41,7 +41,7 @@
/**
* @version $Revision$ $Date$
*/
-public class ManagedConnectionFactoryWrapper implements GBean, DynamicGBean {
+public class ManagedConnectionFactoryWrapper implements GBeanLifecycle,
DynamicGBean {
private static final GBeanInfo GBEAN_INFO;
private static final Log log =
LogFactory.getLog(ManagedConnectionFactoryWrapper.class);
1.5 +3 -3
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JDBCLog.java 5 Jun 2004 07:14:29 -0000 1.4
+++ JDBCLog.java 5 Jun 2004 07:53:21 -0000 1.5
@@ -27,9 +27,9 @@
import javax.transaction.xa.Xid;
import
org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrapper;
-import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.WaitingException;
import org.apache.geronimo.transaction.manager.LogException;
import org.apache.geronimo.transaction.manager.TransactionLog;
@@ -38,7 +38,7 @@
/**
* @version $Revision$ $Date$
*/
-public class JDBCLog implements TransactionLog, GBean {
+public class JDBCLog implements TransactionLog, GBeanLifecycle {
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 = ?";
private final static String RECOVER = "SELECT FORMATID, GLOBALID,
BRANCHID FROM TXLOG WHERE SYSTEMID = ?";
1.13 +3 -3
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- LocalServer.java 5 Jun 2004 07:14:29 -0000 1.12
+++ LocalServer.java 5 Jun 2004 07:53:21 -0000 1.13
@@ -32,9 +32,9 @@
import org.apache.geronimo.deployment.plugin.DeploymentServer;
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.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.WaitingException;
import org.apache.geronimo.gbean.jmx.GBeanMBean;
import org.apache.geronimo.kernel.Kernel;
@@ -48,7 +48,7 @@
/**
* @version $Revision$ $Date$
*/
-public class LocalServer implements DeploymentServer, GBean {
+public class LocalServer implements DeploymentServer, GBeanLifecycle {
private final URI rootConfigID;
private final Target target;
private final Kernel kernel;
1.8 +3 -3
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JettyConnector.java 5 Jun 2004 07:14:29 -0000 1.7
+++ JettyConnector.java 5 Jun 2004 07:53:21 -0000 1.8
@@ -17,9 +17,9 @@
package org.apache.geronimo.jetty.connector;
-import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.WaitingException;
import org.apache.geronimo.jetty.JettyContainer;
import org.mortbay.http.HttpListener;
@@ -28,7 +28,7 @@
/**
* @version $Revision$ $Date$
*/
-public abstract class JettyConnector implements GBean {
+public abstract class JettyConnector implements GBeanLifecycle {
private final JettyContainer container;
protected final HttpListener listener;
1.4 +3 -3
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JAASJettyRealm.java 5 Jun 2004 07:14:29 -0000 1.3
+++ JAASJettyRealm.java 5 Jun 2004 07:53:21 -0000 1.4
@@ -23,9 +23,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.WaitingException;
import org.mortbay.http.HttpRequest;
import org.mortbay.http.UserRealm;
@@ -36,7 +36,7 @@
/**
* @version $Revision$ $Date$
*/
-public class JAASJettyRealm implements UserRealm, GBean {
+public class JAASJettyRealm implements UserRealm, GBeanLifecycle {
private static Log log = LogFactory.getLog(JAASJettyRealm.class);
1.8 +3 -3
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JettyContainerImpl.java 5 Jun 2004 07:14:29 -0000 1.7
+++ JettyContainerImpl.java 5 Jun 2004 07:53:21 -0000 1.8
@@ -17,9 +17,9 @@
package org.apache.geronimo.jetty;
-import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.WaitingException;
import org.mortbay.http.HttpContext;
import org.mortbay.http.HttpListener;
@@ -29,7 +29,7 @@
/**
* @version $Revision$ $Date$
*/
-public class JettyContainerImpl implements JettyContainer, GBean {
+public class JettyContainerImpl implements JettyContainer, GBeanLifecycle {
private final Server server;
1.21 +3 -3
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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- JettyWebApplicationContext.java 5 Jun 2004 07:14:29 -0000 1.20
+++ JettyWebApplicationContext.java 5 Jun 2004 07:53:21 -0000 1.21
@@ -31,9 +31,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.WaitingException;
import org.apache.geronimo.kernel.config.ConfigurationParent;
import org.apache.geronimo.naming.java.ReadOnlyContext;
@@ -56,7 +56,7 @@
*
* @version $Revision$ $Date$
*/
-public class JettyWebApplicationContext extends WebApplicationContext
implements GBean {
+public class JettyWebApplicationContext extends WebApplicationContext
implements GBeanLifecycle {
private static Log log =
LogFactory.getLog(JettyWebApplicationContext.class);
1.6 +3 -3
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JMXConnector.java 5 Jun 2004 07:14:29 -0000 1.5
+++ JMXConnector.java 5 Jun 2004 07:53:22 -0000 1.6
@@ -24,9 +24,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.WaitingException;
import org.apache.geronimo.kernel.Kernel;
@@ -35,7 +35,7 @@
*
* @version $Revision$ $Date$
*/
-public class JMXConnector implements GBean {
+public class JMXConnector implements GBeanLifecycle {
private final Kernel kernel;
private final Log log;
private String url;
1.1
incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanLifecycle.java
Index: GBeanLifecycle.java
===================================================================
/**
*
* Copyright 2003-2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.geronimo.gbean;
/**
* An optional interface for a GBean. When a GBean implements this
interface, the implementation
* will get life-cycle callbacks.
*
* @version $Revision: 1.1 $ $Date: 2004/06/05 07:53:22 $
*/
public interface GBeanLifecycle {
/**
* Starts the GBean. This informs the GBean that it is about to
transition to the running state.
*
* @throws WaitingException if the target is waiting for an external
condition before it can fully start
* @throws Exception if the target failed to start; this will cause a
transition to the failed state
*/
void doStart() throws WaitingException, Exception;
/**
* Stops the target. This informs the GBean that it is about to
transition to the stopped state.
*
* @throws WaitingException if the target is waiting for an external
condition before it can fully stop
*/
void doStop() throws WaitingException, Exception;
/**
* Fails the GBean. This informs the GBean that it is about to
transition to the failed state.
*/
void doFail();
}
1.24 +8 -8
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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- GBeanMBean.java 5 Jun 2004 07:14:29 -0000 1.23
+++ GBeanMBean.java 5 Jun 2004 07:53:22 -0000 1.24
@@ -45,9 +45,9 @@
import org.apache.commons.logging.Log;
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.GBeanLifecycle;
import org.apache.geronimo.gbean.GConstructorInfo;
import org.apache.geronimo.gbean.GOperationInfo;
import org.apache.geronimo.gbean.GOperationSignature;
@@ -585,14 +585,14 @@
references[i].start();
}
- if (target instanceof GBean) {
- ((GBean) target).doStart();
+ if (target instanceof GBeanLifecycle) {
+ ((GBeanLifecycle) target).doStart();
}
}
protected void doStop() throws Exception {
- if (target instanceof GBean) {
- ((GBean) target).doStop();
+ if (target instanceof GBeanLifecycle) {
+ ((GBeanLifecycle) target).doStop();
}
// stop all of the references
@@ -602,8 +602,8 @@
}
protected void doFail() {
- if (target instanceof GBean) {
- ((GBean) target).doFail();
+ if (target instanceof GBeanLifecycle) {
+ ((GBeanLifecycle) target).doFail();
}
// stop all of the references
1.23 +3 -3
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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Configuration.java 5 Jun 2004 07:14:29 -0000 1.22
+++ Configuration.java 5 Jun 2004 07:53:22 -0000 1.23
@@ -44,9 +44,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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.GBeanLifecycle;
import org.apache.geronimo.gbean.GReferenceInfo;
import org.apache.geronimo.gbean.jmx.GBeanMBean;
import org.apache.geronimo.kernel.Kernel;
@@ -83,7 +83,7 @@
*
* @version $Revision$ $Date$
*/
-public class Configuration implements GBean {
+public class Configuration implements GBeanLifecycle {
private static final Log log = LogFactory.getLog(Configuration.class);
private final Kernel kernel;
1.7 +2 -2
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GBeanInfoFactoryTest.java 5 Jun 2004 07:14:29 -0000 1.6
+++ GBeanInfoFactoryTest.java 5 Jun 2004 07:53:22 -0000 1.7
@@ -103,7 +103,7 @@
assertTrue(gbeanInfoFactory.getBeanInfo().getOperations().size() ==
0);
gbeanInfoFactory = new GBeanInfoFactory("");
- gbeanInfoFactory.addInterface(GBean.class);
+ gbeanInfoFactory.addInterface(GBeanLifecycle.class);
GBeanInfo gbeanInfo = gbeanInfoFactory.getBeanInfo();
assertTrue(gbeanInfo.getAttributes().size() == 0);
assertTrue(gbeanInfo.getOperations().size() == 3);
1.11 +3 -3
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SelectorManager.java 5 Jun 2004 07:14:29 -0000 1.10
+++ SelectorManager.java 5 Jun 2004 07:53:22 -0000 1.11
@@ -29,9 +29,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.WaitingException;
import org.apache.geronimo.system.ThreadPool;
@@ -42,7 +42,7 @@
*
* @version $Revision$ $Date$
*/
-public class SelectorManager implements Runnable, GBean {
+public class SelectorManager implements Runnable, GBeanLifecycle {
final static private Log log = LogFactory.getLog(SelectorManager.class);
1.16 +3 -3
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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- MBeanServerStub.java 5 Jun 2004 07:14:29 -0000 1.15
+++ MBeanServerStub.java 5 Jun 2004 07:53:22 -0000 1.16
@@ -20,9 +20,9 @@
import javax.management.ObjectName;
import org.apache.geronimo.core.service.Interceptor;
-import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.jmx.JMXUtil;
import org.apache.geronimo.proxy.ProxyContainer;
@@ -35,7 +35,7 @@
/**
* @version $Revision$ $Date$
*/
-public class MBeanServerStub implements GBean, JMXTarget {
+public class MBeanServerStub implements GBeanLifecycle, JMXTarget {
private final Kernel kernel;
private final ObjectName objectName;
private ProxyContainer serverContainer;
1.10 +3 -3
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AbstractInterceptorRouter.java 5 Jun 2004 07:14:29 -0000 1.9
+++ AbstractInterceptorRouter.java 5 Jun 2004 07:53:22 -0000 1.10
@@ -25,9 +25,9 @@
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.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.remoting.InvocationSupport;
import org.apache.geronimo.remoting.MarshalledObject;
import org.apache.geronimo.remoting.transport.Msg;
@@ -36,7 +36,7 @@
/**
* @version $Revision$ $Date$
*/
-public abstract class AbstractInterceptorRouter implements GBean, Router {
+public abstract class AbstractInterceptorRouter implements GBeanLifecycle,
Router {
private long stoppedRoutingTimeout = 1000 * 60; // 1 min.
/**
1.7 +3 -3
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractRouterRouter.java 5 Jun 2004 07:14:29 -0000 1.6
+++ AbstractRouterRouter.java 5 Jun 2004 07:53:22 -0000 1.7
@@ -22,14 +22,14 @@
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.gbean.GBeanLifecycle;
import org.apache.geronimo.remoting.transport.Msg;
import org.apache.geronimo.remoting.transport.TransportException;
/**
* @version $Revision$ $Date$
*/
-public abstract class AbstractRouterRouter implements GBean, Router {
+public abstract class AbstractRouterRouter implements GBeanLifecycle, Router
{
private long stoppedRoutingTimeout = 1000 * 60; // 1 min.
/**
1.12 +3 -3
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TransportLoader.java 5 Jun 2004 07:14:30 -0000 1.11
+++ TransportLoader.java 5 Jun 2004 07:53:22 -0000 1.12
@@ -21,15 +21,15 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.remoting.router.Router;
/**
* @version $Revision$ $Date$
*/
-public class TransportLoader implements GBean {
+public class TransportLoader implements GBeanLifecycle {
private static final Log log = LogFactory.getLog(TransportLoader.class);
private URI bindURI;
private TransportServer transportServer;
1.10 +3 -3
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ConfigurationEntry.java 5 Jun 2004 07:14:30 -0000 1.9
+++ ConfigurationEntry.java 5 Jun 2004 07:53:22 -0000 1.10
@@ -20,9 +20,9 @@
import java.util.Properties;
import javax.security.auth.login.AppConfigurationEntry;
-import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.WaitingException;
import org.apache.geronimo.gbean.jmx.GBeanMBeanContext;
import org.apache.geronimo.kernel.Kernel;
@@ -43,7 +43,7 @@
* @see org.apache.geronimo.security.jaas.GeronimoLoginConfiguration
* @see javax.security.auth.login.Configuration
*/
-public abstract class ConfigurationEntry implements GBean {
+public abstract class ConfigurationEntry implements GBeanLifecycle {
protected final Kernel kernel;
protected GBeanMBeanContext context;
protected String applicationConfigName;
1.9 +3 -3
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- GeronimoLoginConfiguration.java 5 Jun 2004 07:14:30 -0000 1.8
+++ GeronimoLoginConfiguration.java 5 Jun 2004 07:53:22 -0000 1.9
@@ -22,9 +22,9 @@
import javax.security.auth.login.AppConfigurationEntry;
import javax.security.auth.login.Configuration;
-import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.WaitingException;
import org.apache.geronimo.security.SecurityService;
@@ -32,7 +32,7 @@
/**
* @version $Revision$ $Date$
*/
-public class GeronimoLoginConfiguration extends Configuration implements
GBean {
+public class GeronimoLoginConfiguration extends Configuration implements
GBeanLifecycle {
private static Map entries = new Hashtable();
private Configuration oldConfiguration;
1.8 +3 -3
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LoginService.java 5 Jun 2004 07:14:30 -0000 1.7
+++ LoginService.java 5 Jun 2004 07:53:22 -0000 1.8
@@ -47,9 +47,9 @@
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.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.WaitingException;
import org.apache.geronimo.kernel.jmx.JMXUtil;
import org.apache.geronimo.security.ContextManager;
@@ -65,7 +65,7 @@
*
* @version $Revision$ $Date$
*/
-public class LoginService implements LoginServiceMBean, GBean {
+public class LoginService implements LoginServiceMBean, GBeanLifecycle {
/**
* The JMX name of the SecurityService.
*/
1.6 +3 -3
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractModuleConfiguration.java 5 Jun 2004 07:14:30 -0000 1.5
+++ AbstractModuleConfiguration.java 5 Jun 2004 07:53:22 -0000 1.6
@@ -23,16 +23,16 @@
import javax.security.jacc.PolicyConfigurationFactory;
import javax.security.jacc.PolicyContextException;
-import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.security.GeronimoSecurityException;
/**
* @version $Revision$ $Date$
*/
-public abstract class AbstractModuleConfiguration implements
ModuleConfiguration, GBean {
+public abstract class AbstractModuleConfiguration implements
ModuleConfiguration, GBeanLifecycle {
public static final String BASE_OBJECT_NAME =
"geronimo.security:type=ModuleConfiguration";
private String contextId;
1.8 +3 -3
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractSecurityRealm.java 5 Jun 2004 07:14:30 -0000 1.7
+++ AbstractSecurityRealm.java 5 Jun 2004 07:53:22 -0000 1.8
@@ -17,9 +17,9 @@
package org.apache.geronimo.security.realm.providers;
-import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.security.realm.SecurityRealm;
import org.apache.regexp.RE;
@@ -27,7 +27,7 @@
/**
* @version $Revision$ $Date$
*/
-public abstract class AbstractSecurityRealm implements SecurityRealm, GBean {
+public abstract class AbstractSecurityRealm implements SecurityRealm,
GBeanLifecycle {
private String realmName;
private long maxLoginModuleAge;
1.6 +3 -3
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LoginServiceStub.java 5 Jun 2004 07:14:30 -0000 1.5
+++ LoginServiceStub.java 5 Jun 2004 07:53:22 -0000 1.6
@@ -20,9 +20,9 @@
import javax.management.ObjectName;
import org.apache.geronimo.core.service.Interceptor;
-import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.jmx.JMXUtil;
import org.apache.geronimo.kernel.jmx.MBeanProxyFactory;
@@ -37,7 +37,7 @@
/**
* @version $Revision$ $Date$
*/
-public class LoginServiceStub implements GBean, JMXTarget {
+public class LoginServiceStub implements GBeanLifecycle, JMXTarget {
private final Kernel kernel;
private final ObjectName objectName;
private ProxyContainer serverContainer;
1.9 +3 -3
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SecurityService.java 5 Jun 2004 07:14:30 -0000 1.8
+++ SecurityService.java 5 Jun 2004 07:53:22 -0000 1.9
@@ -24,9 +24,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.WaitingException;
import org.apache.geronimo.kernel.jmx.JMXUtil;
import org.apache.geronimo.security.jacc.ModuleConfiguration;
@@ -42,7 +42,7 @@
*
* @version $Revision$ $Date$
*/
-public class SecurityService implements SecurityServiceMBean, GBean {
+public class SecurityService implements SecurityServiceMBean, GBeanLifecycle
{
/**
* The JMX name of the SecurityService.
*/
1.6 +3 -3
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ClockPool.java 5 Jun 2004 07:14:30 -0000 1.5
+++ ClockPool.java 5 Jun 2004 07:53:22 -0000 1.6
@@ -21,16 +21,16 @@
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.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.WaitingException;
/**
* @version $Revision$ $Date$
*/
-public class ClockPool implements GBean {
+public class ClockPool implements GBeanLifecycle {
static private final Log log = LogFactory.getLog(ClockPool.class);
1.4 +3 -3
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RMIRegistryService.java 5 Jun 2004 07:14:30 -0000 1.3
+++ RMIRegistryService.java 5 Jun 2004 07:53:22 -0000 1.4
@@ -22,9 +22,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.WaitingException;
/**
@@ -32,7 +32,7 @@
*
* @version $Revision$ $Date$
*/
-public class RMIRegistryService implements GBean {
+public class RMIRegistryService implements GBeanLifecycle {
private static final Log log =
LogFactory.getLog(RMIRegistryService.class);
private int port = Registry.REGISTRY_PORT;
private Registry registry;
1.7 +3 -3
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ThreadPool.java 5 Jun 2004 07:14:30 -0000 1.6
+++ ThreadPool.java 5 Jun 2004 07:53:22 -0000 1.7
@@ -22,16 +22,16 @@
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.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.WaitingException;
/**
* @version $Revision$ $Date$
*/
-public class ThreadPool implements GBean {
+public class ThreadPool implements GBeanLifecycle {
static private final Log log = LogFactory.getLog(ThreadPool.class);
1.9 +3 -3
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LocalConfigStore.java 5 Jun 2004 07:14:30 -0000 1.8
+++ LocalConfigStore.java 5 Jun 2004 07:53:22 -0000 1.9
@@ -37,9 +37,9 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.InvalidConfigurationException;
import org.apache.geronimo.gbean.WaitingException;
import org.apache.geronimo.gbean.jmx.GBeanMBean;
@@ -54,7 +54,7 @@
*
* @version $Revision$ $Date$
*/
-public class LocalConfigStore implements ConfigurationStore, GBean {
+public class LocalConfigStore implements ConfigurationStore, GBeanLifecycle {
private static final String INDEX_NAME = "index.properties";
private final String objectName;
private final URI root;
1.6 +3 -3
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractAppenderService.java 5 Jun 2004 07:14:30 -0000 1.5
+++ AbstractAppenderService.java 5 Jun 2004 07:53:22 -0000 1.6
@@ -17,9 +17,9 @@
package org.apache.geronimo.system.logging.log4j.appender;
-import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.system.logging.log4j.PatternLayout;
import org.apache.geronimo.system.logging.log4j.XLevel;
import org.apache.log4j.Logger;
@@ -28,7 +28,7 @@
/**
* @version $Revision$ $Date$
*/
-public abstract class AbstractAppenderService implements GBean {
+public abstract class AbstractAppenderService implements GBeanLifecycle {
protected final WriterAppender appender;
public AbstractAppenderService(WriterAppender appender) {
1.6 +3 -3
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Log4jService.java 5 Jun 2004 07:14:30 -0000 1.5
+++ Log4jService.java 5 Jun 2004 07:53:22 -0000 1.6
@@ -26,9 +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.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.kernel.log.GeronimoLogFactory;
import org.apache.geronimo.system.serverinfo.ServerInfo;
import org.apache.log4j.Level;
@@ -39,7 +39,7 @@
*
* @version $Revision$ $Date$
*/
-public class Log4jService implements GBean {
+public class Log4jService implements GBeanLifecycle {
/**
* The URL to the configuration file.
*/
1.8 +3 -3
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ReadOnlyRepository.java 5 Jun 2004 07:14:30 -0000 1.7
+++ ReadOnlyRepository.java 5 Jun 2004 07:53:22 -0000 1.8
@@ -25,9 +25,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.WaitingException;
import org.apache.geronimo.kernel.repository.Repository;
import org.apache.geronimo.system.serverinfo.ServerInfo;
@@ -35,7 +35,7 @@
/**
* @version $Revision$ $Date$
*/
-public class ReadOnlyRepository implements Repository, GBean {
+public class ReadOnlyRepository implements Repository, GBeanLifecycle {
private static final Log log =
LogFactory.getLog(ReadOnlyRepository.class);
private final URI root;
private final ServerInfo serverInfo;
1.5 +3 -3
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GeronimoURLFactory.java 5 Jun 2004 07:14:30 -0000 1.4
+++ GeronimoURLFactory.java 5 Jun 2004 07:53:22 -0000 1.5
@@ -29,9 +29,9 @@
import java.util.Map;
import java.util.StringTokenizer;
-import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.WaitingException;
/**
@@ -41,7 +41,7 @@
*
* @version $Revision$ $Date$
*/
-public class GeronimoURLFactory implements GBean {
+public class GeronimoURLFactory implements GBeanLifecycle {
private static final URLStreamHandlerFactory factory = new
URLStreamHandlerFactory();
private static boolean installed = false;
