directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r606962 - in /directory: apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/ apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/ shared/branches/bigbang/ldap-constants...
Date Wed, 26 Dec 2007 22:36:27 GMT
Author: elecharny
Date: Wed Dec 26 14:36:25 2007
New Revision: 606962

URL: http://svn.apache.org/viewvc?rev=606962&view=rev
Log:
Added a new constant in SchemaConstants (SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENTRY_OC)

Modified:
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
    directory/shared/branches/bigbang/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java?rev=606962&r1=606961&r2=606962&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java
Wed Dec 26 14:36:25 2007
@@ -64,7 +64,7 @@
     {
         Attribute objectClass = entry.get( SchemaConstants.OBJECT_CLASS_AT );
         
-        if ( AttributeUtils.containsValueCaseIgnore( objectClass, "collectiveAttributeSubentry"
) )
+        if ( AttributeUtils.containsValueCaseIgnore( objectClass, SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENTRY_OC
) )
         {
             return;
         }
@@ -101,7 +101,7 @@
         Attributes targetEntry = SchemaUtils.getTargetEntry( mods, originalEntry );
         Attribute targetObjectClasses = targetEntry.get( SchemaConstants.OBJECT_CLASS_AT
);
         
-        if ( AttributeUtils.containsValueCaseIgnore( targetObjectClasses, "collectiveAttributeSubentry"
) )
+        if ( AttributeUtils.containsValueCaseIgnore( targetObjectClasses, SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENTRY_OC
) )
         {
             return;
         }

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=606962&r1=606961&r2=606962&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
Wed Dec 26 14:36:25 2007
@@ -212,7 +212,7 @@
             types |= Subentry.SCHEMA_SUBENTRY;
         }
         
-        if ( AttributeUtils.containsValueCaseIgnore( oc, "collectiveAttributeSubentry" )
)
+        if ( AttributeUtils.containsValueCaseIgnore( oc, SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENTRY_OC
) )
         {
             types |= Subentry.COLLECTIVE_SUBENTRY;
         }

Modified: directory/shared/branches/bigbang/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java?rev=606962&r1=606961&r2=606962&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java
(original)
+++ directory/shared/branches/bigbang/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java
Wed Dec 26 14:36:25 2007
@@ -100,6 +100,10 @@
     String ACCESS_CONTROL_SUBENTRY_OC = "accessControlSubentry";
     String ACCESS_CONTROL_SUBENTRY_OC_OID = "2.5.17.1";
     
+    // CollectiveAttributeSubentry
+    String COLLECTIVE_ATTRIBUTE_SUBENTRY_OC = "collectiveAttributeSubentry";
+    String COLLECTIVE_ATTRIBUTE_SUBENTRY_OC_OID = "2.5.17.2";
+
     // Subschema
     String SUBSCHEMA_OC = "subschema";
     String SUBSCHEMA_OC_OID = "2.5.20.1";



Mime
View raw message