directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r773848 - in /directory: apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/ shared/trunk/client-api/src/main/java/org/apache/d...
Date Tue, 12 May 2009 11:00:28 GMT
Author: elecharny
Date: Tue May 12 11:00:27 2009
New Revision: 773848

URL: http://svn.apache.org/viewvc?rev=773848&view=rev
Log:
o Fixed a NPE when no server.xml is provided
o Fixed another NPE : LDAPS was not correctly initialized when the default config is used.

o Replaced 686 by 636 everywhere it was used by mistake

Modified:
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaPeerConfiguration.java
    directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java
    directory/shared/trunk/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java
    directory/shared/trunk/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnectionImpl.java

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaPeerConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaPeerConfiguration.java?rev=773848&r1=773847&r2=773848&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaPeerConfiguration.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaPeerConfiguration.java
Tue May 12 11:00:27 2009
@@ -54,7 +54,7 @@
     private static final int DEFAULT_PORT = 10389;
     
     /** The default port */
-    private static final int DEFAULT_SSL_PORT = 10686;
+    private static final int DEFAULT_SSL_PORT = 10636;
     
     /** The producer we want to replicate */
     private LdapURL producer;

Modified: directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java
URL: http://svn.apache.org/viewvc/directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java?rev=773848&r1=773847&r2=773848&view=diff
==============================================================================
--- directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java
(original)
+++ directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java
Tue May 12 11:00:27 2009
@@ -102,7 +102,7 @@
         printBanner( BANNER_LDAP );
         long startTime = System.currentTimeMillis();
 
-        if ( args.length > 0 && new File( args[0] ).exists() ) // hack that takes
server.xml file argument
+        if ( ( args != null ) && ( args.length > 0 ) && new File( args[0]
).exists() ) // hack that takes server.xml file argument
         {
             LOG.info( "server: loading settings from ", args[0] );
             factory = new FileSystemXmlApplicationContext( new File( args[0] ).toURI().toURL().toString()
);
@@ -118,7 +118,7 @@
             ldapService.setTcpTransport( new TcpTransport( 10389 ) );
             ldapService.start();
             LdapService ldapsService = new LdapService();
-            ldapService.setTcpTransport( new TcpTransport( 10686 ) );
+            ldapsService.setTcpTransport( new TcpTransport( 10636 ) );
             ldapsService.setEnableLdaps( true );
             ldapsService.setDirectoryService( directoryService );
             ldapsService.start();

Modified: directory/shared/trunk/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java?rev=773848&r1=773847&r2=773848&view=diff
==============================================================================
--- directory/shared/trunk/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java
(original)
+++ directory/shared/trunk/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java
Tue May 12 11:00:27 2009
@@ -124,7 +124,7 @@
 
     /** Define the default ports for LDAP and LDAPS */
     private static final int DEFAULT_LDAP_PORT = 389; 
-    private static final int DEFAULT_LDAPS_PORT = 686;
+    private static final int DEFAULT_LDAPS_PORT = 636;
     
     /** The default host : localhost */
     private static final String DEFAULT_LDAP_HOST = "127.0.0.1";
@@ -447,7 +447,7 @@
     
     /**
      * Create a new instance of a LdapConnection on localhost,
-     * port 389 if the SSL flag is off, or 686 otherwise.
+     * port 389 if the SSL flag is off, or 636 otherwise.
      * 
      * @param useSsl A flag to tell if it's a SSL connection or not.
      */
@@ -480,7 +480,7 @@
     /**
      * Create a new instance of a LdapConnection on a given
      * server, using the default port (389) if the SSL flag 
-     * is off, or 686 otherwise.
+     * is off, or 636 otherwise.
      *
      * @param server The server we want to be connected to
      * @param useSsl A flag to tell if it's a SSL connection or not.

Modified: directory/shared/trunk/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnectionImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnectionImpl.java?rev=773848&r1=773847&r2=773848&view=diff
==============================================================================
--- directory/shared/trunk/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnectionImpl.java
(original)
+++ directory/shared/trunk/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnectionImpl.java
Tue May 12 11:00:27 2009
@@ -60,7 +60,7 @@
 
     /** Define the default ports for LDAP and LDAPS */
     private static final int DEFAULT_LDAP_PORT = 389; 
-    private static final int DEFAULT_LDAPS_PORT = 686;
+    private static final int DEFAULT_LDAPS_PORT = 636;
     
     /** The default host : localhost */
     private static final String DEFAULT_LDAP_HOST = "127.0.0.1";



Mime
View raw message