X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=test%2Fenterprise%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsupport%2Fjndi%2FStubInitialContextFactory.java;h=158bd6d8b8d8048ff8928e6c844681c0e6fac262;hb=bd197313c85d3ee6336e7e7cbf7ff706247df9b4;hp=c2869ea3237c9d56e3f032acdd3c743f6b26304e;hpb=17775e14ecfb286e59f67117e5cee7e21e95ab1f;p=utils

diff --git a/test/enterprise/src/main/java/org/wamblee/support/jndi/StubInitialContextFactory.java b/test/enterprise/src/main/java/org/wamblee/support/jndi/StubInitialContextFactory.java
index c2869ea3..158bd6d8 100644
--- a/test/enterprise/src/main/java/org/wamblee/support/jndi/StubInitialContextFactory.java
+++ b/test/enterprise/src/main/java/org/wamblee/support/jndi/StubInitialContextFactory.java
@@ -15,12 +15,9 @@
  */ 
 package org.wamblee.support.jndi;
 
-import java.util.HashMap;
 import java.util.Hashtable;
-import java.util.Map;
 
 import javax.naming.Context;
-import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.naming.spi.InitialContextFactory;
 
@@ -30,19 +27,25 @@ import javax.naming.spi.InitialContextFactory;
  * 
  * See {@link #bind(String, Object)} to resp. register the initial context.
  * 
- * To bind objects in the JNDI tree simply use the standard JNDI api: <code>
+ * To start mocking the JNDI tree, call {@link #register()}. 
+ * 
+ * To bind objects in the JNDI tree simply use the standard JNDI api: 
+ * <pre>
  *   InitialContext context = new InitialContext();
  *   MyClass myObj = ...; 
  *   context.bind("a/b", myObj); 
- * </code>
+ * </pre>
+ * 
+ * When finished with a test case, call {@link #unregister()} to unregister the 
+ * JNDI tree again. 
  */
 public class StubInitialContextFactory implements InitialContextFactory {
 
-    private static Context context;
+    private static Context CONTEXT;
 
     private static void initialize() {
         try {
-            context = new StubInitialContext();
+            CONTEXT = new StubInitialContext();
         } catch (NamingException e) { // can't happen.
             throw new RuntimeException(e);
         }
@@ -58,7 +61,7 @@ public class StubInitialContextFactory implements InitialContextFactory {
         // sets up the InitialContextFactoryForTest as default factory.
         System.setProperty(Context.INITIAL_CONTEXT_FACTORY,
             StubInitialContextFactory.class.getName());
-        if (context == null) {
+        if (CONTEXT == null) {
             initialize();
         }
     }
@@ -68,11 +71,11 @@ public class StubInitialContextFactory implements InitialContextFactory {
      */
     public static void unregister() {
         System.setProperty(Context.INITIAL_CONTEXT_FACTORY, "");
-        context = null;
+        CONTEXT = null;
     }
 
-    public Context getInitialContext(Hashtable<?, ?> environment)
+    public Context getInitialContext(Hashtable<?, ?> aEnvironment)
         throws NamingException {
-        return context;
+        return CONTEXT;
     }
 }