directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r806865 - in /directory: apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/ shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/
Date Sat, 22 Aug 2009 16:01:32 GMT
Author: elecharny
Date: Sat Aug 22 16:01:31 2009
New Revision: 806865

URL: http://svn.apache.org/viewvc?rev=806865&view=rev
Log:
Moved the Registry interfaces to shared/registries

Added:
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/AttributeTypeRegistry.java
      - copied, changed from r806632, directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/AttributeTypeRegistry.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ComparatorRegistry.java
      - copied, changed from r806751, directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/ComparatorRegistry.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DITContentRuleRegistry.java
      - copied, changed from r806632, directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DITContentRuleRegistry.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DITStructureRuleRegistry.java
      - copied, changed from r806632, directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DITStructureRuleRegistry.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/LdapSyntaxRegistry.java
      - copied, changed from r806854, directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SyntaxRegistry.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/MatchingRuleRegistry.java
      - copied, changed from r806632, directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/MatchingRuleRegistry.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/MatchingRuleUseRegistry.java
      - copied, changed from r806632, directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/MatchingRuleUseRegistry.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/NameFormRegistry.java
      - copied, changed from r806632, directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/NameFormRegistry.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/NormalizerRegistry.java
      - copied, changed from r806632, directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/NormalizerRegistry.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ObjectClassRegistry.java
      - copied, changed from r806632, directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/ObjectClassRegistry.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SchemaObjectRegistry.java
      - copied, changed from r806632, directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SchemaObjectRegistry.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SyntaxCheckerRegistry.java
      - copied, changed from r806632, directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SyntaxCheckerRegistry.java
Removed:
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/AttributeTypeRegistry.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/ComparatorRegistry.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DITContentRuleRegistry.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DITStructureRuleRegistry.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/MatchingRuleRegistry.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/MatchingRuleUseRegistry.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/NameFormRegistry.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/NormalizerRegistry.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/ObjectClassRegistry.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SchemaObjectRegistry.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SyntaxCheckerRegistry.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SyntaxRegistry.java
Modified:
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultAttributeTypeRegistry.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultComparatorRegistry.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultDitContentRuleRegistry.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultDitStructureRuleRegistry.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultMatchingRuleRegistry.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultMatchingRuleUseRegistry.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultNameFormRegistry.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultNormalizerRegistry.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultObjectClassRegistry.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultRegistries.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxCheckerRegistry.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxRegistry.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/Registries.java

Modified: directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultAttributeTypeRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultAttributeTypeRegistry.java?rev=806865&r1=806864&r2=806865&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultAttributeTypeRegistry.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultAttributeTypeRegistry.java Sat Aug 22 16:01:31 2009
@@ -35,6 +35,7 @@
 import org.apache.directory.shared.ldap.schema.MatchingRule;
 import org.apache.directory.shared.ldap.schema.normalizers.NoOpNormalizer;
 import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer;
+import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultComparatorRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultComparatorRegistry.java?rev=806865&r1=806864&r2=806865&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultComparatorRegistry.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultComparatorRegistry.java Sat Aug 22 16:01:31 2009
@@ -32,6 +32,7 @@
 import org.apache.directory.shared.asn1.primitives.OID;
 import org.apache.directory.shared.ldap.schema.LdapComparator;
 import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescription;
+import org.apache.directory.shared.ldap.schema.registries.ComparatorRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultDitContentRuleRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultDitContentRuleRegistry.java?rev=806865&r1=806864&r2=806865&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultDitContentRuleRegistry.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultDitContentRuleRegistry.java Sat Aug 22 16:01:31 2009
@@ -28,6 +28,7 @@
 
 import org.apache.directory.shared.asn1.primitives.OID;
 import org.apache.directory.shared.ldap.schema.DITContentRule;
+import org.apache.directory.shared.ldap.schema.registries.DITContentRuleRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultDitStructureRuleRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultDitStructureRuleRegistry.java?rev=806865&r1=806864&r2=806865&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultDitStructureRuleRegistry.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultDitStructureRuleRegistry.java Sat Aug 22 16:01:31 2009
@@ -29,6 +29,7 @@
 import org.apache.directory.shared.ldap.exception.LdapNamingException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.schema.DITStructureRule;
