directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r806866 [3/3] - in /directory/apacheds/branches/apacheds-schema: bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/ core-entry/src/main/java/org/apache/directory/server/core/entry/ core-entry/src/test/java/org...
Date Sat, 22 Aug 2009 16:15:46 GMT
Modified: directory/apacheds/branches/apacheds-schema/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java (original)
+++ directory/apacheds/branches/apacheds-schema/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java Sat Aug 22 16:15:42 2009
@@ -28,7 +28,6 @@
 import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey;
 import org.apache.directory.server.kerberos.shared.store.KerberosAttribute;
 import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry;
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
@@ -37,6 +36,7 @@
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/apacheds/branches/apacheds-schema/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolCodecFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolCodecFactory.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolCodecFactory.java (original)
+++ directory/apacheds/branches/apacheds-schema/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolCodecFactory.java Sat Aug 22 16:15:42 2009
@@ -21,13 +21,13 @@
 
 
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.asn1.codec.Asn1CodecDecoder;
 import org.apache.directory.shared.asn1.codec.Asn1CodecEncoder;
 import org.apache.directory.shared.ldap.message.MessageDecoder;
 import org.apache.directory.shared.ldap.message.MessageEncoder;
 import org.apache.directory.shared.ldap.message.spi.BinaryAttributeDetector;
 import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.apache.mina.core.session.IoSession;
 import org.apache.mina.filter.codec.ProtocolCodecFactory;

Modified: directory/apacheds/branches/apacheds-schema/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java Sat Aug 22 16:15:42 2009
@@ -26,11 +26,11 @@
 
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.message.InternalSearchRequest;
 import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.ldap.util.StringTools;
 
 /**

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=806866&r1=806865&r2=806866&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 Sat Aug 22 16:15:42 2009
@@ -21,21 +21,14 @@
 
 
 import java.util.Comparator;
+import java.util.List;
 
 import javax.naming.NamingException;
 
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
-import org.apache.directory.server.schema.registries.ComparatorRegistry;
-import org.apache.directory.server.schema.registries.MatchingRuleRegistry;
-import org.apache.directory.server.schema.registries.NormalizerRegistry;
-import org.apache.directory.server.schema.registries.ObjectClassRegistry;
 import org.apache.directory.server.schema.registries.Registries;
-import org.apache.directory.server.schema.registries.SyntaxCheckerRegistry;
-import org.apache.directory.server.schema.registries.SyntaxRegistry;
 import org.apache.directory.shared.ldap.schema.AbstractAttributeType;
 import org.apache.directory.shared.ldap.schema.AbstractMatchingRule;
 import org.apache.directory.shared.ldap.schema.AbstractSchemaObject;
-import org.apache.directory.shared.ldap.schema.AbstractSyntax;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.MatchingRule;
 import org.apache.directory.shared.ldap.schema.Normalizer;
@@ -44,6 +37,13 @@
 import org.apache.directory.shared.ldap.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.SyntaxChecker;
 import org.apache.directory.shared.ldap.schema.UsageEnum;
+import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
+import org.apache.directory.shared.ldap.schema.registries.ComparatorRegistry;
+import org.apache.directory.shared.ldap.schema.registries.LdapSyntaxRegistry;
+import org.apache.directory.shared.ldap.schema.registries.MatchingRuleRegistry;
+import org.apache.directory.shared.ldap.schema.registries.NormalizerRegistry;
+import org.apache.directory.shared.ldap.schema.registries.ObjectClassRegistry;
+import org.apache.directory.shared.ldap.schema.registries.SyntaxCheckerRegistry;
 
 
 /**
@@ -102,7 +102,7 @@
      * A mutable Syntax for the bootstrap phase that uses the
      * syntaxCheckerRegistry to dynamically resolve syntax checkers.
      */
-    public static class BootstrapSyntax extends AbstractSyntax
+    public static class BootstrapSyntax extends LdapSyntax
     {
         private static final long serialVersionUID = 1L;
         final SyntaxCheckerRegistry registry;
@@ -115,9 +115,9 @@
         }
         
         
-        public void setSchema( String schema )
+        public void setSchema( String schemaName )
         {
-            super.setSchema( schema );
+            setSchemaName( schemaName );
         }
 
 
@@ -133,7 +133,7 @@
         }
 
 
