directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r124458 - in incubator/directory/server/trunk/core: . src/main/java/org/apache/eve/db src/main/java/org/apache/eve/db/jdbm src/main/java/org/apache/eve/jndi src/main/java/org/apache/eve/jndi/ibs src/main/java/org/apache/eve/schema src/main/java/org/apache/ldap/server src/main/java/org/apache/ldap/server/schema src/main/java/org/apache/ldap/server/schema/bootstrap src/test/org/apache/eve/schema/bootstrap
Date Thu, 06 Jan 2005 22:19:25 GMT
Author: akarasulu
Date: Thu Jan  6 14:19:22 2005
New Revision: 124458

URL: http://svn.apache.org/viewcvs?view=rev&rev=124458
Log:
moving some of the core classes - more to go
Added:
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/
      - copied from r124441, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/
Removed:
   incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/
Modified:
   incubator/directory/server/trunk/core/maven.xml
   incubator/directory/server/trunk/core/project.properties
   incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ExpressionEnumerator.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ExpressionEvaluator.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexComparator.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/KeyOnlyComparator.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/LeafEvaluator.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SubstringEnumerator.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SubstringEvaluator.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/TupleComparator.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmIndex.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmMasterTable.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmTable.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/eve/jndi/EveContextFactory.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/eve/jndi/ibs/OperationalAttributeService.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/eve/jndi/ibs/SchemaService.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AbstractSyntaxChecker.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistryMonitor.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistryMonitorAdapter.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitor.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitorAdapter.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ConcreteNameComponentNormalizer.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistryMonitor.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistryMonitorAdapter.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistryMonitor.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistryMonitorAdapter.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalOidRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalRegistries.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitor.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitorAdapter.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistryMonitor.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistryMonitorAdapter.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistryMonitor.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistryMonitorAdapter.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitor.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitorAdapter.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistryMonitor.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistryMonitorAdapter.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitor.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitorAdapter.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/Registries.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitor.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitorAdapter.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitor.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitorAdapter.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/AbstractBootstrapProducer.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapAttributeTypeRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapComparatorRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitContentRuleRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitStructureRuleRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNameFormRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNormalizerRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectClassRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapOidRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapProducer.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapRegistries.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoader.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxRegistry.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveComparatorProducer.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveMatchingRuleProducer.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveNormalizerProducer.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonComparatorProducer.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonMatchingRuleProducer.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonNormalizerProducer.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisComparatorProducer.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisMatchingRuleProducer.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisNormalizerProducer.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxCheckerProducer.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxProducer.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ProducerCallback.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemComparatorProducer.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemMatchingRuleProducer.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxCheckerProducer.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxProducer.java
   incubator/directory/server/trunk/core/src/test/org/apache/eve/schema/bootstrap/BootstrapSchemaLoaderTest.java

Modified: incubator/directory/server/trunk/core/maven.xml
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/maven.xml?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/maven.xml&r1=124457&p2=incubator/directory/server/trunk/core/maven.xml&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/maven.xml	(original)
+++ incubator/directory/server/trunk/core/maven.xml	Thu Jan  6 14:19:22 2005
@@ -8,7 +8,7 @@
   >
 
   <preGoal name="java:compile">
-    <attainGoal name="eve:schema"/>
+    <attainGoal name="directory:schema"/>
   </preGoal> 
  
   <postGoal name="java:compile">

Modified: incubator/directory/server/trunk/core/project.properties
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/project.properties?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/project.properties&r1=124457&p2=incubator/directory/server/trunk/core/project.properties&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/project.properties	(original)
+++ incubator/directory/server/trunk/core/project.properties	Thu Jan  6 14:19:22 2005
@@ -2,7 +2,6 @@
 maven.xdoc.includeProjectDocumentation=yes
 
 #maven.javadoc.private=true
-#maven.javadoc.overview=src/java/org/apache/eve/schema/overview.html
 
 # AspectJ Properties
 # =======================
@@ -15,20 +14,20 @@
 # schema class generation
 # =======================
 
-maven.eve.schemas=autofs,core,cosine,corba,eve,inetorgperson,java,krb5kdc,nis,system,scheduleworld,dnszone,dhcp
+maven.ldap.server.schemas=autofs,core,cosine,corba,eve,inetorgperson,java,krb5kdc,nis,system,scheduleworld,dnszone,dhcp
 
-maven.eve.schema.deps.autofs=system,core,cosine
-maven.eve.schema.deps.corba=system,core
-maven.eve.schema.deps.core=system
-maven.eve.schema.deps.cosine=system,core
-maven.eve.schema.deps.eve=system
-maven.eve.schema.deps.inetorgperson=system,core,cosine
-maven.eve.schema.deps.java=system,core
-maven.eve.schema.deps.krb5kdc=system,core
-maven.eve.schema.deps.nis=system,core,cosine
-maven.eve.schema.deps.system=
-maven.eve.schema.deps.scheduleworld=system,core,cosine,inetorgperson
-maven.eve.schema.deps.dnszone=system,core
-maven.eve.schema.deps.dhcp=system,core
+maven.ldap.server.schema.deps.autofs=system,core,cosine
+maven.ldap.server.schema.deps.corba=system,core
+maven.ldap.server.schema.deps.core=system
+maven.ldap.server.schema.deps.cosine=system,core
+maven.ldap.server.schema.deps.eve=system
+maven.ldap.server.schema.deps.inetorgperson=system,core,cosine
+maven.ldap.server.schema.deps.java=system,core
+maven.ldap.server.schema.deps.krb5kdc=system,core
+maven.ldap.server.schema.deps.nis=system,core,cosine
+maven.ldap.server.schema.deps.system=
+maven.ldap.server.schema.deps.scheduleworld=system,core,cosine,inetorgperson
+maven.ldap.server.schema.deps.dnszone=system,core
+maven.ldap.server.schema.deps.dhcp=system,core
 
 maven.license.licenseFile=${basedir}/../LICENSE.txt

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ExpressionEnumerator.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ExpressionEnumerator.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ExpressionEnumerator.java&r1=124457&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ExpressionEnumerator.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ExpressionEnumerator.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ExpressionEnumerator.java	Thu Jan  6 14:19:22 2005
@@ -29,7 +29,8 @@
 import org.apache.ldap.common.filter.AssertionNode;
 import org.apache.ldap.common.filter.SubstringNode;
 import org.apache.ldap.common.NotImplementedException;
-import org.apache.eve.schema.AttributeTypeRegistry;
+import org.apache.ldap.server.schema.AttributeTypeRegistry;
+import org.apache.ldap.server.schema.AttributeTypeRegistry;
 
 import java.util.ArrayList;
 import java.math.BigInteger;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ExpressionEvaluator.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ExpressionEvaluator.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ExpressionEvaluator.java&r1=124457&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ExpressionEvaluator.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ExpressionEvaluator.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ExpressionEvaluator.java	Thu Jan  6 14:19:22 2005
@@ -23,9 +23,10 @@
 
 import org.apache.ldap.common.filter.ExprNode;
 import org.apache.ldap.common.filter.BranchNode;
+import org.apache.ldap.server.schema.AttributeTypeRegistry;
 
-import org.apache.eve.schema.OidRegistry;
-import org.apache.eve.schema.AttributeTypeRegistry;
+import org.apache.ldap.server.schema.OidRegistry;
+import org.apache.ldap.server.schema.AttributeTypeRegistry;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexComparator.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexComparator.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexComparator.java&r1=124457&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexComparator.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexComparator.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexComparator.java	Thu Jan  6 14:19:22 2005
@@ -19,7 +19,7 @@
 
 import org.apache.ldap.common.util.BigIntegerComparator;
 
-import org.apache.eve.schema.SerializableComparator;
+import org.apache.ldap.server.schema.SerializableComparator;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/KeyOnlyComparator.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/KeyOnlyComparator.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/KeyOnlyComparator.java&r1=124457&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/KeyOnlyComparator.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/KeyOnlyComparator.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/KeyOnlyComparator.java	Thu Jan  6 14:19:22 2005
@@ -19,7 +19,8 @@
 
 import java.io.Serializable;
 
-import org.apache.eve.schema.SerializableComparator;
+import org.apache.ldap.server.schema.SerializableComparator;
+import org.apache.ldap.server.schema.SerializableComparator;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/LeafEvaluator.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/LeafEvaluator.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/LeafEvaluator.java&r1=124457&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/LeafEvaluator.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/LeafEvaluator.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/LeafEvaluator.java	Thu Jan  6 14:19:22 2005
@@ -34,9 +34,11 @@
 import org.apache.ldap.common.schema.MatchingRule;
 import org.apache.ldap.common.filter.PresenceNode;
 import org.apache.ldap.common.NotImplementedException;
