Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 57A00200AC8 for ; Tue, 7 Jun 2016 21:06:54 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 560DD160968; Tue, 7 Jun 2016 19:06:54 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1224F160A36 for ; Tue, 7 Jun 2016 21:06:51 +0200 (CEST) Received: (qmail 30148 invoked by uid 500); 7 Jun 2016 19:06:51 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 30139 invoked by uid 99); 7 Jun 2016 19:06:51 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Jun 2016 19:06:51 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id A1576C0773 for ; Tue, 7 Jun 2016 19:06:50 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id nEiW7PGkciTQ for ; Tue, 7 Jun 2016 19:06:25 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with SMTP id B033C5FB38 for ; Tue, 7 Jun 2016 19:06:21 +0000 (UTC) Received: (qmail 21163 invoked by uid 99); 7 Jun 2016 19:06:20 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Jun 2016 19:06:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 75055E964E; Tue, 7 Jun 2016 19:06:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hiteshkhamesra@apache.org To: commits@geode.incubator.apache.org Date: Tue, 07 Jun 2016 19:06:29 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/55] [abbrv] incubator-geode git commit: GEODE-1377: Initial move of system properties from private to public archived-at: Tue, 07 Jun 2016 19:06:54 -0000 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java index 32a3d73..e1e5123 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java @@ -742,8 +742,8 @@ public class DistributionConfigImpl } private void validateOldSSLVsNewSSLProperties(Map props) { - String sslEnabledString = (String)props.get(SSL_ENABLED_NAME); - String clusterSSLEnabledString =(String)props.get(CLUSTER_SSL_ENABLED_NAME); + String sslEnabledString = (String)props.get(SSL_ENABLED); + String clusterSSLEnabledString =(String)props.get(CLUSTER_SSL_ENABLED); if(sslEnabledString != null && clusterSSLEnabledString != null){ boolean sslEnabled = new Boolean(sslEnabledString).booleanValue(); boolean clusterSSLEnabled =new Boolean(clusterSSLEnabledString).booleanValue(); @@ -753,8 +753,8 @@ public class DistributionConfigImpl } } - String sslCipher = (String)props.get(SSL_CIPHERS_NAME); - String clusterSSLCipher = (String)props.get(CLUSTER_SSL_CIPHERS_NAME); + String sslCipher = (String)props.get(SSL_CIPHERS); + String clusterSSLCipher = (String)props.get(CLUSTER_SSL_CIPHERS); if (sslCipher != null && clusterSSLCipher != null) { if ( !sslCipher.equals(clusterSSLCipher) ) { throw new IllegalArgumentException( @@ -762,8 +762,8 @@ public class DistributionConfigImpl } } - String sslProtocol = (String)props.get(SSL_PROTOCOLS_NAME); - String clusterSSLProtocol = (String)props.get(CLUSTER_SSL_PROTOCOLS_NAME); + String sslProtocol = (String)props.get(SSL_PROTOCOLS); + String clusterSSLProtocol = (String)props.get(CLUSTER_SSL_PROTOCOLS); if (sslProtocol != null && clusterSSLProtocol != null) { if ( !sslProtocol.equals(clusterSSLProtocol) ) { throw new IllegalArgumentException( @@ -771,8 +771,8 @@ public class DistributionConfigImpl } } - String sslReqAuthString = (String)props.get(SSL_REQUIRE_AUTHENTICATION_NAME); - String clusterReqAuthString =(String)props.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME); + String sslReqAuthString = (String)props.get(SSL_REQUIRE_AUTHENTICATION); + String clusterReqAuthString =(String)props.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION); if(sslReqAuthString != null && clusterReqAuthString != null){ boolean sslReqAuth = new Boolean(sslReqAuthString).booleanValue(); boolean clusterSSLReqAuth =new Boolean(clusterReqAuthString).booleanValue(); @@ -782,8 +782,8 @@ public class DistributionConfigImpl } } - String jmxSSLString = (String)props.get(JMX_MANAGER_SSL_NAME); - String jmxSSLEnabledString =(String)props.get(JMX_MANAGER_SSL_ENABLED_NAME); + String jmxSSLString = (String)props.get(JMX_MANAGER_SSL); + String jmxSSLEnabledString =(String)props.get(JMX_MANAGER_SSL_ENABLED); if(jmxSSLString != null && jmxSSLEnabledString != null){ boolean jmxSSL = new Boolean(jmxSSLString).booleanValue(); boolean jmxSSLEnabled =new Boolean(jmxSSLEnabledString).booleanValue(); @@ -798,26 +798,26 @@ public class DistributionConfigImpl * ssl-* properties will be copied in cluster-ssl-* properties. Socket is using cluster-ssl-* properties */ private void copySSLPropsToClusterSSLProps() { - boolean clusterSSLOverriden = this.sourceMap.get(CLUSTER_SSL_ENABLED_NAME)!=null; - boolean p2pSSLOverRidden = this.sourceMap.get(SSL_ENABLED_NAME)!=null; + boolean clusterSSLOverriden = this.sourceMap.get(CLUSTER_SSL_ENABLED)!=null; + boolean p2pSSLOverRidden = this.sourceMap.get(SSL_ENABLED)!=null; if(p2pSSLOverRidden && !clusterSSLOverriden) { this.clusterSSLEnabled = this.sslEnabled; - this.sourceMap.put(CLUSTER_SSL_ENABLED_NAME,this.sourceMap.get(SSL_ENABLED_NAME)); + this.sourceMap.put(CLUSTER_SSL_ENABLED,this.sourceMap.get(SSL_ENABLED)); - if(this.sourceMap.get(SSL_CIPHERS_NAME)!=null) { + if(this.sourceMap.get(SSL_CIPHERS)!=null) { this.clusterSSLCiphers = this.sslCiphers; - this.sourceMap.put(CLUSTER_SSL_CIPHERS_NAME,this.sourceMap.get(SSL_CIPHERS_NAME)); + this.sourceMap.put(CLUSTER_SSL_CIPHERS,this.sourceMap.get(SSL_CIPHERS)); } - if(this.sourceMap.get(SSL_PROTOCOLS_NAME)!=null) { + if(this.sourceMap.get(SSL_PROTOCOLS)!=null) { this.clusterSSLProtocols = this.sslProtocols; - this.sourceMap.put(CLUSTER_SSL_PROTOCOLS_NAME,this.sourceMap.get(SSL_PROTOCOLS_NAME)); + this.sourceMap.put(CLUSTER_SSL_PROTOCOLS,this.sourceMap.get(SSL_PROTOCOLS)); } - if(this.sourceMap.get(SSL_REQUIRE_AUTHENTICATION_NAME)!=null) { + if(this.sourceMap.get(SSL_REQUIRE_AUTHENTICATION)!=null) { this.clusterSSLRequireAuthentication = this.sslRequireAuthentication; - this.sourceMap.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME,this.sourceMap.get(SSL_REQUIRE_AUTHENTICATION_NAME)); + this.sourceMap.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION,this.sourceMap.get(SSL_REQUIRE_AUTHENTICATION)); } this.clusterSSLProperties.putAll(this.sslProperties); } @@ -829,76 +829,76 @@ public class DistributionConfigImpl * if jmx-manager-ssl-*properties are given then use them, and copy the unspecified jmx-manager properties from cluster-properties */ private void copySSLPropsToJMXSSLProps() { - boolean jmxSSLEnabledOverriden = this.sourceMap.get(JMX_MANAGER_SSL_ENABLED_NAME)!=null; - boolean jmxSSLOverriden = this.sourceMap.get(JMX_MANAGER_SSL_NAME)!=null; - boolean clusterSSLOverRidden = this.sourceMap.get(CLUSTER_SSL_ENABLED_NAME)!=null; + boolean jmxSSLEnabledOverriden = this.sourceMap.get(JMX_MANAGER_SSL_ENABLED)!=null; + boolean jmxSSLOverriden = this.sourceMap.get(JMX_MANAGER_SSL)!=null; + boolean clusterSSLOverRidden = this.sourceMap.get(CLUSTER_SSL_ENABLED)!=null; if(jmxSSLOverriden && !jmxSSLEnabledOverriden) { this.jmxManagerSSLEnabled = this.jmxManagerSSL; - this.sourceMap.put(JMX_MANAGER_SSL_ENABLED_NAME,this.sourceMap.get(JMX_MANAGER_SSL_NAME)); + this.sourceMap.put(JMX_MANAGER_SSL_ENABLED,this.sourceMap.get(JMX_MANAGER_SSL)); } if(clusterSSLOverRidden && !jmxSSLOverriden && !jmxSSLEnabledOverriden) { this.jmxManagerSSLEnabled = this.clusterSSLEnabled; - this.sourceMap.put(JMX_MANAGER_SSL_ENABLED_NAME,this.sourceMap.get(CLUSTER_SSL_ENABLED_NAME)); - if(this.sourceMap.get(CLUSTER_SSL_CIPHERS_NAME)!=null) { + this.sourceMap.put(JMX_MANAGER_SSL_ENABLED,this.sourceMap.get(CLUSTER_SSL_ENABLED)); + if(this.sourceMap.get(CLUSTER_SSL_CIPHERS)!=null) { this.jmxManagerSslCiphers = this.clusterSSLCiphers; - this.sourceMap.put(JMX_MANAGER_SSL_CIPHERS_NAME,this.sourceMap.get(CLUSTER_SSL_CIPHERS_NAME)); + this.sourceMap.put(JMX_MANAGER_SSL_CIPHERS_NAME,this.sourceMap.get(CLUSTER_SSL_CIPHERS)); } - if(this.sourceMap.get(CLUSTER_SSL_PROTOCOLS_NAME)!=null) { + if(this.sourceMap.get(CLUSTER_SSL_PROTOCOLS)!=null) { this.jmxManagerSslProtocols = this.clusterSSLProtocols; - this.sourceMap.put(JMX_MANAGER_SSL_PROTOCOLS_NAME,this.sourceMap.get(CLUSTER_SSL_PROTOCOLS_NAME)); + this.sourceMap.put(JMX_MANAGER_SSL_PROTOCOLS,this.sourceMap.get(CLUSTER_SSL_PROTOCOLS)); } - if(this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME)!=null) { + if(this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION)!=null) { this.jmxManagerSslRequireAuthentication = this.clusterSSLRequireAuthentication; - this.sourceMap.put(JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION_NAME,this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME)); + this.sourceMap.put(JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION,this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION)); } - if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME)!=null) { + if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE)!=null) { this.jmxManagerSSLKeyStore = this.clusterSSLKeyStore; - this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME)); + this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE)); } - if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME)!=null) { + if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE)!=null) { this.jmxManagerSSLKeyStoreType = this.clusterSSLKeyStoreType; - this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_TYPE_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME)); + this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_TYPE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE)); } - if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME)!=null) { + if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD)!=null) { this.jmxManagerSSLKeyStorePassword = this.clusterSSLKeyStorePassword; - this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_PASSWORD_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME)); + this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD)); } - if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME)!=null) { + if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE)!=null) { this.jmxManagerSSLTrustStore= this.clusterSSLTrustStore; - this.sourceMap.put(JMX_MANAGER_SSL_TRUSTSTORE_NAME,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME)); + this.sourceMap.put(JMX_MANAGER_SSL_TRUSTSTORE,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE)); } - if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME)!=null) { + if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD)!=null) { this.jmxManagerSSLTrustStorePassword= this.clusterSSLTrustStorePassword; - this.sourceMap.put(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD_NAME,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME)); + this.sourceMap.put(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD)); } this.jmxManagerSslProperties.putAll(this.clusterSSLProperties); } if(jmxSSLOverriden || jmxSSLEnabledOverriden){ - if(this.sourceMap.get(JMX_MANAGER_SSL_KEYSTORE_NAME)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME) != null) { + if(this.sourceMap.get(JMX_MANAGER_SSL_KEYSTORE)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE) != null) { this.jmxManagerSSLKeyStore = this.clusterSSLKeyStore; - this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME)); + this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE)); } - if(this.sourceMap.get(JMX_MANAGER_SSL_KEYSTORE_TYPE_NAME)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME) != null) { + if(this.sourceMap.get(JMX_MANAGER_SSL_KEYSTORE_TYPE)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE) != null) { this.jmxManagerSSLKeyStoreType = this.clusterSSLKeyStoreType; - this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_TYPE_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME)); + this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_TYPE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE)); } - if(this.sourceMap.get(JMX_MANAGER_SSL_KEYSTORE_PASSWORD_NAME)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME) != null) { + if(this.sourceMap.get(JMX_MANAGER_SSL_KEYSTORE_PASSWORD)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD) != null) { this.jmxManagerSSLKeyStorePassword = this.clusterSSLKeyStorePassword; - this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_PASSWORD_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME)); + this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD)); } - if(this.sourceMap.get(JMX_MANAGER_SSL_TRUSTSTORE_NAME)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME) != null) { + if(this.sourceMap.get(JMX_MANAGER_SSL_TRUSTSTORE)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE) != null) { this.jmxManagerSSLTrustStore= this.clusterSSLTrustStore; - this.sourceMap.put(JMX_MANAGER_SSL_TRUSTSTORE_NAME,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME)); + this.sourceMap.put(JMX_MANAGER_SSL_TRUSTSTORE,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE)); } - if(this.sourceMap.get(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD_NAME)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME) != null) { + if(this.sourceMap.get(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD) != null) { this.jmxManagerSSLTrustStorePassword= this.clusterSSLTrustStorePassword; - this.sourceMap.put(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD_NAME,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME)); + this.sourceMap.put(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD)); } } @@ -911,80 +911,80 @@ public class DistributionConfigImpl private void copySSLPropsToHTTPSSLProps() { boolean httpServiceSSLEnabledOverriden = this.sourceMap.get(HTTP_SERVICE_SSL_ENABLED_NAME) != null; - boolean clusterSSLOverRidden = this.sourceMap.get(CLUSTER_SSL_ENABLED_NAME) != null; + boolean clusterSSLOverRidden = this.sourceMap.get(CLUSTER_SSL_ENABLED) != null; if (clusterSSLOverRidden && !httpServiceSSLEnabledOverriden) { this.httpServiceSSLEnabled = this.clusterSSLEnabled; - this.sourceMap.put(HTTP_SERVICE_SSL_ENABLED_NAME, this.sourceMap.get(CLUSTER_SSL_ENABLED_NAME)); + this.sourceMap.put(HTTP_SERVICE_SSL_ENABLED, this.sourceMap.get(CLUSTER_SSL_ENABLED)); - if (this.sourceMap.get(CLUSTER_SSL_CIPHERS_NAME) != null) { + if (this.sourceMap.get(CLUSTER_SSL_CIPHERS) != null) { this.httpServiceSSLCiphers = this.clusterSSLCiphers; - this.sourceMap.put(HTTP_SERVICE_SSL_CIPHERS_NAME, this.sourceMap.get(CLUSTER_SSL_CIPHERS_NAME)); + this.sourceMap.put(HTTP_SERVICE_SSL_CIPHERS, this.sourceMap.get(CLUSTER_SSL_CIPHERS)); } - if (this.sourceMap.get(CLUSTER_SSL_PROTOCOLS_NAME) != null) { + if (this.sourceMap.get(CLUSTER_SSL_PROTOCOLS) != null) { this.httpServiceSSLProtocols = this.clusterSSLProtocols; - this.sourceMap.put(HTTP_SERVICE_SSL_PROTOCOLS_NAME, this.sourceMap.get(CLUSTER_SSL_PROTOCOLS_NAME)); + this.sourceMap.put(HTTP_SERVICE_SSL_PROTOCOLS, this.sourceMap.get(CLUSTER_SSL_PROTOCOLS)); } - if (this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME) != null) { + if (this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION) != null) { this.httpServiceSSLRequireAuthentication = this.clusterSSLRequireAuthentication; - this.sourceMap.put(HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION_NAME, - this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME)); + this.sourceMap.put(HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION, + this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION)); } - if (this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME) != null) { + if (this.sourceMap.get(CLUSTER_SSL_KEYSTORE) != null) { this.httpServiceSSLKeyStore = this.clusterSSLKeyStore; - this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_NAME, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME)); + this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE, this.sourceMap.get(CLUSTER_SSL_KEYSTORE)); } - if (this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME) != null) { + if (this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE) != null) { this.httpServiceSSLKeyStoreType = this.clusterSSLKeyStoreType; - this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_TYPE_NAME, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME)); + this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_TYPE, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE)); } - if (this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME) != null) { + if (this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD) != null) { this.httpServiceSSLKeyStorePassword = this.clusterSSLKeyStorePassword; - this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME, - this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME)); + this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, + this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD)); } - if (this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME) != null) { + if (this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE) != null) { this.httpServiceSSLTrustStore = this.clusterSSLTrustStore; - this.sourceMap.put(HTTP_SERVICE_SSL_TRUSTSTORE_NAME, this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME)); + this.sourceMap.put(HTTP_SERVICE_SSL_TRUSTSTORE, this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE)); } - if (this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME) != null) { + if (this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD) != null) { this.httpServiceSSLTrustStorePassword = this.clusterSSLTrustStorePassword; - this.sourceMap.put(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD_NAME, - this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME)); + this.sourceMap.put(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD, + this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD)); } this.httpServiceSSLProperties.putAll(this.clusterSSLProperties); } if (httpServiceSSLEnabledOverriden) { - if (this.sourceMap.get(HTTP_SERVICE_SSL_KEYSTORE_NAME) == null - && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME) != null) { + if (this.sourceMap.get(HTTP_SERVICE_SSL_KEYSTORE) == null + && this.sourceMap.get(CLUSTER_SSL_KEYSTORE) != null) { this.httpServiceSSLKeyStore = this.clusterSSLKeyStore; - this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_NAME, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME)); + this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE, this.sourceMap.get(CLUSTER_SSL_KEYSTORE)); } - if (this.sourceMap.get(HTTP_SERVICE_SSL_KEYSTORE_TYPE_NAME) == null - && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME) != null) { + if (this.sourceMap.get(HTTP_SERVICE_SSL_KEYSTORE_TYPE) == null + && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE) != null) { this.httpServiceSSLKeyStoreType = this.clusterSSLKeyStoreType; - this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_TYPE_NAME, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME)); + this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_TYPE, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE)); } - if (this.sourceMap.get(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME) == null - && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME) != null) { + if (this.sourceMap.get(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD) == null + && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD) != null) { this.httpServiceSSLKeyStorePassword = this.clusterSSLKeyStorePassword; - this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME, - this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME)); + this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, + this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD)); } - if (this.sourceMap.get(HTTP_SERVICE_SSL_TRUSTSTORE_NAME) == null - && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME) != null) { + if (this.sourceMap.get(HTTP_SERVICE_SSL_TRUSTSTORE) == null + && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE) != null) { this.httpServiceSSLTrustStore = this.clusterSSLTrustStore; - this.sourceMap.put(HTTP_SERVICE_SSL_TRUSTSTORE_NAME, this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME)); + this.sourceMap.put(HTTP_SERVICE_SSL_TRUSTSTORE, this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE)); } - if (this.sourceMap.get(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD_NAME) == null - && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME) != null) { + if (this.sourceMap.get(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD) == null + && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD) != null) { this.httpServiceSSLTrustStorePassword = this.clusterSSLTrustStorePassword; - this.sourceMap.put(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD_NAME, - this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME)); + this.sourceMap.put(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD, + this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD)); } } @@ -995,70 +995,70 @@ public class DistributionConfigImpl * if server-ssl-*properties are given then use them, and copy the unspecified server properties from cluster-properties */ private void copySSLPropsToServerSSLProps() { - boolean cacheServerSSLOverriden = this.sourceMap.get(SERVER_SSL_ENABLED_NAME)!=null; - boolean clusterSSLOverRidden = this.sourceMap.get(CLUSTER_SSL_ENABLED_NAME)!=null; + boolean cacheServerSSLOverriden = this.sourceMap.get(SERVER_SSL_ENABLED)!=null; + boolean clusterSSLOverRidden = this.sourceMap.get(CLUSTER_SSL_ENABLED)!=null; if(clusterSSLOverRidden && !cacheServerSSLOverriden) { this.serverSSLEnabled = this.clusterSSLEnabled; - this.sourceMap.put(SERVER_SSL_ENABLED_NAME,this.sourceMap.get(CLUSTER_SSL_ENABLED_NAME)); - if(this.sourceMap.get(CLUSTER_SSL_CIPHERS_NAME)!=null) { + this.sourceMap.put(SERVER_SSL_ENABLED,this.sourceMap.get(CLUSTER_SSL_ENABLED)); + if(this.sourceMap.get(CLUSTER_SSL_CIPHERS)!=null) { this.serverSslCiphers = this.clusterSSLCiphers; - this.sourceMap.put(SERVER_SSL_CIPHERS_NAME,this.sourceMap.get(CLUSTER_SSL_CIPHERS_NAME)); + this.sourceMap.put(SERVER_SSL_CIPHERS,this.sourceMap.get(CLUSTER_SSL_CIPHERS)); } - if(this.sourceMap.get(CLUSTER_SSL_PROTOCOLS_NAME)!=null) { + if(this.sourceMap.get(CLUSTER_SSL_PROTOCOLS)!=null) { this.serverSslProtocols = this.clusterSSLProtocols; - this.sourceMap.put(SERVER_SSL_PROTOCOLS_NAME,this.sourceMap.get(CLUSTER_SSL_PROTOCOLS_NAME)); + this.sourceMap.put(SERVER_SSL_PROTOCOLS,this.sourceMap.get(CLUSTER_SSL_PROTOCOLS)); } - if(this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME)!=null) { + if(this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION)!=null) { this.serverSslRequireAuthentication = this.clusterSSLRequireAuthentication; - this.sourceMap.put(SERVER_SSL_REQUIRE_AUTHENTICATION_NAME,this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME)); + this.sourceMap.put(SERVER_SSL_REQUIRE_AUTHENTICATION,this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION)); } - if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME)!=null) { + if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE)!=null) { this.serverSSLKeyStore = this.clusterSSLKeyStore; - this.sourceMap.put(SERVER_SSL_KEYSTORE_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME)); + this.sourceMap.put(SERVER_SSL_KEYSTORE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE)); } - if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME)!=null) { + if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE)!=null) { this.serverSSLKeyStoreType = this.clusterSSLKeyStoreType; - this.sourceMap.put(SERVER_SSL_KEYSTORE_TYPE_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME)); + this.sourceMap.put(SERVER_SSL_KEYSTORE_TYPE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE)); } - if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME)!=null) { + if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD)!=null) { this.serverSSLKeyStorePassword = this.clusterSSLKeyStorePassword; - this.sourceMap.put(SERVER_SSL_KEYSTORE_PASSWORD_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME)); + this.sourceMap.put(SERVER_SSL_KEYSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD)); } - if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME)!=null) { + if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE)!=null) { this.serverSSLTrustStore= this.clusterSSLTrustStore; - this.sourceMap.put(SERVER_SSL_TRUSTSTORE_NAME,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME)); + this.sourceMap.put(SERVER_SSL_TRUSTSTORE,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE)); } - if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME)!=null) { + if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD)!=null) { this.serverSSLTrustStorePassword= this.clusterSSLTrustStorePassword; - this.sourceMap.put(SERVER_SSL_TRUSTSTORE_PASSWORD_NAME,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME)); + this.sourceMap.put(SERVER_SSL_TRUSTSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD)); } this.serverSslProperties.putAll(this.clusterSSLProperties); } if(cacheServerSSLOverriden){ - if(this.sourceMap.get(SERVER_SSL_KEYSTORE_NAME)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME) != null) { + if(this.sourceMap.get(SERVER_SSL_KEYSTORE)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE) != null) { this.serverSSLKeyStore = this.clusterSSLKeyStore; - this.sourceMap.put(SERVER_SSL_KEYSTORE_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME)); + this.sourceMap.put(SERVER_SSL_KEYSTORE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE)); } - if(this.sourceMap.get(SERVER_SSL_KEYSTORE_TYPE_NAME)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME) != null) { + if(this.sourceMap.get(SERVER_SSL_KEYSTORE_TYPE)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE) != null) { this.serverSSLKeyStoreType = this.clusterSSLKeyStoreType; - this.sourceMap.put(SERVER_SSL_KEYSTORE_TYPE_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME)); + this.sourceMap.put(SERVER_SSL_KEYSTORE_TYPE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE)); } - if(this.sourceMap.get(SERVER_SSL_KEYSTORE_PASSWORD_NAME)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME) != null) { + if(this.sourceMap.get(SERVER_SSL_KEYSTORE_PASSWORD)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD) != null) { this.serverSSLKeyStorePassword = this.clusterSSLKeyStorePassword; - this.sourceMap.put(SERVER_SSL_KEYSTORE_PASSWORD_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME)); + this.sourceMap.put(SERVER_SSL_KEYSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD)); } - if(this.sourceMap.get(SERVER_SSL_TRUSTSTORE_NAME)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME) != null) { + if(this.sourceMap.get(SERVER_SSL_TRUSTSTORE)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE) != null) { this.serverSSLTrustStore= this.clusterSSLTrustStore; - this.sourceMap.put(SERVER_SSL_TRUSTSTORE_NAME,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME)); + this.sourceMap.put(SERVER_SSL_TRUSTSTORE,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE)); } - if(this.sourceMap.get(SERVER_SSL_TRUSTSTORE_PASSWORD_NAME)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME) != null) { + if(this.sourceMap.get(SERVER_SSL_TRUSTSTORE_PASSWORD)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD) != null) { this.serverSSLTrustStorePassword= this.clusterSSLTrustStorePassword; - this.sourceMap.put(SERVER_SSL_TRUSTSTORE_PASSWORD_NAME,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME)); + this.sourceMap.put(SERVER_SSL_TRUSTSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD)); } } } @@ -1068,70 +1068,70 @@ public class DistributionConfigImpl * if gateway-ssl-*properties are given then use them, and copy the unspecified gateway properties from cluster-properties */ private void copyClusterSSLPropsToGatewaySSLProps() { - boolean gatewaySSLOverriden = this.sourceMap.get(GATEWAY_SSL_ENABLED_NAME)!=null; - boolean clusterSSLOverRidden = this.sourceMap.get(CLUSTER_SSL_ENABLED_NAME)!=null; + boolean gatewaySSLOverriden = this.sourceMap.get(GATEWAY_SSL_ENABLED)!=null; + boolean clusterSSLOverRidden = this.sourceMap.get(CLUSTER_SSL_ENABLED)!=null; if(clusterSSLOverRidden && !gatewaySSLOverriden) { this.gatewaySSLEnabled = this.clusterSSLEnabled; - this.sourceMap.put(GATEWAY_SSL_ENABLED_NAME,this.sourceMap.get(CLUSTER_SSL_ENABLED_NAME)); - if(this.sourceMap.get(CLUSTER_SSL_CIPHERS_NAME)!=null) { + this.sourceMap.put(GATEWAY_SSL_ENABLED,this.sourceMap.get(CLUSTER_SSL_ENABLED)); + if(this.sourceMap.get(CLUSTER_SSL_CIPHERS)!=null) { this.gatewaySslCiphers = this.clusterSSLCiphers; - this.sourceMap.put(GATEWAY_SSL_CIPHERS_NAME,this.sourceMap.get(CLUSTER_SSL_CIPHERS_NAME)); + this.sourceMap.put(GATEWAY_SSL_CIPHERS,this.sourceMap.get(CLUSTER_SSL_CIPHERS)); } - if(this.sourceMap.get(CLUSTER_SSL_PROTOCOLS_NAME)!=null) { + if(this.sourceMap.get(CLUSTER_SSL_PROTOCOLS)!=null) { this.gatewaySslProtocols = this.clusterSSLProtocols; - this.sourceMap.put(GATEWAY_SSL_PROTOCOLS_NAME,this.sourceMap.get(CLUSTER_SSL_PROTOCOLS_NAME)); + this.sourceMap.put(GATEWAY_SSL_PROTOCOLS,this.sourceMap.get(CLUSTER_SSL_PROTOCOLS)); } - if(this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME)!=null) { + if(this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION)!=null) { this.gatewaySslRequireAuthentication = this.clusterSSLRequireAuthentication; - this.sourceMap.put(GATEWAY_SSL_REQUIRE_AUTHENTICATION_NAME,this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME)); + this.sourceMap.put(GATEWAY_SSL_REQUIRE_AUTHENTICATION,this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION)); } - if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME)!=null) { + if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE)!=null) { this.gatewaySSLKeyStore = this.clusterSSLKeyStore; - this.sourceMap.put(GATEWAY_SSL_KEYSTORE_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME)); + this.sourceMap.put(GATEWAY_SSL_KEYSTORE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE)); } - if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME)!=null) { + if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE)!=null) { this.gatewaySSLKeyStoreType = this.clusterSSLKeyStoreType; - this.sourceMap.put(GATEWAY_SSL_KEYSTORE_TYPE_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME)); + this.sourceMap.put(GATEWAY_SSL_KEYSTORE_TYPE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE)); } - if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME)!=null) { + if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD)!=null) { this.gatewaySSLKeyStorePassword = this.clusterSSLKeyStorePassword; - this.sourceMap.put(GATEWAY_SSL_KEYSTORE_PASSWORD_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME)); + this.sourceMap.put(GATEWAY_SSL_KEYSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD)); } - if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME)!=null) { + if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE)!=null) { this.gatewaySSLTrustStore= this.clusterSSLTrustStore; - this.sourceMap.put(GATEWAY_SSL_TRUSTSTORE_NAME,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME)); + this.sourceMap.put(GATEWAY_SSL_TRUSTSTORE,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE)); } - if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME)!=null) { + if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD)!=null) { this.gatewaySSLTrustStorePassword= this.clusterSSLTrustStorePassword; - this.sourceMap.put(GATEWAY_SSL_TRUSTSTORE_PASSWORD_NAME,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME)); + this.sourceMap.put(GATEWAY_SSL_TRUSTSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD)); } this.gatewaySslProperties.putAll(this.clusterSSLProperties); } if(gatewaySSLOverriden){ - if(this.sourceMap.get(GATEWAY_SSL_KEYSTORE_NAME)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME) != null) { + if(this.sourceMap.get(GATEWAY_SSL_KEYSTORE)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE) != null) { this.gatewaySSLKeyStore = this.clusterSSLKeyStore; - this.sourceMap.put(GATEWAY_SSL_KEYSTORE_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME)); + this.sourceMap.put(GATEWAY_SSL_KEYSTORE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE)); } - if(this.sourceMap.get(GATEWAY_SSL_KEYSTORE_TYPE_NAME)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME) != null) { + if(this.sourceMap.get(GATEWAY_SSL_KEYSTORE_TYPE)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE) != null) { this.gatewaySSLKeyStoreType = this.clusterSSLKeyStoreType; - this.sourceMap.put(GATEWAY_SSL_KEYSTORE_TYPE_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME)); + this.sourceMap.put(GATEWAY_SSL_KEYSTORE_TYPE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE)); } - if(this.sourceMap.get(GATEWAY_SSL_KEYSTORE_PASSWORD_NAME)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME) != null) { + if(this.sourceMap.get(GATEWAY_SSL_KEYSTORE_PASSWORD)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD) != null) { this.gatewaySSLKeyStorePassword = this.clusterSSLKeyStorePassword; - this.sourceMap.put(GATEWAY_SSL_KEYSTORE_PASSWORD_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME)); + this.sourceMap.put(GATEWAY_SSL_KEYSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD)); } - if(this.sourceMap.get(GATEWAY_SSL_TRUSTSTORE_NAME)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME)!= null) { + if(this.sourceMap.get(GATEWAY_SSL_TRUSTSTORE)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE)!= null) { this.gatewaySSLTrustStore= this.clusterSSLTrustStore; - this.sourceMap.put(GATEWAY_SSL_TRUSTSTORE_NAME,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME)); + this.sourceMap.put(GATEWAY_SSL_TRUSTSTORE,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE)); } - if(this.sourceMap.get(GATEWAY_SSL_TRUSTSTORE_PASSWORD_NAME)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME) != null) { + if(this.sourceMap.get(GATEWAY_SSL_TRUSTSTORE_PASSWORD)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD) != null) { this.gatewaySSLTrustStorePassword= this.clusterSSLTrustStorePassword; - this.sourceMap.put(GATEWAY_SSL_TRUSTSTORE_PASSWORD_NAME,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME)); + this.sourceMap.put(GATEWAY_SSL_TRUSTSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD)); } } } @@ -1200,10 +1200,10 @@ public class DistributionConfigImpl } public static boolean specialPropName(String propName) { - return propName.equalsIgnoreCase(SSL_ENABLED_NAME) || - propName.equalsIgnoreCase(CLUSTER_SSL_ENABLED_NAME) || - propName.equals(SECURITY_PEER_AUTH_INIT_NAME) || - propName.equals(SECURITY_PEER_AUTHENTICATOR_NAME) || + return propName.equalsIgnoreCase(SSL_ENABLED) || + propName.equalsIgnoreCase(CLUSTER_SSL_ENABLED) || + propName.equals(SECURITY_PEER_AUTH_INIT) || + propName.equals(SECURITY_PEER_AUTHENTICATOR) || propName.equals(LOG_WRITER_NAME) || propName.equals(DS_CONFIG_NAME) || propName.equals(SECURITY_LOG_WRITER_NAME) || @@ -1305,11 +1305,11 @@ public class DistributionConfigImpl } } // now set ssl-enabled if needed... - if ( props.containsKey(SSL_ENABLED_NAME) ) { - this.setAttribute(SSL_ENABLED_NAME, (String) props.get( SSL_ENABLED_NAME ), this.sourceMap.get(SSL_ENABLED_NAME) ); + if ( props.containsKey(SSL_ENABLED) ) { + this.setAttribute(SSL_ENABLED, (String) props.get( SSL_ENABLED ), this.sourceMap.get(SSL_ENABLED) ); } - if ( props.containsKey(CLUSTER_SSL_ENABLED_NAME) ) { - this.setAttribute(CLUSTER_SSL_ENABLED_NAME, (String) props.get( CLUSTER_SSL_ENABLED_NAME ), this.sourceMap.get(CLUSTER_SSL_ENABLED_NAME) ); + if ( props.containsKey(CLUSTER_SSL_ENABLED) ) { + this.setAttribute(CLUSTER_SSL_ENABLED, (String) props.get( CLUSTER_SSL_ENABLED ), this.sourceMap.get(CLUSTER_SSL_ENABLED) ); } // now set the security authInit if needed if (props.containsKey(SECURITY_PEER_AUTH_INIT_NAME)) { @@ -1557,7 +1557,7 @@ public class DistributionConfigImpl } public void setUserCommandPackages(String value) { - this.userCommandPackages = (String)checkAttribute(USER_COMMAND_PACKAGES, value); + this.userCommandPackages = (String)checkAttribute(SystemConfigurationProperties.USER_COMMAND_PACKAGES, value); } public boolean getDeltaPropagation() { @@ -1584,16 +1584,16 @@ public class DistributionConfigImpl this.mcastTtl = (Integer) checkAttribute(MCAST_TTL, value); } public void setSocketLeaseTime(int value) { - this.socketLeaseTime = (Integer)checkAttribute(SOCKET_LEASE_TIME_NAME, value); + this.socketLeaseTime = (Integer)checkAttribute(SOCKET_LEASE_TIME, value); } public void setSocketBufferSize(int value) { - this.socketBufferSize = (Integer)checkAttribute(SOCKET_BUFFER_SIZE_NAME, value); + this.socketBufferSize = (Integer)checkAttribute(SOCKET_BUFFER_SIZE, value); } public void setConserveSockets(boolean value) { - this.conserveSockets = (Boolean)checkAttribute(CONSERVE_SOCKETS_NAME, value); + this.conserveSockets = (Boolean)checkAttribute(CONSERVE_SOCKETS, value); } public void setRoles(String value) { - this.roles = (String)checkAttribute(ROLES_NAME, value); + this.roles = (String)checkAttribute(ROLES, value); } public void setMaxWaitTimeForReconnect(int value){ @@ -1629,13 +1629,13 @@ public class DistributionConfigImpl } public void setDeployWorkingDir(File value) { - this.deployWorkingDir = (File)checkAttribute(DEPLOY_WORKING_DIR, value); + this.deployWorkingDir = (File)checkAttribute(SystemConfigurationProperties.DEPLOY_WORKING_DIR, value); } public void setLogFile(File value) { - this.logFile = (File)checkAttribute(LOG_FILE_NAME, value); + this.logFile = (File)checkAttribute(LOG_FILE, value); } public void setLogLevel(int value) { - this.logLevel = (Integer)checkAttribute(LOG_LEVEL_NAME, value); + this.logLevel = (Integer)checkAttribute(LOG_LEVEL, value); } /** * the locator startup code must be able to modify the locator log file in order @@ -1680,10 +1680,10 @@ public class DistributionConfigImpl this.startLocator = value; } public void setStatisticSamplingEnabled(boolean value) { - this.statisticSamplingEnabled = (Boolean)checkAttribute(STATISTIC_SAMPLING_ENABLED_NAME, value); + this.statisticSamplingEnabled = (Boolean)checkAttribute(STATISTIC_SAMPLING_ENABLED, value); } public void setStatisticSampleRate(int value) { - value = (Integer)checkAttribute(STATISTIC_SAMPLE_RATE_NAME, value); + value = (Integer)checkAttribute(STATISTIC_SAMPLE_RATE, value); if (value < DEFAULT_STATISTIC_SAMPLE_RATE) { // fix 48228 InternalDistributedSystem ids = InternalDistributedSystem.getConnectedInstance(); @@ -1698,91 +1698,91 @@ public class DistributionConfigImpl if (value == null) { value = new File(""); } - this.statisticArchiveFile = (File)checkAttribute(STATISTIC_ARCHIVE_FILE_NAME, value); + this.statisticArchiveFile = (File)checkAttribute(STATISTIC_ARCHIVE_FILE, value); } public void setCacheXmlFile(File value) { - this.cacheXmlFile = (File)checkAttribute(CACHE_XML_FILE_NAME, value); + this.cacheXmlFile = (File)checkAttribute(CACHE_XML_FILE, value); } public void setAckWaitThreshold(int value) { - this.ackWaitThreshold = (Integer)checkAttribute(ACK_WAIT_THRESHOLD_NAME, value); + this.ackWaitThreshold = (Integer)checkAttribute(ACK_WAIT_THRESHOLD, value); } public void setAckSevereAlertThreshold(int value) { - this.ackForceDisconnectThreshold = (Integer)checkAttribute(ACK_SEVERE_ALERT_THRESHOLD_NAME, value); + this.ackForceDisconnectThreshold = (Integer)checkAttribute(ACK_SEVERE_ALERT_THRESHOLD, value); } public int getArchiveDiskSpaceLimit() { return this.archiveDiskSpaceLimit; } public void setArchiveDiskSpaceLimit(int value) { - this.archiveDiskSpaceLimit = (Integer)checkAttribute(ARCHIVE_DISK_SPACE_LIMIT_NAME, value); + this.archiveDiskSpaceLimit = (Integer)checkAttribute(ARCHIVE_DISK_SPACE_LIMIT, value); } public int getArchiveFileSizeLimit() { return this.archiveFileSizeLimit; } public void setArchiveFileSizeLimit(int value) { - this.archiveFileSizeLimit = (Integer)checkAttribute(ARCHIVE_FILE_SIZE_LIMIT_NAME, value); + this.archiveFileSizeLimit = (Integer)checkAttribute(ARCHIVE_FILE_SIZE_LIMIT, value); } public int getLogDiskSpaceLimit() { return this.logDiskSpaceLimit; } public void setLogDiskSpaceLimit(int value) { - this.logDiskSpaceLimit = (Integer)checkAttribute(LOG_DISK_SPACE_LIMIT_NAME, value); + this.logDiskSpaceLimit = (Integer)checkAttribute(LOG_DISK_SPACE_LIMIT, value); } public int getLogFileSizeLimit() { return this.logFileSizeLimit; } public void setLogFileSizeLimit(int value) { - this.logFileSizeLimit = (Integer)checkAttribute(LOG_FILE_SIZE_LIMIT_NAME, value); + this.logFileSizeLimit = (Integer)checkAttribute(LOG_FILE_SIZE_LIMIT, value); } public void setSSLEnabled( boolean value ) { - this.sslEnabled = (Boolean)checkAttribute(SSL_ENABLED_NAME, value); + this.sslEnabled = (Boolean)checkAttribute(SSL_ENABLED, value); } public void setSSLProtocols( String value ) { - this.sslProtocols = (String)checkAttribute(SSL_PROTOCOLS_NAME, value); + this.sslProtocols = (String)checkAttribute(SSL_PROTOCOLS, value); } public void setSSLCiphers( String value ) { - this.sslCiphers = (String)checkAttribute(SSL_CIPHERS_NAME, value); + this.sslCiphers = (String)checkAttribute(SSL_CIPHERS, value); } public void setSSLRequireAuthentication( boolean value ){ - this.sslRequireAuthentication = (Boolean)checkAttribute(SSL_REQUIRE_AUTHENTICATION_NAME, value); + this.sslRequireAuthentication = (Boolean)checkAttribute(SSL_REQUIRE_AUTHENTICATION, value); } public void setClusterSSLEnabled( boolean value ) { - this.clusterSSLEnabled = (Boolean)checkAttribute(CLUSTER_SSL_ENABLED_NAME, value); + this.clusterSSLEnabled = (Boolean)checkAttribute(CLUSTER_SSL_ENABLED, value); } public void setClusterSSLProtocols( String value ) { - this.clusterSSLProtocols = (String)checkAttribute(CLUSTER_SSL_PROTOCOLS_NAME, value); + this.clusterSSLProtocols = (String)checkAttribute(CLUSTER_SSL_PROTOCOLS, value); } public void setClusterSSLCiphers( String value ) { - this.clusterSSLCiphers = (String)checkAttribute(CLUSTER_SSL_CIPHERS_NAME, value); + this.clusterSSLCiphers = (String)checkAttribute(CLUSTER_SSL_CIPHERS, value); } public void setClusterSSLRequireAuthentication( boolean value ){ - this.clusterSSLRequireAuthentication = (Boolean)checkAttribute(CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME, value); + this.clusterSSLRequireAuthentication = (Boolean)checkAttribute(CLUSTER_SSL_REQUIRE_AUTHENTICATION, value); } public void setClusterSSLKeyStore( String value ) { - value = (String)checkAttribute(CLUSTER_SSL_KEYSTORE_NAME, value); + value = (String)checkAttribute(CLUSTER_SSL_KEYSTORE, value); this.getClusterSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + KEY_STORE_NAME, value); this.clusterSSLKeyStore = value; } public void setClusterSSLKeyStoreType( String value ) { - value = (String)checkAttribute(CLUSTER_SSL_KEYSTORE_TYPE_NAME, value); + value = (String)checkAttribute(CLUSTER_SSL_KEYSTORE_TYPE, value); this.getClusterSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + KEY_STORE_TYPE_NAME, value); this.clusterSSLKeyStoreType = value; } public void setClusterSSLKeyStorePassword( String value ) { - value = (String)checkAttribute(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME, value); + value = (String)checkAttribute(CLUSTER_SSL_KEYSTORE_PASSWORD, value); this.getClusterSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + KEY_STORE_PASSWORD_NAME, value); this.clusterSSLKeyStorePassword =value; } public void setClusterSSLTrustStore( String value ) { - value = (String)checkAttribute(CLUSTER_SSL_TRUSTSTORE_NAME, value); + value = (String)checkAttribute(CLUSTER_SSL_TRUSTSTORE, value); this.getClusterSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + TRUST_STORE_NAME, value); this.clusterSSLTrustStore = value; } public void setClusterSSLTrustStorePassword( String value ) { - value = (String)checkAttribute(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME, value); + value = (String)checkAttribute(CLUSTER_SSL_TRUSTSTORE_PASSWORD, value); this.getClusterSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + TRUST_STORE_PASSWORD_NAME, value); this.clusterSSLTrustStorePassword = value; } @@ -1792,7 +1792,7 @@ public class DistributionConfigImpl } public void setMcastSendBufferSize(int value) { - mcastSendBufferSize = (Integer)checkAttribute(MCAST_SEND_BUFFER_SIZE_NAME, value); + mcastSendBufferSize = (Integer)checkAttribute(MCAST_SEND_BUFFER_SIZE, value); } public int getMcastRecvBufferSize() { @@ -1800,16 +1800,16 @@ public class DistributionConfigImpl } public void setMcastRecvBufferSize(int value) { - mcastRecvBufferSize = (Integer)checkAttribute(MCAST_RECV_BUFFER_SIZE_NAME, value); + mcastRecvBufferSize = (Integer)checkAttribute(MCAST_RECV_BUFFER_SIZE, value); } public void setAsyncDistributionTimeout(int value) { - this.asyncDistributionTimeout = (Integer)checkAttribute(ASYNC_DISTRIBUTION_TIMEOUT_NAME, value); + this.asyncDistributionTimeout = (Integer)checkAttribute(ASYNC_DISTRIBUTION_TIMEOUT, value); } public void setAsyncQueueTimeout(int value) { - this.asyncQueueTimeout = (Integer)checkAttribute(ASYNC_QUEUE_TIMEOUT_NAME, value); + this.asyncQueueTimeout = (Integer)checkAttribute(ASYNC_QUEUE_TIMEOUT, value); } public void setAsyncMaxQueueSize(int value) { - this.asyncMaxQueueSize = (Integer)checkAttribute(ASYNC_MAX_QUEUE_SIZE_NAME, value); + this.asyncMaxQueueSize = (Integer)checkAttribute(ASYNC_MAX_QUEUE_SIZE, value); } public FlowControlParams getMcastFlowControl() { @@ -1817,7 +1817,7 @@ public class DistributionConfigImpl } public void setMcastFlowControl(FlowControlParams values) { - mcastFlowControl = (FlowControlParams)checkAttribute(MCAST_FLOW_CONTROL_NAME, values); + mcastFlowControl = (FlowControlParams)checkAttribute(MCAST_FLOW_CONTROL, values); } public int getUdpFragmentSize() { @@ -1825,7 +1825,7 @@ public class DistributionConfigImpl } public void setUdpFragmentSize(int value) { - udpFragmentSize = (Integer)checkAttribute(UDP_FRAGMENT_SIZE_NAME, value); + udpFragmentSize = (Integer)checkAttribute(UDP_FRAGMENT_SIZE, value); } public int getUdpSendBufferSize() { @@ -1833,7 +1833,7 @@ public class DistributionConfigImpl } public void setUdpSendBufferSize(int value) { - udpSendBufferSize = (Integer)checkAttribute(UDP_SEND_BUFFER_SIZE_NAME, value); + udpSendBufferSize = (Integer)checkAttribute(UDP_SEND_BUFFER_SIZE, value); } public int getUdpRecvBufferSize() { @@ -1841,7 +1841,7 @@ public class DistributionConfigImpl } public void setUdpRecvBufferSize(int value) { - udpRecvBufferSize = (Integer)checkAttribute(UDP_RECV_BUFFER_SIZE_NAME, value); + udpRecvBufferSize = (Integer)checkAttribute(UDP_RECV_BUFFER_SIZE, value); } public boolean getDisableTcp() { @@ -1865,7 +1865,7 @@ public class DistributionConfigImpl } public void setMemberTimeout(int value) { - memberTimeout = (Integer)checkAttribute(MEMBER_TIMEOUT_NAME, value); + memberTimeout = (Integer)checkAttribute(MEMBER_TIMEOUT, value); } /** @since GemFire 5.7 */ @@ -1875,7 +1875,7 @@ public class DistributionConfigImpl /** @since GemFire 5.7 */ public void setClientConflation(String value) { - this.clientConflation = (String)checkAttribute(CLIENT_CONFLATION_PROP_NAME, value); + this.clientConflation = (String)checkAttribute(CONFLATE_EVENTS, value); } public String getDurableClientId() { @@ -1883,7 +1883,7 @@ public class DistributionConfigImpl } public void setDurableClientId(String value) { - durableClientId = (String)checkAttribute(DURABLE_CLIENT_ID_NAME, value); + durableClientId = (String)checkAttribute(DURABLE_CLIENT_ID, value); } public int getDurableClientTimeout() { @@ -1891,7 +1891,7 @@ public class DistributionConfigImpl } public void setDurableClientTimeout(int value) { - durableClientTimeout = (Integer)checkAttribute(DURABLE_CLIENT_TIMEOUT_NAME, value); + durableClientTimeout = (Integer)checkAttribute(DURABLE_CLIENT_TIMEOUT, value); } public String getSecurityClientAuthInit() { @@ -1899,7 +1899,7 @@ public class DistributionConfigImpl } public void setSecurityClientAuthInit(String value) { - securityClientAuthInit = (String)checkAttribute(SECURITY_CLIENT_AUTH_INIT_NAME, value); + securityClientAuthInit = (String)checkAttribute(SECURITY_CLIENT_AUTH_INIT, value); } public String getSecurityClientAuthenticator() { @@ -3105,7 +3105,7 @@ public class DistributionConfigImpl * @see com.gemstone.gemfire.distributed.internal.DistributionConfig#setMembershipPortRange(int[]) */ public void setMembershipPortRange(int[] range) { - membershipPortRange = (int[])checkAttribute(MEMBERSHIP_PORT_RANGE_NAME, range); + membershipPortRange = (int[])checkAttribute(MEMBERSHIP_PORT_RANGE, range); } /** @@ -3198,7 +3198,7 @@ public class DistributionConfigImpl @Override public void setEnableClusterConfiguration(boolean value) { - this.enableSharedConfiguration = (Boolean)checkAttribute(ENABLE_CLUSTER_CONFIGURATION_NAME, value); + this.enableSharedConfiguration = (Boolean)checkAttribute(ENABLE_CLUSTER_CONFIGURATION, value); } @Override @@ -3209,7 +3209,7 @@ public class DistributionConfigImpl @Override public void setUseSharedConfiguration(boolean newValue) { - this.useSharedConfiguration = (Boolean)checkAttribute(USE_CLUSTER_CONFIGURATION_NAME, newValue); + this.useSharedConfiguration = (Boolean)checkAttribute(USE_CLUSTER_CONFIGURATION, newValue); } @Override @@ -3218,7 +3218,7 @@ public class DistributionConfigImpl } @Override public void setLoadClusterConfigFromDir(boolean newValue) { - this.loadSharedConfigurationFromDir = (Boolean)checkAttribute(LOAD_CLUSTER_CONFIG_FROM_DIR_NAME, newValue); + this.loadSharedConfigurationFromDir = (Boolean)checkAttribute(LOAD_CLUSTER_CONFIGURATION_FROM_DIR, newValue); } @Override http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java index 7bc65c8..8b9b307 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java @@ -71,8 +71,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.BIND_ADDRESS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; /** * Provides the implementation of a distribution Locator @@ -541,7 +540,7 @@ public class InternalLocator extends Locator implements ConnectListener { if (distributedSystemProperties != null) { env.putAll(distributedSystemProperties); } - env.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, ""); + env.setProperty(CACHE_XML_FILE, ""); // create a DC so that all of the lookup rules, gemfire.properties, etc, // are considered and we have a config object we can trust http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/RuntimeDistributionConfigImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/RuntimeDistributionConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/RuntimeDistributionConfigImpl.java index 010527f..ff95cef 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/RuntimeDistributionConfigImpl.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/RuntimeDistributionConfigImpl.java @@ -59,21 +59,21 @@ public final class RuntimeDistributionConfigImpl //////////////////// Configuration Methods //////////////////// @Override public void setLogLevel(int value) { - this.logLevel = (Integer)checkAttribute(LOG_LEVEL_NAME, value); - getAttSourceMap().put(LOG_LEVEL_NAME, ConfigSource.runtime()); + this.logLevel = (Integer)checkAttribute(LOG_LEVEL, value); + getAttSourceMap().put(LOG_LEVEL, ConfigSource.runtime()); this.ds.getInternalLogWriter().setLogWriterLevel(value); LogWriterAppenders.configChanged(LogWriterAppenders.Identifier.MAIN); } @Override public void setStatisticSamplingEnabled(boolean value) { - this.statisticSamplingEnabled = (Boolean)checkAttribute(STATISTIC_SAMPLING_ENABLED_NAME, value); - getAttSourceMap().put(STATISTIC_SAMPLING_ENABLED_NAME, ConfigSource.runtime()); + this.statisticSamplingEnabled = (Boolean)checkAttribute(STATISTIC_SAMPLING_ENABLED, value); + getAttSourceMap().put(STATISTIC_SAMPLING_ENABLED, ConfigSource.runtime()); } @Override public void setStatisticSampleRate(int value) { - value = (Integer)checkAttribute(STATISTIC_SAMPLE_RATE_NAME, value); + value = (Integer)checkAttribute(STATISTIC_SAMPLE_RATE, value); if (value < DEFAULT_STATISTIC_SAMPLE_RATE) { // fix 48228 this.ds.getLogWriter().info("Setting statistic-sample-rate to " + DEFAULT_STATISTIC_SAMPLE_RATE + " instead of the requested " + value + " because VSD does not work with sub-second sampling."); @@ -84,7 +84,7 @@ public final class RuntimeDistributionConfigImpl @Override public void setStatisticArchiveFile(File value) { - value = (File)checkAttribute(STATISTIC_ARCHIVE_FILE_NAME, value); + value = (File)checkAttribute(STATISTIC_ARCHIVE_FILE, value); if (value == null) { value = new File(""); } @@ -94,33 +94,33 @@ public final class RuntimeDistributionConfigImpl throw new IllegalArgumentException(ex.getMessage()); } this.statisticArchiveFile = value; - getAttSourceMap().put(STATISTIC_ARCHIVE_FILE_NAME, ConfigSource.runtime()); + getAttSourceMap().put(STATISTIC_ARCHIVE_FILE, ConfigSource.runtime()); } @Override public void setArchiveDiskSpaceLimit(int value) { - this.archiveDiskSpaceLimit = (Integer)checkAttribute(ARCHIVE_DISK_SPACE_LIMIT_NAME, value); - getAttSourceMap().put(ARCHIVE_DISK_SPACE_LIMIT_NAME, ConfigSource.runtime()); + this.archiveDiskSpaceLimit = (Integer)checkAttribute(ARCHIVE_DISK_SPACE_LIMIT, value); + getAttSourceMap().put(ARCHIVE_DISK_SPACE_LIMIT, ConfigSource.runtime()); } @Override public void setArchiveFileSizeLimit(int value) { - this.archiveFileSizeLimit = (Integer)checkAttribute(ARCHIVE_FILE_SIZE_LIMIT_NAME, value); - getAttSourceMap().put(ARCHIVE_FILE_SIZE_LIMIT_NAME, ConfigSource.runtime()); + this.archiveFileSizeLimit = (Integer)checkAttribute(ARCHIVE_FILE_SIZE_LIMIT, value); + getAttSourceMap().put(ARCHIVE_FILE_SIZE_LIMIT, ConfigSource.runtime()); } @Override public void setLogDiskSpaceLimit(int value) { - this.logDiskSpaceLimit = (Integer)checkAttribute(LOG_DISK_SPACE_LIMIT_NAME, value); - getAttSourceMap().put(LOG_DISK_SPACE_LIMIT_NAME, ConfigSource.runtime()); + this.logDiskSpaceLimit = (Integer)checkAttribute(LOG_DISK_SPACE_LIMIT, value); + getAttSourceMap().put(LOG_DISK_SPACE_LIMIT, ConfigSource.runtime()); LogWriterAppenders.configChanged(LogWriterAppenders.Identifier.MAIN); } @Override public void setLogFileSizeLimit(int value) { - this.logFileSizeLimit = (Integer)checkAttribute(LOG_FILE_SIZE_LIMIT_NAME, value); - getAttSourceMap().put(this.LOG_FILE_SIZE_LIMIT_NAME, ConfigSource.runtime()); + this.logFileSizeLimit = (Integer)checkAttribute(LOG_FILE_SIZE_LIMIT, value); + getAttSourceMap().put(LOG_FILE_SIZE_LIMIT, ConfigSource.runtime()); LogWriterAppenders.configChanged(LogWriterAppenders.Identifier.MAIN); } @@ -129,9 +129,9 @@ public final class RuntimeDistributionConfigImpl } public List getModifiableAttributes(){ - String[] modifiables = {HTTP_SERVICE_PORT_NAME,JMX_MANAGER_HTTP_PORT_NAME, ARCHIVE_DISK_SPACE_LIMIT_NAME, - ARCHIVE_FILE_SIZE_LIMIT_NAME, LOG_DISK_SPACE_LIMIT_NAME, LOG_FILE_SIZE_LIMIT_NAME, - LOG_LEVEL_NAME, STATISTIC_ARCHIVE_FILE_NAME, STATISTIC_SAMPLE_RATE_NAME, STATISTIC_SAMPLING_ENABLED_NAME}; + String[] modifiables = {HTTP_SERVICE_PORT_NAME,JMX_MANAGER_HTTP_PORT_NAME, ARCHIVE_DISK_SPACE_LIMIT, + ARCHIVE_FILE_SIZE_LIMIT, LOG_DISK_SPACE_LIMIT, LOG_FILE_SIZE_LIMIT, + LOG_LEVEL, STATISTIC_ARCHIVE_FILE, STATISTIC_SAMPLE_RATE, STATISTIC_SAMPLING_ENABLED}; return Arrays.asList(modifiables); }; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java index 964f741..c6558fd 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java @@ -29,6 +29,7 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.util.*; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; /** * Provides an implementation of the {@link Config} interface * that implements functionality that all {@link Config} implementations @@ -207,13 +208,13 @@ public abstract class AbstractConfig implements Config { } public boolean isDeprecated(String attName) { - if (attName.equals(DistributionConfig.SSL_CIPHERS_NAME)) { + if (attName.equals(SSL_CIPHERS)) { return true; - } else if (attName.equals(DistributionConfig.SSL_ENABLED_NAME)) { + } else if (attName.equals(SSL_ENABLED)) { return true; - } else if (attName.equals(DistributionConfig.SSL_PROTOCOLS_NAME)) { + } else if (attName.equals(SSL_PROTOCOLS)) { return true; - } else if (attName.equals(DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME)) { + } else if (attName.equals(SSL_REQUIRE_AUTHENTICATION)) { return true; } else if (attName.equals(DistributionConfig.JMX_MANAGER_SSL_NAME)) { return true; @@ -304,7 +305,7 @@ public abstract class AbstractConfig implements Config { return (String)result; } - if (attName.equalsIgnoreCase(DistributionConfig.MEMBERSHIP_PORT_RANGE_NAME)) { + if (attName.equalsIgnoreCase(MEMBERSHIP_PORT_RANGE)) { int[] value = (int[])result; return ""+value[0]+"-"+value[1]; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java index 0e80a28..cd35e53 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java @@ -16,6 +16,8 @@ */ package com.gemstone.gemfire.internal; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.Region; @@ -158,9 +160,9 @@ public class MigrationClient { && System.getProperty(DistributionConfig.GEMFIRE_PREFIX + LOCATORS) == null) { dsProps.put(MCAST_PORT, "0"); } - dsProps.put(DistributionConfig.LOG_FILE_NAME, "migrationClient.log"); + dsProps.put(LOG_FILE, "migrationClient.log"); if (this.cacheXmlFile != null) { - dsProps.put(DistributionConfig.CACHE_XML_FILE_NAME, this.cacheXmlFile.getName()); + dsProps.put(CACHE_XML_FILE, this.cacheXmlFile.getName()); } this.distributedSystem = DistributedSystem.connect(dsProps); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java index 6c9fa73..a611d39 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java @@ -16,6 +16,8 @@ */ package com.gemstone.gemfire.internal; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + import com.gemstone.gemfire.admin.internal.InetAddressUtil; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; @@ -208,9 +210,9 @@ public class MigrationServer { && System.getProperty(DistributionConfig.GEMFIRE_PREFIX + LOCATORS) == null) { dsProps.put(MCAST_PORT, "0"); } - dsProps.put(DistributionConfig.LOG_FILE_NAME, "migrationServer.log"); + dsProps.put(LOG_FILE, "migrationServer.log"); if (this.cacheXmlFile != null) { - dsProps.put(DistributionConfig.CACHE_XML_FILE_NAME, this.cacheXmlFile.getName()); + dsProps.put(CACHE_XML_FILE, this.cacheXmlFile.getName()); } this.distributedSystem = DistributedSystem.connect(dsProps); if (VERBOSE) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java index d3220b8..8f1ad81 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java @@ -16,6 +16,8 @@ */ package com.gemstone.gemfire.internal; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + import com.gemstone.gemfire.*; import com.gemstone.gemfire.admin.AdminException; import com.gemstone.gemfire.admin.BackupStatus; @@ -457,7 +459,7 @@ public class SystemAdmin { private static InternalDistributedSystem getAdminCnx() { InternalDistributedSystem.setCommandLineAdmin(true); Properties props = propertyOption; - props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "warning"); + props.setProperty(LOG_LEVEL, "warning"); DistributionConfigImpl dsc = new DistributionConfigImpl(props); System.out.print("Connecting to distributed system:"); if (!"".equals(dsc.getLocators())) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java index 97d907a..213653e 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java @@ -18,6 +18,8 @@ package com.gemstone.gemfire.internal.admin; import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + import java.util.Iterator; import java.util.Properties; @@ -113,15 +115,15 @@ public class SSLConfig { * @since GemFire 4.0 */ public void toDSProperties(Properties props) { - props.setProperty(DistributionConfig.SSL_ENABLED_NAME, + props.setProperty(SSL_ENABLED, String.valueOf(this.enabled)); if (this.enabled) { - props.setProperty(DistributionConfig.SSL_PROTOCOLS_NAME, + props.setProperty(SSL_PROTOCOLS, this.protocols); - props.setProperty(DistributionConfig.SSL_CIPHERS_NAME, + props.setProperty(SSL_CIPHERS, this.ciphers); - props.setProperty(DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME, + props.setProperty(SSL_REQUIRE_AUTHENTICATION, String.valueOf(this.requireAuth)); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java index 3e4ddf1..696f322 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java @@ -264,7 +264,7 @@ public class RemoteTransportConfig implements TransportConfig { bindAddress); // System.out.println("entering ds port range property of " + this.membershipPortRange); if (this.membershipPortRange != null) { - props.setProperty(DistributionConfig.MEMBERSHIP_PORT_RANGE_NAME, this.membershipPortRange); + props.setProperty(MEMBERSHIP_PORT_RANGE, this.membershipPortRange); } if (this.tcpPort != 0) { props.setProperty(TCP_PORT, String.valueOf(this.tcpPort)); @@ -309,7 +309,7 @@ public class RemoteTransportConfig implements TransportConfig { this.sslConfig.toDSProperties(props); - props.setProperty(DistributionConfig.DISABLE_TCP_NAME, + props.setProperty(DISABLE_TCP, this.tcpDisabled? "true" : "false"); props.setProperty(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, this.disableAutoReconnect? "true" : "false"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java index d3365e8..c04ae48 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java @@ -43,6 +43,7 @@ import java.net.URL; import java.util.*; import java.util.concurrent.TimeUnit; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOG_FILE; import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.SERVER_BIND_ADDRESS; /** @@ -658,15 +659,15 @@ public class CacheServerLauncher { // properly configure logging, the declarative caching file, etc. final Properties props = (Properties) options.get(PROPERTIES); - if (props.getProperty(DistributionConfig.LOG_FILE_NAME) == null && CacheServerLauncher.isLoggingToStdOut()) { + if (props.getProperty(LOG_FILE) == null && CacheServerLauncher.isLoggingToStdOut()) { // Check First if the gemfire.properties set the log-file. If they do, we shouldn't override that default final Properties gemfireProperties = new Properties(); DistributionConfigImpl.loadGemFireProperties(gemfireProperties); - if (gemfireProperties.get(DistributionConfig.LOG_FILE_NAME) == null) { + if (gemfireProperties.get(LOG_FILE) == null) { // Do not allow the cache server to log to stdout, override the logger with #defaultLogFileName - props.setProperty(DistributionConfig.LOG_FILE_NAME, defaultLogFileName); + props.setProperty(LOG_FILE, defaultLogFileName); } } @@ -1196,7 +1197,7 @@ public class CacheServerLauncher { /** * Reads {@link DistributedSystem#PROPERTY_FILE} and determines if the - * {@link DistributionConfig#LOG_FILE_NAME} property is set to stdout + * {@link SystemConfigurationProperties#LOG_FILE} property is set to stdout * @return true if the logging would go to stdout */ private static boolean isLoggingToStdOut() { @@ -1210,7 +1211,7 @@ public class CacheServerLauncher { System.out.println("Failed reading " + url); System.exit( 1 ); } - final String logFile = gfprops.getProperty(DistributionConfig.LOG_FILE_NAME); + final String logFile = gfprops.getProperty(LOG_FILE); if ( logFile == null || logFile.length() == 0 ) { return true; } @@ -1262,9 +1263,9 @@ public class CacheServerLauncher { commandLineWrapper.add(key + "=" + props.getProperty(key.toString())); } - if (props.getProperty(DistributionConfig.LOG_FILE_NAME) == null && CacheServerLauncher.isLoggingToStdOut()) { + if (props.getProperty(LOG_FILE) == null && CacheServerLauncher.isLoggingToStdOut()) { // Do not allow the cache server to log to stdout; override the logger with #defaultLogFileName - commandLineWrapper.add(DistributionConfig.LOG_FILE_NAME + "=" + defaultLogFileName); + commandLineWrapper.add(LOG_FILE + "=" + defaultLogFileName); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java index f010ca9..4c6ea10 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java @@ -72,8 +72,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; /** * Represents a (disk-based) persistent store for region data. Used for both @@ -4358,7 +4357,7 @@ public class DiskStoreImpl implements DiskStore { Properties props = new Properties(); props.setProperty(LOCATORS, ""); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, ""); + props.setProperty(CACHE_XML_FILE, ""); DistributedSystem ds = DistributedSystem.connect(props); offlineDS = ds; Cache c = com.gemstone.gemfire.cache.CacheFactory.create(ds); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java index d4c291f..ade09ee 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java @@ -32,6 +32,8 @@ import org.apache.logging.log4j.Logger; import java.io.*; import java.util.Arrays; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + /** * This class represents a ConnectionProxy of the CacheClient * @@ -202,7 +204,7 @@ public final class ClientProxyMembershipID private ClientProxyMembershipID(int id, byte[] clientSideIdentity) { Boolean specialCase = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "SPECIAL_DURABLE"); - String durableID = this.system.getProperties().getProperty(DistributionConfig.DURABLE_CLIENT_ID_NAME); + String durableID = this.system.getProperties().getProperty(DURABLE_CLIENT_ID); if (specialCase.booleanValue() && durableID != null && (!durableID.equals(""))) { this.uniqueId = durable_synch_counter; } else { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java index 4ea34f5..8c2fda7 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java @@ -56,6 +56,8 @@ import java.security.cert.X509Certificate; import java.security.spec.X509EncodedKeySpec; import java.util.*; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + public class HandShake implements ClientHandShake { private static final Logger logger = LogService.getLogger(); @@ -344,8 +346,7 @@ public class HandShake implements ClientHandShake private byte setClientConflation() { byte result = CONFLATION_DEFAULT; - String clientConflationValue = this.system.getProperties().getProperty( - DistributionConfig.CLIENT_CONFLATION_PROP_NAME); + String clientConflationValue = this.system.getProperties().getProperty(CONFLATE_EVENTS); if (DistributionConfig.CLIENT_CONFLATION_PROP_VALUE_ON .equalsIgnoreCase(clientConflationValue)) { result = CONFLATION_ON; @@ -480,8 +481,7 @@ public class HandShake implements ClientHandShake writeCredentials(dos, dis, p_credentials, ports != null, member, hdos); } } else { - String authInitMethod = this.system.getProperties().getProperty( - DistributionConfig.SECURITY_CLIENT_AUTH_INIT_NAME); + String authInitMethod = this.system.getProperties().getProperty(SECURITY_CLIENT_AUTH_INIT); acceptanceCode = writeCredential(dos, dis, authInitMethod, ports != null, member, hdos); } @@ -1252,8 +1252,7 @@ public class HandShake implements ClientHandShake REPLY_OK, this.clientReadTimeout, null, this.credentials, member, false); - String authInit = this.system.getProperties().getProperty( - DistributionConfig.SECURITY_CLIENT_AUTH_INIT_NAME); + String authInit = this.system.getProperties().getProperty(SECURITY_CLIENT_AUTH_INIT); if (communicationMode != Acceptor.GATEWAY_TO_GATEWAY && intermediateAcceptanceCode != REPLY_AUTH_NOT_REQUIRED && (authInit != null && authInit.length() != 0)) { @@ -1593,8 +1592,7 @@ public class HandShake implements ClientHandShake private Properties getCredentials(DistributedMember member) { - String authInitMethod = this.system.getProperties().getProperty( - DistributionConfig.SECURITY_CLIENT_AUTH_INIT_NAME); + String authInitMethod = this.system.getProperties().getProperty(SECURITY_CLIENT_AUTH_INIT); return getCredentials(authInitMethod, this.system.getSecurityProperties(), member, false, (InternalLogWriter)this.system.getLogWriter(), (InternalLogWriter)this.system.getSecurityLogWriter()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java index e3c5438..5cd1849 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java @@ -17,6 +17,7 @@ package com.gemstone.gemfire.internal.cache.xmlcache; import com.gemstone.gemfire.cache.CacheXmlException; +import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.ClassPathLoader; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; @@ -691,7 +692,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler { /** The name of the overflow-directory attribute */ protected static final String OVERFLOW_DIRECTORY = "overflow-directory"; /** The name of the socket-buffer-size attribute */ - protected static final String SOCKET_BUFFER_SIZE = DistributionConfig.SOCKET_BUFFER_SIZE_NAME; + protected static final String SOCKET_BUFFER_SIZE = SystemConfigurationProperties.SOCKET_BUFFER_SIZE; /** The name of the socket-read-timeout attribute */ protected static final String SOCKET_READ_TIMEOUT = "socket-read-timeout"; /** The name of the maximum-queue-memory attribute */ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java index cdc5e81..27f5302 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java @@ -16,6 +16,8 @@ */ package com.gemstone.gemfire.internal.logging; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.distributed.internal.InternalLocator; @@ -71,7 +73,7 @@ public class LogWriterFactory { } else { boolean defaultSource = false; if (config instanceof DistributionConfig) { - ConfigSource source = ((DistributionConfig) config).getConfigSource(DistributionConfig.LOG_LEVEL_NAME); + ConfigSource source = ((DistributionConfig) config).getConfigSource(LOG_LEVEL); if (source == null) { defaultSource = true; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java index 690280b..ac28941 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java @@ -16,6 +16,7 @@ */ package com.gemstone.gemfire.management.internal.cli; +import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.ClassPathLoader; import com.gemstone.gemfire.management.cli.CliMetaData; @@ -47,7 +48,7 @@ public class CommandManager { private static final Object INSTANCE_LOCK = new Object(); private static CommandManager INSTANCE = null; - public static final String USER_CMD_PACKAGES_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.USER_COMMAND_PACKAGES; + public static final String USER_CMD_PACKAGES_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + SystemConfigurationProperties.USER_COMMAND_PACKAGES; public static final String USER_CMD_PACKAGES_ENV_VARIABLE = "GEMFIRE_USER_COMMAND_PACKAGES"; private Properties cacheProperties; @@ -92,7 +93,7 @@ public class CommandManager { // Find by packages specified in the distribution config if (this.cacheProperties != null) { - String cacheUserCmdPackages = this.cacheProperties.getProperty(DistributionConfig.USER_COMMAND_PACKAGES); + String cacheUserCmdPackages = this.cacheProperties.getProperty(SystemConfigurationProperties.USER_COMMAND_PACKAGES); if (cacheUserCmdPackages != null && !cacheUserCmdPackages.isEmpty()) { StringTokenizer tokenizer = new StringTokenizer(cacheUserCmdPackages, ","); while (tokenizer.hasMoreTokens()) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java index 4ba8c36..6bc2882 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java @@ -16,12 +16,13 @@ */ package com.gemstone.gemfire.management.internal.cli.commands; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + import com.gemstone.gemfire.SystemFailure; import com.gemstone.gemfire.cache.CacheClosedException; import com.gemstone.gemfire.cache.execute.FunctionInvocationTargetException; import com.gemstone.gemfire.cache.execute.ResultCollector; import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml; import com.gemstone.gemfire.management.cli.CliMetaData; import com.gemstone.gemfire.management.cli.ConverterHint; @@ -324,7 +325,7 @@ public class ConfigCommands implements CommandMarker { } if (statisticSamplingEnabled != null) { - runTimeDistributionConfigAttributes.put(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, statisticSamplingEnabled.toString()); + runTimeDistributionConfigAttributes.put(STATISTIC_SAMPLING_ENABLED, statisticSamplingEnabled.toString()); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java index 4aec26d..d1ca03a 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java @@ -97,8 +97,7 @@ import java.security.KeyStore; import java.util.*; import java.util.Map.Entry; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; /** * @@ -415,8 +414,8 @@ public class ShellCommands implements CommandMarker { String truststorePasswordToUse = sslConfigProps.get(Gfsh.SSL_TRUSTSTORE_PASSWORD); // Ciphers are not passed to HttpsURLConnection. Could not find a clean way // to pass this attribute to socket layer (see #51645) - String sslCiphersToUse = sslConfigProps.get(DistributionConfig.CLUSTER_SSL_CIPHERS_NAME); - String sslProtocolsToUse = sslConfigProps.get(DistributionConfig.CLUSTER_SSL_PROTOCOLS_NAME); + String sslCiphersToUse = sslConfigProps.get(CLUSTER_SSL_CIPHERS); + String sslProtocolsToUse = sslConfigProps.get(CLUSTER_SSL_PROTOCOLS); //Commenting the code to set cipher suites in GFSH rest connect (see #51645) /* http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ChangeLogLevelFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ChangeLogLevelFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ChangeLogLevelFunction.java index 3dd0eb5..4977649 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ChangeLogLevelFunction.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ChangeLogLevelFunction.java @@ -16,6 +16,8 @@ */ package com.gemstone.gemfire.management.internal.cli.functions; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.execute.Function; @@ -56,7 +58,7 @@ public class ChangeLogLevelFunction implements Function, InternalEntity { final String logLevel = (String) args[0]; Level log4jLevel = LogWriterLogger.logWriterNametoLog4jLevel(logLevel); logwriterLogger.setLevel(log4jLevel); - System.setProperty(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.LOG_LEVEL_NAME, logLevel); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + LOG_LEVEL, logLevel); // LOG:CONFIG: logger.info(LogMarker.CONFIG, "GFSH Changed log level to {}", log4jLevel); result.put(cache.getDistributedSystem().getDistributedMember().getId(), "New log level is " + log4jLevel);