directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jcon...@apache.org
Subject svn commit: r512065 - in /directory/sandbox/jconlon/trunk/osgi-apacheds/protocol-ldap-osgi: pom.xml src/main/java/org/apache/directory/server/ldap/osgi/LdapServer.java
Date Mon, 26 Feb 2007 23:11:33 GMT
Author: jconlon
Date: Mon Feb 26 15:11:32 2007
New Revision: 512065

URL: http://svn.apache.org/viewvc?view=rev&rev=512065
Log:
Updated mina and slf4j dependencies.

Modified:
    directory/sandbox/jconlon/trunk/osgi-apacheds/protocol-ldap-osgi/pom.xml
    directory/sandbox/jconlon/trunk/osgi-apacheds/protocol-ldap-osgi/src/main/java/org/apache/directory/server/ldap/osgi/LdapServer.java

Modified: directory/sandbox/jconlon/trunk/osgi-apacheds/protocol-ldap-osgi/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/jconlon/trunk/osgi-apacheds/protocol-ldap-osgi/pom.xml?view=diff&rev=512065&r1=512064&r2=512065
==============================================================================
--- directory/sandbox/jconlon/trunk/osgi-apacheds/protocol-ldap-osgi/pom.xml (original)
+++ directory/sandbox/jconlon/trunk/osgi-apacheds/protocol-ldap-osgi/pom.xml Mon Feb 26 15:11:32
2007
@@ -62,13 +62,13 @@
 		<dependency>
 			<groupId>org.apache.mina</groupId>
 			<artifactId>mina-core</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>2.0.0-M1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.mina</groupId>
 			<artifactId>mina-filter-ssl</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>2.0.0-M1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -118,17 +118,23 @@
 			<artifactId>org.apache.felix.servicebinder</artifactId>
 			<version>0.8.0-SNAPSHOT</version>
 			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.3.0</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
-			<version>1.0</version>
+			<version>1.3.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl104-over-slf4j</artifactId>
-			<version>1.0-rc5</version>
+			<version>1.3.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

Modified: directory/sandbox/jconlon/trunk/osgi-apacheds/protocol-ldap-osgi/src/main/java/org/apache/directory/server/ldap/osgi/LdapServer.java
URL: http://svn.apache.org/viewvc/directory/sandbox/jconlon/trunk/osgi-apacheds/protocol-ldap-osgi/src/main/java/org/apache/directory/server/ldap/osgi/LdapServer.java?view=diff&rev=512065&r1=512064&r2=512065
==============================================================================
--- directory/sandbox/jconlon/trunk/osgi-apacheds/protocol-ldap-osgi/src/main/java/org/apache/directory/server/ldap/osgi/LdapServer.java
(original)
+++ directory/sandbox/jconlon/trunk/osgi-apacheds/protocol-ldap-osgi/src/main/java/org/apache/directory/server/ldap/osgi/LdapServer.java
Mon Feb 26 15:11:32 2007
@@ -49,8 +49,9 @@
         try
         {
             provider = new LdapProtocolProvider( new StartupConfiguration(), (Hashtable)
env.clone() );
-
-            acceptor.bind( new InetSocketAddress( port ), provider.getHandler() );
+            acceptor.setHandler(provider.getHandler());
+            acceptor.setLocalAddress(new InetSocketAddress( port ));
+            acceptor.bind();
 
             log.info( "{} listening on port {}", name, new Integer( port ) );
         }
@@ -71,7 +72,7 @@
 
     public void destroy()
     {
-        acceptor.unbind( new InetSocketAddress( config.getPort() ) );
+        acceptor.unbind( );
 
         acceptor = null;
         provider = null;



Mime
View raw message