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 2009/08/31 00:19:55 UTC
svn commit: r809426 - in /directory/apacheds/branches/apacheds-schema: utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java

Author: elecharny
Date: Sun Aug 30 22:19:55 2009
New Revision: 809426

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

Modified:
    directory/apacheds/branches/apacheds-schema/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java
    directory/apacheds/branches/apacheds-schema/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java

Modified: directory/apacheds/branches/apacheds-schema/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java?rev=809426&r1=809425&r2=809426&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java (original)
+++ directory/apacheds/branches/apacheds-schema/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java Sun Aug 30 22:19:55 2009
@@ -269,15 +269,15 @@
         entry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC );
         entry.put( MetaSchemaConstants.M_SYNTAX_AT, attributeType.getSyntax().getOid() );
         entry.put( MetaSchemaConstants.M_COLLECTIVE_AT, getBoolean( attributeType.isCollective() ) );
-        entry.put( MetaSchemaConstants.M_NO_USER_MODIFICATION_AT, getBoolean( ! attributeType.isCanUserModify() ) );
-        entry.put( MetaSchemaConstants.M_SINGLE_VALUE_AT, getBoolean( attributeType.isSingleValue() ) );
+        entry.put( MetaSchemaConstants.M_NO_USER_MODIFICATION_AT, getBoolean( ! attributeType.isUserModifiable() ) );
+        entry.put( MetaSchemaConstants.M_SINGLE_VALUE_AT, getBoolean( attributeType.isSingleValued() ) );
         entry.put( MetaSchemaConstants.M_USAGE_AT, attributeType.getUsage().toString() );
         entry.put( SchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
         entry.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
 
         injectCommon( attributeType, entry, registries );
         
-        AttributeType superior = attributeType.getSup();
+        AttributeType superior = attributeType.getSuperior();
         
         if ( superior != null )
         {
@@ -304,13 +304,13 @@
             entry.put( MetaSchemaConstants.M_EQUALITY_AT, equality );
         }
 
-        if ( attributeType.getSubstr() != null )
+        if ( attributeType.getSubstring() != null )
         {
-            String substr = attributeType.getSubstr().getName();
+            String substr = attributeType.getSubstring().getName();
             
             if ( substr == null )
             {
-                substr = attributeType.getSubstr().getOid();
+                substr = attributeType.getSubstring().getOid();
             }
             
             entry.put( MetaSchemaConstants.M_SUBSTR_AT, substr );

Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java?rev=809426&r1=809425&r2=809426&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java Sun Aug 30 22:19:55 2009
@@ -83,7 +83,7 @@
         String oid = registries.getAttributeTypeRegistry().getOid( node.getAttribute() );
         type = registries.getAttributeTypeRegistry().lookup( oid );
 
-        MatchingRule rule = type.getSubstr();
+        MatchingRule rule = type.getSubstring();
 
         if ( rule == null )
         {