You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by er...@apache.org on 2005/10/29 05:03:56 UTC

svn commit: r329359 - /directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/ServiceConfiguration.java

Author: erodriguez
Date: Fri Oct 28 20:03:54 2005
New Revision: 329359

URL: http://svn.apache.org/viewcvs?rev=329359&view=rev
Log:
Over-rode toJndiEnvironment to pass env to context factory.

Modified:
    directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/ServiceConfiguration.java

Modified: directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/ServiceConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/ServiceConfiguration.java?rev=329359&r1=329358&r2=329359&view=diff
==============================================================================
--- directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/ServiceConfiguration.java (original)
+++ directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/ServiceConfiguration.java Fri Oct 28 20:03:54 2005
@@ -18,6 +18,7 @@
 package org.apache.protocol.common;
 
 import java.util.HashMap;
+import java.util.Hashtable;
 import java.util.Map;
 
 import org.apache.ldap.server.configuration.Configuration;
@@ -106,6 +107,15 @@
         }
 
         return DEFAULT_INITIAL_CONTEXT_FACTORY;
+    }
+
+    public Hashtable toJndiEnvironment()
+    {
+        Hashtable env = new Hashtable();
+        env.put( JNDI_KEY, this );
+        env.putAll( configuration );
+
+        return env;
     }
 
     protected void loadProperties( String prefix, Map properties, int strategy )