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 2007/03/16 19:45:06 UTC
svn commit: r519097 - in
/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core:
authz/support/MaxImmSubFilter.java schema/SchemaManager.java
schema/SchemaPartitionDao.java schema/SchemaSubentryModifier.java
Author: elecharny
Date: Fri Mar 16 11:45:05 2007
New Revision: 519097
URL: http://svn.apache.org/viewvc?view=rev&rev=519097
Log:
Moved the "objectClass" definition to shared-ldap-constants.
Modified the classes which were using the SystemSchemaConstants for "objctClass"
Modified:
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java?view=diff&rev=519097&r1=519096&r2=519097
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java Fri Mar 16 11:45:05 2007
@@ -35,6 +35,7 @@
import org.apache.directory.shared.ldap.aci.ACITuple;
import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
import org.apache.directory.shared.ldap.aci.ProtectedItem;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.filter.PresenceNode;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -55,7 +56,7 @@
public MaxImmSubFilter()
{
- childrenFilter = new PresenceNode( "objectClass" );
+ childrenFilter = new PresenceNode( SchemaConstants.OBJECT_CLASS_AT );
childrenSearchControls = new SearchControls();
childrenSearchControls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java?view=diff&rev=519097&r1=519096&r2=519097
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java Fri Mar 16 11:45:05 2007
@@ -189,7 +189,7 @@
this.loader = loader;
this.globalRegistries = globalRegistries;
this.objectClassAT = this.globalRegistries.getAttributeTypeRegistry()
- .lookup( SystemSchemaConstants.OBJECT_CLASS_AT );
+ .lookup( SystemSchemaConstants.SYSTEM_OBJECT_CLASS_AT );
this.metaSchemaHandler = new MetaSchemaHandler( this.globalRegistries, this.loader );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java?view=diff&rev=519097&r1=519096&r2=519097
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java Fri Mar 16 11:45:05 2007
@@ -132,7 +132,7 @@
this.CN_OID = oidRegistry.getOid( SystemSchemaConstants.CN_AT );
this.disabledAttributeType = attrRegistry.lookup( MetaSchemaConstants.M_DISABLED_AT );
this.M_OID_OID = oidRegistry.getOid( MetaSchemaConstants.M_OID_AT );
- this.OBJECTCLASS_OID = oidRegistry.getOid( SystemSchemaConstants.OBJECT_CLASS_AT );
+ this.OBJECTCLASS_OID = oidRegistry.getOid( SystemSchemaConstants.SYSTEM_OBJECT_CLASS_AT );
this.M_SYNTAX_OID = oidRegistry.getOid( MetaSchemaConstants.M_SYNTAX_AT );
this.M_ORDERING_OID = oidRegistry.getOid( MetaSchemaConstants.M_ORDERING_AT );
this.M_EQUALITY_OID = oidRegistry.getOid( MetaSchemaConstants.M_EQUALITY_AT );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java?view=diff&rev=519097&r1=519096&r2=519097
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java Fri Mar 16 11:45:05 2007
@@ -28,11 +28,11 @@
import javax.naming.directory.Attributes;
import org.apache.directory.server.constants.MetaSchemaConstants;
-import org.apache.directory.server.constants.SystemSchemaConstants;
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.partition.PartitionNexusProxy;
import org.apache.directory.server.schema.bootstrap.Schema;
import org.apache.directory.server.utils.AttributesFactory;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -188,9 +188,9 @@
private Attributes getAttributes( ComparatorDescription comparatorDescription )
{
- AttributesImpl attributes = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top", true );
- attributes.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( "metaTop" );
- attributes.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( "metaComparator" );
+ AttributesImpl attributes = new AttributesImpl( SchemaConstants.OBJECT_CLASS_AT, "top", true );
+ attributes.get( SchemaConstants.OBJECT_CLASS_AT ).add( "metaTop" );
+ attributes.get( SchemaConstants.OBJECT_CLASS_AT ).add( "metaComparator" );
attributes.put( MetaSchemaConstants.M_OID_AT, comparatorDescription.getNumericOid() );
attributes.put( MetaSchemaConstants.M_FQCN_AT, comparatorDescription.getFqcn() );
@@ -222,9 +222,9 @@
private Attributes getAttributes( NormalizerDescription normalizerDescription )
{
- AttributesImpl attributes = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top", true );
- attributes.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( "metaTop" );
- attributes.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( "metaNormalizer" );
+ AttributesImpl attributes = new AttributesImpl( SchemaConstants.OBJECT_CLASS_AT, "top", true );
+ attributes.get( SchemaConstants.OBJECT_CLASS_AT ).add( "metaTop" );
+ attributes.get( SchemaConstants.OBJECT_CLASS_AT ).add( "metaNormalizer" );
attributes.put( MetaSchemaConstants.M_OID_AT, normalizerDescription.getNumericOid() );
attributes.put( MetaSchemaConstants.M_FQCN_AT, normalizerDescription.getFqcn() );
@@ -267,9 +267,9 @@
private Attributes getAttributes( SyntaxCheckerDescription syntaxCheckerDescription )
{
- AttributesImpl attributes = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top", true );
- attributes.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( "metaTop" );
- attributes.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( "metaSyntaxChecker" );
+ AttributesImpl attributes = new AttributesImpl( SchemaConstants.OBJECT_CLASS_AT, "top", true );
+ attributes.get( SchemaConstants.OBJECT_CLASS_AT ).add( "metaTop" );
+ attributes.get( SchemaConstants.OBJECT_CLASS_AT ).add( "metaSyntaxChecker" );
attributes.put( MetaSchemaConstants.M_OID_AT, syntaxCheckerDescription.getNumericOid() );
attributes.put( MetaSchemaConstants.M_FQCN_AT, syntaxCheckerDescription.getFqcn() );