directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trus...@apache.org
Subject svn commit: r201550 [1/5] - in /directory/apacheds/trunk/core: ./ src/main/aspects/ src/main/java/org/apache/ldap/server/ src/main/java/org/apache/ldap/server/authn/ src/main/java/org/apache/ldap/server/authz/ src/main/java/org/apache/ldap/server/confi...
Date Fri, 24 Jun 2005 03:08:39 GMT
Author: trustin
Date: Thu Jun 23 20:08:31 2005
New Revision: 201550

URL: http://svn.apache.org/viewcvs?rev=201550&view=rev
Log:
merging branch 'db_refactor' into trunk

Added:
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/enumeration/
      - copied from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultEnumeration.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultEnumeration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilter.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilteringEnumeration.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilteringEnumeration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/InvocationStack.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/invocation/InvocationStack.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryService.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryServiceListener.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryServiceListener.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextPartitionNexusProxy.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/ContextPartitionNexusProxy.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryService.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/
      - copied from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/AbstractContextPartition.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/AbstractContextPartition.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/ContextPartition.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/ContextPartition.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/ContextPartitionNexus.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/ContextPartitionNexus.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultContextPartitionNexus.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/DefaultContextPartitionNexus.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/Oid.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/Oid.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/
      - copied from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/
      - copied from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeContextPartition.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeContextPartition.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeSearchResult.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeSearchResult.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeSearchResultEnumeration.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeSearchResultEnumeration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/DefaultOptimizer.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/DefaultOptimizer.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/DefaultSearchEngine.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/DefaultSearchEngine.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/DisjunctionEnumeration.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/DisjunctionEnumeration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/DupsEnumeration.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/DupsEnumeration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/Enumerator.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/Enumerator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/Evaluator.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/Evaluator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ExpressionEnumerator.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ExpressionEnumerator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ExpressionEvaluator.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ExpressionEvaluator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/Index.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/Index.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/IndexAssertion.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/IndexAssertion.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/IndexAssertionEnumeration.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/IndexAssertionEnumeration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/IndexComparator.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/IndexComparator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/IndexEnumeration.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/IndexEnumeration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/IndexNotFoundException.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/IndexNotFoundException.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/IndexRecord.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/IndexRecord.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/KeyOnlyComparator.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/KeyOnlyComparator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/LeafEvaluator.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/LeafEvaluator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/MasterTable.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/MasterTable.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/NoDupsEnumeration.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/NoDupsEnumeration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/Optimizer.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/Optimizer.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ScopeEnumerator.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ScopeEnumerator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ScopeEvaluator.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ScopeEvaluator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SearchEngine.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SearchEngine.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SubstringEnumerator.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SubstringEnumerator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SubstringEvaluator.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SubstringEvaluator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/Table.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/Table.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/Tuple.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/Tuple.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/TupleBrowser.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/TupleBrowser.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/TupleComparator.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/TupleComparator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/TupleEnumeration.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/TupleEnumeration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/TupleRenderer.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/TupleRenderer.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/
      - copied from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/ASTNode.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/ASTNode.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/AboutDialog.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/AboutDialog.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/AddEntryDialog.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/AddEntryDialog.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/AnnotatedFilterTreeDialog.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/AnnotatedFilterTreeDialog.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/AttributesTableModel.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/AttributesTableModel.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/EntryDialog.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/EntryDialog.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/EntryNode.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/EntryNode.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/FilterDialog.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/FilterDialog.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/IndexDialog.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/IndexDialog.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/MainFrame.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/MainFrame.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/PartitionViewer.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/PartitionViewer.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/SearchResultDialog.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/SearchResultDialog.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/server.gif   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/server.gif
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/
      - copied from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmContextPartition.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmContextPartition.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmIndex.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmIndex.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmMasterTable.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmMasterTable.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmTable.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmTable.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmTupleBrowser.java   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmTupleBrowser.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/gui/
      - copied from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/gui/
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/package.html   (props changed)
      - copied unchanged from r201547, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/package.html
Removed:
    directory/apacheds/trunk/core/build.ajproperties
    directory/apacheds/trunk/core/src/main/aspects/
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractContextPartition.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ApplicationPartition.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/BackingStore.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextPartition.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/PartitionNexus.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/RootNexus.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/SystemPartition.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticatorContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/GenericAuthenticatorContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/
    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/Add.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Delete.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/EntryInvocation.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/GetMatchedDN.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/GetSuffix.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/HasEntry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/IsSuffix.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/List.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/ListSuffixes.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Lookup.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/LookupWithAttrIds.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Modify.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/ModifyMany.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/ModifyRN.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Move.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/MoveAndModifyRN.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Search.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/SubtreeInvocation.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/RootNexusProxy.java
Modified:
    directory/apacheds/trunk/core/maven.xml
    directory/apacheds/trunk/core/project.properties
    directory/apacheds/trunk/core/project.xml
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractTestCase.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AbstractAuthenticator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AnonymousAuthenticator.java
    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
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/LdapPrincipal.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/SimpleAuthenticator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/AuthorizationService.java
    directory/apacheds/trunk/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
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/Configuration.java
    directory/apacheds/trunk/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
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/InterceptorConfiguration.java
    directory/apacheds/trunk/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
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableInterceptorConfiguration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableStartupConfiguration.java
    directory/apacheds/trunk/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
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/BaseInterceptor.java
    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/InterceptorException.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/NextInterceptor.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/AbstractContextFactory.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DeadContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/JavaLdapSupport.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirObjectFactory.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/normalization/NormalizationService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/prefs/PreferencesUtils.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/prefs/ServerPreferencesFactory.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/prefs/ServerSystemPreferenceException.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/prefs/ServerSystemPreferences.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitorAdapter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ConcreteNameComponentNormalizer.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalOidRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalRegistries.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitorAdapter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitorAdapter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectFactoryRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitorAdapter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/StateFactoryRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitorAdapter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitorAdapter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/AbstractBootstrapProducer.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ApacheComparatorProducer.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ApacheNormalizerProducer.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapAttributeTypeRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapComparatorRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitContentRuleRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitStructureRuleRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNameFormRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNormalizerRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectClassRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectFactoryRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapOidRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapRegistries.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapStateFactoryRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonComparatorProducer.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonNormalizerProducer.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisComparatorProducer.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisNormalizerProducer.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxCheckerProducer.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxProducer.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemComparatorProducer.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxCheckerProducer.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxProducer.java
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsAdminTest.java
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsNonAdminTest.java
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/ListAsNonAdminTest.java
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/operational/OperationalAttributeServiceTest.java
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/prefs/PreferencesUtilsTest.java

