You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2005/03/28 17:19:07 UTC
svn commit: r159242 - in
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server:
interceptor/ invocation/ invocation/interceptor/ jndi/ jndi/invocation/
Author: akarasulu
Date: Mon Mar 28 07:19:02 2005
New Revision: 159242
URL: http://svn.apache.org/viewcvs?view=rev&rev=159242
Log:
changes ...
o moved internal packages under jndi package up to become peers of o.a.l.s.jndi
so now we have the following new packages ...
o o.a.l.s.invocation was o.a.l.s.jndi.invocation
o o.a.l.s.interceptor was o.a.l.s.jndi.invocation.interceptor
this works nicely now that Trustin made the interceptor framework independent
of the JNDI code
o cleanup a few old javadocs
o cleaned up imports messed up by moves
Added:
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/
- copied from r159236, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/
- copied from r159236, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/
Removed:
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/interceptor/
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/
Modified:
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/Authorizer.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/BaseInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/Interceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorChain.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorConfigBuilder.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorException.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/NextInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/OperationalAttributeInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/SchemaManager.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/Validator.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Add.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Delete.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/GetMatchedDN.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/GetSuffix.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/HasEntry.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Invocation.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/IsSuffix.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/List.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/ListSuffixes.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Lookup.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/LookupWithAttrIds.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Modify.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/ModifyMany.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/ModifyRN.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Move.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/MoveAndModifyRN.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Search.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/Authenticator.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/JndiProvider.java
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/Authorizer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/Authorizer.java?view=diff&r1=159236&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/Authorizer.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/Authorizer.java Mon Mar 28 07:19:02 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi.invocation.interceptor;
+package org.apache.ldap.server.interceptor;
import javax.naming.Name;
@@ -32,18 +32,17 @@
import org.apache.ldap.server.db.ResultFilteringEnumeration;
import org.apache.ldap.server.db.SearchResultFilter;
import org.apache.ldap.server.jndi.ServerContext;
-import org.apache.ldap.server.jndi.invocation.Delete;
-import org.apache.ldap.server.jndi.invocation.HasEntry;
-import org.apache.ldap.server.jndi.invocation.Invocation;
-import org.apache.ldap.server.jndi.invocation.List;
-import org.apache.ldap.server.jndi.invocation.Lookup;
-import org.apache.ldap.server.jndi.invocation.LookupWithAttrIds;
-import org.apache.ldap.server.jndi.invocation.Modify;
-import org.apache.ldap.server.jndi.invocation.ModifyMany;
-import org.apache.ldap.server.jndi.invocation.ModifyRN;
-import org.apache.ldap.server.jndi.invocation.Move;
-import org.apache.ldap.server.jndi.invocation.MoveAndModifyRN;
-import org.apache.ldap.server.jndi.invocation.Search;
+import org.apache.ldap.server.invocation.HasEntry;
+import org.apache.ldap.server.invocation.*;
+import org.apache.ldap.server.invocation.List;
+import org.apache.ldap.server.invocation.Lookup;
+import org.apache.ldap.server.invocation.LookupWithAttrIds;
+import org.apache.ldap.server.invocation.Modify;
+import org.apache.ldap.server.invocation.ModifyMany;
+import org.apache.ldap.server.invocation.ModifyRN;
+import org.apache.ldap.server.invocation.Move;
+import org.apache.ldap.server.invocation.MoveAndModifyRN;
+import org.apache.ldap.server.invocation.Search;
import org.apache.ldap.server.schema.AttributeTypeRegistry;
import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
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?view=diff&r1=159236&r2=159242
==============================================================================
--- 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 Mon Mar 28 07:19:02 2005
@@ -14,12 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi.invocation.interceptor;
+package org.apache.ldap.server.interceptor;
import org.apache.ldap.server.auth.LdapPrincipal;
import org.apache.ldap.server.jndi.ServerContext;
-import org.apache.ldap.server.jndi.invocation.*;
+import org.apache.ldap.server.invocation.*;
import javax.naming.NamingException;
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?view=diff&r1=159236&r2=159242
==============================================================================
--- 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 Mon Mar 28 07:19:02 2005
@@ -14,11 +14,11 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi.invocation.interceptor;
+package org.apache.ldap.server.interceptor;
import org.apache.ldap.server.BackingStore;
-import org.apache.ldap.server.jndi.invocation.Invocation;
+import org.apache.ldap.server.invocation.Invocation;
import javax.naming.NamingException;
@@ -110,7 +110,7 @@
/**
* Filters a particular invocation. You can pass control to
* <code>nextInterceptor</code> by calling {@link NextInterceptor#process(
- * org.apache.ldap.server.jndi.invocation.Invocation)}
+ * org.apache.ldap.server.invocation.Invocation)}
*
* @param nextInterceptor the next interceptor in the interceptor chain
* @param invocation the invocation to process
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?view=diff&r1=159236&r2=159242
==============================================================================
--- 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 Mon Mar 28 07:19:02 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi.invocation.interceptor;
+package org.apache.ldap.server.interceptor;
import java.util.ArrayList;
@@ -28,7 +28,7 @@
import javax.naming.NamingException;
import org.apache.ldap.server.jndi.Authenticator;
-import org.apache.ldap.server.jndi.invocation.Invocation;
+import org.apache.ldap.server.invocation.Invocation;
/**
@@ -68,7 +68,7 @@
private final Interceptor NEXT_INTERCEPTOR0 = new Interceptor()
{
- public void init( InterceptorContext context ) throws NamingException
+ public void init( InterceptorContext context )
{
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorConfigBuilder.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorConfigBuilder.java?view=diff&r1=159236&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorConfigBuilder.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorConfigBuilder.java Mon Mar 28 07:19:02 2005
@@ -1,4 +1,4 @@
-package org.apache.ldap.server.jndi.invocation.interceptor;
+package org.apache.ldap.server.interceptor;
import java.util.HashMap;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorContext.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorContext.java?view=diff&r1=159236&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorContext.java Mon Mar 28 07:19:02 2005
@@ -1,4 +1,4 @@
-package org.apache.ldap.server.jndi.invocation.interceptor;
+package org.apache.ldap.server.interceptor;
import org.apache.ldap.server.RootNexus;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorException.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorException.java?view=diff&r1=159236&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorException.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorException.java Mon Mar 28 07:19:02 2005
@@ -14,13 +14,13 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi.invocation.interceptor;
+package org.apache.ldap.server.interceptor;
import org.apache.ldap.common.exception.LdapException;
import org.apache.ldap.common.exception.LdapNamingException;
import org.apache.ldap.common.message.ResultCodeEnum;
-import org.apache.ldap.server.jndi.invocation.Invocation;
+import org.apache.ldap.server.invocation.Invocation;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/NextInterceptor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/NextInterceptor.java?view=diff&r1=159236&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/NextInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/NextInterceptor.java Mon Mar 28 07:19:02 2005
@@ -14,26 +14,26 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi.invocation.interceptor;
+package org.apache.ldap.server.interceptor;
-import org.apache.ldap.server.jndi.invocation.Invocation;
+import org.apache.ldap.server.invocation.Invocation;
import javax.naming.NamingException;
/**
- * Represents the next {@link Interceptor} in the interceptor chain.
+ * Represents the next {@link org.apache.ldap.server.interceptor.Interceptor} in the interceptor chain.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
- * @see Interceptor
- * @see InterceptorChain
+ * @see org.apache.ldap.server.interceptor.Interceptor
+ * @see org.apache.ldap.server.interceptor.InterceptorChain
*/
public interface NextInterceptor
{
/**
- * Passes the control of current invocation to the next {@link Interceptor} in the {@link InterceptorChain}.
+ * Passes the control of current invocation to the next {@link org.apache.ldap.server.interceptor.Interceptor} in the {@link org.apache.ldap.server.interceptor.InterceptorChain}.
*
* @param incovation
* @throws NamingException
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/OperationalAttributeInterceptor.java?view=diff&r1=159236&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/OperationalAttributeInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/OperationalAttributeInterceptor.java Mon Mar 28 07:19:02 2005
@@ -14,16 +14,16 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi.invocation.interceptor;
+package org.apache.ldap.server.interceptor;
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.RootNexus;
+import org.apache.ldap.server.invocation.*;
import org.apache.ldap.server.db.ResultFilteringEnumeration;
import org.apache.ldap.server.db.SearchResultFilter;
-import org.apache.ldap.server.jndi.invocation.*;
import org.apache.ldap.server.schema.AttributeTypeRegistry;
import javax.naming.Name;
@@ -35,7 +35,7 @@
/**
- * An {@link Interceptor} that adds or modifies the default attributes
+ * An {@link org.apache.ldap.server.interceptor.Interceptor} that adds or modifies the default attributes
* of entries. There are four default attributes for now;<code>'creatorsName'
* </code>, <code>'createTimestamp'</code>, <code>'modifiersName'</code>, and
* <code>'modifyTimestamp'</code>.
@@ -92,8 +92,6 @@
/**
* Adds extra operational attributes to the entry before it is added.
- *
- * @see BaseInterceptor#add(String, Name, Attributes)
*/
protected void process( NextInterceptor nextInterceptor, Add call ) throws NamingException
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/SchemaManager.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/SchemaManager.java?view=diff&r1=159236&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/SchemaManager.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/SchemaManager.java Mon Mar 28 07:19:02 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi.invocation.interceptor;
+package org.apache.ldap.server.interceptor;
import org.apache.ldap.common.filter.ExprNode;
@@ -29,10 +29,11 @@
import org.apache.ldap.server.db.ResultFilteringEnumeration;
import org.apache.ldap.server.db.SearchResultFilter;
import org.apache.ldap.server.jndi.ServerLdapContext;
-import org.apache.ldap.server.jndi.invocation.List;
-import org.apache.ldap.server.jndi.invocation.Lookup;
-import org.apache.ldap.server.jndi.invocation.LookupWithAttrIds;
-import org.apache.ldap.server.jndi.invocation.Search;
+import org.apache.ldap.server.invocation.List;
+import org.apache.ldap.server.invocation.Lookup;
+import org.apache.ldap.server.invocation.*;
+import org.apache.ldap.server.invocation.LookupWithAttrIds;
+import org.apache.ldap.server.invocation.Search;
import org.apache.ldap.server.schema.AttributeTypeRegistry;
import org.apache.ldap.server.schema.GlobalRegistries;
@@ -50,7 +51,7 @@
/**
- * An {@link Interceptor} that manages and enforces schemas.
+ * An {@link org.apache.ldap.server.interceptor.Interceptor} that manages and enforces schemas.
*
* @todo Better interceptor description required.
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -85,10 +86,6 @@
/**
* Creates a schema service interceptor.
- *
- * @param nexus the root nexus to access all database partitions
- * @param globalRegistries the global schema object registries
- * @param filterService
*/
public SchemaManager()
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/Validator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/Validator.java?view=diff&r1=159236&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/Validator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/Validator.java Mon Mar 28 07:19:02 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi.invocation.interceptor;
+package org.apache.ldap.server.interceptor;
import org.apache.ldap.common.exception.LdapContextNotEmptyException;
@@ -25,7 +25,7 @@
import org.apache.ldap.common.name.LdapName;
import org.apache.ldap.server.BackingStore;
import org.apache.ldap.server.RootNexus;
-import org.apache.ldap.server.jndi.invocation.*;
+import org.apache.ldap.server.invocation.*;
import javax.naming.Name;
import javax.naming.NamingEnumeration;
@@ -35,7 +35,7 @@
/**
- * An {@link Interceptor} that detects any operations that breaks integrity
+ * An {@link org.apache.ldap.server.interceptor.Interceptor} that detects any operations that breaks integrity
* of {@link BackingStore} and terminates the current invocation chain by
* throwing a {@link NamingException}. Those operations include when an entry
* already exists at a DN and is added once again to the same DN.
@@ -73,8 +73,6 @@
/**
* In the pre-invocation state this interceptor method checks to see if the entry to be added already exists. If it
* does an exception is raised.
- *
- * @see BaseInterceptor#add(String, Name, Attributes)
*/
protected void process( NextInterceptor nextInterceptor, Add call ) throws NamingException
{
@@ -158,8 +156,6 @@
/**
* Checks to make sure the entry being looked up exists other wise throws the appropriate LdapException.
- *
- * @see org.apache.ldap.server.jndi.BaseInterceptor#lookup(javax.naming.Name)
*/
protected void process( NextInterceptor nextInterceptor, Lookup call ) throws NamingException
{
@@ -330,7 +326,6 @@
*
* @param msg the message to prefix to the distinguished name for explanation
* @param dn the distinguished name of the entry that is asserted
- * @param invocation the invocation object to alter if the entry does not exist
* @throws NamingException if the entry does not exist
*/
private void assertHasEntry( String msg, Name dn ) throws NamingException
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Add.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Add.java?view=diff&r1=159236&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Add.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Add.java Mon Mar 28 07:19:02 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi.invocation;
+package org.apache.ldap.server.invocation;
import org.apache.ldap.server.BackingStore;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Delete.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Delete.java?view=diff&r1=159236&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Delete.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Delete.java Mon Mar 28 07:19:02 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi.invocation;
+package org.apache.ldap.server.invocation;
import org.apache.ldap.server.BackingStore;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/GetMatchedDN.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/GetMatchedDN.java?view=diff&r1=159236&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/GetMatchedDN.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/GetMatchedDN.java Mon Mar 28 07:19:02 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi.invocation;
+package org.apache.ldap.server.invocation;
import org.apache.ldap.server.BackingStore;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/GetSuffix.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/GetSuffix.java?view=diff&r1=159236&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/GetSuffix.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/GetSuffix.java Mon Mar 28 07:19:02 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi.invocation;
+package org.apache.ldap.server.invocation;
import org.apache.ldap.server.BackingStore;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/HasEntry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/HasEntry.java?view=diff&r1=159236&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/HasEntry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/HasEntry.java Mon Mar 28 07:19:02 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi.invocation;
+package org.apache.ldap.server.invocation;
import org.apache.ldap.server.BackingStore;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Invocation.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Invocation.java?view=diff&r1=159236&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Invocation.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Invocation.java Mon Mar 28 07:19:02 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi.invocation;
+package org.apache.ldap.server.invocation;
import org.apache.ldap.server.BackingStore;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/IsSuffix.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/IsSuffix.java?view=diff&r1=159236&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/IsSuffix.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/IsSuffix.java Mon Mar 28 07:19:02 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi.invocation;
+package org.apache.ldap.server.invocation;
import org.apache.ldap.server.BackingStore;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/List.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/List.java?view=diff&r1=159236&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/List.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/List.java Mon Mar 28 07:19:02 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi.invocation;
+package org.apache.ldap.server.invocation;
import org.apache.ldap.server.BackingStore;
@@ -24,7 +24,7 @@
/**
- * Represents an {@link Invocation} on {@link BackingStore#list(Name)}.
+ * Represents an {@link org.apache.ldap.server.invocation.Invocation} on {@link BackingStore#list(Name)}.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/ListSuffixes.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/ListSuffixes.java?view=diff&r1=159236&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/ListSuffixes.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/ListSuffixes.java Mon Mar 28 07:19:02 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi.invocation;
+package org.apache.ldap.server.invocation;
import org.apache.ldap.server.BackingStore;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Lookup.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Lookup.java?view=diff&r1=159236&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Lookup.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Lookup.java Mon Mar 28 07:19:02 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi.invocation;
+package org.apache.ldap.server.invocation;
import org.apache.ldap.server.BackingStore;
@@ -24,7 +24,7 @@
/**
- * Represents an {@link Invocation} on {@link BackingStore#lookup(Name)}.
+ * Represents an {@link org.apache.ldap.server.invocation.Invocation} on {@link BackingStore#lookup(Name)}.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/LookupWithAttrIds.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/LookupWithAttrIds.java?view=diff&r1=159236&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/LookupWithAttrIds.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/LookupWithAttrIds.java Mon Mar 28 07:19:02 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi.invocation;
+package org.apache.ldap.server.invocation;
import org.apache.ldap.server.BackingStore;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Modify.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Modify.java?view=diff&r1=159236&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Modify.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Modify.java Mon Mar 28 07:19:02 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi.invocation;
+package org.apache.ldap.server.invocation;
import org.apache.ldap.server.BackingStore;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/ModifyMany.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/ModifyMany.java?view=diff&r1=159236&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/ModifyMany.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/ModifyMany.java Mon Mar 28 07:19:02 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi.invocation;
+package org.apache.ldap.server.invocation;
import org.apache.ldap.server.BackingStore;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/ModifyRN.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/ModifyRN.java?view=diff&r1=159236&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/ModifyRN.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/ModifyRN.java Mon Mar 28 07:19:02 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi.invocation;
+package org.apache.ldap.server.invocation;
import org.apache.ldap.server.BackingStore;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Move.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Move.java?view=diff&r1=159236&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Move.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Move.java Mon Mar 28 07:19:02 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi.invocation;
+package org.apache.ldap.server.invocation;
import org.apache.ldap.server.BackingStore;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/MoveAndModifyRN.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/MoveAndModifyRN.java?view=diff&r1=159236&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/MoveAndModifyRN.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/MoveAndModifyRN.java Mon Mar 28 07:19:02 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi.invocation;
+package org.apache.ldap.server.invocation;
import org.apache.ldap.server.BackingStore;
@@ -24,7 +24,7 @@
/**
- * Represents an {@link Invocation} on {@link BackingStore#move(Name, Name, String, boolean)}.
+ * Represents an {@link org.apache.ldap.server.invocation.Invocation} on {@link BackingStore#move(Name, Name, String, boolean)}.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Search.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Search.java?view=diff&r1=159236&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Search.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Search.java Mon Mar 28 07:19:02 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi.invocation;
+package org.apache.ldap.server.invocation;
import org.apache.ldap.common.filter.ExprNode;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/Authenticator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/Authenticator.java?view=diff&r1=159241&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/Authenticator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/Authenticator.java Mon Mar 28 07:19:02 2005
@@ -38,10 +38,12 @@
import org.apache.ldap.server.auth.GenericAuthenticatorContext;
import org.apache.ldap.server.auth.LdapPrincipal;
import org.apache.ldap.server.auth.SimpleAuthenticator;
-import org.apache.ldap.server.jndi.invocation.Invocation;
-import org.apache.ldap.server.jndi.invocation.interceptor.Interceptor;
-import org.apache.ldap.server.jndi.invocation.interceptor.InterceptorContext;
-import org.apache.ldap.server.jndi.invocation.interceptor.NextInterceptor;
+import org.apache.ldap.server.invocation.Invocation;
+import org.apache.ldap.server.interceptor.Interceptor;
+import org.apache.ldap.server.interceptor.InterceptorContext;
+import org.apache.ldap.server.interceptor.NextInterceptor;
+import org.apache.ldap.server.interceptor.Interceptor;
+import org.apache.ldap.server.interceptor.NextInterceptor;
/**
* An {@link Interceptor} that authenticates users.
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?view=diff&r1=159241&r2=159242
==============================================================================
--- 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 Mon Mar 28 07:19:02 2005
@@ -44,15 +44,17 @@
import org.apache.ldap.server.ContextPartitionConfig;
import org.apache.ldap.server.RootNexus;
import org.apache.ldap.server.SystemPartition;
+import org.apache.ldap.server.interceptor.InterceptorChain;
import org.apache.ldap.server.db.Database;
import org.apache.ldap.server.db.DefaultSearchEngine;
import org.apache.ldap.server.db.ExpressionEnumerator;
import org.apache.ldap.server.db.ExpressionEvaluator;
import org.apache.ldap.server.db.SearchEngine;
import org.apache.ldap.server.db.jdbm.JdbmDatabase;
-import org.apache.ldap.server.jndi.invocation.interceptor.InterceptorChain;
-import org.apache.ldap.server.jndi.invocation.interceptor.InterceptorConfigBuilder;
-import org.apache.ldap.server.jndi.invocation.interceptor.InterceptorContext;
+import org.apache.ldap.server.interceptor.InterceptorChain;
+import org.apache.ldap.server.interceptor.InterceptorConfigBuilder;
+import org.apache.ldap.server.interceptor.InterceptorContext;
+import org.apache.ldap.server.interceptor.InterceptorContext;
import org.apache.ldap.server.schema.AttributeTypeRegistry;
import org.apache.ldap.server.schema.GlobalRegistries;
import org.apache.ldap.server.schema.MatchingRuleRegistry;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/JndiProvider.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/JndiProvider.java?view=diff&r1=159241&r2=159242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/JndiProvider.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/JndiProvider.java Mon Mar 28 07:19:02 2005
@@ -34,25 +34,27 @@
import org.apache.ldap.server.ContextPartition;
import org.apache.ldap.server.PartitionNexus;
import org.apache.ldap.server.RootNexus;
-import org.apache.ldap.server.jndi.invocation.Add;
-import org.apache.ldap.server.jndi.invocation.Delete;
-import org.apache.ldap.server.jndi.invocation.GetMatchedDN;
-import org.apache.ldap.server.jndi.invocation.GetSuffix;
-import org.apache.ldap.server.jndi.invocation.HasEntry;
-import org.apache.ldap.server.jndi.invocation.Invocation;
-import org.apache.ldap.server.jndi.invocation.IsSuffix;
-import org.apache.ldap.server.jndi.invocation.List;
-import org.apache.ldap.server.jndi.invocation.ListSuffixes;
-import org.apache.ldap.server.jndi.invocation.Lookup;
-import org.apache.ldap.server.jndi.invocation.LookupWithAttrIds;
-import org.apache.ldap.server.jndi.invocation.Modify;
-import org.apache.ldap.server.jndi.invocation.ModifyMany;
-import org.apache.ldap.server.jndi.invocation.ModifyRN;
-import org.apache.ldap.server.jndi.invocation.Move;
-import org.apache.ldap.server.jndi.invocation.MoveAndModifyRN;
-import org.apache.ldap.server.jndi.invocation.Search;
-import org.apache.ldap.server.jndi.invocation.interceptor.Interceptor;
-import org.apache.ldap.server.jndi.invocation.interceptor.InterceptorChain;
+import org.apache.ldap.server.interceptor.Interceptor;
+import org.apache.ldap.server.invocation.Delete;
+import org.apache.ldap.server.invocation.GetMatchedDN;
+import org.apache.ldap.server.invocation.*;
+import org.apache.ldap.server.invocation.GetSuffix;
+import org.apache.ldap.server.invocation.HasEntry;
+import org.apache.ldap.server.invocation.Invocation;
+import org.apache.ldap.server.invocation.IsSuffix;
+import org.apache.ldap.server.invocation.List;
+import org.apache.ldap.server.invocation.ListSuffixes;
+import org.apache.ldap.server.invocation.Lookup;
+import org.apache.ldap.server.invocation.LookupWithAttrIds;
+import org.apache.ldap.server.invocation.Modify;
+import org.apache.ldap.server.invocation.ModifyMany;
+import org.apache.ldap.server.invocation.ModifyRN;
+import org.apache.ldap.server.invocation.Move;
+import org.apache.ldap.server.invocation.MoveAndModifyRN;
+import org.apache.ldap.server.invocation.Search;
+import org.apache.ldap.server.interceptor.Interceptor;
+import org.apache.ldap.server.interceptor.InterceptorChain;
+import org.apache.ldap.server.interceptor.InterceptorChain;
/**