Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 7994 invoked from network); 14 Jun 2006 03:23:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 14 Jun 2006 03:23:03 -0000 Received: (qmail 48885 invoked by uid 500); 14 Jun 2006 03:22:58 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 48856 invoked by uid 500); 14 Jun 2006 03:22:58 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 48843 invoked by uid 99); 14 Jun 2006 03:22:57 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Jun 2006 20:22:57 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Jun 2006 20:22:51 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 82FC61A9842; Tue, 13 Jun 2006 20:22:31 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r414035 [1/8] - in /directory/trunks/apacheds: ./ core-plugin/ core-shared/ core-unit/ core-unit/src/main/java/org/apache/directory/server/core/unit/ core-unit/src/test/java/org/apache/directory/server/core/ core-unit/src/test/java/org/apac... Date: Wed, 14 Jun 2006 03:22:12 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060614032231.82FC61A9842@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: akarasulu Date: Tue Jun 13 20:22:05 2006 New Revision: 414035 URL: http://svn.apache.org/viewvc?rev=414035&view=rev Log: Merging back changes from optimization branch to the trunks for apacheds proper. Added: directory/trunks/apacheds/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/TestPTest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/TestPTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/AbstractAuthorizationITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/authz/AbstractAuthorizationITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfigurationITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfigurationITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/event/EventServiceITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/event/EventServiceITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ComparatorNPEBugITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/jndi/ComparatorNPEBugITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/CreateContextITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/jndi/CreateContextITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/DestroyContextITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/jndi/DestroyContextITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ExtensibleObjectITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/jndi/ExtensibleObjectITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ListAsAdminITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/jndi/ListAsAdminITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ListAsNonAdminITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/jndi/ListAsNonAdminITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ModifyContextITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/jndi/ModifyContextITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/RFC2713ITests.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/jndi/RFC2713ITests.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ShutdownITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/jndi/ShutdownITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SyncITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/jndi/SyncITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/prefs/ServerPreferencesFactoryITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/prefs/ServerPreferencesFactoryITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/prefs/ServerSystemPreferencesITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/prefs/ServerSystemPreferencesITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/schema/SchemaServiceITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/schema/SchemaServiceITest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceITest.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceITest.java directory/trunks/apacheds/core-unit/src/test/resources/org/apache/directory/server/core/org.apache.directory.server.core.TestPTest.ldif - copied unchanged from r414016, directory/branches/apacheds/optimization/core-unit/src/test/resources/org/apache/directory/server/core/org.apache.directory.server.core.TestPTest.ldif directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/ServerUtils.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/ServerUtils.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/NormalizingVisitor.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/normalization/NormalizingVisitor.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/UndefinedFilterAttributeException.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/normalization/UndefinedFilterAttributeException.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DnComparator.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/schema/DnComparator.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DnNormalizer.java - copied unchanged from r414016, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/schema/DnNormalizer.java Removed: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/AbstractAuthorizationTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfigurationTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/event/EventServiceTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ComparatorNPEBugTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/CreateContextTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/DestroyContextTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ExtensibleObjectTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ListAsAdminTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ListAsNonAdminTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ModifyContextTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/RFC2713Tests.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ShutdownTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SyncTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/prefs/ServerPreferencesFactoryTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/prefs/ServerSystemPreferencesTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceTest.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/ValueNormalizingVisitor.java Modified: directory/trunks/apacheds/ (props changed) directory/trunks/apacheds/core/ (props changed) directory/trunks/apacheds/core-plugin/ (props changed) directory/trunks/apacheds/core-shared/ (props changed) directory/trunks/apacheds/core-unit/ (props changed) directory/trunks/apacheds/core-unit/pom.xml directory/trunks/apacheds/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractTestCase.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryServiceListener.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/LdapPrincipal.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfiguration.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/RemoveDirectoryPartitionConfiguration.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/SearchResultFilteringEnumeration.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/AbstractDirectoryPartition.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultDirectoryPartitionNexus.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartition.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartitionNexus.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartitionNexusProxy.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeDirectoryPartition.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/LeafEvaluator.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryDialog.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionViewer.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmDirectoryPartition.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/prefs/PreferencesUtils.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/referral/ReferralLut.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistry.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ConcreteNameComponentNormalizer.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapAttributeTypeRegistry.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemComparatorProducer.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java directory/trunks/apacheds/core/src/main/schema/apache.schema directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/DummyOidRegistry.java directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/referral/ReferralLutTest.java directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java directory/trunks/apacheds/kerberos-shared/ (props changed) directory/trunks/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/AddPrincipal.java directory/trunks/apacheds/protocol-changepw/ (props changed) directory/trunks/apacheds/protocol-dhcp/ (props changed) directory/trunks/apacheds/protocol-dns/ (props changed) directory/trunks/apacheds/protocol-kerberos/ (props changed) directory/trunks/apacheds/protocol-ldap/ (props changed) directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/AddHandler.java directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/BindHandler.java directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/CompareHandler.java directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DeleteHandler.java directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ModifyDnHandler.java directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ModifyHandler.java directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/PersistentSearchListener.java directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchResponseIterator.java directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java directory/trunks/apacheds/protocol-ntp/ (props changed) directory/trunks/apacheds/protocol-shared/ (props changed) directory/trunks/apacheds/server-jndi/ (props changed) directory/trunks/apacheds/server-main/ (props changed) directory/trunks/apacheds/server-sar/ (props changed) directory/trunks/apacheds/server-ssl/ (props changed) directory/trunks/apacheds/server-tools/ (props changed) directory/trunks/apacheds/server-tools/src/main/java/org/apache/directory/server/tools/DisconnectNotificationCommand.java directory/trunks/apacheds/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java directory/trunks/apacheds/server-unit/ (props changed) directory/trunks/apacheds/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/MatchingRuleCompareTest.java directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/PersistentSearchTest.java directory/trunks/apacheds/server-unit/src/test/resources/log4j.properties Propchange: directory/trunks/apacheds/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Tue Jun 13 20:22:05 2006 @@ -8,3 +8,5 @@ .wtpmodules *.log target + +nbproject Propchange: directory/trunks/apacheds/core/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Tue Jun 13 20:22:05 2006 @@ -11,3 +11,5 @@ *.iws .project .classpath + +nbproject Propchange: directory/trunks/apacheds/core-plugin/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Tue Jun 13 20:22:05 2006 @@ -10,3 +10,5 @@ *.iml *.iws *.ipr + +nbproject Propchange: directory/trunks/apacheds/core-shared/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Tue Jun 13 20:22:05 2006 @@ -10,3 +10,5 @@ *.classpath *.iml *.ser + +nbproject Propchange: directory/trunks/apacheds/core-unit/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Tue Jun 13 20:22:05 2006 @@ -10,3 +10,5 @@ .classpath .project *.log + +nbproject Modified: directory/trunks/apacheds/core-unit/pom.xml URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core-unit/pom.xml?rev=414035&r1=414034&r2=414035&view=diff ============================================================================== --- directory/trunks/apacheds/core-unit/pom.xml (original) +++ directory/trunks/apacheds/core-unit/pom.xml Tue Jun 13 20:22:05 2006 @@ -36,9 +36,10 @@ ${pom.version} + - no-integration-tests + no-integration-or-perf-tests true @@ -48,14 +49,8 @@ maven-surefire-plugin - - **/*Test.java + **/*ITest.java + **/*PTest.java @@ -71,8 +66,9 @@ W A R N I N G ------------- -Integration tests have been disabled. To enable integration -tests run maven with the -Dintegration. +Integration and performance tests have been disabled. To enable +integration tests run maven with the -Dintegration switch. To +enable performance tests run maven with the -Dperformance switch. ================================================================= @@ -83,7 +79,7 @@ - + @@ -91,6 +87,90 @@ integration + + + + maven-surefire-plugin + + + **/*PTest.java + + + + + maven-antrun-plugin + + + validate + + + +================================================================= + I N T E G R A T I O N + --------------------- + +Performance tests have been disabled. To enable +performance tests run maven with the -Dperformance switch. +================================================================= + + + + + run + + + + + + + + + performance + + performance + + + + + maven-surefire-plugin + + + + outputDirectory + ${basedir}/target + + + + **/*ITest.java + + + + + maven-antrun-plugin + + + validate + + + +================================================================= + P E R F O R M A N C E + --------------------- + +Integration tests have been disabled. To enable integration +tests run maven with the -Dintegration switch. +================================================================= + + + + + run + + + + + + Modified: directory/trunks/apacheds/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractTestCase.java URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractTestCase.java?rev=414035&r1=414034&r2=414035&view=diff ============================================================================== --- directory/trunks/apacheds/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractTestCase.java (original) +++ directory/trunks/apacheds/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractTestCase.java Tue Jun 13 20:22:05 2006 @@ -30,7 +30,6 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import javax.naming.directory.Attributes; import javax.naming.ldap.InitialLdapContext; import javax.naming.ldap.LdapContext; @@ -71,9 +70,9 @@ "roomnumber: 4612\n" + "userpassword: test\n"; - private final String username; + protected final String username; - private final String password; + protected final String password; /** the context root for the system partition */ protected LdapContext sysRoot; Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=414035&r1=414034&r2=414035&view=diff ============================================================================== --- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original) +++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Tue Jun 13 20:22:05 2006 @@ -17,15 +17,12 @@ package org.apache.directory.server.core; -import java.util.HashMap; import java.util.Hashtable; import java.util.Iterator; -import java.util.Map; import java.util.Set; import java.util.HashSet; import javax.naming.Context; -import javax.naming.Name; import javax.naming.NamingException; import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; @@ -43,8 +40,6 @@ import org.apache.directory.server.core.schema.AttributeTypeRegistry; import org.apache.directory.server.core.schema.bootstrap.BootstrapRegistries; import org.apache.directory.server.core.schema.bootstrap.BootstrapSchemaLoader; -import org.apache.directory.server.core.schema.global.GlobalRegistries; -import org.apache.directory.shared.asn1.primitives.OID; import org.apache.directory.shared.ldap.exception.LdapAuthenticationNotSupportedException; import org.apache.directory.shared.ldap.exception.LdapConfigurationException; import org.apache.directory.shared.ldap.exception.LdapNoPermissionException; @@ -52,11 +47,8 @@ import org.apache.directory.shared.ldap.message.LockableAttributeImpl; import org.apache.directory.shared.ldap.message.LockableAttributesImpl; import org.apache.directory.shared.ldap.message.ResultCodeEnum; -import org.apache.directory.shared.ldap.name.DnOidContainer; -import org.apache.directory.shared.ldap.name.LdapName; +import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.schema.AttributeType; -import org.apache.directory.shared.ldap.schema.NoOpNormalizer; -import org.apache.directory.shared.ldap.schema.OidNormalizer; import org.apache.directory.shared.ldap.util.DateUtils; import org.apache.directory.shared.ldap.util.StringTools; @@ -418,7 +410,7 @@ private boolean createBootstrapEntries() throws NamingException { boolean firstStart = false; - + // ------------------------------------------------------------------- // create admin entry // ------------------------------------------------------------------- @@ -447,7 +439,7 @@ attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() ); attributes.put( "displayName", "Directory Superuser" ); - partitionNexus.add( DirectoryPartitionNexus.ADMIN_PRINCIPAL, DirectoryPartitionNexus.getAdminName(), + partitionNexus.add(DirectoryPartitionNexus.getAdminName(), attributes ); } @@ -455,7 +447,10 @@ // create system users area // ------------------------------------------------------------------- - if ( !partitionNexus.hasEntry( new LdapName( "ou=users,ou=system" ) ) ) + LdapDN userDn = new LdapDN( "ou=users,ou=system" ); + userDn.normalize(); + + if ( !partitionNexus.hasEntry( userDn ) ) { firstStart = true; @@ -469,14 +464,17 @@ attributes.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL ); attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() ); - partitionNexus.add( "ou=users,ou=system", new LdapName( "ou=users,ou=system" ), attributes ); + partitionNexus.add( userDn, attributes ); } // ------------------------------------------------------------------- // create system groups area // ------------------------------------------------------------------- - if ( !partitionNexus.hasEntry( new LdapName( "ou=groups,ou=system" ) ) ) + LdapDN groupDn = new LdapDN( "ou=groups,ou=system" ); + groupDn.normalize(); + + if ( !partitionNexus.hasEntry( groupDn ) ) { firstStart = true; @@ -490,7 +488,7 @@ attributes.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL ); attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() ); - partitionNexus.add( "ou=groups,ou=system", new LdapName( "ou=groups,ou=system" ), attributes ); + partitionNexus.add( groupDn, attributes ); } // ------------------------------------------------------------------- @@ -498,7 +496,9 @@ // ------------------------------------------------------------------- String upName = "cn=Administrators,ou=groups,ou=system"; - Name normName = new LdapName( "cn=administrators,ou=groups,ou=system" ); + LdapDN normName = new LdapDN( "cn=administrators,ou=groups,ou=system" ); + normName.normalize(); + if ( !partitionNexus.hasEntry( normName ) ) { firstStart = true; @@ -513,7 +513,7 @@ attributes.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL ); attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() ); - partitionNexus.add( upName, normName, attributes ); + partitionNexus.add(normName, attributes ); AuthorizationService authzSrvc = ( AuthorizationService ) interceptorChain.get( "authorizationService" ); authzSrvc.cacheNewGroup( upName, normName, attributes ); } @@ -522,7 +522,10 @@ // create system configuration area // ------------------------------------------------------------------- - if ( !partitionNexus.hasEntry( new LdapName( "ou=configuration,ou=system" ) ) ) + LdapDN configurationDn = new LdapDN( "ou=configuration,ou=system" ); + configurationDn.normalize(); + + if ( !partitionNexus.hasEntry( configurationDn ) ) { firstStart = true; @@ -536,14 +539,17 @@ attributes.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL ); attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() ); - partitionNexus.add( "ou=configuration,ou=system", new LdapName( "ou=configuration,ou=system" ), attributes ); + partitionNexus.add( configurationDn, attributes ); } // ------------------------------------------------------------------- // create system configuration area for partition information // ------------------------------------------------------------------- - if ( !partitionNexus.hasEntry( new LdapName( "ou=partitions,ou=configuration,ou=system" ) ) ) + LdapDN partitionsDn = new LdapDN( "ou=partitions,ou=configuration,ou=system" ); + partitionsDn.normalize(); + + if ( !partitionNexus.hasEntry( partitionsDn ) ) { firstStart = true; @@ -557,15 +563,17 @@ attributes.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL ); attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() ); - partitionNexus.add( "ou=partitions,ou=configuration,ou=system", new LdapName( - "ou=partitions,ou=configuration,ou=system" ), attributes ); + partitionNexus.add( partitionsDn, attributes ); } // ------------------------------------------------------------------- // create system configuration area for services // ------------------------------------------------------------------- - if ( !partitionNexus.hasEntry( new LdapName( "ou=services,ou=configuration,ou=system" ) ) ) + LdapDN servicesDn = new LdapDN( "ou=services,ou=configuration,ou=system" ); + servicesDn.normalize(); + + if ( !partitionNexus.hasEntry( servicesDn ) ) { firstStart = true; @@ -579,15 +587,17 @@ attributes.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL ); attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() ); - partitionNexus.add( "ou=services,ou=configuration,ou=system", new LdapName( - "ou=services,ou=configuration,ou=system" ), attributes ); + partitionNexus.add( servicesDn, attributes ); } // ------------------------------------------------------------------- // create system configuration area for interceptors // ------------------------------------------------------------------- - if ( !partitionNexus.hasEntry( new LdapName( "ou=interceptors,ou=configuration,ou=system" ) ) ) + LdapDN interceptorsDn = new LdapDN( "ou=interceptors,ou=configuration,ou=system" ); + interceptorsDn.normalize(); + + if ( !partitionNexus.hasEntry( interceptorsDn ) ) { firstStart = true; @@ -601,15 +611,17 @@ attributes.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL ); attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() ); - partitionNexus.add( "ou=interceptors,ou=configuration,ou=system", new LdapName( - "ou=interceptors,ou=configuration,ou=system" ), attributes ); + partitionNexus.add( interceptorsDn, attributes ); } // ------------------------------------------------------------------- // create system preferences area // ------------------------------------------------------------------- - if ( !partitionNexus.hasEntry( new LdapName( "prefNodeName=sysPrefRoot,ou=system" ) ) ) + LdapDN sysPrefRootDn = new LdapDN( "prefNodeName=sysPrefRoot,ou=system"); + sysPrefRootDn.normalize(); + + if ( !partitionNexus.hasEntry( sysPrefRootDn ) ) { firstStart = true; @@ -624,9 +636,7 @@ attributes.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL ); attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() ); - LdapName dn = new LdapName( "prefNodeName=sysPrefRoot,ou=system" ); - - partitionNexus.add( "prefNodeName=sysPrefRoot,ou=system", dn, attributes ); + partitionNexus.add( sysPrefRootDn, attributes ); } return firstStart; @@ -641,7 +651,10 @@ // Warn if the default password is not changed. boolean needToChangeAdminPassword = false; - Attributes adminEntry = partitionNexus.lookup( new LdapName( DirectoryPartitionNexus.ADMIN_PRINCIPAL ) ); + LdapDN adminDn = new LdapDN( DirectoryPartitionNexus.ADMIN_PRINCIPAL ); + adminDn.normalize(); + + Attributes adminEntry = partitionNexus.lookup( adminDn ); Object userPassword = adminEntry.get( "userPassword" ).get(); if ( userPassword instanceof byte[] ) { @@ -694,71 +707,6 @@ } - private void setupOidsMap( BootstrapRegistries bootstrapRegistries ) throws NamingException - { - Iterator keys = bootstrapRegistries.getOidRegistry().getOidByName().keySet().iterator(); - - Map oidsMap = new HashMap(); - Map oidName = new HashMap(); - - while ( keys.hasNext() ) - { - String name = StringTools.deepTrimToLower( ( String ) keys.next() ); - String principal = null; - - if ( OID.isOID( name ) ) - { - continue; - } - - String oid = bootstrapRegistries.getOidRegistry().getOid( name ); - - OidNormalizer oidNormalizer = null; - - if ( oidName.containsKey( oid ) ) - { - principal = StringTools.deepTrimToLower( ( String ) oidName.get( oid ) ); - - if ( principal.length() > name.length() ) - { - OidNormalizer oldOidNormalizer = ( OidNormalizer ) oidsMap.get( principal ); - - oidNormalizer = new OidNormalizer( name, oldOidNormalizer.getNormalizer() ); - - oidName.remove( oid ); - oidName.put( oid, name ); - oidsMap.remove( principal ); - oidsMap.remove( oid ); - oidsMap.put( principal, oidNormalizer ); - oidsMap.put( name, oidNormalizer ); - oidsMap.put( oid, oidNormalizer ); - continue; - } - } - else - { - principal = name; - oidName.put( oid, principal ); - - if ( bootstrapRegistries.getNormalizerRegistry().hasNormalizer( oid ) ) - { - oidNormalizer = new OidNormalizer( principal, bootstrapRegistries.getNormalizerRegistry().lookup( - oid ) ); - } - else - { - oidNormalizer = new OidNormalizer( principal, new NoOpNormalizer() ); - } - - oidsMap.put( name, oidNormalizer ); - oidsMap.put( oid, oidNormalizer ); - } - } - - DnOidContainer.setOids( oidsMap ); - } - - /** * Kicks off the initialization of the entire system. * @@ -778,7 +726,6 @@ BootstrapRegistries bootstrapRegistries = new BootstrapRegistries(); BootstrapSchemaLoader loader = new BootstrapSchemaLoader(); loader.load( startupConfiguration.getBootstrapSchemas(), bootstrapRegistries ); - setupOidsMap( bootstrapRegistries ); java.util.List errors = bootstrapRegistries.checkRefInteg(); if ( !errors.isEmpty() ) Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryServiceListener.java URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryServiceListener.java?rev=414035&r1=414034&r2=414035&view=diff ============================================================================== --- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryServiceListener.java (original) +++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryServiceListener.java Tue Jun 13 20:22:05 2006 @@ -24,7 +24,7 @@ * An event handler that listens to the changes occurs to * {@link DirectoryService}. * - * @author The Apache Directory Project + * @author Apache Directory Project * @version $Rev$, $Date$ */ public interface DirectoryServiceListener Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java?rev=414035&r1=414034&r2=414035&view=diff ============================================================================== --- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java (original) +++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java Tue Jun 13 20:22:05 2006 @@ -24,7 +24,7 @@ import org.apache.directory.server.core.configuration.AuthenticatorConfiguration; import org.apache.directory.server.core.jndi.ServerContext; import org.apache.directory.shared.ldap.aci.AuthenticationLevel; -import org.apache.directory.shared.ldap.name.LdapName; +import org.apache.directory.shared.ldap.name.LdapDN; /** @@ -143,7 +143,7 @@ protected static LdapPrincipal createLdapPrincipal( String name, AuthenticationLevel authenticationLeve ) throws NamingException { - LdapName principalDn = new LdapName( name ); + LdapDN principalDn = new LdapDN( name ); return new LdapPrincipal( principalDn, AuthenticationLevel.SIMPLE ); } } Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java?rev=414035&r1=414034&r2=414035&view=diff ============================================================================== --- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java (original) +++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java Tue Jun 13 20:22:05 2006 @@ -25,7 +25,6 @@ import java.util.Map; import javax.naming.Context; -import javax.naming.Name; import javax.naming.NamingEnumeration; import javax.naming.NamingException; import javax.naming.directory.Attributes; @@ -44,6 +43,8 @@ import org.apache.directory.shared.ldap.exception.LdapAuthenticationException; import org.apache.directory.shared.ldap.filter.ExprNode; import org.apache.directory.shared.ldap.util.AttributeUtils; +import org.apache.directory.shared.ldap.name.LdapDN; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -181,19 +182,20 @@ } - public void add( NextInterceptor next, String upName, Name normName, Attributes entry ) throws NamingException + public void add( NextInterceptor next, LdapDN normName, Attributes entry ) throws NamingException { if ( log.isDebugEnabled() ) { - log.debug( "Adding the entry " + AttributeUtils.toString( entry ) + " for DN = '" + upName + "'" ); + log.debug( "Adding the entry " + AttributeUtils.toString( entry ) + " for DN = '" + + normName.toUpName() + "'" ); } checkAuthenticated(); - next.add( upName, normName, entry ); + next.add(normName, entry ); } - public void delete( NextInterceptor next, Name name ) throws NamingException + public void delete( NextInterceptor next, LdapDN name ) throws NamingException { if ( log.isDebugEnabled() ) { @@ -205,7 +207,7 @@ } - public Name getMatchedName( NextInterceptor next, Name dn, boolean normalized ) throws NamingException + public LdapDN getMatchedName ( NextInterceptor next, LdapDN dn ) throws NamingException { if ( log.isDebugEnabled() ) { @@ -213,7 +215,7 @@ } checkAuthenticated(); - return next.getMatchedName( dn, normalized ); + return next.getMatchedName( dn ); } @@ -229,7 +231,7 @@ } - public Name getSuffix( NextInterceptor next, Name dn, boolean normalized ) throws NamingException + public LdapDN getSuffix ( NextInterceptor next, LdapDN dn ) throws NamingException { if ( log.isDebugEnabled() ) { @@ -237,11 +239,11 @@ } checkAuthenticated(); - return next.getSuffix( dn, normalized ); + return next.getSuffix( dn ); } - public boolean hasEntry( NextInterceptor next, Name name ) throws NamingException + public boolean hasEntry( NextInterceptor next, LdapDN name ) throws NamingException { if ( log.isDebugEnabled() ) { @@ -253,7 +255,7 @@ } - public boolean isSuffix( NextInterceptor next, Name name ) throws NamingException + public boolean isSuffix( NextInterceptor next, LdapDN name ) throws NamingException { if ( log.isDebugEnabled() ) { @@ -265,7 +267,7 @@ } - public NamingEnumeration list( NextInterceptor next, Name base ) throws NamingException + public NamingEnumeration list( NextInterceptor next, LdapDN base ) throws NamingException { if ( log.isDebugEnabled() ) { @@ -277,7 +279,7 @@ } - public Iterator listSuffixes( NextInterceptor next, boolean normalized ) throws NamingException + public Iterator listSuffixes ( NextInterceptor next ) throws NamingException { if ( log.isDebugEnabled() ) { @@ -285,11 +287,11 @@ } checkAuthenticated(); - return next.listSuffixes( normalized ); + return next.listSuffixes(); } - public Attributes lookup( NextInterceptor next, Name dn, String[] attrIds ) throws NamingException + public Attributes lookup( NextInterceptor next, LdapDN dn, String[] attrIds ) throws NamingException { if ( log.isDebugEnabled() ) { @@ -301,7 +303,7 @@ } - public Attributes lookup( NextInterceptor next, Name name ) throws NamingException + public Attributes lookup( NextInterceptor next, LdapDN name ) throws NamingException { if ( log.isDebugEnabled() ) { @@ -313,7 +315,7 @@ } - public void modify( NextInterceptor next, Name name, int modOp, Attributes mods ) throws NamingException + public void modify( NextInterceptor next, LdapDN name, int modOp, Attributes mods ) throws NamingException { if ( log.isDebugEnabled() ) { @@ -325,7 +327,7 @@ } - public void modify( NextInterceptor next, Name name, ModificationItem[] mods ) throws NamingException + public void modify( NextInterceptor next, LdapDN name, ModificationItem[] mods ) throws NamingException { if ( log.isDebugEnabled() ) { @@ -337,7 +339,7 @@ } - public void modifyRn( NextInterceptor next, Name name, String newRn, boolean deleteOldRn ) throws NamingException + public void modifyRn( NextInterceptor next, LdapDN name, String newRn, boolean deleteOldRn ) throws NamingException { if ( log.isDebugEnabled() ) { @@ -350,7 +352,7 @@ } - public void move( NextInterceptor next, Name oriChildName, Name newParentName, String newRn, boolean deleteOldRn ) + public void move( NextInterceptor next, LdapDN oriChildName, LdapDN newParentName, String newRn, boolean deleteOldRn ) throws NamingException { if ( log.isDebugEnabled() ) @@ -364,7 +366,7 @@ } - public void move( NextInterceptor next, Name oriChildName, Name newParentName ) throws NamingException + public void move( NextInterceptor next, LdapDN oriChildName, LdapDN newParentName ) throws NamingException { if ( log.isDebugEnabled() ) { @@ -376,7 +378,7 @@ } - public NamingEnumeration search( NextInterceptor next, Name base, Map env, ExprNode filter, + public NamingEnumeration search( NextInterceptor next, LdapDN base, Map env, ExprNode filter, SearchControls searchCtls ) throws NamingException { if ( log.isDebugEnabled() ) @@ -406,7 +408,7 @@ } - public void bind( NextInterceptor next, Name bindDn, byte[] credentials, List mechanisms, String saslAuthId ) + public void bind( NextInterceptor next, LdapDN bindDn, byte[] credentials, List mechanisms, String saslAuthId ) throws NamingException { // check if we are already authenticated and if so we return making Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/LdapPrincipal.java URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/LdapPrincipal.java?rev=414035&r1=414034&r2=414035&view=diff ============================================================================== --- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/LdapPrincipal.java (original) +++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/LdapPrincipal.java Tue Jun 13 20:22:05 2006 @@ -23,7 +23,7 @@ import javax.naming.Name; import org.apache.directory.shared.ldap.aci.AuthenticationLevel; -import org.apache.directory.shared.ldap.name.LdapName; +import org.apache.directory.shared.ldap.name.LdapDN; /** @@ -68,7 +68,7 @@ */ private LdapPrincipal() { - this.name = new LdapName(); + this.name = new LdapDN(); this.authenticationLevel = AuthenticationLevel.NONE; } Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java?rev=414035&r1=414034&r2=414035&view=diff ============================================================================== --- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java (original) +++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java Tue Jun 13 20:22:05 2006 @@ -35,9 +35,10 @@ import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy; import org.apache.directory.shared.ldap.aci.AuthenticationLevel; import org.apache.directory.shared.ldap.exception.LdapAuthenticationException; -import org.apache.directory.shared.ldap.name.LdapName; +import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.util.ArrayUtils; import org.apache.directory.shared.ldap.util.Base64; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -119,7 +120,7 @@ // ---- lookup the principal entry's userPassword attribute - LdapName principalDn = new LdapName( principal ); + LdapDN principalDn = new LdapDN( principal ); Invocation invocation = InvocationStack.getInstance().peek(); DirectoryPartitionNexusProxy proxy = invocation.getProxy(); Attributes userEntry;