+import org.apache.ldap.server.schema.AttributeTypeRegistry;
 
-import org.apache.eve.schema.OidRegistry;
-import org.apache.eve.schema.AttributeTypeRegistry;
+import org.apache.ldap.server.schema.OidRegistry;
+import org.apache.ldap.server.schema.AttributeTypeRegistry;
+import org.apache.ldap.server.schema.OidRegistry;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SubstringEnumerator.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SubstringEnumerator.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SubstringEnumerator.java&r1=124457&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SubstringEnumerator.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SubstringEnumerator.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SubstringEnumerator.java	Thu Jan  6 14:19:22 2005
@@ -225,7 +225,8 @@
 import org.apache.ldap.common.filter.SubstringNode;
 import org.apache.ldap.common.schema.Normalizer;
 import org.apache.ldap.common.schema.AttributeType;
-import org.apache.eve.schema.AttributeTypeRegistry;
+import org.apache.ldap.server.schema.AttributeTypeRegistry;
+import org.apache.ldap.server.schema.AttributeTypeRegistry;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SubstringEvaluator.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SubstringEvaluator.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SubstringEvaluator.java&r1=124457&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SubstringEvaluator.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SubstringEvaluator.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SubstringEvaluator.java	Thu Jan  6 14:19:22 2005
@@ -29,9 +29,11 @@
 import org.apache.ldap.common.schema.Normalizer;
 import org.apache.ldap.common.schema.AttributeType;
 import org.apache.ldap.common.filter.SubstringNode;
+import org.apache.ldap.server.schema.AttributeTypeRegistry;
 
-import org.apache.eve.schema.OidRegistry;
-import org.apache.eve.schema.AttributeTypeRegistry;
+import org.apache.ldap.server.schema.OidRegistry;
+import org.apache.ldap.server.schema.AttributeTypeRegistry;
+import org.apache.ldap.server.schema.OidRegistry;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/TupleComparator.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/TupleComparator.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/TupleComparator.java&r1=124457&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/TupleComparator.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/TupleComparator.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/TupleComparator.java	Thu Jan  6 14:19:22 2005
@@ -19,7 +19,8 @@
 
 import java.io.Serializable;
 
-import org.apache.eve.schema.SerializableComparator;
+import org.apache.ldap.server.schema.SerializableComparator;
+import org.apache.ldap.server.schema.SerializableComparator;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmIndex.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmIndex.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmIndex.java&r1=124457&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmIndex.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmIndex.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmIndex.java	Thu Jan  6 14:19:22 2005
@@ -31,9 +31,10 @@
 import org.apache.eve.db.Index;
 import org.apache.eve.db.IndexComparator;
 import org.apache.eve.db.IndexEnumeration;
-import org.apache.eve.schema.SerializableComparator;
+import org.apache.ldap.server.schema.SerializableComparator;
 import org.apache.ldap.common.util.LRUMap;
 import org.apache.ldap.common.schema.AttributeType;
+import org.apache.ldap.server.schema.SerializableComparator;
 
 import jdbm.helper.MRU;
 import jdbm.RecordManager;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmMasterTable.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmMasterTable.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmMasterTable.java&r1=124457&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmMasterTable.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmMasterTable.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmMasterTable.java	Thu Jan  6 14:19:22 2005
@@ -25,8 +25,9 @@
 import jdbm.helper.StringComparator;
 
 import org.apache.ldap.common.util.BigIntegerComparator;
+import org.apache.ldap.server.schema.SerializableComparator;
 import org.apache.eve.db.MasterTable;
-import org.apache.eve.schema.SerializableComparator;
+import org.apache.ldap.server.schema.SerializableComparator;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmTable.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmTable.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmTable.java&r1=124457&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmTable.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmTable.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmTable.java	Thu Jan  6 14:19:22 2005
@@ -34,9 +34,10 @@
 
 import org.apache.ldap.common.util.EmptyEnumeration; 
 import org.apache.ldap.common.util.SingletonEnumeration;
+import org.apache.ldap.server.schema.SerializableComparator;
 
 import org.apache.eve.db.*;
-import org.apache.eve.schema.SerializableComparator;
+import org.apache.ldap.server.schema.SerializableComparator;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/eve/jndi/EveContextFactory.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/eve/jndi/EveContextFactory.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/jndi/EveContextFactory.java&r1=124457&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/jndi/EveContextFactory.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/jndi/EveContextFactory.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/eve/jndi/EveContextFactory.java	Thu Jan  6 14:19:22 2005
@@ -45,6 +45,7 @@
 import org.apache.ldap.common.exception.LdapConfigurationException;
 import org.apache.ldap.common.exception.LdapAuthenticationNotSupportedException;
 import org.apache.ldap.common.exception.LdapNoPermissionException;
+import org.apache.ldap.server.schema.bootstrap.BootstrapRegistries;
 
 import org.apache.eve.RootNexus;
 import org.apache.eve.SystemPartition;
@@ -54,9 +55,8 @@
 import org.apache.eve.jndi.ibs.*;
 import org.apache.eve.db.*;
 import org.apache.eve.db.jdbm.JdbmDatabase;
-import org.apache.eve.schema.bootstrap.BootstrapRegistries;
-import org.apache.eve.schema.bootstrap.BootstrapSchemaLoader;
-import org.apache.eve.schema.*;
+import org.apache.ldap.server.schema.bootstrap.BootstrapSchemaLoader;
+import org.apache.ldap.server.schema.*;
 import org.apache.seda.DefaultFrontend;
 import org.apache.seda.DefaultFrontendFactory;
 import org.apache.seda.listener.TCPListenerConfig;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/eve/jndi/ibs/OperationalAttributeService.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/eve/jndi/ibs/OperationalAttributeService.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/jndi/ibs/OperationalAttributeService.java&r1=124457&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/jndi/ibs/OperationalAttributeService.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/jndi/ibs/OperationalAttributeService.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/eve/jndi/ibs/OperationalAttributeService.java	Thu Jan  6 14:19:22 2005
@@ -28,12 +28,14 @@
 import org.apache.eve.jndi.Invocation;
 import org.apache.eve.jndi.BaseInterceptor;
 import org.apache.eve.jndi.InvocationStateEnum;
-import org.apache.eve.schema.GlobalRegistries;
-import org.apache.eve.schema.AttributeTypeRegistry;
+import org.apache.ldap.server.schema.GlobalRegistries;
+import org.apache.ldap.server.schema.AttributeTypeRegistry;
 
 import org.apache.ldap.common.util.DateUtils;
 import org.apache.ldap.common.schema.AttributeType;
 import org.apache.ldap.common.schema.UsageEnum;
+import org.apache.ldap.server.schema.AttributeTypeRegistry;
+import org.apache.ldap.server.schema.GlobalRegistries;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/eve/jndi/ibs/SchemaService.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/eve/jndi/ibs/SchemaService.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/jndi/ibs/SchemaService.java&r1=124457&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/jndi/ibs/SchemaService.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/jndi/ibs/SchemaService.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/eve/jndi/ibs/SchemaService.java	Thu Jan  6 14:19:22 2005
@@ -32,8 +32,8 @@
 import org.apache.eve.jndi.InvocationStateEnum;
 import org.apache.eve.RootNexus;
 import org.apache.eve.db.SearchResultFilter;
-import org.apache.eve.schema.GlobalRegistries;
-import org.apache.eve.schema.AttributeTypeRegistry;
+import org.apache.ldap.server.schema.GlobalRegistries;
+import org.apache.ldap.server.schema.AttributeTypeRegistry;
 
 import org.apache.ldap.common.schema.*;
 import org.apache.ldap.common.message.LockableAttributeImpl;
@@ -43,6 +43,7 @@
 import org.apache.ldap.common.filter.PresenceNode;
 import org.apache.ldap.common.util.SingletonEnumeration;
 import org.apache.ldap.common.name.LdapName;
+import org.apache.ldap.server.schema.AttributeTypeRegistry;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AbstractSyntaxChecker.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AbstractSyntaxChecker.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/AbstractSyntaxChecker.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AbstractSyntaxChecker.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/AbstractSyntaxChecker.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AbstractSyntaxChecker.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import org.apache.ldap.common.schema.SyntaxChecker;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/AttributeTypeRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/AttributeTypeRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.Iterator;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistryMonitor.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistryMonitor.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/AttributeTypeRegistryMonitor.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistryMonitor.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/AttributeTypeRegistryMonitor.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistryMonitor.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import org.apache.ldap.common.schema.AttributeType;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistryMonitorAdapter.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistryMonitorAdapter.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/AttributeTypeRegistryMonitorAdapter.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistryMonitorAdapter.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/AttributeTypeRegistryMonitorAdapter.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistryMonitorAdapter.java	Thu Jan  6 14:19:22 2005
@@ -14,10 +14,11 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import org.apache.ldap.common.schema.AttributeType;
+import org.apache.ldap.server.schema.AttributeTypeRegistryMonitor;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/ComparatorRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/ComparatorRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.Comparator;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitor.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitor.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/ComparatorRegistryMonitor.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitor.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/ComparatorRegistryMonitor.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitor.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.Comparator;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitorAdapter.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitorAdapter.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/ComparatorRegistryMonitorAdapter.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitorAdapter.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/ComparatorRegistryMonitorAdapter.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitorAdapter.java	Thu Jan  6 14:19:22 2005
@@ -14,13 +14,15 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.Comparator;
 
 import javax.naming.NamingException;
 
