Return-Path: X-Original-To: apmail-archiva-commits-archive@www.apache.org Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F2722E32E for ; Fri, 22 Feb 2013 16:04:49 +0000 (UTC) Received: (qmail 4907 invoked by uid 500); 22 Feb 2013 16:04:49 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 4871 invoked by uid 500); 22 Feb 2013 16:04:49 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 4864 invoked by uid 99); 22 Feb 2013 16:04:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Feb 2013 16:04:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED 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; Fri, 22 Feb 2013 16:04:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AD83F23889CB; Fri, 22 Feb 2013 16:04:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1449089 - /archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java Date: Fri, 22 Feb 2013 16:04:29 -0000 To: commits@archiva.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130222160429.AD83F23889CB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olamy Date: Fri Feb 22 16:04:29 2013 New Revision: 1449089 URL: http://svn.apache.org/r1449089 Log: ease users life for ldap setup make com.sun.jndi.ldap.LdapCtxFactory default if available. Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java?rev=1449089&r1=1449088&r2=1449089&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java (original) +++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java Fri Feb 22 16:04:29 2013 @@ -53,7 +53,7 @@ import java.util.Set; * @author Olivier Lamy * @since 1.4-M4 */ -@Service( "userConfiguration#archiva" ) +@Service("userConfiguration#archiva") public class DefaultRedbackRuntimeConfigurationAdmin implements RedbackRuntimeConfigurationAdmin, UserConfiguration { @@ -64,11 +64,11 @@ public class DefaultRedbackRuntimeConfig private ArchivaConfiguration archivaConfiguration; @Inject - @Named( value = "userConfiguration#redback" ) + @Named(value = "userConfiguration#redback") UserConfiguration userConfiguration; @Inject - @Named( value = "cache#users" ) + @Named(value = "cache#users") private Cache usersCache; @PostConstruct @@ -128,7 +128,10 @@ public class DefaultRedbackRuntimeConfig ldapConfiguration.getBaseDn() ) ); ldapConfiguration.setContextFactory( - userConfiguration.getString( UserConfigurationKeys.LDAP_CONTEX_FACTORY, null ) ); + userConfiguration.getString( UserConfigurationKeys.LDAP_CONTEX_FACTORY, + isSunContextFactoryAvailable() + ? "com.sun.jndi.ldap.LdapCtxFactory" + : "" ) ); ldapConfiguration.setBindDn( userConfiguration.getConcatenatedList( UserConfigurationKeys.LDAP_BINDDN, null ) ); ldapConfiguration.setPassword( @@ -226,6 +229,19 @@ public class DefaultRedbackRuntimeConfig } } + private boolean isSunContextFactoryAvailable() + { + try + { + return Thread.currentThread().getContextClassLoader().loadClass( "com.sun.jndi.ldap.LdapCtxFactory" ) + != null; + } + catch ( ClassNotFoundException e ) + { + return false; + } + } + public RedbackRuntimeConfiguration getRedbackRuntimeConfiguration() { return build( archivaConfiguration.getConfiguration().getRedbackRuntimeConfiguration() );