Index: D:/dev/workspace/logback/logback-classic/src/main/java/ch/qos/logback/classic/ClassicConstants.java
===================================================================
--- D:/dev/workspace/logback/logback-classic/src/main/java/ch/qos/logback/classic/ClassicConstants.java	(working copy)
+++ D:/dev/workspace/logback/logback-classic/src/main/java/ch/qos/logback/classic/ClassicConstants.java	(revision 2)
@@ -22,7 +22,6 @@
     public static final String LOGBACK_CONTEXT_SELECTOR = "logback.ContextSelector";
     public static final String JNDI_CONFIGURATION_RESOURCE = "java:comp/env/logback/configuration-resource";
     public static final String JNDI_CONTEXT_NAME = "java:comp/env/logback/context-name";
-    public static final String JNDI_LOGBACK_CONTEXT_SELECTOR = "java:comp/env/logback/contextSelector";
 
     /**
      * The maximum number of package separators (dots) that abbreviation
Index: D:/dev/workspace/logback/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextSelectorStaticBinder.java
===================================================================
--- D:/dev/workspace/logback/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextSelectorStaticBinder.java	(working copy)
+++ D:/dev/workspace/logback/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextSelectorStaticBinder.java	(revision 2)
@@ -16,9 +16,6 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
-import javax.naming.Context;
-import javax.naming.NamingException;
-
 import ch.qos.logback.classic.ClassicConstants;
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.selector.ContextJNDISelector;
@@ -62,33 +59,17 @@
             throw new IllegalAccessException("Only certain classes can access this method.");
         }
 
-        // First try to find a selector class in the System environment
         String contextSelectorStr = OptionHelper.getEnv(ClassicConstants.LOGBACK_CONTEXT_SELECTOR);
-        
-        // If not there, try the System properties
         if (contextSelectorStr == null) {
             contextSelectorStr = OptionHelper.getSystemProperty(ClassicConstants.LOGBACK_CONTEXT_SELECTOR);
         }
-
-        // If not there, try JNDI
         if (contextSelectorStr == null) {
-            try {
-                Context ctx = JNDIUtil.getInitialContext();
-                contextSelectorStr = (String) JNDIUtil.lookup(ctx, ClassicConstants.JNDI_LOGBACK_CONTEXT_SELECTOR);
-            } catch (NamingException ne) {
-                // We can't log here
-            }
-        }
-
-        // If we're still null here, use the DefaultContextSelector
-        if (contextSelectorStr == null) {
             contextSelector = new DefaultContextSelector(defaultLoggerContext);
         } else if (contextSelectorStr.equals("JNDI")) {
             // if jndi is specified, let's use the appropriate class
             contextSelector = new ContextJNDISelector(defaultLoggerContext);
         } else {
-            // A custom class string was specified
-            contextSelector = dynamicContextSelector(defaultLoggerContext, contextSelectorStr);
+            contextSelector = dynamicalContextSelector(defaultLoggerContext, contextSelectorStr);
         }
     }
 
@@ -107,7 +88,7 @@
      * @throws IllegalAccessException
      * @throws InvocationTargetException
      */
-    static ContextSelector dynamicContextSelector(LoggerContext defaultLoggerContext, String contextSelectorStr) throws ClassNotFoundException,
+    static ContextSelector dynamicalContextSelector(LoggerContext defaultLoggerContext, String contextSelectorStr) throws ClassNotFoundException,
                     SecurityException, NoSuchMethodException, IllegalArgumentException, InstantiationException, IllegalAccessException,
                     InvocationTargetException {
         Class<?> contextSelectorClass = Loader.loadClass(contextSelectorStr);