You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/10/09 15:00:54 UTC
svn commit: r1006149 - in /directory/apacheds/trunk:
core-api/src/main/java/org/apache/directory/server/core/partition/
core-api/src/main/java/org/apache/directory/server/core/schema/
core/src/main/java/org/apache/directory/server/core/partition/ xdbm-...
Author: elecharny
Date: Sat Oct 9 13:00:53 2010
New Revision: 1006149
URL: http://svn.apache.org/viewvc?rev=1006149&view=rev
Log:
Moved the schemManager field and accessors to an upper class
Modified:
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java?rev=1006149&r1=1006148&r2=1006149&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java Sat Oct 9 13:00:53 2010
@@ -27,6 +27,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.exception.LdapOtherException;
+import org.apache.directory.shared.ldap.schema.SchemaManager;
/**
@@ -41,6 +42,9 @@ public abstract class AbstractPartition
/** <tt>true</tt> if and only if this partition is initialized. */
protected boolean initialized;
+ /** The SchemaManager instance */
+ protected SchemaManager schemaManager;
+
protected AbstractPartition()
{
}
@@ -156,4 +160,22 @@ public abstract class AbstractPartition
* this method if there is more effective way for your implementation.
*/
public abstract ClonedServerEntry lookup( LookupOperationContext lookupContext ) throws LdapException;
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setSchemaManager( SchemaManager schemaManager )
+ {
+ this.schemaManager = schemaManager;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public SchemaManager getSchemaManager()
+ {
+ return schemaManager;
+ }
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java?rev=1006149&r1=1006148&r2=1006149&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java Sat Oct 9 13:00:53 2010
@@ -55,7 +55,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.ModificationOperation;
import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.SchemaUtils;
import org.apache.directory.shared.ldap.util.DateUtils;
import org.slf4j.Logger;
@@ -113,9 +112,6 @@ public final class SchemaPartition exten
/** the wrapped Partition */
private Partition wrapped = new NullPartition();
- /** schema manager */
- private SchemaManager schemaManager;
-
/** registry synchronizer adaptor */
private RegistrySynchronizerAdaptor synchronizer;
@@ -477,24 +473,6 @@ public final class SchemaPartition exten
/**
- * @param schemaManager the SchemaManager to set
- */
- public void setSchemaManager( SchemaManager schemaManager )
- {
- this.schemaManager = schemaManager;
- }
-
-
- /**
- * @return The schemaManager
- */
- public SchemaManager getSchemaManager()
- {
- return schemaManager;
- }
-
-
- /**
* @see Object#toString()
*/
public String toString()
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=1006149&r1=1006148&r2=1006149&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Sat Oct 9 13:00:53 2010
@@ -96,7 +96,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.Normalizer;
-import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.UsageEnum;
import org.apache.directory.shared.ldap.util.DateUtils;
import org.apache.directory.shared.ldap.util.NamespaceTools;
@@ -130,9 +129,6 @@ public class DefaultPartitionNexus exten
/** The DirectoryService instance */
private DirectoryService directoryService;
- /** The global schemaManager */
- private SchemaManager schemaManager;
-
/** the partitions keyed by normalized suffix strings */
private Map<String, Partition> partitions = new HashMap<String, Partition>();
@@ -400,24 +396,6 @@ public class DefaultPartitionNexus exten
}
- /**
- * {@inheritDoc}
- */
- public SchemaManager getSchemaManager()
- {
- return schemaManager;
- }
-
-
- /**
- * {@inheritDoc}
- */
- public void setSchemaManager( SchemaManager schemaManager )
- {
- this.schemaManager = schemaManager;
- }
-
-
/* (non-Javadoc)
* @see org.apache.directory.server.core.partition.PartitionNexus#setSuffix(java.lang.String)
*/
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?rev=1006149&r1=1006148&r2=1006149&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java Sat Oct 9 13:00:53 2010
@@ -57,7 +57,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.AliasDerefMode;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
-import org.apache.directory.shared.ldap.schema.SchemaManager;
/**
@@ -73,8 +72,6 @@ public abstract class BTreePartition<ID>
protected Optimizer optimizer;
- protected SchemaManager schemaManager;
-
/** The partition ID */
protected String id;
@@ -108,25 +105,6 @@ public abstract class BTreePartition<ID>
// ------------------------------------------------------------------------
// C O N F I G U R A T I O N M E T H O D S
// ------------------------------------------------------------------------
-
- /**
- * {@inheritDoc}
- */
- public void setSchemaManager( SchemaManager schemaManager )
- {
- this.schemaManager = schemaManager;
- }
-
-
- /**
- * {@inheritDoc}
- */
- public SchemaManager getSchemaManager()
- {
- return schemaManager;
- }
-
-
/**
* Gets the directory in which this Partition stores files.
*