directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jcon...@apache.org
Subject svn commit: r485824 - in /directory/trunks/apacheds/osgi/protocol-ldap-osgi: pom.xml src/main/java/org/apache/ldap/LdapConfig.java src/main/java/org/apache/ldap/LdapServer.java
Date Mon, 11 Dec 2006 19:06:38 GMT
Author: jconlon
Date: Mon Dec 11 11:06:37 2006
New Revision: 485824

URL: http://svn.apache.org/viewvc?view=rev&rev=485824
Log:
Updated for the 1.5.0 SNAPSHOT

Modified:
    directory/trunks/apacheds/osgi/protocol-ldap-osgi/pom.xml
    directory/trunks/apacheds/osgi/protocol-ldap-osgi/src/main/java/org/apache/ldap/LdapConfig.java
    directory/trunks/apacheds/osgi/protocol-ldap-osgi/src/main/java/org/apache/ldap/LdapServer.java

Modified: directory/trunks/apacheds/osgi/protocol-ldap-osgi/pom.xml
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/osgi/protocol-ldap-osgi/pom.xml?view=diff&rev=485824&r1=485823&r2=485824
==============================================================================
--- directory/trunks/apacheds/osgi/protocol-ldap-osgi/pom.xml (original)
+++ directory/trunks/apacheds/osgi/protocol-ldap-osgi/pom.xml Mon Dec 11 11:06:37 2006
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>build</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-protocol-ldap-osgi</artifactId>
   <name>ApacheDS LDAP Protocol Bundle</name>
@@ -20,19 +20,19 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.mina</groupId>
+      <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
       <version>1.1.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.mina</groupId>
+      <groupId>org.apache.mina</groupId>
       <artifactId>mina-filter-ssl</artifactId>
       <version>1.1.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.mina</groupId>
+      <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-asn1-codec</artifactId>
       <version>0.9.6-SNAPSHOT</version>
       <scope>provided</scope>
@@ -41,6 +41,7 @@
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-shared</artifactId>
       <version>${pom.version}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
@@ -103,8 +104,7 @@
             <bundleActivator>
               org.apache.ldap.Activator
             </bundleActivator>
-            <importPackage>
-              org.apache.directory.shared.asn1.codec.stateful,com.sun.jndi.ldap,javax.naming,javax.naming.directory,javax.naming.event,javax.naming.ldap,javax.naming.spi,javax.net.ssl,javax.security.auth.kerberos,org.apache.directory.server.core,org.apache.directory.server.core.authn,org.apache.directory.server.core.configuration,org.apache.directory.server.core.jndi,org.apache.directory.server.core.partition,org.apache.directory.server.core.partition.impl.btree,org.apache.directory.server.core.partition.impl.btree.gui,org.apache.directory.shared.asn1.ber,org.apache.directory.shared.asn1.codec,org.apache.directory.shared.ldap.codec.extended.operations,org.apache.directory.shared.ldap.codec.search.controls,org.apache.directory.shared.ldap.codec.util,org.apache.directory.shared.ldap.exception,org.apache.directory.shared.ldap.filter,org.apache.directory.shared.ldap.message,org.apache.directory.shared.ldap.message.extended,org.apache.directory.shared.ldap.name,org.apache.directo
 ry.shared.ldap.util,org.apache.mina.common,org.apache.mina.filter,org.apache.mina.filter.codec,org.apache.mina.filter.codec.asn1,org.apache.mina.handler.demux,org.apache.mina.transport.socket.nio,org.apache.mina.util,org.apache.felix.servicebinder,org.osgi.service.cm,org.apache.log4j,org.slf4j
