Author: akarasulu Date: Fri Jan 7 22:24:34 2005 New Revision: 124636 URL: http://svn.apache.org/viewcvs?view=rev&rev=124636 Log: correcting names of schemas loaded Eve->Apache Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoaderTest.java
Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java?view=diff&rev=124636&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java&r1=124635&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java&r2=124636 ============================================================================== --- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java (original) +++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java Fri Jan 7 22:24:34 2005 @@ -97,7 +97,7 @@ { "org.apache.ldap.server.schema.bootstrap.CoreSchema", "org.apache.ldap.server.schema.bootstrap.CosineSchema", - "org.apache.ldap.server.schema.bootstrap.EveSchema", + "org.apache.ldap.server.schema.bootstrap.ApacheSchema", "org.apache.ldap.server.schema.bootstrap.InetorgpersonSchema", "org.apache.ldap.server.schema.bootstrap.JavaSchema", "org.apache.ldap.server.schema.bootstrap.SystemSchema" Modified: incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoaderTest.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoaderTest.java?view=diff&rev=124636&p1=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoaderTest.java&r1=124635&p2=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoaderTest.java&r2=124636 ============================================================================== --- incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoaderTest.java (original) +++ incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoaderTest.java Fri Jan 7 22:24:34 2005 @@ -59,7 +59,7 @@ "org.apache.ldap.server.schema.bootstrap.CoreSchema", "org.apache.ldap.server.schema.bootstrap.CosineSchema", "org.apache.ldap.server.schema.bootstrap.CorbaSchema", - "org.apache.ldap.server.schema.bootstrap.EveSchema", + "org.apache.ldap.server.schema.bootstrap.ApacheSchema", "org.apache.ldap.server.schema.bootstrap.InetorgpersonSchema", "org.apache.ldap.server.schema.bootstrap.JavaSchema", "org.apache.ldap.server.schema.bootstrap.Krb5kdcSchema", @@ -86,7 +86,7 @@ assertNotNull( type ); // from eve.schema - type = registries.getAttributeTypeRegistry().lookup( "eveAlias" ); + type = registries.getAttributeTypeRegistry().lookup( "apacheAlias" ); assertNotNull( type ); // from inetorgperson.schema @@ -130,22 +130,22 @@ } - public void testEveSchemaLoad() throws NamingException + public void testApacheSchemaLoad() throws NamingException { testSystemSchemaLoad(); - EveSchema eveSchema = new EveSchema(); + ApacheSchema apacheSchema = new ApacheSchema(); BootstrapSchemaLoader loader = new BootstrapSchemaLoader(); - loader.load( eveSchema, registries ); + loader.load( apacheSchema, registries ); AttributeType type; - type = registries.getAttributeTypeRegistry().lookup( "eveNdn" ); + type = registries.getAttributeTypeRegistry().lookup( "apacheNdn" ); assertNotNull( type ); - type = registries.getAttributeTypeRegistry().lookup( "eveAlias" ); + type = registries.getAttributeTypeRegistry().lookup( "apacheAlias" ); assertNotNull( type ); - type = registries.getAttributeTypeRegistry().lookup( "eveUpdn" ); + type = registries.getAttributeTypeRegistry().lookup( "apacheUpdn" ); assertNotNull( type ); } @@ -154,18 +154,18 @@ { BootstrapSchemaLoader loader = new BootstrapSchemaLoader(); String[] schemaClasses = { - "org.apache.ldap.server.schema.bootstrap.EveSchema", + "org.apache.ldap.server.schema.bootstrap.ApacheSchema", "org.apache.ldap.server.schema.bootstrap.SystemSchema" }; loader.load( schemaClasses, registries ); AttributeType type; - type = registries.getAttributeTypeRegistry().lookup( "eveNdn" ); + type = registries.getAttributeTypeRegistry().lookup( "apacheNdn" ); assertNotNull( type ); - type = registries.getAttributeTypeRegistry().lookup( "eveAlias" ); + type = registries.getAttributeTypeRegistry().lookup( "apacheAlias" ); assertNotNull( type ); - type = registries.getAttributeTypeRegistry().lookup( "eveUpdn" ); + type = registries.getAttributeTypeRegistry().lookup( "apacheUpdn" ); assertNotNull( type ); } @@ -255,20 +255,20 @@ { BootstrapSchemaLoader loader = new BootstrapSchemaLoader(); String[] schemaClasses = { - "org.apache.ldap.server.schema.bootstrap.EveSchema", + "org.apache.ldap.server.schema.bootstrap.ApacheSchema", "org.apache.ldap.server.schema.bootstrap.CoreSchema", "org.apache.ldap.server.schema.bootstrap.JavaSchema", "org.apache.ldap.server.schema.bootstrap.SystemSchema" }; loader.load( schemaClasses, registries ); AttributeType type; - type = registries.getAttributeTypeRegistry().lookup( "eveAlias" ); + type = registries.getAttributeTypeRegistry().lookup( "apacheAlias" ); assertNotNull( type ); - type = registries.getAttributeTypeRegistry().lookup( "eveNdn" ); + type = registries.getAttributeTypeRegistry().lookup( "apacheNdn" ); assertNotNull( type ); - type = registries.getAttributeTypeRegistry().lookup( "eveUpdn" ); + type = registries.getAttributeTypeRegistry().lookup( "apacheUpdn" ); assertNotNull( type ); }