+import org.apache.ldap.server.schema.ComparatorRegistryMonitor;
+
 
 /**
  * An adapter for the ComparatorRegistry's monitor.
@@ -32,7 +34,7 @@
     implements ComparatorRegistryMonitor
 {
     /* (non-Javadoc)
-     * @see org.apache.eve.schema.ComparatorRegistryMonitor#registered(
+     * @see org.apache.ldap.server.schema.ComparatorRegistryMonitor#registered(
      * org.apache.eve.schema.Comparator)
      */
     public void registered( String oid, Comparator comparator )
@@ -41,7 +43,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.schema.ComparatorRegistryMonitor#lookedUp(
+     * @see org.apache.ldap.server.schema.ComparatorRegistryMonitor#lookedUp(
      * org.apache.eve.schema.Comparator)
      */
     public void lookedUp( String oid, Comparator comparator )
@@ -50,7 +52,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.schema.ComparatorRegistryMonitor#lookupFailed(
+     * @see org.apache.ldap.server.schema.ComparatorRegistryMonitor#lookupFailed(
      * java.lang.String, javax.naming.NamingException)
      */
     public void lookupFailed( String oid, NamingException fault )
@@ -63,7 +65,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.schema.ComparatorRegistryMonitor#registerFailed(
+     * @see org.apache.ldap.server.schema.ComparatorRegistryMonitor#registerFailed(
      * org.apache.eve.schema.Comparator, javax.naming.NamingException)
      */
     public void registerFailed( String oid, Comparator comparator, NamingException fault )

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ConcreteNameComponentNormalizer.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ConcreteNameComponentNormalizer.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/ConcreteNameComponentNormalizer.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ConcreteNameComponentNormalizer.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/ConcreteNameComponentNormalizer.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ConcreteNameComponentNormalizer.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import javax.naming.NamingException;
@@ -22,6 +22,7 @@
 import org.apache.ldap.common.schema.Normalizer;
 import org.apache.ldap.common.schema.AttributeType;
 import org.apache.ldap.common.name.NameComponentNormalizer;
+import org.apache.ldap.server.schema.AttributeTypeRegistry;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/DITContentRuleRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/DITContentRuleRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.Iterator;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistryMonitor.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistryMonitor.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/DITContentRuleRegistryMonitor.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistryMonitor.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/DITContentRuleRegistryMonitor.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistryMonitor.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import org.apache.ldap.common.schema.DITContentRule;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistryMonitorAdapter.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistryMonitorAdapter.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/DITContentRuleRegistryMonitorAdapter.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistryMonitorAdapter.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/DITContentRuleRegistryMonitorAdapter.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistryMonitorAdapter.java	Thu Jan  6 14:19:22 2005
@@ -14,10 +14,11 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import org.apache.ldap.common.schema.DITContentRule;
+import org.apache.ldap.server.schema.DITContentRuleRegistryMonitor;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/DITStructureRuleRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/DITStructureRuleRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.Iterator;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistryMonitor.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistryMonitor.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/DITStructureRuleRegistryMonitor.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistryMonitor.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/DITStructureRuleRegistryMonitor.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistryMonitor.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import org.apache.ldap.common.schema.DITStructureRule;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistryMonitorAdapter.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistryMonitorAdapter.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/DITStructureRuleRegistryMonitorAdapter.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistryMonitorAdapter.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/DITStructureRuleRegistryMonitorAdapter.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistryMonitorAdapter.java	Thu Jan  6 14:19:22 2005
@@ -14,10 +14,11 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import org.apache.ldap.common.schema.DITStructureRule;
+import org.apache.ldap.server.schema.DITStructureRuleRegistryMonitor;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/GlobalAttributeTypeRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/GlobalAttributeTypeRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.Map;
@@ -26,7 +26,10 @@
 import org.apache.ldap.common.schema.AttributeType;
 
 import org.apache.eve.SystemPartition;
-import org.apache.eve.schema.bootstrap.BootstrapAttributeTypeRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapAttributeTypeRegistry;
+import org.apache.ldap.server.schema.AttributeTypeRegistry;
+import org.apache.ldap.server.schema.AttributeTypeRegistryMonitor;
+import org.apache.ldap.server.schema.AttributeTypeRegistryMonitorAdapter;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/GlobalComparatorRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/GlobalComparatorRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.Map;
@@ -22,8 +22,12 @@
 import java.util.Comparator;
 import javax.naming.NamingException;
 
-import org.apache.eve.schema.bootstrap.BootstrapComparatorRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapComparatorRegistry;
 import org.apache.eve.SystemPartition;
+import org.apache.ldap.server.schema.bootstrap.BootstrapComparatorRegistry;
+import org.apache.ldap.server.schema.ComparatorRegistry;
+import org.apache.ldap.server.schema.ComparatorRegistryMonitor;
+import org.apache.ldap.server.schema.ComparatorRegistryMonitorAdapter;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/GlobalDitContentRuleRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/GlobalDitContentRuleRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.Map;
@@ -24,9 +24,13 @@
 
 import org.apache.ldap.common.schema.DITContentRule;
 import org.apache.ldap.common.util.JoinIterator;
+import org.apache.ldap.server.schema.bootstrap.BootstrapDitContentRuleRegistry;
 
 import org.apache.eve.SystemPartition;
-import org.apache.eve.schema.bootstrap.BootstrapDitContentRuleRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapDitContentRuleRegistry;
+import org.apache.ldap.server.schema.DITContentRuleRegistry;
+import org.apache.ldap.server.schema.DITContentRuleRegistryMonitor;
+import org.apache.ldap.server.schema.DITContentRuleRegistryMonitorAdapter;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/GlobalDitStructureRuleRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/GlobalDitStructureRuleRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.Map;
@@ -26,7 +26,10 @@
 import org.apache.ldap.common.util.JoinIterator;
 
 import org.apache.eve.SystemPartition;
-import org.apache.eve.schema.bootstrap.BootstrapDitStructureRuleRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapDitStructureRuleRegistry;
+import org.apache.ldap.server.schema.DITStructureRuleRegistry;
+import org.apache.ldap.server.schema.DITStructureRuleRegistryMonitor;
+import org.apache.ldap.server.schema.DITStructureRuleRegistryMonitorAdapter;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/GlobalMatchingRuleRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/GlobalMatchingRuleRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.Map;
@@ -24,9 +24,10 @@
 
 import org.apache.ldap.common.schema.MatchingRule;
 import org.apache.ldap.common.util.JoinIterator;
+import org.apache.ldap.server.schema.bootstrap.BootstrapMatchingRuleRegistry;
 
 import org.apache.eve.SystemPartition;
-import org.apache.eve.schema.bootstrap.BootstrapMatchingRuleRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapMatchingRuleRegistry;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/GlobalMatchingRuleUseRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/GlobalMatchingRuleUseRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.Map;
@@ -26,7 +26,7 @@
 import org.apache.ldap.common.util.JoinIterator;
 
 import org.apache.eve.SystemPartition;
-import org.apache.eve.schema.bootstrap.BootstrapMatchingRuleUseRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapMatchingRuleUseRegistry;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/GlobalNameFormRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/GlobalNameFormRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.Map;
@@ -24,9 +24,10 @@
 
 import org.apache.ldap.common.schema.NameForm;
 import org.apache.ldap.common.util.JoinIterator;
+import org.apache.ldap.server.schema.bootstrap.BootstrapNameFormRegistry;
 
 import org.apache.eve.SystemPartition;
-import org.apache.eve.schema.bootstrap.BootstrapNameFormRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapNameFormRegistry;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/GlobalNormalizerRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/GlobalNormalizerRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.Map;
@@ -22,9 +22,10 @@
 import javax.naming.NamingException;
 
 import org.apache.ldap.common.schema.Normalizer;
+import org.apache.ldap.server.schema.bootstrap.BootstrapNormalizerRegistry;
 
 import org.apache.eve.SystemPartition;
