Author: akarasulu Date: Fri Jan 7 08:03:24 2005 New Revision: 124525 URL: http://svn.apache.org/viewcvs?view=rev&rev=124525 Log: cleaning up imports after moves Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/AbstractContextPartition.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/ApplicationPartition.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/BackingStore.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/ContextPartition.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/EveBackendSubsystem.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/PartitionNexus.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/RootNexus.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/SystemPartition.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/auth/LdapPrincipal.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Database.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DbSearchResult.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultOptimizer.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultSearchEngine.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DisjunctionEnumeration.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DupsEnumeration.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Enumerator.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEnumerator.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEvaluator.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Index.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexAssertionEnumeration.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexComparator.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexEnumeration.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexRecord.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/KeyOnlyComparator.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/LeafEvaluator.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/MasterTable.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/NoDupsEnumeration.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ResultFilteringEnumeration.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ScopeEnumerator.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ScopeEvaluator.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchEngine.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchResultEnumeration.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchResultFilter.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SubstringEnumerator.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SubstringEvaluator.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Table.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleBrowser.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleComparator.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleEnumeration.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/ASTNode.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AboutDialog.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AddEntryDialog.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AnnotatedFilterTreeDialog.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AttributesTableModel.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryDialog.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryNode.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/FilterDialog.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/IndexDialog.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/MainFrame.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/PartitionViewer.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/SearchResultDialog.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmDatabase.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmIndex.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmMasterTable.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmTable.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmTupleBrowser.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/exception/EveInterceptorException.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/AuthenticationService.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/DeadContext.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContext.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContextFactory.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveDirContext.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveJndiProvider.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveLdapContext.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/FailFastPipeline.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/InterceptorPipeline.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/Invocation.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/InvocationMethodEnum.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/JavaLdapSupport.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/PartitionConfigBuilder.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/AuthorizationService.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/EveExceptionService.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterService.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterServiceImpl.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/LookupFilter.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/OperationalAttributeService.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/ReplicationService.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/SchemaService.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistryMonitorAdapter.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistry.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitor.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitorAdapter.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ConcreteNameComponentNormalizer.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistryMonitorAdapter.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistryMonitorAdapter.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalOidRegistry.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalRegistries.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxRegistry.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitor.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitorAdapter.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistryMonitorAdapter.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistryMonitorAdapter.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitorAdapter.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistryMonitorAdapter.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistry.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitor.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitorAdapter.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/Registries.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitorAdapter.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapAttributeTypeRegistry.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapComparatorRegistry.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitContentRuleRegistry.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitStructureRuleRegistry.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleRegistry.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNameFormRegistry.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNormalizerRegistry.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectClassRegistry.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapOidRegistry.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapRegistries.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoader.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxRegistry.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveComparatorProducer.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveNormalizerProducer.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonMatchingRuleProducer.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonNormalizerProducer.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisComparatorProducer.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisNormalizerProducer.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxCheckerProducer.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemMatchingRuleProducer.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxCheckerProducer.java incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/AbstractJndiTest.java incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/EveContextFactoryTest.java incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ImportConfirmationTest.java incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ListTest.java incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ModifyContextTest.java incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/PartitionContextBuilderTest.java incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/RFC2713Tests.java incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/RootDSETest.java incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/SearchContextTest.java incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/SimpleAuthenticationTest.java incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/AuthorizationServiceTest.java incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/BinaryAttributeFilterTest.java incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/EveExceptionServiceTest.java incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/OperationalAttributeServiceTest.java incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoaderTest.java
Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/AbstractContextPartition.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/AbstractContextPartition.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/AbstractContextPartition.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/AbstractContextPartition.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/AbstractContextPartition.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/AbstractContextPartition.java Fri Jan 7 08:03:24 2005 @@ -17,29 +17,25 @@ package org.apache.ldap.server; -import java.util.Map; -import java.util.HashSet; import java.math.BigInteger; - +import java.util.HashSet; +import java.util.Map; import javax.naming.Name; -import javax.naming.NamingException; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; +import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; -import javax.naming.directory.SearchControls; import javax.naming.directory.ModificationItem; -import javax.naming.directory.Attribute; +import javax.naming.directory.SearchControls; +import org.apache.ldap.common.exception.LdapContextNotEmptyException; +import org.apache.ldap.common.exception.LdapNameNotFoundException; import org.apache.ldap.common.filter.ExprNode; -import org.apache.ldap.common.schema.AttributeType; import org.apache.ldap.common.message.LockableAttributesImpl; +import org.apache.ldap.common.schema.AttributeType; import org.apache.ldap.common.util.ArrayUtils; -import org.apache.ldap.common.exception.LdapContextNotEmptyException; -import org.apache.ldap.common.exception.LdapNameNotFoundException; - import org.apache.ldap.server.db.Database; import org.apache.ldap.server.db.SearchEngine; -import org.apache.ldap.server.db.SearchEngine; -import org.apache.ldap.server.db.SearchResultEnumeration; import org.apache.ldap.server.db.SearchResultEnumeration; import org.apache.ldap.server.db.gui.PartitionViewer; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/ApplicationPartition.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/ApplicationPartition.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/ApplicationPartition.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/ApplicationPartition.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/ApplicationPartition.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/ApplicationPartition.java Fri Jan 7 08:03:24 2005 @@ -17,14 +17,12 @@ package org.apache.ldap.server; +import javax.naming.Name; +import javax.naming.NamingException; + +import org.apache.ldap.common.schema.AttributeType; import org.apache.ldap.server.db.Database; import org.apache.ldap.server.db.SearchEngine; -import org.apache.ldap.server.db.SearchEngine; -import org.apache.ldap.server.AbstractContextPartition; -import org.apache.ldap.common.schema.AttributeType; - -import javax.naming.Name ; -import javax.naming.NamingException ; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/BackingStore.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/BackingStore.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/BackingStore.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/BackingStore.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/BackingStore.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/BackingStore.java Fri Jan 7 08:03:24 2005 @@ -18,14 +18,12 @@ import java.util.Map; - import javax.naming.Name; -import javax.naming.NamingException; import javax.naming.NamingEnumeration; - +import javax.naming.NamingException; import javax.naming.directory.Attributes; -import javax.naming.directory.SearchControls; import javax.naming.directory.ModificationItem; +import javax.naming.directory.SearchControls; import org.apache.ldap.common.filter.ExprNode; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/ContextPartition.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/ContextPartition.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/ContextPartition.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/ContextPartition.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/ContextPartition.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/ContextPartition.java Fri Jan 7 08:03:24 2005 @@ -19,8 +19,6 @@ import javax.naming.Name; -import org.apache.ldap.server.BackingStore; - /** * ContextPartitions are indivisible BackingStores associated with a naming Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/EveBackendSubsystem.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/EveBackendSubsystem.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/EveBackendSubsystem.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/EveBackendSubsystem.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/EveBackendSubsystem.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/EveBackendSubsystem.java Fri Jan 7 08:03:24 2005 @@ -2,9 +2,8 @@ import java.util.Hashtable; - -import javax.naming.NamingException ; -import javax.naming.ldap.LdapContext ; +import javax.naming.NamingException; +import javax.naming.ldap.LdapContext; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/PartitionNexus.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/PartitionNexus.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/PartitionNexus.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/PartitionNexus.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/PartitionNexus.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/PartitionNexus.java Fri Jan 7 08:03:24 2005 @@ -18,13 +18,9 @@ import java.util.Iterator; - import javax.naming.Name; import javax.naming.NamingException; import javax.naming.ldap.LdapContext; - -import org.apache.ldap.server.BackingStore; -import org.apache.ldap.server.ContextPartition; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/RootNexus.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/RootNexus.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/RootNexus.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/RootNexus.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/RootNexus.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/RootNexus.java Fri Jan 7 08:03:24 2005 @@ -17,27 +17,26 @@ package org.apache.ldap.server; -import java.util.*; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; import javax.naming.Name; -import javax.naming.NamingException; -import javax.naming.ldap.LdapContext; -import javax.naming.NamingEnumeration; import javax.naming.NameNotFoundException; +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; import javax.naming.directory.*; +import javax.naming.ldap.LdapContext; -import org.apache.ldap.common.filter.ExprNode; -import org.apache.ldap.common.filter.PresenceNode; -import org.apache.ldap.common.NotImplementedException; import org.apache.ldap.common.MultiException; +import org.apache.ldap.common.NotImplementedException; import org.apache.ldap.common.exception.LdapNameNotFoundException; -import org.apache.ldap.common.util.SingletonEnumeration; +import org.apache.ldap.common.filter.ExprNode; +import org.apache.ldap.common.filter.PresenceNode; import org.apache.ldap.common.message.LockableAttributeImpl; import org.apache.ldap.common.message.LockableAttributes; import org.apache.ldap.common.message.LockableAttributesImpl; -import org.apache.ldap.server.BackingStore; -import org.apache.ldap.server.ContextPartition; -import org.apache.ldap.server.PartitionNexus; +import org.apache.ldap.common.util.SingletonEnumeration; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/SystemPartition.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/SystemPartition.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/SystemPartition.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/SystemPartition.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/SystemPartition.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/SystemPartition.java Fri Jan 7 08:03:24 2005 @@ -16,21 +16,18 @@ */ package org.apache.ldap.server; -import javax.naming.Name ; -import javax.naming.NamingException ; -import javax.naming.InvalidNameException ; -import javax.naming.directory.Attributes ; +import javax.naming.InvalidNameException; +import javax.naming.Name; +import javax.naming.NamingException; +import javax.naming.directory.Attributes; -import org.apache.ldap.common.name.LdapName ; -import org.apache.ldap.common.util.NamespaceTools ; -import org.apache.ldap.common.util.DateUtils; +import org.apache.ldap.common.message.LockableAttributesImpl; +import org.apache.ldap.common.name.LdapName; import org.apache.ldap.common.schema.AttributeType; -import org.apache.ldap.common.message.LockableAttributesImpl ; - +import org.apache.ldap.common.util.DateUtils; +import org.apache.ldap.common.util.NamespaceTools; import org.apache.ldap.server.db.Database; import org.apache.ldap.server.db.SearchEngine; -import org.apache.ldap.server.db.SearchEngine; -import org.apache.ldap.server.AbstractContextPartition; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/auth/LdapPrincipal.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/auth/LdapPrincipal.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/auth/LdapPrincipal.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/auth/LdapPrincipal.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/auth/LdapPrincipal.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/auth/LdapPrincipal.java Fri Jan 7 08:03:24 2005 @@ -17,9 +17,9 @@ package org.apache.ldap.server.auth; -import javax.naming.Name; -import java.security.Principal; import java.io.Serializable; +import java.security.Principal; +import javax.naming.Name; import org.apache.ldap.common.name.LdapName; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Database.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Database.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Database.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Database.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Database.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Database.java Fri Jan 7 08:03:24 2005 @@ -17,13 +17,11 @@ package org.apache.ldap.server.db; -import java.util.Iterator; - import java.math.BigInteger; - +import java.util.Iterator; import javax.naming.Name; -import javax.naming.NamingException; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; import javax.naming.directory.Attributes; import javax.naming.directory.ModificationItem; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DbSearchResult.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DbSearchResult.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DbSearchResult.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DbSearchResult.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DbSearchResult.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DbSearchResult.java Fri Jan 7 08:03:24 2005 @@ -18,7 +18,6 @@ import java.math.BigInteger; - import javax.naming.directory.Attributes; import javax.naming.directory.SearchResult; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultOptimizer.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultOptimizer.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultOptimizer.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultOptimizer.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultOptimizer.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultOptimizer.java Fri Jan 7 08:03:24 2005 @@ -17,20 +17,12 @@ package org.apache.ldap.server.db; -import java.util.ArrayList; import java.math.BigInteger; - +import java.util.ArrayList; import javax.naming.NamingException; import javax.naming.directory.SearchControls; -import org.apache.ldap.common.filter.ExprNode; -import org.apache.ldap.common.filter.LeafNode; -import org.apache.ldap.common.filter.ScopeNode; -import org.apache.ldap.common.filter.SimpleNode; -import org.apache.ldap.common.filter.BranchNode; -import org.apache.ldap.common.filter.PresenceNode; -import org.apache.ldap.common.filter.AssertionNode; -import org.apache.ldap.server.db.Database; +import org.apache.ldap.common.filter.*; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultSearchEngine.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultSearchEngine.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultSearchEngine.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultSearchEngine.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultSearchEngine.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultSearchEngine.java Fri Jan 7 08:03:24 2005 @@ -17,22 +17,19 @@ package org.apache.ldap.server.db; -import java.util.Map; import java.math.BigInteger; - +import java.util.Map; import javax.naming.Name; -import javax.naming.NamingException; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; import javax.naming.directory.SearchControls; -import org.apache.ldap.common.name.LdapName; +import org.apache.ldap.common.filter.AbstractExprNode; +import org.apache.ldap.common.filter.BranchNode; import org.apache.ldap.common.filter.ExprNode; import org.apache.ldap.common.filter.ScopeNode; -import org.apache.ldap.common.filter.BranchNode; -import org.apache.ldap.common.filter.AbstractExprNode; import org.apache.ldap.common.message.DerefAliasesEnum; -import org.apache.ldap.server.db.Database; -import org.apache.ldap.server.db.DefaultOptimizer; +import org.apache.ldap.common.name.LdapName; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DisjunctionEnumeration.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DisjunctionEnumeration.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DisjunctionEnumeration.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DisjunctionEnumeration.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DisjunctionEnumeration.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DisjunctionEnumeration.java Fri Jan 7 08:03:24 2005 @@ -17,12 +17,11 @@ package org.apache.ldap.server.db; -import java.util.Map; import java.util.HashMap; +import java.util.Map; import java.util.NoSuchElementException; - -import javax.naming.NamingException; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DupsEnumeration.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DupsEnumeration.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DupsEnumeration.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DupsEnumeration.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DupsEnumeration.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DupsEnumeration.java Fri Jan 7 08:03:24 2005 @@ -17,14 +17,9 @@ package org.apache.ldap.server.db; -import java.util.TreeSet; -import java.util.Iterator; -import java.util.ArrayList; -import java.util.Collections; -import java.util.NoSuchElementException; - -import javax.naming.NamingException; +import java.util.*; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Enumerator.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Enumerator.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Enumerator.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Enumerator.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Enumerator.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Enumerator.java Fri Jan 7 08:03:24 2005 @@ -17,8 +17,8 @@ package org.apache.ldap.server.db; -import javax.naming.NamingException; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; import org.apache.ldap.common.filter.ExprNode; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEnumerator.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEnumerator.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEnumerator.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEnumerator.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEnumerator.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEnumerator.java Fri Jan 7 08:03:24 2005 @@ -17,26 +17,14 @@ package org.apache.ldap.server.db; -import javax.naming.NamingException; +import java.math.BigInteger; +import java.util.ArrayList; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; -import org.apache.ldap.common.filter.ExprNode; -import org.apache.ldap.common.filter.LeafNode; -import org.apache.ldap.common.filter.ScopeNode; -import org.apache.ldap.common.filter.BranchNode; -import org.apache.ldap.common.filter.SimpleNode; -import org.apache.ldap.common.filter.PresenceNode; -import org.apache.ldap.common.filter.AssertionNode; -import org.apache.ldap.common.filter.SubstringNode; import org.apache.ldap.common.NotImplementedException; +import org.apache.ldap.common.filter.*; import org.apache.ldap.server.schema.AttributeTypeRegistry; -import org.apache.ldap.server.schema.AttributeTypeRegistry; -import org.apache.ldap.server.db.Database; -import org.apache.ldap.server.db.DisjunctionEnumeration; -import org.apache.ldap.server.db.Enumerator; - -import java.util.ArrayList; -import java.math.BigInteger; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEvaluator.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEvaluator.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEvaluator.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEvaluator.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEvaluator.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEvaluator.java Fri Jan 7 08:03:24 2005 @@ -18,17 +18,12 @@ import java.util.Iterator; - import javax.naming.NamingException; -import org.apache.ldap.common.filter.ExprNode; import org.apache.ldap.common.filter.BranchNode; +import org.apache.ldap.common.filter.ExprNode; import org.apache.ldap.server.schema.AttributeTypeRegistry; - import org.apache.ldap.server.schema.OidRegistry; -import org.apache.ldap.server.schema.AttributeTypeRegistry; -import org.apache.ldap.server.db.Database; -import org.apache.ldap.server.db.Evaluator; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Index.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Index.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Index.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Index.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Index.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Index.java Fri Jan 7 08:03:24 2005 @@ -22,9 +22,8 @@ import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; -import org.apache.regexp.RE; - import org.apache.ldap.common.schema.AttributeType; +import org.apache.regexp.RE; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexAssertionEnumeration.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexAssertionEnumeration.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexAssertionEnumeration.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexAssertionEnumeration.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexAssertionEnumeration.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexAssertionEnumeration.java Fri Jan 7 08:03:24 2005 @@ -17,14 +17,11 @@ package org.apache.ldap.server.db; -import java.util.Map; import java.util.HashMap; +import java.util.Map; import java.util.NoSuchElementException; - -import javax.naming.NamingException; import javax.naming.NamingEnumeration; - -import org.apache.ldap.server.db.IndexAssertion; +import javax.naming.NamingException; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexComparator.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexComparator.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexComparator.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexComparator.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexComparator.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexComparator.java Fri Jan 7 08:03:24 2005 @@ -18,7 +18,6 @@ import org.apache.ldap.common.util.BigIntegerComparator; - import org.apache.ldap.server.schema.SerializableComparator; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexEnumeration.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexEnumeration.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexEnumeration.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexEnumeration.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexEnumeration.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexEnumeration.java Fri Jan 7 08:03:24 2005 @@ -18,9 +18,8 @@ import java.util.NoSuchElementException; - -import javax.naming.NamingException; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; import org.apache.regexp.RE; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexRecord.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexRecord.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexRecord.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexRecord.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexRecord.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexRecord.java Fri Jan 7 08:03:24 2005 @@ -18,7 +18,6 @@ import java.math.BigInteger; - import javax.naming.directory.Attributes; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/KeyOnlyComparator.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/KeyOnlyComparator.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/KeyOnlyComparator.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/KeyOnlyComparator.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/KeyOnlyComparator.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/KeyOnlyComparator.java Fri Jan 7 08:03:24 2005 @@ -20,7 +20,6 @@ import java.io.Serializable; import org.apache.ldap.server.schema.SerializableComparator; -import org.apache.ldap.server.schema.SerializableComparator; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/LeafEvaluator.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/LeafEvaluator.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/LeafEvaluator.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/LeafEvaluator.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/LeafEvaluator.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/LeafEvaluator.java Fri Jan 7 08:03:24 2005 @@ -19,30 +19,18 @@ import java.math.BigInteger; import java.util.Comparator; - -import javax.naming.NamingException; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; -import org.apache.ldap.common.filter.ExprNode; -import org.apache.ldap.common.filter.LeafNode; -import org.apache.ldap.common.filter.ScopeNode; -import org.apache.ldap.common.filter.SimpleNode; -import org.apache.ldap.common.schema.Normalizer; +import org.apache.ldap.common.NotImplementedException; +import org.apache.ldap.common.filter.*; import org.apache.ldap.common.schema.AttributeType; import org.apache.ldap.common.schema.MatchingRule; -import org.apache.ldap.common.filter.PresenceNode; -import org.apache.ldap.common.NotImplementedException; -import org.apache.ldap.server.schema.AttributeTypeRegistry; - -import org.apache.ldap.server.schema.OidRegistry; +import org.apache.ldap.common.schema.Normalizer; import org.apache.ldap.server.schema.AttributeTypeRegistry; import org.apache.ldap.server.schema.OidRegistry; -import org.apache.ldap.server.db.Database; -import org.apache.ldap.server.db.Evaluator; -import org.apache.ldap.server.db.Index; -import org.apache.ldap.server.db.IndexRecord; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/MasterTable.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/MasterTable.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/MasterTable.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/MasterTable.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/MasterTable.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/MasterTable.java Fri Jan 7 08:03:24 2005 @@ -18,7 +18,6 @@ import java.math.BigInteger; - import javax.naming.NamingException; import javax.naming.directory.Attributes; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/NoDupsEnumeration.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/NoDupsEnumeration.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/NoDupsEnumeration.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/NoDupsEnumeration.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/NoDupsEnumeration.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/NoDupsEnumeration.java Fri Jan 7 08:03:24 2005 @@ -18,9 +18,8 @@ import java.util.NoSuchElementException; - -import javax.naming.NamingException; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ResultFilteringEnumeration.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ResultFilteringEnumeration.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ResultFilteringEnumeration.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ResultFilteringEnumeration.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ResultFilteringEnumeration.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ResultFilteringEnumeration.java Fri Jan 7 08:03:24 2005 @@ -17,15 +17,14 @@ package org.apache.ldap.server.db; -import java.util.List; -import java.util.Collections; import java.util.ArrayList; - -import javax.naming.NamingException; +import java.util.Collections; +import java.util.List; import javax.naming.NamingEnumeration; -import javax.naming.ldap.LdapContext; +import javax.naming.NamingException; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; +import javax.naming.ldap.LdapContext; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ScopeEnumerator.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ScopeEnumerator.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ScopeEnumerator.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ScopeEnumerator.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ScopeEnumerator.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ScopeEnumerator.java Fri Jan 7 08:03:24 2005 @@ -18,15 +18,13 @@ import java.math.BigInteger; - -import javax.naming.NamingException; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; import javax.naming.directory.SearchControls; import org.apache.ldap.common.filter.ExprNode; import org.apache.ldap.common.filter.ScopeNode; import org.apache.ldap.common.util.SingletonEnumeration; -import org.apache.ldap.server.db.*; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ScopeEvaluator.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ScopeEvaluator.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ScopeEvaluator.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ScopeEvaluator.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ScopeEvaluator.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ScopeEvaluator.java Fri Jan 7 08:03:24 2005 @@ -216,17 +216,12 @@ import java.math.BigInteger; - import javax.naming.NamingException; import javax.naming.directory.SearchControls; import org.apache.ldap.common.filter.ExprNode; import org.apache.ldap.common.filter.ScopeNode; import org.apache.ldap.common.message.DerefAliasesEnum; -import org.apache.ldap.server.db.Database; -import org.apache.ldap.server.db.Evaluator; -import org.apache.ldap.server.db.Index; -import org.apache.ldap.server.db.IndexRecord; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchEngine.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchEngine.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchEngine.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchEngine.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchEngine.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchEngine.java Fri Jan 7 08:03:24 2005 @@ -17,16 +17,14 @@ package org.apache.ldap.server.db; -import java.util.Map; import java.math.BigInteger; - +import java.util.Map; import javax.naming.Name; -import javax.naming.NamingException; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; import javax.naming.directory.SearchControls; import org.apache.ldap.common.filter.ExprNode; -import org.apache.ldap.server.db.Optimizer; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchResultEnumeration.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchResultEnumeration.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchResultEnumeration.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchResultEnumeration.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchResultEnumeration.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchResultEnumeration.java Fri Jan 7 08:03:24 2005 @@ -17,15 +17,12 @@ package org.apache.ldap.server.db; -import javax.naming.NamingException; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; import org.apache.ldap.common.message.LockableAttributesImpl; -import org.apache.ldap.server.db.Database; -import org.apache.ldap.server.db.DbSearchResult; -import org.apache.ldap.server.db.IndexRecord; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchResultFilter.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchResultFilter.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchResultFilter.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchResultFilter.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchResultFilter.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchResultFilter.java Fri Jan 7 08:03:24 2005 @@ -18,9 +18,9 @@ import javax.naming.NamingException; -import javax.naming.ldap.LdapContext; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; +import javax.naming.ldap.LdapContext; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SubstringEnumerator.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SubstringEnumerator.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SubstringEnumerator.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SubstringEnumerator.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SubstringEnumerator.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SubstringEnumerator.java Fri Jan 7 08:03:24 2005 @@ -215,19 +215,16 @@ package org.apache.ldap.server.db; -import javax.naming.NamingException; import javax.naming.NamingEnumeration; - -import org.apache.regexp.RE; -import org.apache.regexp.RESyntaxException; +import javax.naming.NamingException; import org.apache.ldap.common.filter.ExprNode; import org.apache.ldap.common.filter.SubstringNode; -import org.apache.ldap.common.schema.Normalizer; import org.apache.ldap.common.schema.AttributeType; +import org.apache.ldap.common.schema.Normalizer; import org.apache.ldap.server.schema.AttributeTypeRegistry; -import org.apache.ldap.server.schema.AttributeTypeRegistry; -import org.apache.ldap.server.db.*; +import org.apache.regexp.RE; +import org.apache.regexp.RESyntaxException; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SubstringEvaluator.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SubstringEvaluator.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SubstringEvaluator.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SubstringEvaluator.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SubstringEvaluator.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SubstringEvaluator.java Fri Jan 7 08:03:24 2005 @@ -17,27 +17,19 @@ package org.apache.ldap.server.db; -import javax.naming.NamingException; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; -import org.apache.regexp.RE; -import org.apache.regexp.RESyntaxException; - import org.apache.ldap.common.filter.ExprNode; -import org.apache.ldap.common.schema.Normalizer; -import org.apache.ldap.common.schema.AttributeType; import org.apache.ldap.common.filter.SubstringNode; -import org.apache.ldap.server.schema.AttributeTypeRegistry; - -import org.apache.ldap.server.schema.OidRegistry; +import org.apache.ldap.common.schema.AttributeType; +import org.apache.ldap.common.schema.Normalizer; import org.apache.ldap.server.schema.AttributeTypeRegistry; import org.apache.ldap.server.schema.OidRegistry; -import org.apache.ldap.server.db.Database; -import org.apache.ldap.server.db.Evaluator; -import org.apache.ldap.server.db.Index; -import org.apache.ldap.server.db.IndexRecord; +import org.apache.regexp.RE; +import org.apache.regexp.RESyntaxException; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Table.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Table.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Table.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Table.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Table.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Table.java Fri Jan 7 08:03:24 2005 @@ -17,8 +17,8 @@ package org.apache.ldap.server.db; -import javax.naming.NamingException; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleBrowser.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleBrowser.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleBrowser.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleBrowser.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleBrowser.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleBrowser.java Fri Jan 7 08:03:24 2005 @@ -19,8 +19,6 @@ import javax.naming.NamingException; -import org.apache.ldap.server.db.Tuple; - /** * TupleBrowser interface used to abstract Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleComparator.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleComparator.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleComparator.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleComparator.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleComparator.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleComparator.java Fri Jan 7 08:03:24 2005 @@ -20,7 +20,6 @@ import java.io.Serializable; import org.apache.ldap.server.schema.SerializableComparator; -import org.apache.ldap.server.schema.SerializableComparator; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleEnumeration.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleEnumeration.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleEnumeration.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleEnumeration.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleEnumeration.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleEnumeration.java Fri Jan 7 08:03:24 2005 @@ -18,10 +18,7 @@ import java.util.Iterator; - import javax.naming.NamingEnumeration; - -import org.apache.ldap.server.db.Tuple; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/ASTNode.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/ASTNode.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/ASTNode.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/ASTNode.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/ASTNode.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/ASTNode.java Fri Jan 7 08:03:24 2005 @@ -18,12 +18,12 @@ import java.util.ArrayList; +import java.util.Collections; import java.util.Enumeration; import javax.swing.tree.TreeNode; -import java.util.Collections; -import org.apache.ldap.common.filter.ExprNode; import org.apache.ldap.common.filter.BranchNode; +import org.apache.ldap.common.filter.ExprNode; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AboutDialog.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AboutDialog.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AboutDialog.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AboutDialog.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AboutDialog.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AboutDialog.java Fri Jan 7 08:03:24 2005 @@ -18,10 +18,10 @@ import java.awt.*; -import javax.swing.*; -import java.awt.event.WindowEvent; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.WindowEvent; +import javax.swing.*; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AddEntryDialog.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AddEntryDialog.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AddEntryDialog.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AddEntryDialog.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AddEntryDialog.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AddEntryDialog.java Fri Jan 7 08:03:24 2005 @@ -17,27 +17,13 @@ package org.apache.ldap.server.db.gui; -import java.awt.Frame; - -import javax.naming.directory.Attributes; - -import javax.swing.DefaultCellEditor; -import javax.swing.JPanel; -import javax.swing.JLabel; -import javax.swing.JTable; -import javax.swing.JDialog; -import javax.swing.JButton; -import javax.swing.JMenuItem; -import javax.swing.JComboBox; -import javax.swing.JPopupMenu; -import javax.swing.JTextField; -import javax.swing.JOptionPane; -import javax.swing.JScrollPane; - -import java.awt.event.MouseEvent; +import java.awt.*; import java.awt.event.ActionEvent; -import java.awt.event.MouseAdapter; import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import javax.naming.directory.Attributes; +import javax.swing.*; import org.apache.ldap.common.message.LockableAttributesImpl; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AnnotatedFilterTreeDialog.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AnnotatedFilterTreeDialog.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AnnotatedFilterTreeDialog.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AnnotatedFilterTreeDialog.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AnnotatedFilterTreeDialog.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AnnotatedFilterTreeDialog.java Fri Jan 7 08:03:24 2005 @@ -17,17 +17,12 @@ package org.apache.ldap.server.db.gui ; -import javax.swing.JDialog ; -import java.awt.Frame ; -import java.awt.event.WindowEvent ; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTree; -import javax.swing.JTextArea; -import javax.swing.JButton; -import javax.swing.tree.TreeModel; -import java.awt.event.ActionListener; +import java.awt.*; import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowEvent; +import javax.swing.*; +import javax.swing.tree.TreeModel; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AttributesTableModel.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AttributesTableModel.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AttributesTableModel.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AttributesTableModel.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AttributesTableModel.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AttributesTableModel.java Fri Jan 7 08:03:24 2005 @@ -17,11 +17,10 @@ package org.apache.ldap.server.db.gui; -import java.util.ArrayList; import java.math.BigInteger; - -import javax.naming.NamingException; +import java.util.ArrayList; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; import javax.swing.table.AbstractTableModel; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryDialog.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryDialog.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryDialog.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryDialog.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryDialog.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryDialog.java Fri Jan 7 08:03:24 2005 @@ -17,20 +17,11 @@ package org.apache.ldap.server.db.gui ; -import java.awt.Frame ; - -import javax.naming.directory.Attributes; -import javax.swing.JPanel ; -import javax.swing.JLabel ; -import javax.swing.JTable ; -import javax.swing.JDialog ; -import javax.swing.JButton ; -import javax.swing.JComboBox ; -import javax.swing.JTextField ; -import javax.swing.JScrollPane ; - +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import javax.naming.directory.Attributes; +import javax.swing.*; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryNode.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryNode.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryNode.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryNode.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryNode.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryNode.java Fri Jan 7 08:03:24 2005 @@ -18,25 +18,17 @@ import java.math.BigInteger; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.Collections; - -import javax.naming.NamingException; +import java.util.*; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; import javax.naming.directory.Attributes; - import javax.swing.tree.TreeNode; import org.apache.ldap.common.filter.ExprNode; import org.apache.ldap.common.name.LdapName; import org.apache.ldap.server.db.Database; -import org.apache.ldap.server.db.SearchEngine; import org.apache.ldap.server.db.IndexRecord; -import org.apache.ldap.server.db.*; +import org.apache.ldap.server.db.SearchEngine; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/FilterDialog.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/FilterDialog.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/FilterDialog.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/FilterDialog.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/FilterDialog.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/FilterDialog.java Fri Jan 7 08:03:24 2005 @@ -17,30 +17,12 @@ package org.apache.ldap.server.db.gui ; -import javax.swing.JLabel ; -import javax.swing.JFrame ; -import javax.swing.JPanel ; -import javax.swing.JDialog ; -import javax.swing.JButton ; -import javax.swing.JComboBox ; -import javax.swing.JTextArea ; -import javax.swing.JTextField ; -import javax.swing.BorderFactory ; -import javax.swing.border.TitledBorder ; - -import java.awt.Font ; -import java.awt.Color ; -import java.awt.Insets ; -import java.awt.Dimension ; -import java.awt.FlowLayout ; -import java.awt.BorderLayout ; -import java.awt.GridBagLayout ; -import java.awt.event.WindowEvent ; -import java.awt.GridBagConstraints ; -import java.awt.event.WindowAdapter ; +import java.awt.*; import java.awt.event.ActionListener; - -import javax.swing.JScrollPane; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import javax.swing.*; +import javax.swing.border.TitledBorder; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/IndexDialog.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/IndexDialog.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/IndexDialog.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/IndexDialog.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/IndexDialog.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/IndexDialog.java Fri Jan 7 08:03:24 2005 @@ -17,33 +17,18 @@ package org.apache.ldap.server.db.gui ; -import java.awt.Frame ; -import java.awt.Panel ; -import java.awt.event.ActionEvent ; -import java.awt.event.ActionListener ; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import javax.naming.NamingEnumeration; +import javax.swing.*; +import javax.swing.table.DefaultTableModel; -import javax.swing.JLabel ; -import javax.swing.JPanel ; -import javax.swing.JTable ; -import javax.swing.JButton ; -import javax.swing.JDialog ; -import javax.swing.JComboBox ; -import javax.swing.JTextArea ; -import javax.swing.JTextField ; -import javax.swing.JScrollPane ; -import javax.swing.JTabbedPane ; -import javax.swing.JOptionPane ; -import javax.naming.NamingEnumeration ; -import javax.swing.DefaultComboBoxModel ; -import javax.swing.table.DefaultTableModel ; - -import org.apache.ldap.common.util.StringTools ; import org.apache.ldap.common.util.ExceptionUtils; -import org.apache.ldap.server.db.Index; - -import org.apache.regexp.RE ; +import org.apache.ldap.common.util.StringTools; import org.apache.ldap.server.db.Index; import org.apache.ldap.server.db.IndexRecord; +import org.apache.regexp.RE; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/MainFrame.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/MainFrame.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/MainFrame.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/MainFrame.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/MainFrame.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/MainFrame.java Fri Jan 7 08:03:24 2005 @@ -17,69 +17,44 @@ package org.apache.ldap.server.db.gui; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.io.File; +import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; -import java.io.FileNotFoundException; - import java.math.BigInteger; - -import java.util.Stack; import java.util.HashMap; -import java.util.Iterator; import java.util.Hashtable; - -import java.awt.Window; -import java.awt.Toolkit; -import java.awt.Dimension; -import java.awt.BorderLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -import javax.naming.NamingException; +import java.util.Iterator; +import java.util.Stack; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; import javax.naming.directory.Attributes; import javax.naming.directory.SearchControls; - -import javax.swing.JTree; -import javax.swing.JMenu; -import javax.swing.JTable; -import javax.swing.JFrame; -import javax.swing.JPanel; -import javax.swing.JLabel; -import javax.swing.JMenuBar; -import javax.swing.JMenuItem; -import javax.swing.JTextArea; -import javax.swing.JSplitPane; -import javax.swing.JSeparator; -import javax.swing.JScrollPane; -import javax.swing.JTabbedPane; -import javax.swing.JOptionPane; -import javax.swing.JFileChooser; -import javax.swing.tree.TreePath; -import javax.swing.tree.TreeNode; -import javax.swing.tree.TreeModel; -import javax.swing.tree.DefaultTreeModel; -import javax.swing.table.DefaultTableModel; +import javax.swing.*; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; +import javax.swing.table.DefaultTableModel; +import javax.swing.tree.DefaultTreeModel; +import javax.swing.tree.TreeModel; +import javax.swing.tree.TreeNode; +import javax.swing.tree.TreePath; -import org.apache.ldap.common.name.LdapName; -import org.apache.ldap.common.ldif.LdifParser; import org.apache.ldap.common.filter.ExprNode; -import org.apache.ldap.common.util.StringTools; -import org.apache.ldap.common.ldif.LdifIterator; -import org.apache.ldap.common.ldif.LdifParserImpl; import org.apache.ldap.common.filter.FilterParser; import org.apache.ldap.common.filter.FilterParserImpl; +import org.apache.ldap.common.ldif.LdifIterator; +import org.apache.ldap.common.ldif.LdifParser; +import org.apache.ldap.common.ldif.LdifParserImpl; import org.apache.ldap.common.message.DerefAliasesEnum; import org.apache.ldap.common.message.LockableAttributesImpl; -import org.apache.ldap.server.db.gui.*; - +import org.apache.ldap.common.name.LdapName; +import org.apache.ldap.common.util.StringTools; import org.apache.ldap.server.db.Database; -import org.apache.ldap.server.db.IndexRecord; import org.apache.ldap.server.db.Index; -import org.apache.ldap.server.db.*; +import org.apache.ldap.server.db.IndexRecord; import org.apache.ldap.server.db.SearchEngine; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/PartitionViewer.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/PartitionViewer.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/PartitionViewer.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/PartitionViewer.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/PartitionViewer.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/PartitionViewer.java Fri Jan 7 08:03:24 2005 @@ -17,15 +17,11 @@ package org.apache.ldap.server.db.gui ; -import java.awt.Toolkit ; -import java.awt.Dimension ; - +import java.awt.*; import javax.naming.NamingException; -import org.apache.ldap.server.db.SearchEngine; import org.apache.ldap.server.db.Database; import org.apache.ldap.server.db.SearchEngine; -import org.apache.ldap.server.db.gui.MainFrame; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/SearchResultDialog.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/SearchResultDialog.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/SearchResultDialog.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/SearchResultDialog.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/SearchResultDialog.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/SearchResultDialog.java Fri Jan 7 08:03:24 2005 @@ -17,25 +17,16 @@ package org.apache.ldap.server.db.gui ; -import javax.swing.JDialog ; -import java.awt.Frame ; -import java.awt.event.WindowEvent ; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTree; -import javax.swing.JTextArea; -import javax.swing.JButton; -import javax.swing.tree.TreeModel; -import java.awt.event.ActionListener; +import java.awt.*; import java.awt.event.ActionEvent; -import javax.swing.JTable; -import javax.swing.table.TableModel; -import javax.swing.event.ListSelectionListener; -import javax.swing.event.ListSelectionEvent; -import javax.swing.ListSelectionModel; +import java.awt.event.ActionListener; +import java.awt.event.WindowEvent; import java.math.BigInteger; - -import org.apache.ldap.server.db.gui.MainFrame; +import javax.swing.*; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import javax.swing.table.TableModel; +import javax.swing.tree.TreeModel; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmDatabase.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmDatabase.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmDatabase.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmDatabase.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmDatabase.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmDatabase.java Fri Jan 7 08:03:24 2005 @@ -17,39 +17,33 @@ package org.apache.ldap.server.db.jdbm; -import java.math.BigInteger; - import java.io.File; import java.io.IOException; - -import java.util.Map; +import java.math.BigInteger; +import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; -import java.util.ArrayList; - +import java.util.Map; import javax.naming.Name; -import javax.naming.NamingException; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; import javax.naming.directory.DirContext; import javax.naming.directory.ModificationItem; -import jdbm.helper.MRU; import jdbm.RecordManager; +import jdbm.helper.MRU; import jdbm.recman.BaseRecordManager; import jdbm.recman.CacheRecordManager; - -import org.apache.ldap.common.name.LdapName; import org.apache.ldap.common.MultiException; import org.apache.ldap.common.exception.LdapNameNotFoundException; +import org.apache.ldap.common.message.LockableAttributesImpl; +import org.apache.ldap.common.name.LdapName; import org.apache.ldap.common.schema.AttributeType; import org.apache.ldap.common.schema.Normalizer; import org.apache.ldap.common.util.NamespaceTools; -import org.apache.ldap.common.message.LockableAttributesImpl; import org.apache.ldap.server.db.*; - -import org.apache.eve.db.*; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmIndex.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmIndex.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmIndex.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmIndex.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmIndex.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmIndex.java Fri Jan 7 08:03:24 2005 @@ -19,29 +19,23 @@ import java.io.File; import java.io.IOException; - import java.math.BigInteger; - -import javax.naming.NamingException; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; -import org.apache.regexp.RE; +import jdbm.RecordManager; +import jdbm.helper.MRU; +import jdbm.recman.BaseRecordManager; +import jdbm.recman.CacheRecordManager; +import org.apache.ldap.common.schema.AttributeType; +import org.apache.ldap.common.util.LRUMap; import org.apache.ldap.server.db.Index; import org.apache.ldap.server.db.IndexComparator; -import org.apache.ldap.server.db.IndexComparator; -import org.apache.ldap.server.db.IndexEnumeration; import org.apache.ldap.server.db.IndexEnumeration; import org.apache.ldap.server.schema.SerializableComparator; -import org.apache.ldap.common.util.LRUMap; -import org.apache.ldap.common.schema.AttributeType; -import org.apache.ldap.server.schema.SerializableComparator; - -import jdbm.helper.MRU; -import jdbm.RecordManager; -import jdbm.recman.BaseRecordManager; -import jdbm.recman.CacheRecordManager; +import org.apache.regexp.RE; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmMasterTable.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmMasterTable.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmMasterTable.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmMasterTable.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmMasterTable.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmMasterTable.java Fri Jan 7 08:03:24 2005 @@ -19,13 +19,11 @@ import java.math.BigInteger; import javax.naming.NamingException; -import javax.naming.directory.Attributes; +import javax.naming.directory.Attributes; import jdbm.RecordManager; import jdbm.helper.StringComparator; - import org.apache.ldap.common.util.BigIntegerComparator; -import org.apache.ldap.server.schema.SerializableComparator; import org.apache.ldap.server.db.MasterTable; import org.apache.ldap.server.schema.SerializableComparator; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmTable.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmTable.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmTable.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmTable.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmTable.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmTable.java Fri Jan 7 08:03:24 2005 @@ -17,28 +17,18 @@ package org.apache.ldap.server.db.jdbm; -import java.util.TreeSet; -import java.util.Iterator; -import java.util.SortedSet; -import java.util.ArrayList; -import java.util.Collections; - import java.io.IOException; - -import javax.naming.NamingException; +import java.util.*; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; -import jdbm.btree.BTree; import jdbm.RecordManager; +import jdbm.btree.BTree; import jdbm.helper.TupleBrowser; - -import org.apache.ldap.common.util.EmptyEnumeration; +import org.apache.ldap.common.util.EmptyEnumeration; import org.apache.ldap.common.util.SingletonEnumeration; -import org.apache.ldap.server.schema.SerializableComparator; - -import org.apache.eve.db.*; -import org.apache.ldap.server.schema.SerializableComparator; import org.apache.ldap.server.db.*; +import org.apache.ldap.server.schema.SerializableComparator; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmTupleBrowser.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmTupleBrowser.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmTupleBrowser.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmTupleBrowser.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmTupleBrowser.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmTupleBrowser.java Fri Jan 7 08:03:24 2005 @@ -17,14 +17,11 @@ package org.apache.ldap.server.db.jdbm; -import org.apache.ldap.server.db.Tuple; -import org.apache.ldap.server.db.TupleBrowser; -import org.apache.ldap.server.db.Tuple; -import org.apache.ldap.server.db.TupleBrowser; - import java.io.IOException; - import javax.naming.NamingException; + +import org.apache.ldap.server.db.Tuple; +import org.apache.ldap.server.db.TupleBrowser; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/exception/EveInterceptorException.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/exception/EveInterceptorException.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/exception/EveInterceptorException.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/exception/EveInterceptorException.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/exception/EveInterceptorException.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/exception/EveInterceptorException.java Fri Jan 7 08:03:24 2005 @@ -17,12 +17,9 @@ package org.apache.ldap.server.exception; -import org.apache.ldap.common.message.ResultCodeEnum; -import org.apache.ldap.common.exception.LdapNamingException; import org.apache.ldap.common.exception.LdapException; -import org.apache.ldap.server.jndi.Interceptor; - -import org.apache.ldap.server.jndi.Invocation; +import org.apache.ldap.common.exception.LdapNamingException; +import org.apache.ldap.common.message.ResultCodeEnum; import org.apache.ldap.server.jndi.Interceptor; import org.apache.ldap.server.jndi.Invocation; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/AuthenticationService.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/AuthenticationService.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/AuthenticationService.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/AuthenticationService.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/AuthenticationService.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/AuthenticationService.java Fri Jan 7 08:03:24 2005 @@ -19,15 +19,17 @@ import javax.naming.Context; import javax.naming.NamingException; -import javax.naming.directory.Attributes; import javax.naming.directory.Attribute; +import javax.naming.directory.Attributes; -import org.apache.ldap.server.RootNexus; -import org.apache.ldap.server.auth.LdapPrincipal; -import org.apache.ldap.common.exception.*; +import org.apache.ldap.common.exception.LdapAuthenticationException; +import org.apache.ldap.common.exception.LdapAuthenticationNotSupportedException; +import org.apache.ldap.common.exception.LdapNameNotFoundException; +import org.apache.ldap.common.exception.LdapNoPermissionException; import org.apache.ldap.common.message.ResultCodeEnum; -import org.apache.ldap.common.util.ArrayUtils; import org.apache.ldap.common.name.LdapName; +import org.apache.ldap.common.util.ArrayUtils; +import org.apache.ldap.server.RootNexus; import org.apache.ldap.server.auth.LdapPrincipal; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/DeadContext.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/DeadContext.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/DeadContext.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/DeadContext.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/DeadContext.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/DeadContext.java Fri Jan 7 08:03:24 2005 @@ -18,16 +18,15 @@ import java.util.Hashtable; - import javax.naming.*; -import javax.naming.ldap.LdapContext; -import javax.naming.ldap.Control; -import javax.naming.ldap.ExtendedResponse; -import javax.naming.ldap.ExtendedRequest; import javax.naming.directory.Attributes; import javax.naming.directory.DirContext; import javax.naming.directory.ModificationItem; import javax.naming.directory.SearchControls; +import javax.naming.ldap.Control; +import javax.naming.ldap.ExtendedRequest; +import javax.naming.ldap.ExtendedResponse; +import javax.naming.ldap.LdapContext; import org.apache.ldap.common.exception.LdapServiceUnavailableException; import org.apache.ldap.common.message.ResultCodeEnum; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContext.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContext.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContext.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContext.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContext.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContext.java Fri Jan 7 08:03:24 2005 @@ -18,22 +18,18 @@ import java.util.Hashtable; - import javax.naming.*; -import javax.naming.ldap.Control; import javax.naming.directory.Attributes; import javax.naming.directory.SearchControls; +import javax.naming.ldap.Control; -import org.apache.ldap.common.name.LdapName; +import org.apache.ldap.common.exception.LdapNoPermissionException; import org.apache.ldap.common.filter.PresenceNode; -import org.apache.ldap.common.util.NamespaceTools; import org.apache.ldap.common.message.LockableAttributesImpl; -import org.apache.ldap.common.exception.LdapNoPermissionException; -import org.apache.ldap.server.auth.LdapPrincipal; - +import org.apache.ldap.common.name.LdapName; +import org.apache.ldap.common.util.NamespaceTools; import org.apache.ldap.server.PartitionNexus; import org.apache.ldap.server.auth.LdapPrincipal; -import org.apache.ldap.server.PartitionNexus; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContextFactory.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContextFactory.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContextFactory.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContextFactory.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContextFactory.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContextFactory.java Fri Jan 7 08:03:24 2005 @@ -17,56 +17,53 @@ package org.apache.ldap.server.jndi; -import java.util.Hashtable; -import java.util.List; -import java.util.ArrayList; import java.io.File; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.net.InetAddress; import java.net.UnknownHostException; - -import javax.naming.*; -import javax.naming.ldap.LdapContext; +import java.util.ArrayList; +import java.util.Hashtable; +import java.util.List; +import javax.naming.Context; +import javax.naming.Name; +import javax.naming.NamingException; import javax.naming.directory.Attributes; +import javax.naming.ldap.LdapContext; import javax.naming.spi.InitialContextFactory; +import org.apache.eve.protocol.LdapProtocolProvider; +import org.apache.ldap.common.exception.LdapAuthenticationNotSupportedException; +import org.apache.ldap.common.exception.LdapConfigurationException; +import org.apache.ldap.common.exception.LdapNoPermissionException; +import org.apache.ldap.common.ldif.LdifIterator; +import org.apache.ldap.common.ldif.LdifParser; +import org.apache.ldap.common.ldif.LdifParserImpl; +import org.apache.ldap.common.message.LockableAttributesImpl; +import org.apache.ldap.common.message.ResultCodeEnum; import org.apache.ldap.common.name.LdapName; import org.apache.ldap.common.schema.AttributeType; import org.apache.ldap.common.schema.Normalizer; -import org.apache.ldap.common.message.LockableAttributesImpl; -import org.apache.ldap.common.message.ResultCodeEnum; import org.apache.ldap.common.util.DateUtils; import org.apache.ldap.common.util.PropertiesUtils; import org.apache.ldap.common.util.StringTools; -import org.apache.ldap.common.ldif.LdifIterator; -import org.apache.ldap.common.ldif.LdifParser; -import org.apache.ldap.common.ldif.LdifParserImpl; -import org.apache.ldap.common.exception.LdapConfigurationException; -import org.apache.ldap.common.exception.LdapAuthenticationNotSupportedException; -import org.apache.ldap.common.exception.LdapNoPermissionException; -import org.apache.ldap.server.schema.bootstrap.BootstrapRegistries; - +import org.apache.ldap.server.ApplicationPartition; +import org.apache.ldap.server.ContextPartitionConfig; import org.apache.ldap.server.RootNexus; import org.apache.ldap.server.SystemPartition; -import org.apache.eve.protocol.LdapProtocolProvider; -import org.apache.eve.db.*; +import org.apache.ldap.server.db.*; import org.apache.ldap.server.db.jdbm.JdbmDatabase; -import org.apache.ldap.server.schema.bootstrap.BootstrapSchemaLoader; -import org.apache.ldap.server.schema.*; import org.apache.ldap.server.jndi.ibs.*; -import org.apache.ldap.server.db.jdbm.JdbmDatabase; -import org.apache.ldap.server.db.*; -import org.apache.ldap.server.ApplicationPartition; -import org.apache.ldap.server.ContextPartitionConfig; -import org.apache.ldap.server.*; +import org.apache.ldap.server.schema.*; +import org.apache.ldap.server.schema.bootstrap.BootstrapRegistries; +import org.apache.ldap.server.schema.bootstrap.BootstrapSchemaLoader; import org.apache.seda.DefaultFrontend; import org.apache.seda.DefaultFrontendFactory; import org.apache.seda.listener.TCPListenerConfig; -import org.apache.seda.protocol.InetServiceEntry; -import org.apache.seda.protocol.TransportTypeEnum; import org.apache.seda.protocol.DefaultInetServicesDatabase; +import org.apache.seda.protocol.InetServiceEntry; import org.apache.seda.protocol.ProtocolProvider; +import org.apache.seda.protocol.TransportTypeEnum; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveDirContext.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveDirContext.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveDirContext.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveDirContext.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveDirContext.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveDirContext.java Fri Jan 7 08:03:24 2005 @@ -18,32 +18,19 @@ import java.io.IOException; -import java.util.Hashtable; import java.text.ParseException; - +import java.util.Hashtable; import javax.naming.Name; -import javax.naming.ldap.Control; -import javax.naming.NamingException; import javax.naming.NamingEnumeration; -import javax.naming.directory.Attribute; -import javax.naming.directory.Attributes; -import javax.naming.directory.DirContext; -import javax.naming.directory.SearchControls; -import javax.naming.directory.ModificationItem; -import javax.naming.directory.InvalidSearchFilterException; +import javax.naming.NamingException; +import javax.naming.directory.*; +import javax.naming.ldap.Control; +import org.apache.ldap.common.filter.*; import org.apache.ldap.common.name.LdapName; -import org.apache.ldap.common.filter.ExprNode; -import org.apache.ldap.common.filter.BranchNode; -import org.apache.ldap.common.filter.SimpleNode; -import org.apache.ldap.common.filter.PresenceNode; -import org.apache.ldap.common.filter.FilterParser; import org.apache.ldap.common.util.NamespaceTools; -import org.apache.ldap.common.filter.FilterParserImpl; - import org.apache.ldap.server.PartitionNexus; import org.apache.ldap.server.auth.LdapPrincipal; -import org.apache.ldap.server.PartitionNexus; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveJndiProvider.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveJndiProvider.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveJndiProvider.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveJndiProvider.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveJndiProvider.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveJndiProvider.java Fri Jan 7 08:03:24 2005 @@ -17,23 +17,20 @@ package org.apache.ldap.server.jndi; -import org.apache.ldap.server.RootNexus; -import org.apache.ldap.server.PartitionNexus; -import org.apache.ldap.server.EveBackendSubsystem; -import org.apache.ldap.common.exception.LdapNamingException; -import org.apache.ldap.common.message.ResultCodeEnum; -import org.apache.ldap.server.EveBackendSubsystem; - -import java.util.Hashtable; - -import java.lang.reflect.Proxy; -import java.lang.reflect.Method; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; - -import javax.naming.NamingException; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.util.Hashtable; import javax.naming.Context; +import javax.naming.NamingException; import javax.naming.ldap.LdapContext; + +import org.apache.ldap.common.exception.LdapNamingException; +import org.apache.ldap.common.message.ResultCodeEnum; +import org.apache.ldap.server.EveBackendSubsystem; +import org.apache.ldap.server.PartitionNexus; +import org.apache.ldap.server.RootNexus; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveLdapContext.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveLdapContext.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveLdapContext.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveLdapContext.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveLdapContext.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveLdapContext.java Fri Jan 7 08:03:24 2005 @@ -18,19 +18,16 @@ import java.util.Hashtable; - -import javax.naming.NamingException; import javax.naming.Name; +import javax.naming.NamingException; import javax.naming.ldap.Control; import javax.naming.ldap.ExtendedRequest; import javax.naming.ldap.ExtendedResponse; import javax.naming.ldap.LdapContext; import org.apache.ldap.common.NotImplementedException; - import org.apache.ldap.server.PartitionNexus; import org.apache.ldap.server.auth.LdapPrincipal; -import org.apache.ldap.server.PartitionNexus; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/FailFastPipeline.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/FailFastPipeline.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/FailFastPipeline.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/FailFastPipeline.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/FailFastPipeline.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/FailFastPipeline.java Fri Jan 7 08:03:24 2005 @@ -20,7 +20,6 @@ import javax.naming.NamingException; import org.apache.ldap.server.exception.EveInterceptorException; -import org.apache.ldap.server.exception.EveInterceptorException; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/InterceptorPipeline.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/InterceptorPipeline.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/InterceptorPipeline.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/InterceptorPipeline.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/InterceptorPipeline.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/InterceptorPipeline.java Fri Jan 7 08:03:24 2005 @@ -17,9 +17,8 @@ package org.apache.ldap.server.jndi; -import java.util.List; import java.util.ArrayList; - +import java.util.List; import javax.naming.NamingException; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/Invocation.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/Invocation.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/Invocation.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/Invocation.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/Invocation.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/Invocation.java Fri Jan 7 08:03:24 2005 @@ -17,14 +17,9 @@ package org.apache.ldap.server.jndi; -import java.util.List; -import java.util.Stack; -import java.util.Iterator; -import java.util.ArrayList; -import java.util.Collections; - import java.io.Serializable; import java.lang.reflect.Method; +import java.util.*; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/InvocationMethodEnum.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/InvocationMethodEnum.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/InvocationMethodEnum.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/InvocationMethodEnum.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/InvocationMethodEnum.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/InvocationMethodEnum.java Fri Jan 7 08:03:24 2005 @@ -17,10 +17,10 @@ package org.apache.ldap.server.jndi; -import java.util.Map; -import java.util.HashMap; -import java.util.Collections; import java.lang.reflect.Method; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; import org.apache.ldap.common.util.ValuedEnum; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/JavaLdapSupport.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/JavaLdapSupport.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/JavaLdapSupport.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/JavaLdapSupport.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/JavaLdapSupport.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/JavaLdapSupport.java Fri Jan 7 08:03:24 2005 @@ -17,12 +17,7 @@ package org.apache.ldap.server.jndi; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; - +import java.io.*; import javax.naming.NamingException; import javax.naming.directory.Attributes; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/PartitionConfigBuilder.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/PartitionConfigBuilder.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/PartitionConfigBuilder.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/PartitionConfigBuilder.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/PartitionConfigBuilder.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/PartitionConfigBuilder.java Fri Jan 7 08:03:24 2005 @@ -17,18 +17,16 @@ package org.apache.ldap.server.jndi; -import java.util.Hashtable; import java.util.Enumeration; - +import java.util.Hashtable; import javax.naming.NamingException; import javax.naming.directory.Attributes; -import org.apache.ldap.server.ContextPartitionConfig; -import org.apache.ldap.common.message.LockableAttributesImpl; import org.apache.ldap.common.message.LockableAttributeImpl; +import org.apache.ldap.common.message.LockableAttributesImpl; +import org.apache.ldap.common.name.LdapName; import org.apache.ldap.common.util.ArrayUtils; import org.apache.ldap.common.util.StringTools; -import org.apache.ldap.common.name.LdapName; import org.apache.ldap.server.ContextPartitionConfig; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/AuthorizationService.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/AuthorizationService.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/AuthorizationService.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/AuthorizationService.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/AuthorizationService.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/AuthorizationService.java Fri Jan 7 08:03:24 2005 @@ -19,22 +19,21 @@ import javax.naming.Name; import javax.naming.NamingException; -import javax.naming.ldap.LdapContext; import javax.naming.directory.Attributes; import javax.naming.directory.ModificationItem; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; +import javax.naming.ldap.LdapContext; -import org.apache.ldap.server.SystemPartition; -import org.apache.ldap.server.db.SearchResultFilter; import org.apache.ldap.common.exception.LdapNoPermissionException; -import org.apache.ldap.common.name.NameComponentNormalizer; import org.apache.ldap.common.name.DnParser; -import org.apache.ldap.server.jndi.InvocationStateEnum; -import org.apache.ldap.server.jndi.EveContext; +import org.apache.ldap.common.name.NameComponentNormalizer; +import org.apache.ldap.server.SystemPartition; +import org.apache.ldap.server.db.SearchResultFilter; import org.apache.ldap.server.jndi.BaseInterceptor; +import org.apache.ldap.server.jndi.EveContext; import org.apache.ldap.server.jndi.Invocation; -import org.apache.ldap.server.db.SearchResultFilter; +import org.apache.ldap.server.jndi.InvocationStateEnum; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/EveExceptionService.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/EveExceptionService.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/EveExceptionService.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/EveExceptionService.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/EveExceptionService.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/EveExceptionService.java Fri Jan 7 08:03:24 2005 @@ -19,24 +19,22 @@ import java.util.Map; import javax.naming.Name; -import javax.naming.NamingException; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; +import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; import javax.naming.directory.ModificationItem; import javax.naming.directory.SearchControls; -import javax.naming.directory.Attribute; -import org.apache.ldap.server.RootNexus; -import org.apache.ldap.server.exception.EveInterceptorException; -import org.apache.ldap.common.exception.LdapException; import org.apache.ldap.common.exception.*; import org.apache.ldap.common.filter.ExprNode; -import org.apache.ldap.common.name.LdapName; import org.apache.ldap.common.message.ResultCodeEnum; -import org.apache.ldap.server.jndi.InvocationStateEnum; +import org.apache.ldap.common.name.LdapName; +import org.apache.ldap.server.RootNexus; +import org.apache.ldap.server.exception.EveInterceptorException; import org.apache.ldap.server.jndi.BaseInterceptor; import org.apache.ldap.server.jndi.Invocation; -import org.apache.ldap.server.exception.EveInterceptorException; +import org.apache.ldap.server.jndi.InvocationStateEnum; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterService.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterService.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterService.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterService.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterService.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterService.java Fri Jan 7 08:03:24 2005 @@ -18,7 +18,6 @@ import org.apache.ldap.server.db.SearchResultFilter; -import org.apache.ldap.server.db.SearchResultFilter; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterServiceImpl.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterServiceImpl.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterServiceImpl.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterServiceImpl.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterServiceImpl.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterServiceImpl.java Fri Jan 7 08:03:24 2005 @@ -17,24 +17,23 @@ package org.apache.ldap.server.jndi.ibs; -import java.util.Map; -import java.util.List; import java.util.ArrayList; - +import java.util.List; +import java.util.Map; import javax.naming.Name; -import javax.naming.NamingException; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; +import javax.naming.directory.Attributes; +import javax.naming.directory.SearchControls; +import javax.naming.directory.SearchResult; import javax.naming.ldap.LdapContext; -import javax.naming.directory.*; -import org.apache.ldap.server.db.SearchResultFilter; +import org.apache.ldap.common.filter.ExprNode; import org.apache.ldap.server.db.ResultFilteringEnumeration; import org.apache.ldap.server.db.SearchResultFilter; -import org.apache.ldap.server.jndi.Invocation; import org.apache.ldap.server.jndi.BaseInterceptor; +import org.apache.ldap.server.jndi.Invocation; import org.apache.ldap.server.jndi.InvocationStateEnum; - -import org.apache.ldap.common.filter.ExprNode; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/LookupFilter.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/LookupFilter.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/LookupFilter.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/LookupFilter.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/LookupFilter.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/LookupFilter.java Fri Jan 7 08:03:24 2005 @@ -19,8 +19,8 @@ import javax.naming.Name; import javax.naming.NamingException; -import javax.naming.ldap.LdapContext; import javax.naming.directory.Attributes; +import javax.naming.ldap.LdapContext; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/OperationalAttributeService.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/OperationalAttributeService.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/OperationalAttributeService.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/OperationalAttributeService.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/OperationalAttributeService.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/OperationalAttributeService.java Fri Jan 7 08:03:24 2005 @@ -18,24 +18,21 @@ import javax.naming.Name; -import javax.naming.NamingException; import javax.naming.NamingEnumeration; -import javax.naming.ldap.LdapContext; +import javax.naming.NamingException; import javax.naming.directory.*; +import javax.naming.ldap.LdapContext; +import org.apache.ldap.common.schema.AttributeType; +import org.apache.ldap.common.schema.UsageEnum; +import org.apache.ldap.common.util.DateUtils; import org.apache.ldap.server.RootNexus; import org.apache.ldap.server.db.SearchResultFilter; -import org.apache.ldap.server.jndi.Invocation; import org.apache.ldap.server.jndi.BaseInterceptor; +import org.apache.ldap.server.jndi.Invocation; import org.apache.ldap.server.jndi.InvocationStateEnum; -import org.apache.ldap.server.schema.GlobalRegistries; import org.apache.ldap.server.schema.AttributeTypeRegistry; -import org.apache.ldap.server.db.SearchResultFilter; -import org.apache.ldap.server.RootNexus; - -import org.apache.ldap.common.util.DateUtils; -import org.apache.ldap.common.schema.AttributeType; -import org.apache.ldap.common.schema.UsageEnum; +import org.apache.ldap.server.schema.GlobalRegistries; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/ReplicationService.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/ReplicationService.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/ReplicationService.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/ReplicationService.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/ReplicationService.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/ReplicationService.java Fri Jan 7 08:03:24 2005 @@ -19,7 +19,6 @@ import org.apache.ldap.server.RootNexus; import org.apache.ldap.server.jndi.BaseInterceptor; -import org.apache.ldap.server.RootNexus; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/SchemaService.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/SchemaService.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/SchemaService.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/SchemaService.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/SchemaService.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/SchemaService.java Fri Jan 7 08:03:24 2005 @@ -19,32 +19,29 @@ import java.util.*; import javax.naming.Name; -import javax.naming.NamingException; import javax.naming.NamingEnumeration; -import javax.naming.ldap.LdapContext; +import javax.naming.NamingException; +import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; import javax.naming.directory.SearchControls; -import javax.naming.directory.Attribute; import javax.naming.directory.SearchResult; +import javax.naming.ldap.LdapContext; +import org.apache.ldap.common.filter.ExprNode; +import org.apache.ldap.common.filter.PresenceNode; +import org.apache.ldap.common.filter.SimpleNode; +import org.apache.ldap.common.message.LockableAttributeImpl; +import org.apache.ldap.common.message.LockableAttributesImpl; +import org.apache.ldap.common.name.LdapName; +import org.apache.ldap.common.schema.*; +import org.apache.ldap.common.util.SingletonEnumeration; +import org.apache.ldap.server.RootNexus; +import org.apache.ldap.server.db.SearchResultFilter; import org.apache.ldap.server.jndi.BaseInterceptor; import org.apache.ldap.server.jndi.Invocation; import org.apache.ldap.server.jndi.InvocationStateEnum; -import org.apache.ldap.server.RootNexus; -import org.apache.ldap.server.db.SearchResultFilter; -import org.apache.ldap.server.schema.GlobalRegistries; import org.apache.ldap.server.schema.AttributeTypeRegistry; -import org.apache.ldap.server.db.SearchResultFilter; -import org.apache.ldap.server.RootNexus; - -import org.apache.ldap.common.schema.*; -import org.apache.ldap.common.message.LockableAttributeImpl; -import org.apache.ldap.common.message.LockableAttributesImpl; -import org.apache.ldap.common.filter.ExprNode; -import org.apache.ldap.common.filter.SimpleNode; -import org.apache.ldap.common.filter.PresenceNode; -import org.apache.ldap.common.util.SingletonEnumeration; -import org.apache.ldap.common.name.LdapName; +import org.apache.ldap.server.schema.GlobalRegistries; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistryMonitorAdapter.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistryMonitorAdapter.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistryMonitorAdapter.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistryMonitorAdapter.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistryMonitorAdapter.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistryMonitorAdapter.java Fri Jan 7 08:03:24 2005 @@ -18,7 +18,6 @@ import org.apache.ldap.common.schema.AttributeType; -import org.apache.ldap.server.schema.AttributeTypeRegistryMonitor; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistry.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistry.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistry.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistry.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistry.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistry.java Fri Jan 7 08:03:24 2005 @@ -18,7 +18,6 @@ import java.util.Comparator; - import javax.naming.NamingException; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitor.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitor.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitor.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitor.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitor.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitor.java Fri Jan 7 08:03:24 2005 @@ -18,7 +18,6 @@ import java.util.Comparator; - import javax.naming.NamingException; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitorAdapter.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitorAdapter.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitorAdapter.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitorAdapter.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitorAdapter.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitorAdapter.java Fri Jan 7 08:03:24 2005 @@ -18,10 +18,7 @@ import java.util.Comparator; - import javax.naming.NamingException; - -import org.apache.ldap.server.schema.ComparatorRegistryMonitor; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ConcreteNameComponentNormalizer.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ConcreteNameComponentNormalizer.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ConcreteNameComponentNormalizer.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ConcreteNameComponentNormalizer.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ConcreteNameComponentNormalizer.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ConcreteNameComponentNormalizer.java Fri Jan 7 08:03:24 2005 @@ -19,10 +19,9 @@ import javax.naming.NamingException; -import org.apache.ldap.common.schema.Normalizer; -import org.apache.ldap.common.schema.AttributeType; import org.apache.ldap.common.name.NameComponentNormalizer; -import org.apache.ldap.server.schema.AttributeTypeRegistry; +import org.apache.ldap.common.schema.AttributeType; +import org.apache.ldap.common.schema.Normalizer; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistryMonitorAdapter.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistryMonitorAdapter.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistryMonitorAdapter.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistryMonitorAdapter.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistryMonitorAdapter.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistryMonitorAdapter.java Fri Jan 7 08:03:24 2005 @@ -18,7 +18,6 @@ import org.apache.ldap.common.schema.DITContentRule; -import org.apache.ldap.server.schema.DITContentRuleRegistryMonitor; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistryMonitorAdapter.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistryMonitorAdapter.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistryMonitorAdapter.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistryMonitorAdapter.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistryMonitorAdapter.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistryMonitorAdapter.java Fri Jan 7 08:03:24 2005 @@ -18,7 +18,6 @@ import org.apache.ldap.common.schema.DITStructureRule; -import org.apache.ldap.server.schema.DITStructureRuleRegistryMonitor; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java Fri Jan 7 08:03:24 2005 @@ -17,20 +17,15 @@ package org.apache.ldap.server.schema; -import java.util.Map; import java.util.HashMap; import java.util.Iterator; +import java.util.Map; import javax.naming.NamingException; -import org.apache.ldap.common.util.JoinIterator; import org.apache.ldap.common.schema.AttributeType; - +import org.apache.ldap.common.util.JoinIterator; import org.apache.ldap.server.SystemPartition; import org.apache.ldap.server.schema.bootstrap.BootstrapAttributeTypeRegistry; -import org.apache.ldap.server.schema.AttributeTypeRegistry; -import org.apache.ldap.server.schema.AttributeTypeRegistryMonitor; -import org.apache.ldap.server.schema.AttributeTypeRegistryMonitorAdapter; -import org.apache.ldap.server.SystemPartition; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java Fri Jan 7 08:03:24 2005 @@ -17,18 +17,13 @@ package org.apache.ldap.server.schema; -import java.util.Map; -import java.util.HashMap; import java.util.Comparator; +import java.util.HashMap; +import java.util.Map; import javax.naming.NamingException; -import org.apache.ldap.server.schema.bootstrap.BootstrapComparatorRegistry; import org.apache.ldap.server.SystemPartition; import org.apache.ldap.server.schema.bootstrap.BootstrapComparatorRegistry; -import org.apache.ldap.server.schema.ComparatorRegistry; -import org.apache.ldap.server.schema.ComparatorRegistryMonitor; -import org.apache.ldap.server.schema.ComparatorRegistryMonitorAdapter; -import org.apache.ldap.server.SystemPartition; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java Fri Jan 7 08:03:24 2005 @@ -17,21 +17,15 @@ package org.apache.ldap.server.schema; -import java.util.Map; import java.util.HashMap; import java.util.Iterator; +import java.util.Map; import javax.naming.NamingException; import org.apache.ldap.common.schema.DITContentRule; import org.apache.ldap.common.util.JoinIterator; -import org.apache.ldap.server.schema.bootstrap.BootstrapDitContentRuleRegistry; - import org.apache.ldap.server.SystemPartition; import org.apache.ldap.server.schema.bootstrap.BootstrapDitContentRuleRegistry; -import org.apache.ldap.server.schema.DITContentRuleRegistry; -import org.apache.ldap.server.schema.DITContentRuleRegistryMonitor; -import org.apache.ldap.server.schema.DITContentRuleRegistryMonitorAdapter; -import org.apache.ldap.server.SystemPartition; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java Fri Jan 7 08:03:24 2005 @@ -17,20 +17,15 @@ package org.apache.ldap.server.schema; -import java.util.Map; import java.util.HashMap; import java.util.Iterator; +import java.util.Map; import javax.naming.NamingException; import org.apache.ldap.common.schema.DITStructureRule; import org.apache.ldap.common.util.JoinIterator; - import org.apache.ldap.server.SystemPartition; import org.apache.ldap.server.schema.bootstrap.BootstrapDitStructureRuleRegistry; -import org.apache.ldap.server.schema.DITStructureRuleRegistry; -import org.apache.ldap.server.schema.DITStructureRuleRegistryMonitor; -import org.apache.ldap.server.schema.DITStructureRuleRegistryMonitorAdapter; -import org.apache.ldap.server.SystemPartition; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java Fri Jan 7 08:03:24 2005 @@ -17,18 +17,15 @@ package org.apache.ldap.server.schema; -import java.util.Map; import java.util.HashMap; import java.util.Iterator; +import java.util.Map; import javax.naming.NamingException; import org.apache.ldap.common.schema.MatchingRule; import org.apache.ldap.common.util.JoinIterator; -import org.apache.ldap.server.schema.bootstrap.BootstrapMatchingRuleRegistry; - import org.apache.ldap.server.SystemPartition; import org.apache.ldap.server.schema.bootstrap.BootstrapMatchingRuleRegistry; -import org.apache.ldap.server.SystemPartition; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java Fri Jan 7 08:03:24 2005 @@ -17,17 +17,15 @@ package org.apache.ldap.server.schema; -import java.util.Map; import java.util.HashMap; import java.util.Iterator; +import java.util.Map; import javax.naming.NamingException; import org.apache.ldap.common.schema.MatchingRuleUse; import org.apache.ldap.common.util.JoinIterator; - import org.apache.ldap.server.SystemPartition; import org.apache.ldap.server.schema.bootstrap.BootstrapMatchingRuleUseRegistry; -import org.apache.ldap.server.SystemPartition; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java Fri Jan 7 08:03:24 2005 @@ -17,18 +17,15 @@ package org.apache.ldap.server.schema; -import java.util.Map; import java.util.HashMap; import java.util.Iterator; +import java.util.Map; import javax.naming.NamingException; import org.apache.ldap.common.schema.NameForm; import org.apache.ldap.common.util.JoinIterator; -import org.apache.ldap.server.schema.bootstrap.BootstrapNameFormRegistry; - import org.apache.ldap.server.SystemPartition; import org.apache.ldap.server.schema.bootstrap.BootstrapNameFormRegistry; -import org.apache.ldap.server.SystemPartition; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java Fri Jan 7 08:03:24 2005 @@ -17,16 +17,13 @@ package org.apache.ldap.server.schema; -import java.util.Map; import java.util.HashMap; +import java.util.Map; import javax.naming.NamingException; import org.apache.ldap.common.schema.Normalizer; -import org.apache.ldap.server.schema.bootstrap.BootstrapNormalizerRegistry; - import org.apache.ldap.server.SystemPartition; import org.apache.ldap.server.schema.bootstrap.BootstrapNormalizerRegistry; -import org.apache.ldap.server.SystemPartition; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java Fri Jan 7 08:03:24 2005 @@ -17,18 +17,15 @@ package org.apache.ldap.server.schema; -import java.util.Map; import java.util.HashMap; import java.util.Iterator; +import java.util.Map; import javax.naming.NamingException; import org.apache.ldap.common.schema.ObjectClass; import org.apache.ldap.common.util.JoinIterator; -import org.apache.ldap.server.schema.bootstrap.BootstrapObjectClassRegistry; - import org.apache.ldap.server.SystemPartition; import org.apache.ldap.server.schema.bootstrap.BootstrapObjectClassRegistry; -import org.apache.ldap.server.SystemPartition; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalOidRegistry.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalOidRegistry.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalOidRegistry.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalOidRegistry.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalOidRegistry.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalOidRegistry.java Fri Jan 7 08:03:24 2005 @@ -17,18 +17,11 @@ package org.apache.ldap.server.schema; -import java.util.List; -import java.util.Iterator; -import java.util.ArrayList; -import java.util.Hashtable; -import java.util.Collections; - +import java.util.*; import javax.naming.NamingException; import org.apache.ldap.server.SystemPartition; import org.apache.ldap.server.schema.bootstrap.BootstrapOidRegistry; -import org.apache.ldap.server.schema.bootstrap.BootstrapOidRegistry; -import org.apache.ldap.server.SystemPartition; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalRegistries.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalRegistries.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalRegistries.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalRegistries.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalRegistries.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalRegistries.java Fri Jan 7 08:03:24 2005 @@ -20,16 +20,14 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; - import javax.naming.NamingException; +import org.apache.ldap.common.schema.AttributeType; +import org.apache.ldap.common.schema.MatchingRule; import org.apache.ldap.common.schema.ObjectClass; import org.apache.ldap.common.schema.Syntax; -import org.apache.ldap.common.schema.MatchingRule; -import org.apache.ldap.common.schema.AttributeType; -import org.apache.ldap.server.schema.bootstrap.*; -import org.apache.ldap.server.SystemPartition; import org.apache.ldap.server.SystemPartition; +import org.apache.ldap.server.schema.bootstrap.*; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java Fri Jan 7 08:03:24 2005 @@ -17,15 +17,13 @@ package org.apache.ldap.server.schema; -import java.util.Map; import java.util.HashMap; +import java.util.Map; import javax.naming.NamingException; import org.apache.ldap.common.schema.SyntaxChecker; - import org.apache.ldap.server.SystemPartition; import org.apache.ldap.server.schema.bootstrap.BootstrapSyntaxCheckerRegistry; -import org.apache.ldap.server.SystemPartition; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxRegistry.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxRegistry.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxRegistry.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxRegistry.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxRegistry.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxRegistry.java Fri Jan 7 08:03:24 2005 @@ -17,18 +17,15 @@ package org.apache.ldap.server.schema; -import java.util.Map; import java.util.HashMap; import java.util.Iterator; +import java.util.Map; import javax.naming.NamingException; import org.apache.ldap.common.schema.Syntax; import org.apache.ldap.common.util.JoinIterator; -import org.apache.ldap.server.schema.bootstrap.BootstrapSyntaxRegistry; - import org.apache.ldap.server.SystemPartition; import org.apache.ldap.server.schema.bootstrap.BootstrapSyntaxRegistry; -import org.apache.ldap.server.SystemPartition; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitor.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitor.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitor.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitor.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitor.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitor.java Fri Jan 7 08:03:24 2005 @@ -17,7 +17,7 @@ package org.apache.ldap.server.schema; -import javax.naming.NamingException ; +import javax.naming.NamingException; import org.apache.ldap.common.schema.MatchingRule; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitorAdapter.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitorAdapter.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitorAdapter.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitorAdapter.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitorAdapter.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitorAdapter.java Fri Jan 7 08:03:24 2005 @@ -20,7 +20,6 @@ import javax.naming.NamingException; import org.apache.ldap.common.schema.MatchingRule; -import org.apache.ldap.server.schema.MatchingRuleRegistryMonitor; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistryMonitorAdapter.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistryMonitorAdapter.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistryMonitorAdapter.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistryMonitorAdapter.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistryMonitorAdapter.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistryMonitorAdapter.java Fri Jan 7 08:03:24 2005 @@ -18,7 +18,6 @@ import org.apache.ldap.common.schema.MatchingRuleUse; -import org.apache.ldap.server.schema.MatchingRuleUseRegistryMonitor; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistryMonitorAdapter.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistryMonitorAdapter.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistryMonitorAdapter.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistryMonitorAdapter.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistryMonitorAdapter.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistryMonitorAdapter.java Fri Jan 7 08:03:24 2005 @@ -18,7 +18,6 @@ import org.apache.ldap.common.schema.NameForm; -import org.apache.ldap.server.schema.NameFormRegistryMonitor; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitorAdapter.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitorAdapter.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitorAdapter.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitorAdapter.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitorAdapter.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitorAdapter.java Fri Jan 7 08:03:24 2005 @@ -20,7 +20,6 @@ import javax.naming.NamingException; import org.apache.ldap.common.schema.Normalizer; -import org.apache.ldap.server.schema.NormalizerRegistryMonitor; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistryMonitorAdapter.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistryMonitorAdapter.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistryMonitorAdapter.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistryMonitorAdapter.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistryMonitorAdapter.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistryMonitorAdapter.java Fri Jan 7 08:03:24 2005 @@ -18,7 +18,6 @@ import org.apache.ldap.common.schema.ObjectClass; -import org.apache.ldap.server.schema.ObjectClassRegistryMonitor; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistry.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistry.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistry.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistry.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistry.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistry.java Fri Jan 7 08:03:24 2005 @@ -17,9 +17,8 @@ package org.apache.ldap.server.schema; -import java.util.List; import java.util.Iterator; - +import java.util.List; import javax.naming.NamingException; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitor.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitor.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitor.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitor.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitor.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitor.java Fri Jan 7 08:03:24 2005 @@ -18,7 +18,6 @@ import java.util.List; - import javax.naming.NamingException; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitorAdapter.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitorAdapter.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitorAdapter.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitorAdapter.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitorAdapter.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitorAdapter.java Fri Jan 7 08:03:24 2005 @@ -17,10 +17,7 @@ package org.apache.ldap.server.schema; import java.util.List; - import javax.naming.NamingException; - -import org.apache.ldap.server.schema.OidRegistryMonitor; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/Registries.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/Registries.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/Registries.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/Registries.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/Registries.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/Registries.java Fri Jan 7 08:03:24 2005 @@ -19,8 +19,6 @@ import java.util.List; -import org.apache.ldap.server.schema.*; - /** * Document this class. Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java Fri Jan 7 08:03:24 2005 @@ -17,11 +17,9 @@ package org.apache.ldap.server.schema; -import java.util.Comparator; import java.io.Serializable; +import java.util.Comparator; import javax.naming.NamingException; - -import org.apache.ldap.server.schema.ComparatorRegistry; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitorAdapter.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitorAdapter.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitorAdapter.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitorAdapter.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitorAdapter.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitorAdapter.java Fri Jan 7 08:03:24 2005 @@ -20,7 +20,6 @@ import javax.naming.NamingException; import org.apache.ldap.common.schema.Syntax; -import org.apache.ldap.server.schema.SyntaxRegistryMonitor; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapAttributeTypeRegistry.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapAttributeTypeRegistry.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapAttributeTypeRegistry.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapAttributeTypeRegistry.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapAttributeTypeRegistry.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapAttributeTypeRegistry.java Fri Jan 7 08:03:24 2005 @@ -17,16 +17,16 @@ package org.apache.ldap.server.schema.bootstrap; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import javax.naming.NamingException; + import org.apache.ldap.common.schema.AttributeType; import org.apache.ldap.server.schema.AttributeTypeRegistry; import org.apache.ldap.server.schema.AttributeTypeRegistryMonitor; -import org.apache.ldap.server.schema.OidRegistry; import org.apache.ldap.server.schema.AttributeTypeRegistryMonitorAdapter; - -import java.util.Map; -import java.util.HashMap; -import java.util.Iterator; -import javax.naming.NamingException; +import org.apache.ldap.server.schema.OidRegistry; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapComparatorRegistry.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapComparatorRegistry.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapComparatorRegistry.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapComparatorRegistry.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapComparatorRegistry.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapComparatorRegistry.java Fri Jan 7 08:03:24 2005 @@ -17,15 +17,15 @@ package org.apache.ldap.server.schema.bootstrap; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Map; +import javax.naming.NamingException; + +import org.apache.ldap.server.schema.ComparatorRegistry; import org.apache.ldap.server.schema.ComparatorRegistryMonitor; import org.apache.ldap.server.schema.ComparatorRegistryMonitorAdapter; -import org.apache.ldap.server.schema.*; import org.apache.ldap.server.schema.SerializableComparator; - -import java.util.Map; -import java.util.HashMap; -import java.util.Comparator; -import javax.naming.NamingException; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitContentRuleRegistry.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitContentRuleRegistry.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitContentRuleRegistry.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitContentRuleRegistry.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitContentRuleRegistry.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitContentRuleRegistry.java Fri Jan 7 08:03:24 2005 @@ -17,16 +17,16 @@ package org.apache.ldap.server.schema.bootstrap; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import javax.naming.NamingException; + import org.apache.ldap.common.schema.DITContentRule; import org.apache.ldap.server.schema.DITContentRuleRegistry; -import org.apache.ldap.server.schema.OidRegistry; import org.apache.ldap.server.schema.DITContentRuleRegistryMonitor; import org.apache.ldap.server.schema.DITContentRuleRegistryMonitorAdapter; - -import java.util.Map; -import java.util.HashMap; -import java.util.Iterator; -import javax.naming.NamingException; +import org.apache.ldap.server.schema.OidRegistry; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitStructureRuleRegistry.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitStructureRuleRegistry.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitStructureRuleRegistry.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitStructureRuleRegistry.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitStructureRuleRegistry.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitStructureRuleRegistry.java Fri Jan 7 08:03:24 2005 @@ -17,16 +17,16 @@ package org.apache.ldap.server.schema.bootstrap; -import org.apache.ldap.common.schema.DITStructureRule; -import org.apache.ldap.server.schema.OidRegistry; -import org.apache.ldap.server.schema.DITStructureRuleRegistryMonitor; -import org.apache.ldap.server.schema.DITStructureRuleRegistryMonitorAdapter; -import org.apache.ldap.server.schema.*; - -import java.util.Map; import java.util.HashMap; import java.util.Iterator; +import java.util.Map; import javax.naming.NamingException; + +import org.apache.ldap.common.schema.DITStructureRule; +import org.apache.ldap.server.schema.DITStructureRuleRegistry; +import org.apache.ldap.server.schema.DITStructureRuleRegistryMonitor; +import org.apache.ldap.server.schema.DITStructureRuleRegistryMonitorAdapter; +import org.apache.ldap.server.schema.OidRegistry; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleRegistry.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleRegistry.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleRegistry.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleRegistry.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleRegistry.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleRegistry.java Fri Jan 7 08:03:24 2005 @@ -17,17 +17,16 @@ package org.apache.ldap.server.schema.bootstrap; -import org.apache.ldap.common.schema.MatchingRule; -import org.apache.ldap.server.schema.MatchingRuleRegistry; -import org.apache.ldap.server.schema.OidRegistry; -import org.apache.ldap.server.schema.MatchingRuleRegistryMonitor; -import org.apache.ldap.server.schema.*; - -import java.util.Map; import java.util.HashMap; import java.util.Iterator; - +import java.util.Map; import javax.naming.NamingException; + +import org.apache.ldap.common.schema.MatchingRule; +import org.apache.ldap.server.schema.MatchingRuleRegistry; +import org.apache.ldap.server.schema.MatchingRuleRegistryMonitor; +import org.apache.ldap.server.schema.MatchingRuleRegistryMonitorAdapter; +import org.apache.ldap.server.schema.OidRegistry; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java Fri Jan 7 08:03:24 2005 @@ -17,15 +17,15 @@ package org.apache.ldap.server.schema.bootstrap; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import javax.naming.NamingException; + import org.apache.ldap.common.schema.MatchingRuleUse; import org.apache.ldap.server.schema.MatchingRuleUseRegistry; import org.apache.ldap.server.schema.MatchingRuleUseRegistryMonitor; import org.apache.ldap.server.schema.MatchingRuleUseRegistryMonitorAdapter; - -import java.util.Map; -import java.util.HashMap; -import java.util.Iterator; -import javax.naming.NamingException; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNameFormRegistry.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNameFormRegistry.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNameFormRegistry.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNameFormRegistry.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNameFormRegistry.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNameFormRegistry.java Fri Jan 7 08:03:24 2005 @@ -17,17 +17,16 @@ package org.apache.ldap.server.schema.bootstrap; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import javax.naming.NamingException; + import org.apache.ldap.common.schema.NameForm; import org.apache.ldap.server.schema.NameFormRegistry; -import org.apache.ldap.server.schema.OidRegistry; import org.apache.ldap.server.schema.NameFormRegistryMonitor; -import org.apache.ldap.server.schema.*; import org.apache.ldap.server.schema.NameFormRegistryMonitorAdapter; - -import java.util.Map; -import java.util.HashMap; -import java.util.Iterator; -import javax.naming.NamingException; +import org.apache.ldap.server.schema.OidRegistry; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNormalizerRegistry.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNormalizerRegistry.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNormalizerRegistry.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNormalizerRegistry.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNormalizerRegistry.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNormalizerRegistry.java Fri Jan 7 08:03:24 2005 @@ -17,14 +17,14 @@ package org.apache.ldap.server.schema.bootstrap; +import java.util.HashMap; +import java.util.Map; +import javax.naming.NamingException; + import org.apache.ldap.common.schema.Normalizer; import org.apache.ldap.server.schema.NormalizerRegistry; import org.apache.ldap.server.schema.NormalizerRegistryMonitor; import org.apache.ldap.server.schema.NormalizerRegistryMonitorAdapter; - -import java.util.Map; -import java.util.HashMap; -import javax.naming.NamingException; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectClassRegistry.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectClassRegistry.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectClassRegistry.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectClassRegistry.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectClassRegistry.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectClassRegistry.java Fri Jan 7 08:03:24 2005 @@ -17,16 +17,16 @@ package org.apache.ldap.server.schema.bootstrap; -import java.util.Map; import java.util.HashMap; import java.util.Iterator; +import java.util.Map; import javax.naming.NamingException; import org.apache.ldap.common.schema.ObjectClass; import org.apache.ldap.server.schema.ObjectClassRegistry; import org.apache.ldap.server.schema.ObjectClassRegistryMonitor; -import org.apache.ldap.server.schema.OidRegistry; import org.apache.ldap.server.schema.ObjectClassRegistryMonitorAdapter; +import org.apache.ldap.server.schema.OidRegistry; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapOidRegistry.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapOidRegistry.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapOidRegistry.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapOidRegistry.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapOidRegistry.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapOidRegistry.java Fri Jan 7 08:03:24 2005 @@ -17,17 +17,12 @@ package org.apache.ldap.server.schema.bootstrap; +import java.util.*; +import javax.naming.NamingException; + import org.apache.ldap.server.schema.OidRegistry; import org.apache.ldap.server.schema.OidRegistryMonitor; import org.apache.ldap.server.schema.OidRegistryMonitorAdapter; - -import java.util.List; -import java.util.Iterator; -import java.util.ArrayList; -import java.util.Hashtable; -import java.util.Collections; - -import javax.naming.NamingException; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapRegistries.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapRegistries.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapRegistries.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapRegistries.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapRegistries.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapRegistries.java Fri Jan 7 08:03:24 2005 @@ -20,13 +20,12 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; - import javax.naming.NamingException; +import org.apache.ldap.common.schema.AttributeType; +import org.apache.ldap.common.schema.MatchingRule; import org.apache.ldap.common.schema.ObjectClass; import org.apache.ldap.common.schema.Syntax; -import org.apache.ldap.common.schema.MatchingRule; -import org.apache.ldap.common.schema.AttributeType; import org.apache.ldap.server.schema.*; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoader.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoader.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoader.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoader.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoader.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoader.java Fri Jan 7 08:03:24 2005 @@ -18,7 +18,6 @@ import java.util.*; - import javax.naming.NamingException; import org.apache.ldap.common.schema.*; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java Fri Jan 7 08:03:24 2005 @@ -17,14 +17,14 @@ package org.apache.ldap.server.schema.bootstrap; +import java.util.HashMap; +import java.util.Map; +import javax.naming.NamingException; + import org.apache.ldap.common.schema.SyntaxChecker; import org.apache.ldap.server.schema.SyntaxCheckerRegistry; import org.apache.ldap.server.schema.SyntaxCheckerRegistryMonitor; import org.apache.ldap.server.schema.SyntaxCheckerRegistryMonitorAdapter; - -import java.util.Map; -import java.util.HashMap; -import javax.naming.NamingException; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxRegistry.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxRegistry.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxRegistry.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxRegistry.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxRegistry.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxRegistry.java Fri Jan 7 08:03:24 2005 @@ -17,17 +17,16 @@ package org.apache.ldap.server.schema.bootstrap; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import javax.naming.NamingException; + import org.apache.ldap.common.schema.Syntax; import org.apache.ldap.server.schema.OidRegistry; import org.apache.ldap.server.schema.SyntaxRegistry; import org.apache.ldap.server.schema.SyntaxRegistryMonitor; import org.apache.ldap.server.schema.SyntaxRegistryMonitorAdapter; - -import java.util.Map; -import java.util.HashMap; -import java.util.Iterator; - -import javax.naming.NamingException; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveComparatorProducer.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveComparatorProducer.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveComparatorProducer.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveComparatorProducer.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveComparatorProducer.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveComparatorProducer.java Fri Jan 7 08:03:24 2005 @@ -20,9 +20,9 @@ import java.util.Comparator; import javax.naming.NamingException; +import jdbm.helper.StringComparator; import org.apache.ldap.common.schema.ComparableComparator; import org.apache.ldap.common.util.BigIntegerComparator; -import jdbm.helper.StringComparator; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveNormalizerProducer.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveNormalizerProducer.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveNormalizerProducer.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveNormalizerProducer.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveNormalizerProducer.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveNormalizerProducer.java Fri Jan 7 08:03:24 2005 @@ -19,8 +19,8 @@ import javax.naming.NamingException; -import org.apache.ldap.common.schema.Normalizer; import org.apache.ldap.common.schema.NoOpNormalizer; +import org.apache.ldap.common.schema.Normalizer; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonMatchingRuleProducer.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonMatchingRuleProducer.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonMatchingRuleProducer.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonMatchingRuleProducer.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonMatchingRuleProducer.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonMatchingRuleProducer.java Fri Jan 7 08:03:24 2005 @@ -19,11 +19,6 @@ import javax.naming.NamingException; -import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum; -import org.apache.ldap.server.schema.bootstrap.ProducerCallback; -import org.apache.ldap.server.schema.bootstrap.BootstrapRegistries; -import org.apache.ldap.server.schema.bootstrap.AbstractBootstrapProducer; - /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonNormalizerProducer.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonNormalizerProducer.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonNormalizerProducer.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonNormalizerProducer.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonNormalizerProducer.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonNormalizerProducer.java Fri Jan 7 08:03:24 2005 @@ -19,9 +19,10 @@ import javax.naming.NamingException; -import org.apache.ldap.common.schema.*; -import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum; -import org.apache.ldap.server.schema.bootstrap.ProducerCallback; +import org.apache.ldap.common.schema.CachingNormalizer; +import org.apache.ldap.common.schema.DeepTrimNormalizer; +import org.apache.ldap.common.schema.DeepTrimToLowerNormalizer; +import org.apache.ldap.common.schema.Normalizer; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisComparatorProducer.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisComparatorProducer.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisComparatorProducer.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisComparatorProducer.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisComparatorProducer.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisComparatorProducer.java Fri Jan 7 08:03:24 2005 @@ -20,10 +20,10 @@ import java.util.Comparator; import javax.naming.NamingException; -import org.apache.ldap.common.schema.NormalizingComparator; import org.apache.ldap.common.schema.CachingNormalizer; -import org.apache.ldap.common.schema.DeepTrimNormalizer; import org.apache.ldap.common.schema.ComparableComparator; +import org.apache.ldap.common.schema.DeepTrimNormalizer; +import org.apache.ldap.common.schema.NormalizingComparator; /** Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisNormalizerProducer.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisNormalizerProducer.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisNormalizerProducer.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisNormalizerProducer.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisNormalizerProducer.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisNormalizerProducer.java Fri Jan 7 08:03:24 2005 @@ -22,10 +22,6 @@ import org.apache.ldap.common.schema.CachingNormalizer; import org.apache.ldap.common.schema.DeepTrimNormalizer; import org.apache.ldap.common.schema.Normalizer; -import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum; -import org.apache.ldap.server.schema.bootstrap.ProducerCallback; -import org.apache.ldap.server.schema.bootstrap.BootstrapRegistries; -import org.apache.ldap.server.schema.bootstrap.AbstractBootstrapProducer; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxCheckerProducer.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxCheckerProducer.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxCheckerProducer.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxCheckerProducer.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxCheckerProducer.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxCheckerProducer.java Fri Jan 7 08:03:24 2005 @@ -19,12 +19,8 @@ import javax.naming.NamingException; -import org.apache.ldap.common.schema.SyntaxChecker; import org.apache.ldap.common.schema.AcceptAllSyntaxChecker; -import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum; -import org.apache.ldap.server.schema.bootstrap.ProducerCallback; -import org.apache.ldap.server.schema.bootstrap.BootstrapRegistries; -import org.apache.ldap.server.schema.bootstrap.AbstractBootstrapProducer; +import org.apache.ldap.common.schema.SyntaxChecker; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemMatchingRuleProducer.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemMatchingRuleProducer.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemMatchingRuleProducer.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemMatchingRuleProducer.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemMatchingRuleProducer.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemMatchingRuleProducer.java Fri Jan 7 08:03:24 2005 @@ -19,11 +19,6 @@ import javax.naming.NamingException; -import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum; -import org.apache.ldap.server.schema.bootstrap.ProducerCallback; -import org.apache.ldap.server.schema.bootstrap.BootstrapRegistries; -import org.apache.ldap.server.schema.bootstrap.AbstractBootstrapProducer; - /** * A simple maching rule configuration where objects and java code are used Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java Fri Jan 7 08:03:24 2005 @@ -20,11 +20,6 @@ import javax.naming.NamingException; import org.apache.ldap.common.schema.*; -import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum; -import org.apache.ldap.server.schema.bootstrap.ProducerCallback; -import org.apache.ldap.server.schema.bootstrap.BootstrapRegistries; -import org.apache.ldap.server.schema.bootstrap.AbstractBootstrapProducer; -import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer; import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer; Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxCheckerProducer.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxCheckerProducer.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxCheckerProducer.java&r1=124524&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxCheckerProducer.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxCheckerProducer.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxCheckerProducer.java Fri Jan 7 08:03:24 2005 @@ -19,9 +19,9 @@ import javax.naming.NamingException; -import org.apache.ldap.common.schema.SyntaxChecker; -import org.apache.ldap.common.schema.BinarySyntaxChecker; import org.apache.ldap.common.schema.AcceptAllSyntaxChecker; +import org.apache.ldap.common.schema.BinarySyntaxChecker; +import org.apache.ldap.common.schema.SyntaxChecker; /** Modified: incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/AbstractJndiTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/AbstractJndiTest.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/AbstractJndiTest.java&r1=124524&p2=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/AbstractJndiTest.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/AbstractJndiTest.java (original) +++ incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/AbstractJndiTest.java Fri Jan 7 08:03:24 2005 @@ -17,14 +17,14 @@ package org.apache.ldap.server.jndi; -import java.util.Hashtable; import java.io.File; import java.io.IOException; -import javax.naming.ldap.LdapContext; -import javax.naming.ldap.InitialLdapContext; +import java.util.Hashtable; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; +import javax.naming.ldap.InitialLdapContext; +import javax.naming.ldap.LdapContext; import junit.framework.TestCase; import org.apache.commons.io.FileUtils; Modified: incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/EveContextFactoryTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/EveContextFactoryTest.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/EveContextFactoryTest.java&r1=124524&p2=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/EveContextFactoryTest.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/EveContextFactoryTest.java (original) +++ incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/EveContextFactoryTest.java Fri Jan 7 08:03:24 2005 @@ -18,11 +18,10 @@ import java.util.Hashtable; - -import javax.naming.directory.*; import javax.naming.Context; -import javax.naming.NamingException; import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.naming.directory.*; /** Modified: incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ImportConfirmationTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ImportConfirmationTest.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ImportConfirmationTest.java&r1=124524&p2=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ImportConfirmationTest.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ImportConfirmationTest.java (original) +++ incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ImportConfirmationTest.java Fri Jan 7 08:03:24 2005 @@ -18,19 +18,18 @@ import java.io.InputStream; - -import javax.naming.directory.Attributes; -import javax.naming.directory.Attribute; import javax.naming.Name; import javax.naming.NamingEnumeration; import javax.naming.NamingException; +import javax.naming.directory.Attribute; +import javax.naming.directory.Attributes; +import org.apache.ldap.common.exception.LdapConfigurationException; +import org.apache.ldap.common.ldif.LdifIterator; import org.apache.ldap.common.ldif.LdifParser; import org.apache.ldap.common.ldif.LdifParserImpl; -import org.apache.ldap.common.ldif.LdifIterator; import org.apache.ldap.common.message.LockableAttributesImpl; import org.apache.ldap.common.name.LdapName; -import org.apache.ldap.common.exception.LdapConfigurationException; /** Modified: incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ListTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ListTest.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ListTest.java&r1=124524&p2=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ListTest.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ListTest.java (original) +++ incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ListTest.java Fri Jan 7 08:03:24 2005 @@ -18,11 +18,9 @@ import java.util.HashSet; -import javax.naming.NamingException; -import javax.naming.NamingEnumeration; import javax.naming.NameClassPair; - -import org.apache.ldap.server.jndi.AbstractMultiUserJndiTest; +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; /** Modified: incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ModifyContextTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ModifyContextTest.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ModifyContextTest.java&r1=124524&p2=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ModifyContextTest.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ModifyContextTest.java (original) +++ incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ModifyContextTest.java Fri Jan 7 08:03:24 2005 @@ -17,8 +17,8 @@ package org.apache.ldap.server.jndi; -import javax.naming.directory.*; import javax.naming.NamingException; +import javax.naming.directory.*; /** Modified: incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/PartitionContextBuilderTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/PartitionContextBuilderTest.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/PartitionContextBuilderTest.java&r1=124524&p2=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/PartitionContextBuilderTest.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/PartitionContextBuilderTest.java (original) +++ incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/PartitionContextBuilderTest.java Fri Jan 7 08:03:24 2005 @@ -18,15 +18,13 @@ import java.util.Hashtable; - import javax.naming.NamingException; -import org.apache.eve.ContextPartitionConfig; -import org.apache.ldap.common.util.ArrayUtils; -import org.apache.ldap.common.message.LockableAttributesImpl; -import org.apache.ldap.common.message.LockableAttributeImpl; - import junit.framework.TestCase; +import org.apache.ldap.common.message.LockableAttributeImpl; +import org.apache.ldap.common.message.LockableAttributesImpl; +import org.apache.ldap.common.util.ArrayUtils; +import org.apache.ldap.server.ContextPartitionConfig; /** Modified: incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/RFC2713Tests.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/RFC2713Tests.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/RFC2713Tests.java&r1=124524&p2=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/RFC2713Tests.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/RFC2713Tests.java (original) +++ incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/RFC2713Tests.java Fri Jan 7 08:03:24 2005 @@ -18,8 +18,8 @@ import java.util.ArrayList; -import javax.naming.directory.Attributes; import javax.naming.directory.Attribute; +import javax.naming.directory.Attributes; /** Modified: incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/RootDSETest.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/RootDSETest.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/RootDSETest.java&r1=124524&p2=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/RootDSETest.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/RootDSETest.java (original) +++ incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/RootDSETest.java Fri Jan 7 08:03:24 2005 @@ -17,10 +17,9 @@ package org.apache.ldap.server.jndi; -import java.util.Hashtable; import java.io.File; import java.io.IOException; - +import java.util.Hashtable; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; Modified: incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/SearchContextTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/SearchContextTest.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/SearchContextTest.java&r1=124524&p2=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/SearchContextTest.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/SearchContextTest.java (original) +++ incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/SearchContextTest.java Fri Jan 7 08:03:24 2005 @@ -18,8 +18,8 @@ import java.util.HashMap; -import javax.naming.NamingException; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; import javax.naming.directory.*; import org.apache.ldap.common.message.DerefAliasesEnum; Modified: incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/SimpleAuthenticationTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/SimpleAuthenticationTest.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/SimpleAuthenticationTest.java&r1=124524&p2=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/SimpleAuthenticationTest.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/SimpleAuthenticationTest.java (original) +++ incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/SimpleAuthenticationTest.java Fri Jan 7 08:03:24 2005 @@ -19,16 +19,19 @@ import java.io.File; import java.util.Hashtable; -import javax.naming.directory.DirContext; +import javax.naming.ConfigurationException; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; +import javax.naming.directory.DirContext; import javax.naming.directory.InitialDirContext; -import javax.naming.directory.Attribute; -import javax.naming.*; import javax.naming.ldap.InitialLdapContext; -import org.apache.ldap.common.util.ArrayUtils; import org.apache.ldap.common.exception.LdapConfigurationException; import org.apache.ldap.common.exception.LdapNoPermissionException; +import org.apache.ldap.common.util.ArrayUtils; /** Modified: incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/AuthorizationServiceTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/AuthorizationServiceTest.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/AuthorizationServiceTest.java&r1=124524&p2=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/AuthorizationServiceTest.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/AuthorizationServiceTest.java (original) +++ incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/AuthorizationServiceTest.java Fri Jan 7 08:03:24 2005 @@ -18,16 +18,16 @@ import java.util.HashSet; -import javax.naming.NamingException; import javax.naming.NamingEnumeration; -import javax.naming.directory.DirContext; +import javax.naming.NamingException; import javax.naming.directory.Attributes; +import javax.naming.directory.DirContext; import javax.naming.directory.SearchControls; -import org.apache.ldap.server.jndi.AbstractMultiUserJndiTest; import org.apache.ldap.common.exception.LdapNoPermissionException; -import org.apache.eve.db.DbSearchResult; import org.apache.ldap.common.message.LockableAttributesImpl; +import org.apache.ldap.server.db.DbSearchResult; +import org.apache.ldap.server.jndi.AbstractMultiUserJndiTest; /** Modified: incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/BinaryAttributeFilterTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/BinaryAttributeFilterTest.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/BinaryAttributeFilterTest.java&r1=124524&p2=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/BinaryAttributeFilterTest.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/BinaryAttributeFilterTest.java (original) +++ incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/BinaryAttributeFilterTest.java Fri Jan 7 08:03:24 2005 @@ -18,12 +18,11 @@ import javax.naming.NamingException; +import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; import javax.naming.directory.BasicAttributes; import javax.naming.directory.DirContext; -import javax.naming.directory.Attribute; -import org.apache.ldap.server.jndi.AbstractJndiTest; import org.apache.ldap.server.jndi.AbstractJndiTest; Modified: incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/EveExceptionServiceTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/EveExceptionServiceTest.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/EveExceptionServiceTest.java&r1=124524&p2=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/EveExceptionServiceTest.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/EveExceptionServiceTest.java (original) +++ incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/EveExceptionServiceTest.java Fri Jan 7 08:03:24 2005 @@ -17,18 +17,18 @@ package org.apache.ldap.server.jndi.ibs; -import javax.naming.NamingException; import javax.naming.Context; import javax.naming.NamingEnumeration; -import javax.naming.ldap.LdapContext; +import javax.naming.NamingException; import javax.naming.directory.*; +import javax.naming.ldap.LdapContext; -import org.apache.ldap.server.jndi.AbstractJndiTest; -import org.apache.ldap.common.exception.LdapNameNotFoundException; import org.apache.ldap.common.exception.LdapContextNotEmptyException; import org.apache.ldap.common.exception.LdapNameAlreadyBoundException; +import org.apache.ldap.common.exception.LdapNameNotFoundException; import org.apache.ldap.common.exception.LdapNamingException; import org.apache.ldap.common.message.ResultCodeEnum; +import org.apache.ldap.server.jndi.AbstractJndiTest; /** Modified: incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/OperationalAttributeServiceTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/OperationalAttributeServiceTest.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/OperationalAttributeServiceTest.java&r1=124524&p2=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/OperationalAttributeServiceTest.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/OperationalAttributeServiceTest.java (original) +++ incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/OperationalAttributeServiceTest.java Fri Jan 7 08:03:24 2005 @@ -17,9 +17,9 @@ package org.apache.ldap.server.jndi.ibs; -import javax.naming.directory.*; -import javax.naming.NamingException; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; +import javax.naming.directory.*; import org.apache.ldap.common.message.DerefAliasesEnum; import org.apache.ldap.server.jndi.AbstractJndiTest; Modified: incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoaderTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoaderTest.java?view=diff&rev=124525&p1=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoaderTest.java&r1=124524&p2=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoaderTest.java&r2=124525 ============================================================================== --- incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoaderTest.java (original) +++ incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoaderTest.java Fri Jan 7 08:03:24 2005 @@ -17,9 +17,9 @@ package org.apache.ldap.server.schema.bootstrap; -import java.util.List; -import java.io.StringWriter; import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.List; import javax.naming.NamingException; import junit.framework.TestCase;
