directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r809428 - in /directory/apacheds/branches/apacheds-schema/core/src: main/java/org/apache/directory/server/core/collective/ main/java/org/apache/directory/server/core/event/ main/java/org/apache/directory/server/core/normalization/ main/java...
Date Sun, 30 Aug 2009 22:20:53 GMT
Author: elecharny
Date: Sun Aug 30 22:20:52 2009
New Revision: 809428

URL: http://svn.apache.org/viewvc?rev=809428&view=rev
Log:
Reflect the changes done in shared

Modified:
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
    directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java?rev=809428&r1=809427&r2=809428&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
Sun Aug 30 22:20:52 2009
@@ -284,7 +284,7 @@
         
         while ( superType != null )
         {
-            superType = superType.getSup();
+            superType = superType.getSuperior();
             
             if ( superType != null )
             {

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java?rev=809428&r1=809427&r2=809428&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
Sun Aug 30 22:20:52 2009
@@ -360,7 +360,7 @@
                 break;
 
             case ( SUBSTRING_MATCH ):
-                mrule = type.getSubstr();
+                mrule = type.getSubstring();
                 break;
 
             case ( ORDERING_MATCH ):

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java?rev=809428&r1=809427&r2=809428&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java
Sun Aug 30 22:20:52 2009
@@ -69,7 +69,7 @@
         SubstringNode snode = (SubstringNode)node;
         String oid = atRegistry.getOid( snode.getAttribute() );
         AttributeType type = atRegistry.lookup( oid );
-        MatchingRule matchingRule = type.getSubstr();
+        MatchingRule matchingRule = type.getSubstring();
         
         if ( matchingRule == null )
         {

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java?rev=809428&r1=809427&r2=809428&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
Sun Aug 30 22:20:52 2009
@@ -390,7 +390,7 @@
                     AttributeType at = attributeRegistry.lookup( upId );
 
                     // 2.1 if the attribute is single valued, replace the value
-                    if ( at.isSingleValue() )
+                    if ( at.isSingleValued() )
                     {
                         entry.removeAttributes( upId );
                         addUnescapedUpValue( entry, upId, upValue );

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java?rev=809428&r1=809427&r2=809428&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
Sun Aug 30 22:20:52 2009
@@ -253,11 +253,11 @@
             }
 
             // if the supertype is provided make sure it exists in some schema
-            if ( attributeType.getSupOid() != null && ! dao.hasAttributeType( attributeType.getSupOid()
) )
+            if ( attributeType.getSuperiorOid() != null && ! dao.hasAttributeType(
attributeType.getSuperiorOid() ) )
             {
                 throw new LdapOperationNotSupportedException(
                     "Cannot permit the addition of an attributeType with an invalid super
type: " 
-                        + attributeType.getSupOid(), 
+                        + attributeType.getSuperiorOid(), 
                     ResultCodeEnum.UNWILLING_TO_PERFORM );
             }
 
@@ -289,18 +289,18 @@
             }
 
             // if the matchingRule is provided make sure it exists in some schema
-            if ( attributeType.getSubstrOid() != null && ! dao.hasMatchingRule( attributeType.getSubstrOid()
) )
+            if ( attributeType.getSubstringOid() != null && ! dao.hasMatchingRule(
attributeType.getSubstringOid() ) )
             {
                 throw new LdapOperationNotSupportedException(
                     "Cannot permit the addition of an attributeType with an invalid SUBSTRINGS
matchingRule: " 
-                        + attributeType.getSubstrOid(), 
+                        + attributeType.getSubstringOid(), 
                     ResultCodeEnum.UNWILLING_TO_PERFORM );
             }
 
             // if the equality matching rule is null and no super type is specified then
there is
             // definitely no equality matchingRule that can be resolved.  We cannot use an
attribute
             // without a matchingRule for search or for building indices not to mention lookups.
-            if ( attributeType.getEqualityOid() == null && attributeType.getSupOid()
== null )
+            if ( attributeType.getEqualityOid() == null && attributeType.getSuperiorOid()
== null )
             {
                 throw new LdapOperationNotSupportedException(
                     "Cannot permit the addition of an attributeType with an no EQUALITY matchingRule
" +
@@ -309,7 +309,7 @@
             }
             else if ( attributeType.getEqualityOid() == null )
             {
-                AttributeType superType = globalRegistries.getAttributeTypeRegistry().lookup(
attributeType.getSupOid() );
+                AttributeType superType = globalRegistries.getAttributeTypeRegistry().lookup(
attributeType.getSuperiorOid() );
 
                 if ( superType.getEquality() == null )
                 {
@@ -324,7 +324,7 @@
             // must be provided from some ancestor in the attributeType hierarchy; without
either
             // of these the description definitely cannot resolve a syntax and cannot be
allowed.
             // if a supertype exists then it must resolve a proper syntax somewhere in the
hierarchy.
-            if ( attributeType.getSyntax() == null && attributeType.getSupOid() ==
null )
+            if ( attributeType.getSyntax() == null && attributeType.getSuperiorOid()
== null )
             {
                 throw new LdapOperationNotSupportedException(
                     "Cannot permit the addition of an attributeType with an no syntax " +

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=809428&r1=809427&r2=809428&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
Sun Aug 30 22:20:52 2009
@@ -1209,7 +1209,7 @@
             {
                 AttributeType attributeType = atRegistry.lookup( atav.getUpType() );
 
-                if ( !attributeType.isCanUserModify() )
+                if ( !attributeType.isUserModifiable() )
                 {
                     throw new NoPermissionException( "Cannot modify the attribute '" + atav.getUpType()
+ "'" );
                 }
@@ -1344,7 +1344,7 @@
                 attributeType = atRegistry.lookup( change.getUpId() );
             }
 
-            if ( !attributeType.isCanUserModify() )
+            if ( !attributeType.isUserModifiable() )
             {
                 throw new NoPermissionException( "Cannot modify the attribute '" + change.getUpId()
+ "'" );
             }
@@ -1590,7 +1590,7 @@
             AttributeType attributeType = attribute.getAttributeType();
             
             // We don't allow modification of operational attributes
-            if ( !attributeType.isCanUserModify() )
+            if ( !attributeType.isUserModifiable() )
             {
                 String msg = "Cannot modify the attribute : " + attributeType;
                 LOG.error( msg );
@@ -2176,7 +2176,7 @@
     private void assertNumberOfAttributeValuesValid( EntryAttribute attribute ) throws InvalidAttributeValueException,
         Exception
     {
-        if ( attribute.size() > 1 && ( ( ServerAttribute ) attribute ).getAttributeType().isSingleValue()
)
+        if ( attribute.size() > 1 && ( ( ServerAttribute ) attribute ).getAttributeType().isSingleValued()
)
         {
             throw new LdapInvalidAttributeValueException( "More than one value has been provided
"
                 + "for the single-valued attribute: " + attribute.getUpId(), ResultCodeEnum.CONSTRAINT_VIOLATION
);

Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java?rev=809428&r1=809427&r2=809428&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java
Sun Aug 30 22:20:52 2009
@@ -64,13 +64,13 @@
         
         AttributeType attributeType = new AttributeType( id );
         attributeType.setEquality( equality );
-        attributeType.setSingleValue( false );
+        attributeType.setSingleValued( false );
         attributeType.setCollective( false );
         attributeType.setDescription( id );
 
         if ( returnOperational )
         {
-            attributeType.setCanUserModify( false );
+            attributeType.setUserModifiable( false );
         }
         else
         {
@@ -78,7 +78,7 @@
             syntax.setHumanReadable( true );
 
             attributeType.setSyntax( syntax );
-            attributeType.setCanUserModify( true );
+            attributeType.setUserModifiable( true );
         }
         
         return attributeType;



Mime
View raw message