[jBoss-Dev] CVS update: jboss/src/main/org/jboss/naming/javajavaURLContextFactory.java

[jBoss CVS Development]

  User: oberg   
  Date: 00/10/25 01:34:08

  Modified:    src/main/org/jboss/naming/java javaURLContextFactory.java
  Log:
  Changed to new java: handling, i.e. create a "java:comp" reference which is 
component local
  Added JNDI factory for the "java:comp" ENC namespace
  
  Revision  Changes    Path
  1.3       +12 -32    jboss/src/main/org/jboss/naming/java/javaURLContextFactory.java
  
  Index: javaURLContextFactory.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/naming/java/javaURLContextFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- javaURLContextFactory.java        2000/09/26 19:07:34     1.2
  +++ javaURLContextFactory.java        2000/10/25 08:34:08     1.3
  @@ -11,7 +11,7 @@
   import javax.naming.spi.*;
   
   import org.jnp.interfaces.NamingContext;
  -import org.jnp.interfaces.Naming;
  +import org.jnp.server.NamingServer;
   
   import org.jboss.ejb.BeanClassLoader;
   
  @@ -24,7 +24,7 @@
    *     
    *   @see <related>
    *   @author Rickard �berg ([EMAIL PROTECTED])
  - *   @version $Revision: 1.2 $
  + *   @version $Revision: 1.3 $
    */
   public class javaURLContextFactory
      implements ObjectFactory
  @@ -34,16 +34,17 @@
      // Attributes ----------------------------------------------------
       
      // Static --------------------------------------------------------
  -   public static void setRoot(Naming srv)
  -   {
  -      BeanClassLoader bcl = 
(BeanClassLoader)Thread.currentThread().getContextClassLoader();
  -      bcl.setJNDIRoot(srv);
  -   }
  +   static NamingServer root;
      
  -   public static Naming getRoot()
  +   static
      {
  -      BeanClassLoader bcl = 
(BeanClassLoader)Thread.currentThread().getContextClassLoader();
  -      return (Naming)bcl.getJNDIRoot();
  +      try
  +      {
  +         root = new NamingServer();
  +      } catch (NamingException e)
  +      {
  +         e.printStackTrace();
  +      }
      }
      
      // Constructors --------------------------------------------------
  @@ -57,28 +58,7 @@
                                   Hashtable environment)
                            throws Exception
      {
  -      if (obj == null)
  -         return new NamingContext(environment, name, getRoot());
  -      else if (obj instanceof String)
  -      {
  -         String url = (String)obj;
  -         Context ctx = new NamingContext(environment, name, getRoot());
  -         
  -         Name n = ctx.getNameParser(name).parse(url.substring(url.indexOf(":")+1));
  -         if (n.size() >= 3)
  -         {
  -            // Provider URL?
  -            if (n.get(0).toString().equals("") &&
  -                n.get(1).toString().equals(""))
  -            {
  -               ctx.addToEnvironment(Context.PROVIDER_URL, n.get(2));
  -            }
  -         }
  -         return ctx;
  -      } else
  -      {
  -         return null;
  -      }
  +      return new NamingContext(environment, name, root);
      }
       
      // Y overrides ---------------------------------------------------