[openejb-scm] openejb/modules/core/src/java/org/openejb EJBContainer.java GenericEJBContainer.java

[dain]

dain        2005/05/08 15:37:04

  Modified:    modules/core/src/java/org/openejb EJBContainer.java
                        GenericEJBContainer.java
  Log:

  Added KernelFactory for pluggable kernel
  Kernel is now an interface
  Moved Kernel implementation  to basic kernel
  Converted JMX registry and config manager to plain old gbeans (they do not 
require special access to the kernel)
  Magic attributes such as state and enabled are now accessed via kernel methods
  Use of getAttribute and invoke for magic attributes and state transition is 
now deprecated
  Cleaned up cruft in GBean infos such as declaration of non existent attributes
  Upgraded to newest CGLIB, asm, and commons-collections
  
  Revision  Changes    Path
  1.10      +6 -7      
openejb/modules/core/src/java/org/openejb/EJBContainer.java
  
  Index: EJBContainer.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/EJBContainer.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- EJBContainer.java 15 Mar 2005 05:27:01 -0000      1.9
  +++ EJBContainer.java 8 May 2005 19:37:04 -0000       1.10
  @@ -57,7 +57,6 @@
   
   import org.apache.geronimo.core.service.Interceptor;
   
  -import org.openejb.proxy.EJBProxyFactory;
   import org.openejb.proxy.ProxyInfo;
   import org.openejb.dispatch.InterfaceMethodSignature;
   
  @@ -81,7 +80,7 @@
        * Return the name of the EJB
        * @return the name of the EJB
        */
  -    String getEJBName();
  +    String getEjbName();
   
       /**
        * Return a proxy for the EJB's home interface. This can be passed back
  @@ -89,7 +88,7 @@
        * call to EJBContext.getEJBHome() )
        * @return the proxy for this EJB's home interface
        */
  -    EJBHome getEJBHome();
  +    EJBHome getEjbHome();
   
       /**
        * Return a proxy for the EJB's remote interface. This can be passed back
  @@ -97,7 +96,7 @@
        * call to SessionContext.getEJBObject() )
        * @return the proxy for this EJB's home interface
        */
  -    EJBObject getEJBObject(Object primaryKey);
  +    EJBObject getEjbObject(Object primaryKey);
   
       /**
        * Return a proxy for the EJB's local home interface. This can be
  @@ -105,7 +104,7 @@
        * (e.g. in response to a call to EJBContext.getEJBLocalHome() )
        * @return the proxy for this EJB's local home interface
        */
  -    EJBLocalHome getEJBLocalHome();
  +    EJBLocalHome getEjbLocalHome();
   
       /**
        * Return a proxy for the EJB's local interface. This can be passed back
  @@ -113,7 +112,7 @@
        * call to SessionContext.getEJBLocalObject() )
        * @return the proxy for this EJB's local interface
        */
  -    EJBLocalObject getEJBLocalObject(Object primaryKey);
  +    EJBLocalObject getEjbLocalObject(Object primaryKey);
   
       /**
        * Legacy invoke method for openejb 1.0 code
  
  
  
  1.49      +8 -8      
openejb/modules/core/src/java/org/openejb/GenericEJBContainer.java
  
  Index: GenericEJBContainer.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/GenericEJBContainer.java,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- GenericEJBContainer.java  15 Apr 2005 05:36:52 -0000      1.48
  +++ GenericEJBContainer.java  8 May 2005 19:37:04 -0000       1.49
  @@ -286,7 +286,7 @@
           return containerId;
       }
   
  -    public String getEJBName() {
  +    public String getEjbName() {
           return ejbName;
       }
   
  @@ -298,19 +298,19 @@
           return copyNames(localJndiNames);
       }
   
  -    public EJBHome getEJBHome() {
  +    public EJBHome getEjbHome() {
           return proxyFactory.getEJBHome();
       }
   
  -    public EJBObject getEJBObject(Object primaryKey) {
  +    public EJBObject getEjbObject(Object primaryKey) {
           return proxyFactory.getEJBObject(primaryKey);
       }
   
  -    public EJBLocalHome getEJBLocalHome() {
  +    public EJBLocalHome getEjbLocalHome() {
           return proxyFactory.getEJBLocalHome();
       }
   
  -    public EJBLocalObject getEJBLocalObject(Object primaryKey) {
  +    public EJBLocalObject getEjbLocalObject(Object primaryKey) {
           return proxyFactory.getEJBLocalObject(primaryKey);
       }
   
  @@ -445,8 +445,8 @@
           infoFactory.addAttribute("classLoader", ClassLoader.class, false);
   
           infoFactory.addOperation("getMethodIndex", new 
Class[]{Method.class});
  -        infoFactory.addOperation("getEJBObject", new Class[]{Object.class});
  -        infoFactory.addOperation("getEJBLocalObject", new 
Class[]{Object.class});
  +        infoFactory.addOperation("getEjbObject", new Class[]{Object.class});
  +        infoFactory.addOperation("getEjbLocalObject", new 
Class[]{Object.class});
   
           infoFactory.addOperation("invoke", new Class[]{Invocation.class});
           infoFactory.addOperation("invoke", new Class[]{Method.class, 
Object[].class, Object.class});