directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trus...@apache.org
Subject svn commit: r191495 - in /directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server: exception/ interceptor/ jndi/ operational/ partition/ partition/store/impl/gui/ schema/
Date Mon, 20 Jun 2005 15:49:03 GMT
Author: trustin
Date: Mon Jun 20 08:49:01 2005
New Revision: 191495

URL: http://svn.apache.org/viewcvs?rev=191495&view=rev
Log:
Made all interfaces expose ContextPartitionNexus instead of DefaultContextPartitionNexus (RootNexus)
Removed unused packages.

Removed:
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/impl/gui/
Modified:
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorContext.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/RootNexusProxy.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/ContextPartitionNexus.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/DefaultContextPartitionNexus.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java?rev=191495&r1=191494&r2=191495&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java
Mon Jun 20 08:49:01 2005
@@ -44,7 +44,7 @@
 import org.apache.ldap.server.invocation.MoveAndModifyRN;
 import org.apache.ldap.server.invocation.Search;
 import org.apache.ldap.server.partition.ContextPartition;
-import org.apache.ldap.server.partition.DefaultContextPartitionNexus;
+import org.apache.ldap.server.partition.ContextPartitionNexus;
 
 
 /**
@@ -61,7 +61,7 @@
     /**
      * the root nexus of the system
      */
-    private DefaultContextPartitionNexus nexus;
+    private ContextPartitionNexus nexus;
 
 
     /**

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorContext.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorContext.java?rev=191495&r1=191494&r2=191495&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorContext.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorContext.java
Mon Jun 20 08:49:01 2005
@@ -2,7 +2,7 @@
 
 
 import org.apache.ldap.server.configuration.StartupConfiguration;
-import org.apache.ldap.server.partition.DefaultContextPartitionNexus;
+import org.apache.ldap.server.partition.ContextPartitionNexus;
 import org.apache.ldap.server.partition.SystemPartition;
 import org.apache.ldap.server.schema.GlobalRegistries;
 
@@ -33,13 +33,13 @@
     /**
      * the root nexus
      */
-    private final DefaultContextPartitionNexus rootNexus;
+    private final ContextPartitionNexus rootNexus;
 
 
     public InterceptorContext( StartupConfiguration configuration,
                                SystemPartition systemPartition,
                                GlobalRegistries globalRegistries,
-                               DefaultContextPartitionNexus rootNexus )
+                               ContextPartitionNexus rootNexus )
     {
         this.configuration = configuration;
 
@@ -63,7 +63,7 @@
     }
 
 
-    public DefaultContextPartitionNexus getRootNexus()
+    public ContextPartitionNexus getRootNexus()
     {
         return rootNexus;
     }

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java?rev=191495&r1=191494&r2=191495&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java
Mon Jun 20 08:49:01 2005
@@ -23,7 +23,7 @@
 
 import org.apache.ldap.server.configuration.StartupConfiguration;
 import org.apache.ldap.server.invocation.Invocation;
-import org.apache.ldap.server.partition.DefaultContextPartitionNexus;
+import org.apache.ldap.server.partition.ContextPartitionNexus;
 import org.apache.ldap.server.schema.GlobalRegistries;
 
 /** FIXME Rename to ContextFactoryContext */
@@ -47,7 +47,7 @@
     /**
      * Returns the root nexus of this context factory.
      */
