You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2006/02/08 01:18:49 UTC
svn commit: r375785 [8/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...
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapProducer.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapProducer.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapProducer.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapProducer.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapProducer.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapProducer.java Tue Feb 7 16:10:02 2006
@@ -14,10 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.schema.bootstrap;
+package org.apache.directory.server.core.schema.bootstrap;
import javax.naming.NamingException;
+
+import org.apache.directory.server.core.schema.bootstrap.ProducerTypeEnum;
/**
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapRegistries.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapRegistries.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapRegistries.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapRegistries.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapRegistries.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapRegistries.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapRegistries.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;
import java.util.ArrayList;
@@ -23,25 +23,25 @@
import javax.naming.NamingException;
-import org.apache.ldap.common.schema.AttributeType;
-import org.apache.ldap.common.schema.MatchingRule;
-import org.apache.ldap.common.schema.ObjectClass;
-import org.apache.ldap.common.schema.Syntax;
-import org.apache.ldap.server.schema.AttributeTypeRegistry;
-import org.apache.ldap.server.schema.ComparatorRegistry;
-import org.apache.ldap.server.schema.DITContentRuleRegistry;
-import org.apache.ldap.server.schema.DITStructureRuleRegistry;
-import org.apache.ldap.server.schema.MatchingRuleRegistry;
-import org.apache.ldap.server.schema.MatchingRuleUseRegistry;
-import org.apache.ldap.server.schema.NameFormRegistry;
-import org.apache.ldap.server.schema.NormalizerRegistry;
-import org.apache.ldap.server.schema.ObjectClassRegistry;
-import org.apache.ldap.server.schema.ObjectFactoryRegistry;
-import org.apache.ldap.server.schema.OidRegistry;
-import org.apache.ldap.server.schema.Registries;
-import org.apache.ldap.server.schema.StateFactoryRegistry;
-import org.apache.ldap.server.schema.SyntaxCheckerRegistry;
-import org.apache.ldap.server.schema.SyntaxRegistry;
+import org.apache.directory.server.core.schema.AttributeTypeRegistry;
+import org.apache.directory.server.core.schema.ComparatorRegistry;
+import org.apache.directory.server.core.schema.DITContentRuleRegistry;
+import org.apache.directory.server.core.schema.DITStructureRuleRegistry;
+import org.apache.directory.server.core.schema.MatchingRuleRegistry;
+import org.apache.directory.server.core.schema.MatchingRuleUseRegistry;
+import org.apache.directory.server.core.schema.NameFormRegistry;
+import org.apache.directory.server.core.schema.NormalizerRegistry;
+import org.apache.directory.server.core.schema.ObjectClassRegistry;
+import org.apache.directory.server.core.schema.ObjectFactoryRegistry;
+import org.apache.directory.server.core.schema.OidRegistry;
+import org.apache.directory.server.core.schema.Registries;
+import org.apache.directory.server.core.schema.StateFactoryRegistry;
+import org.apache.directory.server.core.schema.SyntaxCheckerRegistry;
+import org.apache.directory.server.core.schema.SyntaxRegistry;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.MatchingRule;
+import org.apache.directory.shared.ldap.schema.ObjectClass;
+import org.apache.directory.shared.ldap.schema.Syntax;
/**
@@ -422,7 +422,7 @@
return true;
}
- ObjectClass[] superiors = new org.apache.ldap.common.schema.ObjectClass[0];
+ ObjectClass[] superiors = new org.apache.directory.shared.ldap.schema.ObjectClass[0];
try
{
@@ -440,7 +440,7 @@
isSuccess &= resolve( superiors[ii], errors ) ;
}
- AttributeType[] mayList = new org.apache.ldap.common.schema.AttributeType[0];
+ AttributeType[] mayList = new org.apache.directory.shared.ldap.schema.AttributeType[0];
try
{
@@ -459,7 +459,7 @@
}
- AttributeType[] mustList = new org.apache.ldap.common.schema.AttributeType[0];
+ AttributeType[] mustList = new org.apache.directory.shared.ldap.schema.AttributeType[0];
try
{
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoader.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoader.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoader.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.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;
import java.util.Collection;
@@ -26,31 +26,34 @@
import javax.naming.NamingException;
-import org.apache.ldap.common.schema.AttributeType;
-import org.apache.ldap.common.schema.DITContentRule;
-import org.apache.ldap.common.schema.DITStructureRule;
-import org.apache.ldap.common.schema.MatchingRule;
-import org.apache.ldap.common.schema.MatchingRuleUse;
-import org.apache.ldap.common.schema.NameForm;
-import org.apache.ldap.common.schema.Normalizer;
-import org.apache.ldap.common.schema.ObjectClass;
-import org.apache.ldap.common.schema.Syntax;
-import org.apache.ldap.common.schema.SyntaxChecker;
-import org.apache.ldap.server.jndi.ServerDirObjectFactory;
-import org.apache.ldap.server.jndi.ServerDirStateFactory;
-import org.apache.ldap.server.schema.AttributeTypeRegistry;
-import org.apache.ldap.server.schema.ComparatorRegistry;
-import org.apache.ldap.server.schema.DITContentRuleRegistry;
-import org.apache.ldap.server.schema.DITStructureRuleRegistry;
-import org.apache.ldap.server.schema.MatchingRuleRegistry;
-import org.apache.ldap.server.schema.MatchingRuleUseRegistry;
-import org.apache.ldap.server.schema.NameFormRegistry;
-import org.apache.ldap.server.schema.NormalizerRegistry;
-import org.apache.ldap.server.schema.ObjectClassRegistry;
-import org.apache.ldap.server.schema.ObjectFactoryRegistry;
-import org.apache.ldap.server.schema.StateFactoryRegistry;
-import org.apache.ldap.server.schema.SyntaxCheckerRegistry;
-import org.apache.ldap.server.schema.SyntaxRegistry;
+import org.apache.directory.server.core.jndi.ServerDirObjectFactory;
+import org.apache.directory.server.core.jndi.ServerDirStateFactory;
+import org.apache.directory.server.core.schema.AttributeTypeRegistry;
+import org.apache.directory.server.core.schema.ComparatorRegistry;
+import org.apache.directory.server.core.schema.DITContentRuleRegistry;
+import org.apache.directory.server.core.schema.DITStructureRuleRegistry;
+import org.apache.directory.server.core.schema.MatchingRuleRegistry;
+import org.apache.directory.server.core.schema.MatchingRuleUseRegistry;
+import org.apache.directory.server.core.schema.NameFormRegistry;
+import org.apache.directory.server.core.schema.NormalizerRegistry;
+import org.apache.directory.server.core.schema.ObjectClassRegistry;
+import org.apache.directory.server.core.schema.ObjectFactoryRegistry;
+import org.apache.directory.server.core.schema.StateFactoryRegistry;
+import org.apache.directory.server.core.schema.SyntaxCheckerRegistry;
+import org.apache.directory.server.core.schema.SyntaxRegistry;
+import org.apache.directory.server.core.schema.bootstrap.BootstrapSchema;
+import org.apache.directory.server.core.schema.bootstrap.ProducerTypeEnum;
+import org.apache.directory.server.core.schema.bootstrap.SystemSchema;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.DITContentRule;
+import org.apache.directory.shared.ldap.schema.DITStructureRule;
+import org.apache.directory.shared.ldap.schema.MatchingRule;
+import org.apache.directory.shared.ldap.schema.MatchingRuleUse;
+import org.apache.directory.shared.ldap.schema.NameForm;
+import org.apache.directory.shared.ldap.schema.Normalizer;
+import org.apache.directory.shared.ldap.schema.ObjectClass;
+import org.apache.directory.shared.ldap.schema.Syntax;
+import org.apache.directory.shared.ldap.schema.SyntaxChecker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapStateFactoryRegistry.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapStateFactoryRegistry.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapStateFactoryRegistry.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapStateFactoryRegistry.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapStateFactoryRegistry.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapStateFactoryRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapStateFactoryRegistry.java Tue Feb 7 16:10:02 2006
@@ -14,15 +14,15 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.schema.bootstrap;
+package org.apache.directory.server.core.schema.bootstrap;
import java.util.HashMap;
import javax.naming.NamingException;
-import org.apache.ldap.server.jndi.ServerDirStateFactory;
-import org.apache.ldap.server.schema.StateFactoryRegistry;
+import org.apache.directory.server.core.jndi.ServerDirStateFactory;
+import org.apache.directory.server.core.schema.StateFactoryRegistry;
/**
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxCheckerRegistry.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;
import java.util.HashMap;
@@ -22,10 +22,10 @@
import javax.naming.NamingException;
-import org.apache.ldap.common.schema.SyntaxChecker;
-import org.apache.ldap.server.schema.SyntaxCheckerRegistry;
-import org.apache.ldap.server.schema.SyntaxCheckerRegistryMonitor;
-import org.apache.ldap.server.schema.SyntaxCheckerRegistryMonitorAdapter;
+import org.apache.directory.server.core.schema.SyntaxCheckerRegistry;
+import org.apache.directory.server.core.schema.SyntaxCheckerRegistryMonitor;
+import org.apache.directory.server.core.schema.SyntaxCheckerRegistryMonitorAdapter;
+import org.apache.directory.shared.ldap.schema.SyntaxChecker;
/**
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxRegistry.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxRegistry.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxRegistry.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxRegistry.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxRegistry.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxRegistry.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;
import java.util.HashMap;
@@ -23,11 +23,11 @@
import javax.naming.NamingException;
-import org.apache.ldap.common.schema.Syntax;
-import org.apache.ldap.server.schema.OidRegistry;
-import org.apache.ldap.server.schema.SyntaxRegistry;
-import org.apache.ldap.server.schema.SyntaxRegistryMonitor;
-import org.apache.ldap.server.schema.SyntaxRegistryMonitorAdapter;
+import org.apache.directory.server.core.schema.OidRegistry;
+import org.apache.directory.server.core.schema.SyntaxRegistry;
+import org.apache.directory.server.core.schema.SyntaxRegistryMonitor;
+import org.apache.directory.server.core.schema.SyntaxRegistryMonitorAdapter;
+import org.apache.directory.shared.ldap.schema.Syntax;
/**
@@ -72,7 +72,7 @@
/**
- * @see org.apache.ldap.server.schema.SyntaxRegistry#lookup(java.lang.String)
+ * @see org.apache.directory.server.core.schema.SyntaxRegistry#lookup(java.lang.String)
*/
public Syntax lookup( String id ) throws NamingException
{
@@ -92,7 +92,7 @@
/**
- * @see org.apache.ldap.server.schema.SyntaxRegistry#register(String,Syntax)
+ * @see org.apache.directory.server.core.schema.SyntaxRegistry#register(String,Syntax)
*/
public void register( String schema, Syntax syntax ) throws NamingException
{
@@ -112,7 +112,7 @@
/**
- * @see org.apache.ldap.server.schema.SyntaxRegistry#hasSyntax(java.lang.String)
+ * @see org.apache.directory.server.core.schema.SyntaxRegistry#hasSyntax(java.lang.String)
*/
public boolean hasSyntax( String id )
{
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonComparatorProducer.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonComparatorProducer.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonComparatorProducer.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonComparatorProducer.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonComparatorProducer.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonComparatorProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonComparatorProducer.java Tue Feb 7 16:10:02 2006
@@ -14,18 +14,19 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.schema.bootstrap;
+package org.apache.directory.server.core.schema.bootstrap;
import java.util.Comparator;
import javax.naming.NamingException;
-import org.apache.ldap.common.schema.CachingNormalizer;
-import org.apache.ldap.common.schema.ComparableComparator;
-import org.apache.ldap.common.schema.DeepTrimNormalizer;
-import org.apache.ldap.common.schema.DeepTrimToLowerNormalizer;
-import org.apache.ldap.common.schema.NormalizingComparator;
+import org.apache.directory.server.core.schema.bootstrap.ProducerTypeEnum;
+import org.apache.directory.shared.ldap.schema.CachingNormalizer;
+import org.apache.directory.shared.ldap.schema.ComparableComparator;
+import org.apache.directory.shared.ldap.schema.DeepTrimNormalizer;
+import org.apache.directory.shared.ldap.schema.DeepTrimToLowerNormalizer;
+import org.apache.directory.shared.ldap.schema.NormalizingComparator;
@@ -52,7 +53,7 @@
/**
- * @see org.apache.ldap.server.schema.bootstrap.BootstrapProducer#produce(BootstrapRegistries, org.apache.ldap.server.schema.bootstrap.ProducerCallback)
+ * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(BootstrapRegistries, org.apache.directory.server.core.schema.bootstrap.ProducerCallback)
*/
public void produce( BootstrapRegistries registries, ProducerCallback cb )
throws NamingException
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonMatchingRuleProducer.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonMatchingRuleProducer.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonMatchingRuleProducer.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonMatchingRuleProducer.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonMatchingRuleProducer.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonMatchingRuleProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonMatchingRuleProducer.java Tue Feb 7 16:10:02 2006
@@ -14,11 +14,13 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.schema.bootstrap;
+package org.apache.directory.server.core.schema.bootstrap;
import javax.naming.NamingException;
+import org.apache.directory.server.core.schema.bootstrap.ProducerTypeEnum;
+
/**
@@ -44,7 +46,7 @@
/**
- * @see org.apache.ldap.server.schema.bootstrap.BootstrapProducer#produce(org.apache.ldap.server.schema.bootstrap.BootstrapRegistries, org.apache.ldap.server.schema.bootstrap.ProducerCallback)
+ * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(org.apache.directory.server.core.schema.bootstrap.BootstrapRegistries, org.apache.directory.server.core.schema.bootstrap.ProducerCallback)
*/
public void produce( BootstrapRegistries registries, ProducerCallback cb )
throws NamingException
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonNormalizerProducer.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonNormalizerProducer.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonNormalizerProducer.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonNormalizerProducer.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonNormalizerProducer.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonNormalizerProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonNormalizerProducer.java Tue Feb 7 16:10:02 2006
@@ -14,15 +14,16 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.schema.bootstrap;
+package org.apache.directory.server.core.schema.bootstrap;
import javax.naming.NamingException;
-import org.apache.ldap.common.schema.CachingNormalizer;
-import org.apache.ldap.common.schema.DeepTrimNormalizer;
-import org.apache.ldap.common.schema.DeepTrimToLowerNormalizer;
-import org.apache.ldap.common.schema.Normalizer;
+import org.apache.directory.server.core.schema.bootstrap.ProducerTypeEnum;
+import org.apache.directory.shared.ldap.schema.CachingNormalizer;
+import org.apache.directory.shared.ldap.schema.DeepTrimNormalizer;
+import org.apache.directory.shared.ldap.schema.DeepTrimToLowerNormalizer;
+import org.apache.directory.shared.ldap.schema.Normalizer;
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisComparatorProducer.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisComparatorProducer.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisComparatorProducer.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisComparatorProducer.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisComparatorProducer.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisComparatorProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisComparatorProducer.java Tue Feb 7 16:10:02 2006
@@ -14,17 +14,18 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.schema.bootstrap;
+package org.apache.directory.server.core.schema.bootstrap;
import java.util.Comparator;
import javax.naming.NamingException;
-import org.apache.ldap.common.schema.CachingNormalizer;
-import org.apache.ldap.common.schema.ComparableComparator;
-import org.apache.ldap.common.schema.DeepTrimNormalizer;
-import org.apache.ldap.common.schema.NormalizingComparator;
+import org.apache.directory.server.core.schema.bootstrap.ProducerTypeEnum;
+import org.apache.directory.shared.ldap.schema.CachingNormalizer;
+import org.apache.directory.shared.ldap.schema.ComparableComparator;
+import org.apache.directory.shared.ldap.schema.DeepTrimNormalizer;
+import org.apache.directory.shared.ldap.schema.NormalizingComparator;
/**
@@ -50,7 +51,7 @@
/**
- * @see org.apache.ldap.server.schema.bootstrap.BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
+ * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
*/
public void produce( BootstrapRegistries registries, ProducerCallback cb )
throws NamingException
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisMatchingRuleProducer.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisMatchingRuleProducer.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisMatchingRuleProducer.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisMatchingRuleProducer.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisMatchingRuleProducer.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisMatchingRuleProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisMatchingRuleProducer.java Tue Feb 7 16:10:02 2006
@@ -14,11 +14,13 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.schema.bootstrap;
+package org.apache.directory.server.core.schema.bootstrap;
import javax.naming.NamingException;
+import org.apache.directory.server.core.schema.bootstrap.ProducerTypeEnum;
+
/**
* A producer of MatchingRule objects for the nis schema. This code has been
@@ -43,7 +45,7 @@
/**
- * @see org.apache.ldap.server.schema.bootstrap.BootstrapProducer#produce(org.apache.ldap.server.schema.bootstrap.BootstrapRegistries, org.apache.ldap.server.schema.bootstrap.ProducerCallback)
+ * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(org.apache.directory.server.core.schema.bootstrap.BootstrapRegistries, org.apache.directory.server.core.schema.bootstrap.ProducerCallback)
*/
public void produce( BootstrapRegistries registries, ProducerCallback cb )
throws NamingException
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisNormalizerProducer.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisNormalizerProducer.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisNormalizerProducer.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisNormalizerProducer.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisNormalizerProducer.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisNormalizerProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisNormalizerProducer.java Tue Feb 7 16:10:02 2006
@@ -14,14 +14,15 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.schema.bootstrap;
+package org.apache.directory.server.core.schema.bootstrap;
import javax.naming.NamingException;
-import org.apache.ldap.common.schema.CachingNormalizer;
-import org.apache.ldap.common.schema.DeepTrimNormalizer;
-import org.apache.ldap.common.schema.Normalizer;
+import org.apache.directory.server.core.schema.bootstrap.ProducerTypeEnum;
+import org.apache.directory.shared.ldap.schema.CachingNormalizer;
+import org.apache.directory.shared.ldap.schema.DeepTrimNormalizer;
+import org.apache.directory.shared.ldap.schema.Normalizer;
@@ -48,7 +49,7 @@
/**
- * @see org.apache.ldap.server.schema.bootstrap.BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
+ * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
*/
public void produce( BootstrapRegistries registries, ProducerCallback cb )
throws NamingException
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxCheckerProducer.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxCheckerProducer.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxCheckerProducer.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxCheckerProducer.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxCheckerProducer.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxCheckerProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxCheckerProducer.java Tue Feb 7 16:10:02 2006
@@ -14,13 +14,14 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.schema.bootstrap;
+package org.apache.directory.server.core.schema.bootstrap;
import javax.naming.NamingException;
-import org.apache.ldap.common.schema.AcceptAllSyntaxChecker;
-import org.apache.ldap.common.schema.SyntaxChecker;
+import org.apache.directory.server.core.schema.bootstrap.ProducerTypeEnum;
+import org.apache.directory.shared.ldap.schema.AcceptAllSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.SyntaxChecker;
@@ -47,7 +48,7 @@
/**
- * @see org.apache.ldap.server.schema.bootstrap.BootstrapProducer#produce(BootstrapRegistries, org.apache.ldap.server.schema.bootstrap.ProducerCallback)
+ * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(BootstrapRegistries, org.apache.directory.server.core.schema.bootstrap.ProducerCallback)
*/
public void produce( BootstrapRegistries registries, ProducerCallback cb )
throws NamingException
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxProducer.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxProducer.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxProducer.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxProducer.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxProducer.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxProducer.java Tue Feb 7 16:10:02 2006
@@ -14,12 +14,13 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.schema.bootstrap;
+package org.apache.directory.server.core.schema.bootstrap;
import javax.naming.NamingException;
-import org.apache.ldap.server.schema.SyntaxCheckerRegistry;
+import org.apache.directory.server.core.schema.SyntaxCheckerRegistry;
+import org.apache.directory.server.core.schema.bootstrap.ProducerTypeEnum;
/**
@@ -45,7 +46,7 @@
/**
- * @see org.apache.ldap.server.schema.bootstrap.BootstrapProducer#produce(org.apache.ldap.server.schema.bootstrap.BootstrapRegistries, org.apache.ldap.server.schema.bootstrap.ProducerCallback)
+ * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(org.apache.directory.server.core.schema.bootstrap.BootstrapRegistries, org.apache.directory.server.core.schema.bootstrap.ProducerCallback)
*/
public void produce( BootstrapRegistries registries, ProducerCallback cb )
throws NamingException
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerCallback.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ProducerCallback.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerCallback.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerCallback.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ProducerCallback.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ProducerCallback.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerCallback.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;
import javax.naming.NamingException;
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemComparatorProducer.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemComparatorProducer.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemComparatorProducer.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemComparatorProducer.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemComparatorProducer.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemComparatorProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemComparatorProducer.java Tue Feb 7 16:10:02 2006
@@ -14,15 +14,22 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.schema.bootstrap;
+package org.apache.directory.server.core.schema.bootstrap;
import java.util.Comparator;
import javax.naming.NamingException;
-import org.apache.ldap.common.schema.*;
-import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
+import org.apache.directory.server.core.schema.ConcreteNameComponentNormalizer;
+import org.apache.directory.server.core.schema.bootstrap.ProducerTypeEnum;
+import org.apache.directory.shared.ldap.schema.CachingNormalizer;
+import org.apache.directory.shared.ldap.schema.ComparableComparator;
+import org.apache.directory.shared.ldap.schema.DeepTrimNormalizer;
+import org.apache.directory.shared.ldap.schema.DeepTrimToLowerNormalizer;
+import org.apache.directory.shared.ldap.schema.DnComparator;
+import org.apache.directory.shared.ldap.schema.NormalizingComparator;
+import org.apache.directory.shared.ldap.schema.ObjectIdentifierComparator;
/**
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemMatchingRuleProducer.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemMatchingRuleProducer.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemMatchingRuleProducer.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemMatchingRuleProducer.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemMatchingRuleProducer.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemMatchingRuleProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemMatchingRuleProducer.java Tue Feb 7 16:10:02 2006
@@ -14,10 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.schema.bootstrap;
+package org.apache.directory.server.core.schema.bootstrap;
import javax.naming.NamingException;
+
+import org.apache.directory.server.core.schema.bootstrap.ProducerTypeEnum;
/**
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java Tue Feb 7 16:10:02 2006
@@ -14,13 +14,20 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.schema.bootstrap;
+package org.apache.directory.server.core.schema.bootstrap;
import javax.naming.NamingException;
-import org.apache.ldap.common.schema.*;
-import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
+import org.apache.directory.server.core.schema.ConcreteNameComponentNormalizer;
+import org.apache.directory.server.core.schema.bootstrap.ProducerTypeEnum;
+import org.apache.directory.shared.ldap.schema.CachingNormalizer;
+import org.apache.directory.shared.ldap.schema.DeepTrimNormalizer;
+import org.apache.directory.shared.ldap.schema.DeepTrimToLowerNormalizer;
+import org.apache.directory.shared.ldap.schema.DnNormalizer;
+import org.apache.directory.shared.ldap.schema.NoOpNormalizer;
+import org.apache.directory.shared.ldap.schema.Normalizer;
+import org.apache.directory.shared.ldap.schema.ObjectIdentifierNormalizer;
/**
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxCheckerProducer.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxCheckerProducer.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxCheckerProducer.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxCheckerProducer.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxCheckerProducer.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxCheckerProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxCheckerProducer.java Tue Feb 7 16:10:02 2006
@@ -14,14 +14,15 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.schema.bootstrap;
+package org.apache.directory.server.core.schema.bootstrap;
import javax.naming.NamingException;
-import org.apache.ldap.common.schema.AcceptAllSyntaxChecker;
-import org.apache.ldap.common.schema.BinarySyntaxChecker;
-import org.apache.ldap.common.schema.SyntaxChecker;
+import org.apache.directory.server.core.schema.bootstrap.ProducerTypeEnum;
+import org.apache.directory.shared.ldap.schema.AcceptAllSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.BinarySyntaxChecker;
+import org.apache.directory.shared.ldap.schema.SyntaxChecker;
/**
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxProducer.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxProducer.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxProducer.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxProducer.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxProducer.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxProducer.java Tue Feb 7 16:10:02 2006
@@ -14,12 +14,13 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.schema.bootstrap;
+package org.apache.directory.server.core.schema.bootstrap;
import javax.naming.NamingException;
-import org.apache.ldap.server.schema.SyntaxCheckerRegistry;
+import org.apache.directory.server.core.schema.SyntaxCheckerRegistry;
+import org.apache.directory.server.core.schema.bootstrap.ProducerTypeEnum;
/**
Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/package.html
------------------------------------------------------------------------------
svn:executable = *
Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/package.html
------------------------------------------------------------------------------
svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/subtree/RefinementEvaluator.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/subtree/RefinementEvaluator.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/subtree/RefinementEvaluator.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java Tue Feb 7 16:10:02 2006
@@ -14,12 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.subtree;
+package org.apache.directory.server.core.subtree;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.common.filter.BranchNode;
-import org.apache.ldap.common.filter.SimpleNode;
+import org.apache.directory.shared.ldap.filter.BranchNode;
+import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.filter.SimpleNode;
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/subtree/RefinementLeafEvaluator.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/subtree/RefinementLeafEvaluator.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/subtree/RefinementLeafEvaluator.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java Tue Feb 7 16:10:02 2006
@@ -14,11 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.subtree;
+package org.apache.directory.server.core.subtree;
-import org.apache.ldap.common.filter.*;
-import org.apache.ldap.server.schema.OidRegistry;
+import org.apache.directory.server.core.schema.OidRegistry;
+import org.apache.directory.shared.ldap.filter.LeafNode;
+import org.apache.directory.shared.ldap.filter.SimpleNode;
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/subtree/SubentryService.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/subtree/SubentryService.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/subtree/SubentryService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java Tue Feb 7 16:10:02 2006
@@ -14,31 +14,34 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.subtree;
+package org.apache.directory.server.core.subtree;
-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.enumeration.SearchResultFilter;
-import org.apache.ldap.server.enumeration.SearchResultFilteringEnumeration;
-import org.apache.ldap.server.invocation.InvocationStack;
-import org.apache.ldap.server.invocation.Invocation;
-import org.apache.ldap.server.configuration.InterceptorConfiguration;
-import org.apache.ldap.server.partition.DirectoryPartitionNexus;
-import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
-import org.apache.ldap.common.message.SubentriesControl;
-import org.apache.ldap.common.message.ResultCodeEnum;
-import org.apache.ldap.common.message.LockableAttributesImpl;
-import org.apache.ldap.common.message.LockableAttributeImpl;
-import org.apache.ldap.common.filter.*;
-import org.apache.ldap.common.subtree.SubtreeSpecificationParser;
-import org.apache.ldap.common.subtree.SubtreeSpecification;
-import org.apache.ldap.common.name.DnParser;
-import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.common.exception.LdapNoSuchAttributeException;
-import org.apache.ldap.common.exception.LdapInvalidAttributeValueException;
-import org.apache.ldap.common.exception.LdapSchemaViolationException;
+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.ConcreteNameComponentNormalizer;
+import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
+import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException;
+import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
+import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.filter.LeafNode;
+import org.apache.directory.shared.ldap.filter.PresenceNode;
+import org.apache.directory.shared.ldap.filter.SimpleNode;
+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.message.SubentriesControl;
+import org.apache.directory.shared.ldap.name.DnParser;
+import org.apache.directory.shared.ldap.name.LdapName;
+import org.apache.directory.shared.ldap.subtree.SubtreeSpecification;
+import org.apache.directory.shared.ldap.subtree.SubtreeSpecificationParser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/subtree/SubtreeEvaluator.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/subtree/SubtreeEvaluator.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/subtree/SubtreeEvaluator.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java Tue Feb 7 16:10:02 2006
@@ -14,13 +14,13 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.subtree;
+package org.apache.directory.server.core.subtree;
-import org.apache.ldap.common.util.NamespaceTools;
-import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.common.subtree.SubtreeSpecification;
-import org.apache.ldap.server.schema.OidRegistry;
+import org.apache.directory.server.core.schema.OidRegistry;
+import org.apache.directory.shared.ldap.name.LdapName;
+import org.apache.directory.shared.ldap.subtree.SubtreeSpecification;
+import org.apache.directory.shared.ldap.util.NamespaceTools;
import javax.naming.Name;
import javax.naming.NamingException;
Copied: directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticatorOneWayEncryptedTest.java (from r375781, directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authn/SimpleAuthenticatorOneWayEncryptedTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticatorOneWayEncryptedTest.java?p2=directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticatorOneWayEncryptedTest.java&p1=directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authn/SimpleAuthenticatorOneWayEncryptedTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authn/SimpleAuthenticatorOneWayEncryptedTest.java (original)
+++ directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticatorOneWayEncryptedTest.java Tue Feb 7 16:10:02 2006
@@ -15,9 +15,11 @@
*
*/
-package org.apache.ldap.server.authn;
+package org.apache.directory.server.core.authn;
import java.security.NoSuchAlgorithmException;
+
+import org.apache.directory.server.core.authn.SimpleAuthenticator;
import junit.framework.TestCase;
Copied: directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java (from r375781, directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/DummyAttributeTypeRegistry.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java?p2=directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java&p1=directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/DummyAttributeTypeRegistry.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/DummyAttributeTypeRegistry.java (original)
+++ directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java Tue Feb 7 16:10:02 2006
@@ -16,18 +16,19 @@
* 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.Iterator;
import javax.naming.NamingException;
-import org.apache.ldap.common.schema.AttributeType;
-import org.apache.ldap.common.schema.MatchingRule;
-import org.apache.ldap.common.schema.Syntax;
-import org.apache.ldap.common.schema.UsageEnum;
-import org.apache.ldap.server.schema.AttributeTypeRegistry;
+import org.apache.directory.server.core.authz.support.ACITupleFilter;
+import org.apache.directory.server.core.schema.AttributeTypeRegistry;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.MatchingRule;
+import org.apache.directory.shared.ldap.schema.Syntax;
+import org.apache.directory.shared.ldap.schema.UsageEnum;
/**
* A mock {@link AttributeTypeRegistry} to test {@link ACITupleFilter} implementations.
Copied: directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/DummyOidRegistry.java (from r375781, directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/DummyOidRegistry.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/DummyOidRegistry.java?p2=directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/DummyOidRegistry.java&p1=directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/DummyOidRegistry.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/DummyOidRegistry.java (original)
+++ directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/DummyOidRegistry.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.Iterator;
@@ -25,7 +25,8 @@
import javax.naming.NamingException;
-import org.apache.ldap.server.schema.OidRegistry;
+import org.apache.directory.server.core.authz.support.ACITupleFilter;
+import org.apache.directory.server.core.schema.OidRegistry;
/**
* A mock {@link OidRegistry} to test {@link ACITupleFilter} implementations.
Copied: directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.java (from r375781, directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/HighestPrecedenceFilterTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.java?p2=directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.java&p1=directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/HighestPrecedenceFilterTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/HighestPrecedenceFilterTest.java (original)
+++ directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.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;
@@ -28,8 +28,9 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.ldap.common.aci.ACITuple;
-import org.apache.ldap.common.aci.AuthenticationLevel;
+import org.apache.directory.server.core.authz.support.HighestPrecedenceFilter;
+import org.apache.directory.shared.ldap.aci.ACITuple;
+import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
/**
* Tests {@link HighestPrecedenceFilter}.
Copied: directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java (from r375781, directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/MaxImmSubFilterTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java?p2=directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java&p1=directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/MaxImmSubFilterTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/MaxImmSubFilterTest.java (original)
+++ directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.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.*;
@@ -31,16 +31,18 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-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.name.LdapName;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
-import org.apache.ldap.server.DirectoryService;
-import org.apache.ldap.server.DirectoryServiceListener;
-import org.apache.ldap.server.DirectoryServiceConfiguration;
-import org.apache.ldap.server.jndi.DeadContext;
+import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.DirectoryServiceConfiguration;
+import org.apache.directory.server.core.DirectoryServiceListener;
+import org.apache.directory.server.core.authz.support.MaxImmSubFilter;
+import org.apache.directory.server.core.authz.support.OperationScope;
+import org.apache.directory.server.core.jndi.DeadContext;
+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.name.LdapName;
/**
Copied: directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java (from r375781, directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/MaxValueCountFilterTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java?p2=directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java&p1=directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/MaxValueCountFilterTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/MaxValueCountFilterTest.java (original)
+++ directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.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;
@@ -32,10 +32,12 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-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.directory.server.core.authz.support.MaxValueCountFilter;
+import org.apache.directory.server.core.authz.support.OperationScope;
+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;
/**
* Tests {@link MaxValueCountFilter}.
Copied: directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java (from r375781, directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/MicroOperationFilterTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java?p2=directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java&p1=directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/MicroOperationFilterTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/MicroOperationFilterTest.java (original)
+++ directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.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;
@@ -27,9 +27,11 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.ldap.common.aci.ACITuple;
-import org.apache.ldap.common.aci.AuthenticationLevel;
-import org.apache.ldap.common.aci.MicroOperation;
+import org.apache.directory.server.core.authz.support.MicroOperationFilter;
+import org.apache.directory.server.core.authz.support.OperationScope;
+import org.apache.directory.shared.ldap.aci.ACITuple;
+import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
+import org.apache.directory.shared.ldap.aci.MicroOperation;
/**
* Tests {@link MicroOperationFilter}.
Copied: directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java (from r375781, directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/MostSpecificProtectedItemFilterTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java?p2=directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java&p1=directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/MostSpecificProtectedItemFilterTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/MostSpecificProtectedItemFilterTest.java (original)
+++ directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.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;
@@ -28,10 +28,12 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-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.PresenceNode;
+import org.apache.directory.server.core.authz.support.MostSpecificProtectedItemFilter;
+import org.apache.directory.server.core.authz.support.OperationScope;
+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.PresenceNode;
/**
* Tests {@link MostSpecificProtectedItemFilter}.
Copied: directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java (from r375781, directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/MostSpecificUserClassFilterTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java?p2=directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java&p1=directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/MostSpecificUserClassFilterTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/MostSpecificUserClassFilterTest.java (original)
+++ directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.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;
@@ -28,9 +28,11 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.ldap.common.aci.ACITuple;
-import org.apache.ldap.common.aci.AuthenticationLevel;
-import org.apache.ldap.common.aci.UserClass;
+import org.apache.directory.server.core.authz.support.MostSpecificUserClassFilter;
+import org.apache.directory.server.core.authz.support.OperationScope;
+import org.apache.directory.shared.ldap.aci.ACITuple;
+import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
+import org.apache.directory.shared.ldap.aci.UserClass;
/**
* Tests {@link MostSpecificUserClassFilter}.
Copied: directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/OperationScopeTest.java (from r375781, directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/OperationScopeTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/OperationScopeTest.java?p2=directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/OperationScopeTest.java&p1=directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/OperationScopeTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/OperationScopeTest.java (original)
+++ directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/OperationScopeTest.java Tue Feb 7 16:10:02 2006
@@ -16,7 +16,9 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.authz.support;
+package org.apache.directory.server.core.authz.support;
+
+import org.apache.directory.server.core.authz.support.OperationScope;
import junit.framework.Assert;
import junit.framework.TestCase;
Copied: directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java (from r375781, directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilterTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java?p2=directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java&p1=directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilterTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilterTest.java (original)
+++ directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.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;
@@ -33,18 +33,21 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-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.common.filter.PresenceNode;
-import org.apache.ldap.common.name.LdapName;
-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.directory.server.core.authz.support.OperationScope;
+import org.apache.directory.server.core.authz.support.RelatedProtectedItemFilter;
+import org.apache.directory.server.core.authz.support.RelatedUserClassFilter;
+import org.apache.directory.server.core.event.ExpressionEvaluator;
+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.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;
+import org.apache.directory.shared.ldap.filter.PresenceNode;
+import org.apache.directory.shared.ldap.name.LdapName;
/**
* Tests {@link RelatedUserClassFilter}.
Copied: directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java (from r375781, directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/RelatedUserClassFilterTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java?p2=directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java&p1=directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/RelatedUserClassFilterTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/RelatedUserClassFilterTest.java (original)
+++ directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.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;
@@ -30,11 +30,13 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-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.server.subtree.SubtreeEvaluator;
+import org.apache.directory.server.core.authz.support.OperationScope;
+import org.apache.directory.server.core.authz.support.RelatedUserClassFilter;
+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;
/**
* Tests {@link RelatedUserClassFilter}.
Copied: directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java (from r375781, directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/RestrictedByFilterTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java?p2=directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java&p1=directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/RestrictedByFilterTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/authz/support/RestrictedByFilterTest.java (original)
+++ directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.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;
@@ -32,10 +32,12 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-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.directory.server.core.authz.support.OperationScope;
+import org.apache.directory.server.core.authz.support.RestrictedByFilter;
+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;
/**
* Tests {@link RestrictedByFilter}.
Copied: directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java (from r375781, directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/interceptor/InterceptorChainTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java?p2=directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java&p1=directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/interceptor/InterceptorChainTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/interceptor/InterceptorChainTest.java (original)
+++ directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java Tue Feb 7 16:10:02 2006
@@ -14,22 +14,26 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.interceptor;
+package org.apache.directory.server.core.interceptor;
import junit.framework.TestCase;
-import org.apache.ldap.server.DirectoryServiceConfiguration;
-import org.apache.ldap.server.DirectoryService;
-import org.apache.ldap.server.DirectoryServiceListener;
-import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
-import org.apache.ldap.server.jndi.DeadContext;
-import org.apache.ldap.server.invocation.InvocationStack;
-import org.apache.ldap.server.invocation.Invocation;
-import org.apache.ldap.server.configuration.InterceptorConfiguration;
-import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
-import org.apache.ldap.server.configuration.MutableInterceptorConfiguration;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.common.name.LdapName;
+
+import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.DirectoryServiceConfiguration;
+import org.apache.directory.server.core.DirectoryServiceListener;
+import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.InterceptorConfiguration;
+import org.apache.directory.server.core.configuration.MutableInterceptorConfiguration;
+import org.apache.directory.server.core.interceptor.Interceptor;
+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.DeadContext;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.name.LdapName;
//import org.slf4j.Logger;
//import org.slf4j.LoggerFactory;
Copied: directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/jndi/LdapJndiPropertiesTest.java (from r375781, directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/jndi/LdapJndiPropertiesTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/jndi/LdapJndiPropertiesTest.java?p2=directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/jndi/LdapJndiPropertiesTest.java&p1=directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/jndi/LdapJndiPropertiesTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/jndi/LdapJndiPropertiesTest.java (original)
+++ directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/jndi/LdapJndiPropertiesTest.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;
@@ -22,9 +22,10 @@
import javax.naming.Context;
import org.apache.commons.lang.ArrayUtils;
-import org.apache.ldap.common.aci.AuthenticationLevel;
-import org.apache.ldap.common.exception.LdapConfigurationException;
-import org.apache.ldap.common.util.StringTools;
+import org.apache.directory.server.core.jndi.LdapJndiProperties;
+import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
+import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
+import org.apache.directory.shared.ldap.util.StringTools;
import junit.framework.TestCase;
Copied: directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/jndi/RootDSETest.java (from r375781, directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/jndi/RootDSETest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/jndi/RootDSETest.java?p2=directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/jndi/RootDSETest.java&p1=directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/jndi/RootDSETest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/jndi/RootDSETest.java (original)
+++ directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/jndi/RootDSETest.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.io.File;
@@ -31,9 +31,10 @@
import junit.framework.TestCase;
import org.apache.commons.io.FileUtils;
-import org.apache.ldap.common.exception.LdapNoPermissionException;
-import org.apache.ldap.server.configuration.MutableStartupConfiguration;
-import org.apache.ldap.server.configuration.ShutdownConfiguration;
+import org.apache.directory.server.core.configuration.MutableStartupConfiguration;
+import org.apache.directory.server.core.configuration.ShutdownConfiguration;
+import org.apache.directory.server.core.jndi.CoreContextFactory;
+import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
/**
@@ -92,7 +93,7 @@
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() );
Copied: directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java (from r375781, directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/prefs/PreferencesUtilsTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java?p2=directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java&p1=directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/prefs/PreferencesUtilsTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/prefs/PreferencesUtilsTest.java (original)
+++ directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java Tue Feb 7 16:10:02 2006
@@ -14,11 +14,13 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.prefs;
+package org.apache.directory.server.core.prefs;
import javax.naming.Name;
import javax.naming.NamingException;
+
+import org.apache.directory.server.core.prefs.PreferencesUtils;
import junit.framework.TestCase;
Copied: directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/referral/ReferralLutTest.java (from r375781, directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/referral/ReferralLutTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/referral/ReferralLutTest.java?p2=directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/referral/ReferralLutTest.java&p1=directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/referral/ReferralLutTest.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/test/java/org/apache/ldap/server/referral/ReferralLutTest.java (original)
+++ directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/referral/ReferralLutTest.java Tue Feb 7 16:10:02 2006
@@ -14,13 +14,14 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.referral;
+package org.apache.directory.server.core.referral;
import javax.naming.Name;
import javax.naming.NamingException;
-import org.apache.ldap.common.name.LdapName;
+import org.apache.directory.server.core.referral.ReferralLut;
+import org.apache.directory.shared.ldap.name.LdapName;
import junit.framework.TestCase;