Author: elecharny
Date: Sat Mar 17 13:10:46 2007
New Revision: 519434
URL: http://svn.apache.org/viewvc?view=rev&rev=519434
Log:
Removed the "extensibleObject" from the code (except from tests and antlr files) and replaced
it by
a reference to the constant declared in the new SchemaConstants class in shared-ldap-constants
Modified:
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/PrincipalStateFactory.java
directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/operation/support/EntryUtil.java
directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?view=diff&rev=519434&r1=519433&r2=519434
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
Sat Mar 17 13:10:46 2007
@@ -683,7 +683,7 @@
objectClass.add( "organizationalUnit" );
attributes.put( objectClass );
- attributes.put( SchemaConstants.OBJECT_CLASS_AT, "extensibleObject" );
+ attributes.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.EXTENSIBLE_OBJECT_OC
);
attributes.put( "prefNodeName", "sysPrefRoot" );
attributes.put( "creatorsName", PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED );
attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() );
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?view=diff&rev=519434&r1=519433&r2=519434
==============================================================================
--- 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 Mar 17 13:10:46 2007
@@ -159,7 +159,7 @@
attr = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT );
rootDSE.put( attr );
attr.add( SchemaConstants.TOP_OC );
- attr.add( "extensibleObject" );
+ attr.add( SchemaConstants.EXTENSIBLE_OBJECT_OC );
attr = new AttributeImpl( NAMINGCTXS_ATTR );
rootDSE.put( attr );
@@ -262,7 +262,7 @@
}
objectClassAttr.add( SchemaConstants.TOP_OC );
objectClassAttr.add( "organizationalUnit" );
- objectClassAttr.add( "extensibleObject" );
+ objectClassAttr.add( SchemaConstants.EXTENSIBLE_OBJECT_OC );
systemEntry.put( "creatorsName", PartitionNexus.ADMIN_PRINCIPAL );
systemEntry.put( "createTimestamp", DateUtils.getGeneralizedTime() );
systemEntry.put( NamespaceTools.getRdnAttribute( PartitionNexus.SYSTEM_PARTITION_SUFFIX
),
@@ -358,7 +358,7 @@
Attribute objectClassAttr = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT
);
objectClassAttr.add( SchemaConstants.TOP_OC );
objectClassAttr.add( "organizationalUnit" );
- objectClassAttr.add( "extensibleObject" );
+ objectClassAttr.add( SchemaConstants.EXTENSIBLE_OBJECT_OC );
systemEntry.put( objectClassAttr );
systemEntry.put( "creatorsName", PartitionNexus.ADMIN_PRINCIPAL );
systemEntry.put( "createTimestamp", DateUtils.getGeneralizedTime() );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java?view=diff&rev=519434&r1=519433&r2=519434
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
Sat Mar 17 13:10:46 2007
@@ -195,7 +195,7 @@
Attribute attr = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT );
attr.add( SchemaConstants.TOP_OC );
attr.add( "prefNode" );
- attr.add( "extensibleObject" );
+ attr.add( SchemaConstants.EXTENSIBLE_OBJECT_OC );
attrs.put( attr );
attr = new AttributeImpl( "prefNodeName" );
attr.add( name );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?view=diff&rev=519434&r1=519433&r2=519434
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
Sat Mar 17 13:10:46 2007
@@ -977,7 +977,7 @@
continue;
}
- if ( "extensibleObject".equalsIgnoreCase( objectClassName ) )
+ if ( SchemaConstants.EXTENSIBLE_OBJECT_OC.equalsIgnoreCase( objectClassName )
)
{
hasExtensibleObject = true;
}
@@ -1170,7 +1170,8 @@
String id = ( String ) changes.next();
Attribute change = mods.get( id );
- if ( !atRegistry.hasAttributeType( change.getID() ) && !objectClass.contains(
"extensibleObject" ) )
+ if ( !atRegistry.hasAttributeType( change.getID() ) &&
+ !objectClass.contains( SchemaConstants.EXTENSIBLE_OBJECT_OC ) )
{
throw new LdapInvalidAttributeIdentifierException( "unrecognized attributeID
" + change.getID() );
}
@@ -1437,7 +1438,8 @@
int modOp = mod.getModificationOp();
Attribute change = mod.getAttribute();
- if ( !atRegistry.hasAttributeType( change.getID() ) && !objectClass.contains(
"extensibleObject" ) )
+ if ( !atRegistry.hasAttributeType( change.getID() ) &&
+ !objectClass.contains( SchemaConstants.EXTENSIBLE_OBJECT_OC ) )
{
throw new LdapInvalidAttributeIdentifierException();
}
@@ -1834,7 +1836,7 @@
// declared for this entry
Attribute objectClass = attributes.get( SchemaConstants.OBJECT_CLASS_AT );
- if ( AttributeUtils.containsValueCaseIgnore( objectClass, "extensibleObject" ) )
+ if ( AttributeUtils.containsValueCaseIgnore( objectClass, SchemaConstants.EXTENSIBLE_OBJECT_OC
) )
{
return;
}
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/PrincipalStateFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/PrincipalStateFactory.java?view=diff&rev=519434&r1=519433&r2=519434
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/PrincipalStateFactory.java
(original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/PrincipalStateFactory.java
Sat Mar 17 13:10:46 2007
@@ -91,9 +91,9 @@
}
}
- if ( !oc.contains( "extensibleObject" ) )
+ if ( !oc.contains( SchemaConstants.EXTENSIBLE_OBJECT_OC ) )
{
- oc.add( "extensibleObject" );
+ oc.add( SchemaConstants.EXTENSIBLE_OBJECT_OC );
outAttrs.put( "apacheSamType", "7" );
}
Modified: directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/operation/support/EntryUtil.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/operation/support/EntryUtil.java?view=diff&rev=519434&r1=519433&r2=519434
==============================================================================
--- directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/operation/support/EntryUtil.java
(original)
+++ directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/operation/support/EntryUtil.java
Sat Mar 17 13:10:46 2007
@@ -116,7 +116,7 @@
//// Add objectClass attribute.
Attribute objectClassAttr = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT );
objectClassAttr.add( SchemaConstants.TOP_OC );
- objectClassAttr.add( "extensibleObject" );
+ objectClassAttr.add( SchemaConstants.EXTENSIBLE_OBJECT_OC );
entry.put( objectClassAttr );
// And add it to the nexus.
Modified: directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java?view=diff&rev=519434&r1=519433&r2=519434
==============================================================================
--- directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java
(original)
+++ directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java
Sat Mar 17 13:10:46 2007
@@ -32,6 +32,7 @@
// ObjectClasses
public static final String SUBENTRY_OC = "subentry";
public static final String TOP_OC = "top";
+ public static final String EXTENSIBLE_OBJECT_OC = "extensibleObject";
// AttributeTypes
public static final String OBJECT_CLASS_AT = "objectClass";
|