rename naming->namingcontext

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@1052 1c488680-804c-0410-94cd-c6b725194a0e
weld · Jan 17, 2009 · 48297e6 · 48297e6
1 parent 2a6963f
commit 48297e6
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 42 deletions.
diff --git a/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbResolver.java b/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbResolver.java
@@ -4,7 +4,7 @@
 
 import javax.webbeans.InjectionPoint;
 
-import org.jboss.webbeans.resources.spi.Naming;
+import org.jboss.webbeans.resources.spi.NamingContext;
 
 /**
  * A container should implement this interface to allow the Web Beans RI to
@@ -30,13 +30,13 @@ public interface EjbResolver
     * @throws IllegalStateException
     *            if no EJBs can be resolved for injection
     */
-   public Object resolveEjb(InjectionPoint injectionPoint, Naming naming);
+   public Object resolveEjb(InjectionPoint injectionPoint, NamingContext namingContext);
 
    /**
     * Resolve the value for the given @PersistenceContext injection point
     * 
     * @param injectionPoint the injection point metadata
-    * @param naming the pluggable Web Beans JNDI lookup facility
+    * @param namingContext the pluggable Web Beans JNDI lookup facility
     * @return an instance of the persistence unit
     * @throws IllegalArgumentException
     *            if the injection point is not annotated with 
@@ -45,13 +45,13 @@ public interface EjbResolver
     * @throws IllegalStateException
     *            if no suitable persistence units can be resolved for injection
     */
-   public Object resolvePersistenceContext(InjectionPoint injectionPoint, Naming naming);
+   public Object resolvePersistenceContext(InjectionPoint injectionPoint, NamingContext namingContext);
 
    /**
     * Resolve the value for the given @Resource injection point
     * 
     * @param injectionPoint the injection point metadata
-    * @param naming the pluggable Web Beans JNDI lookup facility
+    * @param namingContext the pluggable Web Beans JNDI lookup facility
     * @return an instance of the resource
     * @throws IllegalArgumentException
     *            if the injection point is not annotated with @Resource, or, if 
@@ -60,7 +60,7 @@ public interface EjbResolver
     * @throws IllegalStateException
     *            if no resource can be resolved for injection
     */
-   public Object resolveResource(InjectionPoint injectionPoint, Naming naming);
+   public Object resolveResource(InjectionPoint injectionPoint, NamingContext namingContext);
 
    /**
     * Get the annotation which defines an @EJB injection point

diff --git a/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/ForwardingEjbResolver.java b/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/ForwardingEjbResolver.java
@@ -4,7 +4,7 @@
 
 import javax.webbeans.InjectionPoint;
 
-import org.jboss.webbeans.resources.spi.Naming;
+import org.jboss.webbeans.resources.spi.NamingContext;
 
 /**
  * An implementation of {@link EjbResolver} which forwards all its method calls
@@ -36,19 +36,19 @@ public Class<? extends Annotation> getResourceAnnotation()
       return delegate().getResourceAnnotation();
    }
 
-   public Object resolveEjb(InjectionPoint injectionPoint, Naming naming)
+   public Object resolveEjb(InjectionPoint injectionPoint, NamingContext namingContext)
    {
-      return delegate().resolveEjb(injectionPoint, naming);
+      return delegate().resolveEjb(injectionPoint, namingContext);
    }
 
-   public Object resolvePersistenceContext(InjectionPoint injectionPoint, Naming naming)
+   public Object resolvePersistenceContext(InjectionPoint injectionPoint, NamingContext namingContext)
    {
-      return delegate().resolvePersistenceContext(injectionPoint, naming);
+      return delegate().resolvePersistenceContext(injectionPoint, namingContext);
    }
 
-   public Object resolveResource(InjectionPoint injectionPoint, Naming naming)
+   public Object resolveResource(InjectionPoint injectionPoint, NamingContext namingContext)
    {
-      return delegate().resolveResource(injectionPoint, naming);
+      return delegate().resolveResource(injectionPoint, namingContext);
    }
 
    @Override

diff --git a/...beans/resources/spi/ForwardingNaming.java → ...esources/spi/ForwardingNamingContext.java b/...beans/resources/spi/ForwardingNaming.java → ...esources/spi/ForwardingNamingContext.java
@@ -2,19 +2,19 @@
 
 
 /**
- * An implementation of {@link Naming} which forwards all its method calls
- * to another {@link Naming}}. Subclasses should override one or more 
- * methods to modify the behavior of the backing {@link Naming} as desired
+ * An implementation of {@link NamingContext} which forwards all its method calls
+ * to another {@link NamingContext}}. Subclasses should override one or more 
+ * methods to modify the behavior of the backing {@link NamingContext} as desired
  * per the <a
  * href="http://en.wikipedia.org/wiki/Decorator_pattern">decorator pattern</a>.
  * 
  * @author Pete Muir
  *
  */
