directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r808074 - in /directory: apacheds/branches/apacheds-schema/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/ apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstra...
Date Wed, 26 Aug 2009 16:02:35 GMT
Author: elecharny
Date: Wed Aug 26 16:02:34 2009
New Revision: 808074

URL: http://svn.apache.org/viewvc?rev=808074&view=rev
Log:
Compilation error fixes

Modified:
    directory/apacheds/branches/apacheds-schema/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java
    directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapProducer.java
    directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java
    directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxProducer.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/AbstractAttributeType.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/DescriptionUtils.java

Modified: directory/apacheds/branches/apacheds-schema/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java?rev=808074&r1=808073&r2=808074&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java
Wed Aug 26 16:02:34 2009
@@ -36,7 +36,7 @@
 import org.apache.directory.server.schema.bootstrap.ProducerTypeEnum;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.AttributeType;
-import org.apache.directory.shared.ldap.schema.parsers.ObjectClassLiteral;
+import org.apache.directory.shared.ldap.schema.ObjectClass;
 import org.apache.directory.shared.ldap.schema.parsers.OpenLdapSchemaParser;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -260,8 +260,8 @@
         }
 
         int size = parser.getObjectClassTypes().size();
-        ObjectClassLiteral[] objectClasses = new ObjectClassLiteral[size];
-        objectClasses = ( ObjectClassLiteral[] ) parser.getObjectClassTypes().toArray( objectClasses
);
+        ObjectClass[] objectClasses = new ObjectClass[size];
+        objectClasses = ( ObjectClass[] ) parser.getObjectClassTypes().toArray( objectClasses
);
 
         VelocityContext context = new VelocityContext();
         context.put( "package", schema.getPackageName() );

Modified: directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapProducer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapProducer.java?rev=808074&r1=808073&r2=808074&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapProducer.java
(original)
+++ directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapProducer.java
Wed Aug 26 16:02:34 2009
@@ -80,9 +80,9 @@
     }
 
 
-    protected static BootstrapSyntax newSyntax( String oid, Registries registries )
+    protected static BootstrapldapSyntax newSyntax( String oid, Registries registries )
     {
-        return new BootstrapSyntax( oid, registries.getSyntaxCheckerRegistry() );
+        return new BootstrapldapSyntax( oid, registries.getSyntaxCheckerRegistry() );
     }
 
 
@@ -102,13 +102,13 @@
      * A mutable Syntax for the bootstrap phase that uses the
      * syntaxCheckerRegistry to dynamically resolve syntax checkers.
      */
-    public static class BootstrapSyntax extends LdapSyntax
+    public static class BootstrapldapSyntax extends LdapSyntax
     {
         private static final long serialVersionUID = 1L;
         final SyntaxCheckerRegistry registry;
 
 
-        public BootstrapSyntax(String oid, SyntaxCheckerRegistry registry)
+        public BootstrapldapSyntax(String oid, SyntaxCheckerRegistry registry)
         {
             super( oid );
             this.registry = registry;
@@ -151,7 +151,7 @@
         }
     }
 
