directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r375785 [3/28] - in /directory/trunks: apacheds/ apacheds/core-plugin/src/main/antlr/ apacheds/core-plugin/src/main/java/org/apache/directory/ apacheds/core-plugin/src/main/java/org/apache/directory/server/ apacheds/core-plugin/src/main/jav...
Date Wed, 08 Feb 2006 00:18:49 GMT
Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/subtree/SubentryServiceTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/subtree/SubentryServiceTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/subtree/SubentryServiceTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceTest.java Tue Feb  7 16:10:02 2006
@@ -14,14 +14,15 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.subtree;
+package org.apache.directory.server.core.subtree;
 
 
-import org.apache.ldap.server.unit.AbstractAdminTestCase;
-import org.apache.ldap.common.message.LockableAttributesImpl;
-import org.apache.ldap.common.message.LockableAttributeImpl;
-import org.apache.ldap.common.message.SubentriesControl;
-import org.apache.ldap.common.exception.LdapNoSuchAttributeException;
+import org.apache.directory.server.core.subtree.SubentryService;
+import org.apache.directory.server.core.unit.AbstractAdminTestCase;
+import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
+import org.apache.directory.shared.ldap.message.SubentriesControl;
 
 import javax.naming.NamingException;
 import javax.naming.NamingEnumeration;

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (from r375660, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/DefaultDirectoryService.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/DefaultDirectoryService.java&r1=375660&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/DefaultDirectoryService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server;
+package org.apache.directory.server.core;
 
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -29,34 +29,34 @@
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 
-import org.apache.asn1.primitives.OID;
-import org.apache.ldap.common.exception.LdapAuthenticationNotSupportedException;
-import org.apache.ldap.common.exception.LdapConfigurationException;
-import org.apache.ldap.common.exception.LdapNoPermissionException;
-import org.apache.ldap.common.message.LockableAttributeImpl;
-import org.apache.ldap.common.message.LockableAttributesImpl;
-import org.apache.ldap.common.message.ResultCodeEnum;
-import org.apache.ldap.common.name.DnOidContainer;
-import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.common.util.DateUtils;
-import org.apache.ldap.common.util.StringTools;
-import org.apache.ldap.common.schema.AttributeType;
-import org.apache.ldap.common.schema.NoOpNormalizer;
-import org.apache.ldap.common.schema.OidNormalizer;
-import org.apache.ldap.server.authz.AuthorizationService;
-import org.apache.ldap.server.configuration.Configuration;
-import org.apache.ldap.server.configuration.ConfigurationException;
-import org.apache.ldap.server.configuration.StartupConfiguration;
-import org.apache.ldap.server.interceptor.InterceptorChain;
-import org.apache.ldap.server.jndi.AbstractContextFactory;
-import org.apache.ldap.server.jndi.DeadContext;
-import org.apache.ldap.server.jndi.ServerLdapContext;
-import org.apache.ldap.server.partition.DefaultDirectoryPartitionNexus;
-import org.apache.ldap.server.partition.DirectoryPartitionNexus;
-import org.apache.ldap.server.schema.AttributeTypeRegistry;
-import org.apache.ldap.server.schema.GlobalRegistries;
-import org.apache.ldap.server.schema.bootstrap.BootstrapRegistries;
-import org.apache.ldap.server.schema.bootstrap.BootstrapSchemaLoader;
+import org.apache.directory.server.core.authz.AuthorizationService;
+import org.apache.directory.server.core.configuration.Configuration;
+import org.apache.directory.server.core.configuration.ConfigurationException;
+import org.apache.directory.server.core.configuration.StartupConfiguration;
+import org.apache.directory.server.core.interceptor.InterceptorChain;
+import org.apache.directory.server.core.jndi.AbstractContextFactory;
+import org.apache.directory.server.core.jndi.DeadContext;
+import org.apache.directory.server.core.jndi.ServerLdapContext;
+import org.apache.directory.server.core.partition.DefaultDirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.schema.AttributeTypeRegistry;
+import org.apache.directory.server.core.schema.GlobalRegistries;
+import org.apache.directory.server.core.schema.bootstrap.BootstrapRegistries;
+import org.apache.directory.server.core.schema.bootstrap.BootstrapSchemaLoader;
+import org.apache.directory.shared.asn1.primitives.OID;
+import org.apache.directory.shared.ldap.exception.LdapAuthenticationNotSupportedException;
+import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
+import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
+import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.name.DnOidContainer;
+import org.apache.directory.shared.ldap.name.LdapName;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.NoOpNormalizer;
+import org.apache.directory.shared.ldap.schema.OidNormalizer;
+import org.apache.directory.shared.ldap.util.DateUtils;
+import org.apache.directory.shared.ldap.util.StringTools;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryServiceConfiguration.java (from r375660, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/DefaultDirectoryServiceConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryServiceConfiguration.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryServiceConfiguration.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/DefaultDirectoryServiceConfiguration.java&r1=375660&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/DefaultDirectoryServiceConfiguration.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryServiceConfiguration.java Tue Feb  7 16:10:02 2006
@@ -14,17 +14,17 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server;
+package org.apache.directory.server.core;
 
 import java.util.Hashtable;
 
 import javax.naming.Context;
 import javax.naming.NamingException;
 
-import org.apache.ldap.server.configuration.StartupConfiguration;
-import org.apache.ldap.server.interceptor.InterceptorChain;
-import org.apache.ldap.server.partition.DirectoryPartitionNexus;
-import org.apache.ldap.server.schema.GlobalRegistries;
+import org.apache.directory.server.core.configuration.StartupConfiguration;
+import org.apache.directory.server.core.interceptor.InterceptorChain;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.schema.GlobalRegistries;
 
 
 /**

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

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryService.java (from r375660, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/DirectoryService.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryService.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryService.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/DirectoryService.java&r1=375660&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/DirectoryService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryService.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server;
+package org.apache.directory.server.core;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -26,9 +26,9 @@
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import org.apache.ldap.server.configuration.Configuration;
-import org.apache.ldap.server.jndi.AbstractContextFactory;
-import org.apache.ldap.server.partition.DirectoryPartition;
+import org.apache.directory.server.core.configuration.Configuration;
+import org.apache.directory.server.core.jndi.AbstractContextFactory;
+import org.apache.directory.server.core.partition.DirectoryPartition;
 
 /**
  * Provides JNDI service to {@link AbstractContextFactory}.

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

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryServiceConfiguration.java (from r375660, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/DirectoryServiceConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryServiceConfiguration.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryServiceConfiguration.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/DirectoryServiceConfiguration.java&r1=375660&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/DirectoryServiceConfiguration.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryServiceConfiguration.java Tue Feb  7 16:10:02 2006
@@ -14,16 +14,16 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server;
+package org.apache.directory.server.core;
 
 import java.util.Hashtable;
 
 import javax.naming.Context;
 
-import org.apache.ldap.server.configuration.StartupConfiguration;
-import org.apache.ldap.server.interceptor.InterceptorChain;
-import org.apache.ldap.server.partition.DirectoryPartitionNexus;
-import org.apache.ldap.server.schema.GlobalRegistries;
+import org.apache.directory.server.core.configuration.StartupConfiguration;
+import org.apache.directory.server.core.interceptor.InterceptorChain;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.schema.GlobalRegistries;
 
 /**
  * Represents the global configuration of currently running

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

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryServiceListener.java (from r375660, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/DirectoryServiceListener.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryServiceListener.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryServiceListener.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/DirectoryServiceListener.java&r1=375660&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/DirectoryServiceListener.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryServiceListener.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server;
+package org.apache.directory.server.core;
 
 import javax.naming.NamingException;
 

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

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authn/AbstractAuthenticator.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authn/AbstractAuthenticator.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authn/AbstractAuthenticator.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java Tue Feb  7 16:10:02 2006
@@ -14,17 +14,17 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authn;
+package org.apache.directory.server.core.authn;
 
 
 import javax.naming.NamingException;
 import javax.naming.spi.InitialContextFactory;
 
-import org.apache.ldap.server.DirectoryServiceConfiguration;
-import org.apache.ldap.server.configuration.AuthenticatorConfiguration;
-import org.apache.ldap.server.jndi.ServerContext;
-import org.apache.ldap.common.aci.AuthenticationLevel;
-import org.apache.ldap.common.name.LdapName;
+import org.apache.directory.server.core.DirectoryServiceConfiguration;
+import org.apache.directory.server.core.configuration.AuthenticatorConfiguration;
+import org.apache.directory.server.core.jndi.ServerContext;
+import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
+import org.apache.directory.shared.ldap.name.LdapName;
 
 
 /**

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AnonymousAuthenticator.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authn/AnonymousAuthenticator.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AnonymousAuthenticator.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AnonymousAuthenticator.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authn/AnonymousAuthenticator.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authn/AnonymousAuthenticator.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AnonymousAuthenticator.java Tue Feb  7 16:10:02 2006
@@ -14,12 +14,12 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authn;
+package org.apache.directory.server.core.authn;
 
 import javax.naming.NamingException;
 
-import org.apache.ldap.common.exception.LdapNoPermissionException;
-import org.apache.ldap.server.jndi.ServerContext;
+import org.apache.directory.server.core.jndi.ServerContext;
+import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
 
 /**
  * An {@link Authenticator} that handles anonymous connections

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authn/AuthenticationService.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authn/AuthenticationService.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authn/AuthenticationService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authn;
+package org.apache.directory.server.core.authn;
 
 
 import java.util.ArrayList;
@@ -32,18 +32,18 @@
 import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchControls;
 
-import org.apache.ldap.common.exception.LdapAuthenticationException;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.common.util.AttributeUtils;
-import org.apache.ldap.server.DirectoryServiceConfiguration;
-import org.apache.ldap.server.configuration.AuthenticatorConfiguration;
-import org.apache.ldap.server.configuration.InterceptorConfiguration;
-import org.apache.ldap.server.interceptor.BaseInterceptor;
-import org.apache.ldap.server.interceptor.Interceptor;
-import org.apache.ldap.server.interceptor.NextInterceptor;
-import org.apache.ldap.server.invocation.InvocationStack;
-import org.apache.ldap.server.jndi.LdapJndiProperties;
-import org.apache.ldap.server.jndi.ServerContext;
+import org.apache.directory.server.core.DirectoryServiceConfiguration;
+import org.apache.directory.server.core.configuration.AuthenticatorConfiguration;
+import org.apache.directory.server.core.configuration.InterceptorConfiguration;
+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.invocation.InvocationStack;
+import org.apache.directory.server.core.jndi.LdapJndiProperties;
+import org.apache.directory.server.core.jndi.ServerContext;
+import org.apache.directory.shared.ldap.exception.LdapAuthenticationException;
+import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.util.AttributeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authn/Authenticator.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authn/Authenticator.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authn/Authenticator.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java Tue Feb  7 16:10:02 2006
@@ -14,16 +14,16 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authn;
+package org.apache.directory.server.core.authn;
 
 
 import javax.naming.Context;
 import javax.naming.NamingException;
 
-import org.apache.ldap.server.DirectoryServiceConfiguration;
-import org.apache.ldap.server.configuration.AuthenticatorConfiguration;
-import org.apache.ldap.server.jndi.ServerContext;
-import org.apache.ldap.server.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.DirectoryServiceConfiguration;
+import org.apache.directory.server.core.configuration.AuthenticatorConfiguration;
+import org.apache.directory.server.core.jndi.ServerContext;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
 
 
 /**

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/LdapPrincipal.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authn/LdapPrincipal.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/LdapPrincipal.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/LdapPrincipal.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authn/LdapPrincipal.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authn/LdapPrincipal.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/LdapPrincipal.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authn;
+package org.apache.directory.server.core.authn;
 
 
 import java.io.Serializable;
@@ -22,8 +22,8 @@
 
 import javax.naming.Name;
 
-import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.common.aci.AuthenticationLevel;
+import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
+import org.apache.directory.shared.ldap.name.LdapName;
 
 
 /**

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authn/SimpleAuthenticator.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authn/SimpleAuthenticator.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authn/SimpleAuthenticator.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authn;
+package org.apache.directory.server.core.authn;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -28,15 +28,15 @@
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 
-import org.apache.ldap.common.aci.AuthenticationLevel;
-import org.apache.ldap.common.exception.LdapAuthenticationException;
-import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.common.util.ArrayUtils;
-import org.apache.ldap.common.util.Base64;
-import org.apache.ldap.server.invocation.Invocation;
-import org.apache.ldap.server.invocation.InvocationStack;
-import org.apache.ldap.server.jndi.ServerContext;
-import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.invocation.Invocation;
+import org.apache.directory.server.core.invocation.InvocationStack;
+import org.apache.directory.server.core.jndi.ServerContext;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
+import org.apache.directory.shared.ldap.exception.LdapAuthenticationException;
+import org.apache.directory.shared.ldap.name.LdapName;
+import org.apache.directory.shared.ldap.util.ArrayUtils;
+import org.apache.directory.shared.ldap.util.Base64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java (from r375660, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/AuthorizationService.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/AuthorizationService.java&r1=375660&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/AuthorizationService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java Tue Feb  7 16:10:02 2006
@@ -14,33 +14,35 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authz;
+package org.apache.directory.server.core.authz;
 
 
-import org.apache.ldap.server.DirectoryServiceConfiguration;
-import org.apache.ldap.server.enumeration.SearchResultFilter;
-import org.apache.ldap.server.enumeration.SearchResultFilteringEnumeration;
-import org.apache.ldap.server.interceptor.BaseInterceptor;
-import org.apache.ldap.server.interceptor.NextInterceptor;
-import org.apache.ldap.server.interceptor.InterceptorChain;
-import org.apache.ldap.server.jndi.ServerContext;
-import org.apache.ldap.server.jndi.ServerLdapContext;
-import org.apache.ldap.server.configuration.InterceptorConfiguration;
-import org.apache.ldap.server.partition.DirectoryPartitionNexus;
-import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
-import org.apache.ldap.server.authz.support.ACDFEngine;
-import org.apache.ldap.server.invocation.InvocationStack;
-import org.apache.ldap.server.invocation.Invocation;
-import org.apache.ldap.server.authn.LdapPrincipal;
-import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
-import org.apache.ldap.server.schema.AttributeTypeRegistry;
-import org.apache.ldap.server.subtree.SubentryService;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.common.aci.*;
-import org.apache.ldap.common.exception.LdapNamingException;
-import org.apache.ldap.common.message.ResultCodeEnum;
-import org.apache.ldap.common.name.DnParser;
-import org.apache.ldap.common.name.LdapName;
+import org.apache.directory.server.core.DirectoryServiceConfiguration;
+import org.apache.directory.server.core.authn.LdapPrincipal;
+import org.apache.directory.server.core.authz.support.ACDFEngine;
+import org.apache.directory.server.core.configuration.InterceptorConfiguration;
+import org.apache.directory.server.core.enumeration.SearchResultFilter;
+import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration;
+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.invocation.Invocation;
+import org.apache.directory.server.core.invocation.InvocationStack;
+import org.apache.directory.server.core.jndi.ServerContext;
+import org.apache.directory.server.core.jndi.ServerLdapContext;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.schema.AttributeTypeRegistry;
+import org.apache.directory.server.core.schema.ConcreteNameComponentNormalizer;
+import org.apache.directory.server.core.subtree.SubentryService;
+import org.apache.directory.shared.ldap.aci.ACIItem;
+import org.apache.directory.shared.ldap.aci.ACIItemParser;
+import org.apache.directory.shared.ldap.aci.MicroOperation;
+import org.apache.directory.shared.ldap.exception.LdapNamingException;
+import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.name.DnParser;
+import org.apache.directory.shared.ldap.name.LdapName;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java (from r375660, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/GroupCache.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/GroupCache.java&r1=375660&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/GroupCache.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java Tue Feb  7 16:10:02 2006
@@ -14,16 +14,16 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authz;
+package org.apache.directory.server.core.authz;
 
 
-import org.apache.ldap.common.name.DnParser;
-import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.common.filter.SimpleNode;
-import org.apache.ldap.common.filter.BranchNode;
-import org.apache.ldap.server.DirectoryServiceConfiguration;
-import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
-import org.apache.ldap.server.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.DirectoryServiceConfiguration;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.schema.ConcreteNameComponentNormalizer;
+import org.apache.directory.shared.ldap.filter.BranchNode;
+import org.apache.directory.shared.ldap.filter.SimpleNode;
+import org.apache.directory.shared.ldap.name.DnParser;
+import org.apache.directory.shared.ldap.name.LdapName;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/OldAuthorizationService.java (from r375660, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/OldAuthorizationService.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/OldAuthorizationService.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/OldAuthorizationService.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/OldAuthorizationService.java&r1=375660&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/OldAuthorizationService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/OldAuthorizationService.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authz;
+package org.apache.directory.server.core.authz;
 
 
 import java.util.Map;
@@ -29,22 +29,22 @@
 import javax.naming.directory.SearchResult;
 import javax.naming.ldap.LdapContext;
 
-import org.apache.ldap.common.exception.LdapNoPermissionException;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.common.name.DnParser;
-import org.apache.ldap.server.DirectoryServiceConfiguration;
-import org.apache.ldap.server.configuration.InterceptorConfiguration;
-import org.apache.ldap.server.enumeration.SearchResultFilteringEnumeration;
-import org.apache.ldap.server.enumeration.SearchResultFilter;
-import org.apache.ldap.server.interceptor.BaseInterceptor;
-import org.apache.ldap.server.interceptor.Interceptor;
-import org.apache.ldap.server.interceptor.NextInterceptor;
-import org.apache.ldap.server.invocation.InvocationStack;
-import org.apache.ldap.server.invocation.Invocation;
-import org.apache.ldap.server.jndi.ServerContext;
-import org.apache.ldap.server.partition.DirectoryPartitionNexus;
-import org.apache.ldap.server.schema.AttributeTypeRegistry;
-import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
+import org.apache.directory.server.core.DirectoryServiceConfiguration;
+import org.apache.directory.server.core.configuration.InterceptorConfiguration;
+import org.apache.directory.server.core.enumeration.SearchResultFilter;
+import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration;
+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.invocation.Invocation;
+import org.apache.directory.server.core.invocation.InvocationStack;
+import org.apache.directory.server.core.jndi.ServerContext;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.schema.AttributeTypeRegistry;
+import org.apache.directory.server.core.schema.ConcreteNameComponentNormalizer;
+import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
+import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.name.DnParser;
 
 
 /**

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/OldAuthorizationService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java (from r375660, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/TupleCache.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/TupleCache.java&r1=375660&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/TupleCache.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authz;
+package org.apache.directory.server.core.authz;
 
 
 import java.text.ParseException;
@@ -29,19 +29,19 @@
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 
-import org.apache.ldap.common.aci.ACIItem;
-import org.apache.ldap.common.aci.ACIItemParser;
-import org.apache.ldap.common.exception.LdapSchemaViolationException;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.common.filter.SimpleNode;
-import org.apache.ldap.common.message.ResultCodeEnum;
-import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.common.name.NameComponentNormalizer;
-import org.apache.ldap.common.name.DnParser;
-import org.apache.ldap.server.DirectoryServiceConfiguration;
-import org.apache.ldap.server.partition.DirectoryPartitionNexus;
-import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
-import org.apache.ldap.server.schema.AttributeTypeRegistry;
+import org.apache.directory.server.core.DirectoryServiceConfiguration;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.schema.AttributeTypeRegistry;
+import org.apache.directory.server.core.schema.ConcreteNameComponentNormalizer;
+import org.apache.directory.shared.ldap.aci.ACIItem;
+import org.apache.directory.shared.ldap.aci.ACIItemParser;
+import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
+import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.filter.SimpleNode;
+import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.name.DnParser;
+import org.apache.directory.shared.ldap.name.LdapName;
+import org.apache.directory.shared.ldap.name.NameComponentNormalizer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/ACDFEngine.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/ACDFEngine.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/ACDFEngine.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java Tue Feb  7 16:10:02 2006
@@ -16,7 +16,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authz.support;
+package org.apache.directory.server.core.authz.support;
 
 import java.util.*;
 
@@ -24,19 +24,19 @@
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 
-import org.apache.ldap.common.aci.ACIItem;
-import org.apache.ldap.common.aci.ACITuple;
-import org.apache.ldap.common.aci.AuthenticationLevel;
-import org.apache.ldap.common.aci.MicroOperation;
-import org.apache.ldap.common.exception.LdapNoPermissionException;
-import org.apache.ldap.server.event.Evaluator;
-import org.apache.ldap.server.event.ExpressionEvaluator;
-import org.apache.ldap.server.schema.AttributeTypeRegistry;
-import org.apache.ldap.server.schema.OidRegistry;
-import org.apache.ldap.server.subtree.RefinementEvaluator;
-import org.apache.ldap.server.subtree.RefinementLeafEvaluator;
-import org.apache.ldap.server.subtree.SubtreeEvaluator;
-import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.event.Evaluator;
+import org.apache.directory.server.core.event.ExpressionEvaluator;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.schema.AttributeTypeRegistry;
+import org.apache.directory.server.core.schema.OidRegistry;
+import org.apache.directory.server.core.subtree.RefinementEvaluator;
+import org.apache.directory.server.core.subtree.RefinementLeafEvaluator;
+import org.apache.directory.server.core.subtree.SubtreeEvaluator;
+import org.apache.directory.shared.ldap.aci.ACIItem;
+import org.apache.directory.shared.ldap.aci.ACITuple;
+import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
+import org.apache.directory.shared.ldap.aci.MicroOperation;
+import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
 
 
 /**

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/ACITupleFilter.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/ACITupleFilter.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/ACITupleFilter.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java Tue Feb  7 16:10:02 2006
@@ -16,7 +16,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authz.support;
+package org.apache.directory.server.core.authz.support;
 
 import java.util.Collection;
 
@@ -24,9 +24,9 @@
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 
-import org.apache.ldap.common.aci.AuthenticationLevel;
-import org.apache.ldap.common.aci.MicroOperation;
-import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
+import org.apache.directory.shared.ldap.aci.MicroOperation;
 
 
 /**

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/HighestPrecedenceFilter.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/HighestPrecedenceFilter.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/HighestPrecedenceFilter.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java Tue Feb  7 16:10:02 2006
@@ -16,7 +16,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authz.support;
+package org.apache.directory.server.core.authz.support;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -25,9 +25,9 @@
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 
-import org.apache.ldap.common.aci.ACITuple;
-import org.apache.ldap.common.aci.AuthenticationLevel;
-import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.shared.ldap.aci.ACITuple;
+import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
 
 
 /**

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/MaxImmSubFilter.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/MaxImmSubFilter.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/MaxImmSubFilter.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java Tue Feb  7 16:10:02 2006
@@ -16,7 +16,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authz.support;
+package org.apache.directory.server.core.authz.support;
 
 import java.util.*;
 
@@ -26,12 +26,12 @@
 import javax.naming.directory.Attributes;
 import javax.naming.directory.SearchControls;
 
-import org.apache.ldap.common.aci.ACITuple;
-import org.apache.ldap.common.aci.AuthenticationLevel;
-import org.apache.ldap.common.aci.ProtectedItem;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.common.filter.PresenceNode;
-import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.shared.ldap.aci.ACITuple;
+import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
+import org.apache.directory.shared.ldap.aci.ProtectedItem;
+import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.filter.PresenceNode;
 
 
 /**

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/MaxValueCountFilter.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/MaxValueCountFilter.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/MaxValueCountFilter.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java Tue Feb  7 16:10:02 2006
@@ -16,7 +16,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authz.support;
+package org.apache.directory.server.core.authz.support;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -26,11 +26,11 @@
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 
-import org.apache.ldap.common.aci.ACITuple;
-import org.apache.ldap.common.aci.AuthenticationLevel;
-import org.apache.ldap.common.aci.ProtectedItem;
-import org.apache.ldap.common.aci.ProtectedItem.MaxValueCountItem;
-import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.shared.ldap.aci.ACITuple;
+import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
+import org.apache.directory.shared.ldap.aci.ProtectedItem;
+import org.apache.directory.shared.ldap.aci.ProtectedItem.MaxValueCountItem;
 
 
 /**

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/MicroOperationFilter.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/MicroOperationFilter.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/MicroOperationFilter.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java Tue Feb  7 16:10:02 2006
@@ -16,7 +16,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authz.support;
+package org.apache.directory.server.core.authz.support;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -25,10 +25,10 @@
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 
-import org.apache.ldap.common.aci.ACITuple;
-import org.apache.ldap.common.aci.AuthenticationLevel;
-import org.apache.ldap.common.aci.MicroOperation;
-import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.shared.ldap.aci.ACITuple;
+import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
+import org.apache.directory.shared.ldap.aci.MicroOperation;
 
 
 /**

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/MostSpecificProtectedItemFilter.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/MostSpecificProtectedItemFilter.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/MostSpecificProtectedItemFilter.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java Tue Feb  7 16:10:02 2006
@@ -16,7 +16,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authz.support;
+package org.apache.directory.server.core.authz.support;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -26,10 +26,10 @@
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 
-import org.apache.ldap.common.aci.ACITuple;
-import org.apache.ldap.common.aci.AuthenticationLevel;
-import org.apache.ldap.common.aci.ProtectedItem;
-import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.shared.ldap.aci.ACITuple;
+import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
+import org.apache.directory.shared.ldap.aci.ProtectedItem;
 
 
 /**

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/MostSpecificUserClassFilter.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/MostSpecificUserClassFilter.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/MostSpecificUserClassFilter.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java Tue Feb  7 16:10:02 2006
@@ -16,7 +16,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authz.support;
+package org.apache.directory.server.core.authz.support;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -26,10 +26,10 @@
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 
-import org.apache.ldap.common.aci.ACITuple;
-import org.apache.ldap.common.aci.AuthenticationLevel;
-import org.apache.ldap.common.aci.UserClass;
-import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.shared.ldap.aci.ACITuple;
+import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
+import org.apache.directory.shared.ldap.aci.UserClass;
 
 
 /**

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/OperationScope.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/OperationScope.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/OperationScope.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/OperationScope.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/OperationScope.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/OperationScope.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/OperationScope.java Tue Feb  7 16:10:02 2006
@@ -16,7 +16,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authz.support;
+package org.apache.directory.server.core.authz.support;
 
 /**
  * An enumeration that represents the scope of user operation.

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilter.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilter.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilter.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java Tue Feb  7 16:10:02 2006
@@ -16,7 +16,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authz.support;
+package org.apache.directory.server.core.authz.support;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -26,14 +26,14 @@
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 
-import org.apache.ldap.common.aci.ACITuple;
-import org.apache.ldap.common.aci.AuthenticationLevel;
-import org.apache.ldap.common.aci.ProtectedItem;
-import org.apache.ldap.common.aci.ProtectedItem.MaxValueCountItem;
-import org.apache.ldap.common.aci.ProtectedItem.RestrictedByItem;
-import org.apache.ldap.server.event.Evaluator;
-import org.apache.ldap.server.subtree.RefinementEvaluator;
-import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.event.Evaluator;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.subtree.RefinementEvaluator;
+import org.apache.directory.shared.ldap.aci.ACITuple;
+import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
+import org.apache.directory.shared.ldap.aci.ProtectedItem;
+import org.apache.directory.shared.ldap.aci.ProtectedItem.MaxValueCountItem;
+import org.apache.directory.shared.ldap.aci.ProtectedItem.RestrictedByItem;
 
 
 /**

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/RelatedUserClassFilter.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/RelatedUserClassFilter.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/RelatedUserClassFilter.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java Tue Feb  7 16:10:02 2006
@@ -16,7 +16,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authz.support;
+package org.apache.directory.server.core.authz.support;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -25,13 +25,13 @@
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 
-import org.apache.ldap.common.aci.ACITuple;
-import org.apache.ldap.common.aci.AuthenticationLevel;
-import org.apache.ldap.common.aci.UserClass;
-import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.common.subtree.SubtreeSpecification;
-import org.apache.ldap.server.subtree.SubtreeEvaluator;
-import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.subtree.SubtreeEvaluator;
+import org.apache.directory.shared.ldap.aci.ACITuple;
+import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
+import org.apache.directory.shared.ldap.aci.UserClass;
+import org.apache.directory.shared.ldap.name.LdapName;
+import org.apache.directory.shared.ldap.subtree.SubtreeSpecification;
 
 
 /**

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/RestrictedByFilter.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/RestrictedByFilter.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/authz/support/RestrictedByFilter.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java Tue Feb  7 16:10:02 2006
@@ -16,7 +16,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authz.support;
+package org.apache.directory.server.core.authz.support;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -26,11 +26,11 @@
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 
-import org.apache.ldap.common.aci.ACITuple;
-import org.apache.ldap.common.aci.AuthenticationLevel;
-import org.apache.ldap.common.aci.ProtectedItem;
-import org.apache.ldap.common.aci.ProtectedItem.RestrictedByItem;
-import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.shared.ldap.aci.ACITuple;
+import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
+import org.apache.directory.shared.ldap.aci.ProtectedItem;
+import org.apache.directory.shared.ldap.aci.ProtectedItem.RestrictedByItem;
 
 
 /**

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/collective/CollectiveAttributeService.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/collective/CollectiveAttributeService.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/collective/CollectiveAttributeService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java Tue Feb  7 16:10:02 2006
@@ -14,24 +14,24 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.collective;
+package org.apache.directory.server.core.collective;
 
 
-import org.apache.ldap.server.DirectoryServiceConfiguration;
-import org.apache.ldap.server.interceptor.BaseInterceptor;
-import org.apache.ldap.server.interceptor.NextInterceptor;
-import org.apache.ldap.server.configuration.InterceptorConfiguration;
-import org.apache.ldap.server.partition.DirectoryPartitionNexus;
-import org.apache.ldap.server.schema.AttributeTypeRegistry;
-import org.apache.ldap.server.subtree.SubentryService;
-import org.apache.ldap.server.invocation.InvocationStack;
-import org.apache.ldap.server.invocation.Invocation;
-import org.apache.ldap.server.enumeration.SearchResultFilteringEnumeration;
-import org.apache.ldap.server.enumeration.SearchResultFilter;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.common.schema.AttributeType;
-import org.apache.ldap.common.message.LockableAttributeImpl;
+import org.apache.directory.server.core.DirectoryServiceConfiguration;
+import org.apache.directory.server.core.configuration.InterceptorConfiguration;
+import org.apache.directory.server.core.enumeration.SearchResultFilter;
+import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration;
+import org.apache.directory.server.core.interceptor.BaseInterceptor;
+import org.apache.directory.server.core.interceptor.NextInterceptor;
+import org.apache.directory.server.core.invocation.Invocation;
+import org.apache.directory.server.core.invocation.InvocationStack;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.schema.AttributeTypeRegistry;
+import org.apache.directory.server.core.subtree.SubentryService;
+import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.name.LdapName;
+import org.apache.directory.shared.ldap.schema.AttributeType;
 
 import javax.naming.NamingException;
 import javax.naming.NamingEnumeration;

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/AddDirectoryPartitionConfiguration.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/AddDirectoryPartitionConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/AddDirectoryPartitionConfiguration.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/AddDirectoryPartitionConfiguration.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/AddDirectoryPartitionConfiguration.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/AddDirectoryPartitionConfiguration.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/AddDirectoryPartitionConfiguration.java Tue Feb  7 16:10:02 2006
@@ -16,10 +16,10 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.configuration;
+package org.apache.directory.server.core.configuration;
 
-import org.apache.ldap.server.partition.DirectoryPartition;
-import org.apache.ldap.server.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.DirectoryPartition;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
 
 /**
  * A {@link Configuration} that adds a new {@link DirectoryPartition} to

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/AttributesPropertyEditor.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/AttributesPropertyEditor.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/AttributesPropertyEditor.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java Tue Feb  7 16:10:02 2006
@@ -16,7 +16,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.configuration;
+package org.apache.directory.server.core.configuration;
 
 import java.beans.PropertyEditor;
 import java.beans.PropertyEditorSupport;
@@ -31,12 +31,12 @@
 import javax.naming.directory.BasicAttributes;
 
 import org.apache.commons.collections.MultiHashMap;
-import org.apache.ldap.common.ldif.LdifComposer;
-import org.apache.ldap.common.ldif.LdifComposerImpl;
-import org.apache.ldap.common.ldif.LdifParser;
-import org.apache.ldap.common.ldif.LdifParserImpl;
-import org.apache.ldap.common.util.MultiMap;
-import org.apache.ldap.server.DirectoryService;
+import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.shared.ldap.ldif.LdifComposer;
+import org.apache.directory.shared.ldap.ldif.LdifComposerImpl;
+import org.apache.directory.shared.ldap.ldif.LdifParser;
+import org.apache.directory.shared.ldap.ldif.LdifParserImpl;
+import org.apache.directory.shared.ldap.util.MultiMap;
 
 /**
  * A JavaBeans {@link PropertyEditor} that can convert {@link Attributes}

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/AuthenticatorConfiguration.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/AuthenticatorConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/AuthenticatorConfiguration.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/AuthenticatorConfiguration.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/AuthenticatorConfiguration.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/AuthenticatorConfiguration.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/AuthenticatorConfiguration.java Tue Feb  7 16:10:02 2006
@@ -16,9 +16,9 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.configuration;
+package org.apache.directory.server.core.configuration;
 
-import org.apache.ldap.server.authn.Authenticator;
+import org.apache.directory.server.core.authn.Authenticator;
 
 /**
  * A configuration for {@link Authenticator}.

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/Configuration.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/Configuration.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/Configuration.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/Configuration.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/Configuration.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/Configuration.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/Configuration.java Tue Feb  7 16:10:02 2006
@@ -16,12 +16,12 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.configuration;
+package org.apache.directory.server.core.configuration;
 
 import java.io.Serializable;
 import java.util.Hashtable;
 
-import org.apache.ldap.server.DirectoryService;
+import org.apache.directory.server.core.DirectoryService;
 
 /**
  * A configuration that provides required, optional, or default properties

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/ConfigurationException.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationException.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/ConfigurationException.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/ConfigurationException.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationException.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationException.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/ConfigurationException.java Tue Feb  7 16:10:02 2006
@@ -16,7 +16,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.configuration;
+package org.apache.directory.server.core.configuration;
 
 /**
  * A {@link RuntimeException} that is thrown when configuration is not valid.

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/ConfigurationUtil.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationUtil.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/ConfigurationUtil.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/ConfigurationUtil.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationUtil.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationUtil.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/ConfigurationUtil.java Tue Feb  7 16:10:02 2006
@@ -16,7 +16,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.configuration;
+package org.apache.directory.server.core.configuration;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -33,7 +33,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-class ConfigurationUtil
+public class ConfigurationUtil
 {
     /**
      * Checks all elements of the specified set is of the specified type,
@@ -41,7 +41,7 @@
      * 
      * @throws ConfigurationException if the specified set has an element of wrong type
      */
-    static Set getTypeSafeSet( Set set, Class type )
+    public static Set getTypeSafeSet( Set set, Class type )
     {
         Set newSet = new HashSet();
         getTypeSafeCollection( set, type, newSet );
@@ -54,14 +54,14 @@
      * 
      * @throws ConfigurationException if the specified set has an element of wrong type
      */
-    static List getTypeSafeList( List list, Class type )
+    public static List getTypeSafeList( List list, Class type )
     {
         List newList = new ArrayList();
         getTypeSafeCollection( list, type, newList );
         return newList;
     }
 
-    private static void getTypeSafeCollection( Collection collection, Class type, Collection newCollection )
+    public static void getTypeSafeCollection( Collection collection, Class type, Collection newCollection )
     {
         Iterator i = collection.iterator();
         while( i.hasNext() )
@@ -80,7 +80,7 @@
     /**
      * Returns the clone of the specified set.
      */
-    static Set getClonedSet( Set set )
+    public static Set getClonedSet( Set set )
     {
         Set newSet = new HashSet();
         newSet.addAll( set );
@@ -90,7 +90,7 @@
     /**
      * Returns the clone of the specified list.
      */
-    static List getClonedList( List list )
+    public static List getClonedList( List list )
     {
         List newList = new ArrayList();
         newList.addAll( list );
@@ -100,7 +100,7 @@
     /**
      * Returns the deep clone of the specified {@link Attributes} list.
      */
-    static List getClonedAttributesList( List list )
+    public static List getClonedAttributesList( List list )
     {
         List newList = new ArrayList();
         Iterator i = list.iterator();
@@ -115,7 +115,7 @@
      * Throws a {@link ConfigurationException} if the specified port number
      * is out of range.
      */
-    static void validatePortNumber( int port )
+    public static void validatePortNumber( int port )
     {
         if( port < 0 || port > 65535 )
         {

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfiguration.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/DirectoryPartitionConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfiguration.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfiguration.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/DirectoryPartitionConfiguration.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/DirectoryPartitionConfiguration.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfiguration.java Tue Feb  7 16:10:02 2006
@@ -16,7 +16,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.configuration;
+package org.apache.directory.server.core.configuration;
 
 
 import java.util.HashSet;
@@ -28,12 +28,12 @@
 import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttributes;
 
-import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.common.schema.Normalizer;
-import org.apache.ldap.server.partition.DirectoryPartition;
-import org.apache.ldap.server.partition.Oid;
-import org.apache.ldap.server.partition.impl.btree.jdbm.JdbmDirectoryPartition;
-import org.apache.ldap.server.schema.MatchingRuleRegistry;
+import org.apache.directory.server.core.partition.DirectoryPartition;
+import org.apache.directory.server.core.partition.Oid;
+import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmDirectoryPartition;
+import org.apache.directory.server.core.schema.MatchingRuleRegistry;
+import org.apache.directory.shared.ldap.name.LdapName;
+import org.apache.directory.shared.ldap.schema.Normalizer;
 
 
 /**

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/InterceptorConfiguration.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/InterceptorConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/InterceptorConfiguration.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/InterceptorConfiguration.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/InterceptorConfiguration.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/InterceptorConfiguration.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/InterceptorConfiguration.java Tue Feb  7 16:10:02 2006
@@ -16,9 +16,9 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.configuration;
+package org.apache.directory.server.core.configuration;
 
-import org.apache.ldap.server.interceptor.Interceptor;
+import org.apache.directory.server.core.interceptor.Interceptor;
 
 /**
  * A configuration for {@link Interceptor}.

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableAuthenticatorConfiguration.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/MutableAuthenticatorConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableAuthenticatorConfiguration.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableAuthenticatorConfiguration.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/MutableAuthenticatorConfiguration.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/MutableAuthenticatorConfiguration.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableAuthenticatorConfiguration.java Tue Feb  7 16:10:02 2006
@@ -16,9 +16,9 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.configuration;
+package org.apache.directory.server.core.configuration;
 
-import org.apache.ldap.server.authn.Authenticator;
+import org.apache.directory.server.core.authn.Authenticator;
 
 /**
  * A mutable version of {@link AuthenticatorConfiguration}.

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableDirectoryPartitionConfiguration.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/MutableDirectoryPartitionConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableDirectoryPartitionConfiguration.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableDirectoryPartitionConfiguration.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/MutableDirectoryPartitionConfiguration.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/MutableDirectoryPartitionConfiguration.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableDirectoryPartitionConfiguration.java Tue Feb  7 16:10:02 2006
@@ -16,13 +16,13 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.configuration;
+package org.apache.directory.server.core.configuration;
 
 import java.util.Set;
 
 import javax.naming.directory.Attributes;
 
-import org.apache.ldap.server.partition.DirectoryPartition;
+import org.apache.directory.server.core.partition.DirectoryPartition;
 
 /**
  * A mutable version of {@link DirectoryPartitionConfiguration}.

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableInterceptorConfiguration.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/MutableInterceptorConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableInterceptorConfiguration.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableInterceptorConfiguration.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/MutableInterceptorConfiguration.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/MutableInterceptorConfiguration.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableInterceptorConfiguration.java Tue Feb  7 16:10:02 2006
@@ -16,9 +16,9 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.configuration;
+package org.apache.directory.server.core.configuration;
 
-import org.apache.ldap.server.interceptor.Interceptor;
+import org.apache.directory.server.core.interceptor.Interceptor;
 
 /**
  * A mutable version of {@link InterceptorConfiguration}.

Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableStartupConfiguration.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/MutableStartupConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableStartupConfiguration.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableStartupConfiguration.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/MutableStartupConfiguration.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/MutableStartupConfiguration.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableStartupConfiguration.java Tue Feb  7 16:10:02 2006
@@ -16,14 +16,14 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.configuration;
+package org.apache.directory.server.core.configuration;
 
 
 import java.io.File;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.ldap.server.DirectoryService;
+import org.apache.directory.server.core.DirectoryService;
 
 
 /**



Mime
View raw message