You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by tr...@apache.org on 2005/10/08 03:41:07 UTC
svn commit: r307233 - in
/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server: ./
authn/ authz/ collective/ configuration/ event/ exception/ interceptor/
jndi/ normalization/ operational/ partition/ partition/impl/btree/
partition/impl/b...
Author: trustin
Date: Fri Oct 7 18:40:39 2005
New Revision: 307233
URL: http://svn.apache.org/viewcvs?rev=307233&view=rev
Log:
Pulled up non-JNDI core classes to org.apache.ldap.server.
Added:
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryConfiguration.java
- copied, changed from r307230, 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/ContextFactoryService.java
- copied, changed from r307230, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryService.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryServiceListener.java
- copied, changed from r307230, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryServiceListener.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultContextFactoryConfiguration.java
- copied, changed from r307230, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultContextFactoryService.java
- copied, changed from r307230, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryService.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartitionNexusProxy.java (with props)
Removed:
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/ContextFactoryService.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryServiceListener.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryService.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DirectoryPartitionNexusProxy.java
Modified:
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/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/authz/AuthorizationService.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/GroupCache.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/OldAuthorizationService.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/TupleCache.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/collective/CollectiveAttributeService.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/Configuration.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/ShutdownConfiguration.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/event/EventService.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/jndi/AbstractContextFactory.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/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/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/partition/AbstractDirectoryPartition.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartition.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeDirectoryPartition.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmDirectoryPartition.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/subtree/SubentryService.java
Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryConfiguration.java (from r307230, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryConfiguration.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryConfiguration.java&p1=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java&r1=307230&r2=307233&rev=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryConfiguration.java Fri Oct 7 18:40:39 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi;
+package org.apache.ldap.server;
import java.util.Hashtable;
Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryService.java (from r307230, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryService.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryService.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryService.java&p1=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryService.java&r1=307230&r2=307233&rev=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryService.java Fri Oct 7 18:40:39 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi;
+package org.apache.ldap.server;
import java.util.HashMap;
import java.util.HashSet;
@@ -27,6 +27,7 @@
import javax.naming.NamingException;
import org.apache.ldap.server.configuration.Configuration;
+import org.apache.ldap.server.jndi.AbstractContextFactory;
import org.apache.ldap.server.partition.DirectoryPartition;
/**
Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryServiceListener.java (from r307230, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryServiceListener.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryServiceListener.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryServiceListener.java&p1=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryServiceListener.java&r1=307230&r2=307233&rev=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryServiceListener.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryServiceListener.java Fri Oct 7 18:40:39 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi;
+package org.apache.ldap.server;
import javax.naming.NamingException;
Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultContextFactoryConfiguration.java (from r307230, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultContextFactoryConfiguration.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultContextFactoryConfiguration.java&p1=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java&r1=307230&r2=307233&rev=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultContextFactoryConfiguration.java Fri Oct 7 18:40:39 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi;
+package org.apache.ldap.server;
import java.util.Hashtable;
Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultContextFactoryService.java (from r307230, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryService.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultContextFactoryService.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultContextFactoryService.java&p1=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryService.java&r1=307230&r2=307233&rev=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultContextFactoryService.java Fri Oct 7 18:40:39 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi;
+package org.apache.ldap.server;
import java.util.Hashtable;
import java.util.Iterator;
@@ -36,18 +36,20 @@
import org.apache.ldap.common.name.LdapName;
import org.apache.ldap.common.name.NameComponentNormalizer;
import org.apache.ldap.common.util.DateUtils;
+import org.apache.ldap.server.authz.AuthorizationService;
import org.apache.ldap.server.configuration.Configuration;
import org.apache.ldap.server.configuration.ConfigurationException;
import org.apache.ldap.server.configuration.StartupConfiguration;
import org.apache.ldap.server.interceptor.InterceptorChain;
-import org.apache.ldap.server.partition.DirectoryPartitionNexus;
+import org.apache.ldap.server.jndi.DeadContext;
+import org.apache.ldap.server.jndi.ServerLdapContext;
import org.apache.ldap.server.partition.DefaultDirectoryPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
import org.apache.ldap.server.schema.AttributeTypeRegistry;
import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
import org.apache.ldap.server.schema.GlobalRegistries;
import org.apache.ldap.server.schema.bootstrap.BootstrapRegistries;
import org.apache.ldap.server.schema.bootstrap.BootstrapSchemaLoader;
-import org.apache.ldap.server.authz.AuthorizationService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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=307233&r1=307232&r2=307233&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 Fri Oct 7 18:40:39 2005
@@ -20,8 +20,8 @@
import javax.naming.NamingException;
import javax.naming.spi.InitialContextFactory;
+import org.apache.ldap.server.ContextFactoryConfiguration;
import org.apache.ldap.server.configuration.AuthenticatorConfiguration;
-import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
import org.apache.ldap.server.jndi.ServerContext;
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=307233&r1=307232&r2=307233&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 Fri Oct 7 18:40:39 2005
@@ -36,13 +36,13 @@
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.ContextFactoryConfiguration;
import org.apache.ldap.server.configuration.AuthenticatorConfiguration;
import org.apache.ldap.server.configuration.InterceptorConfiguration;
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.slf4j.Logger;
import org.slf4j.LoggerFactory;
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=307233&r1=307232&r2=307233&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 Fri Oct 7 18:40:39 2005
@@ -20,8 +20,8 @@
import javax.naming.Context;
import javax.naming.NamingException;
+import org.apache.ldap.server.ContextFactoryConfiguration;
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.DirectoryPartitionNexus;
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=307233&r1=307232&r2=307233&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 Fri Oct 7 18:40:39 2005
@@ -17,10 +17,10 @@
package org.apache.ldap.server.authz;
+import org.apache.ldap.server.ContextFactoryConfiguration;
import org.apache.ldap.server.interceptor.BaseInterceptor;
import org.apache.ldap.server.interceptor.NextInterceptor;
import org.apache.ldap.server.interceptor.InterceptorChain;
-import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
import org.apache.ldap.server.jndi.ServerContext;
import org.apache.ldap.server.configuration.InterceptorConfiguration;
import org.apache.ldap.server.partition.DirectoryPartitionNexus;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/GroupCache.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/GroupCache.java?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/GroupCache.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/GroupCache.java Fri Oct 7 18:40:39 2005
@@ -21,7 +21,7 @@
import org.apache.ldap.common.name.LdapName;
import org.apache.ldap.common.filter.SimpleNode;
import org.apache.ldap.common.filter.BranchNode;
-import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
+import org.apache.ldap.server.ContextFactoryConfiguration;
import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
import org.apache.ldap.server.partition.DirectoryPartitionNexus;
import org.slf4j.Logger;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/OldAuthorizationService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/OldAuthorizationService.java?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/OldAuthorizationService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/OldAuthorizationService.java Fri Oct 7 18:40:39 2005
@@ -32,6 +32,7 @@
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.ContextFactoryConfiguration;
import org.apache.ldap.server.configuration.InterceptorConfiguration;
import org.apache.ldap.server.enumeration.SearchResultFilteringEnumeration;
import org.apache.ldap.server.enumeration.SearchResultFilter;
@@ -39,7 +40,6 @@
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.DirectoryPartitionNexus;
import org.apache.ldap.server.schema.AttributeTypeRegistry;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/TupleCache.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/TupleCache.java?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/TupleCache.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/TupleCache.java Fri Oct 7 18:40:39 2005
@@ -37,7 +37,7 @@
import org.apache.ldap.common.filter.SimpleNode;
import org.apache.ldap.common.message.ResultCodeEnum;
import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
+import org.apache.ldap.server.ContextFactoryConfiguration;
import org.apache.ldap.server.partition.DirectoryPartitionNexus;
import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
import org.slf4j.Logger;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/collective/CollectiveAttributeService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/collective/CollectiveAttributeService.java?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/collective/CollectiveAttributeService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/collective/CollectiveAttributeService.java Fri Oct 7 18:40:39 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.collective;
+import org.apache.ldap.server.ContextFactoryConfiguration;
import org.apache.ldap.server.interceptor.BaseInterceptor;
import org.apache.ldap.server.interceptor.NextInterceptor;
-import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
import org.apache.ldap.server.configuration.InterceptorConfiguration;
import org.apache.ldap.server.partition.DirectoryPartitionNexus;
import org.apache.ldap.server.schema.AttributeTypeRegistry;
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=307233&r1=307232&r2=307233&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 Fri Oct 7 18:40:39 2005
@@ -36,7 +36,7 @@
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;
+import org.apache.ldap.server.ContextFactoryService;
/**
* A JavaBeans {@link PropertyEditor} that can convert {@link Attributes}
Modified: directory/apacheds/trunk/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?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/Configuration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/Configuration.java Fri Oct 7 18:40:39 2005
@@ -21,7 +21,7 @@
import java.io.Serializable;
import java.util.Hashtable;
-import org.apache.ldap.server.jndi.ContextFactoryService;
+import org.apache.ldap.server.ContextFactoryService;
/**
* A configuration that provides required, optional, or default properties
Modified: directory/apacheds/trunk/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?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableStartupConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableStartupConfiguration.java Fri Oct 7 18:40:39 2005
@@ -22,7 +22,7 @@
import java.util.List;
import java.util.Set;
-import org.apache.ldap.server.jndi.ContextFactoryService;
+import org.apache.ldap.server.ContextFactoryService;
/**
* A mutable version of {@link StartupConfiguration}.
Modified: directory/apacheds/trunk/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?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ShutdownConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ShutdownConfiguration.java Fri Oct 7 18:40:39 2005
@@ -18,7 +18,7 @@
*/
package org.apache.ldap.server.configuration;
-import org.apache.ldap.server.jndi.ContextFactoryService;
+import org.apache.ldap.server.ContextFactoryService;
/**
* A {@link Configuration} that shuts down ApacheDS.
Modified: directory/apacheds/trunk/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?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java Fri Oct 7 18:40:39 2005
@@ -27,13 +27,13 @@
import javax.naming.directory.Attributes;
+import org.apache.ldap.server.ContextFactoryService;
import org.apache.ldap.server.authn.AnonymousAuthenticator;
import org.apache.ldap.server.authn.AuthenticationService;
import org.apache.ldap.server.authn.SimpleAuthenticator;
import org.apache.ldap.server.authz.OldAuthorizationService;
import org.apache.ldap.server.authz.AuthorizationService;
import org.apache.ldap.server.exception.ExceptionService;
-import org.apache.ldap.server.jndi.ContextFactoryService;
import org.apache.ldap.server.normalization.NormalizationService;
import org.apache.ldap.server.operational.OperationalAttributeService;
import org.apache.ldap.server.schema.SchemaService;
Modified: directory/apacheds/trunk/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?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/SyncConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/SyncConfiguration.java Fri Oct 7 18:40:39 2005
@@ -18,7 +18,7 @@
*/
package org.apache.ldap.server.configuration;
-import org.apache.ldap.server.jndi.ContextFactoryService;
+import org.apache.ldap.server.ContextFactoryService;
/**
* A {@link Configuration} that makes a call to {@link ContextFactoryService#sync()}.
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/event/EventService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/event/EventService.java?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/event/EventService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/event/EventService.java Fri Oct 7 18:40:39 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.event;
+import org.apache.ldap.server.ContextFactoryConfiguration;
import org.apache.ldap.server.interceptor.BaseInterceptor;
import org.apache.ldap.server.interceptor.NextInterceptor;
-import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
import org.apache.ldap.server.configuration.InterceptorConfiguration;
import org.apache.ldap.server.schema.AttributeTypeRegistry;
import org.apache.ldap.server.schema.OidRegistry;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java Fri Oct 7 18:40:39 2005
@@ -28,10 +28,10 @@
import org.apache.ldap.common.filter.ExprNode;
import org.apache.ldap.common.message.ResultCodeEnum;
import org.apache.ldap.common.name.LdapName;
+import org.apache.ldap.server.ContextFactoryConfiguration;
import org.apache.ldap.server.configuration.InterceptorConfiguration;
import org.apache.ldap.server.interceptor.BaseInterceptor;
import org.apache.ldap.server.interceptor.NextInterceptor;
-import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
import org.apache.ldap.server.partition.DirectoryPartition;
import org.apache.ldap.server.partition.DirectoryPartitionNexus;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/BaseInterceptor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/BaseInterceptor.java?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/BaseInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/BaseInterceptor.java Fri Oct 7 18:40:39 2005
@@ -30,11 +30,11 @@
import javax.naming.ldap.LdapContext;
import org.apache.ldap.common.filter.ExprNode;
+import org.apache.ldap.server.ContextFactoryConfiguration;
import org.apache.ldap.server.authn.LdapPrincipal;
import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
import org.apache.ldap.server.configuration.InterceptorConfiguration;
import org.apache.ldap.server.invocation.InvocationStack;
-import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
import org.apache.ldap.server.jndi.ServerContext;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/Interceptor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/Interceptor.java?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/Interceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/Interceptor.java Fri Oct 7 18:40:39 2005
@@ -28,9 +28,9 @@
import javax.naming.directory.SearchControls;
import org.apache.ldap.common.filter.ExprNode;
+import org.apache.ldap.server.ContextFactoryConfiguration;
import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
import org.apache.ldap.server.configuration.InterceptorConfiguration;
-import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
import org.apache.ldap.server.partition.DirectoryPartition;
import org.apache.ldap.server.partition.DirectoryPartitionNexus;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorChain.java?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorChain.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorChain.java Fri Oct 7 18:40:39 2005
@@ -33,10 +33,10 @@
import javax.naming.directory.SearchControls;
import org.apache.ldap.common.filter.ExprNode;
+import org.apache.ldap.server.ContextFactoryConfiguration;
import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
import org.apache.ldap.server.configuration.InterceptorConfiguration;
import org.apache.ldap.server.configuration.MutableInterceptorConfiguration;
-import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
import org.apache.ldap.server.partition.DirectoryPartitionNexus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java Fri Oct 7 18:40:39 2005
@@ -25,12 +25,15 @@
import javax.naming.NamingException;
import javax.naming.spi.InitialContextFactory;
+import org.apache.ldap.server.ContextFactoryService;
+import org.apache.ldap.server.ContextFactoryServiceListener;
import org.apache.ldap.server.configuration.AddDirectoryPartitionConfiguration;
import org.apache.ldap.server.configuration.Configuration;
import org.apache.ldap.server.configuration.RemoveDirectoryPartitionConfiguration;
import org.apache.ldap.server.configuration.ShutdownConfiguration;
import org.apache.ldap.server.configuration.StartupConfiguration;
import org.apache.ldap.server.configuration.SyncConfiguration;
+import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java Fri Oct 7 18:40:39 2005
@@ -19,6 +19,8 @@
import javax.naming.NamingException;
import javax.naming.spi.InitialContextFactory;
+import org.apache.ldap.server.ContextFactoryService;
+
/**
* A simplistic implementation of {@link AbstractContextFactory}.
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DeadContext.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DeadContext.java?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DeadContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DeadContext.java Fri Oct 7 18:40:39 2005
@@ -50,7 +50,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-class DeadContext implements LdapContext, EventDirContext
+public class DeadContext implements LdapContext, EventDirContext
{
private final String EXCEPTION_MSG = "Context operation unavailable when " +
"invoked after Eve provider has been shutdown";
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java Fri Oct 7 18:40:39 2005
@@ -18,10 +18,10 @@
import java.io.Serializable;
-import java.util.Hashtable;
-import java.util.Set;
import java.util.HashSet;
+import java.util.Hashtable;
import java.util.Iterator;
+import java.util.Set;
import javax.naming.ConfigurationException;
import javax.naming.Context;
@@ -33,25 +33,28 @@
import javax.naming.NamingException;
import javax.naming.Reference;
import javax.naming.Referenceable;
-import javax.naming.event.EventContext;
-import javax.naming.event.NamingListener;
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext;
import javax.naming.directory.SearchControls;
+import javax.naming.event.EventContext;
+import javax.naming.event.NamingListener;
import javax.naming.ldap.Control;
import javax.naming.spi.DirStateFactory;
import javax.naming.spi.DirectoryManager;
import org.apache.ldap.common.exception.LdapNoPermissionException;
-import org.apache.ldap.common.filter.PresenceNode;
import org.apache.ldap.common.filter.ExprNode;
+import org.apache.ldap.common.filter.PresenceNode;
import org.apache.ldap.common.message.LockableAttributesImpl;
import org.apache.ldap.common.name.LdapName;
import org.apache.ldap.common.util.NamespaceTools;
+import org.apache.ldap.server.ContextFactoryConfiguration;
+import org.apache.ldap.server.ContextFactoryService;
import org.apache.ldap.server.authn.AuthenticationService;
import org.apache.ldap.server.authn.LdapPrincipal;
import org.apache.ldap.server.partition.DirectoryPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java Fri Oct 7 18:40:39 2005
@@ -27,28 +27,29 @@
import javax.naming.NamingException;
import javax.naming.Reference;
import javax.naming.Referenceable;
-import javax.naming.event.EventDirContext;
-import javax.naming.event.NamingListener;
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext;
import javax.naming.directory.InvalidSearchFilterException;
import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
+import javax.naming.event.EventDirContext;
+import javax.naming.event.NamingListener;
import javax.naming.ldap.Control;
import javax.naming.spi.DirStateFactory;
import javax.naming.spi.DirectoryManager;
import org.apache.ldap.common.filter.BranchNode;
import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.common.filter.FilterParser;
import org.apache.ldap.common.filter.FilterParserImpl;
import org.apache.ldap.common.filter.PresenceNode;
import org.apache.ldap.common.filter.SimpleNode;
import org.apache.ldap.common.name.LdapName;
import org.apache.ldap.common.util.NamespaceTools;
+import org.apache.ldap.server.ContextFactoryService;
import org.apache.ldap.server.authn.LdapPrincipal;
import org.apache.ldap.server.partition.DirectoryPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java Fri Oct 7 18:40:39 2005
@@ -27,6 +27,7 @@
import javax.naming.ldap.LdapContext;
import org.apache.ldap.common.NotImplementedException;
+import org.apache.ldap.server.ContextFactoryService;
import org.apache.ldap.server.authn.LdapPrincipal;
import org.apache.ldap.server.partition.DirectoryPartitionNexus;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/normalization/NormalizationService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/normalization/NormalizationService.java?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/normalization/NormalizationService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/normalization/NormalizationService.java Fri Oct 7 18:40:39 2005
@@ -30,10 +30,10 @@
import org.apache.ldap.common.name.DnParser;
import org.apache.ldap.common.name.NameComponentNormalizer;
import org.apache.ldap.common.schema.AttributeType;
+import org.apache.ldap.server.ContextFactoryConfiguration;
import org.apache.ldap.server.configuration.InterceptorConfiguration;
import org.apache.ldap.server.interceptor.BaseInterceptor;
import org.apache.ldap.server.interceptor.NextInterceptor;
-import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
import org.apache.ldap.server.partition.DirectoryPartitionNexus;
import org.apache.ldap.server.schema.AttributeTypeRegistry;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java Fri Oct 7 18:40:39 2005
@@ -36,6 +36,7 @@
import org.apache.ldap.common.schema.AttributeType;
import org.apache.ldap.common.schema.UsageEnum;
import org.apache.ldap.common.util.DateUtils;
+import org.apache.ldap.server.ContextFactoryConfiguration;
import org.apache.ldap.server.configuration.InterceptorConfiguration;
import org.apache.ldap.server.enumeration.SearchResultFilter;
import org.apache.ldap.server.enumeration.SearchResultFilteringEnumeration;
@@ -43,7 +44,6 @@
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.partition.DirectoryPartitionNexus;
import org.apache.ldap.server.schema.AttributeTypeRegistry;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/AbstractDirectoryPartition.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/AbstractDirectoryPartition.java?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/AbstractDirectoryPartition.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/AbstractDirectoryPartition.java Fri Oct 7 18:40:39 2005
@@ -29,8 +29,8 @@
import javax.naming.directory.ModificationItem;
import org.apache.ldap.common.name.LdapName;
+import org.apache.ldap.server.ContextFactoryConfiguration;
import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
-import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
/**
* A {@link DirectoryPartition} that helps users to implement their own partition.
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java Fri Oct 7 18:40:39 2005
@@ -58,9 +58,9 @@
import org.apache.ldap.common.util.DateUtils;
import org.apache.ldap.common.util.NamespaceTools;
import org.apache.ldap.common.util.SingletonEnumeration;
+import org.apache.ldap.server.ContextFactoryConfiguration;
import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
import org.apache.ldap.server.configuration.MutableDirectoryPartitionConfiguration;
-import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
import org.apache.ldap.server.partition.impl.btree.jdbm.JdbmDirectoryPartition;
import org.apache.ldap.server.schema.AttributeTypeRegistry;
import org.slf4j.Logger;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartition.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartition.java?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartition.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartition.java Fri Oct 7 18:40:39 2005
@@ -29,8 +29,8 @@
import javax.naming.directory.SearchResult;
import org.apache.ldap.common.filter.ExprNode;
+import org.apache.ldap.server.ContextFactoryConfiguration;
import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
-import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
/**
Added: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartitionNexusProxy.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartitionNexusProxy.java?rev=307233&view=auto
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartitionNexusProxy.java (added)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartitionNexusProxy.java Fri Oct 7 18:40:39 2005
@@ -0,0 +1,464 @@
+/*
+ * 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.partition;
+
+
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.ServiceUnavailableException;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.ModificationItem;
+import javax.naming.directory.SearchControls;
+import javax.naming.event.EventContext;
+import javax.naming.event.NamingListener;
+import javax.naming.ldap.LdapContext;
+
+import org.apache.ldap.common.filter.ExprNode;
+import org.apache.ldap.server.ContextFactoryConfiguration;
+import org.apache.ldap.server.ContextFactoryService;
+import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
+import org.apache.ldap.server.event.EventService;
+import org.apache.ldap.server.interceptor.InterceptorChain;
+import org.apache.ldap.server.invocation.Invocation;
+import org.apache.ldap.server.invocation.InvocationStack;
+
+
+/**
+ * A decorator that wraps other {@link DirectoryPartitionNexus} to enable
+ * {@link InterceptorChain} and {@link InvocationStack} support.
+ * All {@link Invocation}s made to this nexus is automatically pushed to
+ * {@link InvocationStack} of the current thread, and popped when
+ * the operation ends. All invocations are filtered by {@link InterceptorChain}.
+ *
+ * @author The Apache Directory Project
+ * @version $Rev$, $Date$
+ */
+public class DirectoryPartitionNexusProxy extends DirectoryPartitionNexus
+{
+ private final Context caller;
+ private final ContextFactoryService service;
+ private final ContextFactoryConfiguration configuration;
+
+ /**
+ * Creates a new instance.
+ *
+ * @param caller a JNDI {@link Context} object that will call this proxy
+ * @param service a JNDI service
+ */
+ public DirectoryPartitionNexusProxy( Context caller, ContextFactoryService service )
+ {
+ this.caller = caller;
+ this.service = service;
+ this.configuration = service.getConfiguration();
+ }
+
+ public LdapContext getLdapContext() {
+ return this.configuration.getPartitionNexus().getLdapContext();
+ }
+
+ public void init( ContextFactoryConfiguration factoryCfg, DirectoryPartitionConfiguration cfg )
+ {
+ }
+
+ public void destroy()
+ {
+ }
+
+ public DirectoryPartition getSystemPartition()
+ {
+ return this.configuration.getPartitionNexus().getSystemPartition();
+ }
+
+ public Name getSuffix( boolean normalized ) throws NamingException
+ {
+ return this.configuration.getPartitionNexus().getSuffix( normalized );
+ }
+
+ public void sync() throws NamingException {
+ this.service.sync();
+ }
+
+ public void close() throws NamingException {
+ this.service.shutdown();
+ }
+
+ public boolean isInitialized() {
+ return this.service.isStarted();
+ }
+
+ public Name getMatchedName(Name dn, boolean normalized) throws NamingException {
+ ensureStarted();
+ InvocationStack stack = InvocationStack.getInstance();
+ stack.push( new Invocation(
+ caller, "getMatchedDn",
+ new Object[] { dn, normalized? Boolean.TRUE : Boolean.FALSE } ) );
+ try
+ {
+ return this.configuration.getInterceptorChain().getMatchedName( dn, normalized );
+ }
+ finally
+ {
+ stack.pop();
+ }
+ }
+
+ public Name getSuffix(Name dn, boolean normalized) throws NamingException {
+ ensureStarted();
+ InvocationStack stack = InvocationStack.getInstance();
+ stack.push( new Invocation(
+ caller, "getSuffix",
+ new Object[] { dn, normalized? Boolean.TRUE : Boolean.FALSE } ) );
+ try
+ {
+ return this.configuration.getInterceptorChain().getSuffix( dn, normalized );
+ }
+ finally
+ {
+ stack.pop();
+ }
+ }
+
+ public Iterator listSuffixes(boolean normalized) throws NamingException {
+ ensureStarted();
+ InvocationStack stack = InvocationStack.getInstance();
+ stack.push( new Invocation(
+ caller, "listSuffixes",
+ new Object[] { normalized? Boolean.TRUE : Boolean.FALSE } ) );
+ try
+ {
+ return this.configuration.getInterceptorChain().listSuffixes( normalized );
+ }
+ finally
+ {
+ stack.pop();
+ }
+ }
+
+ public boolean compare( Name name, String oid, Object value ) throws NamingException
+ {
+ ensureStarted();
+ InvocationStack stack = InvocationStack.getInstance();
+ stack.push( new Invocation( caller, "compare", new Object[] { name, oid, value } ) );
+ try
+ {
+ return this.configuration.getInterceptorChain().compare( name, oid, value );
+ }
+ finally
+ {
+ stack.pop();
+ }
+ }
+
+
+ public void delete(Name name) throws NamingException {
+ ensureStarted();
+ InvocationStack stack = InvocationStack.getInstance();
+ stack.push( new Invocation(
+ caller, "delete",
+ new Object[] { name } ) );
+ try
+ {
+ this.configuration.getInterceptorChain().delete( name );
+ }
+ finally
+ {
+ stack.pop();
+ }
+ }
+
+ public void add(String upName, Name normName, Attributes entry) throws NamingException {
+ ensureStarted();
+ InvocationStack stack = InvocationStack.getInstance();
+ stack.push( new Invocation(
+ caller, "add",
+ new Object[] { upName, normName, entry } ) );
+ try
+ {
+ this.configuration.getInterceptorChain().add( upName, normName, entry );
+ }
+ finally
+ {
+ stack.pop();
+ }
+ }
+
+ public void modify(Name name, int modOp, Attributes mods) throws NamingException {
+ ensureStarted();
+ InvocationStack stack = InvocationStack.getInstance();
+ // TODO Use predefined modOp Interger constants.
+ stack.push( new Invocation(
+ caller, "modify",
+ new Object[] { name, new Integer( modOp ), mods } ) );
+ try
+ {
+ this.configuration.getInterceptorChain().modify( name, modOp, mods );
+ }
+ finally
+ {
+ stack.pop();
+ }
+ }
+
+ public void modify(Name name, ModificationItem[] mods) throws NamingException {
+ ensureStarted();
+ InvocationStack stack = InvocationStack.getInstance();
+ stack.push( new Invocation(
+ caller, "modify",
+ new Object[] { name, mods } ) );
+ try
+ {
+ this.configuration.getInterceptorChain().modify( name, mods );
+ }
+ finally
+ {
+ stack.pop();
+ }
+ }
+
+ public NamingEnumeration list(Name base) throws NamingException {
+ ensureStarted();
+ InvocationStack stack = InvocationStack.getInstance();
+ stack.push( new Invocation(
+ caller, "list",
+ new Object[] { base } ) );
+ try
+ {
+ return this.configuration.getInterceptorChain().list( base );
+ }
+ finally
+ {
+ stack.pop();
+ }
+ }
+
+ public NamingEnumeration search(Name base, Map env, ExprNode filter, SearchControls searchCtls) throws NamingException {
+ ensureStarted();
+ InvocationStack stack = InvocationStack.getInstance();
+ stack.push( new Invocation(
+ caller, "search",
+ new Object[] { base, env, filter, searchCtls } ) );
+ try
+ {
+ return this.configuration.getInterceptorChain().search( base, env, filter, searchCtls );
+ }
+ finally
+ {
+ stack.pop();
+ }
+ }
+
+ public Attributes lookup(Name name) throws NamingException {
+ ensureStarted();
+ InvocationStack stack = InvocationStack.getInstance();
+ stack.push( new Invocation(
+ caller, "lookup",
+ new Object[] { name } ) );
+ try
+ {
+ return this.configuration.getInterceptorChain().lookup( name );
+ }
+ finally
+ {
+ stack.pop();
+ }
+ }
+
+ public Attributes lookup(Name dn, String[] attrIds) throws NamingException {
+ ensureStarted();
+ InvocationStack stack = InvocationStack.getInstance();
+ stack.push( new Invocation(
+ caller, "lookup",
+ new Object[] { dn, attrIds } ) );
+ try
+ {
+ return this.configuration.getInterceptorChain().lookup( dn, attrIds );
+ }
+ finally
+ {
+ stack.pop();
+ }
+ }
+
+ public boolean hasEntry(Name name) throws NamingException {
+ ensureStarted();
+ InvocationStack stack = InvocationStack.getInstance();
+ stack.push( new Invocation(
+ caller, "hasEntry",
+ new Object[] { name } ) );
+ try
+ {
+ return this.configuration.getInterceptorChain().hasEntry( name );
+ }
+ finally
+ {
+ stack.pop();
+ }
+ }
+
+ public boolean isSuffix(Name name) throws NamingException {
+ ensureStarted();
+ InvocationStack stack = InvocationStack.getInstance();
+ stack.push( new Invocation(
+ caller, "isSuffix",
+ new Object[] { name } ) );
+ try
+ {
+ return this.configuration.getInterceptorChain().isSuffix( name );
+ }
+ finally
+ {
+ stack.pop();
+ }
+ }
+
+ public void modifyRn(Name name, String newRn, boolean deleteOldRn) throws NamingException {
+ ensureStarted();
+ InvocationStack stack = InvocationStack.getInstance();
+ stack.push( new Invocation(
+ caller, "modifyRn",
+ new Object[] { name, newRn, deleteOldRn? Boolean.TRUE : Boolean.FALSE } ) );
+ try
+ {
+ this.configuration.getInterceptorChain().modifyRn( name, newRn, deleteOldRn );
+ }
+ finally
+ {
+ stack.pop();
+ }
+ }
+
+ public void move(Name oriChildName, Name newParentName) throws NamingException {
+ ensureStarted();
+ InvocationStack stack = InvocationStack.getInstance();
+ stack.push( new Invocation(
+ caller, "move",
+ new Object[] { oriChildName, newParentName } ) );
+ try
+ {
+ this.configuration.getInterceptorChain().move( oriChildName, newParentName );
+ }
+ finally
+ {
+ stack.pop();
+ }
+ }
+
+ public void move(Name oriChildName, Name newParentName, String newRn, boolean deleteOldRn) throws NamingException {
+ ensureStarted();
+ InvocationStack stack = InvocationStack.getInstance();
+ stack.push( new Invocation(
+ caller, "move",
+ new Object[] { oriChildName, newParentName, newRn, deleteOldRn? Boolean.TRUE : Boolean.FALSE } ) );
+ try
+ {
+ this.configuration.getInterceptorChain().move( oriChildName, newParentName, newRn, deleteOldRn );
+ }
+ finally
+ {
+ stack.pop();
+ }
+ }
+
+ public Attributes getRootDSE() throws NamingException
+ {
+ ensureStarted();
+ InvocationStack stack = InvocationStack.getInstance();
+ stack.push( new Invocation( caller, "getRootDSE" ) );
+ try
+ {
+ return this.configuration.getInterceptorChain().getRootDSE();
+ }
+ finally
+ {
+ stack.pop();
+ }
+ }
+
+ public void addContextPartition( DirectoryPartitionConfiguration config ) throws NamingException
+ {
+ ensureStarted();
+ InvocationStack stack = InvocationStack.getInstance();
+ stack.push( new Invocation(
+ caller, "addContextPartition",
+ new Object[] { config } ) );
+ try
+ {
+ this.configuration.getInterceptorChain().addContextPartition( config );
+ }
+ finally
+ {
+ stack.pop();
+ }
+ }
+
+ public void removeContextPartition( Name suffix ) throws NamingException
+ {
+ ensureStarted();
+ InvocationStack stack = InvocationStack.getInstance();
+ stack.push( new Invocation(
+ caller, "removeContextPartition",
+ new Object[] { suffix } ) );
+ try
+ {
+ this.configuration.getInterceptorChain().removeContextPartition( suffix );
+ }
+ finally
+ {
+ stack.pop();
+ }
+ }
+
+ private void ensureStarted() throws ServiceUnavailableException {
+ if( !service.isStarted() )
+ {
+ throw new ServiceUnavailableException( "ContextFactoryService is not started." );
+ }
+ }
+
+
+ // -----------------------------------------------------------------------
+ // EventContext and EventDirContext notification methods
+ // -----------------------------------------------------------------------
+
+ /*
+ * All listener registration/deregistration methods can be reduced down to
+ * the following methods. Rather then make these actual intercepted methods
+ * we use them as out of band methods to interface with the notification
+ * interceptor.
+ */
+
+ public void addNamingListener( EventContext ctx, Name name, ExprNode filter, SearchControls searchControls,
+ NamingListener namingListener ) throws NamingException
+ {
+ InterceptorChain chain = this.configuration.getInterceptorChain();
+ EventService interceptor = ( EventService ) chain.get( "eventService" );
+ interceptor.addNamingListener( ctx, name, filter, searchControls, namingListener );
+ }
+
+
+ public void removeNamingListener( EventContext ctx, NamingListener namingListener ) throws NamingException
+ {
+ InterceptorChain chain = this.configuration.getInterceptorChain();
+ EventService interceptor = ( EventService ) chain.get( "eventService" );
+ interceptor.removeNamingListener( ctx, namingListener );
+ }
+}
\ No newline at end of file
Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartitionNexusProxy.java
------------------------------------------------------------------------------
svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeDirectoryPartition.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeDirectoryPartition.java?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeDirectoryPartition.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeDirectoryPartition.java Fri Oct 7 18:40:39 2005
@@ -36,9 +36,9 @@
import org.apache.ldap.common.message.LockableAttributesImpl;
import org.apache.ldap.common.schema.AttributeType;
import org.apache.ldap.common.util.ArrayUtils;
+import org.apache.ldap.server.ContextFactoryConfiguration;
import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
import org.apache.ldap.server.enumeration.SearchResultEnumeration;
-import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
import org.apache.ldap.server.partition.DirectoryPartition;
import org.apache.ldap.server.partition.Oid;
import org.apache.ldap.server.partition.impl.btree.gui.PartitionViewer;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmDirectoryPartition.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmDirectoryPartition.java?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmDirectoryPartition.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmDirectoryPartition.java Fri Oct 7 18:40:39 2005
@@ -47,8 +47,8 @@
import org.apache.ldap.common.schema.AttributeType;
import org.apache.ldap.common.schema.Normalizer;
import org.apache.ldap.common.util.NamespaceTools;
+import org.apache.ldap.server.ContextFactoryConfiguration;
import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
-import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
import org.apache.ldap.server.partition.DirectoryPartition;
import org.apache.ldap.server.partition.impl.btree.BTreeDirectoryPartition;
import org.apache.ldap.server.partition.impl.btree.Index;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java Fri Oct 7 18:40:39 2005
@@ -51,12 +51,12 @@
import org.apache.ldap.common.exception.LdapSchemaViolationException;
import org.apache.ldap.common.exception.LdapInvalidAttributeIdentifierException;
import org.apache.ldap.common.exception.LdapNoSuchAttributeException;
+import org.apache.ldap.server.ContextFactoryConfiguration;
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.NextInterceptor;
-import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
import org.apache.ldap.server.jndi.ServerLdapContext;
import org.apache.ldap.server.partition.DirectoryPartitionNexus;
import org.slf4j.Logger;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/subtree/SubentryService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/subtree/SubentryService.java?rev=307233&r1=307232&r2=307233&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/subtree/SubentryService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/subtree/SubentryService.java Fri Oct 7 18:40:39 2005
@@ -17,12 +17,12 @@
package org.apache.ldap.server.subtree;
+import org.apache.ldap.server.ContextFactoryConfiguration;
import org.apache.ldap.server.interceptor.BaseInterceptor;
import org.apache.ldap.server.interceptor.NextInterceptor;
import org.apache.ldap.server.enumeration.SearchResultFilter;
import org.apache.ldap.server.enumeration.SearchResultFilteringEnumeration;
import org.apache.ldap.server.invocation.InvocationStack;
-import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
import org.apache.ldap.server.configuration.InterceptorConfiguration;
import org.apache.ldap.server.partition.DirectoryPartitionNexus;
import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;