directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erodrig...@apache.org
Subject svn commit: r359844 - in /directory/standalone/trunk/osgi: ldap/src/main/java/org/apache/ldap/LdapServer.java network/project.xml ntp/project.xml project.xml
Date Thu, 29 Dec 2005 16:55:17 GMT
Author: erodriguez
Date: Thu Dec 29 08:55:13 2005
New Revision: 359844

URL: http://svn.apache.org/viewcvs?rev=359844&view=rev
Log:
Updates to use MINA 0.9.

Modified:
    directory/standalone/trunk/osgi/ldap/src/main/java/org/apache/ldap/LdapServer.java
    directory/standalone/trunk/osgi/network/project.xml
    directory/standalone/trunk/osgi/ntp/project.xml
    directory/standalone/trunk/osgi/project.xml

Modified: directory/standalone/trunk/osgi/ldap/src/main/java/org/apache/ldap/LdapServer.java
URL: http://svn.apache.org/viewcvs/directory/standalone/trunk/osgi/ldap/src/main/java/org/apache/ldap/LdapServer.java?rev=359844&r1=359843&r2=359844&view=diff
==============================================================================
--- directory/standalone/trunk/osgi/ldap/src/main/java/org/apache/ldap/LdapServer.java (original)
+++ directory/standalone/trunk/osgi/ldap/src/main/java/org/apache/ldap/LdapServer.java Thu
Dec 29 08:55:13 2005
@@ -24,7 +24,6 @@
 import org.apache.ldap.common.exception.LdapNamingException;
 import org.apache.ldap.server.protocol.LdapProtocolProvider;
 import org.apache.mina.common.TransportType;
-import org.apache.mina.protocol.ProtocolProvider;
 import org.apache.mina.registry.Service;
 import org.apache.mina.registry.ServiceRegistry;
 import org.slf4j.Logger;
@@ -36,7 +35,7 @@
     private static final Logger log = LoggerFactory.getLogger( LdapServer.class );
 
     private ServiceRegistry registry;
-    private ProtocolProvider provider;
+    private LdapProtocolProvider provider;
     private Service tcpService;
 
     private LdapConfig config;
@@ -60,7 +59,7 @@
 
             tcpService = new Service( name, TransportType.SOCKET, port );
 
-            registry.bind( tcpService, provider );
+            registry.bind( tcpService, provider.getHandler() );
 
             log.debug( name + " listening on port " + port );
         }

Modified: directory/standalone/trunk/osgi/network/project.xml
URL: http://svn.apache.org/viewcvs/directory/standalone/trunk/osgi/network/project.xml?rev=359844&r1=359843&r2=359844&view=diff
==============================================================================
--- directory/standalone/trunk/osgi/network/project.xml (original)
+++ directory/standalone/trunk/osgi/network/project.xml Thu Dec 29 08:55:13 2005
@@ -6,7 +6,7 @@
   <currentVersion>0.1.1</currentVersion>
   <properties>
     <osgi.import.package>org.osgi.framework</osgi.import.package>
-    <osgi.export.package>org.apache.mina.protocol.handler,org.apache.mina,org.apache.mina.registry,org.apache.mina.protocol,org.apache.mina.protocol.codec,org.apache.mina.common</osgi.export.package>
+    <osgi.export.package>org.apache.mina.protocol.handler,org.apache.mina,org.apache.mina.registry,org.apache.mina.filter,org.apache.mina.filter.codec,org.apache.mina.common</osgi.export.package>
   </properties>
   <package>org.apache.mina</package>
   <shortDescription>Apache MINA Network Service Registry</shortDescription>
@@ -15,11 +15,10 @@
     <dependency>
       <groupId>directory-network</groupId>
       <artifactId>mina</artifactId>
-      <version>0.7.3-SNAPSHOT</version>
+      <version>0.9.0-SNAPSHOT</version>
       <properties>
         <osgi.jar.bundle>true</osgi.jar.bundle>
       </properties>
     </dependency>
   </dependencies>
 </project>
-

Modified: directory/standalone/trunk/osgi/ntp/project.xml
URL: http://svn.apache.org/viewcvs/directory/standalone/trunk/osgi/ntp/project.xml?rev=359844&r1=359843&r2=359844&view=diff
==============================================================================
--- directory/standalone/trunk/osgi/ntp/project.xml (original)
+++ directory/standalone/trunk/osgi/ntp/project.xml Thu Dec 29 08:55:13 2005
@@ -7,7 +7,7 @@
   <properties>
     <osgi.bundle.category>Network Service</osgi.bundle.category>
     <osgi.bundle.activator>org.apache.ntp.Activator</osgi.bundle.activator>
-    <osgi.import.package>org.apache.ldap.server.configuration,org.ungoverned.gravity.servicebinder,org.osgi.framework,org.apache.mina.registry,org.apache.mina.protocol,org.apache.mina.common,org.osgi.service.cm</osgi.import.package>
+    <osgi.import.package>org.apache.ldap.server.configuration,org.ungoverned.gravity.servicebinder,org.osgi.framework,org.apache.mina.registry,org.apache.mina.filter,org.apache.mina.filter.codec,org.apache.mina.common,org.osgi.service.cm</osgi.import.package>
   </properties>
   <package>org.apache.ntp</package>
   <shortDescription>Apache NTP Network Service</shortDescription>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>directory-protocols</groupId>
       <artifactId>ntp-protocol</artifactId>
-      <version>0.1-SNAPSHOT</version>
+      <version>0.5-SNAPSHOT</version>
       <properties>
         <osgi.jar.bundle>true</osgi.jar.bundle>
       </properties>

Modified: directory/standalone/trunk/osgi/project.xml
URL: http://svn.apache.org/viewcvs/directory/standalone/trunk/osgi/project.xml?rev=359844&r1=359843&r2=359844&view=diff
==============================================================================
--- directory/standalone/trunk/osgi/project.xml (original)
+++ directory/standalone/trunk/osgi/project.xml Thu Dec 29 08:55:13 2005
@@ -84,7 +84,7 @@
       <!-- required to load Configuration base class -->
       <groupId>directory</groupId>
       <artifactId>apacheds-core</artifactId>
-      <version>0.9.3-SNAPSHOT</version>
+      <version>0.9.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>directory-shared</groupId>
@@ -126,7 +126,7 @@
     <dependency>
       <groupId>directory-network</groupId>
       <artifactId>mina</artifactId>
-      <version>0.8.0</version>
+      <version>0.9.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>maven</groupId>



Mime
View raw message