+import org.apache.directory.shared.ldap.schema.registries.DITStructureRuleRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultMatchingRuleRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultMatchingRuleRegistry.java?rev=806865&r1=806864&r2=806865&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultMatchingRuleRegistry.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultMatchingRuleRegistry.java Sat Aug 22 16:01:31 2009
@@ -28,6 +28,7 @@
 
 import org.apache.directory.shared.asn1.primitives.OID;
 import org.apache.directory.shared.ldap.schema.MatchingRule;
+import org.apache.directory.shared.ldap.schema.registries.MatchingRuleRegistry;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultMatchingRuleUseRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultMatchingRuleUseRegistry.java?rev=806865&r1=806864&r2=806865&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultMatchingRuleUseRegistry.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultMatchingRuleUseRegistry.java Sat Aug 22 16:01:31 2009
@@ -27,6 +27,7 @@
 import javax.naming.NamingException;
 
 import org.apache.directory.shared.ldap.schema.MatchingRuleUse;
+import org.apache.directory.shared.ldap.schema.registries.MatchingRuleUseRegistry;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultNameFormRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultNameFormRegistry.java?rev=806865&r1=806864&r2=806865&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultNameFormRegistry.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultNameFormRegistry.java Sat Aug 22 16:01:31 2009
@@ -27,6 +27,7 @@
 import javax.naming.NamingException;
 
 import org.apache.directory.shared.ldap.schema.NameForm;
+import org.apache.directory.shared.ldap.schema.registries.NameFormRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultNormalizerRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultNormalizerRegistry.java?rev=806865&r1=806864&r2=806865&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultNormalizerRegistry.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultNormalizerRegistry.java Sat Aug 22 16:01:31 2009
@@ -31,6 +31,7 @@
 import org.apache.directory.shared.asn1.primitives.OID;
 import org.apache.directory.shared.ldap.schema.Normalizer;
 import org.apache.directory.shared.ldap.schema.parsers.NormalizerDescription;
+import org.apache.directory.shared.ldap.schema.registries.NormalizerRegistry;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultObjectClassRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultObjectClassRegistry.java?rev=806865&r1=806864&r2=806865&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultObjectClassRegistry.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultObjectClassRegistry.java Sat Aug 22 16:01:31 2009
@@ -28,6 +28,7 @@
 
 import org.apache.directory.shared.asn1.primitives.OID;
 import org.apache.directory.shared.ldap.schema.ObjectClass;
+import org.apache.directory.shared.ldap.schema.registries.ObjectClassRegistry;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultRegistries.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultRegistries.java?rev=806865&r1=806864&r2=806865&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultRegistries.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultRegistries.java Sat Aug 22 16:01:31 2009
@@ -33,6 +33,18 @@
 import org.apache.directory.shared.ldap.schema.ObjectClass;
 import org.apache.directory.shared.ldap.schema.SchemaObject;
 import org.apache.directory.shared.ldap.schema.LdapSyntax;
+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.DITContentRuleRegistry;
+import org.apache.directory.shared.ldap.schema.registries.DITStructureRuleRegistry;
+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.MatchingRuleUseRegistry;
+import org.apache.directory.shared.ldap.schema.registries.NameFormRegistry;
+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.SchemaObjectRegistry;
+import org.apache.directory.shared.ldap.schema.registries.SyntaxCheckerRegistry;
 
 
 /**
@@ -163,7 +175,7 @@
     }
 
 
-    public SyntaxRegistry getSyntaxRegistry()
+    public LdapSyntaxRegistry getSyntaxRegistry()
     {
         return syntaxRegistry;
     }

Modified: directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxCheckerRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxCheckerRegistry.java?rev=806865&r1=806864&r2=806865&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxCheckerRegistry.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxCheckerRegistry.java Sat Aug 22 16:01:31 2009
@@ -31,6 +31,7 @@
 import org.apache.directory.shared.asn1.primitives.OID;
 import org.apache.directory.shared.ldap.schema.SyntaxChecker;
 import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescription;
+import org.apache.directory.shared.ldap.schema.registries.SyntaxCheckerRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxRegistry.java?rev=806865&r1=806864&r2=806865&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxRegistry.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxRegistry.java Sat Aug 22 16:01:31 2009
@@ -28,6 +28,7 @@
 
 import org.apache.directory.shared.asn1.primitives.OID;
 import org.apache.directory.shared.ldap.schema.LdapSyntax;
+import org.apache.directory.shared.ldap.schema.registries.LdapSyntaxRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,7 +40,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class DefaultSyntaxRegistry implements SyntaxRegistry
+public class DefaultSyntaxRegistry implements LdapSyntaxRegistry
 {
     /** static class logger */
     private static final Logger LOG = LoggerFactory.getLogger( DefaultSyntaxRegistry.class );

