directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trus...@apache.org
Subject svn commit: r202108 - in /directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi: AbstractContextFactory.java ContextFactoryConfiguration.java ContextFactoryService.java DefaultContextFactoryConfiguration.java
Date Tue, 28 Jun 2005 01:17:11 GMT
Author: trustin
Date: Mon Jun 27 18:17:09 2005
New Revision: 202108

URL: http://svn.apache.org/viewcvs?rev=202108&view=rev
Log:
* Moved ContextFactoryConfiguration.getJndiContext() to ContextFactoryService
* Added ContextFactoryConfiguration.getService().

Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java?rev=202108&r1=202107&r2=202108&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java
Mon Jun 27 18:17:09 2005
@@ -101,7 +101,7 @@
             throw new NamingException( "Unknown configuration: " + cfg );
         }
         
-        return service.getConfiguration().getJndiContext( principal, credential, authentication,
providerUrl );
+        return service.getJndiContext( principal, credential, authentication, providerUrl
);
     }
 
     private String getProviderUrl( Hashtable env )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java?rev=202108&r1=202107&r2=202108&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java
Mon Jun 27 18:17:09 2005
@@ -19,7 +19,6 @@
 import java.util.Hashtable;
 
 import javax.naming.Context;
-import javax.naming.NamingException;
 
 import org.apache.ldap.server.configuration.StartupConfiguration;
 import org.apache.ldap.server.interceptor.InterceptorChain;
@@ -34,6 +33,12 @@
  */
 public interface ContextFactoryConfiguration
 {
+    
+    /**
+     * Returns the {@link ContextFactoryService} for this configuration.
+     */
+    ContextFactoryService getService();
+    
     /**
      * Returns the instance ID of the {@link ContextFactoryService}.
      */
@@ -74,22 +79,4 @@
      * and bootstrap entries have been created for the first time.
      */
     boolean isFirstStart();
-    
-    /**
-     * Returns an anonymous JNDI {@link Context} with the specified <tt>baseName</tt>
-     * @throws NamingException if failed to create a context
-     */
-    Context getJndiContext( String baseName ) throws NamingException;
-    
-    /**
-     * Returns a JNDI {@link Context} with the specified authentication information
-     * (<tt>principal</tt>, <tt>credential</tt>, and <tt>authentication</tt>)
and
-     * <tt>baseName</tt>.
-     * 
-     * @param principal {@link Context#SECURITY_PRINCIPAL} value
-     * @param credential {@link Context#SECURITY_CREDENTIALS} value
-     * @param authentication {@link Context#SECURITY_AUTHENTICATION} value
-     * @throws NamingException if failed to create a context
-     */
-    Context getJndiContext( String principal, byte[] credential, String authentication, String
baseName ) throws NamingException;
 }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryService.java?rev=202108&r1=202107&r2=202108&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryService.java
Mon Jun 27 18:17:09 2005
@@ -22,6 +22,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
@@ -103,4 +104,22 @@
      * Returns the configuration of this service.
      */
     public abstract ContextFactoryConfiguration getConfiguration();
+
+    /**
+     * Returns an anonymous JNDI {@link Context} with the specified <tt>baseName</tt>
+     * @throws NamingException if failed to create a context
+     */
+    public abstract Context getJndiContext( String baseName ) throws NamingException;
+    
+    /**
+     * Returns a JNDI {@link Context} with the specified authentication information
+     * (<tt>principal</tt>, <tt>credential</tt>, and <tt>authentication</tt>)
and
+     * <tt>baseName</tt>.
+     * 
+     * @param principal {@link Context#SECURITY_PRINCIPAL} value
+     * @param credential {@link Context#SECURITY_CREDENTIALS} value
+     * @param authentication {@link Context#SECURITY_AUTHENTICATION} value
+     * @throws NamingException if failed to create a context
+     */
+    public abstract Context getJndiContext( String principal, byte[] credential, String authentication,
String baseName ) throws NamingException;
 }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java?rev=202108&r1=202107&r2=202108&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java
Mon Jun 27 18:17:09 2005
@@ -46,6 +46,11 @@
     {
         return parent.getInstanceId();
     }
+    
+    public ContextFactoryService getService()
+    {
+        return parent;
+    }
 
     public ContextFactoryServiceListener getServiceListener()
     {



Mime
View raw message