Author: akarasulu Date: Fri Jan 7 09:34:51 2005 New Revision: 124548 URL: http://svn.apache.org/viewcvs?view=rev&rev=124548 Log: changes ...
o fixed references to initial context factor with Eve prefix o renamed all eve. properties to server. properties in server.properties o changed reference to old packages where schemas were loaded o adjusted main to use ServerContextFactory instead of EveContextFactory o fixed references the EveJndiProvider in the ProviderNexusAspect Modified: incubator/directory/server/trunk/core/src/main/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.java incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoaderTest.java incubator/directory/server/trunk/main/server.properties incubator/directory/server/trunk/main/src/main/java/org/apache/ldap/server/ServerMain.java Modified: incubator/directory/server/trunk/core/src/main/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.java?view=diff&rev=124548&p1=incubator/directory/server/trunk/core/src/main/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.java&r1=124547&p2=incubator/directory/server/trunk/core/src/main/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.java&r2=124548 ============================================================================== --- incubator/directory/server/trunk/core/src/main/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.java (original) +++ incubator/directory/server/trunk/core/src/main/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.java Fri Jan 7 09:34:51 2005 @@ -40,7 +40,7 @@ * backend nexus calls made by the JndiProvider's contexts within the same * thread of execution. */ - private static ThreadLocal EveJndiProvider.s_contextStacks = new ThreadLocal(); + private static ThreadLocal JndiProvider.s_contextStacks = new ThreadLocal(); // ------------------------------------------------------------------------ @@ -54,7 +54,7 @@ * * @param context the caller or the current context for the nexus call */ - private static void EveJndiProvider.push( LdapContext context ) + private static void JndiProvider.push( LdapContext context ) { Stack stack = ( Stack ) s_contextStacks.get(); @@ -74,7 +74,7 @@ * * @return the last LdapContext or caller */ - private static LdapContext EveJndiProvider.pop() + private static LdapContext JndiProvider.pop() { Stack stack = ( Stack ) s_contextStacks.get(); @@ -92,7 +92,7 @@ * * @return the current LdapContext or caller */ - static LdapContext EveJndiProvider.peek() + static LdapContext JndiProvider.peek() { Stack stack = ( Stack ) s_contextStacks.get(); @@ -117,7 +117,7 @@ */ private static Stack getContextStack() { - Stack stack = ( Stack ) EveJndiProvider.s_contextStacks.get(); + Stack stack = ( Stack ) JndiProvider.s_contextStacks.get(); if ( null == stack ) { @@ -191,7 +191,7 @@ before( Context caller ): jndiNexusCalls( caller ) { - EveJndiProvider.push( ( LdapContext ) caller ); + JndiProvider.push( ( LdapContext ) caller ); //System.out.println( "\npushed " + a_caller + " for join point " // + thisJoinPoint ); } @@ -200,7 +200,7 @@ after( Context caller ): jndiNexusCalls( caller ) { - LdapContext head = EveJndiProvider.pop(); + LdapContext head = JndiProvider.pop(); //System.out.println( "\npopped " + a_caller + " for join point " // + thisJoinPoint ); } 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=124548&p1=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoaderTest.java&r1=124547&p2=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/schema/bootstrap/BootstrapSchemaLoaderTest.java&r2=124548 ============================================================================== --- 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 09:34:51 2005 @@ -55,16 +55,16 @@ { BootstrapSchemaLoader loader = new BootstrapSchemaLoader(); String[] schemaClasses = { - "org.apache.eve.schema.bootstrap.AutofsSchema", - "org.apache.eve.schema.bootstrap.CoreSchema", - "org.apache.eve.schema.bootstrap.CosineSchema", - "org.apache.eve.schema.bootstrap.CorbaSchema", - "org.apache.eve.schema.bootstrap.EveSchema", - "org.apache.eve.schema.bootstrap.InetorgpersonSchema", - "org.apache.eve.schema.bootstrap.JavaSchema", - "org.apache.eve.schema.bootstrap.Krb5kdcSchema", - "org.apache.eve.schema.bootstrap.NisSchema", - "org.apache.eve.schema.bootstrap.SystemSchema" + "org.apache.ldap.server.schema.bootstrap.AutofsSchema", + "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.InetorgpersonSchema", + "org.apache.ldap.server.schema.bootstrap.JavaSchema", + "org.apache.ldap.server.schema.bootstrap.Krb5kdcSchema", + "org.apache.ldap.server.schema.bootstrap.NisSchema", + "org.apache.ldap.server.schema.bootstrap.SystemSchema" }; loader.load( schemaClasses, registries ); AttributeType type; @@ -154,8 +154,8 @@ { BootstrapSchemaLoader loader = new BootstrapSchemaLoader(); String[] schemaClasses = { - "org.apache.eve.schema.bootstrap.EveSchema", - "org.apache.eve.schema.bootstrap.SystemSchema" + "org.apache.ldap.server.schema.bootstrap.EveSchema", + "org.apache.ldap.server.schema.bootstrap.SystemSchema" }; loader.load( schemaClasses, registries ); AttributeType type; @@ -194,8 +194,8 @@ { BootstrapSchemaLoader loader = new BootstrapSchemaLoader(); String[] schemaClasses = { - "org.apache.eve.schema.bootstrap.CoreSchema", - "org.apache.eve.schema.bootstrap.SystemSchema" + "org.apache.ldap.server.schema.bootstrap.CoreSchema", + "org.apache.ldap.server.schema.bootstrap.SystemSchema" }; loader.load( schemaClasses, registries ); AttributeType type; @@ -234,9 +234,9 @@ { BootstrapSchemaLoader loader = new BootstrapSchemaLoader(); String[] schemaClasses = { - "org.apache.eve.schema.bootstrap.CoreSchema", - "org.apache.eve.schema.bootstrap.JavaSchema", - "org.apache.eve.schema.bootstrap.SystemSchema" + "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; @@ -255,10 +255,10 @@ { BootstrapSchemaLoader loader = new BootstrapSchemaLoader(); String[] schemaClasses = { - "org.apache.eve.schema.bootstrap.EveSchema", - "org.apache.eve.schema.bootstrap.CoreSchema", - "org.apache.eve.schema.bootstrap.JavaSchema", - "org.apache.eve.schema.bootstrap.SystemSchema" + "org.apache.ldap.server.schema.bootstrap.EveSchema", + "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; @@ -313,3 +313,4 @@ assertTrue( buf.toString(), errors.isEmpty() ); } } + \ No newline at end of file Modified: incubator/directory/server/trunk/main/server.properties Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/main/server.properties?view=diff&rev=124548&p1=incubator/directory/server/trunk/main/server.properties&r1=124547&p2=incubator/directory/server/trunk/main/server.properties&r2=124548 ============================================================================== --- incubator/directory/server/trunk/main/server.properties (original) +++ incubator/directory/server/trunk/main/server.properties Fri Jan 7 09:34:51 2005 @@ -4,7 +4,7 @@ # General JNDI Properties # -java.naming.factory.initial=org.apache.ldap.server.jndi.EveContextFactory +java.naming.factory.initial=org.apache.ldap.server.jndi.ServerContextFactory java.naming.security.authentication=simple java.naming.security.principal=uid=admin,ou=system java.naming.security.credentials=secret @@ -21,19 +21,19 @@ # Server-Side Provider Properties # -eve.wkdir=apache.org -eve.disable.anonymous=true -eve.net.ldap.port=10389 +server.wkdir=apache.org +server.disable.anonymous=true +server.net.ldap.port=10389 # create apache partition -eve.db.partitions=apache -eve.db.partition.suffix.apache=dc=apache,dc=org -eve.db.partition.indices.apache=objectClass ou uid -eve.db.partition.attributes.apache.objectClass=top domain extensibleObject -eve.db.partition.attributes.apache.dc=apache +server.db.partitions=apache +server.db.partition.suffix.apache=dc=apache,dc=org +server.db.partition.indices.apache=objectClass ou uid +server.db.partition.attributes.apache.objectClass=top domain extensibleObject +server.db.partition.attributes.apache.dc=apache # set up all the schemas used -eve.schemas=org.apache.ldap.server.schema.bootstrap.AutofsSchema org.apache.ldap.server.schema.bootstrap.CorbaSchema 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.InetorgpersonSchema org.apache.ldap.server.schema.bootstrap.JavaSchema org.apache.ldap.server.schema.bootstrap.Krb5kdcSchema org.apache.ldap.server.schema.bootstrap.NisSchema org.apache.ldap.server.schema.bootstrap.ScheduleworldSchema org.apache.ldap.server.schema.bootstrap.SystemSchema +server.schemas=org.apache.ldap.server.schema.bootstrap.AutofsSchema org.apache.ldap.server.schema.bootstrap.CorbaSchema 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.InetorgpersonSchema org.apache.ldap.server.schema.bootstrap.JavaSchema org.apache.ldap.server.schema.bootstrap.Krb5kdcSchema org.apache.ldap.server.schema.bootstrap.NisSchema org.apache.ldap.server.schema.bootstrap.ScheduleworldSchema org.apache.ldap.server.schema.bootstrap.SystemSchema Modified: incubator/directory/server/trunk/main/src/main/java/org/apache/ldap/server/ServerMain.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/main/src/main/java/org/apache/ldap/server/ServerMain.java?view=diff&rev=124548&p1=incubator/directory/server/trunk/main/src/main/java/org/apache/ldap/server/ServerMain.java&r1=124547&p2=incubator/directory/server/trunk/main/src/main/java/org/apache/ldap/server/ServerMain.java&r2=124548 ============================================================================== --- incubator/directory/server/trunk/main/src/main/java/org/apache/ldap/server/ServerMain.java (original) +++ incubator/directory/server/trunk/main/src/main/java/org/apache/ldap/server/ServerMain.java Fri Jan 7 09:34:51 2005 @@ -78,7 +78,7 @@ } env.setProperty( Context.PROVIDER_URL, "ou=system" ); - env.setProperty( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.EveContextFactory" ); + env.setProperty( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.ServerContextFactory" ); try {
