Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Sun Oct 9 20:58:08 2011 @@ -43,37 +43,45 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.administrative.CollectiveAttributeAdministrativePoint; import org.apache.directory.server.core.administrative.SubschemaAdministrativePoint; import org.apache.directory.server.core.administrative.TriggerExecutionAdministrativePoint; +import org.apache.directory.server.core.api.CacheService; +import org.apache.directory.server.core.api.CoreSession; +import org.apache.directory.server.core.api.DirectoryService; +import org.apache.directory.server.core.api.DnFactory; +import org.apache.directory.server.core.api.InstanceLayout; +import org.apache.directory.server.core.api.LdapPrincipal; +import org.apache.directory.server.core.api.OperationManager; +import org.apache.directory.server.core.api.ReferralManager; +import org.apache.directory.server.core.api.changelog.ChangeLog; +import org.apache.directory.server.core.api.changelog.ChangeLogEvent; +import org.apache.directory.server.core.api.changelog.Tag; +import org.apache.directory.server.core.api.changelog.TaggableSearchableChangeLogStore; +import org.apache.directory.server.core.api.event.EventService; +import org.apache.directory.server.core.api.interceptor.Interceptor; +import org.apache.directory.server.core.api.interceptor.InterceptorChain; +import org.apache.directory.server.core.api.interceptor.context.AddOperationContext; +import org.apache.directory.server.core.api.interceptor.context.BindOperationContext; +import org.apache.directory.server.core.api.interceptor.context.EntryOperationContext; +import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext; +import org.apache.directory.server.core.api.journal.Journal; +import org.apache.directory.server.core.api.partition.Partition; +import org.apache.directory.server.core.api.partition.PartitionNexus; +import org.apache.directory.server.core.api.schema.SchemaPartition; import org.apache.directory.server.core.authn.AuthenticationInterceptor; import org.apache.directory.server.core.authn.ppolicy.PpolicyConfigContainer; import org.apache.directory.server.core.authz.AciAuthorizationInterceptor; import org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor; -import org.apache.directory.server.core.changelog.ChangeLog; -import org.apache.directory.server.core.changelog.ChangeLogEvent; import org.apache.directory.server.core.changelog.ChangeLogInterceptor; import org.apache.directory.server.core.changelog.DefaultChangeLog; -import org.apache.directory.server.core.changelog.Tag; -import org.apache.directory.server.core.changelog.TaggableSearchableChangeLogStore; import org.apache.directory.server.core.collective.CollectiveAttributeInterceptor; import org.apache.directory.server.core.event.EventInterceptor; -import org.apache.directory.server.core.event.EventService; import org.apache.directory.server.core.exception.ExceptionInterceptor; -import org.apache.directory.server.core.interceptor.Interceptor; -import org.apache.directory.server.core.interceptor.InterceptorChain; -import org.apache.directory.server.core.interceptor.context.AddOperationContext; -import org.apache.directory.server.core.interceptor.context.BindOperationContext; -import org.apache.directory.server.core.interceptor.context.EntryOperationContext; -import org.apache.directory.server.core.interceptor.context.LookupOperationContext; import org.apache.directory.server.core.journal.DefaultJournal; -import org.apache.directory.server.core.journal.Journal; import org.apache.directory.server.core.journal.JournalInterceptor; import org.apache.directory.server.core.normalization.NormalizationInterceptor; import org.apache.directory.server.core.operational.OperationalAttributeInterceptor; import org.apache.directory.server.core.partition.DefaultPartitionNexus; -import org.apache.directory.server.core.partition.Partition; -import org.apache.directory.server.core.partition.PartitionNexus; import org.apache.directory.server.core.referral.ReferralInterceptor; import org.apache.directory.server.core.schema.SchemaInterceptor; -import org.apache.directory.server.core.schema.SchemaPartition; import org.apache.directory.server.core.security.TlsKeyGenerator; import org.apache.directory.server.core.subtree.SubentryInterceptor; import org.apache.directory.server.core.trigger.TriggerInterceptor; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDnFactory.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDnFactory.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDnFactory.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDnFactory.java Sun Oct 9 20:58:08 2011 @@ -24,6 +24,7 @@ package org.apache.directory.server.core import net.sf.ehcache.Cache; import net.sf.ehcache.Element; +import org.apache.directory.server.core.api.DnFactory; import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.model.name.Dn; import org.apache.directory.shared.ldap.model.schema.SchemaManager; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java Sun Oct 9 20:58:08 2011 @@ -23,23 +23,26 @@ package org.apache.directory.server.core import java.util.ArrayList; import java.util.List; +import org.apache.directory.server.core.api.DirectoryService; +import org.apache.directory.server.core.api.OperationManager; +import org.apache.directory.server.core.api.ReferralManager; +import org.apache.directory.server.core.api.interceptor.InterceptorChain; +import org.apache.directory.server.core.api.interceptor.context.AddOperationContext; +import org.apache.directory.server.core.api.interceptor.context.BindOperationContext; +import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext; +import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext; +import org.apache.directory.server.core.api.interceptor.context.EntryOperationContext; +import org.apache.directory.server.core.api.interceptor.context.GetRootDSEOperationContext; +import org.apache.directory.server.core.api.interceptor.context.ListOperationContext; +import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext; +import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext; +import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext; +import org.apache.directory.server.core.api.interceptor.context.MoveOperationContext; +import org.apache.directory.server.core.api.interceptor.context.OperationContext; +import org.apache.directory.server.core.api.interceptor.context.RenameOperationContext; +import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; +import org.apache.directory.server.core.api.interceptor.context.UnbindOperationContext; import org.apache.directory.server.core.filtering.EntryFilteringCursor; -import org.apache.directory.server.core.interceptor.InterceptorChain; -import org.apache.directory.server.core.interceptor.context.AddOperationContext; -import org.apache.directory.server.core.interceptor.context.BindOperationContext; -import org.apache.directory.server.core.interceptor.context.CompareOperationContext; -import org.apache.directory.server.core.interceptor.context.DeleteOperationContext; -import org.apache.directory.server.core.interceptor.context.EntryOperationContext; -import org.apache.directory.server.core.interceptor.context.GetRootDSEOperationContext; -import org.apache.directory.server.core.interceptor.context.ListOperationContext; -import org.apache.directory.server.core.interceptor.context.LookupOperationContext; -import org.apache.directory.server.core.interceptor.context.ModifyOperationContext; -import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext; -import org.apache.directory.server.core.interceptor.context.MoveOperationContext; -import org.apache.directory.server.core.interceptor.context.OperationContext; -import org.apache.directory.server.core.interceptor.context.RenameOperationContext; -import org.apache.directory.server.core.interceptor.context.SearchOperationContext; -import org.apache.directory.server.core.interceptor.context.UnbindOperationContext; import org.apache.directory.server.core.invocation.InvocationStack; import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java Sun Oct 9 20:58:08 2011 @@ -25,9 +25,12 @@ import java.util.concurrent.locks.Reentr import javax.naming.directory.SearchControls; +import org.apache.directory.server.core.api.CoreSession; +import org.apache.directory.server.core.api.DirectoryService; +import org.apache.directory.server.core.api.ReferralManager; +import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; +import org.apache.directory.server.core.api.partition.PartitionNexus; import org.apache.directory.server.core.filtering.EntryFilteringCursor; -import org.apache.directory.server.core.interceptor.context.SearchOperationContext; -import org.apache.directory.server.core.partition.PartitionNexus; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.entry.Entry; import org.apache.directory.shared.ldap.model.entry.StringValue; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java Sun Oct 9 20:58:08 2011 @@ -31,10 +31,7 @@ import java.util.concurrent.locks.Reentr import javax.naming.directory.SearchControls; import org.apache.directory.server.constants.ServerDNConstants; -import org.apache.directory.server.core.CoreSession; import org.apache.directory.server.core.DefaultCoreSession; -import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.core.LdapPrincipal; import org.apache.directory.server.core.administrative.AccessControlAAP; import org.apache.directory.server.core.administrative.AccessControlAdministrativePoint; import org.apache.directory.server.core.administrative.AccessControlIAP; @@ -51,20 +48,23 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.administrative.TriggerExecutionAdministrativePoint; import org.apache.directory.server.core.administrative.TriggerExecutionIAP; import org.apache.directory.server.core.administrative.TriggerExecutionSAP; +import org.apache.directory.server.core.api.CoreSession; +import org.apache.directory.server.core.api.DirectoryService; +import org.apache.directory.server.core.api.LdapPrincipal; +import org.apache.directory.server.core.api.interceptor.BaseInterceptor; +import org.apache.directory.server.core.api.interceptor.Interceptor; +import org.apache.directory.server.core.api.interceptor.NextInterceptor; +import org.apache.directory.server.core.api.interceptor.context.AddOperationContext; +import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext; +import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext; +import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext; +import org.apache.directory.server.core.api.interceptor.context.MoveOperationContext; +import org.apache.directory.server.core.api.interceptor.context.RenameOperationContext; +import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; +import org.apache.directory.server.core.api.partition.PartitionNexus; import org.apache.directory.server.core.authn.Authenticator; import org.apache.directory.server.core.entry.ClonedServerEntry; import org.apache.directory.server.core.filtering.EntryFilteringCursor; -import org.apache.directory.server.core.interceptor.BaseInterceptor; -import org.apache.directory.server.core.interceptor.Interceptor; -import org.apache.directory.server.core.interceptor.NextInterceptor; -import org.apache.directory.server.core.interceptor.context.AddOperationContext; -import org.apache.directory.server.core.interceptor.context.DeleteOperationContext; -import org.apache.directory.server.core.interceptor.context.ModifyOperationContext; -import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext; -import org.apache.directory.server.core.interceptor.context.MoveOperationContext; -import org.apache.directory.server.core.interceptor.context.RenameOperationContext; -import org.apache.directory.server.core.interceptor.context.SearchOperationContext; -import org.apache.directory.server.core.partition.PartitionNexus; import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.entry.Attribute; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java Sun Oct 9 20:58:08 2011 @@ -31,7 +31,7 @@ import static org.apache.directory.share import java.util.Date; -import org.apache.directory.server.core.DirectoryService; +import org.apache.directory.server.core.api.DirectoryService; import org.apache.directory.server.core.authn.ppolicy.PasswordPolicyConfiguration; import org.apache.directory.server.core.authn.ppolicy.PasswordPolicyException; import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AnonymousAuthenticator.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AnonymousAuthenticator.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AnonymousAuthenticator.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AnonymousAuthenticator.java Sun Oct 9 20:58:08 2011 @@ -22,8 +22,8 @@ package org.apache.directory.server.core import java.net.SocketAddress; -import org.apache.directory.server.core.LdapPrincipal; -import org.apache.directory.server.core.interceptor.context.BindOperationContext; +import org.apache.directory.server.core.api.LdapPrincipal; +import org.apache.directory.server.core.api.interceptor.context.BindOperationContext; import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel; import org.apache.directory.shared.ldap.model.exception.LdapNoPermissionException; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java Sun Oct 9 20:58:08 2011 @@ -45,11 +45,29 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; -import org.apache.directory.server.core.CoreSession; import org.apache.directory.server.core.DefaultCoreSession; -import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.core.LdapPrincipal; import org.apache.directory.server.core.admin.AdministrativePointInterceptor; +import org.apache.directory.server.core.api.CoreSession; +import org.apache.directory.server.core.api.DirectoryService; +import org.apache.directory.server.core.api.LdapPrincipal; +import org.apache.directory.server.core.api.interceptor.BaseInterceptor; +import org.apache.directory.server.core.api.interceptor.Interceptor; +import org.apache.directory.server.core.api.interceptor.NextInterceptor; +import org.apache.directory.server.core.api.interceptor.context.AddOperationContext; +import org.apache.directory.server.core.api.interceptor.context.BindOperationContext; +import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext; +import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext; +import org.apache.directory.server.core.api.interceptor.context.EntryOperationContext; +import org.apache.directory.server.core.api.interceptor.context.GetRootDSEOperationContext; +import org.apache.directory.server.core.api.interceptor.context.ListOperationContext; +import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext; +import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext; +import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext; +import org.apache.directory.server.core.api.interceptor.context.MoveOperationContext; +import org.apache.directory.server.core.api.interceptor.context.OperationContext; +import org.apache.directory.server.core.api.interceptor.context.RenameOperationContext; +import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; +import org.apache.directory.server.core.api.interceptor.context.UnbindOperationContext; import org.apache.directory.server.core.authn.ppolicy.PasswordPolicyConfiguration; import org.apache.directory.server.core.authn.ppolicy.PasswordPolicyException; import org.apache.directory.server.core.authn.ppolicy.PpolicyConfigContainer; @@ -59,24 +77,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.event.EventInterceptor; import org.apache.directory.server.core.exception.ExceptionInterceptor; import org.apache.directory.server.core.filtering.EntryFilteringCursor; -import org.apache.directory.server.core.interceptor.BaseInterceptor; -import org.apache.directory.server.core.interceptor.Interceptor; -import org.apache.directory.server.core.interceptor.NextInterceptor; -import org.apache.directory.server.core.interceptor.context.AddOperationContext; -import org.apache.directory.server.core.interceptor.context.BindOperationContext; -import org.apache.directory.server.core.interceptor.context.CompareOperationContext; -import org.apache.directory.server.core.interceptor.context.DeleteOperationContext; -import org.apache.directory.server.core.interceptor.context.EntryOperationContext; -import org.apache.directory.server.core.interceptor.context.GetRootDSEOperationContext; -import org.apache.directory.server.core.interceptor.context.ListOperationContext; -import org.apache.directory.server.core.interceptor.context.LookupOperationContext; -import org.apache.directory.server.core.interceptor.context.ModifyOperationContext; -import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext; -import org.apache.directory.server.core.interceptor.context.MoveOperationContext; -import org.apache.directory.server.core.interceptor.context.OperationContext; -import org.apache.directory.server.core.interceptor.context.RenameOperationContext; -import org.apache.directory.server.core.interceptor.context.SearchOperationContext; -import org.apache.directory.server.core.interceptor.context.UnbindOperationContext; import org.apache.directory.server.core.normalization.NormalizationInterceptor; import org.apache.directory.server.core.operational.OperationalAttributeInterceptor; import org.apache.directory.server.core.schema.SchemaInterceptor; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java Sun Oct 9 20:58:08 2011 @@ -22,10 +22,10 @@ package org.apache.directory.server.core import javax.naming.Context; -import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.core.LdapPrincipal; +import org.apache.directory.server.core.api.DirectoryService; +import org.apache.directory.server.core.api.LdapPrincipal; +import org.apache.directory.server.core.api.interceptor.context.BindOperationContext; import org.apache.directory.server.core.authn.ppolicy.PasswordPolicyException; -import org.apache.directory.server.core.interceptor.context.BindOperationContext; import org.apache.directory.server.core.partition.DefaultPartitionNexus; import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel; import org.apache.directory.shared.ldap.model.entry.Entry; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/DelegatingAuthenticator.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/DelegatingAuthenticator.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/DelegatingAuthenticator.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/DelegatingAuthenticator.java Sun Oct 9 20:58:08 2011 @@ -24,8 +24,8 @@ import java.net.SocketAddress; import org.apache.directory.ldap.client.api.LdapConnection; import org.apache.directory.ldap.client.api.LdapConnectionFactory; -import org.apache.directory.server.core.LdapPrincipal; -import org.apache.directory.server.core.interceptor.context.BindOperationContext; +import org.apache.directory.server.core.api.LdapPrincipal; +import org.apache.directory.server.core.api.interceptor.context.BindOperationContext; import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel; import org.apache.directory.shared.ldap.model.entry.Entry; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java Sun Oct 9 20:58:08 2011 @@ -33,16 +33,16 @@ import javax.naming.Context; import org.apache.commons.collections.map.LRUMap; import org.apache.commons.lang.ArrayUtils; -import org.apache.directory.server.core.LdapPrincipal; import org.apache.directory.server.core.admin.AdministrativePointInterceptor; +import org.apache.directory.server.core.api.LdapPrincipal; +import org.apache.directory.server.core.api.interceptor.context.BindOperationContext; +import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext; import org.apache.directory.server.core.authz.AciAuthorizationInterceptor; import org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor; import org.apache.directory.server.core.collective.CollectiveAttributeInterceptor; import org.apache.directory.server.core.entry.ClonedServerEntry; import org.apache.directory.server.core.event.EventInterceptor; import org.apache.directory.server.core.exception.ExceptionInterceptor; -import org.apache.directory.server.core.interceptor.context.BindOperationContext; -import org.apache.directory.server.core.interceptor.context.LookupOperationContext; import org.apache.directory.server.core.normalization.NormalizationInterceptor; import org.apache.directory.server.core.operational.OperationalAttributeInterceptor; import org.apache.directory.server.core.schema.SchemaInterceptor; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/StrongAuthenticator.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/StrongAuthenticator.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/StrongAuthenticator.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/StrongAuthenticator.java Sun Oct 9 20:58:08 2011 @@ -22,8 +22,8 @@ package org.apache.directory.server.core import java.net.SocketAddress; -import org.apache.directory.server.core.LdapPrincipal; -import org.apache.directory.server.core.interceptor.context.BindOperationContext; +import org.apache.directory.server.core.api.LdapPrincipal; +import org.apache.directory.server.core.api.interceptor.context.BindOperationContext; import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel; import org.apache.directory.shared.ldap.model.exception.LdapAuthenticationException; import org.apache.mina.core.session.IoSession; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Sun Oct 9 20:58:08 2011 @@ -31,34 +31,34 @@ import java.util.Set; import javax.naming.directory.SearchControls; import org.apache.directory.server.constants.ServerDNConstants; -import org.apache.directory.server.core.CoreSession; import org.apache.directory.server.core.DefaultCoreSession; -import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.core.LdapPrincipal; +import org.apache.directory.server.core.api.CoreSession; +import org.apache.directory.server.core.api.DirectoryService; +import org.apache.directory.server.core.api.LdapPrincipal; +import org.apache.directory.server.core.api.interceptor.BaseInterceptor; +import org.apache.directory.server.core.api.interceptor.InterceptorChain; +import org.apache.directory.server.core.api.interceptor.NextInterceptor; +import org.apache.directory.server.core.api.interceptor.context.AddOperationContext; +import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext; +import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext; +import org.apache.directory.server.core.api.interceptor.context.EntryOperationContext; +import org.apache.directory.server.core.api.interceptor.context.ListOperationContext; +import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext; +import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext; +import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext; +import org.apache.directory.server.core.api.interceptor.context.MoveOperationContext; +import org.apache.directory.server.core.api.interceptor.context.OperationContext; +import org.apache.directory.server.core.api.interceptor.context.RenameOperationContext; +import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; +import org.apache.directory.server.core.api.interceptor.context.SearchingOperationContext; +import org.apache.directory.server.core.api.partition.ByPassConstants; +import org.apache.directory.server.core.api.partition.PartitionNexus; import org.apache.directory.server.core.authz.support.ACDFEngine; import org.apache.directory.server.core.authz.support.AciContext; import org.apache.directory.server.core.entry.ClonedServerEntry; import org.apache.directory.server.core.entry.ServerEntryUtils; import org.apache.directory.server.core.filtering.EntryFilter; import org.apache.directory.server.core.filtering.EntryFilteringCursor; -import org.apache.directory.server.core.interceptor.BaseInterceptor; -import org.apache.directory.server.core.interceptor.InterceptorChain; -import org.apache.directory.server.core.interceptor.NextInterceptor; -import org.apache.directory.server.core.interceptor.context.AddOperationContext; -import org.apache.directory.server.core.interceptor.context.CompareOperationContext; -import org.apache.directory.server.core.interceptor.context.DeleteOperationContext; -import org.apache.directory.server.core.interceptor.context.EntryOperationContext; -import org.apache.directory.server.core.interceptor.context.ListOperationContext; -import org.apache.directory.server.core.interceptor.context.LookupOperationContext; -import org.apache.directory.server.core.interceptor.context.ModifyOperationContext; -import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext; -import org.apache.directory.server.core.interceptor.context.MoveOperationContext; -import org.apache.directory.server.core.interceptor.context.OperationContext; -import org.apache.directory.server.core.interceptor.context.RenameOperationContext; -import org.apache.directory.server.core.interceptor.context.SearchOperationContext; -import org.apache.directory.server.core.interceptor.context.SearchingOperationContext; -import org.apache.directory.server.core.partition.ByPassConstants; -import org.apache.directory.server.core.partition.PartitionNexus; import org.apache.directory.server.core.subtree.SubentryInterceptor; import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.aci.ACIItem; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java Sun Oct 9 20:58:08 2011 @@ -26,27 +26,27 @@ import java.util.Set; import javax.naming.NoPermissionException; import org.apache.directory.server.constants.ServerDNConstants; -import org.apache.directory.server.core.CoreSession; import org.apache.directory.server.core.DefaultCoreSession; -import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.core.LdapPrincipal; +import org.apache.directory.server.core.api.CoreSession; +import org.apache.directory.server.core.api.DirectoryService; +import org.apache.directory.server.core.api.LdapPrincipal; +import org.apache.directory.server.core.api.interceptor.BaseInterceptor; +import org.apache.directory.server.core.api.interceptor.Interceptor; +import org.apache.directory.server.core.api.interceptor.NextInterceptor; +import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext; +import org.apache.directory.server.core.api.interceptor.context.ListOperationContext; +import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext; +import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext; +import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext; +import org.apache.directory.server.core.api.interceptor.context.MoveOperationContext; +import org.apache.directory.server.core.api.interceptor.context.OperationContext; +import org.apache.directory.server.core.api.interceptor.context.RenameOperationContext; +import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; +import org.apache.directory.server.core.api.interceptor.context.SearchingOperationContext; +import org.apache.directory.server.core.api.partition.PartitionNexus; import org.apache.directory.server.core.filtering.EntryFilter; import org.apache.directory.server.core.filtering.EntryFilteringCursor; -import org.apache.directory.server.core.interceptor.BaseInterceptor; -import org.apache.directory.server.core.interceptor.Interceptor; -import org.apache.directory.server.core.interceptor.NextInterceptor; -import org.apache.directory.server.core.interceptor.context.DeleteOperationContext; -import org.apache.directory.server.core.interceptor.context.ListOperationContext; -import org.apache.directory.server.core.interceptor.context.LookupOperationContext; -import org.apache.directory.server.core.interceptor.context.ModifyOperationContext; -import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext; -import org.apache.directory.server.core.interceptor.context.MoveOperationContext; -import org.apache.directory.server.core.interceptor.context.OperationContext; -import org.apache.directory.server.core.interceptor.context.RenameOperationContext; -import org.apache.directory.server.core.interceptor.context.SearchOperationContext; -import org.apache.directory.server.core.interceptor.context.SearchingOperationContext; import org.apache.directory.server.core.partition.DefaultPartitionNexus; -import org.apache.directory.server.core.partition.PartitionNexus; import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel; import org.apache.directory.shared.ldap.model.entry.Attribute; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java Sun Oct 9 20:58:08 2011 @@ -30,12 +30,12 @@ import net.sf.ehcache.Cache; import net.sf.ehcache.Element; import org.apache.directory.server.constants.ServerDNConstants; -import org.apache.directory.server.core.CoreSession; -import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.core.DnFactory; +import org.apache.directory.server.core.api.CoreSession; +import org.apache.directory.server.core.api.DirectoryService; +import org.apache.directory.server.core.api.DnFactory; +import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; +import org.apache.directory.server.core.api.partition.PartitionNexus; import org.apache.directory.server.core.filtering.EntryFilteringCursor; -import org.apache.directory.server.core.interceptor.context.SearchOperationContext; -import org.apache.directory.server.core.partition.PartitionNexus; import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.entry.Attribute; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java Sun Oct 9 20:58:08 2011 @@ -30,11 +30,11 @@ import java.util.Set; import javax.naming.directory.SearchControls; -import org.apache.directory.server.core.CoreSession; -import org.apache.directory.server.core.DnFactory; +import org.apache.directory.server.core.api.CoreSession; +import org.apache.directory.server.core.api.DnFactory; +import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; +import org.apache.directory.server.core.api.partition.PartitionNexus; import org.apache.directory.server.core.filtering.EntryFilteringCursor; -import org.apache.directory.server.core.interceptor.context.SearchOperationContext; -import org.apache.directory.server.core.partition.PartitionNexus; import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.aci.ACIItem; import org.apache.directory.shared.ldap.aci.ACIItemParser; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java Sun Oct 9 20:58:08 2011 @@ -26,10 +26,10 @@ import java.util.Collections; import java.util.HashSet; import org.apache.directory.server.core.admin.AdministrativePointInterceptor; +import org.apache.directory.server.core.api.event.Evaluator; import org.apache.directory.server.core.authn.AuthenticationInterceptor; import org.apache.directory.server.core.authz.AciAuthorizationInterceptor; import org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor; -import org.apache.directory.server.core.event.Evaluator; import org.apache.directory.server.core.event.EventInterceptor; import org.apache.directory.server.core.event.ExpressionEvaluator; import org.apache.directory.server.core.normalization.NormalizationInterceptor; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/AciContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/AciContext.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/AciContext.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/AciContext.java Sun Oct 9 20:58:08 2011 @@ -21,7 +21,7 @@ package org.apache.directory.server.core import java.util.Collection; -import org.apache.directory.server.core.interceptor.context.OperationContext; +import org.apache.directory.server.core.api.interceptor.context.OperationContext; import org.apache.directory.shared.ldap.aci.ACITuple; import org.apache.directory.shared.ldap.aci.MicroOperation; import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java Sun Oct 9 20:58:08 2011 @@ -28,13 +28,13 @@ import java.util.Iterator; import javax.naming.directory.SearchControls; import org.apache.directory.server.core.admin.AdministrativePointInterceptor; +import org.apache.directory.server.core.api.interceptor.context.OperationContext; +import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; import org.apache.directory.server.core.authn.AuthenticationInterceptor; import org.apache.directory.server.core.authz.AciAuthorizationInterceptor; import org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor; import org.apache.directory.server.core.event.EventInterceptor; import org.apache.directory.server.core.filtering.EntryFilteringCursor; -import org.apache.directory.server.core.interceptor.context.OperationContext; -import org.apache.directory.server.core.interceptor.context.SearchOperationContext; import org.apache.directory.server.core.normalization.NormalizationInterceptor; import org.apache.directory.server.core.operational.OperationalAttributeInterceptor; import org.apache.directory.server.core.schema.SchemaInterceptor; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java Sun Oct 9 20:58:08 2011 @@ -23,7 +23,7 @@ package org.apache.directory.server.core import java.util.Collection; import java.util.Iterator; -import org.apache.directory.server.core.event.Evaluator; +import org.apache.directory.server.core.api.event.Evaluator; import org.apache.directory.server.core.subtree.RefinementEvaluator; import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.aci.ACITuple; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java Sun Oct 9 20:58:08 2011 @@ -26,19 +26,20 @@ import java.util.Set; import org.apache.directory.server.constants.ApacheSchemaConstants; import org.apache.directory.server.constants.ServerDNConstants; -import org.apache.directory.server.core.DirectoryService; +import org.apache.directory.server.core.api.DirectoryService; +import org.apache.directory.server.core.api.changelog.ChangeLog; +import org.apache.directory.server.core.api.interceptor.BaseInterceptor; +import org.apache.directory.server.core.api.interceptor.NextInterceptor; +import org.apache.directory.server.core.api.interceptor.context.AddOperationContext; +import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext; +import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext; +import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext; +import org.apache.directory.server.core.api.interceptor.context.MoveOperationContext; +import org.apache.directory.server.core.api.interceptor.context.OperationContext; +import org.apache.directory.server.core.api.interceptor.context.RenameOperationContext; +import org.apache.directory.server.core.api.partition.ByPassConstants; import org.apache.directory.server.core.entry.ClonedServerEntry; import org.apache.directory.server.core.entry.ServerEntryUtils; -import org.apache.directory.server.core.interceptor.BaseInterceptor; -import org.apache.directory.server.core.interceptor.NextInterceptor; -import org.apache.directory.server.core.interceptor.context.AddOperationContext; -import org.apache.directory.server.core.interceptor.context.DeleteOperationContext; -import org.apache.directory.server.core.interceptor.context.ModifyOperationContext; -import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext; -import org.apache.directory.server.core.interceptor.context.MoveOperationContext; -import org.apache.directory.server.core.interceptor.context.OperationContext; -import org.apache.directory.server.core.interceptor.context.RenameOperationContext; -import org.apache.directory.server.core.partition.ByPassConstants; import org.apache.directory.server.core.schema.SchemaService; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.entry.Attribute; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java Sun Oct 9 20:58:08 2011 @@ -21,9 +21,18 @@ package org.apache.directory.server.core import java.util.List; -import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.core.LdapPrincipal; -import org.apache.directory.server.core.partition.Partition; +import org.apache.directory.server.core.api.DirectoryService; +import org.apache.directory.server.core.api.LdapPrincipal; +import org.apache.directory.server.core.api.changelog.ChangeLog; +import org.apache.directory.server.core.api.changelog.ChangeLogEvent; +import org.apache.directory.server.core.api.changelog.ChangeLogSearchEngine; +import org.apache.directory.server.core.api.changelog.ChangeLogStore; +import org.apache.directory.server.core.api.changelog.SearchableChangeLogStore; +import org.apache.directory.server.core.api.changelog.Tag; +import org.apache.directory.server.core.api.changelog.TagSearchEngine; +import org.apache.directory.server.core.api.changelog.TaggableChangeLogStore; +import org.apache.directory.server.core.api.changelog.TaggableSearchableChangeLogStore; +import org.apache.directory.server.core.api.partition.Partition; import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java Sun Oct 9 20:58:08 2011 @@ -35,8 +35,12 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.core.LdapPrincipal; +import org.apache.directory.server.core.api.DirectoryService; +import org.apache.directory.server.core.api.LdapPrincipal; +import org.apache.directory.server.core.api.changelog.ChangeLogEvent; +import org.apache.directory.server.core.api.changelog.ChangeLogEventSerializer; +import org.apache.directory.server.core.api.changelog.Tag; +import org.apache.directory.server.core.api.changelog.TaggableChangeLogStore; import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.cursor.Cursor; import org.apache.directory.shared.ldap.model.cursor.ListCursor; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java Sun Oct 9 20:58:08 2011 @@ -24,20 +24,20 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.directory.server.core.DirectoryService; +import org.apache.directory.server.core.api.DirectoryService; +import org.apache.directory.server.core.api.interceptor.BaseInterceptor; +import org.apache.directory.server.core.api.interceptor.NextInterceptor; +import org.apache.directory.server.core.api.interceptor.context.AddOperationContext; +import org.apache.directory.server.core.api.interceptor.context.ListOperationContext; +import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext; +import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext; +import org.apache.directory.server.core.api.interceptor.context.OperationContext; +import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; +import org.apache.directory.server.core.api.interceptor.context.SearchingOperationContext; +import org.apache.directory.server.core.api.partition.ByPassConstants; import org.apache.directory.server.core.entry.ClonedServerEntry; import org.apache.directory.server.core.filtering.EntryFilter; import org.apache.directory.server.core.filtering.EntryFilteringCursor; -import org.apache.directory.server.core.interceptor.BaseInterceptor; -import org.apache.directory.server.core.interceptor.NextInterceptor; -import org.apache.directory.server.core.interceptor.context.AddOperationContext; -import org.apache.directory.server.core.interceptor.context.ListOperationContext; -import org.apache.directory.server.core.interceptor.context.LookupOperationContext; -import org.apache.directory.server.core.interceptor.context.ModifyOperationContext; -import org.apache.directory.server.core.interceptor.context.OperationContext; -import org.apache.directory.server.core.interceptor.context.SearchOperationContext; -import org.apache.directory.server.core.interceptor.context.SearchingOperationContext; -import org.apache.directory.server.core.partition.ByPassConstants; import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.entry.Attribute; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/DefaultEventService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/DefaultEventService.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/DefaultEventService.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/DefaultEventService.java Sun Oct 9 20:58:08 2011 @@ -23,7 +23,11 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import org.apache.directory.server.core.DirectoryService; +import org.apache.directory.server.core.api.DirectoryService; +import org.apache.directory.server.core.api.event.DirectoryListener; +import org.apache.directory.server.core.api.event.EventService; +import org.apache.directory.server.core.api.event.NotificationCriteria; +import org.apache.directory.server.core.api.event.RegistrationEntry; import org.apache.directory.server.core.normalization.FilterNormalizingVisitor; import org.apache.directory.shared.ldap.model.filter.ExprNode; import org.apache.directory.shared.ldap.model.schema.SchemaManager; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java Sun Oct 9 20:58:08 2011 @@ -28,18 +28,23 @@ import java.util.concurrent.ExecutorServ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import org.apache.directory.server.core.DirectoryService; +import org.apache.directory.server.core.api.DirectoryService; +import org.apache.directory.server.core.api.event.DirectoryListener; +import org.apache.directory.server.core.api.event.Evaluator; +import org.apache.directory.server.core.api.event.EventType; +import org.apache.directory.server.core.api.event.NotificationCriteria; +import org.apache.directory.server.core.api.event.RegistrationEntry; +import org.apache.directory.server.core.api.interceptor.BaseInterceptor; +import org.apache.directory.server.core.api.interceptor.NextInterceptor; +import org.apache.directory.server.core.api.interceptor.context.AddOperationContext; +import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext; +import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext; +import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext; +import org.apache.directory.server.core.api.interceptor.context.MoveOperationContext; +import org.apache.directory.server.core.api.interceptor.context.OperationContext; +import org.apache.directory.server.core.api.interceptor.context.RenameOperationContext; +import org.apache.directory.server.core.api.partition.ByPassConstants; import org.apache.directory.server.core.entry.ClonedServerEntry; -import org.apache.directory.server.core.interceptor.BaseInterceptor; -import org.apache.directory.server.core.interceptor.NextInterceptor; -import org.apache.directory.server.core.interceptor.context.AddOperationContext; -import org.apache.directory.server.core.interceptor.context.DeleteOperationContext; -import org.apache.directory.server.core.interceptor.context.ModifyOperationContext; -import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext; -import org.apache.directory.server.core.interceptor.context.MoveOperationContext; -import org.apache.directory.server.core.interceptor.context.OperationContext; -import org.apache.directory.server.core.interceptor.context.RenameOperationContext; -import org.apache.directory.server.core.partition.ByPassConstants; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.entry.Entry; import org.apache.directory.shared.ldap.model.exception.LdapException; @@ -51,7 +56,7 @@ import org.slf4j.LoggerFactory; /** - * An {@link org.apache.directory.server.core.interceptor.Interceptor} based service for notifying {@link + * An {@link org.apache.directory.server.core.api.interceptor.Interceptor} based service for notifying {@link * DirectoryListener}s of changes to the DIT. * * @author Apache Directory Project Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java Sun Oct 9 20:58:08 2011 @@ -20,6 +20,7 @@ package org.apache.directory.server.core.event; +import org.apache.directory.server.core.api.event.Evaluator; import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.entry.Entry; import org.apache.directory.shared.ldap.model.exception.LdapException; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java Sun Oct 9 20:58:08 2011 @@ -22,6 +22,7 @@ package org.apache.directory.server.core import java.util.Comparator; +import org.apache.directory.server.core.api.event.Evaluator; import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.entry.Entry; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java Sun Oct 9 20:58:08 2011 @@ -20,6 +20,7 @@ package org.apache.directory.server.core.event; +import org.apache.directory.server.core.api.event.Evaluator; import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.entry.Entry; import org.apache.directory.shared.ldap.model.exception.LdapException; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java Sun Oct 9 20:58:08 2011 @@ -23,6 +23,7 @@ package org.apache.directory.server.core import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; +import org.apache.directory.server.core.api.event.Evaluator; import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.entry.Entry; import org.apache.directory.shared.ldap.model.entry.Attribute; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java Sun Oct 9 20:58:08 2011 @@ -21,25 +21,25 @@ package org.apache.directory.server.core import org.apache.commons.collections.map.LRUMap; -import org.apache.directory.server.core.DirectoryService; +import org.apache.directory.server.core.api.DirectoryService; +import org.apache.directory.server.core.api.interceptor.BaseInterceptor; +import org.apache.directory.server.core.api.interceptor.NextInterceptor; +import org.apache.directory.server.core.api.interceptor.context.AddOperationContext; +import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext; +import org.apache.directory.server.core.api.interceptor.context.EntryOperationContext; +import org.apache.directory.server.core.api.interceptor.context.ListOperationContext; +import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext; +import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext; +import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext; +import org.apache.directory.server.core.api.interceptor.context.MoveOperationContext; +import org.apache.directory.server.core.api.interceptor.context.OperationContext; +import org.apache.directory.server.core.api.interceptor.context.RenameOperationContext; +import org.apache.directory.server.core.api.partition.ByPassConstants; +import org.apache.directory.server.core.api.partition.Partition; +import org.apache.directory.server.core.api.partition.PartitionNexus; import org.apache.directory.server.core.entry.ClonedServerEntry; import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor; import org.apache.directory.server.core.filtering.EntryFilteringCursor; -import org.apache.directory.server.core.interceptor.BaseInterceptor; -import org.apache.directory.server.core.interceptor.NextInterceptor; -import org.apache.directory.server.core.interceptor.context.AddOperationContext; -import org.apache.directory.server.core.interceptor.context.DeleteOperationContext; -import org.apache.directory.server.core.interceptor.context.EntryOperationContext; -import org.apache.directory.server.core.interceptor.context.ListOperationContext; -import org.apache.directory.server.core.interceptor.context.LookupOperationContext; -import org.apache.directory.server.core.interceptor.context.ModifyOperationContext; -import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext; -import org.apache.directory.server.core.interceptor.context.MoveOperationContext; -import org.apache.directory.server.core.interceptor.context.OperationContext; -import org.apache.directory.server.core.interceptor.context.RenameOperationContext; -import org.apache.directory.server.core.partition.ByPassConstants; -import org.apache.directory.server.core.partition.Partition; -import org.apache.directory.server.core.partition.PartitionNexus; import org.apache.directory.server.core.schema.SchemaService; import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; @@ -57,7 +57,7 @@ import org.apache.directory.shared.ldap. /** - * An {@link org.apache.directory.server.core.interceptor.Interceptor} that detects any operations that breaks integrity + * An {@link org.apache.directory.server.core.api.interceptor.Interceptor} that detects any operations that breaks integrity * of {@link Partition} and terminates the current invocation chain by * throwing a {@link Exception}. Those operations include when an entry * already exists at a Dn and is added once again to the same Dn. Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/hash/PasswordHashingInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/hash/PasswordHashingInterceptor.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/hash/PasswordHashingInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/hash/PasswordHashingInterceptor.java Sun Oct 9 20:58:08 2011 @@ -23,11 +23,11 @@ package org.apache.directory.server.core import java.util.List; +import org.apache.directory.server.core.api.interceptor.BaseInterceptor; +import org.apache.directory.server.core.api.interceptor.NextInterceptor; +import org.apache.directory.server.core.api.interceptor.context.AddOperationContext; +import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext; import org.apache.directory.server.core.authn.PasswordUtil; -import org.apache.directory.server.core.interceptor.BaseInterceptor; -import org.apache.directory.server.core.interceptor.NextInterceptor; -import org.apache.directory.server.core.interceptor.context.AddOperationContext; -import org.apache.directory.server.core.interceptor.context.ModifyOperationContext; import org.apache.directory.shared.ldap.model.constants.LdapSecurityConstants; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.entry.BinaryValue; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java Sun Oct 9 20:58:08 2011 @@ -18,8 +18,10 @@ */ package org.apache.directory.server.core.journal; -import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.core.LdapPrincipal; +import org.apache.directory.server.core.api.DirectoryService; +import org.apache.directory.server.core.api.LdapPrincipal; +import org.apache.directory.server.core.api.journal.Journal; +import org.apache.directory.server.core.api.journal.JournalStore; import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.model.ldif.LdifEntry; import org.slf4j.Logger; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournalStore.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournalStore.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournalStore.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournalStore.java Sun Oct 9 20:58:08 2011 @@ -26,8 +26,9 @@ import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.Writer; -import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.core.LdapPrincipal; +import org.apache.directory.server.core.api.DirectoryService; +import org.apache.directory.server.core.api.LdapPrincipal; +import org.apache.directory.server.core.api.journal.JournalStore; import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.model.ldif.LdifEntry; import org.apache.directory.shared.ldap.model.ldif.LdifUtils; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java Sun Oct 9 20:58:08 2011 @@ -22,15 +22,16 @@ package org.apache.directory.server.core import java.util.Set; import java.util.concurrent.atomic.AtomicLong; -import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.core.interceptor.BaseInterceptor; -import org.apache.directory.server.core.interceptor.NextInterceptor; -import org.apache.directory.server.core.interceptor.context.AddOperationContext; -import org.apache.directory.server.core.interceptor.context.DeleteOperationContext; -import org.apache.directory.server.core.interceptor.context.ModifyOperationContext; -import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext; -import org.apache.directory.server.core.interceptor.context.MoveOperationContext; -import org.apache.directory.server.core.interceptor.context.RenameOperationContext; +import org.apache.directory.server.core.api.DirectoryService; +import org.apache.directory.server.core.api.interceptor.BaseInterceptor; +import org.apache.directory.server.core.api.interceptor.NextInterceptor; +import org.apache.directory.server.core.api.interceptor.context.AddOperationContext; +import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext; +import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext; +import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext; +import org.apache.directory.server.core.api.interceptor.context.MoveOperationContext; +import org.apache.directory.server.core.api.interceptor.context.RenameOperationContext; +import org.apache.directory.server.core.api.journal.Journal; import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.entry.Entry; import org.apache.directory.shared.ldap.model.entry.Modification; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java Sun Oct 9 20:58:08 2011 @@ -22,24 +22,24 @@ package org.apache.directory.server.core import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.apache.directory.server.core.DirectoryService; +import org.apache.directory.server.core.api.DirectoryService; +import org.apache.directory.server.core.api.interceptor.Interceptor; +import org.apache.directory.server.core.api.interceptor.NextInterceptor; +import org.apache.directory.server.core.api.interceptor.context.AddOperationContext; +import org.apache.directory.server.core.api.interceptor.context.BindOperationContext; +import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext; +import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext; +import org.apache.directory.server.core.api.interceptor.context.EntryOperationContext; +import org.apache.directory.server.core.api.interceptor.context.GetRootDSEOperationContext; +import org.apache.directory.server.core.api.interceptor.context.ListOperationContext; +import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext; +import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext; +import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext; +import org.apache.directory.server.core.api.interceptor.context.MoveOperationContext; +import org.apache.directory.server.core.api.interceptor.context.RenameOperationContext; +import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; +import org.apache.directory.server.core.api.interceptor.context.UnbindOperationContext; import org.apache.directory.server.core.filtering.EntryFilteringCursor; -import org.apache.directory.server.core.interceptor.Interceptor; -import org.apache.directory.server.core.interceptor.NextInterceptor; -import org.apache.directory.server.core.interceptor.context.AddOperationContext; -import org.apache.directory.server.core.interceptor.context.BindOperationContext; -import org.apache.directory.server.core.interceptor.context.CompareOperationContext; -import org.apache.directory.server.core.interceptor.context.DeleteOperationContext; -import org.apache.directory.server.core.interceptor.context.EntryOperationContext; -import org.apache.directory.server.core.interceptor.context.GetRootDSEOperationContext; -import org.apache.directory.server.core.interceptor.context.ListOperationContext; -import org.apache.directory.server.core.interceptor.context.LookupOperationContext; -import org.apache.directory.server.core.interceptor.context.ModifyOperationContext; -import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext; -import org.apache.directory.server.core.interceptor.context.MoveOperationContext; -import org.apache.directory.server.core.interceptor.context.RenameOperationContext; -import org.apache.directory.server.core.interceptor.context.SearchOperationContext; -import org.apache.directory.server.core.interceptor.context.UnbindOperationContext; import org.apache.directory.shared.ldap.model.entry.Entry; import org.apache.directory.shared.ldap.model.exception.LdapException; import org.slf4j.Logger; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java Sun Oct 9 20:58:08 2011 @@ -22,23 +22,23 @@ package org.apache.directory.server.core import java.util.List; -import org.apache.directory.server.core.DirectoryService; +import org.apache.directory.server.core.api.DirectoryService; +import org.apache.directory.server.core.api.interceptor.BaseInterceptor; +import org.apache.directory.server.core.api.interceptor.NextInterceptor; +import org.apache.directory.server.core.api.interceptor.context.AddOperationContext; +import org.apache.directory.server.core.api.interceptor.context.BindOperationContext; +import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext; +import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext; +import org.apache.directory.server.core.api.interceptor.context.EntryOperationContext; +import org.apache.directory.server.core.api.interceptor.context.ListOperationContext; +import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext; +import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext; +import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext; +import org.apache.directory.server.core.api.interceptor.context.MoveOperationContext; +import org.apache.directory.server.core.api.interceptor.context.RenameOperationContext; +import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor; import org.apache.directory.server.core.filtering.EntryFilteringCursor; -import org.apache.directory.server.core.interceptor.BaseInterceptor; -import org.apache.directory.server.core.interceptor.NextInterceptor; -import org.apache.directory.server.core.interceptor.context.AddOperationContext; -import org.apache.directory.server.core.interceptor.context.BindOperationContext; -import org.apache.directory.server.core.interceptor.context.CompareOperationContext; -import org.apache.directory.server.core.interceptor.context.DeleteOperationContext; -import org.apache.directory.server.core.interceptor.context.EntryOperationContext; -import org.apache.directory.server.core.interceptor.context.ListOperationContext; -import org.apache.directory.server.core.interceptor.context.LookupOperationContext; -import org.apache.directory.server.core.interceptor.context.ModifyOperationContext; -import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext; -import org.apache.directory.server.core.interceptor.context.MoveOperationContext; -import org.apache.directory.server.core.interceptor.context.RenameOperationContext; -import org.apache.directory.server.core.interceptor.context.SearchOperationContext; import org.apache.directory.server.core.partition.DefaultPartitionNexus; import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.cursor.EmptyCursor; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=1180716&r1=1180715&r2=1180716&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Sun Oct 9 20:58:08 2011 @@ -28,22 +28,22 @@ import java.util.UUID; import org.apache.directory.server.constants.ApacheSchemaConstants; import org.apache.directory.server.constants.ServerDNConstants; -import org.apache.directory.server.core.DirectoryService; +import org.apache.directory.server.core.api.DirectoryService; +import org.apache.directory.server.core.api.interceptor.BaseInterceptor; +import org.apache.directory.server.core.api.interceptor.Interceptor; +import org.apache.directory.server.core.api.interceptor.NextInterceptor; +import org.apache.directory.server.core.api.interceptor.context.AddOperationContext; +import org.apache.directory.server.core.api.interceptor.context.ListOperationContext; +import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext; +import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext; +import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext; +import org.apache.directory.server.core.api.interceptor.context.MoveOperationContext; +import org.apache.directory.server.core.api.interceptor.context.RenameOperationContext; +import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; +import org.apache.directory.server.core.api.interceptor.context.SearchingOperationContext; import org.apache.directory.server.core.entry.ClonedServerEntry; import org.apache.directory.server.core.filtering.EntryFilter; import org.apache.directory.server.core.filtering.EntryFilteringCursor; -import org.apache.directory.server.core.interceptor.BaseInterceptor; -import org.apache.directory.server.core.interceptor.Interceptor; -import org.apache.directory.server.core.interceptor.NextInterceptor; -import org.apache.directory.server.core.interceptor.context.AddOperationContext; -import org.apache.directory.server.core.interceptor.context.ListOperationContext; -import org.apache.directory.server.core.interceptor.context.LookupOperationContext; -import org.apache.directory.server.core.interceptor.context.ModifyOperationContext; -import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext; -import org.apache.directory.server.core.interceptor.context.MoveOperationContext; -import org.apache.directory.server.core.interceptor.context.RenameOperationContext; -import org.apache.directory.server.core.interceptor.context.SearchOperationContext; -import org.apache.directory.server.core.interceptor.context.SearchingOperationContext; import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.entry.Attribute;