Modified: directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/Registries.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/Registries.java?rev=806865&r1=806864&r2=806865&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/Registries.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/Registries.java Sat Aug 22 16:01:31 2009
@@ -25,6 +25,17 @@
 import java.util.Properties;
 
 import org.apache.directory.server.schema.bootstrap.Schema;
+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.DITContentRuleRegistry;
+import org.apache.directory.shared.ldap.schema.registries.DITStructureRuleRegistry;
+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.MatchingRuleUseRegistry;
+import org.apache.directory.shared.ldap.schema.registries.NameFormRegistry;
+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;
 
 
 /**
@@ -69,7 +80,7 @@
 
     SyntaxCheckerRegistry getSyntaxCheckerRegistry();
 
-    SyntaxRegistry getSyntaxRegistry();
+    LdapSyntaxRegistry getLdapSyntaxRegistry();
 
     List<Throwable> checkRefInteg();
 

Copied: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/AttributeTypeRegistry.java (from r806632, directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/AttributeTypeRegistry.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/AttributeTypeRegistry.java?p2=directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/AttributeTypeRegistry.java&p1=directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/AttributeTypeRegistry.java&r1=806632&r2=806865&rev=806865&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/AttributeTypeRegistry.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/AttributeTypeRegistry.java Sat Aug 22 16:01:31 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.schema.registries;
+package org.apache.directory.shared.ldap.schema.registries;
 
 
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -34,7 +34,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface AttributeTypeRegistry extends SchemaObjectRegistry, Iterable<AttributeType>
+public interface AttributeTypeRegistry extends SchemaObjectRegistry<AttributeType>
 {
     /**
      * Registers a new AttributeType with this registry.
@@ -68,14 +68,6 @@
 
 
     /**
-     * Gets an Iterator over the AttributeTypes within this registry.
-     *
-     * @return an iterator over all AttributeTypes in registry
-     */
-    Iterator<AttributeType> iterator();
-    
-    
-    /**
      * Gets an oid/name to normalizer mapping used to normalize distinguished 
      * names.
      *

Copied: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ComparatorRegistry.java (from r806751, directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/ComparatorRegistry.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ComparatorRegistry.java?p2=directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ComparatorRegistry.java&p1=directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/ComparatorRegistry.java&r1=806751&r2=806865&rev=806865&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/ComparatorRegistry.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ComparatorRegistry.java Sat Aug 22 16:01:31 2009
@@ -17,10 +17,9 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.schema.registries;
+package org.apache.directory.shared.ldap.schema.registries;
 
 
-import java.util.Comparator;
 import java.util.Iterator;
 
 import javax.naming.NamingException;
@@ -35,19 +34,9 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface ComparatorRegistry extends Iterable<String>
+public interface ComparatorRegistry extends SchemaObjectRegistry<LdapComparator<?>>
 {
     /**
-     * Gets the name of the schema this schema object is associated with.
-     *
-     * @param oid the object identifier
-     * @return the schema name
-     * @throws NamingException if the schema object does not exist 
-     */
-    String getSchemaName( String oid ) throws NamingException;
-
-
-    /**
      * Registers a Comparator with this registry.
      * 
      * @param description the comparatorDescription for the comparator to register
@@ -59,36 +48,6 @@
 
 
     /**
-     * Looks up a Comparator by its unique Object Identifier.
-     * 
-     * @param oid the object identifier
-     * @return the Comparator for the oid
-     * @throws NamingException if there is a backing store failure or the 
-     *      Comparator does not exist.
-     */
-    Comparator<?> lookup( String oid ) throws NamingException;
-
-
-    /**
-     * Checks to see if a Comparator exists.  Backing store failures simply 
-     * return false.
-     * 
-     * @param oid the object identifier
-     * @return true if a Comparator definition exists for the oid, false 
-     *      otherwise
-     */
-    boolean hasComparator( String oid );
-
-
-    /**
-     * Iterates over the numeric OID strings of this registry.
-     * 
-     * @return Iterator of numeric OID strings 
-     */
-    Iterator<String> iterator();
-
-    
-    /**
      * Iterates over the numeric OID strings of this registry.
      * 
      * @return Iterator of numeric OID strings 
@@ -97,15 +56,6 @@
 
     
     /**
-     * Removes a registered comparator from this registry.
-     * 
-     * @param oid the numeric oid of the comparator to remove.
-     * @throws NamingException if the oid is not a numeric id
-     */
-    void unregister( String oid ) throws NamingException;
-    
-    
-    /**
      * Unregisters comparators from this registry associated with a schema.
      *
      * @param schemaName the name of the schema whose comparators are removed 

Copied: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DITContentRuleRegistry.java (from r806632, directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DITContentRuleRegistry.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DITContentRuleRegistry.java?p2=directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DITContentRuleRegistry.java&p1=directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DITContentRuleRegistry.java&r1=806632&r2=806865&rev=806865&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DITContentRuleRegistry.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DITContentRuleRegistry.java Sat Aug 22 16:01:31 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.schema.registries;
+package org.apache.directory.shared.ldap.schema.registries;
 
 
 import java.util.Iterator;
@@ -33,7 +33,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface DITContentRuleRegistry extends SchemaObjectRegistry
+public interface DITContentRuleRegistry extends SchemaObjectRegistry<DITContentRule>
 {
     /**
      * Registers a DITContentRule with this registry.
@@ -63,11 +63,4 @@
      * otherwise
      */
     boolean hasDITContentRule( String id );