-import org.apache.eve.schema.bootstrap.BootstrapNormalizerRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapNormalizerRegistry;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/GlobalObjectClassRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/GlobalObjectClassRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.Map;
@@ -24,9 +24,10 @@
 
 import org.apache.ldap.common.schema.ObjectClass;
 import org.apache.ldap.common.util.JoinIterator;
+import org.apache.ldap.server.schema.bootstrap.BootstrapObjectClassRegistry;
 
 import org.apache.eve.SystemPartition;
-import org.apache.eve.schema.bootstrap.BootstrapObjectClassRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapObjectClassRegistry;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalOidRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalOidRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/GlobalOidRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalOidRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/GlobalOidRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalOidRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.List;
@@ -26,7 +26,8 @@
 import javax.naming.NamingException;
 
 import org.apache.eve.SystemPartition;
-import org.apache.eve.schema.bootstrap.BootstrapOidRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapOidRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapOidRegistry;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalRegistries.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalRegistries.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/GlobalRegistries.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalRegistries.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/GlobalRegistries.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalRegistries.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.ArrayList;
@@ -27,8 +27,8 @@
 import org.apache.ldap.common.schema.Syntax;
 import org.apache.ldap.common.schema.MatchingRule;
 import org.apache.ldap.common.schema.AttributeType;
+import org.apache.ldap.server.schema.bootstrap.*;
 import org.apache.eve.SystemPartition;
-import org.apache.eve.schema.bootstrap.*;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/GlobalSyntaxCheckerRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/GlobalSyntaxCheckerRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.Map;
@@ -24,7 +24,7 @@
 import org.apache.ldap.common.schema.SyntaxChecker;
 
 import org.apache.eve.SystemPartition;
-import org.apache.eve.schema.bootstrap.BootstrapSyntaxCheckerRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapSyntaxCheckerRegistry;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/GlobalSyntaxRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/GlobalSyntaxRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.Map;
@@ -24,9 +24,10 @@
 
 import org.apache.ldap.common.schema.Syntax;
 import org.apache.ldap.common.util.JoinIterator;
+import org.apache.ldap.server.schema.bootstrap.BootstrapSyntaxRegistry;
 
 import org.apache.eve.SystemPartition;
-import org.apache.eve.schema.bootstrap.BootstrapSyntaxRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapSyntaxRegistry;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/MatchingRuleRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/MatchingRuleRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.Iterator;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitor.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitor.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/MatchingRuleRegistryMonitor.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitor.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/MatchingRuleRegistryMonitor.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitor.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import javax.naming.NamingException ;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitorAdapter.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitorAdapter.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/MatchingRuleRegistryMonitorAdapter.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitorAdapter.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/MatchingRuleRegistryMonitorAdapter.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitorAdapter.java	Thu Jan  6 14:19:22 2005
@@ -14,12 +14,13 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import javax.naming.NamingException;
 
 import org.apache.ldap.common.schema.MatchingRule;
+import org.apache.ldap.server.schema.MatchingRuleRegistryMonitor;
 
 
 /**
@@ -32,7 +33,7 @@
     implements MatchingRuleRegistryMonitor
 {
     /**
-     * @see org.apache.eve.schema.MatchingRuleRegistryMonitor#registered(
+     * @see org.apache.ldap.server.schema.MatchingRuleRegistryMonitor#registered(
      * org.apache.ldap.common.schema.MatchingRule)
      */
     public void registered( MatchingRule rule )
@@ -41,7 +42,7 @@
     
 
     /**
-     * @see org.apache.eve.schema.MatchingRuleRegistryMonitor#lookedUp(
+     * @see org.apache.ldap.server.schema.MatchingRuleRegistryMonitor#lookedUp(
      * org.apache.ldap.common.schema.MatchingRule)
      */
     public void lookedUp( MatchingRule rule )
@@ -50,7 +51,7 @@
 
     
     /**
-     * @see org.apache.eve.schema.MatchingRuleRegistryMonitor#lookupFailed(
+     * @see org.apache.ldap.server.schema.MatchingRuleRegistryMonitor#lookupFailed(
      * java.lang.String, javax.naming.NamingException)
      */
     public void lookupFailed( String oid, NamingException fault )
@@ -63,7 +64,7 @@
 
     
     /**
-     * @see org.apache.eve.schema.MatchingRuleRegistryMonitor#registerFailed(
+     * @see org.apache.ldap.server.schema.MatchingRuleRegistryMonitor#registerFailed(
      * org.apache.ldap.common.schema.MatchingRule, javax.naming.NamingException)
      */
     public void registerFailed( MatchingRule rule, NamingException fault )

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/MatchingRuleUseRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/MatchingRuleUseRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.Iterator;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistryMonitor.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistryMonitor.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/MatchingRuleUseRegistryMonitor.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistryMonitor.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/MatchingRuleUseRegistryMonitor.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistryMonitor.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import org.apache.ldap.common.schema.MatchingRuleUse;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistryMonitorAdapter.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistryMonitorAdapter.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/MatchingRuleUseRegistryMonitorAdapter.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistryMonitorAdapter.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/MatchingRuleUseRegistryMonitorAdapter.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistryMonitorAdapter.java	Thu Jan  6 14:19:22 2005
@@ -14,10 +14,11 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import org.apache.ldap.common.schema.MatchingRuleUse;
+import org.apache.ldap.server.schema.MatchingRuleUseRegistryMonitor;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/NameFormRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/NameFormRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.Iterator;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistryMonitor.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistryMonitor.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/NameFormRegistryMonitor.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistryMonitor.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/NameFormRegistryMonitor.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistryMonitor.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import org.apache.ldap.common.schema.NameForm;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistryMonitorAdapter.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistryMonitorAdapter.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/NameFormRegistryMonitorAdapter.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistryMonitorAdapter.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/NameFormRegistryMonitorAdapter.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistryMonitorAdapter.java	Thu Jan  6 14:19:22 2005
@@ -14,10 +14,11 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import org.apache.ldap.common.schema.NameForm;
+import org.apache.ldap.server.schema.NameFormRegistryMonitor;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/NormalizerRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/NormalizerRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import javax.naming.NamingException;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitor.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitor.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/NormalizerRegistryMonitor.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitor.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/NormalizerRegistryMonitor.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitor.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import javax.naming.NamingException;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitorAdapter.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitorAdapter.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/NormalizerRegistryMonitorAdapter.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitorAdapter.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/NormalizerRegistryMonitorAdapter.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitorAdapter.java	Thu Jan  6 14:19:22 2005
@@ -14,12 +14,13 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import javax.naming.NamingException;
 
 import org.apache.ldap.common.schema.Normalizer;
+import org.apache.ldap.server.schema.NormalizerRegistryMonitor;
 
 
 /**
@@ -32,7 +33,7 @@
     implements NormalizerRegistryMonitor
 {
     /* (non-Javadoc)
-     * @see org.apache.eve.schema.NormalizerRegistryMonitor#registered(
+     * @see org.apache.ldap.server.schema.NormalizerRegistryMonitor#registered(
      * org.apache.eve.schema.Normalizer)
      */
     public void registered( String oid, Normalizer normalizer )
@@ -41,7 +42,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.schema.NormalizerRegistryMonitor#lookedUp(
+     * @see org.apache.ldap.server.schema.NormalizerRegistryMonitor#lookedUp(
      * org.apache.eve.schema.Normalizer)
      */
     public void lookedUp( String oid, Normalizer normalizer )
@@ -50,7 +51,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.schema.NormalizerRegistryMonitor#lookupFailed(
+     * @see org.apache.ldap.server.schema.NormalizerRegistryMonitor#lookupFailed(
      * java.lang.String, javax.naming.NamingException)
      */
     public void lookupFailed( String oid, NamingException fault )
@@ -63,7 +64,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.schema.NormalizerRegistryMonitor#registerFailed(
+     * @see org.apache.ldap.server.schema.NormalizerRegistryMonitor#registerFailed(
      * org.apache.eve.schema.Normalizer, javax.naming.NamingException)
      */
     public void registerFailed( String oid, Normalizer normalizer, NamingException fault )

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/ObjectClassRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/ObjectClassRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.Iterator;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistryMonitor.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistryMonitor.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/ObjectClassRegistryMonitor.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistryMonitor.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/ObjectClassRegistryMonitor.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistryMonitor.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import org.apache.ldap.common.schema.ObjectClass;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistryMonitorAdapter.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistryMonitorAdapter.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/ObjectClassRegistryMonitorAdapter.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistryMonitorAdapter.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/ObjectClassRegistryMonitorAdapter.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistryMonitorAdapter.java	Thu Jan  6 14:19:22 2005
@@ -14,10 +14,11 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import org.apache.ldap.common.schema.ObjectClass;
+import org.apache.ldap.server.schema.ObjectClassRegistryMonitor;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/OidRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/OidRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.List;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitor.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitor.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/OidRegistryMonitor.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitor.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/OidRegistryMonitor.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitor.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.List;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitorAdapter.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitorAdapter.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/OidRegistryMonitorAdapter.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitorAdapter.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/OidRegistryMonitorAdapter.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitorAdapter.java	Thu Jan  6 14:19:22 2005
@@ -14,12 +14,14 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 import java.util.List;
 
 import javax.naming.NamingException;
 