-    public static class BootstrapMatchingRule extends AbstractMatchingRule
+    public static class BootstrapMatchingRule extends MatchingRule
     {
         private static final long serialVersionUID = 1L;
         final LdapSyntaxRegistry syntaxRegistry;
@@ -223,7 +223,7 @@
      * A concrete mutable attributeType implementation for bootstrapping which
      * uses registries for dynamically resolving dependent objects.
      */
-    public static class BootstrapAttributeType extends AbstractAttributeType
+    public static class BootstrapAttributeType extends AttributeType
     {
         private static final long serialVersionUID = 4050205236738471984L;
 
@@ -261,7 +261,7 @@
         {
             super( oid );
 
-            syntaxRegistry = registries.getSyntaxRegistry();
+            syntaxRegistry = registries.getLdapSyntaxRegistry();
             matchingRuleRegistry = registries.getMatchingRuleRegistry();
             attributeTypeRegistry = registries.getAttributeTypeRegistry();
         }
@@ -459,7 +459,7 @@
      * A concrete mutable objectClass implementation for bootstrapping which
      * uses registries for dynamically resolving dependent objects.
      */
-    public static class BootstrapObjectClass extends AbstractSchemaObject implements ObjectClass
+    public static class BootstrapObjectClass extends ObjectClass
     {
         private static final long serialVersionUID = 1L;
         private final ObjectClassRegistry objectClassRegistry;

Modified: directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java?rev=808074&r1=808073&r2=808074&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java
(original)
+++ directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java
Wed Aug 26 16:02:34 2009
@@ -39,7 +39,7 @@
 import org.apache.directory.server.schema.bootstrap.AbstractBootstrapProducer.BootstrapAttributeType;
 import org.apache.directory.server.schema.bootstrap.AbstractBootstrapProducer.BootstrapMatchingRule;
 import org.apache.directory.server.schema.bootstrap.AbstractBootstrapProducer.BootstrapObjectClass;
-import org.apache.directory.server.schema.bootstrap.AbstractBootstrapProducer.BootstrapSyntax;
+import org.apache.directory.server.schema.bootstrap.AbstractBootstrapProducer.BootstrapldapSyntax;
 import org.apache.directory.server.schema.registries.AbstractSchemaLoader;
 import org.apache.directory.server.schema.registries.DefaultRegistries;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -269,9 +269,9 @@
             case SYNTAX_PRODUCER :
                 LdapSyntax syntax = ( LdapSyntax ) schemaObject;
                 
-                if ( schemaObject instanceof BootstrapSyntax )
+                if ( schemaObject instanceof BootstrapldapSyntax )
                 {
-                    ( ( BootstrapSyntax ) syntax ).setSchema( schema.getSchemaName() );
+                    ( ( BootstrapldapSyntax ) syntax ).setSchema( schema.getSchemaName()
);
                 }
 
                 LdapSyntaxRegistry syntaxRegistry = registries.getSyntaxRegistry();

Modified: directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxProducer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxProducer.java?rev=808074&r1=808073&r2=808074&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxProducer.java
(original)
+++ directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxProducer.java
Wed Aug 26 16:02:34 2009
@@ -119,7 +119,7 @@
     // ------------------------------------------------------------------------
     public void produce( Registries registries, ProducerCallback cb ) throws NamingException
     {
-        BootstrapSyntax syntax;
+        BootstrapldapSyntax syntax;
         SyntaxCheckerRegistry syntaxCheckerRegistry = registries.getSyntaxCheckerRegistry();
 
         /*
@@ -140,62 +140,62 @@
          * 8 Certificate List                N  1.3.6.1.4.1.1466.115.121.1.9
          * 9 Certificate Pair                N  1.3.6.1.4.1.1466.115.121.1.10
          */
-        syntax = new BootstrapSyntax( SchemaConstants.ACI_ITEM_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.ACI_ITEM_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "ACI Item" } );
         // This is in direct conflict with RFC 2252 but for us ACI Item is human readable
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.ACCESS_POINT_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.ACCESS_POINT_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Access Point" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.ATTRIBUT_TYPE_DESCRIPTION_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.ATTRIBUT_TYPE_DESCRIPTION_SYNTAX,
syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Attribute Type Description" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.AUDIO_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.AUDIO_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Audio" } );
         syntax.setHumanReadable( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.BINARY_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.BINARY_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Binary" } );
         syntax.setHumanReadable( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.BIT_STRING_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.BIT_STRING_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Bit String" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.BOOLEAN_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.BOOLEAN_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Boolean" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.CERTIFICATE_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.CERTIFICATE_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Certificate" } );
         syntax.setHumanReadable( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.CERTIFICATE_LIST_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.CERTIFICATE_LIST_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Certificate List" } );
         syntax.setHumanReadable( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.CERTIFICATE_PAIR_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.CERTIFICATE_PAIR_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Certificate Pair" } );
         syntax.setHumanReadable( false );
@@ -215,61 +215,61 @@
          * 18 DSA Quality Syntax              Y  1.3.6.1.4.1.1466.115.121.1.19
          * 19 DSE Type                        Y  1.3.6.1.4.1.1466.115.121.1.20
          */
-        syntax = new BootstrapSyntax( SchemaConstants.COUNTRY_STRING_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.COUNTRY_STRING_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Country String" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.DN_SYNTAX, syntaxCheckerRegistry );
+        syntax = new BootstrapldapSyntax( SchemaConstants.DN_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "DN" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.DATA_QUALITY_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.DATA_QUALITY_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Data Quality Syntax" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.DELIVERY_METHOD_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.DELIVERY_METHOD_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Delivery Method" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.DIRECTORY_STRING_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.DIRECTORY_STRING_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Directory String" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.DIT_CONTENT_RULE_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.DIT_CONTENT_RULE_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "DIT Content Rule Description" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.DIT_STRUCTURE_RULE_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.DIT_STRUCTURE_RULE_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "DIT Structure Rule Description" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.DL_SUBMIT_PERMISSION_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.DL_SUBMIT_PERMISSION_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "DL Submit Permission" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.DSA_QUALITY_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.DSA_QUALITY_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "DSA Quality Syntax" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.DSE_TYPE_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.DSE_TYPE_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "DSE Type" } );
         syntax.setHumanReadable( true );
@@ -289,61 +289,61 @@
          * 28 Master And Shadow Access Points Y  1.3.6.1.4.1.1466.115.121.1.29
          * 29 Matching Rule Description       Y  1.3.6.1.4.1.1466.115.121.1.30
          */
-        syntax = new BootstrapSyntax( SchemaConstants.ENHANCED_GUIDE_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.ENHANCED_GUIDE_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Enhanced Guide" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.FACSIMILE_TELEPHONE_NUMBER_SYNTAX,
syntaxCheckerRegistry );
+        syntax = new BootstrapldapSyntax( SchemaConstants.FACSIMILE_TELEPHONE_NUMBER_SYNTAX,
syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Facsimile Telephone Number" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.FAX_SYNTAX, syntaxCheckerRegistry );
+        syntax = new BootstrapldapSyntax( SchemaConstants.FAX_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Fax" } );
         syntax.setHumanReadable( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.GENERALIZED_TIME_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.GENERALIZED_TIME_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Generalized Time" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.GUIDE_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.GUIDE_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Guide" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.IA5_STRING_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.IA5_STRING_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "IA5 String" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.INTEGER_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.INTEGER_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "INTEGER" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.JPEG_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.JPEG_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "JPEG" } );
         syntax.setHumanReadable( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.MASTER_AND_SHADOW_ACCESS_POINTS_SYNTAX,
syntaxCheckerRegistry );
+        syntax = new BootstrapldapSyntax( SchemaConstants.MASTER_AND_SHADOW_ACCESS_POINTS_SYNTAX,
syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Master And Shadow Access Points" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.MATCHING_RULE_DESCRIPTION_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.MATCHING_RULE_DESCRIPTION_SYNTAX,
syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Matching Rule Description" } );
         syntax.setHumanReadable( true );
@@ -363,55 +363,55 @@
          * 38 Other Mailbox                   Y  1.3.6.1.4.1.1466.115.121.1.39
          * 39 Octet String                    Y  1.3.6.1.4.1.1466.115.121.1.40
          */
-        syntax = new BootstrapSyntax( SchemaConstants.MATCHING_RULE_USE_DESCRIPTION_SYNTAX,
syntaxCheckerRegistry );
+        syntax = new BootstrapldapSyntax( SchemaConstants.MATCHING_RULE_USE_DESCRIPTION_SYNTAX,
syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Matching Rule Use Description" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.MAIL_PREFERENCE_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.MAIL_PREFERENCE_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Mail Preference" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.MHS_OR_ADDRESS_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.MHS_OR_ADDRESS_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "MHS OR Address" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.NAME_AND_OPTIONAL_UID_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.NAME_AND_OPTIONAL_UID_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Name And Optional UID" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.NAME_FORM_DESCRIPTION_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.NAME_FORM_DESCRIPTION_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Name Form Description" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.NUMERIC_STRING_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.NUMERIC_STRING_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Numeric String" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.OBJECT_CLASS_DESCRIPTION_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.OBJECT_CLASS_DESCRIPTION_SYNTAX,
syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Object Class Description" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.OID_SYNTAX, syntaxCheckerRegistry );
+        syntax = new BootstrapldapSyntax( SchemaConstants.OID_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "OID" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.OTHER_MAILBOX_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.OTHER_MAILBOX_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Other Mailbox" } );
         syntax.setHumanReadable( true );
@@ -425,7 +425,7 @@
          * If we set this to true then userPasswords which implement this syntax are not
treated as
          * binary attributes.  If that happens we can have data corruption due to UTF-8 handling.
          */
-        syntax = new BootstrapSyntax( SchemaConstants.OCTET_STRING_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.OCTET_STRING_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Octet String" } );
         syntax.setHumanReadable( false );
@@ -445,61 +445,61 @@
          * 48 Supported Algorithm             N  1.3.6.1.4.1.1466.115.121.1.49
          * 49 Telephone Number                Y  1.3.6.1.4.1.1466.115.121.1.50
          */
-        syntax = new BootstrapSyntax( SchemaConstants.POSTAL_ADDRESS_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.POSTAL_ADDRESS_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Postal Address" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.PROTOCOL_INFORMATION_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.PROTOCOL_INFORMATION_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Protocol Information" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.PRESENTATION_ADDRESS_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.PRESENTATION_ADDRESS_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Presentation Address" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.PRINTABLE_STRING_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.PRINTABLE_STRING_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Printable String" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.SUBTREE_SPECIFICATION_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.SUBTREE_SPECIFICATION_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Subtree Specification" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.SUPPLIER_INFORMATION_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.SUPPLIER_INFORMATION_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Supplier Information" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.SUPPLIER_OR_CONSUMER_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.SUPPLIER_OR_CONSUMER_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Supplier Or Consumer" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.SUPPLIER_AND_CONSUMER_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.SUPPLIER_AND_CONSUMER_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Supplier And Consumer" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.SUPPORTED_ALGORITHM_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.SUPPORTED_ALGORITHM_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Supported Algorithm" } );
         syntax.setHumanReadable( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.TELEPHONE_NUMBER_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.TELEPHONE_NUMBER_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Telephone Number" } );
         syntax.setHumanReadable( true );
@@ -517,55 +517,55 @@
          * 56 LDAP BootstrapSchema Description         Y  1.3.6.1.4.1.1466.115.121.1.57
          * 57 Substring Assertion             Y  1.3.6.1.4.1.1466.115.121.1.58
          */
-        syntax = new BootstrapSyntax( SchemaConstants.TELETEX_TERMINAL_IDENTIFIER_SYNTAX,
syntaxCheckerRegistry );
+        syntax = new BootstrapldapSyntax( SchemaConstants.TELETEX_TERMINAL_IDENTIFIER_SYNTAX,
syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Teletex Terminal Identifier" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.TELEX_NUMBER_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.TELEX_NUMBER_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Telex Number" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.UTC_TIME_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.UTC_TIME_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "UTC Time" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.LDAP_SYNTAX_DESCRIPTION_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.LDAP_SYNTAX_DESCRIPTION_SYNTAX,
syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "LDAP Syntax Description" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.MODIFY_RIGHTS_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.MODIFY_RIGHTS_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Modify Rights" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.LDAP_SCHEMA_DEFINITION_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.LDAP_SCHEMA_DEFINITION_SYNTAX,
syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "LDAP BootstrapSchema Definition" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.LDAP_SCHEMA_DESCRIPTION_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.LDAP_SCHEMA_DESCRIPTION_SYNTAX,
syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "LDAP BootstrapSchema Description" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( SchemaConstants.SUBSTRING_ASSERTION_SYNTAX, syntaxCheckerRegistry
);
+        syntax = new BootstrapldapSyntax( SchemaConstants.SUBSTRING_ASSERTION_SYNTAX, syntaxCheckerRegistry
);
         syntax.setNames( new String[]
             { "Substring Assertion" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
         
-        syntax = new BootstrapSyntax( SchemaConstants.ATTRIBUTE_CERTIFICATE_ASSERTION_SYNTAX,
syntaxCheckerRegistry );
+        syntax = new BootstrapldapSyntax( SchemaConstants.ATTRIBUTE_CERTIFICATE_ASSERTION_SYNTAX,
syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Trigger Specification" } );
         syntax.setHumanReadable( true );

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/AbstractAttributeType.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/AbstractAttributeType.java?rev=808074&r1=808073&r2=808074&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/AbstractAttributeType.java
(original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/AbstractAttributeType.java
Wed Aug 26 16:02:34 2009
@@ -185,8 +185,7 @@
      * Sets the length limit of this AttributeType based on its associated
      * syntax.
      * 
-     * @param length
-     *            the new length to set
+     * @param length the new length to set
      */
     protected void setLength( int length )
     {

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/DescriptionUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/DescriptionUtils.java?rev=808074&r1=808073&r2=808074&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/DescriptionUtils.java
(original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/DescriptionUtils.java
Wed Aug 26 16:02:34 2009
@@ -20,6 +20,8 @@
 package org.apache.directory.shared.ldap.schema;
 
 
+import java.util.List;
+
 import javax.naming.NamingException;
 
 
@@ -99,7 +101,7 @@
             buf.append( '\n' );
         }
 
-        buf.append( attributeType.getSuperior().getOid() );
+        buf.append( attributeType.getSup().getOid() );
 
         if ( attributeType.getEquality() != null )
         {
@@ -202,9 +204,9 @@
         }
 
         // print out all the auxiliary object class oids
-        ObjectClass[] aux = dITContentRule.getAuxObjectClasses();
+        List<ObjectClass> aux = dITContentRule.getAuxObjectClasses();
         
-        if ( aux != null && aux.length > 0 )
+        if ( ( aux != null ) && ( aux.size() > 0 ) )
         {
             buf.append( "AUX\n" );
             
@@ -216,9 +218,9 @@
             }
         }
 
-        AttributeType[] must = dITContentRule.getMustNames();
+        List<AttributeType> must = dITContentRule.getMustAttributeTypes();
         
-        if ( must != null && must.length > 0 )
+        if ( ( must != null ) && ( must.size() > 0 ) )
         {
             buf.append( "MUST\n" );
             
@@ -230,9 +232,9 @@
             }
         }
 
-        AttributeType[] may = dITContentRule.getMayNames();
+        List<AttributeType> may = dITContentRule.getMayAttributeTypes();
         
-        if ( may != null && may.length > 0 )
+        if ( ( may != null ) && ( may.size() > 0 ) )
         {
             buf.append( "MAY\n" );
             
@@ -244,9 +246,9 @@
             }
         }
 
-        AttributeType[] not = dITContentRule.getNotNames();
+        List<AttributeType> not = dITContentRule.getNotAttributeTypes();
         
-        if ( not != null && not.length > 0 )
+        if ( ( not != null ) && ( not.size() > 0 ) )
         {
             buf.append( "NOT\n" );
             
@@ -351,7 +353,7 @@
     public static String getDescription( MatchingRuleUse matchingRuleUse ) throws NamingException
     {
         StringBuffer buf = new StringBuffer( "( " );
-        buf.append( matchingRuleUse.getMatchingRule().getOid() );
+        buf.append( matchingRuleUse.getOid() );
         buf.append( '\n' );
 
         buf.append( "NAME " );
@@ -372,21 +374,33 @@
         }
 
         buf.append( "APPLIES " );
-        AttributeType[] attributeTypes = matchingRuleUse.getApplicableAttributes();
-        if ( attributeTypes.length == 1 )
+        List<AttributeType> attributeTypes = matchingRuleUse.getApplicableAttributes();
+        
+        if ( attributeTypes.size() == 1 )
         {
-            buf.append( attributeTypes[0].getOid() );
+            buf.append( attributeTypes.get( 0 ).getOid() );
         }
         else
         // for list of oids we need a parenthesis
         {
             buf.append( "( " );
-            buf.append( attributeTypes[0] );
-            for ( int ii = 1; ii < attributeTypes.length; ii++ )
+            
+            boolean isFirst = true;
+            
+            for ( AttributeType attributeType : attributeTypes )
             {
-                buf.append( " $ " );
-                buf.append( attributeTypes[ii] );
+                if ( isFirst )
+                {
+                    isFirst = false;
+                }
+                else
+                {
+                    buf.append( " $ " );
+                }
+                
+                buf.append( attributeType );
             }
+            
             buf.append( " ) " );
         }
 
@@ -443,11 +457,11 @@
         }
 
         buf.append( "OC " );
-        buf.append( nameForm.getObjectClass().getOid() );
+        buf.append( nameForm.getStructuralObjectClassOid() );
         buf.append( '\n' );
 
         buf.append( "MUST\n" );
-        AttributeType[] must = nameForm.getMustUse();
+        List<AttributeType> must = nameForm.getMustAttributeTypes();
         
         for ( AttributeType attributeType:must )
         {
@@ -456,9 +470,9 @@
             buf.append( '\n' );
         }
 
-        AttributeType[] may = nameForm.getMayUse();
+        List<AttributeType> may = nameForm.getMayAttributeTypes();
 
-        if ( may != null && may.length > 0 )
+        if ( ( may != null ) && ( may.size() > 0 ) )
         {
             buf.append( "MAY\n" );
         
@@ -623,11 +637,12 @@
         }
 
         buf.append( "FORM " );
-        buf.append( dITStructureRule.getNameForm().getOid() );
+        buf.append( dITStructureRule.getForm() );
         buf.append( '\n' );
 
-        DITStructureRule[] sups = dITStructureRule.getSuperClasses();
-        if ( sups != null && sups.length > 0 )
+        List<DITStructureRule> sups = dITStructureRule.getSuperRules();
+        
+        if ( ( sups != null ) && ( sups.size() > 0 ) )
         {
             buf.append( "SUP\n" );
             



Mime
View raw message