[openejb-scm] openejb/modules/core/src/java/org/openejb/client AppClientJNDIContext.java JNDIResponse.java

[dain]

dain        2005/01/21 01:30:35

  Modified:    modules/core/src/java/org/openejb/client
                        AppClientJNDIContext.java JNDIResponse.java
  Log:

  Updated to new jndi reference code in geronimo.
  
  Revision  Changes    Path
  1.7       +3 -3      
openejb/modules/core/src/java/org/openejb/client/AppClientJNDIContext.java
  
  Index: AppClientJNDIContext.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/AppClientJNDIContext.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AppClientJNDIContext.java 21 Jan 2005 04:52:13 -0000      1.6
  +++ AppClientJNDIContext.java 21 Jan 2005 06:30:35 -0000      1.7
  @@ -70,7 +70,7 @@
           this.port = port;
       }
   
  -    public void startClient(ObjectName appClientModuleName, Kernel kernel) 
throws Exception {
  +    public void startClient(ObjectName appClientModuleName, Kernel kernel, 
ClassLoader classLoader) throws Exception {
   
           Context context;
           try {
  
  
  
  1.6       +9 -10     
openejb/modules/core/src/java/org/openejb/client/JNDIResponse.java
  
  Index: JNDIResponse.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/JNDIResponse.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JNDIResponse.java 9 Oct 2004 00:16:14 -0000       1.5
  +++ JNDIResponse.java 21 Jan 2005 06:30:35 -0000      1.6
  @@ -47,9 +47,12 @@
   import java.io.IOException;
   import java.io.ObjectInput;
   import java.io.ObjectOutput;
  -import javax.naming.*;
  +import javax.naming.Binding;
  +import javax.naming.Context;
  +import javax.naming.NamingEnumeration;
  +import javax.naming.NamingException;
   
  -import org.openejb.proxy.ProxyObjectFactory;
  +import org.openejb.proxy.EJBProxyReference;
   
   /**
    *
  @@ -222,13 +225,9 @@
                       out.write(CONTEXT);
                       out.writeUTF(name);
                       writeContextTree(out, (Context)obj);
  -                } else if ( obj instanceof Reference ){
  -                    Reference reference = (Reference) obj;
  -                    String factoryClassName = 
reference.getFactoryClassName();
  -                    if 
(ProxyObjectFactory.class.getName().equals(factoryClassName)){
  -                        ProxyObjectFactory factory = new 
ProxyObjectFactory();
  -                        obj = 
factory.getObjectInstance(reference,null,context,null);
  -                    }
  +                } else if ( obj instanceof EJBProxyReference ){
  +                    EJBProxyReference reference = (EJBProxyReference) obj;
  +                    obj = reference.getContent();
                       out.write(OBJECT);
                       out.writeUTF(name);
                       out.writeObject(obj);