svn commit: r190555 [1/4] - in /directory: apacheds/branches/ apacheds/branches/direve-158/ apacheds/trunk/ apacheds/trunk/core/ apacheds/trunk/core/src/main/aspects/org/apache/ldap/server/jndi/ apacheds/trunk/core/src/main/java/org/apache/ldap/server/ apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/ apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/ apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/ apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/ apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/ apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/ apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ apacheds/trunk/core/src/main/java/org/apache/ldap/server/normalization/ apacheds/trunk/core/src/main/java/org/apache/ldap/server/prefs/ apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ apacheds/trunk/core/src/test/org/apache/ldap/server/authn/ apacheds/trunk/core/src/test/org/apache/ldap/server/authz/ apacheds/trunk/core/src/test/org/apache/ldap/server/exception/ apacheds/trunk/core/src/test/org/apache/ldap/server/interceptor/ apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/ apacheds/trunk/core/src/test/org/apache/ldap/server/operational/ apacheds/trunk/core/src/test/org/apache/ldap/server/prefs/ apacheds/trunk/core/src/test/org/apache/ldap/server/schema/bootstrap/ apacheds/trunk/main/ apacheds/trunk/main/src/main/java/org/apache/ldap/server/ apacheds/trunk/main/src/main/java/org/apache/ldap/server/configuration/ apacheds/trunk/main/src/main/java/org/apache/ldap/server/jndi/ apacheds/trunk/main/src/test/org/apache/ldap/server/ apacheds/trunk/main/src/test/org/apache/ldap/server/jndi/ protocol-providers/ldap/branches/direve-158/ protocol-providers/ldap/trunk/ protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/

[tr...@apache.org]

Author: trustin
Date: Mon Jun 13 22:09:25 2005
New Revision: 190555

URL: http://svn.apache.org/viewcvs?rev=190555&view=rev
Log:
Merged the branch 'direve-158'.

Summary of changes (More documentation will follow):
1. New package called 'configuration' is introduced and it replaced all EnvKeys properties and config builders
2. Authenticator interface also has been revamped to catch up the change #1.
3. Resolved resource leak issues in CoreContextFactory
4. Replaced dynamic instantiation of ContextPartitions with init() call.
5. We're going to merge all these changes back to trunk, and work further on making Interceptors configurable and on writing somedetailed  docos on these changes.


Added:
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractAdminTestCase.java   (props changed)
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractAdminTestCase.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractNonAdminTestCase.java   (props changed)
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractNonAdminTestCase.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractTestCase.java   (props changed)
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractTestCase.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/
      - copied from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AttributesPropertyEditor.java   (props changed)
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/AttributesPropertyEditor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AuthenticatorConfiguration.java   (props changed)
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/AuthenticatorConfiguration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/Configuration.java   (props changed)
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/Configuration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationException.java   (props changed)
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationException.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationUtil.java   (props changed)
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationUtil.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ContextPartitionConfiguration.java   (props changed)
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/ContextPartitionConfiguration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableAuthenticatorConfiguration.java   (props changed)
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/MutableAuthenticatorConfiguration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableContextPartitionConfiguration.java   (props changed)
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/MutableContextPartitionConfiguration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableStartupConfiguration.java   (props changed)
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/MutableStartupConfiguration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ShutdownConfiguration.java   (props changed)
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/ShutdownConfiguration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java   (props changed)
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/SyncConfiguration.java   (props changed)
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/SyncConfiguration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java   (props changed)
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryContext.java   (props changed)
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryContext.java   (props changed)
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/RootNexusProxy.java   (props changed)
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/jndi/RootNexusProxy.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/prefs/ServerSystemPreferenceException.java   (props changed)
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/prefs/ServerSystemPreferenceException.java
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsAdminTest.java   (props changed)
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsAdminTest.java
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsNonAdminTest.java   (props changed)
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsNonAdminTest.java
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/ListAsAdminTest.java   (props changed)
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/core/src/test/org/apache/ldap/server/jndi/ListAsAdminTest.java
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/ListAsNonAdminTest.java   (props changed)
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/core/src/test/org/apache/ldap/server/jndi/ListAsNonAdminTest.java
    directory/apacheds/trunk/main/server.xml
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/main/server.xml
    directory/apacheds/trunk/main/src/main/java/org/apache/ldap/server/configuration/
      - copied from r190553, directory/apacheds/branches/direve-158/main/src/main/java/org/apache/ldap/server/configuration/
    directory/apacheds/trunk/main/src/main/java/org/apache/ldap/server/configuration/MutableServerStartupConfiguration.java   (props changed)
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/main/src/main/java/org/apache/ldap/server/configuration/MutableServerStartupConfiguration.java
    directory/apacheds/trunk/main/src/main/java/org/apache/ldap/server/configuration/ServerStartupConfiguration.java   (props changed)
      - copied unchanged from r190553, directory/apacheds/branches/direve-158/main/src/main/java/org/apache/ldap/server/configuration/ServerStartupConfiguration.java
Removed:
    directory/apacheds/branches/direve-158/
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractCoreTest.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/BackendSubsystem.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextPartitionConfig.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticatorConfig.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticatorConfigBuilder.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/GenericAuthenticatorConfig.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorConfigBuilder.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/EnvKeys.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/JndiProvider.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/PartitionConfigBuilder.java
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceTest.java
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/interceptor/
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/AbstractMultiUserJndiTest.java
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/ListTest.java
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/PartitionContextBuilderTest.java
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/ServiceRegistryPassthruTest.java
    directory/apacheds/trunk/main/server.properties
    directory/protocol-providers/ldap/branches/direve-158/
