Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-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 E044417931 for ; Mon, 20 Oct 2014 23:06:20 +0000 (UTC) Received: (qmail 6531 invoked by uid 500); 20 Oct 2014 23:06:20 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 6436 invoked by uid 500); 20 Oct 2014 23:06:20 -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 5440 invoked by uid 99); 20 Oct 2014 23:06:20 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Oct 2014 23:06:20 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 315769D3C15; Mon, 20 Oct 2014 23:06:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elecharny@apache.org To: commits@directory.apache.org Date: Mon, 20 Oct 2014 23:07:07 -0000 Message-Id: <9ab77677e3694723b5bf2c0623d4882e@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [50/50] git commit: FC-151 - UnboundID SDK removal preparations - cleanup FC-151 - UnboundID SDK removal preparations - cleanup Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/b59b4541 Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/b59b4541 Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/b59b4541 Branch: refs/heads/master Commit: b59b454158c6a86979574cda3539660ed55c88ed Parents: 39ac279 Author: Shawn McKinney Authored: Mon Oct 20 14:15:57 2014 -0500 Committer: Shawn McKinney Committed: Mon Oct 20 14:15:57 2014 -0500 ---------------------------------------------------------------------- .../openldap/fortress/ldap/ApacheDsDataProvider.java | 14 -------------- 1 file changed, 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/b59b4541/src/main/java/org/openldap/fortress/ldap/ApacheDsDataProvider.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/openldap/fortress/ldap/ApacheDsDataProvider.java b/src/main/java/org/openldap/fortress/ldap/ApacheDsDataProvider.java index aee62b4..f9d235e 100644 --- a/src/main/java/org/openldap/fortress/ldap/ApacheDsDataProvider.java +++ b/src/main/java/org/openldap/fortress/ldap/ApacheDsDataProvider.java @@ -118,20 +118,6 @@ public abstract class ApacheDsDataProvider private static final boolean IS_SSL_DEBUG = ( ( Config.getProperty( ENABLE_LDAP_SSL_DEBUG ) != null ) && ( Config .getProperty( ENABLE_LDAP_SSL_DEBUG ).equalsIgnoreCase( "true" ) ) ); - static - { - if(IS_SET_TRUST_STORE_PROP) - { - LOG.info( "Set JSSE truststore properties:"); - LOG.info( "javax.net.ssl.trustStore: " + TRUST_STORE ); - LOG.info( "javax.net.debug: " + new Boolean( IS_SSL_DEBUG ).toString()); - System.setProperty( "javax.net.ssl.trustStore", TRUST_STORE ); - System.setProperty( "javax.net.ssl.trustStorePassword", TRUST_STORE_PW ); - System.setProperty( "javax.net.debug", new Boolean( IS_SSL_DEBUG ).toString() ); - } - } - - /** * The Admin connection pool */