[openejb-scm] openejb/modules/core/src/java/org/openejb/proxy ProxyObjectFactory.java ProxyRefAddr.java

[djencks]

djencks     2004/10/31 19:10:02

  Modified:    modules/core/src/java/org/openejb/proxy
                        ProxyObjectFactory.java ProxyRefAddr.java
  Log:

  use new interface to expose containerId. ProxyObjectFactory could be replaced with 
geronimo RefAddrContentObjectFactory.
  
  Revision  Changes    Path
  1.2       +2 -3      
openejb/modules/core/src/java/org/openejb/proxy/ProxyObjectFactory.java
  
  Index: ProxyObjectFactory.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/proxy/ProxyObjectFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ProxyObjectFactory.java   13 Apr 2004 20:18:49 -0000      1.1
  +++ ProxyObjectFactory.java   1 Nov 2004 00:10:02 -0000       1.2
  @@ -69,7 +69,6 @@
           if (!(refAddr instanceof ProxyRefAddr)) {
               throw new IllegalStateException("Invalid ref addr in Proxy Factory: " + 
refAddr);
           }
  -        ProxyRefAddr proxyRefAddr = (ProxyRefAddr) refAddr;
  -        return proxyRefAddr.getContent();
  +        return refAddr.getContent();
       }
   }
  
  
  
  1.4       +13 -2     
openejb/modules/core/src/java/org/openejb/proxy/ProxyRefAddr.java
  
  Index: ProxyRefAddr.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/proxy/ProxyRefAddr.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ProxyRefAddr.java 19 May 2004 21:36:22 -0000      1.3
  +++ ProxyRefAddr.java 1 Nov 2004 00:10:02 -0000       1.4
  @@ -49,10 +49,12 @@
   
   import javax.naming.RefAddr;
   
  +import org.apache.geronimo.naming.reference.GBeanRefAddr;
  +
   /**
    * @version $Revision$ $Date$
    */
  -public class ProxyRefAddr extends RefAddr {
  +public class ProxyRefAddr extends RefAddr implements GBeanRefAddr {
       public static ProxyRefAddr createRemote(String containerId, boolean 
sessionBean, String remoteInterfaceName, String homeInterfaceName) {
           return new ProxyRefAddr(containerId, sessionBean, remoteInterfaceName, 
homeInterfaceName, null, null, false);
       }
  @@ -119,5 +121,14 @@
           } catch (ClassNotFoundException e) {
               throw new IllegalStateException("ejb" + (isLocal ? "-local" : "") + 
"-ref class not found: " + name);
           }
  +    }
  +
  +    public String getContainerId() {
  +        return containerId;
  +    }
  +
  +    public String getKernelName() {
  +        //TODO stop using a static instance of ContainerIndex in EJBProxyFactory
  +        return null;
       }
   }