Modified:
    directory/apacheds/branches/readme.txt
    directory/apacheds/trunk/core/   (props changed)
    directory/apacheds/trunk/core/project.xml
    directory/apacheds/trunk/core/src/main/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.aj   (contents, props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractContextPartition.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ApplicationPartition.java   (contents, props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/BackingStore.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextPartition.java   (contents, props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/PartitionNexus.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/RootNexus.java   (contents, props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/SystemPartition.java   (contents, props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AbstractAuthenticator.java   (contents, props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AnonymousAuthenticator.java   (contents, props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticationService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/Authenticator.java   (contents, props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticatorContext.java   (contents, props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/GenericAuthenticatorContext.java   (contents, props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/LdapPrincipal.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/SimpleAuthenticator.java   (contents, props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/Database.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/DbSearchResult.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultOptimizer.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultSearchEngine.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/DisjunctionEnumeration.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/DupsEnumeration.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/Enumerator.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/Evaluator.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEnumerator.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEvaluator.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/Index.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/IndexAssertion.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/IndexAssertionEnumeration.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/IndexComparator.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/IndexEnumeration.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/IndexNotFoundException.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/IndexRecord.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/KeyOnlyComparator.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/LeafEvaluator.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/MasterTable.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/NoDupsEnumeration.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/Optimizer.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/ResultFilteringEnumeration.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/ScopeEnumerator.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/ScopeEvaluator.java   (contents, props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/SearchEngine.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/SearchResultEnumeration.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/SearchResultFilter.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/SubstringEnumerator.java   (contents, props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/SubstringEvaluator.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/Table.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/Tuple.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/TupleBrowser.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/TupleComparator.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/TupleEnumeration.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/TupleRenderer.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/ASTNode.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AboutDialog.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AddEntryDialog.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AnnotatedFilterTreeDialog.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AttributesTableModel.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryDialog.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryNode.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/FilterDialog.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/IndexDialog.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/MainFrame.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/PartitionViewer.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/SearchResultDialog.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/server.gif   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmDatabase.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmIndex.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmMasterTable.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmTable.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmTupleBrowser.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/package.html   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/Interceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorChain.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Invocation.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java   (contents, props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DeadContext.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/JavaLdapSupport.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirObjectFactory.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirStateFactory.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/normalization/NormalizationService.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/prefs/PreferencesUtils.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/prefs/ServerPreferencesFactory.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/prefs/ServerSystemPreferences.java   (contents, props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/prefs/package.html   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/AbstractSyntaxChecker.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistryMonitor.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistryMonitorAdapter.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitor.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitorAdapter.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ConcreteNameComponentNormalizer.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistryMonitor.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistryMonitorAdapter.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistryMonitor.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistryMonitorAdapter.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalOidRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalRegistries.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitor.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitorAdapter.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistryMonitor.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistryMonitorAdapter.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistryMonitor.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistryMonitorAdapter.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitor.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitorAdapter.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistryMonitor.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistryMonitorAdapter.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectFactoryRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitor.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitorAdapter.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/Registries.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/StateFactoryRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitor.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitorAdapter.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitor.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitorAdapter.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/AbstractBootstrapProducer.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ApacheComparatorProducer.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ApacheMatchingRuleProducer.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ApacheNormalizerProducer.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapAttributeTypeRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapComparatorRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitContentRuleRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitStructureRuleRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNameFormRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNormalizerRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectClassRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectFactoryRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapOidRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapProducer.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapRegistries.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoader.java   (contents, props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapStateFactoryRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxRegistry.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonComparatorProducer.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonMatchingRuleProducer.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonNormalizerProducer.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisComparatorProducer.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisMatchingRuleProducer.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisNormalizerProducer.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxCheckerProducer.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxProducer.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ProducerCallback.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemComparatorProducer.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemMatchingRuleProducer.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxCheckerProducer.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxProducer.java   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/package.html   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/package.html   (props changed)
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/authn/SimpleAuthenticationTest.java   (contents, props changed)
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/exception/ExceptionServiceTest.java   (contents, props changed)
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/ComparatorNPEBugTest.java   (contents, props changed)
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/CreateContextTest.java   (contents, props changed)
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/DestroyContextTest.java   (contents, props changed)
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/ModifyContextTest.java   (contents, props changed)
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/ObjStateFactoryTest.java   (contents, props changed)
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/RFC2713Tests.java   (contents, props changed)
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/RootDSETest.java   (contents, props changed)
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/SearchContextTest.java   (contents, props changed)
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/ShutdownTest.java   (contents, props changed)
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/SyncTest.java   (contents, props changed)
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/operational/BinaryAttributeFilterTest.java   (contents, props changed)
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/operational/OperationalAttributeServiceTest.java   (contents, props changed)
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/prefs/PreferencesUtilsTest.java   (props changed)
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/prefs/ServerPreferencesFactoryTest.java   (contents, props changed)
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/prefs/ServerSystemPreferencesTest.java   (contents, props changed)
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoaderTest.java   (contents, props changed)
    directory/apacheds/trunk/main/project.properties
    directory/apacheds/trunk/main/project.xml
    directory/apacheds/trunk/main/src/main/java/org/apache/ldap/server/ServerMain.java   (contents, props changed)
    directory/apacheds/trunk/main/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java   (contents, props changed)
    directory/apacheds/trunk/main/src/test/org/apache/ldap/server/AbstractServerTest.java   (contents, props changed)
    directory/apacheds/trunk/main/src/test/org/apache/ldap/server/DisableAnonBindTest.java   (contents, props changed)
    directory/apacheds/trunk/main/src/test/org/apache/ldap/server/jndi/ServerContextFactoryTest.java   (contents, props changed)
    directory/apacheds/trunk/project.properties
    directory/protocol-providers/ldap/trunk/project.xml
    directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/BindHandler.java

Modified: directory/apacheds/branches/readme.txt
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/readme.txt?rev=190555&r1=190554&r2=190555&view=diff
==============================================================================
--- directory/apacheds/branches/readme.txt (original)
+++ directory/apacheds/branches/readme.txt Mon Jun 13 22:09:25 2005
@@ -6,25 +6,29 @@
 branch: eve-0.1-merlin
 deleted on: Jan 06, 2005
 delete rev: 124386
-resusitate: svn cp -r 124385 https://svn.apache.org/repos/asf/incubator/directory/server/branches/eve-0.1-merlin eve-0.1-merlin
+resusitate: svn co -r 124385 https://svn.apache.org/repos/asf/incubator/directory/server/branches/eve-0.1-merlin eve-0.1-merlin
 
 branch: eve-0.1-phoenix 
 deleted on: Jan 06, 2005
 delete rev: 124386
-resusitate: svn cp -r 124385 https://svn.apache.org/repos/asf/incubator/directory/server/branches/eve-0.1-phoenix eve-0.1-phoenix
+resusitate: svn co -r 124385 https://svn.apache.org/repos/asf/incubator/directory/server/branches/eve-0.1-phoenix eve-0.1-phoenix
 
 branch: pre-seda
 deleted on: Jan 06, 2005
 delete rev: 124386
-resusitate: svn cp -r 124385 https://svn.apache.org/repos/asf/incubator/directory/server/branches/pre-seda pre-seda
+resusitate: svn co -r 124385 https://svn.apache.org/repos/asf/incubator/directory/server/branches/pre-seda pre-seda
 
 branch: mina-port
 deleted on: Feb 07, 2005
 delete rev: 151812
-resusitate: svn cp -r 151811 https://svn.apache.org/repos/asf/incubator/directory/apacheds/branches/mina-port mina-port
+resusitate: svn co -r 151811 https://svn.apache.org/repos/asf/incubator/directory/apacheds/branches/mina-port mina-port
 
 branch: interceptor_revamp
 deleted on: March 24, 2005
 delete rev: 158890
-resusitate: svn cp -r 158889 https://svn.apache.org/repos/asf/incubator/directory/apacheds/branches/interceptor_revamp interceptor_revamp
+resusitate: svn co -r 158889 https://svn.apache.org/repos/asf/incubator/directory/apacheds/branches/interceptor_revamp interceptor_revamp
 
+branch: direve-158
+deleted on: June 14, 2005
+delete rev: 190051+
+resusitate: svn co -r 190051 https://svn.apache.org/repos/asf/incubator/directory/apacheds/branches/direve-158 direve-158
\ No newline at end of file

Propchange: directory/apacheds/trunk/core/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 13 22:09:25 2005
@@ -1,3 +1,4 @@
+
 target
 *.dump
 *.ser
@@ -12,3 +13,4 @@
 .classpath
 .generated.*
 eve
+bin

Modified: directory/apacheds/trunk/core/project.xml
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/project.xml?rev=190555&r1=190554&r2=190555&view=diff
==============================================================================
--- directory/apacheds/trunk/core/project.xml (original)
+++ directory/apacheds/trunk/core/project.xml Mon Jun 13 22:09:25 2005
@@ -112,7 +112,7 @@
     <dependency>
       <groupId>directory-network</groupId>
       <artifactId>mina</artifactId>
-      <version>0.7.2-SNAPSHOT</version>
+      <version>0.7.3-SNAPSHOT</version>
     </dependency>
 
     <!-- The Eve Maven Plugin -->

Modified: directory/apacheds/trunk/core/src/main/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.aj
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.aj?rev=190555&r1=190554&r2=190555&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.aj (original)
+++ directory/apacheds/trunk/core/src/main/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.aj Mon Jun 13 22:09:25 2005
@@ -26,7 +26,7 @@
  * injection of interceptors between calls to the nexus from the JNDI.
  * 
  * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
- * @author $Author: akarasulu $
+ * @author $Author$
  * @version $Revision$
  */
 public aspect ProviderNexusAspect
@@ -38,10 +38,10 @@
     
     /** 
      * Adds a static ThreadLocal for a Stack of LdapContexts representing nested
-     * backend nexus calls made by the JndiProvider's contexts within the same 
+     * backend nexus calls made by the DefaultContextFactoryContext's contexts within the same 
      * thread of execution.
      */
-    private static ThreadLocal JndiProvider.s_contextStacks = new ThreadLocal();
+    private static ThreadLocal DefaultContextFactoryContext.s_contextStacks = new ThreadLocal();
     
     
     // ------------------------------------------------------------------------
@@ -55,7 +55,7 @@
      * 
      * @param context the caller or the current context for the nexus call
      */
-    private static void JndiProvider.push( LdapContext context )
+    private static void DefaultContextFactoryContext.push( LdapContext context )
     {
         Stack stack = ( Stack ) s_contextStacks.get();
         
@@ -75,7 +75,7 @@
      * 
      * @return the last LdapContext or caller
      */
-    private static LdapContext JndiProvider.pop()
+    private static LdapContext DefaultContextFactoryContext.pop()
     {
         Stack stack = ( Stack ) s_contextStacks.get();
         
@@ -93,7 +93,7 @@
      * 
      * @return the current LdapContext or caller
      */
-    static LdapContext JndiProvider.peek()
+    static LdapContext DefaultContextFactoryContext.peek()
     {
         Stack stack = ( Stack ) s_contextStacks.get();
         
@@ -118,7 +118,7 @@
      */    
     private static Stack getContextStack()
     {
-        Stack stack = ( Stack ) JndiProvider.s_contextStacks.get();
+        Stack stack = ( Stack ) DefaultContextFactoryContext.s_contextStacks.get();
         
         if ( stack == null )
         {
@@ -192,7 +192,7 @@
     before( Context caller ):
         jndiNexusCalls( caller )
         {
-    		JndiProvider.push( ( LdapContext ) caller );
+    		DefaultContextFactoryContext.push( ( LdapContext ) caller );
             //System.out.println( "\npushed " + caller + " for join point "
             //    + thisJoinPoint );
         }
@@ -201,7 +201,7 @@
     after( Context caller ):
         jndiNexusCalls( caller ) 
         {
-            LdapContext head = JndiProvider.pop();
+            LdapContext head = DefaultContextFactoryContext.pop();
             //System.out.println( "\npopped " + caller + " for join point "
             //    + thisJoinPoint );
         }

Propchange: directory/apacheds/trunk/core/src/main/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.aj
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jun 13 22:09:25 2005
@@ -1 +1 @@
-Rev
+HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractAdminTestCase.java (from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractAdminTestCase.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractAdminTestCase.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractAdminTestCase.java&p1=directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractAdminTestCase.java&r1=190553&r2=190555&rev=190555&view=diff
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractAdminTestCase.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractContextPartition.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jun 13 22:09:25 2005
@@ -1 +1 @@
-Rev
+HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractNonAdminTestCase.java (from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractNonAdminTestCase.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractNonAdminTestCase.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractNonAdminTestCase.java&p1=directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractNonAdminTestCase.java&r1=190553&r2=190555&rev=190555&view=diff
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractNonAdminTestCase.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractTestCase.java (from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractTestCase.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractTestCase.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractTestCase.java&p1=directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractTestCase.java&r1=190553&r2=190555&rev=190555&view=diff
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractTestCase.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ApplicationPartition.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ApplicationPartition.java?rev=190555&r1=190554&r2=190555&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ApplicationPartition.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ApplicationPartition.java Mon Jun 13 22:09:25 2005
@@ -37,13 +37,13 @@
      * user provided suffix distinguished name for this backend set during
      * the Avalon configuration life-cycle phase.
      */
-    private Name upSuffix = null ;
+    private Name upSuffix;
     
     /**
      * normalized suffix distinguished name for this backend set during
      * the Avalon configuration life-cycle phase.
      */
-    private Name normalizedSuffix = null ;
+    private Name normalizedSuffix;
 
 
     // ------------------------------------------------------------------------
@@ -53,22 +53,16 @@
 
     /**
      *
-     * @param upSuffix the user provided suffix without normalization
-     * @param normalizedSuffix the normalized suffix
      * @param db the database to use for this partition
      * @param searchEngine the search engine to use for this partition
      * @param indexAttributes the index attrivutes including system attributes
      * @throws NamingException on failures while creating this partition
      */
-    public ApplicationPartition( Name upSuffix, Name normalizedSuffix, Database db,
-                           SearchEngine searchEngine,
-                           AttributeType[] indexAttributes )
+    public ApplicationPartition(
+            Database db, SearchEngine searchEngine, AttributeType[] indexAttributes )
         throws NamingException
     {
         super( db, searchEngine, indexAttributes );
-
-        this.normalizedSuffix = normalizedSuffix;
-        this.upSuffix = upSuffix;
     }
 
 
@@ -77,6 +71,11 @@
     // Backend Interface Method Implementations
     // ------------------------------------------------------------------------
 
+    public void init( Name upSuffix, Name normSuffix )
+    {
+        this.upSuffix = upSuffix;
+        this.normalizedSuffix = normSuffix;
+    }
 
     /**
      * @see ContextPartition#getSuffix( boolean )

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ApplicationPartition.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jun 13 22:09:25 2005
@@ -1 +1 @@
-Rev
+HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/BackingStore.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jun 13 22:09:25 2005
@@ -1 +1 @@
-Rev
+HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextPartition.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextPartition.java?rev=190555&r1=190554&r2=190555&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextPartition.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextPartition.java Mon Jun 13 22:09:25 2005
@@ -18,6 +18,7 @@
 
 
 import javax.naming.Name;
+import javax.naming.NamingException;
 
 
 /**
@@ -30,6 +31,11 @@
  */
 public interface ContextPartition extends BackingStore
 {
+    /**
+     * Initializes this partition.
+     */
+    void init( Name userProvidedSuffix, Name normalizedSuffix ) throws NamingException;
+    
     /**
      * Gets the distinguished/absolute name of the suffix for all entries
      * stored within this BackingStore.

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextPartition.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jun 13 22:09:25 2005
@@ -1 +1 @@
-Rev
+HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/PartitionNexus.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jun 13 22:09:25 2005
@@ -1 +1 @@
-Rev
+HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/RootNexus.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/RootNexus.java?rev=190555&r1=190554&r2=190555&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/RootNexus.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/RootNexus.java Mon Jun 13 22:09:25 2005
@@ -57,9 +57,6 @@
     /** the namingContexts DSE operational attribute */
     private static final String NAMINGCTXS_ATTR = "namingContexts";
 
-    /** Handle on the singleton instance of this class within the entire JVM. */
-    private static RootNexus s_singleton = null;
-    
     /** the closed state of this partition */
     private boolean closed = false;
 
@@ -83,12 +80,6 @@
      */
     public RootNexus( SystemPartition system, Attributes rootDSE )
     {
-        if ( null != s_singleton )
-        {
-            throw new IllegalStateException();
-        }
-        
-        s_singleton = this;
         this.system = system;
 
         // setup that root DSE
@@ -115,25 +106,6 @@
 
         // register will add to the list of namingContexts as well
         register( this.system );
-
-        Runtime.getRuntime().addShutdownHook( new Thread( new Runnable() {
-            public void run()
-            {
-                try
-                {
-                    if ( ! isClosed() )
-                    {
-                        RootNexus.this.close();
-                    }
-                }
-                catch ( NamingException e )
-                {
-                    e.printStackTrace();
-                    // @todo again we need to monitor this failure and report
-                    // that it occured on shutdown specifically
-                }
-            }
-        }, "RootNexusShutdownHook" ) );
     }
 
 
@@ -547,7 +519,6 @@
             try
             {
                 store.sync();
-
                 store.close();
             }
             catch ( NamingException e )
@@ -563,8 +534,6 @@
                 error.addThrowable( e );
             }
         }
-
-        s_singleton = null;
 
         closed = true;
 

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/RootNexus.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jun 13 22:09:25 2005
@@ -1 +1 @@
-Rev
+HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/SystemPartition.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/SystemPartition.java?rev=190555&r1=190554&r2=190555&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/SystemPartition.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/SystemPartition.java Mon Jun 13 22:09:25 2005
@@ -42,6 +42,8 @@
 {
     /** the default user principal or DN */
     public final static String ADMIN_PRINCIPAL = "uid=admin,ou=system";
+    /** the DN of the default user principal */
+    public final static Name ADMIN_PRINCIPAL_NAME = getAdminDn();
     /** the admin super user uid */
     public final static String ADMIN_UID = "admin";
     /** the initial admin passwd set on startup */
@@ -134,8 +136,6 @@
         }
         catch ( NamingException e )
         {
-            e.printStackTrace();
-            // should never really happen since names are correct
         }
 
         return adminDn;
@@ -198,6 +198,11 @@
     // B A C K E N D   M E T H O D S 
     // ------------------------------------------------------------------------
 
+    public final void init( Name upSuffix, Name normalizedSuffix )
+    {
+        // This method may not be called.
+        throw new IllegalStateException( "SystemPartition is already initialized." );
+    }
 
     /**
      * @see org.apache.ldap.server.ContextPartition#getSuffix(boolean)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/SystemPartition.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jun 13 22:09:25 2005
@@ -1 +1 @@
-Rev
+HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AbstractAuthenticator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AbstractAuthenticator.java?rev=190555&r1=190554&r2=190555&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AbstractAuthenticator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AbstractAuthenticator.java Mon Jun 13 22:09:25 2005
@@ -17,11 +17,10 @@
 package org.apache.ldap.server.authn;
 
 
-import org.apache.ldap.server.jndi.ServerContext;
-import org.apache.ldap.common.name.LdapName;
-
 import javax.naming.NamingException;
-import java.util.Enumeration;
+
+import org.apache.ldap.common.name.LdapName;
+import org.apache.ldap.server.jndi.ServerContext;
 
 
 /**
@@ -29,14 +28,14 @@
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public abstract class AbstractAuthenticator implements Authenticator, AuthenticatorConfig
+public abstract class AbstractAuthenticator implements Authenticator
 {
 
     /** authenticator config */
-    public AuthenticatorConfig authenticatorConfig;
+    private AuthenticatorContext ctx;
 
     /** authenticator type */
-    public String authenticatorType;
+    private String authenticatorType;
 
 
     /**
@@ -44,7 +43,7 @@
      *
      * @param type authenticator's type
      */
-    public AbstractAuthenticator( String type )
+    protected AbstractAuthenticator( String type )
     {
         this.authenticatorType = type;
     }
@@ -53,9 +52,9 @@
     /**
      * Returns a reference to the AuthenticatorContext in which this authenticator is running.
      */
-    public AuthenticatorContext getAuthenticatorContext()
+    public AuthenticatorContext getContext()
     {
-        return authenticatorConfig.getAuthenticatorContext();
+        return ctx;
     }
 
 
@@ -69,23 +68,13 @@
 
 
     /**
-     * Return this authenticator's AuthenticatorConfig object.
-     */
-    public AuthenticatorConfig getAuthenticatorConfig()
-    {
-        return authenticatorConfig;
-    }
-
-
-    /**
      * Called by the server to indicate to an authenticator that the authenticator
      * is being placed into service.
      */
-    public void init( AuthenticatorConfig authenticatorConfig ) throws NamingException
+    public final void init( AuthenticatorContext ctx ) throws NamingException
     {
-        this.authenticatorConfig = authenticatorConfig;
-
-        init();
+        this.ctx = ctx;
+        doInit();
     }
 
 
@@ -93,9 +82,7 @@
      * A convenience method which can be overridden so that there's no need to
      * call super.init( authenticatorConfig ).
      */
-    public void init() throws NamingException
-    {
-    }
+    protected abstract void doInit();
 
 
     /**
@@ -105,33 +92,6 @@
 
 
     /**
-     * Returns the name of this authenticator instance.
-     */
-    public String getAuthenticatorName()
-    {
-        return authenticatorConfig.getAuthenticatorName();
-    }
-
-
-    /**
-     * Returns a String containing the value of the named initialization parameter, or null if the parameter does not exist.
-     */
-    public String getInitParameter( String name )
-    {
-        return authenticatorConfig.getInitParameter( name );
-    }
-
-
-    /**
-     * Returns the names of the servlet's initialization parameters as an Enumeration of String objects, or an empty Enumeration if the servlet has no initialization parameters.
-     */
-    public Enumeration getInitParameterNames()
-    {
-        return authenticatorConfig.getInitParameterNames();
-    }
-
-
-    /**
      * Allows a means to create an LDAP principal without exposing LdapPrincipal creation
      * to the rest of the world.
      *
@@ -142,9 +102,6 @@
     protected LdapPrincipal createLdapPrincipal( String dn ) throws NamingException
     {
         LdapName principalDn = new LdapName( dn );
-
         return new LdapPrincipal( principalDn );
     }
-
-
 }

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AbstractAuthenticator.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AnonymousAuthenticator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AnonymousAuthenticator.java?rev=190555&r1=190554&r2=190555&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AnonymousAuthenticator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AnonymousAuthenticator.java Mon Jun 13 22:09:25 2005
@@ -28,11 +28,14 @@
  */
 public class AnonymousAuthenticator extends AbstractAuthenticator
 {
-    public AnonymousAuthenticator( )
+    public AnonymousAuthenticator()
     {
         super( "none" );
     }
 
+    protected void doInit()
+    {
+    }
 
     /**
      * This will be called when the authentication is set to "none" on the client.
@@ -40,7 +43,7 @@
      */
     public LdapPrincipal authenticate( ServerContext ctx ) throws NamingException
     {
-        if ( getAuthenticatorContext().getAllowAnonymous() )
+        if ( getContext().getRootConfiguration().isAllowAnonymousAccess() )
         {
             return LdapPrincipal.ANONYMOUS ;
         }

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AnonymousAuthenticator.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticationService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticationService.java?rev=190555&r1=190554&r2=190555&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticationService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticationService.java Mon Jun 13 22:09:25 2005
@@ -17,23 +17,27 @@
 package org.apache.ldap.server.authn;
 
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+
 import org.apache.ldap.common.exception.LdapAuthenticationException;
 import org.apache.ldap.common.exception.LdapAuthenticationNotSupportedException;
 import org.apache.ldap.common.message.ResultCodeEnum;
 import org.apache.ldap.common.util.StringTools;
+import org.apache.ldap.server.configuration.AuthenticatorConfiguration;
 import org.apache.ldap.server.interceptor.Interceptor;
 import org.apache.ldap.server.interceptor.InterceptorContext;
 import org.apache.ldap.server.interceptor.NextInterceptor;
 import org.apache.ldap.server.invocation.Invocation;
-import org.apache.ldap.server.jndi.EnvKeys;
 import org.apache.ldap.server.jndi.ServerContext;
 import org.apache.ldap.server.jndi.ServerLdapContext;
 
-import javax.naming.Context;
-import javax.naming.NamingException;
-import java.lang.reflect.Constructor;
-import java.util.*;
-
 
 /**
  * An {@link Interceptor} that authenticates users.
@@ -52,7 +56,7 @@
     private static final String CREDS = Context.SECURITY_CREDENTIALS;
 
     /** authenticators **/
-    public Map authenticators = new LinkedHashMap();
+    public Map authenticators = new HashMap();
 
 
     /**
@@ -64,82 +68,27 @@
 
     public void init( InterceptorContext ctx ) throws NamingException
     {
-        /*
-         * Create and add the Authentication service interceptor to before
-         * interceptor chain.
-         */
-        boolean allowAnonymous = !ctx.getEnvironment().containsKey( EnvKeys.DISABLE_ANONYMOUS );
-
-        // create authenticator context
-
-        GenericAuthenticatorContext authenticatorContext = new GenericAuthenticatorContext();
-
-        authenticatorContext.setPartitionNexus( ctx.getRootNexus() );
-
-        authenticatorContext.setAllowAnonymous( allowAnonymous );
-
-        try // initialize default authenticators
-        {
-            // create anonymous authenticator
-
-            GenericAuthenticatorConfig authenticatorConfig = new GenericAuthenticatorConfig();
-
-            authenticatorConfig.setAuthenticatorName( "none" );
-
-            authenticatorConfig.setAuthenticatorContext( authenticatorContext );
-
-            org.apache.ldap.server.authn.Authenticator authenticator = new AnonymousAuthenticator();
-
-            authenticator.init( authenticatorConfig );
-
-            this.register( authenticator );
-
-            // create simple authenticator
-            authenticatorConfig = new GenericAuthenticatorConfig();
-
-            authenticatorConfig.setAuthenticatorName( "simple" );
-
-            authenticatorConfig.setAuthenticatorContext( authenticatorContext );
-
-            authenticator = new SimpleAuthenticator();
-
-            authenticator.init( authenticatorConfig );
-
-            this.register( authenticator );
-        }
-        catch ( Exception e )
-        {
-            throw new NamingException( e.getMessage() );
-        }
-
-        GenericAuthenticatorConfig[] configs = null;
-
-        configs = AuthenticatorConfigBuilder.getAuthenticatorConfigs( new Hashtable( ctx.getEnvironment() ) );
-
-        for ( int ii = 0; ii < configs.length; ii++ )
+        // Register all authenticators
+        Iterator i = ctx.getConfiguration().getAuthenticatorConfigurations().iterator();
+        while( i.hasNext() )
         {
-            try
-            {
-                configs[ii].setAuthenticatorContext( authenticatorContext );
-
-                String authenticatorClass = configs[ii].getAuthenticatorClass();
-
-                Class clazz = Class.forName( authenticatorClass );
-
-                Constructor constructor = clazz.getConstructor( new Class[] { } );
-
-                AbstractAuthenticator authenticator = ( AbstractAuthenticator ) constructor.newInstance( new Object[] { } );
-
-                authenticator.init( configs[ii] );
-
-                this.register( authenticator );
+            try {
+                AuthenticatorConfiguration cfg = ( AuthenticatorConfiguration ) i.next();
+                
+                // Create context
+                AuthenticatorContext authenticatorContext =
+                    new GenericAuthenticatorContext( ctx.getConfiguration(), cfg, ctx.getRootNexus() );
+    
+                cfg.getAuthenticator().init( authenticatorContext );
+                
+                this.register( cfg.getAuthenticator() );
             }
             catch ( Exception e )
             {
-                e.printStackTrace();
+                throw ( NamingException ) new NamingException(
+                        "Failed to register authenticator." ).initCause( e );
             }
         }
-
     }
     
     public void destroy()
@@ -155,7 +104,7 @@
      * @param authenticator AuthenticationService component to register with this
      * AuthenticatorService.
      */
-    public void register( org.apache.ldap.server.authn.Authenticator authenticator )
+    public void register( Authenticator authenticator )
     {
         Collection authenticatorList = getAuthenticators( authenticator.getAuthenticatorType() );
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/Authenticator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/Authenticator.java?rev=190555&r1=190554&r2=190555&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/Authenticator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/Authenticator.java Mon Jun 13 22:09:25 2005
@@ -36,24 +36,17 @@
  */
 public interface Authenticator
 {
-    public AuthenticatorConfig getAuthenticatorConfig();
-
     public String getAuthenticatorType();
+    
+    public AuthenticatorContext getContext();
 
     /**
      * Called by the authenticator container to indicate that the authenticator is being placed into service.
-     *
-     * @param authenticatorConfig
-     * @throws NamingException
      */
-    public void init( AuthenticatorConfig authenticatorConfig ) throws NamingException;
+    public void init( AuthenticatorContext ctx ) throws NamingException;
 
     /**
      * Perform the authentication operation and return the authorization id if successfull.
-     *
-     * @param ctx
-     * @return the authorization id
-     * @throws NamingException
      */
     public LdapPrincipal authenticate( ServerContext ctx ) throws NamingException;
 }

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/Authenticator.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticatorContext.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticatorContext.java?rev=190555&r1=190554&r2=190555&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticatorContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticatorContext.java Mon Jun 13 22:09:25 2005
@@ -18,6 +18,8 @@
 
 
 import org.apache.ldap.server.PartitionNexus;
+import org.apache.ldap.server.configuration.AuthenticatorConfiguration;
+import org.apache.ldap.server.configuration.StartupConfiguration;
 
 
 /**
@@ -26,18 +28,22 @@
  * anonymous connection.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev: 124525 $
+ * @version $Rev$
  */
 public interface AuthenticatorContext
 {
+    /**
+     * Returns root configuration.
+     */
+    public StartupConfiguration getRootConfiguration();
 
     /**
-     * Returns a reference to the PartitionNexus.
+     * Returns configuration of the {@link Authenticator}.
      */
-    public PartitionNexus getPartitionNexus();
+    public AuthenticatorConfiguration getConfiguration();
 
     /**
-     * Returns the value of server.disable.anonymous JNDI Property.
+     * Returns {@link PartitionNexus}.
      */
-    public boolean getAllowAnonymous();
+    public PartitionNexus getPartitionNexus();
 }

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticatorContext.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/GenericAuthenticatorContext.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/GenericAuthenticatorContext.java?rev=190555&r1=190554&r2=190555&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/GenericAuthenticatorContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/GenericAuthenticatorContext.java Mon Jun 13 22:09:25 2005
@@ -18,46 +18,48 @@
 
 
 import org.apache.ldap.server.PartitionNexus;
+import org.apache.ldap.server.configuration.AuthenticatorConfiguration;
+import org.apache.ldap.server.configuration.StartupConfiguration;
 
 
 /**
  * Default implementation of AuthenticatorContext.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev: 124525 $
+ * @version $Rev$
  */
 public class GenericAuthenticatorContext implements AuthenticatorContext
 {
-
+    private StartupConfiguration rootConfiguration;
+    private AuthenticatorConfiguration configuration;
     /** the root nexus to all database partitions */
     private PartitionNexus partitionNexus;
-    /** whether or not to allow anonymous users */
-    private boolean allowAnonymous = false;
 
     /**
      * Create a new AuthenticatorContext.
      */
-    public GenericAuthenticatorContext()
-    {
-    }
-
-    public PartitionNexus getPartitionNexus()
+    public GenericAuthenticatorContext(
+            StartupConfiguration rootConfiguration,
+            AuthenticatorConfiguration configuration,
+            PartitionNexus partitionNexus )
     {
-        return partitionNexus;
+        this.rootConfiguration = rootConfiguration;
+        this.configuration = configuration;
+        this.partitionNexus = partitionNexus;
     }
-    public void setPartitionNexus( PartitionNexus rootNexus )
+    
+    public StartupConfiguration getRootConfiguration()
     {
-        this.partitionNexus = rootNexus;
+        return rootConfiguration;
     }
-
-    public boolean getAllowAnonymous()
+    
+    public AuthenticatorConfiguration getConfiguration()
     {
-        return allowAnonymous;
+        return configuration;
     }
 
-    public void setAllowAnonymous( boolean allowAnonymous )
+    public PartitionNexus getPartitionNexus()
     {
-        this.allowAnonymous = allowAnonymous;
+        return partitionNexus;
     }
-
 }

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/GenericAuthenticatorContext.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/LdapPrincipal.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jun 13 22:09:25 2005
@@ -1 +1 @@
-Rev
+HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/SimpleAuthenticator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/SimpleAuthenticator.java?rev=190555&r1=190554&r2=190555&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/SimpleAuthenticator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/SimpleAuthenticator.java Mon Jun 13 22:09:25 2005
@@ -47,7 +47,10 @@
         super( "simple" );
     }
 
-
+    protected void doInit()
+    {
+    }
+    
     /**
      * Uses the userPassword field of the user to authenticate.
      *
@@ -90,7 +93,7 @@
 
         LdapName principalDn = new LdapName( principal );
 
-        PartitionNexus rootNexus = getAuthenticatorContext().getPartitionNexus();
+        PartitionNexus rootNexus = getContext().getPartitionNexus();
 
         Attributes userEntry = rootNexus.lookup( principalDn );
 

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/SimpleAuthenticator.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AttributesPropertyEditor.java (from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/AttributesPropertyEditor.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AttributesPropertyEditor.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AttributesPropertyEditor.java&p1=directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/AttributesPropertyEditor.java&r1=190553&r2=190555&rev=190555&view=diff
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AttributesPropertyEditor.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AuthenticatorConfiguration.java (from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/AuthenticatorConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AuthenticatorConfiguration.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AuthenticatorConfiguration.java&p1=directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/AuthenticatorConfiguration.java&r1=190553&r2=190555&rev=190555&view=diff
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AuthenticatorConfiguration.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/Configuration.java (from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/Configuration.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/Configuration.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/Configuration.java&p1=directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/Configuration.java&r1=190553&r2=190555&rev=190555&view=diff
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/Configuration.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationException.java (from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationException.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationException.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationException.java&p1=directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationException.java&r1=190553&r2=190555&rev=190555&view=diff
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationException.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationUtil.java (from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationUtil.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationUtil.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationUtil.java&p1=directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationUtil.java&r1=190553&r2=190555&rev=190555&view=diff
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationUtil.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ContextPartitionConfiguration.java (from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/ContextPartitionConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ContextPartitionConfiguration.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ContextPartitionConfiguration.java&p1=directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/ContextPartitionConfiguration.java&r1=190553&r2=190555&rev=190555&view=diff
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ContextPartitionConfiguration.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableAuthenticatorConfiguration.java (from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/MutableAuthenticatorConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableAuthenticatorConfiguration.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableAuthenticatorConfiguration.java&p1=directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/MutableAuthenticatorConfiguration.java&r1=190553&r2=190555&rev=190555&view=diff
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableAuthenticatorConfiguration.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableContextPartitionConfiguration.java (from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/MutableContextPartitionConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableContextPartitionConfiguration.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableContextPartitionConfiguration.java&p1=directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/MutableContextPartitionConfiguration.java&r1=190553&r2=190555&rev=190555&view=diff
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableContextPartitionConfiguration.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableStartupConfiguration.java (from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/MutableStartupConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableStartupConfiguration.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableStartupConfiguration.java&p1=directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/MutableStartupConfiguration.java&r1=190553&r2=190555&rev=190555&view=diff
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableStartupConfiguration.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ShutdownConfiguration.java (from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/ShutdownConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ShutdownConfiguration.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ShutdownConfiguration.java&p1=directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/ShutdownConfiguration.java&r1=190553&r2=190555&rev=190555&view=diff
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ShutdownConfiguration.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java (from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java&p1=directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java&r1=190553&r2=190555&rev=190555&view=diff
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/SyncConfiguration.java (from r190553, directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/SyncConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/SyncConfiguration.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/SyncConfiguration.java&p1=directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/SyncConfiguration.java&r1=190553&r2=190555&rev=190555&view=diff
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/SyncConfiguration.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/Database.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jun 13 22:09:25 2005
@@ -1 +1 @@
-Rev
+HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/DbSearchResult.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jun 13 22:09:25 2005
@@ -1 +1 @@
-Rev
+HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultOptimizer.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jun 13 22:09:25 2005
@@ -1 +1 @@
-Rev
+HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultSearchEngine.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jun 13 22:09:25 2005
@@ -1 +1 @@
-Rev
+HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/DisjunctionEnumeration.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jun 13 22:09:25 2005
@@ -1 +1 @@
-Rev
+HeadURL Id LastChangedBy LastChangedDate LastChangedRevision