-public abstract class ForwardingNaming implements Naming
+public abstract class ForwardingNamingContext implements NamingContext
 {
 
-   protected abstract Naming delegate();
+   protected abstract NamingContext delegate();
 
    public void bind(String key, Object value)
    {

diff --git a/.../jboss/webbeans/resources/spi/Naming.java → ...webbeans/resources/spi/NamingContext.java b/.../jboss/webbeans/resources/spi/Naming.java → ...webbeans/resources/spi/NamingContext.java
@@ -17,10 +17,10 @@
 
 package org.jboss.webbeans.resources.spi;
 
-public interface Naming
+public interface NamingContext
 {
 
-   public static final String PROPERTY_NAME = Naming.class.getName();
+   public static final String PROPERTY_NAME = NamingContext.class.getName();
 
    /**
     * Typed JNDI lookup
@@ -38,6 +38,6 @@ public interface Naming
     * @param key The key to bind under
     * @param value The item to bind
     */
-   public void bind(String key, Object value);
+   public void bind(String name, Object value);
 
 }
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java b/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
@@ -60,7 +60,7 @@
 import org.jboss.webbeans.introspector.AnnotatedItem;
 import org.jboss.webbeans.introspector.AnnotatedMethod;
 import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl;
-import org.jboss.webbeans.resources.spi.Naming;
+import org.jboss.webbeans.resources.spi.NamingContext;
 import org.jboss.webbeans.resources.spi.ResourceLoader;
 import org.jboss.webbeans.util.BeanValidation;
 import org.jboss.webbeans.util.Proxies;
@@ -116,17 +116,17 @@ public class ManagerImpl implements Manager, Serializable
    private transient final ResourceLoader resourceLoader;
 
    // The Naming (JNDI) access
-   private transient final Naming naming;
+   private transient final NamingContext namingContext;
 
    /**
     * Create a new manager
     * 
     * @param ejbResolver the ejbResolver to use
     */
-   public ManagerImpl(Naming naming, EjbResolver ejbResolver, ResourceLoader resourceLoader)
+   public ManagerImpl(NamingContext namingContext, EjbResolver ejbResolver, ResourceLoader resourceLoader)
    {
       this.ejbResolver = ejbResolver;
-      this.naming = naming;
+      this.namingContext = namingContext;
       this.resourceLoader = resourceLoader;
       this.beans = new CopyOnWriteArrayList<Bean<?>>();
       this.beanMap = new ConcurrentHashMap<Class<?>, Bean<?>>();
@@ -732,9 +732,9 @@ public Manager setCurrent()
       return this;
    }
 
-   public Naming getNaming()
+   public NamingContext getNaming()
    {
-      return naming;
+      return namingContext;
    }
 
    public EjbResolver getEjbResolver()

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java b/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
@@ -63,7 +63,7 @@
 import org.jboss.webbeans.jsf.JSFApiAbstraction;
 import org.jboss.webbeans.log.LogProvider;
 import org.jboss.webbeans.log.Logging;
-import org.jboss.webbeans.resources.spi.Naming;
+import org.jboss.webbeans.resources.spi.NamingContext;
 import org.jboss.webbeans.resources.spi.ResourceLoader;
 import org.jboss.webbeans.servlet.ServletApiAbstraction;
 import org.jboss.webbeans.transaction.Transaction;
@@ -118,9 +118,9 @@ public ManagerImpl create()
    // The Web Beans manager
    private ManagerImpl manager;
 
-   protected void initManager(Naming naming, EjbResolver ejbResolver, ResourceLoader resourceLoader)
+   protected void initManager(NamingContext namingContext, EjbResolver ejbResolver, ResourceLoader resourceLoader)
    {
-      this.manager = new ManagerImpl(naming, ejbResolver, resourceLoader);
+      this.manager = new ManagerImpl(namingContext, ejbResolver, resourceLoader);
       manager.getNaming().bind(ManagerImpl.JNDI_KEY, getManager());
       CurrentManager.setRootManager(manager);
    }

diff --git a/...oss/webbeans/resource/AbstractNaming.java → ...beans/resource/AbstractNamingContext.java b/...oss/webbeans/resource/AbstractNaming.java → ...beans/resource/AbstractNamingContext.java
@@ -7,9 +7,9 @@
 import javax.naming.NamingException;
 import javax.webbeans.ExecutionException;
 
-import org.jboss.webbeans.resources.spi.Naming;
+import org.jboss.webbeans.resources.spi.NamingContext;
 
-public abstract class AbstractNaming implements Naming
+public abstract class AbstractNamingContext implements NamingContext
 {
 
    public abstract Context getContext();

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/resource/DefaultNaming.java b/webbeans-ri/src/main/java/org/jboss/webbeans/resource/DefaultNaming.java
@@ -26,7 +26,7 @@
  * 
  * @author Pete Muir
  */
-public class DefaultNaming extends AbstractNaming
+public class DefaultNaming extends AbstractNamingContext
 {
    private static final long serialVersionUID = 1L;
    // The initial lookup context

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletBootstrap.java b/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletBootstrap.java
@@ -31,7 +31,7 @@
 import org.jboss.webbeans.context.SessionContext;
 import org.jboss.webbeans.ejb.spi.EjbResolver;
 import org.jboss.webbeans.resource.DefaultNaming;
-import org.jboss.webbeans.resources.spi.Naming;
+import org.jboss.webbeans.resources.spi.NamingContext;
 import org.jboss.webbeans.resources.spi.ResourceLoader;
 import org.jboss.webbeans.util.DeploymentProperties;
 
@@ -81,9 +81,9 @@ private void initManager(ServletContext servletContext)
       initManager(createNaming(servletContext), createEjbResolver(servletContext), getResourceLoader());
    }
 
-   protected Naming createNaming(ServletContext servletContext)
+   protected NamingContext createNaming(ServletContext servletContext)
    {
-      Constructor<? extends Naming> namingConstructor = getClassConstructor(getDeploymentProperties(), getResourceLoader(), Naming.PROPERTY_NAME, Naming.class, ServletContext.class);
+      Constructor<? extends NamingContext> namingConstructor = getClassConstructor(getDeploymentProperties(), getResourceLoader(), NamingContext.PROPERTY_NAME, NamingContext.class, ServletContext.class);
       if (namingConstructor != null)
       {
          return newInstance(namingConstructor, servletContext);

diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java
@@ -19,8 +19,8 @@
 import org.jboss.webbeans.bootstrap.spi.EjbDiscovery;
 import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery;
 import org.jboss.webbeans.ejb.spi.EjbResolver;
-import org.jboss.webbeans.resource.AbstractNaming;
-import org.jboss.webbeans.resources.spi.Naming;
+import org.jboss.webbeans.resource.AbstractNamingContext;
+import org.jboss.webbeans.resources.spi.NamingContext;
 import org.jboss.webbeans.resources.spi.ResourceLoader;
 import org.jboss.webbeans.test.mock.context.MockApplicationContext;
 import org.jboss.webbeans.test.mock.context.MockDependentContext;
@@ -30,7 +30,7 @@
 public class MockBootstrap extends WebBeansBootstrap
 { 
 
-   public static class MockNaming extends AbstractNaming
+   public static class MockNaming extends AbstractNamingContext
    {
 
       private Context context;
@@ -133,13 +133,13 @@ public Class<? extends Annotation> getPersistenceContextAnnotation()
          return PersistenceContext.class;
       }
 
-      public Object resolveEjb(InjectionPoint injectionPoint, Naming naming)
+      public Object resolveEjb(InjectionPoint injectionPoint, NamingContext namingContext)
       {
          // TODO Implement EJB resolution for Unit tests
          return null;
       }
 
-      public Object resolvePersistenceContext(InjectionPoint injectionPoint, Naming naming)
+      public Object resolvePersistenceContext(InjectionPoint injectionPoint, NamingContext namingContext)
       {
          // TODO Implement PU resolution for Unit tests
          return null;
@@ -150,7 +150,7 @@ public Class<? extends Annotation> getResourceAnnotation()
          return Resource.class;
       }
 
-      public Object resolveResource(InjectionPoint injectionPoint, Naming naming)
+      public Object resolveResource(InjectionPoint injectionPoint, NamingContext namingContext)
       {
          // TODO Auto-generated method stub
          return null;