Author: akarasulu Date: Fri Jan 7 08:14:23 2005 New Revision: 124530 URL: http://svn.apache.org/viewcvs?view=rev&rev=124530 Log: moving stuff around to new packages and adjusting configs and build for new pkgs Added: incubator/directory/server/trunk/main/src/main/java/org/apache/ldap/ incubator/directory/server/trunk/main/src/main/java/org/apache/ldap/server/ incubator/directory/server/trunk/main/src/main/java/org/apache/ldap/server/EveMain.java - copied, changed from r124441, incubator/directory/server/trunk/main/src/main/java/org/apache/eve/EveMain.java Removed: incubator/directory/server/trunk/main/src/main/java/org/apache/eve/EveMain.java Modified: incubator/directory/server/trunk/main/eve.properties incubator/directory/server/trunk/main/project.properties
Modified: incubator/directory/server/trunk/main/eve.properties Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/main/eve.properties?view=diff&rev=124530&p1=incubator/directory/server/trunk/main/eve.properties&r1=124529&p2=incubator/directory/server/trunk/main/eve.properties&r2=124530 ============================================================================== --- incubator/directory/server/trunk/main/eve.properties (original) +++ incubator/directory/server/trunk/main/eve.properties Fri Jan 7 08:14:23 2005 @@ -4,7 +4,7 @@ # General JNDI Properties # -java.naming.factory.initial=org.apache.eve.jndi.EveContextFactory +java.naming.factory.initial=org.apache.ldap.server.jndi.EveContextFactory java.naming.security.authentication=simple java.naming.security.principal=uid=admin,ou=system java.naming.security.credentials=secret @@ -18,7 +18,7 @@ # -# Eve Provider Properties +# Server-Side Provider Properties # eve.wkdir=apache.org @@ -35,5 +35,5 @@ # set up all the schemas used -eve.schemas=org.apache.eve.schema.bootstrap.AutofsSchema org.apache.eve.schema.bootstrap.CorbaSchema org.apache.eve.schema.bootstrap.CoreSchema org.apache.eve.schema.bootstrap.CosineSchema 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.ScheduleworldSchema org.apache.eve.schema.bootstrap.SystemSchema +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 Modified: incubator/directory/server/trunk/main/project.properties Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/main/project.properties?view=diff&rev=124530&p1=incubator/directory/server/trunk/main/project.properties&r1=124529&p2=incubator/directory/server/trunk/main/project.properties&r2=124530 ============================================================================== --- incubator/directory/server/trunk/main/project.properties (original) +++ incubator/directory/server/trunk/main/project.properties Fri Jan 7 08:14:23 2005 @@ -5,7 +5,7 @@ # maven.javaapp.jar.exclude=junit, maven-javaapp-plugin -maven.javaapp.mainclass=org.apache.eve.EveMain +maven.javaapp.mainclass=org.apache.ldap.server.EveMain maven.javaapp.jar.name=${maven.final.name}.jar maven.javaapp.sysproperties= maven.javaapp.jvmargs= Deleted: /incubator/directory/server/trunk/main/src/main/java/org/apache/eve/EveMain.java Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/main/src/main/java/org/apache/eve/EveMain.java?view=auto&rev=124529 ============================================================================== Copied: incubator/directory/server/trunk/main/src/main/java/org/apache/ldap/server/EveMain.java (from r124441, incubator/directory/server/trunk/main/src/main/java/org/apache/eve/EveMain.java) Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/main/src/main/java/org/apache/ldap/server/EveMain.java?view=diff&rev=124530&p1=incubator/directory/server/trunk/main/src/main/java/org/apache/eve/EveMain.java&r1=124441&p2=incubator/directory/server/trunk/main/src/main/java/org/apache/ldap/server/EveMain.java&r2=124530 ============================================================================== --- incubator/directory/server/trunk/main/src/main/java/org/apache/eve/EveMain.java (original) +++ incubator/directory/server/trunk/main/src/main/java/org/apache/ldap/server/EveMain.java Fri Jan 7 08:14:23 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.eve; +package org.apache.ldap.server; import java.util.Properties; @@ -25,7 +25,7 @@ import javax.naming.directory.InitialDirContext; import org.apache.ldap.common.util.PropertiesUtils; -import org.apache.eve.jndi.EnvKeys; +import org.apache.ldap.server.jndi.EnvKeys; import org.apache.seda.listener.AvailablePortFinder; @@ -53,12 +53,12 @@ if ( args.length > 0 ) { - System.out.println( "Eve: loading properties from " + args[0] ); + System.out.println( "server: loading properties from " + args[0] ); env = PropertiesUtils.getProperties( new File( args[0] ) ); } else { - System.out.println( "Eve: using default properties ..." ); + System.out.println( "server: using default properties ..." ); env = new Properties(); } @@ -69,7 +69,7 @@ if ( ! AvailablePortFinder.available( port ) ) { port = AvailablePortFinder.getNextAvailable( 1024 ); - System.out.println( "Eve: standard ldap port " + LDAP_PORT + System.out.println( "server: standard ldap port " + LDAP_PORT + " is not available, using " + port + " instead" ); } @@ -77,7 +77,7 @@ } env.setProperty( Context.PROVIDER_URL, "ou=system" ); - env.setProperty( Context.INITIAL_CONTEXT_FACTORY, "org.apache.eve.jndi.EveContextFactory" ); + env.setProperty( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.EveContextFactory" ); try { @@ -88,7 +88,7 @@ e.printStackTrace(); } - System.out.println( "Eve: started in " + System.out.println( "server: started in " + ( System.currentTimeMillis() - startTime ) + " milliseconds");
