From commits-return-8951-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Tue Apr 25 20:38:06 2006 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 62578 invoked from network); 25 Apr 2006 20:38:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 25 Apr 2006 20:38:02 -0000 Received: (qmail 90655 invoked by uid 500); 25 Apr 2006 20:38:01 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 90622 invoked by uid 500); 25 Apr 2006 20:38:01 -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 90602 invoked by uid 99); 25 Apr 2006 20:38:01 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Apr 2006 13:38:01 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 25 Apr 2006 13:38:00 -0700 Received: (qmail 62412 invoked by uid 65534); 25 Apr 2006 20:37:39 -0000 Message-ID: <20060425203738.62399.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r396978 - /directory/trunks/apacheds/osgi/ldap/src/main/java/org/apache/ldap/LdapConfig.java Date: Tue, 25 Apr 2006 20:37:36 -0000 To: commits@directory.apache.org From: erodriguez@apache.org X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: erodriguez Date: Tue Apr 25 13:37:33 2006 New Revision: 396978 URL: http://svn.apache.org/viewcvs?rev=396978&view=rev Log: Updated to use convention in protocol providers of working with attributes as Strings, since they are going to come from JNDI thay way. Modified: directory/trunks/apacheds/osgi/ldap/src/main/java/org/apache/ldap/LdapConfig.java Modified: directory/trunks/apacheds/osgi/ldap/src/main/java/org/apache/ldap/LdapConfig.java URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/osgi/ldap/src/main/java/org/apache/ldap/LdapConfig.java?rev=396978&r1=396977&r2=396978&view=diff ============================================================================== --- directory/trunks/apacheds/osgi/ldap/src/main/java/org/apache/ldap/LdapConfig.java (original) +++ directory/trunks/apacheds/osgi/ldap/src/main/java/org/apache/ldap/LdapConfig.java Tue Apr 25 13:37:33 2006 @@ -32,8 +32,8 @@ public static String LDAP_PORT_KEY = "ldap.port"; public static String LDAPS_PORT_KEY = "ldaps.port"; - private static int LDAP_PORT_DEFAULT = 389; - private static int LDAPS_PORT_DEFAULT = 636; + private static String LDAP_PORT_DEFAULT = "389"; + private static String LDAPS_PORT_DEFAULT = "636"; private static String SERVICE_PID = "service.pid"; private static String PID = "org.apache.ldap"; @@ -114,7 +114,7 @@ return Integer.parseInt( get( key ) ); } - return LDAP_PORT_DEFAULT; + return Integer.parseInt( LDAP_PORT_DEFAULT ); } public int getSecurePort() @@ -126,7 +126,7 @@ return Integer.parseInt( get( key ) ); } - return LDAPS_PORT_DEFAULT; + return Integer.parseInt( LDAPS_PORT_DEFAULT ); } public static Map getDefaultConfig() @@ -134,8 +134,8 @@ Map defaults = new HashMap(); defaults.put( SERVICE_PID, PID ); - defaults.put( LDAP_PORT_KEY, Integer.getInteger( LDAP_PORT_KEY, new Integer( LDAP_PORT_DEFAULT ) ) ); - defaults.put( LDAPS_PORT_KEY, Integer.getInteger( LDAPS_PORT_KEY, new Integer( LDAPS_PORT_DEFAULT ) ) ); + defaults.put( LDAP_PORT_KEY, LDAP_PORT_DEFAULT ); + defaults.put( LDAPS_PORT_KEY, LDAPS_PORT_DEFAULT ); return defaults; }