You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by tr...@apache.org on 2005/04/06 17:40:21 UTC
svn commit: r160305 -
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java
Author: trustin
Date: Wed Apr 6 08:40:19 2005
New Revision: 160305
URL: http://svn.apache.org/viewcvs?view=rev&rev=160305
Log:
Cathing up recent MINA changes...
Modified:
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java?view=diff&r1=160304&r2=160305
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java Wed Apr 6 08:40:19 2005
@@ -17,6 +17,17 @@
package org.apache.ldap.server.jndi;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.InetSocketAddress;
+import java.util.Hashtable;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.directory.Attributes;
+import javax.naming.ldap.LdapContext;
+
import org.apache.ldap.common.exception.LdapConfigurationException;
import org.apache.ldap.common.ldif.LdifIterator;
import org.apache.ldap.common.ldif.LdifParser;
@@ -30,15 +41,6 @@
import org.apache.mina.registry.ServiceRegistry;
import org.apache.mina.registry.SimpleServiceRegistry;
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NamingException;
-import javax.naming.directory.Attributes;
-import javax.naming.ldap.LdapContext;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Hashtable;
-
/**
* Adds additional bootstrapping for server socket listeners when firing
@@ -158,7 +160,8 @@
int port = PropertiesUtils.get( initialEnv, EnvKeys.LDAP_PORT, LDAP_PORT );
- Service service = new Service( "ldap", TransportType.SOCKET, port );
+ Service service = new Service( "ldap", TransportType.SOCKET,
+ new InetSocketAddress( port ) );
try
{