directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r375785 [2/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

Modified: directory/trunks/apacheds/core-plugin/src/main/antlr/openldap.g
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-plugin/src/main/antlr/openldap.g?rev=375785&r1=375784&r2=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-plugin/src/main/antlr/openldap.g (original)
+++ directory/trunks/apacheds/core-plugin/src/main/antlr/openldap.g Tue Feb  7 16:10:02 2006
@@ -30,10 +30,10 @@
  * Keep the semicolon right next to the package name or else there will be a
  * bug that comes into the foreground in the new antlr release.
  */
-package org.apache.ldap.server.tools.schema;
+package org.apache.directory.server.core.tools.schema;
 
 import java.util.* ;
-import org.apache.ldap.common.schema.*;
+import org.apache.directory.shared.ldap.schema.*;
 
 }
 

Copied: directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/AttributeTypeLiteral.java (from r375781, directory/trunks/apacheds/core-plugin/src/main/java/org/apache/ldap/server/tools/schema/AttributeTypeLiteral.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/AttributeTypeLiteral.java?p2=directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/AttributeTypeLiteral.java&p1=directory/trunks/apacheds/core-plugin/src/main/java/org/apache/ldap/server/tools/schema/AttributeTypeLiteral.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-plugin/src/main/java/org/apache/ldap/server/tools/schema/AttributeTypeLiteral.java (original)
+++ directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/AttributeTypeLiteral.java Tue Feb  7 16:10:02 2006
@@ -14,11 +14,11 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.tools.schema;
+package org.apache.directory.server.core.tools.schema;
 
 
-import org.apache.ldap.common.util.ArrayUtils;
-import org.apache.ldap.common.schema.UsageEnum;
+import org.apache.directory.shared.ldap.schema.UsageEnum;
+import org.apache.directory.shared.ldap.util.ArrayUtils;
 
 
 /**

Copied: directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java (from r375781, directory/trunks/apacheds/core-plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaToolMojo.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java?p2=directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java&p1=directory/trunks/apacheds/core-plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaToolMojo.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaToolMojo.java (original)
+++ directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.tools.schema;
+package org.apache.directory.server.core.tools.schema;
 
 
 import java.io.File;
@@ -28,9 +28,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ldap.server.schema.bootstrap.AbstractBootstrapSchema;
-import org.apache.ldap.server.schema.bootstrap.BootstrapSchema;
-import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum;
+import org.apache.directory.server.core.schema.bootstrap.AbstractBootstrapSchema;
+import org.apache.directory.server.core.schema.bootstrap.BootstrapSchema;
+import org.apache.directory.server.core.schema.bootstrap.ProducerTypeEnum;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
@@ -63,7 +63,7 @@
     
     /**
      * The default package to use for generated schema classes.
-     * @parameter expression="org.apache.ldap.server.schema.bootstrap"
+     * @parameter expression="org.apache.directory.server.core.schema.bootstrap"
      */
     private String defaultPackage;
 

Copied: directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/ObjectClassLiteral.java (from r375781, directory/trunks/apacheds/core-plugin/src/main/java/org/apache/ldap/server/tools/schema/ObjectClassLiteral.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/ObjectClassLiteral.java?p2=directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/ObjectClassLiteral.java&p1=directory/trunks/apacheds/core-plugin/src/main/java/org/apache/ldap/server/tools/schema/ObjectClassLiteral.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-plugin/src/main/java/org/apache/ldap/server/tools/schema/ObjectClassLiteral.java (original)
+++ directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/ObjectClassLiteral.java Tue Feb  7 16:10:02 2006
@@ -14,11 +14,11 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.tools.schema;
+package org.apache.directory.server.core.tools.schema;
 
 
-import org.apache.ldap.common.util.ArrayUtils;
-import org.apache.ldap.common.schema.ObjectClassTypeEnum;
+import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum;
+import org.apache.directory.shared.ldap.util.ArrayUtils;
 
 
 /**

Copied: directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/OpenLdapAttributeTypeParser.java (from r375781, directory/trunks/apacheds/core-plugin/src/main/java/org/apache/ldap/server/tools/schema/OpenLdapAttributeTypeParser.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/OpenLdapAttributeTypeParser.java?p2=directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/OpenLdapAttributeTypeParser.java&p1=directory/trunks/apacheds/core-plugin/src/main/java/org/apache/ldap/server/tools/schema/OpenLdapAttributeTypeParser.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-plugin/src/main/java/org/apache/ldap/server/tools/schema/OpenLdapAttributeTypeParser.java (original)
+++ directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/OpenLdapAttributeTypeParser.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.tools.schema;
+package org.apache.directory.server.core.tools.schema;
 
 /**
  * Document me.

Copied: directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/OpenLdapSchemaParser.java (from r375781, directory/trunks/apacheds/core-plugin/src/main/java/org/apache/ldap/server/tools/schema/OpenLdapSchemaParser.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/OpenLdapSchemaParser.java?p2=directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/OpenLdapSchemaParser.java&p1=directory/trunks/apacheds/core-plugin/src/main/java/org/apache/ldap/server/tools/schema/OpenLdapSchemaParser.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-plugin/src/main/java/org/apache/ldap/server/tools/schema/OpenLdapSchemaParser.java (original)
+++ directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/OpenLdapSchemaParser.java Tue Feb  7 16:10:02 2006
@@ -14,10 +14,12 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.tools.schema;
+package org.apache.directory.server.core.tools.schema;
 
 
-import org.apache.ldap.common.util.ExceptionUtils;
+import org.apache.directory.server.core.tools.schema.antlrOpenLdapSchemaLexer;
+import org.apache.directory.server.core.tools.schema.antlrOpenLdapSchemaParser;
+import org.apache.directory.shared.ldap.util.ExceptionUtils;
 
 import java.util.Map;
 import java.text.ParseException;

Copied: directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/ParserMonitor.java (from r375781, directory/trunks/apacheds/core-plugin/src/main/java/org/apache/ldap/server/tools/schema/ParserMonitor.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/ParserMonitor.java?p2=directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/ParserMonitor.java&p1=directory/trunks/apacheds/core-plugin/src/main/java/org/apache/ldap/server/tools/schema/ParserMonitor.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-plugin/src/main/java/org/apache/ldap/server/tools/schema/ParserMonitor.java (original)
+++ directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/ParserMonitor.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.tools.schema;
+package org.apache.directory.server.core.tools.schema;
 
 /**
  * A monitor for the OpenLdap parser.

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

Copied: directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/Schema.java (from r375781, directory/trunks/apacheds/core-plugin/src/main/java/org/apache/ldap/server/tools/schema/Schema.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/Schema.java?p2=directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/Schema.java&p1=directory/trunks/apacheds/core-plugin/src/main/java/org/apache/ldap/server/tools/schema/Schema.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-plugin/src/main/java/org/apache/ldap/server/tools/schema/Schema.java (original)
+++ directory/trunks/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/Schema.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.tools.schema;
+package org.apache.directory.server.core.tools.schema;
 
 
 public class Schema

Copied: directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/AttributeTypes.template (from r375781, directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/ldap/server/tools/schema/AttributeTypes.template)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/AttributeTypes.template?p2=directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/AttributeTypes.template&p1=directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/ldap/server/tools/schema/AttributeTypes.template&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/ldap/server/tools/schema/AttributeTypes.template (original)
+++ directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/AttributeTypes.template Tue Feb  7 16:10:02 2006
@@ -20,10 +20,10 @@
 import java.util.ArrayList;
 import javax.naming.NamingException;
 
-import org.apache.ldap.common.schema.*;
+import org.apache.directory.shared.ldap.schema.*;
 
-#if ( $package != "org.apache.ldap.server.schema.bootstrap" )
-import org.apache.ldap.server.schema.bootstrap.*;
+#if ( $package != "org.apache.directory.server.core.schema.bootstrap" )
+import org.apache.directory.server.core.schema.bootstrap.*;
 #end
 
 /**

Copied: directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/ObjectClasses.template (from r375781, directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/ldap/server/tools/schema/ObjectClasses.template)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/ObjectClasses.template?p2=directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/ObjectClasses.template&p1=directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/ldap/server/tools/schema/ObjectClasses.template&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/ldap/server/tools/schema/ObjectClasses.template (original)
+++ directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/ObjectClasses.template Tue Feb  7 16:10:02 2006
@@ -19,10 +19,10 @@
 
 import java.util.ArrayList;
 import javax.naming.NamingException;
-import org.apache.ldap.common.schema.ObjectClassTypeEnum;
+import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum;
 
-#if ( $package != "org.apache.ldap.server.schema.bootstrap" )
-import org.apache.ldap.server.schema.bootstrap.*;
+#if ( $package != "org.apache.directory.server.core.schema.bootstrap" )
+import org.apache.directory.server.core.schema.bootstrap.*;
 #end
 
 /**

Copied: directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/Schema.template (from r375781, directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/ldap/server/tools/schema/Schema.template)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/Schema.template?p2=directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/Schema.template&p1=directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/ldap/server/tools/schema/Schema.template&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/ldap/server/tools/schema/Schema.template (original)
+++ directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/Schema.template Tue Feb  7 16:10:02 2006
@@ -20,8 +20,8 @@
 import java.util.ArrayList;
 
 
-#if ( $package != "org.apache.ldap.server.schema.bootstrap" )
-import org.apache.ldap.server.schema.bootstrap.*;
+#if ( $package != "org.apache.directory.server.core.schema.bootstrap" )
+import org.apache.directory.server.core.schema.bootstrap.*;
 #end
 
 

Copied: directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/typeless.template (from r375781, directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/ldap/server/tools/schema/typeless.template)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/typeless.template?p2=directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/typeless.template&p1=directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/ldap/server/tools/schema/typeless.template&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/ldap/server/tools/schema/typeless.template (original)
+++ directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/typeless.template Tue Feb  7 16:10:02 2006
@@ -19,8 +19,8 @@
 
 import javax.naming.NamingException;
 
-#if ( $package != "org.apache.ldap.server.schema.bootstrap" )
-import org.apache.ldap.server.schema.bootstrap.*;
+#if ( $package != "org.apache.directory.server.core.schema.bootstrap" )
+import org.apache.directory.server.core.schema.bootstrap.*;
 #end
 
 

Copied: directory/trunks/apacheds/core-plugin/src/test/java/org/apache/directory/server/core/tools/schema/ConsoleParserMonitor.java (from r375781, directory/trunks/apacheds/core-plugin/src/test/java/org/apache/ldap/server/tools/schema/ConsoleParserMonitor.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-plugin/src/test/java/org/apache/directory/server/core/tools/schema/ConsoleParserMonitor.java?p2=directory/trunks/apacheds/core-plugin/src/test/java/org/apache/directory/server/core/tools/schema/ConsoleParserMonitor.java&p1=directory/trunks/apacheds/core-plugin/src/test/java/org/apache/ldap/server/tools/schema/ConsoleParserMonitor.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-plugin/src/test/java/org/apache/ldap/server/tools/schema/ConsoleParserMonitor.java (original)
+++ directory/trunks/apacheds/core-plugin/src/test/java/org/apache/directory/server/core/tools/schema/ConsoleParserMonitor.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,9 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.tools.schema;
+package org.apache.directory.server.core.tools.schema;
+
+import org.apache.directory.server.core.tools.schema.ParserMonitor;
 
 
 /**

Copied: directory/trunks/apacheds/core-plugin/src/test/java/org/apache/directory/server/core/tools/schema/OpenLdapSchemaParserTest.java (from r375781, directory/trunks/apacheds/core-plugin/src/test/java/org/apache/ldap/server/tools/schema/OpenLdapSchemaParserTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-plugin/src/test/java/org/apache/directory/server/core/tools/schema/OpenLdapSchemaParserTest.java?p2=directory/trunks/apacheds/core-plugin/src/test/java/org/apache/directory/server/core/tools/schema/OpenLdapSchemaParserTest.java&p1=directory/trunks/apacheds/core-plugin/src/test/java/org/apache/ldap/server/tools/schema/OpenLdapSchemaParserTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-plugin/src/test/java/org/apache/ldap/server/tools/schema/OpenLdapSchemaParserTest.java (original)
+++ directory/trunks/apacheds/core-plugin/src/test/java/org/apache/directory/server/core/tools/schema/OpenLdapSchemaParserTest.java Tue Feb  7 16:10:02 2006
@@ -14,15 +14,17 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.tools.schema;
+package org.apache.directory.server.core.tools.schema;
 
 
-import java.io.InputStream;
 import java.util.Map;
 
 import junit.framework.TestCase;
 
-import org.apache.ldap.common.schema.ObjectClassTypeEnum;
+import org.apache.directory.server.core.tools.schema.AttributeTypeLiteral;
+import org.apache.directory.server.core.tools.schema.ObjectClassLiteral;
+import org.apache.directory.server.core.tools.schema.OpenLdapSchemaParser;
+import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum;
 
 
 /**

Copied: directory/trunks/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapSchema.java (from r375781, directory/trunks/apacheds/core-shared/src/main/java/org/apache/ldap/server/schema/bootstrap/AbstractBootstrapSchema.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapSchema.java?p2=directory/trunks/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapSchema.java&p1=directory/trunks/apacheds/core-shared/src/main/java/org/apache/ldap/server/schema/bootstrap/AbstractBootstrapSchema.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-shared/src/main/java/org/apache/ldap/server/schema/bootstrap/AbstractBootstrapSchema.java (original)
+++ directory/trunks/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapSchema.java Tue Feb  7 16:10:02 2006
@@ -14,11 +14,11 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.schema.bootstrap;
+package org.apache.directory.server.core.schema.bootstrap;
 
 
-import org.apache.ldap.common.util.ArrayUtils;
-import org.apache.ldap.common.util.ClassUtils;
+import org.apache.directory.shared.ldap.util.ArrayUtils;
+import org.apache.directory.shared.ldap.util.ClassUtils;
 
 
 /**
@@ -32,7 +32,7 @@
     protected static final String[] DEFAULT_DEPS = ArrayUtils.EMPTY_STRING_ARRAY;
     private static final String DEFAULT_OWNER = "uid=admin,ou=system";
     private static final String DEFAULT_SCHEMA_NAME = "default";
-    private static final String DEFAULT_PACKAGE_NAME = "org.apache.ldap.server.schema.bootstrap";
+    private static final String DEFAULT_PACKAGE_NAME = AbstractBootstrapSchema.class.getPackage().getName();
 
     private final String owner;
     private final String schemaName;

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

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

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

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

Copied: directory/trunks/apacheds/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractTestCase.java (from r375781, directory/trunks/apacheds/core-unit/src/main/java/org/apache/ldap/server/unit/AbstractTestCase.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractTestCase.java?p2=directory/trunks/apacheds/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractTestCase.java&p1=directory/trunks/apacheds/core-unit/src/main/java/org/apache/ldap/server/unit/AbstractTestCase.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/main/java/org/apache/ldap/server/unit/AbstractTestCase.java (original)
+++ directory/trunks/apacheds/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractTestCase.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.unit;
+package org.apache.directory.server.core.unit;
 
 
 import java.io.File;
@@ -37,12 +37,12 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.exception.NestableRuntimeException;
-import org.apache.ldap.common.ldif.LdifIterator;
-import org.apache.ldap.common.ldif.LdifParserImpl;
-import org.apache.ldap.common.message.LockableAttributesImpl;
-import org.apache.ldap.server.configuration.Configuration;
-import org.apache.ldap.server.configuration.MutableStartupConfiguration;
-import org.apache.ldap.server.configuration.ShutdownConfiguration;
+import org.apache.directory.server.core.configuration.Configuration;
+import org.apache.directory.server.core.configuration.MutableStartupConfiguration;
+import org.apache.directory.server.core.configuration.ShutdownConfiguration;
+import org.apache.directory.shared.ldap.ldif.LdifIterator;
+import org.apache.directory.shared.ldap.ldif.LdifParserImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 
                                                                                                             
 /**
@@ -264,7 +264,7 @@
             envFinal.put( Context.PROVIDER_URL, "ou=system" );
         }
         
-        envFinal.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.CoreContextFactory" );
+        envFinal.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.directory.server.core.jndi.CoreContextFactory" );
         envFinal.putAll( overrides );
         
         // We have to initiate the first run as an admin at least.
@@ -306,7 +306,7 @@
         Hashtable env = new Hashtable();
 
         env.put( Context.PROVIDER_URL, "ou=system" );
-        env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.CoreContextFactory" );
+        env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.directory.server.core.jndi.CoreContextFactory" );
         env.putAll( new ShutdownConfiguration().toJndiEnvironment() );
         env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
         env.put( Context.SECURITY_CREDENTIALS, "secret" );

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authn/SimpleAuthenticationTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authn/SimpleAuthenticationTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authn/SimpleAuthenticationTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationTest.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.File;
@@ -31,10 +31,10 @@
 import javax.naming.directory.InitialDirContext;
 import javax.naming.ldap.InitialLdapContext;
 
-import org.apache.ldap.common.exception.LdapConfigurationException;
-import org.apache.ldap.common.exception.LdapNoPermissionException;
-import org.apache.ldap.common.util.ArrayUtils;
-import org.apache.ldap.server.unit.AbstractAdminTestCase;
+import org.apache.directory.server.core.unit.AbstractAdminTestCase;
+import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
+import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
+import org.apache.directory.shared.ldap.util.ArrayUtils;
 
 
 /**
@@ -138,7 +138,7 @@
         env.put( Context.SECURITY_PRINCIPAL, "uid=akarasulu,ou=users,ou=system" );
         env.put( Context.SECURITY_CREDENTIALS, "test" );
         env.put( Context.SECURITY_AUTHENTICATION, "simple" );
-        env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.CoreContextFactory" );
+        env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.directory.server.core.jndi.CoreContextFactory" );
         InitialDirContext ic = new InitialDirContext( env );
         Attributes attrs = ic.getAttributes( "uid=akarasulu,ou=users" );
         Attribute ou = attrs.get( "ou" );
@@ -198,7 +198,7 @@
 
         // now go in as anonymous user and we should be wh
         env.put( Context.PROVIDER_URL, "ou=system" );
-        env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.CoreContextFactory" );
+        env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.directory.server.core.jndi.CoreContextFactory" );
 
         InitialLdapContext initial = new InitialLdapContext( env, null );
 
@@ -288,7 +288,7 @@
         env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
         env.put( Context.SECURITY_CREDENTIALS, "secret" );
         env.put( Context.SECURITY_AUTHENTICATION, "simple" );
-        env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.CoreContextFactory" );
+        env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.directory.server.core.jndi.CoreContextFactory" );
         assertNotNull( new InitialContext( env ) );
     }
 
@@ -306,7 +306,7 @@
         env.put( Context.SECURITY_PRINCIPAL, "uid=akarasulu,ou=users,ou=system" );
         env.put( Context.SECURITY_CREDENTIALS, "test" );
         env.put( Context.SECURITY_AUTHENTICATION, "simple" );
-        env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.CoreContextFactory" );
+        env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.directory.server.core.jndi.CoreContextFactory" );
         assertNotNull( new InitialContext( env ) );
     }
 }

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/AbstractAuthorizationTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/AbstractAuthorizationTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/AbstractAuthorizationTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/AbstractAuthorizationTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/AbstractAuthorizationTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/AbstractAuthorizationTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/AbstractAuthorizationTest.java Tue Feb  7 16:10:02 2006
@@ -14,13 +14,13 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authz;
+package org.apache.directory.server.core.authz;
 
 
-import org.apache.ldap.server.unit.AbstractTestCase;
-import org.apache.ldap.server.partition.DirectoryPartitionNexus;
-import org.apache.ldap.server.subtree.SubentryService;
-import org.apache.ldap.common.name.LdapName;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.subtree.SubentryService;
+import org.apache.directory.server.core.unit.AbstractTestCase;
+import org.apache.directory.shared.ldap.name.LdapName;
 
 import javax.naming.directory.*;
 import javax.naming.NamingException;

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/AddAuthorizationTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/AddAuthorizationTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/AddAuthorizationTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationTest.java Tue Feb  7 16:10:02 2006
@@ -14,11 +14,11 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authz;
+package org.apache.directory.server.core.authz;
 
 
-import org.apache.ldap.common.exception.LdapNoPermissionException;
-import org.apache.ldap.common.name.LdapName;
+import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
+import org.apache.directory.shared.ldap.name.LdapName;
 
 import javax.naming.NamingException;
 import javax.naming.directory.*;

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/AuthorizationServiceAsAdminTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/AuthorizationServiceAsAdminTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/AuthorizationServiceAsAdminTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminTest.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.HashSet;
@@ -23,10 +23,10 @@
 import javax.naming.NamingException;
 import javax.naming.directory.*;
 
-import org.apache.ldap.common.exception.LdapNoPermissionException;
-import org.apache.ldap.common.message.LockableAttributesImpl;
-import org.apache.ldap.common.util.ArrayUtils;
-import org.apache.ldap.server.unit.AbstractAdminTestCase;
+import org.apache.directory.server.core.unit.AbstractAdminTestCase;
+import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
+import org.apache.directory.shared.ldap.util.ArrayUtils;
 
 
 /**

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/AuthorizationServiceAsNonAdminTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/AuthorizationServiceAsNonAdminTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/AuthorizationServiceAsNonAdminTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminTest.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.HashSet;
@@ -23,9 +23,9 @@
 import javax.naming.NamingException;
 import javax.naming.directory.*;
 
-import org.apache.ldap.common.exception.LdapNoPermissionException;
-import org.apache.ldap.common.message.LockableAttributesImpl;
-import org.apache.ldap.server.unit.AbstractNonAdminTestCase;
+import org.apache.directory.server.core.unit.AbstractNonAdminTestCase;
+import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 
 
 /**

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/CompareAuthorizationTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/CompareAuthorizationTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/CompareAuthorizationTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationTest.java Tue Feb  7 16:10:02 2006
@@ -14,12 +14,12 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authz;
+package org.apache.directory.server.core.authz;
 
 
-import org.apache.ldap.common.exception.LdapNoPermissionException;
-import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.server.jndi.ServerLdapContext;
+import org.apache.directory.server.core.jndi.ServerLdapContext;
+import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
+import org.apache.directory.shared.ldap.name.LdapName;
 
 import javax.naming.NamingException;
 import javax.naming.directory.*;

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/DeleteAuthorizationTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/DeleteAuthorizationTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/DeleteAuthorizationTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationTest.java Tue Feb  7 16:10:02 2006
@@ -14,11 +14,11 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authz;
+package org.apache.directory.server.core.authz;
 
 
-import org.apache.ldap.common.exception.LdapNoPermissionException;
-import org.apache.ldap.common.name.LdapName;
+import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
+import org.apache.directory.shared.ldap.name.LdapName;
 
 import javax.naming.NamingException;
 import javax.naming.directory.*;

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/ModifyAuthorizationTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/ModifyAuthorizationTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/ModifyAuthorizationTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationTest.java Tue Feb  7 16:10:02 2006
@@ -14,11 +14,11 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authz;
+package org.apache.directory.server.core.authz;
 
 
-import org.apache.ldap.common.exception.LdapNoPermissionException;
-import org.apache.ldap.common.name.LdapName;
+import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
+import org.apache.directory.shared.ldap.name.LdapName;
 
 import javax.naming.NamingException;
 import javax.naming.NamingEnumeration;

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/MoveRenameAuthorizationTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/MoveRenameAuthorizationTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/MoveRenameAuthorizationTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationTest.java Tue Feb  7 16:10:02 2006
@@ -14,11 +14,11 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authz;
+package org.apache.directory.server.core.authz;
 
 
-import org.apache.ldap.common.exception.LdapNoPermissionException;
-import org.apache.ldap.common.name.LdapName;
+import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
+import org.apache.directory.shared.ldap.name.LdapName;
 
 import javax.naming.NamingException;
 import javax.naming.directory.*;

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/SearchAuthorizationTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/SearchAuthorizationTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/authz/SearchAuthorizationTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationTest.java Tue Feb  7 16:10:02 2006
@@ -14,14 +14,14 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.authz;
+package org.apache.directory.server.core.authz;
 
 
-import org.apache.ldap.common.message.LockableAttributesImpl;
-import org.apache.ldap.common.message.LockableAttributeImpl;
-import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.common.exception.LdapNameNotFoundException;
-import org.apache.ldap.common.exception.LdapNoPermissionException;
+import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
+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.name.LdapName;
 
 import javax.naming.NamingException;
 import javax.naming.Name;

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/collective/CollectiveAttributeServiceTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/collective/CollectiveAttributeServiceTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/collective/CollectiveAttributeServiceTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceTest.java Tue Feb  7 16:10:02 2006
@@ -14,12 +14,12 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.collective;
+package org.apache.directory.server.core.collective;
 
 
-import org.apache.ldap.server.unit.AbstractAdminTestCase;
-import org.apache.ldap.common.message.LockableAttributeImpl;
-import org.apache.ldap.common.message.LockableAttributesImpl;
+import org.apache.directory.server.core.unit.AbstractAdminTestCase;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 
 import javax.naming.NamingException;
 import javax.naming.NamingEnumeration;

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfigurationTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/configuration/DirectoryPartitionConfigurationTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfigurationTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfigurationTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/configuration/DirectoryPartitionConfigurationTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/configuration/DirectoryPartitionConfigurationTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfigurationTest.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.configuration;
+package org.apache.directory.server.core.configuration;
 
 
 import java.util.Hashtable;
@@ -27,9 +27,12 @@
 
 import junit.framework.Assert;
 
-import org.apache.ldap.server.unit.AbstractAdminTestCase;
-import org.apache.ldap.server.jndi.CoreContextFactory;
-import org.apache.ldap.server.partition.impl.btree.jdbm.JdbmDirectoryPartition;
+import org.apache.directory.server.core.configuration.AddDirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.MutableDirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.RemoveDirectoryPartitionConfiguration;
+import org.apache.directory.server.core.jndi.CoreContextFactory;
+import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmDirectoryPartition;
+import org.apache.directory.server.core.unit.AbstractAdminTestCase;
 
 
 /**

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

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/exception/ExceptionServiceTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/exception/ExceptionServiceTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/exception/ExceptionServiceTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceTest.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.exception;
+package org.apache.directory.server.core.exception;
 
 
 import javax.naming.Context;
@@ -30,12 +30,12 @@
 import javax.naming.directory.SearchResult;
 import javax.naming.ldap.LdapContext;
 
-import org.apache.ldap.common.exception.LdapContextNotEmptyException;
-import org.apache.ldap.common.exception.LdapNameAlreadyBoundException;
-import org.apache.ldap.common.exception.LdapNameNotFoundException;
-import org.apache.ldap.common.exception.LdapNamingException;
-import org.apache.ldap.common.message.ResultCodeEnum;
-import org.apache.ldap.server.unit.AbstractAdminTestCase;
+import org.apache.directory.server.core.unit.AbstractAdminTestCase;
+import org.apache.directory.shared.ldap.exception.LdapContextNotEmptyException;
+import org.apache.directory.shared.ldap.exception.LdapNameAlreadyBoundException;
+import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
+import org.apache.directory.shared.ldap.exception.LdapNamingException;
+import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 
 
 /**

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ComparatorNPEBugTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/ComparatorNPEBugTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ComparatorNPEBugTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ComparatorNPEBugTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/ComparatorNPEBugTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/ComparatorNPEBugTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ComparatorNPEBugTest.java Tue Feb  7 16:10:02 2006
@@ -14,10 +14,10 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.jndi;
+package org.apache.directory.server.core.jndi;
 
 
-import org.apache.ldap.server.unit.AbstractAdminTestCase;
+import org.apache.directory.server.core.unit.AbstractAdminTestCase;
 
 
 /**

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

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/DestroyContextTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/DestroyContextTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/DestroyContextTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/DestroyContextTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/DestroyContextTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/DestroyContextTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/DestroyContextTest.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.jndi;
+package org.apache.directory.server.core.jndi;
 
 
 import javax.naming.NamingException;
@@ -24,8 +24,8 @@
 import javax.naming.directory.BasicAttributes;
 import javax.naming.directory.DirContext;
 
-import org.apache.ldap.common.exception.LdapNameNotFoundException;
-import org.apache.ldap.server.unit.AbstractAdminTestCase;
+import org.apache.directory.server.core.unit.AbstractAdminTestCase;
+import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
 
 
 /**

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

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ListAsAdminTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/ListAsAdminTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ListAsAdminTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ListAsAdminTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/ListAsAdminTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/ListAsAdminTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ListAsAdminTest.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.jndi;
+package org.apache.directory.server.core.jndi;
 
 
 import java.util.HashSet;
@@ -23,7 +23,7 @@
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 
-import org.apache.ldap.server.unit.AbstractAdminTestCase;
+import org.apache.directory.server.core.unit.AbstractAdminTestCase;
 
 
 /**

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ListAsNonAdminTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/ListAsNonAdminTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ListAsNonAdminTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ListAsNonAdminTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/ListAsNonAdminTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/ListAsNonAdminTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ListAsNonAdminTest.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.jndi;
+package org.apache.directory.server.core.jndi;
 
 
 import java.util.HashSet;
@@ -23,7 +23,7 @@
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 
-import org.apache.ldap.server.unit.AbstractNonAdminTestCase;
+import org.apache.directory.server.core.unit.AbstractNonAdminTestCase;
 
 
 /**

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/MixedCaseTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/MixedCaseTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/MixedCaseTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseTest.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.jndi;
+package org.apache.directory.server.core.jndi;
 
 
 import javax.naming.NamingException;
@@ -22,9 +22,9 @@
 import javax.naming.NamingEnumeration;
 import javax.naming.directory.*;
 
-import org.apache.ldap.server.unit.AbstractAdminTestCase;
-import org.apache.ldap.server.configuration.MutableDirectoryPartitionConfiguration;
-import org.apache.ldap.common.exception.LdapNameNotFoundException;
+import org.apache.directory.server.core.configuration.MutableDirectoryPartitionConfiguration;
+import org.apache.directory.server.core.unit.AbstractAdminTestCase;
+import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
 
 import java.util.HashSet;
 import java.util.Set;

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

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/ObjStateFactoryTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/ObjStateFactoryTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/ObjStateFactoryTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryTest.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.jndi;
+package org.apache.directory.server.core.jndi;
 
 
 import java.util.Hashtable;
@@ -30,8 +30,8 @@
 import javax.naming.spi.DirObjectFactory;
 import javax.naming.spi.DirStateFactory;
 
-import org.apache.ldap.server.unit.AbstractAdminTestCase;
-import org.apache.ldap.common.util.ArrayUtils;
+import org.apache.directory.server.core.unit.AbstractAdminTestCase;
+import org.apache.directory.shared.ldap.util.ArrayUtils;
 
 
 /**

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/RFC2713Tests.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/RFC2713Tests.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/RFC2713Tests.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/RFC2713Tests.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/RFC2713Tests.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/RFC2713Tests.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/RFC2713Tests.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.jndi;
+package org.apache.directory.server.core.jndi;
 
 
 import java.util.ArrayList;
@@ -22,7 +22,7 @@
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 
-import org.apache.ldap.server.unit.AbstractAdminTestCase;
+import org.apache.directory.server.core.unit.AbstractAdminTestCase;
 
 
 /**

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/ReferralTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/ReferralTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/ReferralTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralTest.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.jndi;
+package org.apache.directory.server.core.jndi;
 
 
 import java.util.HashMap;
@@ -39,10 +39,11 @@
 import javax.naming.ldap.InitialLdapContext;
 import javax.naming.ldap.LdapContext;
 
-import org.apache.ldap.common.exception.LdapNamingException;
-import org.apache.ldap.common.message.ResultCodeEnum;
-import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.server.unit.AbstractAdminTestCase;
+import org.apache.directory.server.core.jndi.ServerLdapContext;
+import org.apache.directory.server.core.unit.AbstractAdminTestCase;
+import org.apache.directory.shared.ldap.exception.LdapNamingException;
+import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.name.LdapName;
 
 
 /**

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/SearchContextTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/SearchContextTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/SearchContextTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextTest.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.jndi;
+package org.apache.directory.server.core.jndi;
 
 
 import java.util.HashMap;
@@ -29,13 +29,13 @@
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 
-import org.apache.ldap.common.exception.LdapSizeLimitExceededException;
-import org.apache.ldap.common.exception.LdapTimeLimitExceededException;
-import org.apache.ldap.common.message.DerefAliasesEnum;
-import org.apache.ldap.server.enumeration.SearchResultFilter;
-import org.apache.ldap.server.enumeration.SearchResultFilteringEnumeration;
-import org.apache.ldap.server.invocation.Invocation;
-import org.apache.ldap.server.unit.AbstractAdminTestCase;
+import org.apache.directory.server.core.enumeration.SearchResultFilter;
+import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration;
+import org.apache.directory.server.core.invocation.Invocation;
+import org.apache.directory.server.core.unit.AbstractAdminTestCase;
+import org.apache.directory.shared.ldap.exception.LdapSizeLimitExceededException;
+import org.apache.directory.shared.ldap.exception.LdapTimeLimitExceededException;
+import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
 
 
 /**

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ShutdownTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/ShutdownTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ShutdownTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ShutdownTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/ShutdownTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/ShutdownTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ShutdownTest.java Tue Feb  7 16:10:02 2006
@@ -14,11 +14,11 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.jndi;
+package org.apache.directory.server.core.jndi;
 
 
-import org.apache.ldap.server.unit.AbstractAdminTestCase;
-import org.apache.ldap.server.configuration.ShutdownConfiguration;
+import org.apache.directory.server.core.configuration.ShutdownConfiguration;
+import org.apache.directory.server.core.unit.AbstractAdminTestCase;
 
 
 /**

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SyncTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/SyncTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SyncTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SyncTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/SyncTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/jndi/SyncTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SyncTest.java Tue Feb  7 16:10:02 2006
@@ -14,13 +14,13 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.jndi;
+package org.apache.directory.server.core.jndi;
 
 
 import javax.naming.directory.Attributes;
 
-import org.apache.ldap.server.unit.AbstractAdminTestCase;
-import org.apache.ldap.server.configuration.SyncConfiguration;
+import org.apache.directory.server.core.configuration.SyncConfiguration;
+import org.apache.directory.server.core.unit.AbstractAdminTestCase;
 
 
 /**

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

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/operational/BinaryAttributeFilterTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/operational/BinaryAttributeFilterTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/operational/BinaryAttributeFilterTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterTest.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.operational;
+package org.apache.directory.server.core.operational;
 
 
 import javax.naming.NamingException;
@@ -23,13 +23,13 @@
 import javax.naming.directory.BasicAttributes;
 import javax.naming.directory.DirContext;
 
-import org.apache.ldap.common.util.StringTools;
-import org.apache.ldap.server.unit.AbstractAdminTestCase;
+import org.apache.directory.server.core.unit.AbstractAdminTestCase;
+import org.apache.directory.shared.ldap.util.StringTools;
 
 
 /**
  * Tests to see that the binary property filtering in the schema service's
- * filter class {@link org.apache.ldap.server.schema.SchemaService} is working
+ * filter class {@link org.apache.directory.server.core.schema.SchemaService} is working
  * properly.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/operational/OperationalAttributeServiceTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/operational/OperationalAttributeServiceTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/operational/OperationalAttributeServiceTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceTest.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.operational;
+package org.apache.directory.server.core.operational;
 
 
 import javax.naming.NamingEnumeration;
@@ -27,8 +27,8 @@
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 
-import org.apache.ldap.common.message.DerefAliasesEnum;
-import org.apache.ldap.server.unit.AbstractAdminTestCase;
+import org.apache.directory.server.core.unit.AbstractAdminTestCase;
+import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
 
 
 /**

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/prefs/ServerPreferencesFactoryTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/prefs/ServerPreferencesFactoryTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/prefs/ServerPreferencesFactoryTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/prefs/ServerPreferencesFactoryTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/prefs/ServerPreferencesFactoryTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/prefs/ServerPreferencesFactoryTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/prefs/ServerPreferencesFactoryTest.java Tue Feb  7 16:10:02 2006
@@ -14,12 +14,13 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.prefs;
+package org.apache.directory.server.core.prefs;
 
 
 import java.util.prefs.Preferences;
 
-import org.apache.ldap.server.unit.AbstractAdminTestCase;
+import org.apache.directory.server.core.prefs.ServerPreferencesFactory;
+import org.apache.directory.server.core.unit.AbstractAdminTestCase;
 
 
 /**

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/prefs/ServerSystemPreferencesTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/prefs/ServerSystemPreferencesTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/prefs/ServerSystemPreferencesTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/prefs/ServerSystemPreferencesTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/prefs/ServerSystemPreferencesTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/prefs/ServerSystemPreferencesTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/prefs/ServerSystemPreferencesTest.java Tue Feb  7 16:10:02 2006
@@ -14,13 +14,14 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.prefs;
+package org.apache.directory.server.core.prefs;
 
 
 import java.util.prefs.BackingStoreException;
 import java.util.prefs.Preferences;
 
-import org.apache.ldap.server.unit.AbstractAdminTestCase;
+import org.apache.directory.server.core.prefs.ServerSystemPreferences;
+import org.apache.directory.server.core.unit.AbstractAdminTestCase;
 
 
 /**

Copied: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java (from r375781, directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/schema/SchemaServiceTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java?p2=directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java&p1=directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/schema/SchemaServiceTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/ldap/server/schema/SchemaServiceTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java Tue Feb  7 16:10:02 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.server.schema;
+package org.apache.directory.server.core.schema;
 
 
 import java.util.HashMap;
@@ -27,7 +27,7 @@
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 
-import org.apache.ldap.server.unit.AbstractAdminTestCase;
+import org.apache.directory.server.core.unit.AbstractAdminTestCase;
 
 
 /**



Mime
View raw message