+import org.apache.ldap.server.schema.OidRegistryMonitor;
+
 
 /**
  * An adapter for an OidRegistryMonitor.
@@ -31,7 +33,7 @@
 {
 
     /* (non-Javadoc)
-     * @see org.apache.eve.schema.OidRegistryMonitor#getOidWithOid(
+     * @see org.apache.ldap.server.schema.OidRegistryMonitor#getOidWithOid(
      * java.lang.String)
      */
     public void getOidWithOid( String oid )
@@ -40,7 +42,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.schema.OidRegistryMonitor#oidResolved(
+     * @see org.apache.ldap.server.schema.OidRegistryMonitor#oidResolved(
      * java.lang.String, java.lang.String)
      */
     public void oidResolved( String name, String oid )
@@ -49,7 +51,7 @@
     
 
     /* (non-Javadoc)
-     * @see org.apache.eve.schema.OidRegistryMonitor#oidResolved(
+     * @see org.apache.ldap.server.schema.OidRegistryMonitor#oidResolved(
      * java.lang.String, java.lang.String, java.lang.String)
      */
     public void oidResolved( String name, String normalized, String oid )
@@ -58,7 +60,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.schema.OidRegistryMonitor#oidResolutionFailed(
+     * @see org.apache.ldap.server.schema.OidRegistryMonitor#oidResolutionFailed(
      * java.lang.String, javax.naming.NamingException)
      */
     public void oidResolutionFailed( String name, NamingException fault )
@@ -71,7 +73,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.schema.OidRegistryMonitor#oidDoesNotExist(
+     * @see org.apache.ldap.server.schema.OidRegistryMonitor#oidDoesNotExist(
      * java.lang.String, javax.naming.NamingException)
      */
     public void oidDoesNotExist( String oid, NamingException fault )
@@ -84,7 +86,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.schema.OidRegistryMonitor#nameResolved(
+     * @see org.apache.ldap.server.schema.OidRegistryMonitor#nameResolved(
      * java.lang.String, java.lang.String)
      */
     public void nameResolved( String oid, String name )
@@ -93,7 +95,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.schema.OidRegistryMonitor#namesResolved(
+     * @see org.apache.ldap.server.schema.OidRegistryMonitor#namesResolved(
      * java.lang.String, java.util.List)
      */
     public void namesResolved( String oid, List names )
@@ -102,7 +104,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.schema.OidRegistryMonitor#registered(
+     * @see org.apache.ldap.server.schema.OidRegistryMonitor#registered(
      * java.lang.String, java.lang.String)
      */
     public void registered( String name, String oid )

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/Registries.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/Registries.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/Registries.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/Registries.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/Registries.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/Registries.java	Thu Jan  6 14:19:22 2005
@@ -14,10 +14,12 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.List;
+
+import org.apache.ldap.server.schema.*;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/SerializableComparator.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/SerializableComparator.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java	Thu Jan  6 14:19:22 2005
@@ -14,12 +14,14 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.Comparator;
 import java.io.Serializable;
 import javax.naming.NamingException;
+
+import org.apache.ldap.server.schema.ComparatorRegistry;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/SyntaxCheckerRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/SyntaxCheckerRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import javax.naming.NamingException;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitor.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitor.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/SyntaxCheckerRegistryMonitor.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitor.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/SyntaxCheckerRegistryMonitor.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitor.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import javax.naming.NamingException;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitorAdapter.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitorAdapter.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/SyntaxCheckerRegistryMonitorAdapter.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitorAdapter.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/SyntaxCheckerRegistryMonitorAdapter.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitorAdapter.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import javax.naming.NamingException;
@@ -32,7 +32,7 @@
     implements SyntaxCheckerRegistryMonitor
 {
     /* (non-Javadoc)
-     * @see org.apache.eve.schema.SyntaxCheckerRegistryMonitor#registered(
+     * @see org.apache.ldap.server.schema.SyntaxCheckerRegistryMonitor#registered(
      * org.apache.eve.schema.SyntaxChecker)
      */
     public void registered( String oid, SyntaxChecker syntaxChecker )
@@ -41,7 +41,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.schema.SyntaxCheckerRegistryMonitor#lookedUp(
+     * @see org.apache.ldap.server.schema.SyntaxCheckerRegistryMonitor#lookedUp(
      * org.apache.eve.schema.SyntaxChecker)
      */
     public void lookedUp( String oid, SyntaxChecker syntaxChecker )
@@ -50,7 +50,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.schema.SyntaxCheckerRegistryMonitor#lookupFailed(
+     * @see org.apache.ldap.server.schema.SyntaxCheckerRegistryMonitor#lookupFailed(
      * java.lang.String, javax.naming.NamingException)
      */
     public void lookupFailed( String oid, NamingException fault )
@@ -63,7 +63,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.schema.SyntaxCheckerRegistryMonitor#registerFailed(
+     * @see org.apache.ldap.server.schema.SyntaxCheckerRegistryMonitor#registerFailed(
      * org.apache.eve.schema.SyntaxChecker, javax.naming.NamingException)
      */
     public void registerFailed( String oid, SyntaxChecker syntaxChecker,

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/SyntaxRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/SyntaxRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import java.util.Iterator;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitor.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitor.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/SyntaxRegistryMonitor.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitor.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/SyntaxRegistryMonitor.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitor.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import javax.naming.NamingException;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitorAdapter.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitorAdapter.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/SyntaxRegistryMonitorAdapter.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitorAdapter.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/SyntaxRegistryMonitorAdapter.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitorAdapter.java	Thu Jan  6 14:19:22 2005
@@ -14,12 +14,13 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.ldap.server.schema;
 
 
 import javax.naming.NamingException;
 
 import org.apache.ldap.common.schema.Syntax;
+import org.apache.ldap.server.schema.SyntaxRegistryMonitor;
 
 
 /**
@@ -31,7 +32,7 @@
 public class SyntaxRegistryMonitorAdapter implements SyntaxRegistryMonitor
 {
     /* (non-Javadoc)
-     * @see org.apache.eve.schema.SyntaxRegistryMonitor#registered(
+     * @see org.apache.ldap.server.schema.SyntaxRegistryMonitor#registered(
      * org.apache.eve.schema.Syntax)
      */
     public void registered( Syntax syntax)
@@ -40,7 +41,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.schema.SyntaxRegistryMonitor#lookedUp(
+     * @see org.apache.ldap.server.schema.SyntaxRegistryMonitor#lookedUp(
      * org.apache.eve.schema.Syntax)
      */
     public void lookedUp( Syntax syntax )
@@ -49,7 +50,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.schema.SyntaxRegistryMonitor#lookupFailed(
+     * @see org.apache.ldap.server.schema.SyntaxRegistryMonitor#lookupFailed(
      * java.lang.String, javax.naming.NamingException)
      */
     public void lookupFailed( String oid, NamingException fault )
@@ -62,7 +63,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.schema.SyntaxRegistryMonitor#registerFailed(
+     * @see org.apache.ldap.server.schema.SyntaxRegistryMonitor#registerFailed(
      * org.apache.eve.schema.Syntax, javax.naming.NamingException)
      */
     public void registerFailed( Syntax syntax, NamingException fault )

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/AbstractBootstrapProducer.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/AbstractBootstrapProducer.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/AbstractBootstrapProducer.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/AbstractBootstrapProducer.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/AbstractBootstrapProducer.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/AbstractBootstrapProducer.java	Thu Jan  6 14:19:22 2005
@@ -14,15 +14,14 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import java.util.Comparator;
 import javax.naming.NamingException;
 
 import org.apache.ldap.common.schema.*;