-        public void setNames( String[] names )
+        public void setNames( List<String> names )
         {
             super.setNames( names );
         }
@@ -154,7 +154,7 @@
     public static class BootstrapMatchingRule extends AbstractMatchingRule
     {
         private static final long serialVersionUID = 1L;
-        final SyntaxRegistry syntaxRegistry;
+        final LdapSyntaxRegistry syntaxRegistry;
         final NormalizerRegistry normalizerRegistry;
         final ComparatorRegistry comparatorRegistry;
         String syntaxOid;
@@ -227,7 +227,7 @@
     {
         private static final long serialVersionUID = 4050205236738471984L;
 
-        private final SyntaxRegistry syntaxRegistry;
+        private final LdapSyntaxRegistry syntaxRegistry;
         private final MatchingRuleRegistry matchingRuleRegistry;
         private final AttributeTypeRegistry attributeTypeRegistry;
         private String superiorId;

Modified: directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheSyntaxProducer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheSyntaxProducer.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheSyntaxProducer.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheSyntaxProducer.java Sat Aug 22 16:15:42 2009
@@ -24,8 +24,7 @@
 
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.schema.AbstractSyntax;
-import org.apache.directory.shared.ldap.schema.SyntaxChecker;
+import org.apache.directory.shared.ldap.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.syntaxChecker.CsnSidSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntaxChecker.CsnSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntaxChecker.JavaByteSyntaxChecker;
@@ -64,31 +63,14 @@
     public void produce( Registries registries, ProducerCallback cb )
         throws NamingException
     {
-        AbstractSyntax syntax = null;
+        LdapSyntax syntax = null;
         
         // A Syntax for Java byte, OID = 1.3.6.1.4.1.18060.0.4.1.0.0
-        syntax = new AbstractSyntax( SchemaConstants.JAVA_BYTE_SYNTAX, "a syntax for java byte values", true )
-        {
-            private static final long serialVersionUID = 1L;
-            private final JavaByteSyntaxChecker JAVA_BYTE_SYNTAX_CHECKER = new JavaByteSyntaxChecker();
-
-            public String getName()
-            {
-                return "JAVA_BYTE";
-            }
-            
-            public String[] getNames()
-            {
-                return new String[] { "JAVA_BYTE" };
-            }
-            
-            public SyntaxChecker getSyntaxChecker() throws NamingException
-            {
-                return JAVA_BYTE_SYNTAX_CHECKER;
-            }
-        };
+        syntax = new LdapSyntax( SchemaConstants.JAVA_BYTE_SYNTAX, "a syntax for java byte values", true );
+        syntax.addName( "JAVA_BYTE" );
+        syntax.setSyntaxChecker( new JavaByteSyntaxChecker() );
+        syntax.setSchemaName( "apache" );
         
-        syntax.setSchema( "apache" );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         // A Syntax for Java char, OID = 1.3.6.1.4.1.18060.0.4.1.0.1
@@ -120,153 +102,51 @@
         */
         
         // A Syntax for Java short, OID = 1.3.6.1.4.1.18060.0.4.1.0.2
-        syntax = new AbstractSyntax( SchemaConstants.JAVA_SHORT_SYNTAX, "a syntax for java short values", true )
-        {
-            private static final long serialVersionUID = 1L;
-            private final JavaShortSyntaxChecker JAVA_SHORT_SYNTAX_CHECKER = new JavaShortSyntaxChecker();
+        syntax = new LdapSyntax( SchemaConstants.JAVA_SHORT_SYNTAX, "a syntax for java short values", true );
+        syntax.addName( "JAVA_SHORT" );
+        syntax.setSyntaxChecker( new JavaShortSyntaxChecker() );
+        syntax.setSchemaName( "apache" );
 
-            public String getName()
-            {
-                return "JAVA_SHORT";
-            }
-            
-            public String[] getNames()
-            {
-                return new String[] { "JAVA_SHORT" };
-            }
-            
-            public SyntaxChecker getSyntaxChecker() throws NamingException
-            {
-                return JAVA_SHORT_SYNTAX_CHECKER;
-            }
-        };
-        
-        syntax.setSchema( "apache" );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         // A Syntax for Java long, OID = 1.3.6.1.4.1.18060.0.4.1.0.3
-        syntax = new AbstractSyntax( SchemaConstants.JAVA_LONG_SYNTAX, "a syntax for java long values", true )
-        {
-            private static final long serialVersionUID = 1L;
-            private final JavaLongSyntaxChecker JAVA_LONG_SYNTAX_CHECKER = new JavaLongSyntaxChecker();
-
-            public String getName()
-            {
-                return "JAVA_LONG";
-            }
-            
-            public String[] getNames()
-            {
-                return new String[] { "JAVA_LONG" };
-            }
-            
-            public SyntaxChecker getSyntaxChecker() throws NamingException
-            {
-                return JAVA_LONG_SYNTAX_CHECKER;
-            }
-        };
+        syntax = new LdapSyntax( SchemaConstants.JAVA_LONG_SYNTAX, "a syntax for java long values", true );
+        syntax.addName( "JAVA_LONG" );
+        syntax.setSyntaxChecker( new JavaLongSyntaxChecker() );
+        syntax.setSchemaName( "apache" );
         
-        syntax.setSchema( "apache" );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         // A Syntax for Java int, OID = 1.3.6.1.4.1.18060.0.4.1.0.4
-        syntax = new AbstractSyntax( SchemaConstants.JAVA_INT_SYNTAX, "a syntax for java int values", true )
-        {
-            private static final long serialVersionUID = 1L;
-            private final JavaIntegerSyntaxChecker JAVA_INT_SYNTAX_CHECKER = new JavaIntegerSyntaxChecker();
+        syntax = new LdapSyntax( SchemaConstants.JAVA_INT_SYNTAX, "a syntax for java int values", true );
+        syntax.addName( "JAVA_INT" );
+        syntax.setSyntaxChecker( new JavaIntegerSyntaxChecker() );
+        syntax.setSchemaName( "apache" );
 
-            public String getName()
-            {
-                return "JAVA_INT";
-            }
-            
-            public String[] getNames()
-            {
-                return new String[] { "JAVA_INT" };
-            }
-            
-            public SyntaxChecker getSyntaxChecker() throws NamingException
-            {
-                return JAVA_INT_SYNTAX_CHECKER;
-            }
-        };
-        
-        syntax.setSchema( "apache" );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         // A Syntax for UUID, OID = 1.3.6.1.1.16.1
-        syntax = new AbstractSyntax( SchemaConstants.UUID_SYNTAX, "a syntax for UUID values", false )
-        {
-            private static final long serialVersionUID = 1L;
-            private final UuidSyntaxChecker UUID_SYNTAX_CHECKER = new UuidSyntaxChecker();
+        syntax = new LdapSyntax( SchemaConstants.UUID_SYNTAX, "a syntax for UUID values", true );
+        syntax.addName( "UUID" );
+        syntax.setSyntaxChecker( new UuidSyntaxChecker() );
+        syntax.setSchemaName( "apache" );
 
-            public String getName()
-            {
-                return "UUID";
-            }
-            
-            public String[] getNames()
-            {
-                return new String[] { "UUID" };
-            }
-            
-            public SyntaxChecker getSyntaxChecker() throws NamingException
-            {
-                return UUID_SYNTAX_CHECKER;
-            }
-        };
-        
-        syntax.setSchema( "apache" );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         // A Syntax for CSN, OID = 1.3.6.1.4.1.4203.666.11.2.1
-        syntax = new AbstractSyntax( SchemaConstants.CSN_SYNTAX, "a syntax for CSN values", true )
-        {
-            private static final long serialVersionUID = 1L;
-            private final CsnSyntaxChecker CSN_SYNTAX_CHECKER = new CsnSyntaxChecker();
+        syntax = new LdapSyntax( SchemaConstants.CSN_SYNTAX, "a syntax for CSN values", true );
+        syntax.addName( "CSN" );
+        syntax.setSyntaxChecker( new CsnSyntaxChecker() );
+        syntax.setSchemaName( "apache" );
 
-            public String getName()
-            {
-                return "CSN";
-            }
-            
-            public String[] getNames()
-            {
-                return new String[] { "CSN" };
-            }
-            
-            public SyntaxChecker getSyntaxChecker() throws NamingException
-            {
-                return CSN_SYNTAX_CHECKER;
-            }
-        };
-        
-        syntax.setSchema( "apache" );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         // A Syntax for CSNSid, OID = 1.3.6.1.4.1.4203.666.11.2.5
-        syntax = new AbstractSyntax( SchemaConstants.CSN_SID_SYNTAX, "a syntax for CSN SID values", true )
-        {
-            private static final long serialVersionUID = 1L;
-            private final CsnSidSyntaxChecker CSN_SID_SYNTAX_CHECKER = new CsnSidSyntaxChecker();
+        syntax = new LdapSyntax( SchemaConstants.CSN_SID_SYNTAX, "a syntax for CSN SID values", true );
+        syntax.addName( "CSNSid" );
+        syntax.setSyntaxChecker( new CsnSidSyntaxChecker() );
+        syntax.setSchemaName( "apache" );
 
-            public String getName()
-            {
-                return "CSNSid";
-            }
-            
-            public String[] getNames()
-            {
-                return new String[] { "CSNSid" };
-            }
-            
-            public SyntaxChecker getSyntaxChecker() throws NamingException
-            {
-                return CSN_SID_SYNTAX_CHECKER;
-            }
-        };
-        
-        syntax.setSchema( "apache" );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
     }
 }

Modified: directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaMatchingRuleProducer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaMatchingRuleProducer.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaMatchingRuleProducer.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaMatchingRuleProducer.java Sat Aug 22 16:15:42 2009
@@ -29,7 +29,6 @@
 import org.apache.commons.collections.comparators.ComparableComparator;
 import org.apache.directory.server.constants.MetaSchemaConstants;
 import org.apache.directory.server.schema.registries.Registries;
-import org.apache.directory.server.schema.registries.SyntaxRegistry;
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.MatchingRule;
@@ -39,6 +38,7 @@
 import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimToLowerNormalizer;
 import org.apache.directory.shared.ldap.schema.normalizers.NoOpNormalizer;
 import org.apache.directory.shared.ldap.schema.normalizers.ObjectIdentifierNormalizer;
+import org.apache.directory.shared.ldap.schema.registries.LdapSyntaxRegistry;
 
 
 /**
@@ -96,7 +96,7 @@
         private final String[] NAMES = new String[] { "ruleIdMatch" };
         
         
-        RuleIdMatch( SyntaxRegistry registry ) throws NamingException
+        RuleIdMatch( LdapSyntaxRegistry registry ) throws NamingException
         {
             syntax = registry.lookup( SchemaConstants.IA5_STRING_SYNTAX );
         }
@@ -161,7 +161,7 @@
         LdapSyntax syntax;
         
         
-        public SupDITStructureRuleMatch( SyntaxRegistry registry ) throws NamingException
+        public SupDITStructureRuleMatch( LdapSyntaxRegistry registry ) throws NamingException
         {
             this.syntax = registry.lookup( SchemaConstants.DIT_STRUCTURE_RULE_SYNTAX );
         }
@@ -228,7 +228,7 @@
         final String[] NAMES = new String[] { "numericOidMatch" };
         LdapSyntax syntax;
         
-        public NumericOidMatch( SyntaxRegistry registry ) throws NamingException
+        public NumericOidMatch( LdapSyntaxRegistry registry ) throws NamingException
         {
             this.syntax = registry.lookup( SchemaConstants.OID_SYNTAX );
         }

Modified: directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java Sat Aug 22 16:15:42 2009
@@ -60,15 +60,15 @@
         SyntaxChecker checker = null;
         
         checker = new NumericOidSyntaxChecker();
-        cb.schemaObjectProduced( this, checker.getSyntaxOid(), checker );
+        cb.schemaObjectProduced( this, checker.getOid(), checker );
         
         checker = new ObjectClassTypeSyntaxChecker();
-        cb.schemaObjectProduced( this, checker.getSyntaxOid(), checker );
+        cb.schemaObjectProduced( this, checker.getOid(), checker );
 
         checker = new NumberSyntaxChecker();
-        cb.schemaObjectProduced( this, checker.getSyntaxOid(), checker );
+        cb.schemaObjectProduced( this, checker.getOid(), checker );
 
         checker = new ObjectNameSyntaxChecker();
-        cb.schemaObjectProduced( this, checker.getSyntaxOid(), checker );
+        cb.schemaObjectProduced( this, checker.getOid(), checker );
     }
 }

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=806866&r1=806865&r2=806866&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 Sat Aug 22 16:15:42 2009
@@ -41,14 +41,8 @@
 import org.apache.directory.server.schema.bootstrap.AbstractBootstrapProducer.BootstrapObjectClass;
 import org.apache.directory.server.schema.bootstrap.AbstractBootstrapProducer.BootstrapSyntax;
 import org.apache.directory.server.schema.registries.AbstractSchemaLoader;
-import org.apache.directory.server.schema.registries.ComparatorRegistry;
 import org.apache.directory.server.schema.registries.DefaultRegistries;
-import org.apache.directory.server.schema.registries.MatchingRuleRegistry;
-import org.apache.directory.server.schema.registries.NormalizerRegistry;
-import org.apache.directory.server.schema.registries.ObjectClassRegistry;
 import org.apache.directory.server.schema.registries.Registries;
-import org.apache.directory.server.schema.registries.SyntaxCheckerRegistry;
-import org.apache.directory.server.schema.registries.SyntaxRegistry;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.LdapComparator;
 import org.apache.directory.shared.ldap.schema.MatchingRule;
@@ -59,6 +53,12 @@
 import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescription;
 import org.apache.directory.shared.ldap.schema.parsers.NormalizerDescription;
 import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescription;
+import org.apache.directory.shared.ldap.schema.registries.ComparatorRegistry;
+import org.apache.directory.shared.ldap.schema.registries.LdapSyntaxRegistry;
+import org.apache.directory.shared.ldap.schema.registries.MatchingRuleRegistry;
+import org.apache.directory.shared.ldap.schema.registries.NormalizerRegistry;
+import org.apache.directory.shared.ldap.schema.registries.ObjectClassRegistry;
+import org.apache.directory.shared.ldap.schema.registries.SyntaxCheckerRegistry;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -274,7 +274,7 @@
                     ( ( BootstrapSyntax ) syntax ).setSchema( schema.getSchemaName() );
                 }
 
-                SyntaxRegistry syntaxRegistry = registries.getSyntaxRegistry();
+                LdapSyntaxRegistry syntaxRegistry = registries.getSyntaxRegistry();
                 syntaxRegistry.register( syntax );
                 break;
                 

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=806866&r1=806865&r2=806866&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 Sat Aug 22 16:15:42 2009
@@ -24,8 +24,8 @@
 
 import org.apache.directory.server.schema.bootstrap.ProducerTypeEnum;
 import org.apache.directory.server.schema.registries.Registries;
-import org.apache.directory.server.schema.registries.SyntaxCheckerRegistry;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.schema.registries.SyntaxCheckerRegistry;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-schema/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/NisSyntaxProducer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/NisSyntaxProducer.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/NisSyntaxProducer.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/NisSyntaxProducer.java Sat Aug 22 16:15:42 2009
@@ -26,7 +26,7 @@
 import org.apache.directory.server.schema.bootstrap.ProducerCallback;
 import org.apache.directory.server.schema.bootstrap.ProducerTypeEnum;
 import org.apache.directory.server.schema.registries.Registries;
-import org.apache.directory.server.schema.registries.SyntaxCheckerRegistry;
+import org.apache.directory.shared.ldap.schema.registries.SyntaxCheckerRegistry;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/ConcreteNameComponentNormalizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/ConcreteNameComponentNormalizer.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/ConcreteNameComponentNormalizer.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/ConcreteNameComponentNormalizer.java Sat Aug 22 16:15:42 2009
@@ -24,7 +24,6 @@
 
 import javax.naming.NamingException;
 
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.OidRegistry;
 import org.apache.directory.shared.ldap.entry.client.ClientBinaryValue;
 import org.apache.directory.shared.ldap.name.NameComponentNormalizer;
@@ -32,6 +31,7 @@
 import org.apache.directory.shared.ldap.schema.MatchingRule;
 import org.apache.directory.shared.ldap.schema.Normalizer;
 import org.apache.directory.shared.ldap.schema.normalizers.NoOpNormalizer;
+import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -206,7 +206,7 @@
         
         if ( mrule == null )
         {
-            return NoOpNormalizer.INSTANCE;
+            return new NoOpNormalizer( id );
         }
         
         return type.getEquality().getNormalizer();

Modified: directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/DnComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/DnComparator.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/DnComparator.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/DnComparator.java Sat Aug 22 16:15:42 2009
@@ -25,9 +25,9 @@
 import javax.naming.Name;
 import javax.naming.NamingException;
 
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/DnNormalizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/DnNormalizer.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/DnNormalizer.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/DnNormalizer.java Sat Aug 22 16:15:42 2009
@@ -22,12 +22,13 @@
 
 import javax.naming.NamingException;
 
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.Registries;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.Normalizer;
+import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
 
 
 /**
@@ -36,7 +37,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class DnNormalizer implements Normalizer
+public class DnNormalizer extends Normalizer
 {
     // The serial UID
     private static final long serialVersionUID = 1L;
@@ -50,6 +51,7 @@
     
     public DnNormalizer( AttributeTypeRegistry attrRegistry )
     {
+        super( SchemaConstants.DISTINGUISHED_NAME_MATCH_MR_OID );
         this.attrRegistry = attrRegistry;
     }
     
@@ -59,7 +61,7 @@
      */
     public DnNormalizer()
     {
-        // Nothing to do
+        super( SchemaConstants.DISTINGUISHED_NAME_MATCH_MR_OID );
     }
 
 

Modified: directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/NameAndOptionalUIDComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/NameAndOptionalUIDComparator.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/NameAndOptionalUIDComparator.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/NameAndOptionalUIDComparator.java Sat Aug 22 16:15:42 2009
@@ -25,9 +25,9 @@
 import javax.naming.Name;
 import javax.naming.NamingException;
 
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/NameAndOptionalUIDNormalizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/NameAndOptionalUIDNormalizer.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/NameAndOptionalUIDNormalizer.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/NameAndOptionalUIDNormalizer.java Sat Aug 22 16:15:42 2009
@@ -20,12 +20,13 @@
 package org.apache.directory.server.schema;
 
 
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.Registries;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.Normalizer;
+import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.ldap.util.StringTools;
 
 import javax.naming.NamingException;
@@ -48,7 +49,6 @@
     
     public NameAndOptionalUIDNormalizer()
     {
-        // Do nothing
     }
     
     public NameAndOptionalUIDNormalizer( AttributeTypeRegistry attrRegistry )

Modified: directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/SerializableComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/SerializableComparator.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/SerializableComparator.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/SerializableComparator.java Sat Aug 22 16:15:42 2009
@@ -25,7 +25,7 @@
 
 import javax.naming.NamingException;
 
-import org.apache.directory.server.schema.registries.ComparatorRegistry;
+import org.apache.directory.shared.ldap.schema.registries.ComparatorRegistry;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-schema/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java (original)
+++ directory/apacheds/branches/apacheds-schema/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java Sat Aug 22 16:15:42 2009
@@ -30,9 +30,9 @@
 import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.server.protocol.shared.store.LdifFileLoader;
 import org.apache.directory.server.protocol.shared.store.LdifLoadFilter;
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/apacheds/branches/apacheds-schema/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java (original)
+++ directory/apacheds/branches/apacheds-schema/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java Sat Aug 22 16:15:42 2009
@@ -56,7 +56,6 @@
 import org.apache.directory.server.schema.bootstrap.Schema;
 import org.apache.directory.server.schema.bootstrap.SystemSchema;
 import org.apache.directory.server.schema.bootstrap.partition.DbFileListing;
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.DefaultOidRegistry;
 import org.apache.directory.server.schema.registries.DefaultRegistries;
 import org.apache.directory.server.schema.registries.OidRegistry;
@@ -71,6 +70,7 @@
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.UsageEnum;
+import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.ldap.util.Base64;
 
 

Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java Sat Aug 22 16:15:42 2009
@@ -95,7 +95,7 @@
 
             if ( mr == null )
             {
-                normalizer = NoOpNormalizer.INSTANCE;
+                normalizer = new NoOpNormalizer( mr.getOid() );
                 comparator = null;
             }
             else

Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java Sat Aug 22 16:15:42 2009
@@ -38,7 +38,6 @@
 import org.apache.directory.server.schema.bootstrap.CoreSchema;
 import org.apache.directory.server.schema.bootstrap.Schema;
 import org.apache.directory.server.schema.bootstrap.SystemSchema;
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.DefaultOidRegistry;
 import org.apache.directory.server.schema.registries.DefaultRegistries;
 import org.apache.directory.server.schema.registries.OidRegistry;
@@ -55,6 +54,7 @@
 import org.apache.directory.shared.ldap.filter.FilterParser;
 import org.apache.directory.shared.ldap.filter.PresenceNode;
 import org.apache.directory.shared.ldap.filter.SubstringNode;
+import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java Sat Aug 22 16:15:42 2009
@@ -33,14 +33,18 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class BogusSyntax implements LdapSyntax
+public class BogusSyntax extends LdapSyntax
 {
     private static final long serialVersionUID = 1L;
 
-
-    public boolean isHumanReadable()
+    protected BogusSyntax()
     {
-        return false;
+        super( "1.3.6.1.4.1.18060.0.4.1.1.100000" );
+        setHumanReadable( false );
+        setObsolete( false );
+        addName( "bogus" );
+        setDescription( "bogus" );
+        setSchemaName( "bogus" );
     }
 
 
@@ -48,51 +52,4 @@
     {
         return new AcceptAllSyntaxChecker( getOid() );
     }
-
-
-    public boolean isObsolete()
-    {
-        return false;
-    }
-
-
-    public String getOid()
-    {
-        return "1.3.6.1.4.1.18060.0.4.1.1.100000";
-    }
-
-
-    public String[] getNames()
-    {
-        return new String[] { "bogus" };
-    }
-
-
-    public String getName()
-    {
-        return "bogus";
-    }
-
-
-    public String getDescription()
-    {
-        return "bogus";
-    }
-
-
-    public String getSchema()
-    {
-        return "bogus";
-    }
-
-
-    public void setSchema( String schemaName )
-    {
-    }
-
-
-    public String[] getNamesRef()
-    {
-        return new String[] { "bogus" };
-    }
 }

Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java Sat Aug 22 16:15:42 2009
@@ -39,6 +39,7 @@
 import org.apache.directory.shared.ldap.filter.GreaterEqNode;
 import org.apache.directory.shared.ldap.schema.*;
 import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescription;
+import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.commons.io.FileUtils;
 import org.junit.Before;

Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java Sat Aug 22 16:15:42 2009
@@ -33,7 +33,6 @@
 import org.apache.directory.server.schema.bootstrap.CoreSchema;
 import org.apache.directory.server.schema.bootstrap.Schema;
 import org.apache.directory.server.schema.bootstrap.SystemSchema;
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.DefaultOidRegistry;
 import org.apache.directory.server.schema.registries.DefaultRegistries;
 import org.apache.directory.server.schema.registries.OidRegistry;
@@ -50,6 +49,7 @@
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaUtils;
 import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescription;
+import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.commons.io.FileUtils;
 import org.junit.Before;
@@ -735,13 +735,12 @@
         AttributeType at = new OrderingOnlyMatchingRuleAttributeType();
         registries.getAttributeTypeRegistry().register( at );
         registries.getSyntaxRegistry().register( at.getSyntax() );
-        SyntaxCheckerDescription desc = new SyntaxCheckerDescription();
+        SyntaxCheckerDescription desc = new SyntaxCheckerDescription( at.getSyntax().getOid() );
         desc.setDescription( "bogus" );
         desc.setFqcn( BogusSyntax.class.getName() );
         List<String> names = new ArrayList<String>();
         names.add( "bogus" );
         desc.setNames( names );
-        desc.setNumericOid( at.getSyntax().getOid() );
         desc.setObsolete( false );
         registries.getSyntaxCheckerRegistry().register( desc, at.getSyntax().getSyntaxChecker() );
 

Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java Sat Aug 22 16:15:42 2009
@@ -37,7 +37,6 @@
 import org.apache.directory.server.schema.bootstrap.CoreSchema;
 import org.apache.directory.server.schema.bootstrap.Schema;
 import org.apache.directory.server.schema.bootstrap.SystemSchema;
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.DefaultOidRegistry;
 import org.apache.directory.server.schema.registries.DefaultRegistries;
 import org.apache.directory.server.schema.registries.OidRegistry;
@@ -50,6 +49,7 @@
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.FilterParser;
 import org.apache.directory.shared.ldap.name.NameComponentNormalizer;
+import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.*;
 import static org.junit.Assert.*;

Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java Sat Aug 22 16:15:42 2009
@@ -36,7 +36,6 @@
 import org.apache.directory.server.schema.bootstrap.CoreSchema;
 import org.apache.directory.server.schema.bootstrap.Schema;
 import org.apache.directory.server.schema.bootstrap.SystemSchema;
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.DefaultOidRegistry;
 import org.apache.directory.server.schema.registries.DefaultRegistries;
 import org.apache.directory.server.schema.registries.OidRegistry;
@@ -52,6 +51,7 @@
 import org.apache.directory.shared.ldap.filter.FilterParser;
 import org.apache.directory.shared.ldap.filter.NotNode;
 import org.apache.directory.shared.ldap.filter.SubstringNode;
+import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java Sat Aug 22 16:15:42 2009
@@ -34,7 +34,6 @@
 import org.apache.directory.server.schema.bootstrap.CoreSchema;
 import org.apache.directory.server.schema.bootstrap.Schema;
 import org.apache.directory.server.schema.bootstrap.SystemSchema;
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.DefaultOidRegistry;
 import org.apache.directory.server.schema.registries.DefaultRegistries;
 import org.apache.directory.server.schema.registries.OidRegistry;
@@ -51,6 +50,7 @@
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.SchemaUtils;
+import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
 import org.apache.commons.io.FileUtils;
 import org.junit.Before;
 import org.junit.After;

Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java Sat Aug 22 16:15:42 2009
@@ -37,7 +37,6 @@
 import org.apache.directory.server.schema.bootstrap.CoreSchema;
 import org.apache.directory.server.schema.bootstrap.Schema;
 import org.apache.directory.server.schema.bootstrap.SystemSchema;
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.DefaultOidRegistry;
 import org.apache.directory.server.schema.registries.DefaultRegistries;
 import org.apache.directory.server.schema.registries.OidRegistry;
@@ -55,6 +54,7 @@
 import org.apache.directory.shared.ldap.filter.FilterParser;
 import org.apache.directory.shared.ldap.filter.OrNode;
 import org.apache.directory.shared.ldap.filter.SubstringNode;
+import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java Sat Aug 22 16:15:42 2009
@@ -30,7 +30,6 @@
 import org.apache.directory.server.schema.bootstrap.CoreSchema;
 import org.apache.directory.server.schema.bootstrap.Schema;
 import org.apache.directory.server.schema.bootstrap.SystemSchema;
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.DefaultOidRegistry;
 import org.apache.directory.server.schema.registries.DefaultRegistries;
 import org.apache.directory.server.schema.registries.OidRegistry;
@@ -44,6 +43,7 @@
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.filter.PresenceNode;
+import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
 import org.apache.commons.io.FileUtils;
 import org.junit.After;
 import org.junit.Before;

Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java Sat Aug 22 16:15:42 2009
@@ -33,7 +33,6 @@
 import org.apache.directory.server.schema.bootstrap.CoreSchema;
 import org.apache.directory.server.schema.bootstrap.Schema;
 import org.apache.directory.server.schema.bootstrap.SystemSchema;
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.DefaultOidRegistry;
 import org.apache.directory.server.schema.registries.DefaultRegistries;
 import org.apache.directory.server.schema.registries.OidRegistry;
@@ -44,6 +43,7 @@
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.filter.SubstringNode;
+import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
 import org.apache.commons.io.FileUtils;
 import org.junit.Before;
 import org.junit.After;

Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java Sat Aug 22 16:15:42 2009
@@ -34,7 +34,6 @@
 import org.apache.directory.server.schema.bootstrap.CoreSchema;
 import org.apache.directory.server.schema.bootstrap.Schema;
 import org.apache.directory.server.schema.bootstrap.SystemSchema;
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.DefaultOidRegistry;
 import org.apache.directory.server.schema.registries.DefaultRegistries;
 import org.apache.directory.server.schema.registries.OidRegistry;
@@ -51,6 +50,7 @@
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.SchemaUtils;
+import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
 import org.apache.commons.io.FileUtils;
 import org.junit.Before;
 import org.junit.After;

Modified: directory/apacheds/branches/apacheds-schema/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java Sat Aug 22 16:15:42 2009
@@ -25,7 +25,6 @@
 
 import org.apache.directory.server.core.entry.DefaultServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
 import org.apache.directory.server.xdbm.Index;
@@ -40,6 +39,7 @@
 import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.SchemaUtils;
+import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
 
 
 /**



Mime
View raw message