From commits-return-21966-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Tue May 12 11:01:02 2009 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 76289 invoked from network); 12 May 2009 11:01:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 12 May 2009 11:01:00 -0000 Received: (qmail 8555 invoked by uid 500); 12 May 2009 11:01:00 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 8502 invoked by uid 500); 12 May 2009 11:00:59 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 8492 invoked by uid 99); 12 May 2009 11:00:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 May 2009 11:00:59 +0000 X-ASF-Spam-Status: No, hits=-1998.8 required=10.0 tests=ALL_TRUSTED,FS_REPLICA X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 May 2009 11:00:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 545E12388D55; Tue, 12 May 2009 11:00:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090512110028.545E12388D55@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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";