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

[dain]

dain        2004/09/23 19:53:52

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

  Cleaned up handling of specDDs so orignial dd is returned from 77 modules and 
web.xml is not overwritten with an upgraded dd
  Cleaned up generation of the base URI used for ref resolution
  
  Revision  Changes    Path
  1.2       +9 -6      
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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AppClientJNDIContext.java 23 Sep 2004 19:23:18 -0000      1.1
  +++ AppClientJNDIContext.java 23 Sep 2004 23:53:52 -0000      1.2
  @@ -44,13 +44,13 @@
    */
   package org.openejb.client;
   
  -import org.apache.geronimo.gbean.GBeanInfo;
  -import org.apache.geronimo.gbean.GBeanInfoFactory;
  -
   import javax.management.ObjectName;
   import javax.naming.Context;
   import javax.naming.NamingException;
   
  +import org.apache.geronimo.gbean.GBeanInfo;
  +import org.apache.geronimo.gbean.GBeanInfoFactory;
  +
   /**
    * @version $Revision$ $Date$
    */
  @@ -79,9 +79,12 @@
               context = (Context) res.getResult();
           } catch (Exception e) {
               NamingException namingException = new NamingException("Unable to 
retrieve J2EE AppClient's JNDI Context");
  -            e.initCause(namingException);
  +            namingException.initCause(e);
               throw namingException;
           }
  +
  +        System.setProperty("java.naming.factory.initial", 
"com.sun.jndi.rmi.registry.RegistryContextFactory");
  +        System.setProperty("java.naming.factory.url.pkgs", 
"org.openejb.client.naming");
       }
   
       public void stopClient(ObjectName appClientModuleName) throws Exception {