-import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum;
-import org.apache.eve.schema.*;
+import org.apache.ldap.server.schema.*;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapAttributeTypeRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapAttributeTypeRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapAttributeTypeRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapAttributeTypeRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapAttributeTypeRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapAttributeTypeRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,14 +14,14 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import org.apache.ldap.common.schema.AttributeType;
-import org.apache.eve.schema.AttributeTypeRegistry;
-import org.apache.eve.schema.OidRegistry;
-import org.apache.eve.schema.AttributeTypeRegistryMonitor;
-import org.apache.eve.schema.AttributeTypeRegistryMonitorAdapter;
+import org.apache.ldap.server.schema.AttributeTypeRegistry;
+import org.apache.ldap.server.schema.AttributeTypeRegistryMonitor;
+import org.apache.ldap.server.schema.OidRegistry;
+import org.apache.ldap.server.schema.AttributeTypeRegistryMonitorAdapter;
 
 import java.util.Map;
 import java.util.HashMap;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapComparatorRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapComparatorRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapComparatorRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapComparatorRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapComparatorRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapComparatorRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,13 +14,13 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
-import org.apache.eve.schema.ComparatorRegistry;
-import org.apache.eve.schema.ComparatorRegistryMonitor;
-import org.apache.eve.schema.ComparatorRegistryMonitorAdapter;
-import org.apache.eve.schema.SerializableComparator;
+import org.apache.ldap.server.schema.ComparatorRegistryMonitor;
+import org.apache.ldap.server.schema.ComparatorRegistryMonitorAdapter;
+import org.apache.ldap.server.schema.*;
+import org.apache.ldap.server.schema.SerializableComparator;
 
 import java.util.Map;
 import java.util.HashMap;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitContentRuleRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitContentRuleRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapDitContentRuleRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitContentRuleRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapDitContentRuleRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitContentRuleRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,14 +14,14 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import org.apache.ldap.common.schema.DITContentRule;
-import org.apache.eve.schema.DITContentRuleRegistry;
-import org.apache.eve.schema.OidRegistry;
-import org.apache.eve.schema.DITContentRuleRegistryMonitor;
-import org.apache.eve.schema.DITContentRuleRegistryMonitorAdapter;
+import org.apache.ldap.server.schema.DITContentRuleRegistry;
+import org.apache.ldap.server.schema.OidRegistry;
+import org.apache.ldap.server.schema.DITContentRuleRegistryMonitor;
+import org.apache.ldap.server.schema.DITContentRuleRegistryMonitorAdapter;
 
 import java.util.Map;
 import java.util.HashMap;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitStructureRuleRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitStructureRuleRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapDitStructureRuleRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitStructureRuleRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapDitStructureRuleRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitStructureRuleRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,14 +14,14 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import org.apache.ldap.common.schema.DITStructureRule;
-import org.apache.eve.schema.DITStructureRuleRegistry;
-import org.apache.eve.schema.OidRegistry;
-import org.apache.eve.schema.DITStructureRuleRegistryMonitor;
-import org.apache.eve.schema.DITStructureRuleRegistryMonitorAdapter;
+import org.apache.ldap.server.schema.OidRegistry;
+import org.apache.ldap.server.schema.DITStructureRuleRegistryMonitor;
+import org.apache.ldap.server.schema.DITStructureRuleRegistryMonitorAdapter;
+import org.apache.ldap.server.schema.*;
 
 import java.util.Map;
 import java.util.HashMap;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapMatchingRuleRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapMatchingRuleRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,14 +14,14 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import org.apache.ldap.common.schema.MatchingRule;
-import org.apache.eve.schema.MatchingRuleRegistry;
-import org.apache.eve.schema.OidRegistry;
-import org.apache.eve.schema.MatchingRuleRegistryMonitor;
-import org.apache.eve.schema.MatchingRuleRegistryMonitorAdapter;
+import org.apache.ldap.server.schema.MatchingRuleRegistry;
+import org.apache.ldap.server.schema.OidRegistry;
+import org.apache.ldap.server.schema.MatchingRuleRegistryMonitor;
+import org.apache.ldap.server.schema.*;
 
 import java.util.Map;
 import java.util.HashMap;
