svn commit: r151551 - in incubator/directory/apacheds/branches/mina-port/main: project.xml src/main/java/org/apache/ldap/server/ServerMain.java

[tr...@apache.org]

Author: trustin
Date: Sat Feb  5 23:36:55 2005
New Revision: 151551

URL: http://svn.apache.org/viewcvs?view=rev&rev=151551
Log:
Modified ServerMain not to use apseda classes, and moreover I think choosing port number automatically here is not a good idea.

Modified:
    incubator/directory/apacheds/branches/mina-port/main/project.xml
    incubator/directory/apacheds/branches/mina-port/main/src/main/java/org/apache/ldap/server/ServerMain.java

Modified: incubator/directory/apacheds/branches/mina-port/main/project.xml
URL: http://svn.apache.org/viewcvs/incubator/directory/apacheds/branches/mina-port/main/project.xml?view=diff&r1=151550&r2=151551
==============================================================================
--- incubator/directory/apacheds/branches/mina-port/main/project.xml (original)
+++ incubator/directory/apacheds/branches/mina-port/main/project.xml Sat Feb  5 23:36:55 2005
@@ -109,8 +109,8 @@
     </dependency>
     <dependency>
       <groupId>incubator-directory</groupId>
-      <artifactId>apseda</artifactId>
-      <version>0.3-SNAPSHOT</version>
+      <artifactId>mina</artifactId>
+      <version>0.7-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>incubator-directory</groupId>

Modified: incubator/directory/apacheds/branches/mina-port/main/src/main/java/org/apache/ldap/server/ServerMain.java
URL: http://svn.apache.org/viewcvs/incubator/directory/apacheds/branches/mina-port/main/src/main/java/org/apache/ldap/server/ServerMain.java?view=diff&r1=151550&r2=151551
==============================================================================
--- incubator/directory/apacheds/branches/mina-port/main/src/main/java/org/apache/ldap/server/ServerMain.java (original)
+++ incubator/directory/apacheds/branches/mina-port/main/src/main/java/org/apache/ldap/server/ServerMain.java Sat Feb  5 23:36:55 2005
@@ -17,8 +17,8 @@
 package org.apache.ldap.server;
 
 
-import java.util.Properties;
 import java.io.File;
+import java.util.Properties;
 
 import javax.naming.Context;
 import javax.naming.NamingException;
@@ -26,8 +26,6 @@
 
 import org.apache.ldap.common.util.PropertiesUtils;
 import org.apache.ldap.server.jndi.EnvKeys;
-import org.apache.apseda.listener.AvailablePortFinder;
-import org.apache.apseda.listener.AvailablePortFinder;
 
 
 /**
@@ -67,14 +65,6 @@
         if ( ! env.containsKey( EnvKeys.LDAP_PORT ) )
         {
             int port = LDAP_PORT;
-
-            if ( ! AvailablePortFinder.available( port ) )
-            {
-                port = AvailablePortFinder.getNextAvailable( 1024 );
-                System.out.println( "server: standard ldap port " + LDAP_PORT
-                        + " is not available, using " + port + " instead" );
-            }
-
             env.setProperty( EnvKeys.LDAP_PORT, String.valueOf( port ) );
         }