directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r486353 - in /directory/branches/trunks/schema/apacheds: bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/ core/src/main/java/org/apache/directory/server/core/schema/ core/src/main/java/org/apache/directory/s...
Date Tue, 12 Dec 2006 21:59:22 GMT
Author: akarasulu
Date: Tue Dec 12 13:59:21 2006
New Revision: 486353

URL: http://svn.apache.org/viewvc?view=rev&rev=486353
Log:
changes ...

o added new iterator() method to AttributeTypeRegistry and impls
o added code to add attributeTypes
o added (renamed really) missing m-usage attributeType 
o added new syntaxes for types elecharny put into meta schema


Modified:
    directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/AttributesFactory.java
    directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistry.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxProducer.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapAttributeTypeRegistry.java
    directory/branches/trunks/schema/apacheds/core/src/main/schema/apachemeta.schema
    directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java

Modified: directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/AttributesFactory.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/AttributesFactory.java?view=diff&rev=486353&r1=486352&r2=486353
==============================================================================
--- directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/AttributesFactory.java
(original)
+++ directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/AttributesFactory.java
Tue Dec 12 13:59:21 2006
@@ -49,28 +49,15 @@
  */
 public class AttributesFactory
 {
+    private static final String META_ATTRIBUTE_TYPE_OC = "metaAttributeType";
     private static final String META_MATCHING_RULE_OC = "metaMatchingRule";
-
     private static final String META_NORMALIZER_OC = "metaNormalizer";
-
     private static final String META_SYNTAX_OC = "metaSyntax";
-
     private static final String META_SYNTAX_CHECKER_OC = "metaSyntaxChecker";
+    private static final String META_COMPARATOR_OC = "metaComparator";
 
-    private static final String OBJECT_CLASS_AT = "objectClass";
-    
     /*
     #         | 1.3.6.1.4.1.18060.0.4.0.2.9  | m-extensionObjectClass      |
-    #         | 1.3.6.1.4.1.18060.0.4.0.2.10 | m-supAttributeType          |
-    #         | 1.3.6.1.4.1.18060.0.4.0.2.11 | m-equality                  |
-    #         | 1.3.6.1.4.1.18060.0.4.0.2.12 | m-ordering                  |
-    #         | 1.3.6.1.4.1.18060.0.4.0.2.13 | m-substr                    |
-    #         | 1.3.6.1.4.1.18060.0.4.0.2.14 | m-syntax                    |
-    #         | 1.3.6.1.4.1.18060.0.4.0.2.15 | m-singleValue               |
-    #         | 1.3.6.1.4.1.18060.0.4.0.2.16 | m-collective                |
-    #         | 1.3.6.1.4.1.18060.0.4.0.2.17 | m-noUserModification        |
-    #         | 1.3.6.1.4.1.18060.0.4.0.2.18 | m-usage                     |
-    #         | 1.3.6.1.4.1.18060.0.4.0.2.19 | m-extensionAttributeType    |
     #         | 1.3.6.1.4.1.18060.0.4.0.2.20 | m-ruleId                    |
     #         | 1.3.6.1.4.1.18060.0.4.0.2.21 | m-form                      |
     #         | 1.3.6.1.4.1.18060.0.4.0.2.22 | m-supDITStructureRule       |
@@ -85,6 +72,7 @@
     #         | 1.3.6.1.4.1.18060.0.4.0.2.31 | m-matchingRuleSyntax        |
     */
     
+    private static final String OBJECT_CLASS_AT = "objectClass";
     private static final String M_OID_AT = "m-oid";
     private static final String M_NAME_AT = "m-name";
     private static final String M_DESC_AT = "m-description";
@@ -93,18 +81,22 @@
     private static final String M_MUST_AT = "m-must";
     private static final String M_MAY_AT = "m-may";
     private static final String M_TYPE_OBJECT_CLASS_AT = "m-typeObjectClass";
-
     private static final String M_FQCN_AT = "m-fqcn";
-    private static final String M_BYTECODE_AT = "m-bytecode";
-
+    // private static final String M_BYTECODE_AT = "m-bytecode";
     private static final String M_HUMAN_READIBLE_AT = "m-humanReadible";
-
-    private static final Object META_COMPARATOR_OC = "metaComparator";
-
+    private static final String M_COLLECTIVE_AT = "m-collective";
     private static final String M_SYNTAX_AT = "m-syntax";
+    private static final String M_NO_USER_MODIFICATION_AT = "m-noUserModification";
+    private static final String M_EQUALITY_AT = "m-equality";
+    private static final String M_ORDERING_AT = "m-ordering";
+    private static final String M_SUBSTR_AT = "m-substr";
+    private static final String M_SUP_ATTRIBUTE_TYPE_AT = "m-supAttributeType";
+    private static final String M_SINGLE_VALUE_AT = "m-singleValue";
+    private static final String M_USAGE_AT = "m-usage";
+    // private static final String M_EXTENSION_ATTRIBUTE_TYPE_AT = "m-extensionAttributeType";
+    
+    /*
     
-/*
-    private static final String _AT = "";
     private static final String _AT = "";
     private static final String _AT = "";
     private static final String _AT = "";
@@ -160,7 +152,13 @@
         return entry;
     }
 
-    
+
+    /**
+     * 
+     * @param matchingRule
+     * @return
+     * @throws NamingException
+     */
     public Attributes getAttributes( MatchingRule matchingRule ) throws NamingException
     {
         BasicAttributes entry = new BasicAttributes( OBJECT_CLASS_AT, "top", true );
@@ -168,13 +166,16 @@
         entry.put( M_OID_AT, matchingRule.getOid() );
         entry.put( M_SYNTAX_AT, matchingRule.getSyntax().getOid() );
         entry.put( M_OBSOLETE_AT, getBoolean( matchingRule.isObsolete() ) );
-
-        Attribute attr = new BasicAttribute( M_NAME_AT );
-        for ( String name: matchingRule.getNames() )
+        
+        if ( matchingRule.getName() != null )
         {
-            attr.add( name );
+            Attribute attr = new BasicAttribute( M_NAME_AT );
+            for ( String name: matchingRule.getNames() )
+            {
+                attr.add( name );
+            }
+            entry.put( attr );
         }
-        entry.put( attr );
         
         if ( matchingRule.getDescription() != null )
         {
@@ -216,11 +217,102 @@
         return entry;
     }
 
-    
-    public Attributes getAttributes( AttributeType attributeType )
+
+    /**
+     * <pre>
+     *    objectclass ( 1.3.6.1.4.1.18060.0.4.0.3.3
+     *       NAME 'metaAttributeType'
+     *       DESC 'meta definition of the AttributeType object'
+     *       SUP metaTop
+     *       STRUCTURAL
+     *       MUST ( m-name $ m-syntax )
+     *       MAY ( m-supAttributeType $ m-obsolete $ m-equality $ m-ordering $ 
+     *             m-substr $ m-singleValue $ m-collective $ m-noUserModification $ 
+     *             m-usage $ m-extensionAttributeType )
+     *    )
+     * </pre>
+     * 
+     * @param attributeType
+     * @return
+     * @throws NamingException
+     */
+    public Attributes getAttributes( AttributeType attributeType ) throws NamingException
     {
         BasicAttributes entry = new BasicAttributes( OBJECT_CLASS_AT, "top", true );
-        entry.get( OBJECT_CLASS_AT ).add( "" );
+        entry.get( OBJECT_CLASS_AT ).add( META_ATTRIBUTE_TYPE_OC );
+        
+        entry.put( M_OID_AT, attributeType.getOid() );
+        entry.put( M_SYNTAX_AT, attributeType.getSyntax().getOid() );
+        entry.put( M_OBSOLETE_AT, getBoolean( attributeType.isObsolete() ) );
+        entry.put( M_COLLECTIVE_AT, getBoolean( attributeType.isCollective() ) );
+        entry.put( M_NO_USER_MODIFICATION_AT, getBoolean( ! attributeType.isCanUserModify()
) );
+        entry.put( M_SINGLE_VALUE_AT, getBoolean( attributeType.isSingleValue() ) );
+        entry.put( M_USAGE_AT, attributeType.getUsage().toString() );
+        
+        AttributeType superior = attributeType.getSuperior();
+        if ( superior == null )
+        {
+            entry.put( M_SUP_ATTRIBUTE_TYPE_AT, "top" );
+        }
+        else
+        {
+            // use name if we can for clarity
+            String sup = superior.getName();
+            if ( sup == null )
+            {
+                sup = superior.getOid();
+            }
+            entry.put( M_SUP_ATTRIBUTE_TYPE_AT, sup );
+        }
+        
+        if ( attributeType.getEquality() != null )
+        {
+            String equality = attributeType.getEquality().getName();
+            
+            if ( equality == null )
+            {
+                equality = attributeType.getEquality().getOid();
+            }
+            
+            entry.put( M_EQUALITY_AT, equality );
+        }
+
+        if ( attributeType.getSubstr() != null )
+        {
+            String substr = attributeType.getSubstr().getName();
+            
+            if ( substr == null )
+            {
+                substr = attributeType.getSubstr().getOid();
+            }
+            
+            entry.put( M_SUBSTR_AT, substr );
+        }
+
+        if ( attributeType.getOrdering() != null )
+        {
+            String ordering = attributeType.getOrdering().getName();
+            
+            if ( ordering == null )
+            {
+                ordering = attributeType.getOrdering().getOid();
+            }
+            
+            entry.put( M_ORDERING_AT, ordering );
+        }
+        
+        Attribute attr = new BasicAttribute( M_NAME_AT );
+        for ( String name: attributeType.getNames() )
+        {
+            attr.add( name );
+        }
+        entry.put( attr );
+        
+        if ( attributeType.getDescription() != null )
+        {
+            entry.put( M_DESC_AT, attributeType.getDescription() );
+        }
+
         return entry;
     }
 

Modified: directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java?view=diff&rev=486353&r1=486352&r2=486353
==============================================================================
--- directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
(original)
+++ directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
Tue Dec 12 13:59:21 2006
@@ -35,6 +35,7 @@
 import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
 import org.apache.directory.server.core.configuration.MutableStartupConfiguration;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
+import org.apache.directory.server.core.schema.AttributeTypeRegistry;
 import org.apache.directory.server.core.schema.ComparatorRegistry;
 import org.apache.directory.server.core.schema.MatchingRuleRegistry;
 import org.apache.directory.server.core.schema.NormalizerRegistry;
@@ -52,8 +53,8 @@
 import org.apache.directory.shared.ldap.filter.PresenceNode;
 import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.MatchingRule;
-import org.apache.directory.shared.ldap.schema.Normalizer;
 import org.apache.directory.shared.ldap.schema.Syntax;
 import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker;
 import org.apache.maven.plugin.AbstractMojo;
@@ -133,6 +134,7 @@
             addNormalizers();
             addComparators();
             addMatchingRules();
+            addAttributeTypes();
             
             listEntries();
         }
@@ -153,6 +155,31 @@
     }
 
     