@@ -73,7 +73,7 @@
     
     
     /**
-     * @see org.apache.eve.schema.MatchingRuleRegistry#lookup(String)
+     * @see org.apache.ldap.server.schema.MatchingRuleRegistry#lookup(String)
      */
     public MatchingRule lookup( String id ) throws NamingException
     {
@@ -119,7 +119,7 @@
 
     
     /**
-     * @see org.apache.eve.schema.MatchingRuleRegistry#hasMatchingRule(String)
+     * @see org.apache.ldap.server.schema.MatchingRuleRegistry#hasMatchingRule(String)
      */
     public boolean hasMatchingRule( String id )
     {

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,13 +14,13 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import org.apache.ldap.common.schema.MatchingRuleUse;
-import org.apache.eve.schema.MatchingRuleUseRegistry;
-import org.apache.eve.schema.MatchingRuleUseRegistryMonitor;
-import org.apache.eve.schema.MatchingRuleUseRegistryMonitorAdapter;
+import org.apache.ldap.server.schema.MatchingRuleUseRegistry;
+import org.apache.ldap.server.schema.MatchingRuleUseRegistryMonitor;
+import org.apache.ldap.server.schema.MatchingRuleUseRegistryMonitorAdapter;
 
 import java.util.Map;
 import java.util.HashMap;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNameFormRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNameFormRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapNameFormRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNameFormRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapNameFormRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNameFormRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,14 +14,15 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import org.apache.ldap.common.schema.NameForm;
-import org.apache.eve.schema.NameFormRegistry;
-import org.apache.eve.schema.OidRegistry;
-import org.apache.eve.schema.NameFormRegistryMonitor;
-import org.apache.eve.schema.NameFormRegistryMonitorAdapter;
+import org.apache.ldap.server.schema.NameFormRegistry;
+import org.apache.ldap.server.schema.OidRegistry;
+import org.apache.ldap.server.schema.NameFormRegistryMonitor;
+import org.apache.ldap.server.schema.*;
+import org.apache.ldap.server.schema.NameFormRegistryMonitorAdapter;
 
 import java.util.Map;
 import java.util.HashMap;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNormalizerRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNormalizerRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapNormalizerRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNormalizerRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapNormalizerRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNormalizerRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,13 +14,13 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import org.apache.ldap.common.schema.Normalizer;
-import org.apache.eve.schema.NormalizerRegistry;
-import org.apache.eve.schema.NormalizerRegistryMonitor;
-import org.apache.eve.schema.NormalizerRegistryMonitorAdapter;
+import org.apache.ldap.server.schema.NormalizerRegistry;
+import org.apache.ldap.server.schema.NormalizerRegistryMonitor;
+import org.apache.ldap.server.schema.NormalizerRegistryMonitorAdapter;
 
 import java.util.Map;
 import java.util.HashMap;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectClassRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectClassRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapObjectClassRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectClassRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapObjectClassRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectClassRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import java.util.Map;
@@ -23,10 +23,10 @@
 import javax.naming.NamingException;
 
 import org.apache.ldap.common.schema.ObjectClass;
-import org.apache.eve.schema.ObjectClassRegistry;
-import org.apache.eve.schema.OidRegistry;
-import org.apache.eve.schema.ObjectClassRegistryMonitor;
-import org.apache.eve.schema.ObjectClassRegistryMonitorAdapter;
+import org.apache.ldap.server.schema.ObjectClassRegistry;
+import org.apache.ldap.server.schema.ObjectClassRegistryMonitor;
+import org.apache.ldap.server.schema.OidRegistry;
+import org.apache.ldap.server.schema.ObjectClassRegistryMonitorAdapter;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapOidRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapOidRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapOidRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapOidRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapOidRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapOidRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,12 +14,12 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
-import org.apache.eve.schema.OidRegistry;
-import org.apache.eve.schema.OidRegistryMonitor;
-import org.apache.eve.schema.OidRegistryMonitorAdapter;
+import org.apache.ldap.server.schema.OidRegistry;
+import org.apache.ldap.server.schema.OidRegistryMonitor;
+import org.apache.ldap.server.schema.OidRegistryMonitorAdapter;
 
 import java.util.List;
 import java.util.Iterator;
@@ -48,7 +48,7 @@
     
     
     /**
-     * @see org.apache.eve.schema.OidRegistry#getOid(java.lang.String)
+     * @see org.apache.ldap.server.schema.OidRegistry#getOid(java.lang.String)
      */
     public String getOid( String name ) throws NamingException
     {
@@ -101,7 +101,7 @@
 
 
     /**
-     * @see org.apache.eve.schema.OidRegistry#hasOid(java.lang.String)
+     * @see org.apache.ldap.server.schema.OidRegistry#hasOid(java.lang.String)
      */
     public boolean hasOid( String name )
     {
@@ -110,7 +110,7 @@
 
 
     /**
-     * @see org.apache.eve.schema.OidRegistry#getPrimaryName(java.lang.String)
+     * @see org.apache.ldap.server.schema.OidRegistry#getPrimaryName(java.lang.String)
      */
     public String getPrimaryName( String oid ) throws NamingException
     {
@@ -137,7 +137,7 @@
 
 
     /**
-     * @see org.apache.eve.schema.OidRegistry#getNameSet(java.lang.String)
+     * @see org.apache.ldap.server.schema.OidRegistry#getNameSet(java.lang.String)
      */
     public List getNameSet( String oid ) throws NamingException
     {
@@ -164,7 +164,7 @@
 
 
     /**
-     * @see org.apache.eve.schema.OidRegistry#list()
+     * @see org.apache.ldap.server.schema.OidRegistry#list()
      */
     public Iterator list()
     {
@@ -173,7 +173,7 @@
 
 
     /**
-     * @see org.apache.eve.schema.OidRegistry#register(String, String)
+     * @see org.apache.ldap.server.schema.OidRegistry#register(String, String)
      */
     public void register( String name, String oid )
     {

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapProducer.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapProducer.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapProducer.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapProducer.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapProducer.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapProducer.java	Thu Jan  6 14:19:22 2005
@@ -14,12 +14,10 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import javax.naming.NamingException;
-
-import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapRegistries.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapRegistries.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapRegistries.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapRegistries.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapRegistries.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapRegistries.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import java.util.ArrayList;
@@ -23,11 +23,11 @@
 
 import javax.naming.NamingException;
 
-import org.apache.eve.schema.*;
 import org.apache.ldap.common.schema.ObjectClass;
 import org.apache.ldap.common.schema.Syntax;
 import org.apache.ldap.common.schema.MatchingRule;
 import org.apache.ldap.common.schema.AttributeType;
+import org.apache.ldap.server.schema.*;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoader.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoader.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapSchemaLoader.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoader.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapSchemaLoader.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoader.java	Thu Jan  6 14:19:22 2005
@@ -14,17 +14,15 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import java.util.*;
 
 import javax.naming.NamingException;
 
-import org.apache.eve.schema.*;
 import org.apache.ldap.common.schema.*;
-import org.apache.ldap.server.schema.bootstrap.BootstrapSchema;
-import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum;
+import org.apache.ldap.server.schema.*;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,13 +14,13 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import org.apache.ldap.common.schema.SyntaxChecker;
-import org.apache.eve.schema.SyntaxCheckerRegistry;
-import org.apache.eve.schema.SyntaxCheckerRegistryMonitor;
-import org.apache.eve.schema.SyntaxCheckerRegistryMonitorAdapter;
+import org.apache.ldap.server.schema.SyntaxCheckerRegistry;
+import org.apache.ldap.server.schema.SyntaxCheckerRegistryMonitor;
+import org.apache.ldap.server.schema.SyntaxCheckerRegistryMonitorAdapter;
 
 import java.util.Map;
 import java.util.HashMap;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxRegistry.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapSyntaxRegistry.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxRegistry.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/BootstrapSyntaxRegistry.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxRegistry.java	Thu Jan  6 14:19:22 2005
@@ -14,14 +14,14 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import org.apache.ldap.common.schema.Syntax;
-import org.apache.eve.schema.SyntaxRegistry;
-import org.apache.eve.schema.OidRegistry;
-import org.apache.eve.schema.SyntaxRegistryMonitor;
-import org.apache.eve.schema.SyntaxRegistryMonitorAdapter;
+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 java.util.Map;
 import java.util.HashMap;
@@ -72,7 +72,7 @@
     
     
     /**
-     * @see SyntaxRegistry#lookup(java.lang.String)
+     * @see org.apache.ldap.server.schema.SyntaxRegistry#lookup(java.lang.String)
      */
     public Syntax lookup( String id ) throws NamingException
     {
@@ -92,7 +92,7 @@
     
 
     /**
-     * @see SyntaxRegistry#register(String,Syntax)
+     * @see org.apache.ldap.server.schema.SyntaxRegistry#register(String,Syntax)
      */
     public void register( String schema, Syntax syntax ) throws NamingException
     {
@@ -112,7 +112,7 @@
 
     
     /**
-     * @see SyntaxRegistry#hasSyntax(java.lang.String)
+     * @see org.apache.ldap.server.schema.SyntaxRegistry#hasSyntax(java.lang.String)
      */
     public boolean hasSyntax( String id )
     {

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveComparatorProducer.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveComparatorProducer.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/EveComparatorProducer.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveComparatorProducer.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/EveComparatorProducer.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveComparatorProducer.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import java.util.Comparator;
@@ -22,7 +22,6 @@
 
 import org.apache.ldap.common.schema.ComparableComparator;
 import org.apache.ldap.common.util.BigIntegerComparator;
-import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum;
 import jdbm.helper.StringComparator;
 
 
@@ -47,7 +46,7 @@
 
 
     /**
-     * @see BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
+     * @see org.apache.ldap.server.schema.bootstrap.BootstrapProducer#produce(org.apache.ldap.server.schema.bootstrap.BootstrapRegistries, ProducerCallback)
      */
     public void produce( BootstrapRegistries registries, ProducerCallback cb )
         throws NamingException

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveMatchingRuleProducer.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveMatchingRuleProducer.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/EveMatchingRuleProducer.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveMatchingRuleProducer.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/EveMatchingRuleProducer.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveMatchingRuleProducer.java	Thu Jan  6 14:19:22 2005
@@ -14,14 +14,11 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import javax.naming.NamingException;
 
-import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum;
-
-
 
 /**
  * A producer of MatchingRule objects for the eve schema. 
@@ -43,7 +40,7 @@
 
 
     /**
-     * @see BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
+     * @see BootstrapProducer#produce(BootstrapRegistries, org.apache.ldap.server.schema.bootstrap.ProducerCallback)
      */
     public void produce( BootstrapRegistries registries, ProducerCallback cb )
         throws NamingException

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveNormalizerProducer.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveNormalizerProducer.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/EveNormalizerProducer.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveNormalizerProducer.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/EveNormalizerProducer.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/EveNormalizerProducer.java	Thu Jan  6 14:19:22 2005
@@ -14,15 +14,13 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import javax.naming.NamingException;
 
 import org.apache.ldap.common.schema.Normalizer;
 import org.apache.ldap.common.schema.NoOpNormalizer;
-import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum;
-
 
 
 /**
@@ -45,7 +43,7 @@
 
 
     /**
-     * @see BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
+     * @see org.apache.ldap.server.schema.bootstrap.BootstrapProducer#produce(org.apache.ldap.server.schema.bootstrap.BootstrapRegistries, org.apache.ldap.server.schema.bootstrap.ProducerCallback)
      */
     public void produce( BootstrapRegistries registries, ProducerCallback cb )
         throws NamingException

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonComparatorProducer.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonComparatorProducer.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/InetorgpersonComparatorProducer.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonComparatorProducer.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/InetorgpersonComparatorProducer.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonComparatorProducer.java	Thu Jan  6 14:19:22 2005
@@ -14,14 +14,13 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import java.util.Comparator;
 import javax.naming.NamingException;
 
 import org.apache.ldap.common.schema.*;
-import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum;
 
 
 
@@ -48,7 +47,7 @@
 
 
     /**
-     * @see BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
+     * @see org.apache.ldap.server.schema.bootstrap.BootstrapProducer#produce(BootstrapRegistries, org.apache.ldap.server.schema.bootstrap.ProducerCallback)
      */
     public void produce( BootstrapRegistries registries, ProducerCallback cb )
         throws NamingException

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonMatchingRuleProducer.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonMatchingRuleProducer.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/InetorgpersonMatchingRuleProducer.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonMatchingRuleProducer.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/InetorgpersonMatchingRuleProducer.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonMatchingRuleProducer.java	Thu Jan  6 14:19:22 2005
@@ -14,12 +14,15 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import javax.naming.NamingException;
 
 import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum;
+import org.apache.ldap.server.schema.bootstrap.ProducerCallback;
+import org.apache.ldap.server.schema.bootstrap.BootstrapRegistries;
+import org.apache.ldap.server.schema.bootstrap.AbstractBootstrapProducer;
 
 
 
@@ -46,7 +49,7 @@
 
 
     /**
-     * @see BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
+     * @see org.apache.ldap.server.schema.bootstrap.BootstrapProducer#produce(org.apache.ldap.server.schema.bootstrap.BootstrapRegistries, org.apache.ldap.server.schema.bootstrap.ProducerCallback)
      */
     public void produce( BootstrapRegistries registries, ProducerCallback cb )
         throws NamingException

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonNormalizerProducer.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonNormalizerProducer.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/InetorgpersonNormalizerProducer.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonNormalizerProducer.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/InetorgpersonNormalizerProducer.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonNormalizerProducer.java	Thu Jan  6 14:19:22 2005
@@ -14,13 +14,14 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import javax.naming.NamingException;
 
 import org.apache.ldap.common.schema.*;
 import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum;
+import org.apache.ldap.server.schema.bootstrap.ProducerCallback;
 
 
 

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisComparatorProducer.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisComparatorProducer.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/NisComparatorProducer.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisComparatorProducer.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/NisComparatorProducer.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisComparatorProducer.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import java.util.Comparator;
@@ -24,8 +24,6 @@
 import org.apache.ldap.common.schema.CachingNormalizer;
 import org.apache.ldap.common.schema.DeepTrimNormalizer;
 import org.apache.ldap.common.schema.ComparableComparator;
-import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum;
-
 
 
 /**
@@ -51,7 +49,7 @@
 
 
     /**
-     * @see BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
+     * @see org.apache.ldap.server.schema.bootstrap.BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
      */
     public void produce( BootstrapRegistries registries, ProducerCallback cb )
         throws NamingException

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisMatchingRuleProducer.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisMatchingRuleProducer.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/NisMatchingRuleProducer.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisMatchingRuleProducer.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/NisMatchingRuleProducer.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisMatchingRuleProducer.java	Thu Jan  6 14:19:22 2005
@@ -14,13 +14,11 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import javax.naming.NamingException;
 
-import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum;
-
 
 /**
  * A producer of MatchingRule objects for the nis schema.  This code has been
@@ -45,7 +43,7 @@
 
 
     /**
-     * @see BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
+     * @see org.apache.ldap.server.schema.bootstrap.BootstrapProducer#produce(org.apache.ldap.server.schema.bootstrap.BootstrapRegistries, org.apache.ldap.server.schema.bootstrap.ProducerCallback)
      */
     public void produce( BootstrapRegistries registries, ProducerCallback cb )
         throws NamingException

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisNormalizerProducer.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisNormalizerProducer.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/NisNormalizerProducer.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisNormalizerProducer.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/NisNormalizerProducer.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisNormalizerProducer.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import javax.naming.NamingException;
@@ -23,6 +23,9 @@
 import org.apache.ldap.common.schema.DeepTrimNormalizer;
 import org.apache.ldap.common.schema.Normalizer;
 import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum;
+import org.apache.ldap.server.schema.bootstrap.ProducerCallback;
+import org.apache.ldap.server.schema.bootstrap.BootstrapRegistries;
+import org.apache.ldap.server.schema.bootstrap.AbstractBootstrapProducer;
 
 
 
@@ -49,7 +52,7 @@
 
 
     /**
-     * @see BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
+     * @see org.apache.ldap.server.schema.bootstrap.BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
      */
     public void produce( BootstrapRegistries registries, ProducerCallback cb )
         throws NamingException

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxCheckerProducer.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxCheckerProducer.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/NisSyntaxCheckerProducer.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxCheckerProducer.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/NisSyntaxCheckerProducer.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxCheckerProducer.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import javax.naming.NamingException;
@@ -22,6 +22,9 @@
 import org.apache.ldap.common.schema.SyntaxChecker;
 import org.apache.ldap.common.schema.AcceptAllSyntaxChecker;
 import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum;
+import org.apache.ldap.server.schema.bootstrap.ProducerCallback;
+import org.apache.ldap.server.schema.bootstrap.BootstrapRegistries;
+import org.apache.ldap.server.schema.bootstrap.AbstractBootstrapProducer;
 
 
 
@@ -48,7 +51,7 @@
 
 
     /**
-     * @see BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
+     * @see org.apache.ldap.server.schema.bootstrap.BootstrapProducer#produce(BootstrapRegistries, org.apache.ldap.server.schema.bootstrap.ProducerCallback)
      */
     public void produce( BootstrapRegistries registries, ProducerCallback cb )
         throws NamingException

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxProducer.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxProducer.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/NisSyntaxProducer.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxProducer.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/NisSyntaxProducer.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxProducer.java	Thu Jan  6 14:19:22 2005
@@ -14,14 +14,12 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import javax.naming.NamingException;
 
-import org.apache.eve.schema.SyntaxCheckerRegistry;
-import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum;
-
+import org.apache.ldap.server.schema.SyntaxCheckerRegistry;
 
 
 /**
@@ -47,7 +45,7 @@
 
 
     /**
-     * @see BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
+     * @see org.apache.ldap.server.schema.bootstrap.BootstrapProducer#produce(org.apache.ldap.server.schema.bootstrap.BootstrapRegistries, org.apache.ldap.server.schema.bootstrap.ProducerCallback)
      */
     public void produce( BootstrapRegistries registries, ProducerCallback cb )
         throws NamingException

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ProducerCallback.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ProducerCallback.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/ProducerCallback.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ProducerCallback.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/ProducerCallback.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ProducerCallback.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import javax.naming.NamingException;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemComparatorProducer.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemComparatorProducer.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/SystemComparatorProducer.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemComparatorProducer.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/SystemComparatorProducer.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemComparatorProducer.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import java.util.Comparator;
@@ -22,7 +22,11 @@
 
 import org.apache.ldap.common.schema.*;
 import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum;
-import org.apache.eve.schema.ConcreteNameComponentNormalizer;
+import org.apache.ldap.server.schema.bootstrap.ProducerCallback;
+import org.apache.ldap.server.schema.bootstrap.BootstrapRegistries;
+import org.apache.ldap.server.schema.bootstrap.AbstractBootstrapProducer;
+import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
+import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemMatchingRuleProducer.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemMatchingRuleProducer.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/SystemMatchingRuleProducer.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemMatchingRuleProducer.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/SystemMatchingRuleProducer.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemMatchingRuleProducer.java	Thu Jan  6 14:19:22 2005
@@ -14,12 +14,15 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import javax.naming.NamingException;
 
 import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum;
+import org.apache.ldap.server.schema.bootstrap.ProducerCallback;
+import org.apache.ldap.server.schema.bootstrap.BootstrapRegistries;
+import org.apache.ldap.server.schema.bootstrap.AbstractBootstrapProducer;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/SystemNormalizerProducer.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/SystemNormalizerProducer.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java	Thu Jan  6 14:19:22 2005
@@ -14,14 +14,18 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import javax.naming.NamingException;
 
 import org.apache.ldap.common.schema.*;
 import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum;
-import org.apache.eve.schema.ConcreteNameComponentNormalizer;
+import org.apache.ldap.server.schema.bootstrap.ProducerCallback;
+import org.apache.ldap.server.schema.bootstrap.BootstrapRegistries;
+import org.apache.ldap.server.schema.bootstrap.AbstractBootstrapProducer;
+import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
+import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxCheckerProducer.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxCheckerProducer.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/SystemSyntaxCheckerProducer.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxCheckerProducer.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/SystemSyntaxCheckerProducer.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxCheckerProducer.java	Thu Jan  6 14:19:22 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import javax.naming.NamingException;
@@ -22,7 +22,6 @@
 import org.apache.ldap.common.schema.SyntaxChecker;
 import org.apache.ldap.common.schema.BinarySyntaxChecker;
 import org.apache.ldap.common.schema.AcceptAllSyntaxChecker;
-import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxProducer.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxProducer.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/SystemSyntaxProducer.java&r1=124441&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxProducer.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/schema/bootstrap/SystemSyntaxProducer.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxProducer.java	Thu Jan  6 14:19:22 2005
@@ -14,13 +14,12 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema.bootstrap;
+package org.apache.ldap.server.schema.bootstrap;
 
 
 import javax.naming.NamingException;
 
-import org.apache.eve.schema.SyntaxCheckerRegistry;
-import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum;
+import org.apache.ldap.server.schema.SyntaxCheckerRegistry;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/test/org/apache/eve/schema/bootstrap/BootstrapSchemaLoaderTest.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/test/org/apache/eve/schema/bootstrap/BootstrapSchemaLoaderTest.java?view=diff&rev=124458&p1=incubator/directory/server/trunk/core/src/test/org/apache/eve/schema/bootstrap/BootstrapSchemaLoaderTest.java&r1=124457&p2=incubator/directory/server/trunk/core/src/test/org/apache/eve/schema/bootstrap/BootstrapSchemaLoaderTest.java&r2=124458
==============================================================================
--- incubator/directory/server/trunk/core/src/test/org/apache/eve/schema/bootstrap/BootstrapSchemaLoaderTest.java	(original)
+++ incubator/directory/server/trunk/core/src/test/org/apache/eve/schema/bootstrap/BootstrapSchemaLoaderTest.java	Thu Jan  6 14:19:22 2005
@@ -24,6 +24,7 @@
 
 import junit.framework.TestCase;
 import org.apache.ldap.common.schema.AttributeType;
+import org.apache.ldap.server.schema.bootstrap.*;
 
 
 /**

Mime
View raw message