+            <importPackage>org.apache.directory.server.protocol.shared, javax.naming,
javax.naming.directory, javax.naming.event, javax.naming.ldap, javax.naming.spi, javax.security.auth.kerberos,
org.apache.commons.lang, org.apache.directory.server.core, org.apache.directory.server.core.authn,
org.apache.directory.server.core.configuration, org.apache.directory.server.core.jndi, org.apache.directory.server.core.partition,
org.apache.directory.server.core.partition.impl.btree, org.apache.directory.server.core.partition.impl.btree.gui,
org.apache.directory.server.core.schema.bootstrap, org.apache.directory.server.core.sp, org.apache.directory.shared.asn1.ber,
org.apache.directory.shared.asn1.codec, org.apache.directory.shared.asn1.codec.stateful, org.apache.directory.shared.ldap.codec.extended.operations,
org.apache.directory.shared.ldap.codec.search.controls, org.apache.directory.shared.ldap.codec.util,
org.apache.directory.shared.ldap.exception, org.apache.directory.shared.
 ldap.filter, org.apache.directory.shared.ldap.ldif, org.apache.directory.shared.ldap.message,
org.apache.directory.shared.ldap.message.extended,  org.apache.directory.shared.ldap.name,
 org.apache.directory.shared.ldap.util, org.apache.felix.servicebinder, org.apache.mina.common,
org.apache.mina.filter, org.apache.mina.filter.codec, org.apache.mina.handler.demux, org.apache.mina.transport.socket.nio,
org.apache.mina.util, org.osgi.service.cm, org.slf4j
             </importPackage>
           </osgiManifest>
         </configuration>

Modified: directory/trunks/apacheds/osgi/protocol-ldap-osgi/src/main/java/org/apache/ldap/LdapConfig.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/osgi/protocol-ldap-osgi/src/main/java/org/apache/ldap/LdapConfig.java?view=diff&rev=485824&r1=485823&r2=485824
==============================================================================
--- directory/trunks/apacheds/osgi/protocol-ldap-osgi/src/main/java/org/apache/ldap/LdapConfig.java
(original)
+++ directory/trunks/apacheds/osgi/protocol-ldap-osgi/src/main/java/org/apache/ldap/LdapConfig.java
Mon Dec 11 11:06:37 2006
@@ -32,8 +32,8 @@
     public static String LDAP_PORT_KEY = "ldap.port";
     public static String LDAPS_PORT_KEY = "ldaps.port";
 
-    private static String LDAP_PORT_DEFAULT = "389";
-    private static String LDAPS_PORT_DEFAULT = "636";
+    private static String LDAP_PORT_DEFAULT = "10389";
+    private static String LDAPS_PORT_DEFAULT = "10636";
 
     private static String SERVICE_PID = "service.pid";
     private static String PID = "org.apache.ldap";

Modified: directory/trunks/apacheds/osgi/protocol-ldap-osgi/src/main/java/org/apache/ldap/LdapServer.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/osgi/protocol-ldap-osgi/src/main/java/org/apache/ldap/LdapServer.java?view=diff&rev=485824&r1=485823&r2=485824
==============================================================================
--- directory/trunks/apacheds/osgi/protocol-ldap-osgi/src/main/java/org/apache/ldap/LdapServer.java
(original)
+++ directory/trunks/apacheds/osgi/protocol-ldap-osgi/src/main/java/org/apache/ldap/LdapServer.java
Mon Dec 11 11:06:37 2006
@@ -22,6 +22,7 @@
 import java.util.Dictionary;
 import java.util.Hashtable;
 
+import org.apache.directory.server.core.configuration.StartupConfiguration;
 import org.apache.directory.server.ldap.LdapProtocolProvider;
 import org.apache.directory.shared.ldap.exception.LdapNamingException;
 import org.apache.mina.common.IoAcceptor;
@@ -47,7 +48,7 @@
 
         try
         {
-            provider = new LdapProtocolProvider( (Hashtable) env.clone() );
+            provider = new LdapProtocolProvider( new StartupConfiguration(), (Hashtable)
env.clone() );
 
             acceptor.bind( new InetSocketAddress( port ), provider.getHandler() );
 



Mime
View raw message