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 2006/04/24 00:23:57 UTC
svn commit: r396332 - in /directory/trunks/apacheds/osgi:
apacheds/src/main/java/org/apache/ldap/server/Activator.java
loader/src/main/java/org/apache/ldap/server/loader/LoadCommand.java
Author: erodriguez
Date: Sun Apr 23 15:23:55 2006
New Revision: 396332
URL: http://svn.apache.org/viewcvs?rev=396332&view=rev
Log:
Corrected 2 instances of old CoreContextFactory packages.
Modified:
directory/trunks/apacheds/osgi/apacheds/src/main/java/org/apache/ldap/server/Activator.java
directory/trunks/apacheds/osgi/loader/src/main/java/org/apache/ldap/server/loader/LoadCommand.java
Modified: directory/trunks/apacheds/osgi/apacheds/src/main/java/org/apache/ldap/server/Activator.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/osgi/apacheds/src/main/java/org/apache/ldap/server/Activator.java?rev=396332&r1=396331&r2=396332&view=diff
==============================================================================
--- directory/trunks/apacheds/osgi/apacheds/src/main/java/org/apache/ldap/server/Activator.java (original)
+++ directory/trunks/apacheds/osgi/apacheds/src/main/java/org/apache/ldap/server/Activator.java Sun Apr 23 15:23:55 2006
@@ -71,7 +71,7 @@
env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
- env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.CoreContextFactory" );
+ env.put( Context.INITIAL_CONTEXT_FACTORY, CoreContextFactory.class.getName() );
factory = new CoreContextFactory();
Modified: directory/trunks/apacheds/osgi/loader/src/main/java/org/apache/ldap/server/loader/LoadCommand.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/osgi/loader/src/main/java/org/apache/ldap/server/loader/LoadCommand.java?rev=396332&r1=396331&r2=396332&view=diff
==============================================================================
--- directory/trunks/apacheds/osgi/loader/src/main/java/org/apache/ldap/server/loader/LoadCommand.java (original)
+++ directory/trunks/apacheds/osgi/loader/src/main/java/org/apache/ldap/server/loader/LoadCommand.java Sun Apr 23 15:23:55 2006
@@ -25,6 +25,7 @@
import javax.naming.directory.DirContext;
import javax.naming.spi.InitialContextFactory;
+import org.apache.directory.server.core.jndi.CoreContextFactory;
import org.apache.directory.server.protocol.shared.store.LdifFileLoader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -70,7 +71,7 @@
String initialContext = components[ 2 ];
Hashtable env = new Hashtable( new LoaderConfiguration().toJndiEnvironment() );
- env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.CoreContextFactory" );
+ env.put( Context.INITIAL_CONTEXT_FACTORY, CoreContextFactory.class.getName() );
env.put( Context.PROVIDER_URL, initialContext );
try