Drat it!!! I forgot to attach the diffs, so here they are.
Jan
Jan Bartel wrote:
The changes that Dain and Greg discussed some time ago are being implemented. I have attached the diffs to this email. I will commit in 24hrs unless I hear the sound of screaming and gnashing of teeth.
In summary, the changes are:
+ o.a.g.kernel.service.AbstractStateManageable is redundant and is removed + classes inheriting from it now inherit from o.a.g.kernel.service.AbstractManagedObject instead + o.a.g.core.service.AbstractContainer renamed to o.a.g.core.service.ManagedContainer + o.a.g.core.service.AbstractComponent renamed to o.a.g.core.service.ManagedComponent + a couple of the private members of o.a.g.kernel.service.AbstractManagedObject have been changed from private to protected
cheers, Jan
Index:
modules/core/src/java/org/apache/geronimo/core/service/AbstractRPCContainer.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/core/service/AbstractRPCContainer.java,v
retrieving revision 1.1
diff -r1.1 AbstractRPCContainer.java
64c64
< import org.apache.geronimo.core.service.AbstractContainer;
---
> import org.apache.geronimo.core.service.ManagedContainer;
71c71
< public class AbstractRPCContainer extends AbstractContainer implements
RPCContainer {
---
> public class AbstractRPCContainer extends ManagedContainer implements
> RPCContainer {
Index:
modules/core/src/java/org/apache/geronimo/ejb/EJBProxyFactoryManager.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/EJBProxyFactoryManager.java,v
retrieving revision 1.6
diff -r1.6 EJBProxyFactoryManager.java
63c63
< import org.apache.geronimo.core.service.AbstractComponent;
---
> import org.apache.geronimo.core.service.ManagedComponent;
73c73
< public class EJBProxyFactoryManager extends AbstractComponent {
---
> public class EJBProxyFactoryManager extends ManagedComponent {
Index:
modules/core/src/java/org/apache/geronimo/ejb/cache/EnterpriseContextInstanceCache.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/cache/EnterpriseContextInstanceCache.java,v
retrieving revision 1.7
diff -r1.7 EnterpriseContextInstanceCache.java
65c65
< import org.apache.geronimo.core.service.AbstractComponent;
---
> import org.apache.geronimo.core.service.ManagedComponent;
75c75
< public final class EnterpriseContextInstanceCache extends AbstractComponent
implements InstanceCache {
---
> public final class EnterpriseContextInstanceCache extends ManagedComponent
> implements InstanceCache {
Index:
modules/core/src/java/org/apache/geronimo/ejb/cache/EnterpriseContextInstancePool.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/cache/EnterpriseContextInstancePool.java,v
retrieving revision 1.6
diff -r1.6 EnterpriseContextInstancePool.java
67c67
< import org.apache.geronimo.core.service.AbstractComponent;
---
> import org.apache.geronimo.core.service.ManagedComponent;
77c77
< public final class EnterpriseContextInstancePool extends AbstractComponent
implements InstancePool {
---
> public final class EnterpriseContextInstancePool extends ManagedComponent
> implements InstancePool {
Index:
modules/core/src/java/org/apache/geronimo/ejb/cache/StatelessInstanceFactory.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/cache/StatelessInstanceFactory.java,v
retrieving revision 1.6
diff -r1.6 StatelessInstanceFactory.java
64c64
< import org.apache.geronimo.core.service.AbstractComponent;
---
> import org.apache.geronimo.core.service.ManagedComponent;
77c77
< public class StatelessInstanceFactory extends AbstractComponent implements
InstanceFactory {
---
> public class StatelessInstanceFactory extends ManagedComponent implements
> InstanceFactory {
Index:
modules/core/src/java/org/apache/geronimo/remoting/transport/TransportLoader.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/transport/TransportLoader.java,v
retrieving revision 1.5
diff -r1.5 TransportLoader.java
84c84
< * @see org.apache.geronimo.core.service.AbstractComponent#doStart()
---
> * @see org.apache.geronimo.core.service.ManagedComponent#doStart()
103c103
< * @see org.apache.geronimo.core.service.AbstractComponent#doStop()
---
> * @see org.apache.geronimo.core.service.ManagedComponent#doStop()
Index:
modules/kernel/src/java/org/apache/geronimo/kernel/service/AbstractManagedObject.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service/AbstractManagedObject.java,v
retrieving revision 1.1
diff -r1.1 AbstractManagedObject.java
123c123
< private final Set notificationTypes = new HashSet();
---
> protected final Set notificationTypes = new HashSet();
128c128
< private DependencyServiceMBean dependencyService;
---
> protected DependencyServiceMBean dependencyService;
133c133
< private RelationServiceMBean relationService;
---
> protected RelationServiceMBean relationService;