-    
-    /**
-     * Lists the DITContentRules registered in this registry.
-     *
-     * @return an Iterator of DITContentRules
-     */
-    Iterator<DITContentRule> iterator();
 }

Copied: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DITStructureRuleRegistry.java (from r806632, directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DITStructureRuleRegistry.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DITStructureRuleRegistry.java?p2=directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DITStructureRuleRegistry.java&p1=directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DITStructureRuleRegistry.java&r1=806632&r2=806865&rev=806865&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DITStructureRuleRegistry.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DITStructureRuleRegistry.java Sat Aug 22 16:01:31 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.schema.registries;
+package org.apache.directory.shared.ldap.schema.registries;
 
 
 import java.util.Iterator;
@@ -33,7 +33,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface DITStructureRuleRegistry extends SchemaObjectRegistry
+public interface DITStructureRuleRegistry extends SchemaObjectRegistry<DITStructureRule>
 {
     /**
      * Registers a DITStructureRule with this registry.
@@ -108,12 +108,4 @@
      * @throws NamingException if no such rule could be found
      */
     String getSchemaName( Integer ruleId ) throws NamingException;
-
-
-    /**
-     * Lists all the DITStructureRules within this registry.
-     *
-     * @return an Iterator over all the DITStructureRules within this registry
-     */
-    Iterator<DITStructureRule> iterator();
 }

Copied: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/LdapSyntaxRegistry.java (from r806854, directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SyntaxRegistry.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/LdapSyntaxRegistry.java?p2=directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/LdapSyntaxRegistry.java&p1=directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SyntaxRegistry.java&r1=806854&r2=806865&rev=806865&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SyntaxRegistry.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/LdapSyntaxRegistry.java Sat Aug 22 16:01:31 2009
@@ -17,13 +17,9 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.schema.registries;
+package org.apache.directory.shared.ldap.schema.registries;
 
 
-import java.util.Iterator;
-
-import javax.naming.NamingException;
-
 import org.apache.directory.shared.ldap.schema.LdapSyntax;
 
 
@@ -33,43 +29,6 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface SyntaxRegistry extends SchemaObjectRegistry, Iterable<LdapSyntax>
+public interface LdapSyntaxRegistry extends SchemaObjectRegistry<LdapSyntax>
 {
-    /**
-     * Looks up a Syntax by its unique Object Identifier or by name.
-     * 
-     * @param id the object identifier or name
-     * @return the Syntax for the id
-     * @throws NamingException if there is a backing store failure or the Syntax
-     * does not exist.
-     */
-    LdapSyntax lookup( String id ) throws NamingException;
-
-
-    /**
-     * Registers a Syntax with this registry.  
-     * 
-     * @param syntax the Syntax to register
-     * @throws NamingException if the syntax is already registered or the 
-     * registration operation is not supported
-     */
-    void register( LdapSyntax syntax ) throws NamingException;
-
-
-    /**
-     * Checks to see if a Syntax exists.  Backing store failures simply return
-     * false.
-     * 
-     * @param id the object identifier or name
-     * @return true if a Syntax definition exists for the id, false otherwise
-     */
-    boolean hasSyntax( String id );
-
-
-    /**
-     * Lists all the Syntaxes within this registry.
-     *
-     * @return an Iterator over all the Syntaxes within this registry
-     */
-    Iterator<LdapSyntax> iterator();
 }

Copied: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/MatchingRuleRegistry.java (from r806632, directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/MatchingRuleRegistry.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/MatchingRuleRegistry.java?p2=directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/MatchingRuleRegistry.java&p1=directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/MatchingRuleRegistry.java&r1=806632&r2=806865&rev=806865&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/MatchingRuleRegistry.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/MatchingRuleRegistry.java Sat Aug 22 16:01:31 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.schema.registries;
+package org.apache.directory.shared.ldap.schema.registries;
 
 
 import java.util.Iterator;
@@ -33,7 +33,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface MatchingRuleRegistry extends SchemaObjectRegistry, Iterable<MatchingRule>
+public interface MatchingRuleRegistry extends SchemaObjectRegistry<MatchingRule>
 {
     /**
      * Registers a MatchingRule with this registry.
@@ -65,12 +65,4 @@
      * otherwise
      */
     boolean hasMatchingRule( String oid );
-
-
-    /**
-     * Gets an Iterator over the MatchingRules within this registry.
-     *
-     * @return an iterator over all MatchingRules in registry
-     */
-    Iterator<MatchingRule> iterator();
 }

Copied: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/MatchingRuleUseRegistry.java (from r806632, directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/MatchingRuleUseRegistry.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/MatchingRuleUseRegistry.java?p2=directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/MatchingRuleUseRegistry.java&p1=directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/MatchingRuleUseRegistry.java&r1=806632&r2=806865&rev=806865&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/MatchingRuleUseRegistry.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/MatchingRuleUseRegistry.java Sat Aug 22 16:01:31 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.schema.registries;
+package org.apache.directory.shared.ldap.schema.registries;
 
 
 import java.util.Iterator;
@@ -35,7 +35,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface MatchingRuleUseRegistry extends SchemaObjectRegistry
+public interface MatchingRuleUseRegistry extends SchemaObjectRegistry<MatchingRuleUse>
 {
     /**
      * Registers a MatchingRuleUse with this registry.
@@ -65,12 +65,4 @@
      * otherwise
      */
     boolean hasMatchingRuleUse( String name );
-
-
-    /**
-     * Lists all the MatchingRuleUses within this registry.
-     *
-     * @return an Iterator over all the MatchingRuleUses within this registry
-     */
-    Iterator<MatchingRuleUse> iterator();
 }

Copied: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/NameFormRegistry.java (from r806632, directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/NameFormRegistry.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/NameFormRegistry.java?p2=directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/NameFormRegistry.java&p1=directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/NameFormRegistry.java&r1=806632&r2=806865&rev=806865&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/NameFormRegistry.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/NameFormRegistry.java Sat Aug 22 16:01:31 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.schema.registries;
+package org.apache.directory.shared.ldap.schema.registries;
 
 
 import java.util.Iterator;
@@ -33,7 +33,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface NameFormRegistry extends SchemaObjectRegistry
+public interface NameFormRegistry extends SchemaObjectRegistry<NameForm>
 {
     /**
      * Registers a NameForm with this registry.

Copied: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/NormalizerRegistry.java (from r806632, directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/NormalizerRegistry.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/NormalizerRegistry.java?p2=directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/NormalizerRegistry.java&p1=directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/NormalizerRegistry.java&r1=806632&r2=806865&rev=806865&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/NormalizerRegistry.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/NormalizerRegistry.java Sat Aug 22 16:01:31 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.schema.registries;
+package org.apache.directory.shared.ldap.schema.registries;
 
 
 import java.util.Iterator;
@@ -34,7 +34,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface NormalizerRegistry extends Iterable<String>
+public interface NormalizerRegistry extends SchemaObjectRegistry<Normalizer>
 {
     /**
      * Registers a Normalizer with this registry.
@@ -47,48 +47,6 @@
 
 
     /**
-     * Looks up a Normalizer by its unique Object Identifier.
-     * 
-     * @param oid the object identifier
-     * @return the Normalizer for the oid
-     * @throws NamingException if there is a backing store failure or the 
-     *      Normalizer does not exist.
-     */
-    Normalizer lookup( String oid ) throws NamingException;
-
-
-    /**
-     * Gets the name of the schema this schema object is associated with.
-     *
-     * @param oid the object identifier
-     * @return the schema name
-     * @throws NamingException if the schema object does not exist
-     */
-    String getSchemaName( String oid ) throws NamingException;
-
-
-    /**
-     * Checks to see if a Normalizer exists.  Backing store failures simply 
-     * return false.
-     * 
-     * @param oid the object identifier
-     * @return true if a Normalizer definition exists for the oid, false 
-     *      otherwise
-     */
-    boolean hasNormalizer( String oid );
-    
-    
-    /**
-     * Used to iterate through all normalizers.  We have to iterate over the
-     * OID String keys because these objects do not associate a matchingRule OID
-     * with them as a class member.
-     *  
-     * @return an Iterator over the set of OID Strings in this registry
-     */
-    Iterator<String> iterator();
-
-    
-    /**
      * Used to iterate through all normalizerDescriptions.
      *  
      * @return an Iterator over the set of NormalizerDescriptions in this registry
@@ -97,15 +55,6 @@
 
     
     /**
-     * Unregisters a normalizer from this registry by OID.
-     * 
-     * @param oid the numeric OID of the matchingRule the normalizer is for
-     * @throws NamingException if the provided argument is not a numeric OID
-     */
-    void unregister( String oid ) throws NamingException;
-    
-    
-    /**
      * Unregisters normalizers from this registry associated with a schema.
      *
      * @param schemaName the name of the schema whose normalizers are 

Copied: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ObjectClassRegistry.java (from r806632, directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/ObjectClassRegistry.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ObjectClassRegistry.java?p2=directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ObjectClassRegistry.java&p1=directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/ObjectClassRegistry.java&r1=806632&r2=806865&rev=806865&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/ObjectClassRegistry.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ObjectClassRegistry.java Sat Aug 22 16:01:31 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.schema.registries;
+package org.apache.directory.shared.ldap.schema.registries;
 
 
 import java.util.Iterator;
@@ -33,7 +33,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface ObjectClassRegistry extends SchemaObjectRegistry, Iterable<ObjectClass>
+public interface ObjectClassRegistry extends SchemaObjectRegistry<ObjectClass>
 {
     /**
      * Registers an ObjectClass with this registry.

Copied: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SchemaObjectRegistry.java (from r806632, directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SchemaObjectRegistry.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SchemaObjectRegistry.java?p2=directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SchemaObjectRegistry.java&p1=directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SchemaObjectRegistry.java&r1=806632&r2=806865&rev=806865&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SchemaObjectRegistry.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SchemaObjectRegistry.java Sat Aug 22 16:01:31 2009
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.server.schema.registries;
+package org.apache.directory.shared.ldap.schema.registries;
 
 
 import java.util.Iterator;
@@ -33,9 +33,19 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public interface SchemaObjectRegistry
+public interface SchemaObjectRegistry<T extends SchemaObject> extends Iterable<T>
 {
     /**
+     * Checks to see if an SchemaObject exists in the registry.
+     * 
+     * @param id the object identifier or name of the SchemaObject
+     * @return true if a SchemaObject definition exists for the oid, false
+     * otherwise
+     */
+    boolean contains( String id );
+    
+    
+    /**
      * Gets the name of the schema this schema object is associated with.
      *
      * @param id the object identifier or the name
@@ -48,9 +58,37 @@
     /**
      * Gets an iterator over the registered schema objects in the registry.
      *
-     * @return an Iterator of homogenious schema objects
+     * @return an Iterator of homogeneous schema objects
+     */
+    Iterator<T> iterator();
+
+    
+    /**
+     * Gets an iterator over the registered schema objects'OID in the registry.
+     *
+     * @return an Iterator of OIDs
+     */
+    Iterator<String> oidsIterator();
+
+    
+    /**
+     * Looks up a SchemaObject by its unique Object Identifier or by name.
+     *
+     * @param id the object identifier or name
+     * @return the SchemaObject instance for the id
+     * @throws NamingException if the SchemaObject does not exist
+     */
+    T lookup( String id ) throws NamingException;
+
+
+    /**
+     * Registers a new SchemaObject with this registry.
+     *
+     * @param schemaObject the SchemaObject to register
+     * @throws NamingException if the SchemaObject is already registered or
+     * the registration operation is not supported
      */
-    Iterator<? extends SchemaObject> iterator();
+    void register( T schemaObject ) throws NamingException;
 
 
     /**

Copied: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SyntaxCheckerRegistry.java (from r806632, directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SyntaxCheckerRegistry.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SyntaxCheckerRegistry.java?p2=directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SyntaxCheckerRegistry.java&p1=directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SyntaxCheckerRegistry.java&r1=806632&r2=806865&rev=806865&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SyntaxCheckerRegistry.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SyntaxCheckerRegistry.java Sat Aug 22 16:01:31 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.schema.registries;
+package org.apache.directory.shared.ldap.schema.registries;
 
 
 import java.util.Iterator;
@@ -34,7 +34,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface SyntaxCheckerRegistry extends Iterable<SyntaxChecker>
+public interface SyntaxCheckerRegistry extends SchemaObjectRegistry<SyntaxChecker>
 {
     /**
      * Registers a SyntaxChecker with this registry.
@@ -48,46 +48,6 @@
 
 
     /**
-     * Looks up a SyntaxChecker by its unique Object Identifier.
-     * 
-     * @param oid the object identifier
-     * @return the SyntaxChecker for the oid
-     * @throws NamingException if there is a backing store failure or the 
-     *      SyntaxChecker does not exist.
-     */
-    SyntaxChecker lookup( String oid ) throws NamingException;
-
-
-    /**
-     * Gets the name of the schema this schema object is associated with.
-     *
-     * @param oid the object identifier
-     * @return the schema name
-     * @throws NamingException if the schema object does not exist
-     */
-    String getSchemaName( String oid ) throws NamingException;
-
-
-    /**
-     * Checks to see if a SyntaxChecker exists.  Backing store failures simply 
-     * return false.
-     * 
-     * @param oid the object identifier
-     * @return true if a SyntaxChecker definition exists for the oid, false 
-     *      otherwise
-     */
-    boolean hasSyntaxChecker( String oid );
-    
-
-    /**
-     * Get's an iterator over all the syntaxCheckers associated with this registry.
-     * 
-     * @return an Iterator over all the syntaxCheckers
-     */
-    Iterator<SyntaxChecker> iterator();
-
-
-    /**
      * Get's an iterator over all the syntaxCheckerDescriptions associated with this registry.
      * 
      * @return an Iterator over all the syntaxCheckerDescriptions
@@ -96,15 +56,6 @@
 
 
     /**
-     * Unregisters a registered syntaxChecker from this registry.
-     * 
-     * @param numericOid the numeric oid of the syntax this checker is associated with
-     * @throws NamingException if the numericOid is not valid
-     */
-    void unregister( String numericOid ) throws NamingException;
-    
-    
-    /**
      * Unregisters all syntaxCheckers defined for a specific schema from
      * this registry.
      * 



Mime
View raw message