+    private void addAttributeTypes() throws NamingException
+    {
+        getLog().info( "------------------------------------------------------------------------"
);
+        getLog().info( " Adding attributeTypes" );
+        getLog().info( "------------------------------------------------------------------------"
);
+
+        AttributeTypeRegistry attributeTypeRegistry = registries.getAttributeTypeRegistry();
+        Iterator<AttributeType> ii = attributeTypeRegistry.iterator();
+        while ( ii.hasNext() )
+        {
+            AttributeType at = ii.next();
+            getLog().info( "Adding attributeType with oid = " + at.getOid() );
+            String schemaName = attributeTypeRegistry.getSchemaName( at.getOid() );
+            LdapDN dn = checkCreateSchema( schemaName );
+            dn.add( "ou=attributeTypes" );
+            dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
+            checkCreateContainer( dn );
+            Attributes entry = attributesFactory.getAttributes( at );
+            dn.add( "m-oid=" + at.getOid() );
+            dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
+            partition.add( dn, entry );
+        }
+    }
+
+
     private void addMatchingRules() throws NamingException
     {
         getLog().info( "------------------------------------------------------------------------"
);

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistry.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistry.java?view=diff&rev=486353&r1=486352&r2=486353
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistry.java
(original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistry.java
Tue Dec 12 13:59:21 2006
@@ -114,4 +114,11 @@
      * discerned from the ancestorId supplied
      */
     Iterator descendants( String ancestorId ) throws NamingException;
+
+    /**
+     * Gets an Iterator over the attributeTypes in this registry.
+     * 
+     * @return Iterator over attributeTypes
+     */
+    Iterator<AttributeType> iterator();
 }

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxProducer.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxProducer.java?view=diff&rev=486353&r1=486352&r2=486353
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxProducer.java
(original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxProducer.java
Tue Dec 12 13:59:21 2006
@@ -24,11 +24,12 @@
 
 import org.apache.directory.shared.ldap.schema.Syntax;
 import org.apache.directory.shared.ldap.schema.syntax.NumericOidSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.NumericStringSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntax.ObjectClassTypeSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.OidSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker;
 
 
-
 /**
  * A producer of Syntax objects for the apachemeta schema.  This code has been
  * automatically generated using schema files in the OpenLDAP format along with
@@ -61,6 +62,59 @@
         
         syntax = new NameOrNumericIdSyntax();
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
+
+        syntax = new NumericOidSyntax();
+        cb.schemaObjectProduced( this, syntax.getOid(), syntax );
+
+        syntax = new ObjectClassTypeSyntax();
+        cb.schemaObjectProduced( this, syntax.getOid(), syntax );
+
+        syntax = new NumberSyntax();
+        cb.schemaObjectProduced( this, syntax.getOid(), syntax );
+    }
+    
+    
+    public static class NumericOidSyntax implements Syntax
+    {
+        private static final long serialVersionUID = 1L;
+        private final static String OID = "1.3.6.1.4.1.18060.0.4.0.0.2";
+        private final static SyntaxChecker CHECKER = new OidSyntaxChecker();
+        private final static String[] NAMES = new String[] { "numericOid" };
+        
+        public final SyntaxChecker getSyntaxChecker() throws NamingException
+        {
+            return CHECKER;
+        }
+
+        public final boolean isHumanReadible()
+        {
+            return true;
+        }
+
+        public final String getDescription()
+        {
+            return "The syntax for numericoids.";
+        }
+
+        public final String getName()
+        {
+            return NAMES[0];
+        }
+
+        public final String[] getNames()
+        {
+            return NAMES;
+        }
+
+        public final String getOid()
+        {
+            return OID;
+        }
+
+        public final boolean isObsolete()
+        {
+            return false;
+        }
     }
 
 
@@ -128,6 +182,50 @@
         public final String getDescription()
         {
             return "The syntax for either numeric ids or names.";
+        }
+
+        public final String getName()
+        {
+            return NAMES[0];
+        }
+
+        public final String[] getNames()
+        {
+            return NAMES;
+        }
+
+        public final String getOid()
+        {
+            return OID;
+        }
+
+        public final boolean isObsolete()
+        {
+            return false;
+        }
+    }
+
+
+    public static class NumberSyntax implements Syntax
+    {
+        private static final long serialVersionUID = 1L;
+        private final static String OID = "1.3.6.1.4.1.18060.0.4.0.0.4";
+        private final static SyntaxChecker CHECKER = new NumericStringSyntaxChecker();
+        private final static String[] NAMES = new String[] { "numeric" };
+        
+        public final SyntaxChecker getSyntaxChecker() throws NamingException
+        {
+            return CHECKER;
+        }
+
+        public final boolean isHumanReadible()
+        {
+            return true;
+        }
+
+        public final String getDescription()
+        {
+            return "The syntax for numeric strings.";
         }
 
         public final String getName()

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapAttributeTypeRegistry.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapAttributeTypeRegistry.java?view=diff&rev=486353&r1=486352&r2=486353
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapAttributeTypeRegistry.java
(original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapAttributeTypeRegistry.java
Tue Dec 12 13:59:21 2006
@@ -52,15 +52,15 @@
     private final static Logger log = LoggerFactory.getLogger( BootstrapAttributeTypeRegistry.class
);
 
     /** maps an OID to an AttributeType */
-    private final Map byOid;
+    private final Map<String,AttributeType> byOid;
     /** maps an OID to a schema name*/
-    private final Map oidToSchema;
+    private final Map<String,String> oidToSchema;
     /** maps OIDs to a Set of descendants for that OID */
-    private final Map oidToDescendantSet;
+    private final Map<String,Set<AttributeType>> oidToDescendantSet;
     /** the registry used to resolve names to OIDs */
     private final OidRegistry oidRegistry;
     /** cached normalizer mapping */
-    private transient Map mapping;
+    private transient Map<String, OidNormalizer> mapping;
     
 
     // ------------------------------------------------------------------------
@@ -72,9 +72,9 @@
      */
     public BootstrapAttributeTypeRegistry( OidRegistry oidRegistry )
     {
-        this.byOid = new HashMap();
-        this.oidToSchema = new HashMap();
-        this.oidToDescendantSet= new HashMap();
+        this.byOid = new HashMap<String,AttributeType>();
+        this.oidToSchema = new HashMap<String,String>();
+        this.oidToDescendantSet= new HashMap<String,Set<AttributeType>>();
         this.oidRegistry = oidRegistry;
     }
 
@@ -112,7 +112,7 @@
     public void registerDescendants( AttributeType attributeType ) throws NamingException
     {
         // add/create the descendent set for this attribute
-        oidToDescendantSet.put( attributeType.getOid(), new HashSet( 5 ) );
+        oidToDescendantSet.put( attributeType.getOid(), new HashSet<AttributeType>(
5 ) );
         
         // add this attribute to descendant list of other attributes in superior chain
         onRegisterAddToAncestorDescendants( attributeType, attributeType.getSuperior() );
@@ -135,10 +135,10 @@
             return;
         }
         
-        Set descendants = ( Set ) oidToDescendantSet.get( ancestor.getOid() );
+        Set<AttributeType> descendants = oidToDescendantSet.get( ancestor.getOid()
);
         if ( descendants == null )
         {
-            descendants = new HashSet( 5 );
+            descendants = new HashSet<AttributeType>( 5 );
             oidToDescendantSet.put( ancestor.getOid(), descendants );
         }
         descendants.add( newType );
@@ -205,7 +205,7 @@
     {
         if ( mapping == null )
         {
-            mapping = new HashMap( byOid.size() << 1 );
+            mapping = new HashMap<String,OidNormalizer>( byOid.size() << 1 );
             for ( Iterator ii = byOid.values().iterator(); ii.hasNext(); /**/ )
             {
                 AttributeType type = ( AttributeType ) ii.next();
@@ -257,5 +257,11 @@
             return false;
         }
         return !descendants.isEmpty();
+    }
+
+
+    public Iterator<AttributeType> iterator()
+    {
+        return byOid.values().iterator();
     }
 }

Modified: directory/branches/trunks/schema/apacheds/core/src/main/schema/apachemeta.schema
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/schema/apachemeta.schema?view=diff&rev=486353&r1=486352&r2=486353
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/schema/apachemeta.schema (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/schema/apachemeta.schema Tue Dec
12 13:59:21 2006
@@ -24,7 +24,7 @@
 #         |          Syntax OID          |            name             |
 #         +------------------------------+-----------------------------+
 #         | 1.3.6.1.4.1.18060.0.4.0.0.1  | objectClassType             |
-#         | 1.3.6.1.4.1.18060.0.4.0.0.2  | NumericOid                  |
+#         | 1.3.6.1.4.1.18060.0.4.0.0.2  | numericOid                  |
 #         | 1.3.6.1.4.1.18060.0.4.0.0.3  | attributeTypeUsage          |
 #         | 1.3.6.1.4.1.18060.0.4.0.0.4  | number                      |
 #         | 1.3.6.1.4.1.18060.0.4.0.0.5  | oidLen                      |
@@ -223,7 +223,7 @@
     MAY m-bytecode
 )
 
-# --- metaNormalizer objectclass ------------------------------------------
+# --- metaComparator objectclass ------------------------------------------
 objectclass ( 1.3.6.1.4.1.18060.0.4.0.3.13
     NAME 'metaComparator'
     DESC 'meta definition of a Comparator object'
@@ -367,9 +367,9 @@
     SINGLE-VALUE
 )
 
-# --- m-attributeTypeUusage AttributeType -------------------------------------
-attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.18 NAME 'm-attributeTypeUsage'
-    DESC 'Type of operation'
+# --- m-usage AttributeType -------------------------------------
+attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.18 NAME 'm-usage'
+    DESC 'Usage type of an attributeType'
     EQUALITY caseIgnoreMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
     SINGLE-VALUE

Modified: directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java?view=diff&rev=486353&r1=486352&r2=486353
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java
(original)
+++ directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java
Tue Dec 12 13:59:21 2006
@@ -464,4 +464,10 @@
     {
         return false;
     }
+
+
+    public Iterator<AttributeType> iterator()
+    {
+        return null;
+    }
 }



Mime
View raw message