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/09/13 05:45:37 UTC

svn commit: r280481 - in /directory/standalone/trunk/osgi: ldap/src/main/java/org/apache/ldap/Activator.java loader/src/main/java/org/apache/ldap/server/loader/Activator.java

Author: erodriguez
Date: Mon Sep 12 20:45:32 2005
New Revision: 280481

URL: http://svn.apache.org/viewcvs?rev=280481&view=rev
Log:
o  Removed unused JNDI properties from the OSGi protocol-provider bundles.

Modified:
    directory/standalone/trunk/osgi/ldap/src/main/java/org/apache/ldap/Activator.java
    directory/standalone/trunk/osgi/loader/src/main/java/org/apache/ldap/server/loader/Activator.java

Modified: directory/standalone/trunk/osgi/ldap/src/main/java/org/apache/ldap/Activator.java
URL: http://svn.apache.org/viewcvs/directory/standalone/trunk/osgi/ldap/src/main/java/org/apache/ldap/Activator.java?rev=280481&r1=280480&r2=280481&view=diff
==============================================================================
--- directory/standalone/trunk/osgi/ldap/src/main/java/org/apache/ldap/Activator.java (original)
+++ directory/standalone/trunk/osgi/ldap/src/main/java/org/apache/ldap/Activator.java Mon Sep 12 20:45:32 2005
@@ -146,9 +146,6 @@
     private void loadEnvironment( Hashtable env )
     {
         env.put( Context.PROVIDER_URL, "ou=system" );
-        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( "asn.1.berlib.provider", "org.apache.ldap.common.berlib.asn1.SnickersProvider" );

Modified: directory/standalone/trunk/osgi/loader/src/main/java/org/apache/ldap/server/loader/Activator.java
URL: http://svn.apache.org/viewcvs/directory/standalone/trunk/osgi/loader/src/main/java/org/apache/ldap/server/loader/Activator.java?rev=280481&r1=280480&r2=280481&view=diff
==============================================================================
--- directory/standalone/trunk/osgi/loader/src/main/java/org/apache/ldap/server/loader/Activator.java (original)
+++ directory/standalone/trunk/osgi/loader/src/main/java/org/apache/ldap/server/loader/Activator.java Mon Sep 12 20:45:32 2005
@@ -113,10 +113,7 @@
 
     private void loadEnvironment( Hashtable env )
     {
-        env.put( Context.PROVIDER_URL, "dc=example,dc=com" );
-        env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
-        env.put( Context.SECURITY_AUTHENTICATION, "simple" );
-        env.put( Context.SECURITY_CREDENTIALS, "secret" );
+        env.put( Context.PROVIDER_URL, "ou=system" );
         env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.CoreContextFactory" );
     }
 }