directory-commits mailing list archives

Author: elecharny
Date: Mon Jun 18 10:16:34 2007
New Revision: 548416

URL: http://svn.apache.org/viewvc?view=rev&rev=548416
Log:
Injected the new ObjectNameSyntaxChecker into the registries

Modified:
    directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java
    directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxProducer.java

Modified: directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java?view=diff&rev=548416&r1=548415&r2=548416
==============================================================================
--- directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java
(original)
+++ directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java
Mon Jun 18 10:16:34 2007
@@ -26,6 +26,7 @@
 import org.apache.directory.shared.ldap.schema.syntax.NumberSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntax.NumericOidSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntax.ObjectClassTypeSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.ObjectNameSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker;
 
 
@@ -65,6 +66,9 @@
         cb.schemaObjectProduced( this, checker.getSyntaxOid(), checker );
 
         checker = new NumberSyntaxChecker();
+        cb.schemaObjectProduced( this, checker.getSyntaxOid(), checker );
+
+        checker = new ObjectNameSyntaxChecker();
         cb.schemaObjectProduced( this, checker.getSyntaxOid(), checker );
     }
 }

Modified: directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxProducer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxProducer.java?view=diff&rev=548416&r1=548415&r2=548416
==============================================================================
--- directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxProducer.java
(original)
+++ directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxProducer.java
Mon Jun 18 10:16:34 2007
@@ -29,6 +29,7 @@
 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.ObjectNameSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntax.OidSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker;
 
@@ -72,6 +73,9 @@
 
         syntax = new NumberSyntax();
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
+
+        syntax = new ObjectNameSyntax();
+        cb.schemaObjectProduced( this, syntax.getOid(), syntax );
     }
     
     
@@ -257,6 +261,59 @@
         public final String getDescription()
         {
             return "The syntax for numeric strings.";
+        }
+
+        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 String getSchema()
+        {
+            return MetaSchemaConstants.SCHEMA_NAME;
+        }
+
+        public void setSchema( String schemaName )
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    public static class ObjectNameSyntax implements Syntax
+    {
+        private static final long serialVersionUID = 1L;
+        private final static String OID = "1.3.6.1.4.1.18060.0.4.0.0.6";
+        private final static SyntaxChecker CHECKER = new ObjectNameSyntaxChecker();
+        private final static String[] NAMES = new String[] { "objectName" };
+        
+        public final SyntaxChecker getSyntaxChecker() throws NamingException
+        {
+            return CHECKER;
+        }
+
+        public final boolean isHumanReadible()
+        {
+            return true;
+        }
+
+        public final String getDescription()
+        {
+            return "The syntax for object names.";
         }
 
         public final String getName()