directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1521900 - in /directory/apacheds/trunk: ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/ server-config/src/main/java/org/apache/directory/server/config/ xdbm-partition/src/main/java/org/apache/directory/server/...
Date Wed, 11 Sep 2013 15:20:46 GMT
Author: pamarcelot
Date: Wed Sep 11 15:20:46 2013
New Revision: 1521900

URL: http://svn.apache.org/r1521900
Log:
Added a constructor with no DnFactory parameter.

Modified:
    directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/AbstractLdifPartition.java
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ReadOnlyConfigurationPartition.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java

Modified: directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/AbstractLdifPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/AbstractLdifPartition.java?rev=1521900&r1=1521899&r2=1521900&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/AbstractLdifPartition.java
(original)
+++ directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/AbstractLdifPartition.java
Wed Sep 11 15:20:46 2013
@@ -44,10 +44,38 @@ public abstract class AbstractLdifPartit
     protected static CsnFactory defaultCSNFactory;
 
 
+    /**
+     * Creates a new instance of AbstractLdifPartition.
+     *
+     * @param schemaManager the schema manager
+     */
+    public AbstractLdifPartition( SchemaManager schemaManager )
+    {
+        super( schemaManager );
+        
+        initInstance();
+    }
+
+
+    /**
+     * Creates a new instance of AbstractLdifPartition.
+     *
+     * @param schemaManager the schema manager
+     * @param dnFactory the DN factory
+     */
     public AbstractLdifPartition( SchemaManager schemaManager, DnFactory dnFactory )
     {
         super( schemaManager, dnFactory );
+        
+        initInstance();
+    }
+
 
+    /**
+     * Intializes the instance.
+     */
+    public void initInstance()
+    {
         // Create the CsnFactory with a invalid ReplicaId
         // @TODO : inject a correct ReplicaId
         defaultCSNFactory = new CsnFactory( 0 );

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ReadOnlyConfigurationPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ReadOnlyConfigurationPartition.java?rev=1521900&r1=1521899&r2=1521900&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ReadOnlyConfigurationPartition.java
(original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ReadOnlyConfigurationPartition.java
Wed Sep 11 15:20:46 2013
@@ -35,7 +35,6 @@ import org.apache.directory.api.ldap.mod
 import org.apache.directory.api.ldap.model.ldif.LdifReader;
 import org.apache.directory.api.ldap.model.name.Dn;
 import org.apache.directory.api.ldap.model.schema.SchemaManager;
-import org.apache.directory.server.core.api.DnFactory;
 import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext;
@@ -63,9 +62,9 @@ public class ReadOnlyConfigurationPartit
      * @param schemaManager
      *      the schema manager
      */
-    public ReadOnlyConfigurationPartition( InputStream inputStream, SchemaManager schemaManager,
DnFactory dnFactory )
+    public ReadOnlyConfigurationPartition( InputStream inputStream, SchemaManager schemaManager
)
     {
-        super( schemaManager, dnFactory );
+        super( schemaManager );
         this.inputStream = inputStream;
         id = "config";
 

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java?rev=1521900&r1=1521899&r2=1521900&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java
Wed Sep 11 15:20:46 2013
@@ -55,6 +55,20 @@ public class AvlPartition extends Abstra
 
     /**
      * Creates a store based on AVL Trees.
+     * 
+     * @param schemaManager the schema manager
+     */
+    public AvlPartition( SchemaManager schemaManager )
+    {
+        super( schemaManager );
+    }
+
+
+    /**
+     * Creates a store based on AVL Trees.
+     *
+     * @param schemaManager the schema manager
+     * @param dnFactory the DN factory
      */
     public AvlPartition( SchemaManager schemaManager, DnFactory dnFactory )
     {

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java?rev=1521900&r1=1521899&r2=1521900&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
Wed Sep 11 15:20:46 2013
@@ -186,12 +186,37 @@ public abstract class AbstractBTreeParti
 
     /**
      * Creates a B-tree based context partition.
+     * 
+     * @param schemaManager the schema manager
+     */
+    protected AbstractBTreePartition( SchemaManager schemaManager )
+    {
+        this.schemaManager = schemaManager;
+
+        initInstance();
+    }
+
+
+    /**
+     * Creates a B-tree based context partition.
+     * 
+     * @param schemaManager the schema manager
+     * @param dnFactory the DN factory
      */
     protected AbstractBTreePartition( SchemaManager schemaManager, DnFactory dnFactory )
     {
         this.schemaManager = schemaManager;
         this.dnFactory = dnFactory;
 
+        initInstance();
+    }
+
+
+    /**
+     * Intializes the instance.
+     */
+    private void initInstance()
+    {
         indexedAttributes = new HashSet<Index<?, ?, String>>();
 
         // Initialize Attribute types used all over this method
@@ -201,6 +226,7 @@ public abstract class AbstractBTreeParti
         ENTRY_DN_AT = schemaManager.getAttributeType( SchemaConstants.ENTRY_DN_AT );
         ENTRY_UUID_AT = schemaManager.getAttributeType( SchemaConstants.ENTRY_UUID_AT );
         ADMINISTRATIVE_ROLE_AT = schemaManager.getAttributeType( SchemaConstants.ADMINISTRATIVE_ROLE_AT
);
+
     }
 
 



Mime
View raw message