-    DefaultContextPartitionNexus getRootNexus();
+    ContextPartitionNexus getPartitionNexus();
     
     /**
      * Returns <tt>true</tt> if this context is started for the first time

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java?rev=191495&r1=191494&r2=191495&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java
Mon Jun 20 08:49:01 2005
@@ -242,7 +242,7 @@
         return globalRegistries;
     }
 
-    public DefaultContextPartitionNexus getRootNexus()
+    public ContextPartitionNexus getPartitionNexus()
     {
         return rootNexus;
     }

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/RootNexusProxy.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/RootNexusProxy.java?rev=191495&r1=191494&r2=191495&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/RootNexusProxy.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/RootNexusProxy.java
Mon Jun 20 08:49:01 2005
@@ -57,7 +57,7 @@
     }
 
     public LdapContext getLdapContext() {
-        return this.provider.getRootNexus().getLdapContext();
+        return this.provider.getPartitionNexus().getLdapContext();
     }
 
     public Name getMatchedDn(Name dn, boolean normalized) throws NamingException {
@@ -133,7 +133,7 @@
     }
 
     public boolean isInitialized() {
-        return this.provider.getRootNexus().isInitialized();
+        return this.provider.getPartitionNexus().isInitialized();
     }
 
     public void init( ContextFactoryConfiguration factoryCfg, ContextPartitionConfiguration
cfg ) throws NamingException
@@ -148,6 +148,11 @@
 
     public Name getSuffix( boolean normalized )
     {
-        return this.provider.getRootNexus().getSuffix( normalized );
+        return this.provider.getPartitionNexus().getSuffix( normalized );
+    }
+
+    public Attributes getRootDSE()
+    {
+        return this.provider.getPartitionNexus().getRootDSE();
     }
 }

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java?rev=191495&r1=191494&r2=191495&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java
Mon Jun 20 08:49:01 2005
@@ -46,7 +46,7 @@
 import org.apache.ldap.server.invocation.Move;
 import org.apache.ldap.server.invocation.MoveAndModifyRN;
 import org.apache.ldap.server.invocation.Search;
-import org.apache.ldap.server.partition.DefaultContextPartitionNexus;
+import org.apache.ldap.server.partition.ContextPartitionNexus;
 import org.apache.ldap.server.partition.store.impl.btree.ResultFilteringEnumeration;
 import org.apache.ldap.server.partition.store.impl.btree.SearchResultFilter;
 import org.apache.ldap.server.schema.AttributeTypeRegistry;
@@ -83,7 +83,7 @@
     /**
      * the root nexus of the system
      */
-    private DefaultContextPartitionNexus nexus;
+    private ContextPartitionNexus nexus;
 
     private AttributeTypeRegistry registry;
 

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/ContextPartitionNexus.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/ContextPartitionNexus.java?rev=191495&r1=191494&r2=191495&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/ContextPartitionNexus.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/ContextPartitionNexus.java
Mon Jun 20 08:49:01 2005
@@ -21,6 +21,7 @@
 
 import javax.naming.Name;
 import javax.naming.NamingException;
+import javax.naming.directory.Attributes;
 import javax.naming.ldap.LdapContext;
 
 
@@ -52,6 +53,13 @@
      * if no context is associated with the calling thread.
      */
     LdapContext getLdapContext();
+
+    /**
+     * Get's the RootDSE entry for the DSA.
+     *
+     * @return the attributes of the RootDSE
+     */
+    public Attributes getRootDSE(); 
 
     /**
      * Gets the most significant Dn that exists within the server for any Dn.

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/DefaultContextPartitionNexus.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/DefaultContextPartitionNexus.java?rev=191495&r1=191494&r2=191495&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/DefaultContextPartitionNexus.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/DefaultContextPartitionNexus.java
Mon Jun 20 08:49:01 2005
@@ -360,11 +360,6 @@
     }
 
 
-    /**
-     * Get's the RootDSE entry for the DSA.
-     *
-     * @return the attributes of the RootDSE
-     */
     public Attributes getRootDSE() 
     {
         return rootDSE;

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java?rev=191495&r1=191494&r2=191495&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
Mon Jun 20 08:49:01 2005
@@ -54,7 +54,7 @@
 import org.apache.ldap.server.invocation.LookupWithAttrIds;
 import org.apache.ldap.server.invocation.Search;
 import org.apache.ldap.server.jndi.ServerLdapContext;
-import org.apache.ldap.server.partition.DefaultContextPartitionNexus;
+import org.apache.ldap.server.partition.ContextPartitionNexus;
 import org.apache.ldap.server.partition.store.impl.btree.ResultFilteringEnumeration;
 import org.apache.ldap.server.partition.store.impl.btree.SearchResultFilter;
 
@@ -73,7 +73,7 @@
     /**
      * the root nexus to all database partitions
      */
-    private DefaultContextPartitionNexus nexus;
+    private ContextPartitionNexus nexus;
 
     /**
      * a binary attribute tranforming filter: String -> byte[]



Mime
View raw message