Modified: directory/apacheds/trunk/core/maven.xml
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/maven.xml?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/maven.xml (original)
+++ directory/apacheds/trunk/core/maven.xml Thu Jun 23 20:08:31 2005
@@ -18,8 +18,4 @@
   <preGoal name="java:compile">
     <attainGoal name="directory:schema"/>
   </preGoal> 
- 
-  <postGoal name="java:compile">
-    <attainGoal name="aspectj:compile"/>
-  </postGoal>
 </project>

Modified: directory/apacheds/trunk/core/project.properties
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/project.properties?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/project.properties (original)
+++ directory/apacheds/trunk/core/project.properties Thu Jun 23 20:08:31 2005
@@ -9,13 +9,6 @@
 
 #maven.javadoc.private=true
 
-# AspectJ Properties
-# =======================
-
-#maven.aspectj.verbose=true
-#maven.aspectj.incremental=true
-maven.aspectj.time=true
-
 
 # schema class generation
 # =======================
@@ -41,7 +34,7 @@
 maven.junit.sysproperties=java.util.prefs.PreferencesFactory
 java.util.prefs.PreferencesFactory=org.apache.ldap.server.prefs.ServerPreferencesFactory
 
-maven.eclipse.classpath.include=${basedir}/target/schema,${basedir}/src/main/aspects
+maven.eclipse.classpath.include=${basedir}/target/schema
 
 # Disabled temporarilly; Eclipse build doesn't work.
 #maven.eclipse.buildcommands=org.eclipse.ajdt.core.ajbuilder

Modified: directory/apacheds/trunk/core/project.xml
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/project.xml?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/project.xml (original)
+++ directory/apacheds/trunk/core/project.xml Thu Jun 23 20:08:31 2005
@@ -76,15 +76,6 @@
       <version>0.9.1-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>aspectj</groupId>
-      <artifactId>aspectjrt</artifactId>
-      <version>1.2</version>
-      <properties>
-        <gump.project>aspectj</gump.project>
-        <gump.id>aspectjrt</gump.id>
-      </properties>
-    </dependency>
-    <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>apacheds-shared</artifactId>
       <version>${pom.currentVersion}</version>
@@ -125,7 +116,6 @@
   </dependencies>
 
   <build>
-    <aspectSourceDirectory>${basedir}/src/main/aspects</aspectSourceDirectory>
   </build>
 
   <reports>

Modified: directory/apacheds/trunk/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?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractTestCase.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractTestCase.java Thu Jun 23 20:08:31 2005
@@ -22,7 +22,9 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;

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=201550&r1=201549&r2=201550&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 Thu Jun 23 20:08:31 2005
@@ -18,8 +18,11 @@
 
 
 import javax.naming.NamingException;
+import javax.naming.spi.InitialContextFactory;
 
 import org.apache.ldap.common.name.LdapName;
+import org.apache.ldap.server.configuration.AuthenticatorConfiguration;
+import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
 import org.apache.ldap.server.jndi.ServerContext;
 
 
