You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2009/08/22 18:15:46 UTC
svn commit: r806866 [1/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...
Author: elecharny
Date: Sat Aug 22 16:15:42 2009
New Revision: 806866
URL: http://svn.apache.org/viewvc?rev=806866&view=rev
Log:
Reflecting the Registry interfaces move to shared
Modified:
directory/apacheds/branches/apacheds-schema/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java
directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerModification.java
directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleImpl.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandler.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandler.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaObjectClassHandler.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxHandler.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaEntityFactory.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaOperationControl.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SyntaxImpl.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java
directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java
directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java
directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
directory/apacheds/branches/apacheds-schema/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
directory/apacheds/branches/apacheds-schema/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java
directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java
directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java
directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java
directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java
directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java
directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java
directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java
directory/apacheds/branches/apacheds-schema/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java
directory/apacheds/branches/apacheds-schema/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java
directory/apacheds/branches/apacheds-schema/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolCodecFactory.java
directory/apacheds/branches/apacheds-schema/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java
directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapProducer.java
directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheSyntaxProducer.java
directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaMatchingRuleProducer.java
directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java
directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java
directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxProducer.java
directory/apacheds/branches/apacheds-schema/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/NisSyntaxProducer.java
directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/ConcreteNameComponentNormalizer.java
directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/DnComparator.java
directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/DnNormalizer.java
directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/NameAndOptionalUIDComparator.java
directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/NameAndOptionalUIDNormalizer.java
directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/SerializableComparator.java
directory/apacheds/branches/apacheds-schema/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
directory/apacheds/branches/apacheds-schema/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
directory/apacheds/branches/apacheds-schema/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java
Modified: directory/apacheds/branches/apacheds-schema/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java (original)
+++ directory/apacheds/branches/apacheds-schema/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java Sat Aug 22 16:15:42 2009
@@ -59,16 +59,9 @@
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.ComparatorRegistry;
import org.apache.directory.server.schema.registries.DefaultOidRegistry;
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.server.utils.AttributesFactory;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.csn.CsnFactory;
@@ -82,6 +75,13 @@
import org.apache.directory.shared.ldap.schema.SchemaUtils;
import org.apache.directory.shared.ldap.schema.LdapSyntax;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
+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;
import org.apache.directory.shared.ldap.util.DateUtils;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
@@ -606,18 +606,18 @@
getLog().info( "------------------------------------------------------------------------" );
getLog().info( "" );
- SyntaxRegistry syntaxRegistry = registries.getSyntaxRegistry();
+ LdapSyntaxRegistry syntaxRegistry = registries.getSyntaxRegistry();
- for ( LdapSyntax syntax : syntaxRegistry )
+ for ( LdapSyntax ldapSyntax : syntaxRegistry )
{
- getLog().info( "\t\t o [" + syntax.getSchema() + "] - " + getNameOrNumericoid( syntax ) );
- LdapDN dn = checkCreateSchema( syntax.getSchema() );
- Schema schema = registries.getLoadedSchemas().get( syntax.getSchema() );
+ getLog().info( "\t\t o [" + ldapSyntax.getSchemaName() + "] - " + getNameOrNumericoid( ldapSyntax ) );
+ LdapDN dn = checkCreateSchema( ldapSyntax.getSchemaName() );
+ Schema schema = registries.getLoadedSchemas().get( ldapSyntax.getSchemaName() );
dn.add( SchemaConstants.OU_AT + "=syntaxes" );
dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
checkCreateContainer( dn );
- ServerEntry entry = attributesFactory.getAttributes( syntax, schema, registries );
- dn.add( MetaSchemaConstants.M_OID_AT + "=" + syntax.getOid() );
+ ServerEntry entry = attributesFactory.getAttributes( ldapSyntax, schema, registries );
+ dn.add( MetaSchemaConstants.M_OID_AT + "=" + ldapSyntax.getOid() );
dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
entry.setDn( dn );
injectEntryInStore( store, entry );
Modified: directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java Sat Aug 22 16:15:42 2009
@@ -30,7 +30,6 @@
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.NotImplementedException;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
@@ -42,6 +41,7 @@
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.name.LdapDNSerializer;
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.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java Sat Aug 22 16:15:42 2009
@@ -35,7 +35,6 @@
import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchResult;
-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.EntryAttribute;
@@ -45,6 +44,7 @@
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.SchemaUtils;
+import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
import org.apache.directory.shared.ldap.util.EmptyEnumeration;
import org.apache.directory.shared.ldap.util.StringTools;
Modified: directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerModification.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerModification.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerModification.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerModification.java Sat Aug 22 16:15:42 2009
@@ -26,13 +26,13 @@
import javax.naming.NamingException;
//import javax.naming.directory.DirContext;
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
import org.apache.directory.server.schema.registries.Registries;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
import org.apache.directory.shared.ldap.entry.client.ClientModification;
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/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java Sat Aug 22 16:15:42 2009
@@ -40,7 +40,6 @@
import org.apache.directory.server.schema.bootstrap.InetorgpersonSchema;
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.entry.client.DefaultClientEntry;
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.apache.directory.shared.ldap.util.StringTools;
import static org.junit.Assert.assertEquals;
Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java Sat Aug 22 16:15:42 2009
@@ -24,13 +24,14 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.integ.CiRunner;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSchemaContext;
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java Sat Aug 22 16:15:42 2009
@@ -26,8 +26,6 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.integ.CiRunner;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSchemaContext;
-import org.apache.directory.server.schema.registries.ComparatorRegistry;
-import org.apache.directory.server.schema.registries.MatchingRuleRegistry;
import org.apache.directory.server.schema.registries.OidRegistry;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
@@ -37,6 +35,9 @@
import org.apache.directory.shared.ldap.schema.MatchingRule;
import org.apache.directory.shared.ldap.schema.Normalizer;
import org.apache.directory.shared.ldap.schema.LdapSyntax;
+import org.apache.directory.shared.ldap.schema.registries.ComparatorRegistry;
+import org.apache.directory.shared.ldap.schema.registries.MatchingRuleRegistry;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
@@ -126,7 +127,7 @@
dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
getSchemaContext( service ).createSubcontext( dn, attrs );
- assertTrue( getComparatorRegistry().hasComparator( OID ) );
+ assertTrue( getComparatorRegistry().contains( OID ) );
assertEquals( getComparatorRegistry().getSchemaName( OID ), "apachemeta" );
Class<?> clazz = getComparatorRegistry().lookup( OID ).getClass();
assertEquals( clazz, StringComparator.class );
@@ -157,7 +158,7 @@
dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
getSchemaContext( service ).createSubcontext( dn, attrs );
- assertTrue( getComparatorRegistry().hasComparator( OID ) );
+ assertTrue( getComparatorRegistry().contains( OID ) );
assertEquals( getComparatorRegistry().getSchemaName( OID ), "apachemeta" );
Class<?> clazz = getComparatorRegistry().lookup( OID ).getClass();
assertEquals( clazz.getName(), "DummyComparator" );
@@ -174,7 +175,7 @@
getSchemaContext( service ).destroySubcontext( dn );
assertFalse( "comparator should be removed from the registry after being deleted",
- getComparatorRegistry().hasComparator( OID ) );
+ getComparatorRegistry().contains( OID ) );
try
{
@@ -199,7 +200,7 @@
getSchemaContext( service ).rename( dn, newdn );
assertFalse( "old comparator OID should be removed from the registry after being renamed",
- getComparatorRegistry().hasComparator( OID ) );
+ getComparatorRegistry().contains( OID ) );
try
{
@@ -210,7 +211,7 @@
{
}
- assertTrue( getComparatorRegistry().hasComparator( NEW_OID ) );
+ assertTrue( getComparatorRegistry().contains( NEW_OID ) );
Class<?> clazz = getComparatorRegistry().lookup( NEW_OID ).getClass();
assertEquals( clazz, StringComparator.class );
}
@@ -230,7 +231,7 @@
getSchemaContext( service ).rename( dn, newdn );
assertTrue( "comparator OID should still be present",
- getComparatorRegistry().hasComparator( OID ) );
+ getComparatorRegistry().contains( OID ) );
assertEquals( "comparator schema should be set to apache not apachemeta",
getComparatorRegistry().getSchemaName( OID ), "apache" );
@@ -254,10 +255,10 @@
getSchemaContext( service ).rename( dn, newdn );
assertFalse( "old comparator OID should NOT be present",
- getComparatorRegistry().hasComparator( OID ) );
+ getComparatorRegistry().contains( OID ) );
assertTrue( "new comparator OID should be present",
- getComparatorRegistry().hasComparator( NEW_OID ) );
+ getComparatorRegistry().contains( NEW_OID ) );
assertEquals( "comparator with new oid should have schema set to apache NOT apachemeta",
getComparatorRegistry().getSchemaName( NEW_OID ), "apache" );
@@ -281,7 +282,7 @@
getSchemaContext( service ).modifyAttributes( dn, mods );
assertTrue( "comparator OID should still be present",
- getComparatorRegistry().hasComparator( OID ) );
+ getComparatorRegistry().contains( OID ) );
assertEquals( "comparator schema should be set to apachemeta",
getComparatorRegistry().getSchemaName( OID ), "apachemeta" );
@@ -304,7 +305,7 @@
getSchemaContext( service ).modifyAttributes( dn, DirContext.REPLACE_ATTRIBUTE, mods );
assertTrue( "comparator OID should still be present",
- getComparatorRegistry().hasComparator( OID ) );
+ getComparatorRegistry().contains( OID ) );
assertEquals( "comparator schema should be set to apachemeta",
getComparatorRegistry().getSchemaName( OID ), "apachemeta" );
@@ -338,7 +339,7 @@
}
assertTrue( "comparator should still be in the registry after delete failure",
- getComparatorRegistry().hasComparator( OID ) );
+ getComparatorRegistry().contains( OID ) );
getMatchingRuleRegistry().unregister( OID );
getOidRegistry().unregister( OID );
}
@@ -367,7 +368,7 @@
}
assertTrue( "comparator should still be in the registry after move failure",
- getComparatorRegistry().hasComparator( OID ) );
+ getComparatorRegistry().contains( OID ) );
getMatchingRuleRegistry().unregister( OID );
getOidRegistry().unregister( OID );
}
@@ -396,7 +397,7 @@
}
assertTrue( "comparator should still be in the registry after move failure",
- getComparatorRegistry().hasComparator( OID ) );
+ getComparatorRegistry().contains( OID ) );
getMatchingRuleRegistry().unregister( OID );
getOidRegistry().unregister( OID );
}
@@ -424,7 +425,7 @@
}
assertTrue( "comparator should still be in the registry after rename failure",
- getComparatorRegistry().hasComparator( OID ) );
+ getComparatorRegistry().contains( OID ) );
getMatchingRuleRegistry().unregister( OID );
getOidRegistry().unregister( OID );
}
@@ -457,7 +458,7 @@
}
assertTrue( "comparator should still be in the registry after move failure",
- getComparatorRegistry().hasComparator( OID ) );
+ getComparatorRegistry().contains( OID ) );
}
@@ -483,7 +484,7 @@
}
assertTrue( "comparator should still be in the registry after move failure",
- getComparatorRegistry().hasComparator( OID ) );
+ getComparatorRegistry().contains( OID ) );
}
@@ -505,7 +506,7 @@
getSchemaContext( service ).createSubcontext( dn, attrs );
assertFalse( "adding new comparator to disabled schema should not register it into the registries",
- getComparatorRegistry().hasComparator( OID ) );
+ getComparatorRegistry().contains( OID ) );
}
@@ -524,7 +525,7 @@
getSchemaContext( service ).rename( dn, newdn );
assertFalse( "comparator OID should no longer be present",
- getComparatorRegistry().hasComparator( OID ) );
+ getComparatorRegistry().contains( OID ) );
}
@@ -538,7 +539,7 @@
dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
assertFalse( "comparator OID should NOT be present when added to disabled nis schema",
- getComparatorRegistry().hasComparator( OID ) );
+ getComparatorRegistry().contains( OID ) );
LdapDN newdn = getComparatorContainer( "apachemeta" );
newdn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -546,7 +547,7 @@
getSchemaContext( service ).rename( dn, newdn );
assertTrue( "comparator OID should be present when moved to enabled schema",
- getComparatorRegistry().hasComparator( OID ) );
+ getComparatorRegistry().contains( OID ) );
assertEquals( "comparator should be in apachemeta schema after move",
getComparatorRegistry().getSchemaName( OID ), "apachemeta" );
Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java Sat Aug 22 16:15:42 2009
@@ -24,12 +24,13 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.integ.CiRunner;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSchemaContext;
-import org.apache.directory.server.schema.registries.MatchingRuleRegistry;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.MatchingRule;
+import org.apache.directory.shared.ldap.schema.registries.MatchingRuleRegistry;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java Sat Aug 22 16:15:42 2009
@@ -24,8 +24,6 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.integ.CiRunner;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSchemaContext;
-import org.apache.directory.server.schema.registries.MatchingRuleRegistry;
-import org.apache.directory.server.schema.registries.NormalizerRegistry;
import org.apache.directory.server.schema.registries.OidRegistry;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
@@ -37,6 +35,8 @@
import org.apache.directory.shared.ldap.schema.LdapSyntax;
import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimNormalizer;
import org.apache.directory.shared.ldap.schema.normalizers.NoOpNormalizer;
+import org.apache.directory.shared.ldap.schema.registries.MatchingRuleRegistry;
+import org.apache.directory.shared.ldap.schema.registries.NormalizerRegistry;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -127,7 +127,7 @@
dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
getSchemaContext( service ).createSubcontext( dn, attrs );
- assertTrue( getNormalizerRegistry().hasNormalizer( OID ) );
+ assertTrue( getNormalizerRegistry().contains( OID ) );
assertEquals( getNormalizerRegistry().getSchemaName( OID ), "apachemeta" );
Class<?> clazz = getNormalizerRegistry().lookup( OID ).getClass();
assertEquals( clazz, NoOpNormalizer.class );
@@ -158,7 +158,7 @@
dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
getSchemaContext( service ).createSubcontext( dn, attrs );
- assertTrue( getNormalizerRegistry().hasNormalizer( OID ) );
+ assertTrue( getNormalizerRegistry().contains( OID ) );
assertEquals( getNormalizerRegistry().getSchemaName( OID ), "apachemeta" );
Class<?> clazz = getNormalizerRegistry().lookup( OID ).getClass();
assertEquals( clazz.getName(), "DummyNormalizer" );
@@ -175,7 +175,7 @@
getSchemaContext( service ).destroySubcontext( dn );
assertFalse( "normalizer should be removed from the registry after being deleted",
- getNormalizerRegistry().hasNormalizer( OID ) );
+ getNormalizerRegistry().contains( OID ) );
//noinspection EmptyCatchBlock
try
@@ -201,7 +201,7 @@
getSchemaContext( service ).rename( dn, newdn );
assertFalse( "old normalizer OID should be removed from the registry after being renamed",
- getNormalizerRegistry().hasNormalizer( OID ) );
+ getNormalizerRegistry().contains( OID ) );
//noinspection EmptyCatchBlock
try
@@ -213,7 +213,7 @@
{
}
- assertTrue( getNormalizerRegistry().hasNormalizer( NEW_OID ) );
+ assertTrue( getNormalizerRegistry().contains( NEW_OID ) );
Class<?> clazz = getNormalizerRegistry().lookup( NEW_OID ).getClass();
assertEquals( clazz, NoOpNormalizer.class );
}
@@ -233,7 +233,7 @@
getSchemaContext( service ).rename( dn, newdn );
assertTrue( "normalizer OID should still be present",
- getNormalizerRegistry().hasNormalizer( OID ) );
+ getNormalizerRegistry().contains( OID ) );
assertEquals( "normalizer schema should be set to apache not apachemeta",
getNormalizerRegistry().getSchemaName( OID ), "apache" );
@@ -257,10 +257,10 @@
getSchemaContext( service ).rename( dn, newdn );
assertFalse( "old normalizer OID should NOT be present",
- getNormalizerRegistry().hasNormalizer( OID ) );
+ getNormalizerRegistry().contains( OID ) );
assertTrue( "new normalizer OID should be present",
- getNormalizerRegistry().hasNormalizer( NEW_OID ) );
+ getNormalizerRegistry().contains( NEW_OID ) );
assertEquals( "normalizer with new oid should have schema set to apache NOT apachemeta",
getNormalizerRegistry().getSchemaName( NEW_OID ), "apache" );
@@ -284,7 +284,7 @@
getSchemaContext( service ).modifyAttributes( dn, mods );
assertTrue( "normalizer OID should still be present",
- getNormalizerRegistry().hasNormalizer( OID ) );
+ getNormalizerRegistry().contains( OID ) );
assertEquals( "normalizer schema should be set to apachemeta",
getNormalizerRegistry().getSchemaName( OID ), "apachemeta" );
@@ -307,7 +307,7 @@
getSchemaContext( service ).modifyAttributes( dn, DirContext.REPLACE_ATTRIBUTE, mods );
assertTrue( "normalizer OID should still be present",
- getNormalizerRegistry().hasNormalizer( OID ) );
+ getNormalizerRegistry().contains( OID ) );
assertEquals( "normalizer schema should be set to apachemeta",
getNormalizerRegistry().getSchemaName( OID ), "apachemeta" );
@@ -341,7 +341,7 @@
}
assertTrue( "normalizer should still be in the registry after delete failure",
- getNormalizerRegistry().hasNormalizer( OID ) );
+ getNormalizerRegistry().contains( OID ) );
getMatchingRuleRegistry().unregister( OID );
getOidRegistry().unregister( OID );
}
@@ -370,7 +370,7 @@
}
assertTrue( "normalizer should still be in the registry after move failure",
- getNormalizerRegistry().hasNormalizer( OID ) );
+ getNormalizerRegistry().contains( OID ) );
getMatchingRuleRegistry().unregister( OID );
getOidRegistry().unregister( OID );
}
@@ -399,7 +399,7 @@
}
assertTrue( "normalizer should still be in the registry after move failure",
- getNormalizerRegistry().hasNormalizer( OID ) );
+ getNormalizerRegistry().contains( OID ) );
getMatchingRuleRegistry().unregister( OID );
getOidRegistry().unregister( OID );
}
@@ -427,7 +427,7 @@
}
assertTrue( "normalizer should still be in the registry after rename failure",
- getNormalizerRegistry().hasNormalizer( OID ) );
+ getNormalizerRegistry().contains( OID ) );
getMatchingRuleRegistry().unregister( OID );
getOidRegistry().unregister( OID );
}
@@ -460,7 +460,7 @@
}
assertTrue( "normalizer should still be in the registry after move failure",
- getNormalizerRegistry().hasNormalizer( OID ) );
+ getNormalizerRegistry().contains( OID ) );
}
@@ -486,7 +486,7 @@
}
assertTrue( "normalizer should still be in the registry after move failure",
- getNormalizerRegistry().hasNormalizer( OID ) );
+ getNormalizerRegistry().contains( OID ) );
}
@@ -508,7 +508,7 @@
getSchemaContext( service ).createSubcontext( dn, attrs );
assertFalse( "adding new normalizer to disabled schema should not register it into the registries",
- getNormalizerRegistry().hasNormalizer( OID ) );
+ getNormalizerRegistry().contains( OID ) );
}
@@ -527,7 +527,7 @@
getSchemaContext( service ).rename( dn, newdn );
assertFalse( "normalizer OID should no longer be present",
- getNormalizerRegistry().hasNormalizer( OID ) );
+ getNormalizerRegistry().contains( OID ) );
}
@@ -541,7 +541,7 @@
dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
assertFalse( "normalizer OID should NOT be present when added to disabled nis schema",
- getNormalizerRegistry().hasNormalizer( OID ) );
+ getNormalizerRegistry().contains( OID ) );
LdapDN newdn = getNormalizerContainer( "apachemeta" );
newdn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -549,7 +549,7 @@
getSchemaContext( service ).rename( dn, newdn );
assertTrue( "normalizer OID should be present when moved to enabled schema",
- getNormalizerRegistry().hasNormalizer( OID ) );
+ getNormalizerRegistry().contains( OID ) );
assertEquals( "normalizer should be in apachemeta schema after move",
getNormalizerRegistry().getSchemaName( OID ), "apachemeta" );
Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java Sat Aug 22 16:15:42 2009
@@ -23,12 +23,12 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.integ.CiRunner;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSchemaContext;
-import org.apache.directory.server.schema.registries.ObjectClassRegistry;
import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.ObjectClass;
+import org.apache.directory.shared.ldap.schema.registries.ObjectClassRegistry;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java Sat Aug 22 16:15:42 2009
@@ -26,10 +26,10 @@
import org.apache.directory.server.core.integ.IntegrationUtils;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSchemaContext;
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java Sat Aug 22 16:15:42 2009
@@ -25,8 +25,6 @@
import org.apache.directory.server.core.integ.CiRunner;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSchemaContext;
import org.apache.directory.server.schema.registries.OidRegistry;
-import org.apache.directory.server.schema.registries.SyntaxCheckerRegistry;
-import org.apache.directory.server.schema.registries.SyntaxRegistry;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
@@ -34,6 +32,8 @@
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.LdapSyntax;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
+import org.apache.directory.shared.ldap.schema.registries.LdapSyntaxRegistry;
+import org.apache.directory.shared.ldap.schema.registries.SyntaxCheckerRegistry;
import org.apache.directory.shared.ldap.schema.syntaxChecker.AcceptAllSyntaxChecker;
import static org.junit.Assert.assertEquals;
@@ -78,9 +78,9 @@
}
- private static SyntaxRegistry getSyntaxRegistry()
+ private static LdapSyntaxRegistry getLdapSyntaxRegistry()
{
- return service.getRegistries().getSyntaxRegistry();
+ return service.getRegistries().getLdapSyntaxRegistry();
}
@@ -124,7 +124,7 @@
dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
getSchemaContext( service ).createSubcontext( dn, attrs );
- assertTrue( getSyntaxCheckerRegistry().hasSyntaxChecker( OID ) );
+ assertTrue( getSyntaxCheckerRegistry().contains( OID ) );
assertEquals( getSyntaxCheckerRegistry().getSchemaName( OID ), "apachemeta" );
Class<?> clazz = getSyntaxCheckerRegistry().lookup( OID ).getClass();
assertEquals( clazz, AcceptAllSyntaxChecker.class );
@@ -155,7 +155,7 @@
dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
getSchemaContext( service ).createSubcontext( dn, attrs );
- assertTrue( getSyntaxCheckerRegistry().hasSyntaxChecker( OID ) );
+ assertTrue( getSyntaxCheckerRegistry().contains( OID ) );
assertEquals( getSyntaxCheckerRegistry().getSchemaName( OID ), "apachemeta" );
Class<?> clazz = getSyntaxCheckerRegistry().lookup( OID ).getClass();
assertEquals( clazz.getName(), "DummySyntaxChecker" );
@@ -172,7 +172,7 @@
getSchemaContext( service ).destroySubcontext( dn );
assertFalse( "syntaxChecker should be removed from the registry after being deleted",
- getSyntaxCheckerRegistry().hasSyntaxChecker( OID ) );
+ getSyntaxCheckerRegistry().contains( OID ) );
//noinspection EmptyCatchBlock
try
@@ -198,7 +198,7 @@
getSchemaContext( service ).rename( dn, newdn );
assertFalse( "old syntaxChecker OID should be removed from the registry after being renamed",
- getSyntaxCheckerRegistry().hasSyntaxChecker( OID ) );
+ getSyntaxCheckerRegistry().contains( OID ) );
//noinspection EmptyCatchBlock
try
@@ -210,7 +210,7 @@
{
}
- assertTrue( getSyntaxCheckerRegistry().hasSyntaxChecker( NEW_OID ) );
+ assertTrue( getSyntaxCheckerRegistry().contains( NEW_OID ) );
Class<?> clazz = getSyntaxCheckerRegistry().lookup( NEW_OID ).getClass();
assertEquals( clazz, AcceptAllSyntaxChecker.class );
}
@@ -230,7 +230,7 @@
getSchemaContext( service ).rename( dn, newdn );
assertTrue( "syntaxChecker OID should still be present",
- getSyntaxCheckerRegistry().hasSyntaxChecker( OID ) );
+ getSyntaxCheckerRegistry().contains( OID ) );
assertEquals( "syntaxChecker schema should be set to apache not apachemeta",
getSyntaxCheckerRegistry().getSchemaName( OID ), "apache" );
@@ -254,10 +254,10 @@
getSchemaContext( service ).rename( dn, newdn );
assertFalse( "old syntaxChecker OID should NOT be present",
- getSyntaxCheckerRegistry().hasSyntaxChecker( OID ) );
+ getSyntaxCheckerRegistry().contains( OID ) );
assertTrue( "new syntaxChecker OID should be present",
- getSyntaxCheckerRegistry().hasSyntaxChecker( NEW_OID ) );
+ getSyntaxCheckerRegistry().contains( NEW_OID ) );
assertEquals( "syntaxChecker with new oid should have schema set to apache NOT apachemeta",
getSyntaxCheckerRegistry().getSchemaName( NEW_OID ), "apache" );
@@ -281,7 +281,7 @@
getSchemaContext( service ).modifyAttributes( dn, mods );
assertTrue( "syntaxChecker OID should still be present",
- getSyntaxCheckerRegistry().hasSyntaxChecker( OID ) );
+ getSyntaxCheckerRegistry().contains( OID ) );
assertEquals( "syntaxChecker schema should be set to apachemeta",
getSyntaxCheckerRegistry().getSchemaName( OID ), "apachemeta" );
@@ -304,7 +304,7 @@
getSchemaContext( service ).modifyAttributes( dn, DirContext.REPLACE_ATTRIBUTE, mods );
assertTrue( "syntaxChecker OID should still be present",
- getSyntaxCheckerRegistry().hasSyntaxChecker( OID ) );
+ getSyntaxCheckerRegistry().contains( OID ) );
assertEquals( "syntaxChecker schema should be set to apachemeta",
getSyntaxCheckerRegistry().getSchemaName( OID ), "apachemeta" );
@@ -325,7 +325,7 @@
LdapDN dn = getSyntaxCheckerContainer( "apachemeta" );
dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
testAddSyntaxChecker();
- getSyntaxRegistry().register( new DummySyntax() );
+ getLdapSyntaxRegistry().register( new DummySyntax() );
try
{
@@ -338,8 +338,8 @@
}
assertTrue( "syntaxChecker should still be in the registry after delete failure",
- getSyntaxCheckerRegistry().hasSyntaxChecker( OID ) );
- getSyntaxRegistry().unregister( OID );
+ getSyntaxCheckerRegistry().contains( OID ) );
+ getLdapSyntaxRegistry().unregister( OID );
getOidRegistry().unregister( OID );
}
@@ -348,7 +348,7 @@
public void testMoveSyntaxCheckerWhenInUse() throws Exception
{
testAddSyntaxChecker();
- getSyntaxRegistry().register( new DummySyntax() );
+ getLdapSyntaxRegistry().register( new DummySyntax() );
LdapDN dn = getSyntaxCheckerContainer( "apachemeta" );
dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -367,8 +367,8 @@
}
assertTrue( "syntaxChecker should still be in the registry after move failure",
- getSyntaxCheckerRegistry().hasSyntaxChecker( OID ) );
- getSyntaxRegistry().unregister( OID );
+ getSyntaxCheckerRegistry().contains( OID ) );
+ getLdapSyntaxRegistry().unregister( OID );
getOidRegistry().unregister( OID );
}
@@ -377,7 +377,7 @@
public void testMoveSyntaxCheckerAndChangeRdnWhenInUse() throws Exception
{
testAddSyntaxChecker();
- getSyntaxRegistry().register( new DummySyntax() );
+ getLdapSyntaxRegistry().register( new DummySyntax() );
LdapDN dn = getSyntaxCheckerContainer( "apachemeta" );
dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -396,8 +396,8 @@
}
assertTrue( "syntaxChecker should still be in the registry after move failure",
- getSyntaxCheckerRegistry().hasSyntaxChecker( OID ) );
- getSyntaxRegistry().unregister( OID );
+ getSyntaxCheckerRegistry().contains( OID ) );
+ getLdapSyntaxRegistry().unregister( OID );
getOidRegistry().unregister( OID );
}
@@ -408,7 +408,7 @@
LdapDN dn = getSyntaxCheckerContainer( "apachemeta" );
dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
testAddSyntaxChecker();
- getSyntaxRegistry().register( new DummySyntax() );
+ getLdapSyntaxRegistry().register( new DummySyntax() );
LdapDN newdn = getSyntaxCheckerContainer( "apachemeta" );
newdn.add( MetaSchemaConstants.M_OID_AT + "=" + NEW_OID );
@@ -424,8 +424,8 @@
}
assertTrue( "syntaxChecker should still be in the registry after rename failure",
- getSyntaxCheckerRegistry().hasSyntaxChecker( OID ) );
- getSyntaxRegistry().unregister( OID );
+ getSyntaxCheckerRegistry().contains( OID ) );
+ getLdapSyntaxRegistry().unregister( OID );
getOidRegistry().unregister( OID );
}
@@ -457,7 +457,7 @@
}
assertTrue( "syntaxChecker should still be in the registry after move failure",
- getSyntaxCheckerRegistry().hasSyntaxChecker( OID ) );
+ getSyntaxCheckerRegistry().contains( OID ) );
}
@@ -483,7 +483,7 @@
}
assertTrue( "syntaxChecker should still be in the registry after move failure",
- getSyntaxCheckerRegistry().hasSyntaxChecker( OID ) );
+ getSyntaxCheckerRegistry().contains( OID ) );
}
@@ -505,7 +505,7 @@
getSchemaContext( service ).createSubcontext( dn, attrs );
assertFalse( "adding new syntaxChecker to disabled schema should not register it into the registries",
- getSyntaxCheckerRegistry().hasSyntaxChecker( OID ) );
+ getSyntaxCheckerRegistry().contains( OID ) );
}
@@ -524,7 +524,7 @@
getSchemaContext( service ).rename( dn, newdn );
assertFalse( "syntaxChecker OID should no longer be present",
- getSyntaxCheckerRegistry().hasSyntaxChecker( OID ) );
+ getSyntaxCheckerRegistry().contains( OID ) );
}
@@ -538,7 +538,7 @@
dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
assertFalse( "syntaxChecker OID should NOT be present when added to disabled nis schema",
- getSyntaxCheckerRegistry().hasSyntaxChecker( OID ) );
+ getSyntaxCheckerRegistry().contains( OID ) );
LdapDN newdn = getSyntaxCheckerContainer( "apachemeta" );
newdn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -546,7 +546,7 @@
getSchemaContext( service ).rename( dn, newdn );
assertTrue( "syntaxChecker OID should be present when moved to enabled schema",
- getSyntaxCheckerRegistry().hasSyntaxChecker( OID ) );
+ getSyntaxCheckerRegistry().contains( OID ) );
assertEquals( "syntaxChecker should be in apachemeta schema after move",
getSyntaxCheckerRegistry().getSchemaName( OID ), "apachemeta" );
@@ -555,20 +555,13 @@
public static class BogusSyntaxChecker extends SyntaxChecker
{
+ private static final long serialVersionUID = 1L;
+
public BogusSyntaxChecker()
{
super(OID);
}
- public void assertSyntax( Object value ) throws NamingException
- {
- }
-
- public String getSyntaxOid()
- {
- return OID;
- }
-
public boolean isValidSyntax( Object value )
{
return false;
@@ -576,59 +569,17 @@
}
- class DummySyntax implements LdapSyntax
+ class DummySyntax extends LdapSyntax
{
private static final long serialVersionUID = 1L;
-
- public String getDescription()
- {
- return null;
- }
-
- public String getName()
- {
- return "dummy";
- }
-
- public String[] getNames()
- {
- return new String[] { "dummy" };
- }
-
- public String getOid()
- {
- return OID;
- }
-
- public boolean isObsolete()
- {
- return false;
- }
-
- public SyntaxChecker getSyntaxChecker() throws NamingException
- {
- return null;
- }
-
- public boolean isHumanReadable()
- {
- return false;
- }
-
- public String getSchema()
- {
- return null;
- }
-
- public void setSchema( String schemaName )
- {
- }
-
- public String[] getNamesRef()
+ public DummySyntax()
{
- // TODO Auto-generated method stub
- return null;
+ super( OID );
+ addName( "dummy" );
+ isObsolete = false;
+ isHumanReadable = false;
+ syntaxChecker = null;
}
}
}
Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java Sat Aug 22 16:15:42 2009
@@ -25,14 +25,14 @@
import org.apache.directory.server.core.integ.CiRunner;
import static org.apache.directory.server.core.integ.IntegrationUtils.getRootContext;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSchemaContext;
-import org.apache.directory.server.schema.registries.MatchingRuleRegistry;
-import org.apache.directory.server.schema.registries.SyntaxRegistry;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.LdapSyntax;
+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.syntaxChecker.AcceptAllSyntaxChecker;
import static org.junit.Assert.assertEquals;
@@ -82,9 +82,9 @@
public static DirectoryService service;
- private static SyntaxRegistry getSyntaxRegistry()
+ private static LdapSyntaxRegistry getLdapSyntaxRegistry()
{
- return service.getRegistries().getSyntaxRegistry();
+ return service.getRegistries().getLdapSyntaxRegistry();
}
@@ -128,8 +128,8 @@
createDummySyntaxChecker( OID, "apachemeta" );
getSchemaContext( service ).createSubcontext( dn, attrs );
- assertTrue( getSyntaxRegistry().hasSyntax( OID ) );
- assertEquals( getSyntaxRegistry().getSchemaName( OID ), "apachemeta" );
+ assertTrue( getLdapSyntaxRegistry().contains( OID ) );
+ assertEquals( getLdapSyntaxRegistry().getSchemaName( OID ), "apachemeta" );
}
@@ -143,12 +143,12 @@
getSchemaContext( service ).destroySubcontext( dn );
assertFalse( "syntax should be removed from the registry after being deleted",
- getSyntaxRegistry().hasSyntax( OID ) );
+ getLdapSyntaxRegistry().contains( OID ) );
//noinspection EmptyCatchBlock
try
{
- getSyntaxRegistry().lookup( OID );
+ getLdapSyntaxRegistry().lookup( OID );
fail( "syntax lookup should fail after deleting it" );
}
catch( NamingException e )
@@ -169,19 +169,19 @@
getSchemaContext( service ).rename( dn, newdn );
assertFalse( "old syntax OID should be removed from the registry after being renamed",
- getSyntaxRegistry().hasSyntax( OID ) );
+ getLdapSyntaxRegistry().contains( OID ) );
//noinspection EmptyCatchBlock
try
{
- getSyntaxRegistry().lookup( OID );
+ getLdapSyntaxRegistry().lookup( OID );
fail( "syntax lookup should fail after deleting the syntax" );
}
catch( NamingException e )
{
}
- assertTrue( getSyntaxRegistry().hasSyntax( NEW_OID ) );
+ assertTrue( getLdapSyntaxRegistry().contains( NEW_OID ) );
}
@@ -199,10 +199,10 @@
getSchemaContext( service ).rename( dn, newdn );
assertTrue( "syntax OID should still be present",
- getSyntaxRegistry().hasSyntax( OID ) );
+ getLdapSyntaxRegistry().contains( OID ) );
assertEquals( "syntax schema should be set to apache not apachemeta",
- getSyntaxRegistry().getSchemaName( OID ), "apache" );
+ getLdapSyntaxRegistry().getSchemaName( OID ), "apache" );
}
@@ -220,13 +220,13 @@
getSchemaContext( service ).rename( dn, newdn );
assertFalse( "old syntax OID should NOT be present",
- getSyntaxRegistry().hasSyntax( OID ) );
+ getLdapSyntaxRegistry().contains( OID ) );
assertTrue( "new syntax OID should be present",
- getSyntaxRegistry().hasSyntax( NEW_OID ) );
+ getLdapSyntaxRegistry().contains( NEW_OID ) );
assertEquals( "syntax with new oid should have schema set to apache NOT apachemeta",
- getSyntaxRegistry().getSchemaName( NEW_OID ), "apache" );
+ getLdapSyntaxRegistry().getSchemaName( NEW_OID ), "apache" );
}
@@ -235,7 +235,7 @@
{
testAddSyntax();
- LdapSyntax syntax = getSyntaxRegistry().lookup( OID );
+ LdapSyntax syntax = getLdapSyntaxRegistry().lookup( OID );
assertEquals( syntax.getDescription(), DESCRIPTION0 );
LdapDN dn = getSyntaxContainer( "apachemeta" );
@@ -247,12 +247,12 @@
getSchemaContext( service ).modifyAttributes( dn, mods );
assertTrue( "syntax OID should still be present",
- getSyntaxRegistry().hasSyntax( OID ) );
+ getLdapSyntaxRegistry().contains( OID ) );
assertEquals( "syntax schema should be set to apachemeta",
- getSyntaxRegistry().getSchemaName( OID ), "apachemeta" );
+ getLdapSyntaxRegistry().getSchemaName( OID ), "apachemeta" );
- syntax = getSyntaxRegistry().lookup( OID );
+ syntax = getLdapSyntaxRegistry().lookup( OID );
assertEquals( syntax.getDescription(), DESCRIPTION1 );
}
@@ -262,7 +262,7 @@
{
testAddSyntax();
- LdapSyntax syntax = getSyntaxRegistry().lookup( OID );
+ LdapSyntax syntax = getLdapSyntaxRegistry().lookup( OID );
assertEquals( syntax.getDescription(), DESCRIPTION0 );
LdapDN dn = getSyntaxContainer( "apachemeta" );
@@ -273,12 +273,12 @@
getSchemaContext( service ).modifyAttributes( dn, DirContext.REPLACE_ATTRIBUTE, mods );
assertTrue( "syntax OID should still be present",
- getSyntaxRegistry().hasSyntax( OID ) );
+ getLdapSyntaxRegistry().contains( OID ) );
assertEquals( "syntax schema should be set to apachemeta",
- getSyntaxRegistry().getSchemaName( OID ), "apachemeta" );
+ getLdapSyntaxRegistry().getSchemaName( OID ), "apachemeta" );
- syntax = getSyntaxRegistry().lookup( OID );
+ syntax = getLdapSyntaxRegistry().lookup( OID );
assertEquals( syntax.getDescription(), DESCRIPTION1 );
}
@@ -307,7 +307,7 @@
}
assertTrue( "syntax should still be in the registry after delete failure",
- getSyntaxRegistry().hasSyntax( OID ) );
+ getLdapSyntaxRegistry().contains( OID ) );
}
@@ -334,7 +334,7 @@
}
assertTrue( "syntax should still be in the registry after move failure",
- getSyntaxRegistry().hasSyntax( OID ) );
+ getLdapSyntaxRegistry().contains( OID ) );
}
@@ -361,7 +361,7 @@
}
assertTrue( "syntax should still be in the registry after move failure",
- getSyntaxRegistry().hasSyntax( OID ) );
+ getLdapSyntaxRegistry().contains( OID ) );
}
@@ -420,7 +420,7 @@
}
assertTrue( "syntax should still be in the registry after rename failure",
- getSyntaxRegistry().hasSyntax( OID ) );
+ getLdapSyntaxRegistry().contains( OID ) );
}
@@ -451,7 +451,7 @@
}
assertTrue( "syntax should still be in the registry after move failure",
- getSyntaxRegistry().hasSyntax( OID ) );
+ getLdapSyntaxRegistry().contains( OID ) );
}
@@ -477,7 +477,7 @@
}
assertTrue( "syntax should still be in the registry after move failure",
- getSyntaxRegistry().hasSyntax( OID ) );
+ getLdapSyntaxRegistry().contains( OID ) );
}
@@ -499,7 +499,7 @@
getSchemaContext( service ).createSubcontext( dn, attrs );
assertFalse( "adding new syntax to disabled schema should not register it into the registries",
- getSyntaxRegistry().hasSyntax( OID ) );
+ getLdapSyntaxRegistry().contains( OID ) );
}
@@ -518,7 +518,7 @@
getSchemaContext( service ).rename( dn, newdn );
assertFalse( "syntax OID should no longer be present",
- getSyntaxRegistry().hasSyntax( OID ) );
+ getLdapSyntaxRegistry().contains( OID ) );
}
@@ -532,7 +532,7 @@
dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
assertFalse( "syntax OID should NOT be present when added to disabled nis schema",
- getSyntaxRegistry().hasSyntax( OID ) );
+ getLdapSyntaxRegistry().contains( OID ) );
LdapDN newdn = getSyntaxContainer( "apachemeta" );
newdn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -540,10 +540,10 @@
getSchemaContext( service ).rename( dn, newdn );
assertTrue( "syntax OID should be present when moved to enabled schema",
- getSyntaxRegistry().hasSyntax( OID ) );
+ getLdapSyntaxRegistry().contains( OID ) );
assertEquals( "syntax should be in apachemeta schema after move",
- getSyntaxRegistry().getSchemaName( OID ), "apachemeta" );
+ getLdapSyntaxRegistry().getSchemaName( OID ), "apachemeta" );
}
Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java Sat Aug 22 16:15:42 2009
@@ -37,7 +37,7 @@
import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimNormalizer;
import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescription;
import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.ComparatorDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescriptionSchemaParser;
import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescription;
import org.apache.directory.shared.ldap.schema.parsers.LdapSyntaxDescription;
import org.apache.directory.shared.ldap.schema.parsers.LdapSyntaxDescriptionSchemaParser;
@@ -103,8 +103,8 @@
new SyntaxCheckerDescriptionSchemaParser();
private static final AttributeTypeDescriptionSchemaParser ATTRIBUTE_TYPE_DESCRIPTION_SCHEMA_PARSER =
new AttributeTypeDescriptionSchemaParser();
- private ComparatorDescriptionSchemaParser comparatorDescriptionSchemaParser =
- new ComparatorDescriptionSchemaParser();
+ private LdapComparatorDescriptionSchemaParser comparatorDescriptionSchemaParser =
+ new LdapComparatorDescriptionSchemaParser();
private NormalizerDescriptionSchemaParser normalizerDescriptionSchemaParser =
new NormalizerDescriptionSchemaParser();
private LdapSyntaxDescriptionSchemaParser ldapSyntaxDescriptionSchemaParser =
@@ -294,11 +294,11 @@
if ( isPresent )
{
- assertTrue( service.getRegistries().getSyntaxCheckerRegistry().hasSyntaxChecker( oid ) );
+ assertTrue( service.getRegistries().getSyntaxCheckerRegistry().contains( oid ) );
}
else
{
- assertFalse( service.getRegistries().getSyntaxCheckerRegistry().hasSyntaxChecker( oid ) );
+ assertFalse( service.getRegistries().getSyntaxCheckerRegistry().contains( oid ) );
}
}
@@ -461,11 +461,11 @@
if ( isPresent )
{
- assertTrue( service.getRegistries().getComparatorRegistry().hasComparator( oid ) );
+ assertTrue( service.getRegistries().getComparatorRegistry().contains( oid ) );
}
else
{
- assertFalse( service.getRegistries().getComparatorRegistry().hasComparator( oid ) );
+ assertFalse( service.getRegistries().getComparatorRegistry().contains( oid ) );
}
}
@@ -614,11 +614,11 @@
if ( isPresent )
{
- assertTrue( service.getRegistries().getNormalizerRegistry().hasNormalizer( oid ) );
+ assertTrue( service.getRegistries().getNormalizerRegistry().contains( oid ) );
}
else
{
- assertFalse( service.getRegistries().getNormalizerRegistry().hasNormalizer( oid ) );
+ assertFalse( service.getRegistries().getNormalizerRegistry().contains( oid ) );
}
}
@@ -767,11 +767,11 @@
if ( isPresent )
{
- assertTrue( service.getRegistries().getSyntaxRegistry().hasSyntax( oid ) );
+ assertTrue( service.getRegistries().getLdapSyntaxRegistry().contains( oid ) );
}
else
{
- assertFalse( service.getRegistries().getSyntaxRegistry().hasSyntax( oid ) );
+ assertFalse( service.getRegistries().getLdapSyntaxRegistry().contains( oid ) );
}
}
Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Sat Aug 22 16:15:42 2009
@@ -62,7 +62,6 @@
import org.apache.directory.server.core.partition.ByPassConstants;
import org.apache.directory.server.core.subtree.SubentryInterceptor;
import org.apache.directory.server.schema.ConcreteNameComponentNormalizer;
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
import org.apache.directory.server.schema.registries.OidRegistry;
import org.apache.directory.server.schema.registries.Registries;
import org.apache.directory.shared.ldap.aci.ACIItem;
@@ -79,6 +78,7 @@
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
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/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java Sat Aug 22 16:15:42 2009
@@ -49,7 +49,6 @@
import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.interceptor.context.SearchingOperationContext;
import org.apache.directory.server.core.partition.PartitionNexus;
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -58,6 +57,7 @@
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
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/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java Sat Aug 22 16:15:42 2009
@@ -36,7 +36,6 @@
import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.partition.PartitionNexus;
-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.EntryAttribute;
@@ -51,6 +50,7 @@
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
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/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java Sat Aug 22 16:15:42 2009
@@ -27,7 +27,6 @@
import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.schema.ConcreteNameComponentNormalizer;
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
import org.apache.directory.server.schema.registries.OidRegistry;
import org.apache.directory.shared.ldap.aci.ACIItem;
import org.apache.directory.shared.ldap.aci.ACIItemParser;
@@ -46,6 +45,7 @@
import org.apache.directory.shared.ldap.name.NameComponentNormalizer;
import org.apache.directory.shared.ldap.schema.AttributeType;
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/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java Sat Aug 22 16:15:42 2009
@@ -43,7 +43,6 @@
import org.apache.directory.server.core.subtree.SubentryInterceptor;
import org.apache.directory.server.core.subtree.SubtreeEvaluator;
import org.apache.directory.server.core.trigger.TriggerInterceptor;
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
import org.apache.directory.server.schema.registries.OidRegistry;
import org.apache.directory.server.schema.registries.Registries;
import org.apache.directory.shared.ldap.aci.ACITuple;
@@ -52,6 +51,7 @@
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
/**
Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java Sat Aug 22 16:15:42 2009
@@ -30,7 +30,6 @@
import org.apache.directory.server.core.event.Evaluator;
import org.apache.directory.server.core.interceptor.context.OperationContext;
import org.apache.directory.server.core.subtree.RefinementEvaluator;
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
import org.apache.directory.server.schema.registries.OidRegistry;
import org.apache.directory.server.schema.registries.Registries;
import org.apache.directory.shared.ldap.aci.ACITuple;
@@ -44,6 +43,7 @@
import org.apache.directory.shared.ldap.entry.Value;
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.apache.directory.shared.ldap.util.AttributeUtils;
Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java?rev=806866&r1=806865&r2=806866&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java Sat Aug 22 16:15:42 2009
@@ -37,12 +37,12 @@
import org.apache.directory.server.core.interceptor.context.SearchingOperationContext;
import org.apache.directory.server.core.partition.ByPassConstants;
import org.apache.directory.server.core.partition.PartitionNexus;
-import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
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 java.util.HashSet;
import java.util.Set;