directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: rev 53911 - incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi
Date Wed, 06 Oct 2004 21:24:11 GMT
Author: akarasulu
Date: Wed Oct  6 14:24:10 2004
New Revision: 53911

Added:
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveContext.java
      - copied, changed from rev 53886, incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/ServerContext.java
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveDirContext.java
      - copied, changed from rev 53886, incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/DirServerContext.java
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveLdapContext.java
      - copied, changed from rev 53886, incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/LdapServerContext.java
Removed:
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/DirServerContext.java
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/LdapServerContext.java
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/ServerContext.java
Modified:
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveJndiProvider.java
Log:
renaming context to follow more consistent pattern

Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveContext.java
(from rev 53886, incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/ServerContext.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/ServerContext.java
(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveContext.java
Wed Oct  6 14:24:10 2004
@@ -25,7 +25,7 @@
  * A non-federated abstract Context implementation.
  *
  */
-abstract class ServerContext implements Context
+abstract class EveContext implements Context
 {
     /** */
     public static final String DELETE_OLD_RDN_PROP = "java.naming.ldap.deleteRDN" ;
@@ -52,7 +52,7 @@
      * @throws NamingException if the environment parameters are not set 
      * correctly.
      */
-    protected ServerContext( PartitionNexus a_nexusProxy, Hashtable a_env ) throws NamingException
+    protected EveContext( PartitionNexus a_nexusProxy, Hashtable a_env ) throws NamingException
     {
         m_nexusProxy = a_nexusProxy ;
         m_env = ( Hashtable ) a_env.clone() ;
@@ -83,7 +83,7 @@
      * @param a_env the environment properties used by this context
      * @param a_dn the distinguished name of this context
      */
-    protected ServerContext( PartitionNexus a_nexusProxy, Hashtable a_env, LdapName a_dn
)
+    protected EveContext( PartitionNexus a_nexusProxy, Hashtable a_env, LdapName a_dn )
     {
         m_dn = ( LdapName ) a_dn.clone() ; 
         m_env = ( Hashtable ) a_env.clone() ;
@@ -219,16 +219,16 @@
         /*
          * Add the new context to the server which as a side effect adds 
          * operational attributes to the l_attributes refering instance which 
-         * can them be used to initialize a new LdapServerContext.  Remember
+         * can them be used to initialize a new EveLdapContext.  Remember
          * we need to copy over the controls as well to propagate the complete 
          * environment besides whats in the hashtable for m_env.
          */
         m_nexusProxy.add( l_target.toString(), l_target, l_attributes ) ;
         
-        LdapServerContext l_ctx = 
-            new LdapServerContext( m_nexusProxy, m_env, l_target ) ;
+        EveLdapContext l_ctx =
+            new EveLdapContext( m_nexusProxy, m_env, l_target ) ;
         Control [] l_controls = ( Control [] )
-            ( ( LdapServerContext ) this ).getRequestControls().clone() ; 
+            ( ( EveLdapContext ) this ).getRequestControls().clone() ;
         l_ctx.setRequestControls( l_controls ) ;
         return l_ctx ;
     }
@@ -267,7 +267,7 @@
      */
     public void bind( Name a_name, Object a_obj ) throws NamingException
     {
-        if ( a_obj instanceof LdapServerContext )
+        if ( a_obj instanceof EveLdapContext )
         {
             throw new IllegalArgumentException(
                 "Cannot bind a directory context object!" ) ;
@@ -427,11 +427,11 @@
         }
         
         // Initialize and return a context since the entry is not a java object
-        LdapServerContext l_ctx = new LdapServerContext( m_nexusProxy, 
+        EveLdapContext l_ctx = new EveLdapContext( m_nexusProxy,
             m_env, l_target ) ; 
             
         // Need to add controls to propagate extended ldap operational env
-        Control [] l_controls = ( ( LdapServerContext ) this )
+        Control [] l_controls = ( ( EveLdapContext ) this )
             .getRequestControls() ; 
         if ( null != l_controls )
         {    

Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveDirContext.java
(from rev 53886, incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/DirServerContext.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/DirServerContext.java
(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveDirContext.java
Wed Oct  6 14:24:10 2004
@@ -32,7 +32,7 @@
  * The DirContext implementation for the Server Side JNDI LDAP provider.
  *
  */
-public class DirServerContext extends ServerContext implements DirContext
+public class EveDirContext extends EveContext implements DirContext
 {
     
     
@@ -41,28 +41,28 @@
     // ------------------------------------------------------------------------
     
     /**
-     * Creates a new DirServerContext by reading the PROVIDER_URL to resolve the
+     * Creates a new EveDirContext by reading the PROVIDER_URL to resolve the
      * distinguished name for this context.
      *
      * @param a_nexusProxy the proxy to the backend nexus
      * @param a_env the environment used for this context
      * @throws NamingException if something goes wrong
      */
-    public DirServerContext( PartitionNexus a_nexusProxy, Hashtable a_env ) throws NamingException
+    public EveDirContext( PartitionNexus a_nexusProxy, Hashtable a_env ) throws NamingException
     {
         super( a_nexusProxy, a_env ) ;
     }
 
 
     /**
-     * Creates a new DirServerContext with a distinguished name which is used to
+     * Creates a new EveDirContext with a distinguished name which is used to
      * set the PROVIDER_URL to the distinguished name for this context.
      * 
      * @param a_nexusProxy the intercepting proxy to the nexus
      * @param a_env the environment properties used by this context
      * @param a_dn the distinguished name of this context
      */
-    protected DirServerContext( PartitionNexus a_nexusProxy, Hashtable a_env, LdapName a_dn
)
+    protected EveDirContext( PartitionNexus a_nexusProxy, Hashtable a_env, LdapName a_dn
)
     {
         super( a_nexusProxy, a_env, a_dn ) ;
     }
@@ -196,7 +196,7 @@
         // Need to perform serialization of object into a copy of a_attrs
         else 
         {
-            if ( a_obj instanceof LdapServerContext )
+            if ( a_obj instanceof EveLdapContext )
             {
                 throw new IllegalArgumentException(
                     "Cannot bind a directory context object!" ) ;
@@ -276,10 +276,10 @@
         getNexusProxy().add( l_target.toString(), l_target, l_attributes ) ;
 
         // Initialize the new context
-        LdapServerContext l_ctx = new LdapServerContext( getNexusProxy(),
+        EveLdapContext l_ctx = new EveLdapContext( getNexusProxy(),
             getEnvironment(), l_target ) ;
         Control [] l_controls = ( Control [] )
-            ( ( LdapServerContext ) this ).getRequestControls().clone() ; 
+            ( ( EveLdapContext ) this ).getRequestControls().clone() ;
         l_ctx.setRequestControls( l_controls ) ;
         return l_ctx ;
     }

Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveJndiProvider.java
==============================================================================
--- incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveJndiProvider.java
(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveJndiProvider.java
Wed Oct  6 14:24:10 2004
@@ -92,7 +92,7 @@
      */
     public LdapContext getLdapContext( Hashtable an_env ) throws NamingException
     {
-        return new LdapServerContext( m_proxy, an_env ) ;
+        return new EveLdapContext( m_proxy, an_env ) ;
     }
 
 

Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveLdapContext.java
(from rev 53886, incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/LdapServerContext.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/LdapServerContext.java
(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveLdapContext.java
Wed Oct  6 14:24:10 2004
@@ -17,7 +17,7 @@
 /**
  *
  */
-public class LdapServerContext extends DirServerContext implements LdapContext
+public class EveLdapContext extends EveDirContext implements LdapContext
 {
 
     /**
@@ -26,21 +26,21 @@
      * @param a_nexusProxy TODO
      * @param a_env TODO
      */
-    public LdapServerContext( PartitionNexus a_nexusProxy, Hashtable a_env ) throws NamingException
+    public EveLdapContext( PartitionNexus a_nexusProxy, Hashtable a_env ) throws NamingException
     {
         super( a_nexusProxy, a_env ) ;
     }
 
 
     /**
-     * Creates a new DirServerContext with a distinguished name which is used to
+     * Creates a new EveDirContext with a distinguished name which is used to
      * set the PROVIDER_URL to the distinguished name for this context.
      * 
      * @param a_nexusProxy the intercepting proxy to the nexus
      * @param a_env the environment properties used by this context
      * @param a_dn the distinguished name of this context
      */
-    LdapServerContext( PartitionNexus a_nexusProxy, Hashtable a_env, LdapName a_dn )
+    EveLdapContext( PartitionNexus a_nexusProxy, Hashtable a_env, LdapName a_dn )
     {
         super( a_nexusProxy, a_env, a_dn ) ;
     }

Mime
View raw message