@@ -27,21 +30,21 @@
  * Base class for all Authenticators.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
  */
 public abstract class AbstractAuthenticator implements Authenticator
 {
-
-    /** authenticator config */
-    private AuthenticatorContext ctx;
+    private ContextFactoryConfiguration factoryCfg;
+    private AuthenticatorConfiguration cfg;
 
     /** authenticator type */
     private String authenticatorType;
 
 
     /**
-     * Create a new AuthenticationService.
+     * Creates a new instance.
      *
-     * @param type authenticator's type
+     * @param type the type of this authenticator (e.g. <tt>'simple'</tt>, <tt>'none'</tt>...)
      */
     protected AbstractAuthenticator( String type )
     {
@@ -50,17 +53,22 @@
 
 
     /**
-     * Returns a reference to the AuthenticatorContext in which this authenticator is running.
+     * Returns {@link ContextFactoryConfiguration} of {@link InitialContextFactory}
+     * which initialized this authenticator.
      */
-    public AuthenticatorContext getContext()
+    public ContextFactoryConfiguration getFactoryConfiguration()
     {
-        return ctx;
+        return factoryCfg;
     }
-
-
+    
     /**
-     * Returns this authenticator's type.
+     * Returns the configuration of this authenticator.
      */
+    public AuthenticatorConfiguration getConfiguration()
+    {
+        return cfg;
+    }
+
     public String getAuthenticatorType()
     {
         return authenticatorType;
@@ -68,40 +76,64 @@
 
 
     /**
-     * Called by the server to indicate to an authenticator that the authenticator
-     * is being placed into service.
+     * Initializes default properties (<tt>factoryConfiguration</tt> and
+     * <tt>configuration</tt>, and calls {@link #doInit()} method.
+     * Please put your initialization code into {@link #doInit()}.
      */
-    public final void init( AuthenticatorContext ctx ) throws NamingException
+    public final void init( ContextFactoryConfiguration factoryCfg, AuthenticatorConfiguration cfg ) throws NamingException
     {
-        this.ctx = ctx;
+        this.factoryCfg = factoryCfg;
+        this.cfg = cfg;
         doInit();
     }
 
 
     /**
-     * A convenience method which can be overridden so that there's no need to
-     * call super.init( authenticatorConfig ).
+     * Implement your initialization code here.
      */
-    protected abstract void doInit();
-
+    protected void doInit() throws NamingException
+    {
+    }
 
     /**
-     * Perform the authentication operation and return the authorization id if successfull.
+     * Calls {@link #doDestroy()} method, and clears default properties
+     * (<tt>factoryConfiguration</tt> and <tt>configuration</tt>).
+     * Please put your deinitialization code into {@link #doDestroy()}. 
+     */
+    public final void destroy()
+    {
+        try
+        {
+            doDestroy();
+        }
+        finally
+        {
+            this.factoryCfg = null;
+            this.cfg = null;
+        }
+    }
+    
+    /**
+     * Implement your deinitialization code here.
      */
+    protected void doDestroy()
+    {
+    }
+
     public abstract LdapPrincipal authenticate( ServerContext ctx ) throws NamingException;
 
 
     /**
-     * Allows a means to create an LDAP principal without exposing LdapPrincipal creation
-     * to the rest of the world.
+     * Returns a new {@link LdapPrincipal} instance whose value is the specified
+     * <tt>name</tt>.
      *
-     * @param dn the distinguished name of the X.500 principal
-     * @return the principal for the dn
-     * @throws NamingException if there is a problem parsing the dn
+     * @param name the distinguished name of the X.500 principal
+     * @return the principal for the <tt>name</tt>
+     * @throws NamingException if there is a problem parsing <tt>name</tt>
      */
-    protected LdapPrincipal createLdapPrincipal( String dn ) throws NamingException
+    protected static LdapPrincipal createLdapPrincipal( String name ) throws NamingException
     {
-        LdapName principalDn = new LdapName( dn );
+        LdapName principalDn = new LdapName( name );
         return new LdapPrincipal( principalDn );
     }
 }

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=201550&r1=201549&r2=201550&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 Thu Jun 23 20:08:31 2005
@@ -16,34 +16,34 @@
  */
 package org.apache.ldap.server.authn;
 
+import javax.naming.NamingException;
+
 import org.apache.ldap.common.exception.LdapNoPermissionException;
 import org.apache.ldap.server.jndi.ServerContext;
 
-import javax.naming.NamingException;
-
 /**
- * A default implentation of an AuthenticationService for handling anonymous connections.
+ * An {@link Authenticator} that handles anonymous connections
+ * (type <tt>'none'</tt>).
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 public class AnonymousAuthenticator extends AbstractAuthenticator
 {
+    /**
+     * Creates a new instance.
+     */
     public AnonymousAuthenticator()
     {
         super( "none" );
     }
 
-    protected void doInit()
-    {
-    }
-
     /**
-     * This will be called when the authentication is set to "none" on the client.
-     * If server is not configured to allow anonymous connections, it throws an exception.
+     * If the context is not configured to allow anonymous connections,
+     * this method throws a {@link javax.naming.NoPermissionException}.
      */
     public LdapPrincipal authenticate( ServerContext ctx ) throws NamingException
     {
-        if ( getContext().getRootConfiguration().isAllowAnonymousAccess() )
+        if ( getFactoryConfiguration().getStartupConfiguration().isAllowAnonymousAccess() )
         {
             return LdapPrincipal.ANONYMOUS ;
         }

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=201550&r1=201549&r2=201550&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 Thu Jun 23 20:08:31 2005
@@ -24,19 +24,25 @@
 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;
+import javax.naming.directory.ModificationItem;
+import javax.naming.directory.SearchControls;
 
 import org.apache.ldap.common.exception.LdapAuthenticationException;
 import org.apache.ldap.common.exception.LdapAuthenticationNotSupportedException;
+import org.apache.ldap.common.filter.ExprNode;
 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.configuration.InterceptorConfiguration;
 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.invocation.InvocationStack;
+import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
 import org.apache.ldap.server.jndi.ServerContext;
-import org.apache.ldap.server.jndi.ServerLdapContext;
 
 
 /**
@@ -49,15 +55,10 @@
  */
 public class AuthenticationService implements Interceptor
 {
-    /** short for Context.SECURITY_AUTHENTICATION */
-    private static final String AUTH_TYPE = Context.SECURITY_AUTHENTICATION;
-
-    /** short for Context.SECURITY_CREDENTIALS */
-    private static final String CREDS = Context.SECURITY_CREDENTIALS;
-
     /** authenticators **/
     public Map authenticators = new HashMap();
 
+    private ContextFactoryConfiguration factoryCfg;
 
     /**
      * Creates an authentication service interceptor.
@@ -66,68 +67,71 @@
     {
     }
 
-    public void init( InterceptorContext ctx ) throws NamingException
+    /**
+     * Registers and initializes all {@link Authenticator}s to this service.
+     */
+    public void init( ContextFactoryConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
     {
+        this.factoryCfg = factoryCfg;
+
         // Register all authenticators
-        Iterator i = ctx.getConfiguration().getAuthenticatorConfigurations().iterator();
+        Iterator i = factoryCfg.getStartupConfiguration().getAuthenticatorConfigurations().iterator();
         while( i.hasNext() )
         {
-            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() );
+            try
+            {
+                this.register( ( AuthenticatorConfiguration ) i.next() );
             }
             catch ( Exception e )
             {
+                destroy();
                 throw ( NamingException ) new NamingException(
                         "Failed to register authenticator." ).initCause( e );
             }
         }
     }
     
+    /**
+     * Deinitializes and deregisters all {@link Authenticator}s from this service.
+     */
     public void destroy()
     {
+        Iterator i = new ArrayList( authenticators.values() ).iterator();
+        while( i.hasNext() )
+        {
+            Iterator j = new ArrayList( ( Collection ) i.next() ).iterator();
+            while( j.hasNext() )
+            {
+                unregister( ( Authenticator ) j.next() );
+            }
+        }
+        
         authenticators.clear();
     }
 
     /**
-     * Registers an AuthenticationService with the AuthenticationService.  Called by each
-     * AuthenticationService implementation after it has started to register for
-     * authentication operation calls.
-     *
-     * @param authenticator AuthenticationService component to register with this
-     * AuthenticatorService.
+     * Initializes the specified {@link Authenticator} and registers it to
+     * this service.
      */
-    public void register( Authenticator authenticator )
+    private void register( AuthenticatorConfiguration cfg ) throws NamingException
     {
-        Collection authenticatorList = getAuthenticators( authenticator.getAuthenticatorType() );
+        cfg.getAuthenticator().init( factoryCfg, cfg );
 
+        Collection authenticatorList = getAuthenticators( cfg.getAuthenticator().getAuthenticatorType() );
         if ( authenticatorList == null )
         {
             authenticatorList = new ArrayList();
-
-            authenticators.put( authenticator.getAuthenticatorType(), authenticatorList );
+            authenticators.put( cfg.getAuthenticator().getAuthenticatorType(), authenticatorList );
         }
 
-        authenticatorList.add( authenticator );
+        authenticatorList.add( cfg.getAuthenticator() );
     }
 
     /**
-     * Unregisters an AuthenticationService with the AuthenticationService.  Called for each
-     * registered AuthenticationService right before it is to be stopped.  This prevents
-     * protocol server calls from reaching the Backend and effectively puts
-     * the ContextPartition's naming context offline.
-     *
-     * @param authenticator AuthenticationService component to unregister with this
-     * AuthenticationService.
+     * Deinitializes the specified {@link Authenticator} and deregisters it from
+     * this service.
      */
-    public void unregister( org.apache.ldap.server.authn.Authenticator authenticator )
+    private void unregister( Authenticator authenticator )
     {
         Collection authenticatorList = getAuthenticators( authenticator.getAuthenticatorType() );
 
@@ -137,42 +141,176 @@
         }
 
         authenticatorList.remove( authenticator );
+        
+        try
+        {
+            authenticator.destroy();
+        }
+        catch( Throwable t )
+        {
+            t.printStackTrace();
+        }
     }
 
     /**
-     * Gets the authenticators with a specific type.
-     *
-     * @param type the authentication type
-     * @return the authenticators with the specified type
+     * Returns the list of {@link Authenticator}s with the specified type.
+     * 
+     * @return <tt>null</tt> if no authenticator is found.
      */
-    public Collection getAuthenticators( String type )
+    private Collection getAuthenticators( String type )
     {
-        return ( Collection ) authenticators.get( type );
+        Collection result = ( Collection ) authenticators.get( type );
+        if( result != null && result.size() > 0 )
+        {
+            return result;
+        }
+        else
+        {
+            return null;
+        }
     }
     
-    public void process( NextInterceptor nextProcessor, Invocation call ) throws NamingException
+
+    public void add( NextInterceptor next, String upName, Name normName, Attributes entry ) throws NamingException
+    {
+        authenticate();
+        next.add( upName, normName, entry );
+    }
+
+
+    public void delete( NextInterceptor next, Name name ) throws NamingException
+    {
+        authenticate();
+        next.delete( name );
+    }
+
+
+    public Name getMatchedName( NextInterceptor next, Name dn, boolean normalized ) throws NamingException
+    {
+        authenticate();
+        return next.getMatchedName( dn, normalized );
+    }
+
+
+    public Attributes getRootDSE( NextInterceptor next ) throws NamingException
+    {
+        authenticate();
+        return next.getRootDSE();
+    }
+
+
+    public Name getSuffix( NextInterceptor next, Name dn, boolean normalized ) throws NamingException
+    {
+        authenticate();
+        return next.getSuffix( dn, normalized );
+    }
+
+
+    public boolean hasEntry( NextInterceptor next, Name name ) throws NamingException
+    {
+        authenticate();
+        return next.hasEntry( name );
+    }
+
+
+    public boolean isSuffix( NextInterceptor next, Name name ) throws NamingException
+    {
+        authenticate();
+        return next.isSuffix( name );
+    }
+
+
+    public NamingEnumeration list( NextInterceptor next, Name base ) throws NamingException
+    {
+        authenticate();
+        return next.list( base );
+    }
+
+
+    public Iterator listSuffixes( NextInterceptor next, boolean normalized ) throws NamingException
+    {
+        authenticate();
+        return next.listSuffixes( normalized );
+    }
+
+
+    public Attributes lookup( NextInterceptor next, Name dn, String[] attrIds ) throws NamingException
+    {
+        authenticate();
+        return next.lookup( dn, attrIds );
+    }
+
+
+    public Attributes lookup( NextInterceptor next, Name name ) throws NamingException
+    {
+        authenticate();
+        return next.lookup( name );
+    }
+
+
+    public void modify( NextInterceptor next, Name name, int modOp, Attributes mods ) throws NamingException
+    {
+        authenticate();
+        next.modify( name, modOp, mods );
+    }
+
+
+    public void modify( NextInterceptor next, Name name, ModificationItem[] mods ) throws NamingException
+    {
+        authenticate();
+        next.modify( name, mods );
+    }
+
+
+    public void modifyRn( NextInterceptor next, Name name, String newRn, boolean deleteOldRn ) throws NamingException
+    {
+        authenticate();
+        next.modifyRn( name, newRn, deleteOldRn );
+    }
+
+
+    public void move( NextInterceptor next, Name oriChildName, Name newParentName, String newRn, boolean deleteOldRn ) throws NamingException
+    {
+        authenticate();
+        next.move( oriChildName, newParentName, newRn, deleteOldRn );
+    }
+
+
+    public void move( NextInterceptor next, Name oriChildName, Name newParentName ) throws NamingException
+    {
+        authenticate();
+        next.move( oriChildName, newParentName );
+    }
+
+
+    public NamingEnumeration search( NextInterceptor next, Name base, Map env, ExprNode filter, SearchControls searchCtls ) throws NamingException
+    {
+        authenticate();
+        return next.search( base, env, filter, searchCtls );
+    }
+
+
+    private void authenticate() throws NamingException
     {
         // check if we are already authenticated and if so we return making
         // sure first that the credentials are not exposed within context
-        ServerContext ctx = ( ServerLdapContext ) call.getContextStack().peek();
+        ServerContext ctx =
+            ( ServerContext ) InvocationStack.getInstance().peek().getCaller();
 
         if ( ctx.getPrincipal() != null )
         {
-            if ( ctx.getEnvironment().containsKey( CREDS ) )
+            if ( ctx.getEnvironment().containsKey( Context.SECURITY_CREDENTIALS ) )
             {
-                ctx.removeFromEnvironment( CREDS );
+                ctx.removeFromEnvironment( Context.SECURITY_CREDENTIALS );
             }
-
-            nextProcessor.process(call);
-
             return;
         }
 
-        String authList = ( String ) ctx.getEnvironment().get( AUTH_TYPE );
+        String authList = ( String ) ctx.getEnvironment().get( Context.SECURITY_AUTHENTICATION );
 
         if ( authList == null )
         {
-            if ( ctx.getEnvironment().containsKey( CREDS ) )
+            if ( ctx.getEnvironment().containsKey( Context.SECURITY_CREDENTIALS ) )
             {
                 // authentication type is simple here
 
@@ -231,10 +369,7 @@
 
                 // remove creds so there is no security risk
 
-                ctx.removeFromEnvironment( CREDS );
-
-                nextProcessor.process(call);
-
+                ctx.removeFromEnvironment( Context.SECURITY_CREDENTIALS );
                 return;
             }
             catch ( LdapAuthenticationException e )
@@ -248,6 +383,8 @@
 
 
     /**
+     * FIXME This doesn't secure anything actually.
+     * 
      * Created this wrapper to pass to ctx.setPrincipal() which is public for added
      * security.  This adds more security because an instance of this class is not
      * easily accessible whereas LdapPrincipals can be accessed easily from a context

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=201550&r1=201549&r2=201550&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 Thu Jun 23 20:08:31 2005
@@ -17,36 +17,53 @@
 package org.apache.ldap.server.authn;
 
 
-import org.apache.ldap.server.jndi.ServerContext;
-
+import javax.naming.Context;
 import javax.naming.NamingException;
 
+import org.apache.ldap.server.configuration.AuthenticatorConfiguration;
+import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
+import org.apache.ldap.server.jndi.ServerContext;
+import org.apache.ldap.server.partition.ContextPartitionNexus;
+
 
 /**
- * Defines methods that all Authenticators must implement.
- *
- * <p>An AuthenticationService is a program that performs client authentication based on the authentication
- * method/type that the client specifies in the JNDI properties.
- *
- * <p>To implement this interface, you can write an authenticator that extends org.apache.ldap.server.authn.AbstractAuthenticator.
+ * Authenticates users who access {@link ContextPartitionNexus}.
+ * <p>
+ * {@link Authenticator}s are registered to and configured by
+ * {@link AuthenticationService} interceptor.
+ * <p>
+ * {@link AuthenticationService} authenticates users by calling
+ * {@link #authenticate(ServerContext)}, and then {@link Authenticator}
+ * checks JNDI {@link Context} environment properties
+ * ({@link Context#SECURITY_PRINCIPAL} and {@link Context#SECURITY_CREDENTIALS})
+ * of current {@link Context}.
  *
- * @see org.apache.ldap.server.authn.AbstractAuthenticator
+ * @see AbstractAuthenticator
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
 public interface Authenticator
 {
+    /**
+     * Returns the type of this authenticator (e.g. <tt>'simple'</tt>,
+     * <tt>'none'</tt>,...).
+     */
     public String getAuthenticatorType();
     
-    public AuthenticatorContext getContext();
-
     /**
-     * Called by the authenticator container to indicate that the authenticator is being placed into service.
+     * Called by {@link AuthenticationService} to indicate that this
+     * authenticator is being placed into service.
+     */
+    public void init( ContextFactoryConfiguration factoryCfg, AuthenticatorConfiguration cfg ) throws NamingException;
+    
+    /**
+     * Called by {@link AuthenticationService} to indicate that this
+     * authenticator is being removed from service.
      */
-    public void init( AuthenticatorContext ctx ) throws NamingException;
+    public void destroy();
 
     /**
-     * Perform the authentication operation and return the authorization id if successfull.
+     * Performs authentication and returns the principal if succeeded.
      */
     public LdapPrincipal authenticate( ServerContext ctx ) throws NamingException;
 }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/LdapPrincipal.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/LdapPrincipal.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/LdapPrincipal.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/LdapPrincipal.java Thu Jun 23 20:08:31 2005
@@ -17,12 +17,13 @@
 package org.apache.ldap.server.authn;
 
 
-import org.apache.ldap.common.name.LdapName;
-
-import javax.naming.Name;
 import java.io.Serializable;
 import java.security.Principal;
 
+import javax.naming.Name;
+
+import org.apache.ldap.common.name.LdapName;
+
 
 /**
  * An alternative X500 user implementation that has access to the distinguished
@@ -66,23 +67,29 @@
 
     /**
      * Gets a cloned copy of the normalized distinguished name of this
-     * principal as a JNDI Name.  It must be cloned to protect this Principal
-     * from alteration.
+     * principal as a JNDI {@link Name}.
      *
-     * @return the normalized distinguished name of the principal as a JNDI Name
+     * @return the normalized distinguished name of the principal as a JNDI {@link Name}
      */
-    public Name getDn()
+    public Name getJndiName()
     {
         return ( Name ) name.clone();
     }
 
 
     /**
-     * Gets the normalized distinguished name of the principal as a String.
-     *
-     * @see Principal#getName()
+     * Returns the normalized distinguished name of the principal as a String.
      */
     public String getName()
+    {
+        return name.toString();
+    }
+    
+    /**
+     * Returns string representation of the normalized distinguished name
+     * of this principal.
+     */
+    public String toString()
     {
         return name.toString();
     }

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=201550&r1=201549&r2=201550&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 Thu Jun 23 20:08:31 2005
@@ -17,44 +17,39 @@
 package org.apache.ldap.server.authn;
 
 
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+
 import org.apache.ldap.common.exception.LdapAuthenticationException;
 import org.apache.ldap.common.exception.LdapNameNotFoundException;
 import org.apache.ldap.common.name.LdapName;
 import org.apache.ldap.common.util.ArrayUtils;
-import org.apache.ldap.server.PartitionNexus;
 import org.apache.ldap.server.jndi.ServerContext;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
+import org.apache.ldap.server.partition.ContextPartitionNexus;
 
 
 /**
- * A simple AuthenticationService that just authenticates clear text passwords
- * contained within the <code>userPassword</code> attribute.
+ * A simple {@link Authenticator} that authenticates clear text passwords
+ * contained within the <code>userPassword</code> attribute in DIT.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 public class SimpleAuthenticator extends AbstractAuthenticator
 {
     /**
-     * Creates a simple authenticator for clear text passwords in
-     * userPassword attributes.
+     * Creates a new instance.
      */
     public SimpleAuthenticator( )
     {
         super( "simple" );
     }
 
-    protected void doInit()
-    {
-    }
-    
     /**
-     * Uses the userPassword field of the user to authenticate.
-     *
-     * @see org.apache.ldap.server.authn.Authenticator#authenticate(org.apache.ldap.server.jndi.ServerContext)
+     * Looks up <tt>userPassword</tt> attribute of the entry whose name is
+     * the value of {@link Context#SECURITY_PRINCIPAL} environment variable,
+     * and authenticates a user with the plain-text password.
      */
     public LdapPrincipal authenticate( ServerContext ctx ) throws NamingException
     {
@@ -93,9 +88,8 @@
 
         LdapName principalDn = new LdapName( principal );
 
-        PartitionNexus rootNexus = getContext().getPartitionNexus();
-
-        Attributes userEntry = rootNexus.lookup( principalDn );
+        ContextPartitionNexus nexus = getFactoryConfiguration().getPartitionNexus();
+        Attributes userEntry = nexus.lookup( principalDn );
 
         if ( userEntry == null )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/AuthorizationService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/AuthorizationService.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/AuthorizationService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/AuthorizationService.java Thu Jun 23 20:08:31 2005
@@ -17,33 +17,39 @@
 package org.apache.ldap.server.authz;
 
 
-import org.apache.ldap.common.exception.LdapNoPermissionException;
-import org.apache.ldap.common.name.DnParser;
-import org.apache.ldap.server.BackingStore;
-import org.apache.ldap.server.SystemPartition;
-import org.apache.ldap.server.interceptor.BaseInterceptor;
-import org.apache.ldap.server.interceptor.InterceptorContext;
-import org.apache.ldap.server.interceptor.NextInterceptor;
-import org.apache.ldap.server.db.ResultFilteringEnumeration;
-import org.apache.ldap.server.db.SearchResultFilter;
-import org.apache.ldap.server.invocation.*;
-import org.apache.ldap.server.jndi.ServerContext;
-import org.apache.ldap.server.schema.AttributeTypeRegistry;
-import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
+import java.util.Map;
 
 import javax.naming.Name;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
+import javax.naming.NoPermissionException;
 import javax.naming.directory.Attributes;
+import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 import javax.naming.ldap.LdapContext;
 
+import org.apache.ldap.common.exception.LdapNoPermissionException;
+import org.apache.ldap.common.filter.ExprNode;
+import org.apache.ldap.common.name.DnParser;
+import org.apache.ldap.server.configuration.InterceptorConfiguration;
+import org.apache.ldap.server.enumeration.SearchResultFilteringEnumeration;
+import org.apache.ldap.server.enumeration.SearchResultFilter;
+import org.apache.ldap.server.interceptor.BaseInterceptor;
+import org.apache.ldap.server.interceptor.Interceptor;
+import org.apache.ldap.server.interceptor.NextInterceptor;
+import org.apache.ldap.server.invocation.InvocationStack;
+import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
+import org.apache.ldap.server.jndi.ServerContext;
+import org.apache.ldap.server.partition.ContextPartitionNexus;
+import org.apache.ldap.server.schema.AttributeTypeRegistry;
+import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
+
 
 /**
- * An {@link org.apache.ldap.server.interceptor.Interceptor} that controls access to {@link BackingStore}
- * operations.  If a user tries to perform any operations that requires
- * permission he or she doesn't have, {@link NamingException} will be
+ * An {@link Interceptor} that controls access to {@link ContextPartitionNexus}.
+ * If a user tries to perform any operations that requires
+ * permission he or she doesn't have, {@link NoPermissionException} will be
  * thrown and therefore the current invocation chain will terminate.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -54,17 +60,17 @@
     /**
      * the administrator's distinguished {@link Name}
      */
-    private static final Name ADMIN_DN = SystemPartition.getAdminDn();
+    private static final Name ADMIN_DN = ContextPartitionNexus.getAdminName();
 
     /**
      * the base distinguished {@link Name} for all users
      */
-    private static final Name USER_BASE_DN = SystemPartition.getUsersBaseDn();
+    private static final Name USER_BASE_DN = ContextPartitionNexus.getUsersBaseName();
 
     /**
      * the base distinguished {@link Name} for all groups
      */
-    private static final Name GROUP_BASE_DN = SystemPartition.getGroupsBaseDn();
+    private static final Name GROUP_BASE_DN = ContextPartitionNexus.getGroupsBaseName();
 
     /**
      * the name parser used by this service
@@ -73,38 +79,27 @@
 
 
     /**
-     * Creates an authorization service interceptor.
+     * Creates a new instance.
      */
     public AuthorizationService()
     {
     }
 
 
-    public void init( InterceptorContext ctx ) throws NamingException
+    public void init( ContextFactoryConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
     {
-        AttributeTypeRegistry atr = ctx.getGlobalRegistries().getAttributeTypeRegistry();
+        AttributeTypeRegistry atr = factoryCfg.getGlobalRegistries().getAttributeTypeRegistry();
         dnParser = new DnParser( new ConcreteNameComponentNormalizer( atr ) );
     }
 
 
-    public void destroy()
-    {
-    }
-
-
-    public void process( NextInterceptor nextInterceptor, Invocation call ) throws NamingException
-    {
-        super.process( nextInterceptor, call );
-    }
-
     // Note:
     //    Lookup, search and list operations need to be handled using a filter
     // and so we need access to the filter service.
 
-    protected void process( NextInterceptor nextInterceptor, Delete call ) throws NamingException
+    public void delete( NextInterceptor nextInterceptor, Name name ) throws NamingException
     {
-        Name name = call.getName();
-        Name principalDn = getPrincipal( call ).getDn();
+        Name principalDn = getPrincipal().getJndiName();
 
         if ( name.toString().equals( "" ) )
         {
@@ -138,7 +133,7 @@
             throw new LdapNoPermissionException( msg );
         }
 
-        nextInterceptor.process( call );
+        nextInterceptor.delete( name );
     }
 
 
@@ -148,9 +143,9 @@
      * the provider for optimization purposes so there is no reason for us to
      * start to constrain it.
      */
-    protected void process( NextInterceptor nextInterceptor, HasEntry call ) throws NamingException
+    public boolean hasEntry( NextInterceptor nextInterceptor, Name name ) throws NamingException
     {
-        super.process( nextInterceptor, call );
+        return super.hasEntry( nextInterceptor, name );
     }
 
 
@@ -165,10 +160,10 @@
      * users to self access these resources.  As far as we're concerned no one but
      * the admin needs access.
      */
-    protected void process( NextInterceptor nextInterceptor, Modify call ) throws NamingException
+    public void modify( NextInterceptor nextInterceptor, Name name, int modOp, Attributes attrs ) throws NamingException
     {
-        protectModifyAlterations( call, call.getName() );
-        nextInterceptor.process( call );
+        protectModifyAlterations( name );
+        nextInterceptor.modify( name, modOp, attrs );
     }
 
 
@@ -178,16 +173,16 @@
      * self access these resources.  As far as we're concerned no one but the admin
      * needs access.
      */
-    protected void process( NextInterceptor nextInterceptor, ModifyMany call ) throws NamingException
+    public void modify( NextInterceptor nextInterceptor, Name name, ModificationItem[] items ) throws NamingException
     {
-        protectModifyAlterations( call, call.getName() );
-        nextInterceptor.process( call );
+        protectModifyAlterations( name );
+        nextInterceptor.modify( name, items );
     }
 
 
-    private void protectModifyAlterations( Invocation call, Name dn ) throws LdapNoPermissionException
+    private void protectModifyAlterations( Name dn ) throws LdapNoPermissionException
     {
-        Name principalDn = getPrincipal( call ).getDn();
+        Name principalDn = getPrincipal().getJndiName();
 
         if ( dn.toString().equals( "" ) )
         {
@@ -235,30 +230,32 @@
     // ------------------------------------------------------------------------
 
 
-    protected void process( NextInterceptor nextInterceptor, ModifyRN call ) throws NamingException
+    public void modifyRn( NextInterceptor nextInterceptor, Name name, String newRn, boolean deleteOldRn ) throws NamingException
     {
-        protectDnAlterations( call, call.getName() );
-        nextInterceptor.process( call );
+        protectDnAlterations( name );
+        nextInterceptor.modifyRn( name, newRn, deleteOldRn );
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, Move call ) throws NamingException
+    public void move( NextInterceptor nextInterceptor, Name oriChildName, Name newParentName ) throws NamingException
     {
-        protectDnAlterations( call, call.getName() );
-        nextInterceptor.process( call );
+        protectDnAlterations( oriChildName );
+        nextInterceptor.move( oriChildName, newParentName );
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, MoveAndModifyRN call ) throws NamingException
+    public void move( NextInterceptor nextInterceptor,
+            Name oriChildName, Name newParentName, String newRn,
+            boolean deleteOldRn ) throws NamingException
     {
-        protectDnAlterations( call, call.getName() );
-        nextInterceptor.process( call );
+        protectDnAlterations( oriChildName );
+        nextInterceptor.move( oriChildName, newParentName, newRn, deleteOldRn );
     }
 
 
-    private void protectDnAlterations( Invocation call, Name dn ) throws LdapNoPermissionException
+    private void protectDnAlterations( Name dn ) throws LdapNoPermissionException
     {
-        Name principalDn = getPrincipal( call ).getDn();
+        Name principalDn = getPrincipal().getJndiName();
 
         if ( dn.toString().equals( "" ) )
         {
@@ -294,43 +291,37 @@
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, Lookup call ) throws NamingException
+    public Attributes lookup( NextInterceptor nextInterceptor, Name name ) throws NamingException
     {
-        super.process( nextInterceptor, call );
-
-        Attributes attributes = ( Attributes ) call.getReturnValue();
+        Attributes attributes = nextInterceptor.lookup( name );
         if ( attributes == null )
         {
-            return;
+            return null;
         }
 
-        Attributes retval = ( Attributes ) attributes.clone();
-        LdapContext ctx = ( LdapContext ) call.getContextStack().peek();
-        protectLookUp( ctx, call.getName() );
-        call.setReturnValue( retval );
+        protectLookUp( name );
+        return attributes;
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, LookupWithAttrIds call ) throws NamingException
+    public Attributes lookup( NextInterceptor nextInterceptor, Name name, String[] attrIds ) throws NamingException
     {
-        super.process( nextInterceptor, call );
-
-        Attributes attributes = ( Attributes ) call.getReturnValue();
+        Attributes attributes = nextInterceptor.lookup( name, attrIds );
         if ( attributes == null )
         {
-            return;
+            return null;
         }
 
-        Attributes retval = ( Attributes ) attributes.clone();
-        LdapContext ctx = ( LdapContext ) call.getContextStack().peek();
-        protectLookUp( ctx, call.getName() );
-        call.setReturnValue( retval );
+        protectLookUp( name );
+        return attributes;
     }
 
 
-    private void protectLookUp( LdapContext ctx, Name dn ) throws NamingException
+    private void protectLookUp( Name dn ) throws NamingException
     {
-        Name principalDn = ( ( ServerContext ) ctx ).getPrincipal().getDn();
+        LdapContext ctx =
+            ( LdapContext ) InvocationStack.getInstance().peek().getCaller();
+        Name principalDn = ( ( ServerContext ) ctx ).getPrincipal().getJndiName();
 
         if ( !principalDn.equals( ADMIN_DN ) )
         {
@@ -379,21 +370,19 @@
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, Search call ) throws NamingException
-    {
-        super.process( nextInterceptor, call );
-
-        SearchControls searchControls = call.getControls();
-        if ( searchControls.getReturningAttributes() != null )
-        {
-            return;
-        }
-
-        NamingEnumeration e;
-        ResultFilteringEnumeration retval;
-        LdapContext ctx = ( LdapContext ) call.getContextStack().peek();
-        e = ( NamingEnumeration ) call.getReturnValue();
-        retval = new ResultFilteringEnumeration( e, searchControls, ctx,
+    public NamingEnumeration search( NextInterceptor nextInterceptor,
+            Name base, Map env, ExprNode filter,
+            SearchControls searchCtls ) throws NamingException
+    {
+        NamingEnumeration e = nextInterceptor.search( base, env, filter, searchCtls );
+        //if ( searchCtls.getReturningAttributes() != null )
+        //{
+        //    return null;
+        //}
+        
+        LdapContext ctx =
+            ( LdapContext ) InvocationStack.getInstance().peek().getCaller();
+        return new SearchResultFilteringEnumeration( e, searchCtls, ctx,
                 new SearchResultFilter()
                 {
                     public boolean accept( LdapContext ctx, SearchResult result,
@@ -403,20 +392,16 @@
                         return AuthorizationService.this.isSearchable( ctx, result );
                     }
                 } );
-
-        call.setReturnValue( retval );
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, List call ) throws NamingException
+    public NamingEnumeration list( NextInterceptor nextInterceptor, Name base ) throws NamingException
     {
-        super.process( nextInterceptor, call );
-
-        NamingEnumeration e;
-        ResultFilteringEnumeration retval;
-        LdapContext ctx = ( LdapContext ) call.getContextStack().peek();
-        e = ( NamingEnumeration ) call.getReturnValue();
-        retval = new ResultFilteringEnumeration( e, null, ctx,
+        NamingEnumeration e = nextInterceptor.list( base );
+        LdapContext ctx =
+            ( LdapContext ) InvocationStack.getInstance().peek().getCaller();
+        
+        return new SearchResultFilteringEnumeration( e, null, ctx,
             new SearchResultFilter()
             {
                 public boolean accept( LdapContext ctx, SearchResult result,
@@ -426,8 +411,6 @@
                     return AuthorizationService.this.isSearchable( ctx, result );
                 }
             } );
-
-        call.setReturnValue( retval );
     }
 
 
@@ -441,7 +424,7 @@
             dn = dnParser.parse( result.getName() );
         }
 
-        Name principalDn = ( ( ServerContext ) ctx ).getPrincipal().getDn();
+        Name principalDn = ( ( ServerContext ) ctx ).getPrincipal().getJndiName();
         if ( !principalDn.equals( ADMIN_DN ) )
         {
             if ( dn.size() > 2 )

Modified: directory/apacheds/trunk/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?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AttributesPropertyEditor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AttributesPropertyEditor.java Thu Jun 23 20:08:31 2005
@@ -1,5 +1,24 @@
+/*
+ *   @(#) $Id$
+ *
+ *   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
 package org.apache.ldap.server.configuration;
 
+import java.beans.PropertyEditor;
 import java.beans.PropertyEditorSupport;
 import java.util.Collection;
 import java.util.Map;
@@ -17,25 +36,45 @@
 import org.apache.ldap.common.ldif.LdifParser;
 import org.apache.ldap.common.ldif.LdifParserImpl;
 import org.apache.ldap.common.util.MultiMap;
+import org.apache.ldap.server.jndi.ContextFactoryService;
 
+/**
+ * A JavaBeans {@link PropertyEditor} that can convert {@link Attributes}
+ * to LDIF string and vice versa.  This class is useful when you're going
+ * to configure a {@link ContextFactoryService} with 3rd party containers
+ * such as <a href="http://www.springframework.org/">Spring Framework</a>.
+ *
+ * @author The Apache Directory Project
+ * @version $Rev$, $Date$
+ */
 public class AttributesPropertyEditor extends PropertyEditorSupport
 {
 
+    /**
+     * Creates a new instance.
+     */
     public AttributesPropertyEditor()
     {
         super();
     }
 
+    /**
+     * Creates a new instance with source object.
+     */
     public AttributesPropertyEditor( Object source )
     {
         super( source );
     }
 
+    /**
+     * Returns LDIF string of {@link Attributes} object.
+     */
     public String getAsText()
     {
         LdifComposer composer = new LdifComposerImpl();
         MultiMap map = new MultiMap()
         {
+            // FIXME Stop forking commons-collections.
             private final MultiHashMap map = new MultiHashMap();
 
             public Object remove( Object arg0, Object arg1 )
@@ -127,6 +166,9 @@
         }
     }
 
+    /**
+     * Converts the specified LDIF string into {@link Attributes}.
+     */
     public void setAsText( String text ) throws IllegalArgumentException
     {
         if( text == null )

Modified: directory/apacheds/trunk/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?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AuthenticatorConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AuthenticatorConfiguration.java Thu Jun 23 20:08:31 2005
@@ -31,30 +31,51 @@
     private String name;
     private Authenticator authenticator;
 
+    /**
+     * Creates a new instance.
+     */
     protected AuthenticatorConfiguration()
     {
     }
 
+    /**
+     * Returns the {@link Authenticator} this configuration is configuring.
+     */
     public Authenticator getAuthenticator()
     {
         return authenticator;
     }
 
+    /**
+     * Sets the {@link Authenticator} to configure.
+     */
     protected void setAuthenticator( Authenticator authenticator )
     {
         this.authenticator = authenticator;
     }
 
+    /**
+     * Returns the user-defined name of the {@link Authenticator} that
+     * this configuration configures..
+     */
     public String getName()
     {
         return name;
     }
 
+    /**
+     * Sets the user-defined name of the {@link Authenticator} that
+     * this configuration configures.
+     */
     protected void setName( String name )
     {
         this.name = name.trim();
     }
 
+    /**
+     * Validates all properties of this configuration.
+     * @throws ConfigurationException if this configuration is not valid. 
+     */
     public void validate()
     {
         if( name == null )



Mime
View raw message