geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [01/26] incubator-geode git commit: GEODE-420: Removal of more deprecated properties and addition of new "alias" properties
Date Fri, 22 Jul 2016 00:19:48 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-420 [created] 3a215caf3


GEODE-420: Removal of more deprecated properties and addition of new "alias" properties


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8e4a59d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8e4a59d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8e4a59d5

Branch: refs/heads/feature/GEODE-420
Commit: 8e4a59d5fa09e1829fed61b383779851aa42d954
Parents: c27b85c
Author: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Authored: Tue Jun 14 10:01:59 2016 +1000
Committer: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Committed: Thu Jul 21 16:10:40 2016 -0700

----------------------------------------------------------------------
 .../internal/DistributionConfig.java            |   2 +-
 .../gemfire/management/GemFireProperties.java   | 173 ++++++++++++++++---
 2 files changed, 154 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8e4a59d5/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
index b86aa9f..325059a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
@@ -3201,7 +3201,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE} value.
    * <p> Actual value of this constant is "".
-   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE}
    */
   String DEFAULT_HTTP_SERVICE_SSL_KEYSTORE = "";
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8e4a59d5/geode-core/src/main/java/com/gemstone/gemfire/management/GemFireProperties.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/GemFireProperties.java
b/geode-core/src/main/java/com/gemstone/gemfire/management/GemFireProperties.java
index c5cf8f5..410d658 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/GemFireProperties.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/GemFireProperties.java
@@ -431,17 +431,54 @@ public class GemFireProperties {
   private String httpServiceBindAddress;
   private boolean startDevRestApi;
   private int jmxManagerUpdateRate;
-  
 
+
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLEnabled}
+   */
+  @Deprecated
   private boolean jmxManagerSSLEnabled;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLProtocols}
+   */
+  @Deprecated
   private String jmxManagerSSLProtocols;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLCiphers}
+   */
+  @Deprecated
   private String jmxManagerSSLCiphers;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLRequireAuthentication}
+   */
+  @Deprecated
   private boolean jmxManagerSSLRequireAuthentication;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLKeyStore}
+   */
+  @Deprecated
   private String jmxManagerSSLKeyStore;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLKeyStoreType}
+   */
+  @Deprecated
   private String jmxManagerSSLKeyStoreType;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLKeyStorePassword}
+   */
+  @Deprecated
   private String jmxManagerSSLKeyStorePassword;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLTrustStore}
+   */
+  @Deprecated
   private String jmxManagerSSLTrustStore;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLTrustStorePassword}
+   */
+  @Deprecated
   private String jmxManagerSSLTrustStorePassword;
+  private String jmxManagerSSLAlias;
   
   private boolean clusterSSLEnabled;
   private String clusterSSLProtocols;
@@ -452,36 +489,148 @@ public class GemFireProperties {
   private String clusterSSLKeyStorePassword;
   private String clusterSSLTrustStore;
   private String clusterSSLTrustStorePassword;
-  
+  private String clusterSSLAlias;
+
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLEnabled}
+   */
+  @Deprecated
   private boolean serverSSLEnabled;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLProtocols}
+   */
+  @Deprecated
   private String serverSSLProtocols;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLCiphers}
+   */
+  @Deprecated
   private String serverSSLCiphers;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLRequireAuthentication}
+   */
+  @Deprecated
   private boolean serverSSLRequireAuthentication;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLKeyStore}
+   */
+  @Deprecated
   private String serverSSLKeyStore;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLKeyStoreType}
+   */
+  @Deprecated
   private String serverSSLKeyStoreType;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLKeyStorePassword}
+   */
+  @Deprecated
   private String serverSSLKeyStorePassword;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLTrustStore}
+   */
+  @Deprecated
   private String serverSSLTrustStore;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLTrustStorePassword}
+   */
+  @Deprecated
   private String serverSSLTrustStorePassword;
-  
+  private String serverSSLAlias;
+
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLEnabled}
+   */
+  @Deprecated
   private boolean gatewaySSLEnabled;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLProtocols}
+   */
+  @Deprecated
   private String gatewaySSLProtocols;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLCiphers}
+   */
+  @Deprecated
   private String gatewaySSLCiphers;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLRequireAuthentication}
+   */
+  @Deprecated
   private boolean gatewaySSLRequireAuthentication;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLKeyStore}
+   */
+  @Deprecated
   private String gatewaySSLKeyStore;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLKeyStoreType}
+   */
+  @Deprecated
   private String gatewaySSLKeyStoreType;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLKeyStorePassword}
+   */
+  @Deprecated
   private String gatewaySSLKeyStorePassword;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLTrustStore}
+   */
+  @Deprecated
   private String gatewaySSLTrustStore;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLTrustStorePassword}
+   */
+  @Deprecated
   private String gatewaySSLTrustStorePassword;
-  
+  private String gatewaySSLAlias;
+
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLEnabled}
+   */
+  @Deprecated
   private boolean httpServiceSSLEnabled;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLRequireAuthentication}
+   */
+  @Deprecated
   private boolean httpServiceSSLRequireAuthentication;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLProtocols}
+   */
+  @Deprecated
   private String httpServiceSSLProtocols;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLCiphers}
+   */
+  @Deprecated
   private String httpServiceSSLCiphers;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLKeyStore}
+   */
+  @Deprecated
   private String httpServiceSSLKeyStore;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLKeyStoreType}
+   */
+  @Deprecated
   private String httpServiceSSLKeyStoreType;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLKeyStorePassword}
+   */
+  @Deprecated
   private String httpServiceSSLKeyStorePassword;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLTrustStore}
+   */
+  @Deprecated
   private String httpServiceSSLTrustStore;
+  /**
+   * @deprecated Geode 1.0 use {@link #clusterSSLTrustStorePassword}
+   */
+  @Deprecated
   private String httpServiceSSLTrustStorePassword;
+  private String httpServiceSSLAlias;
   
   /**
    * Specifies whether the default transaction mode should be distributed.
@@ -590,22 +739,6 @@ public class GemFireProperties {
     return logDiskSpaceLimit;
   }
 
-//  public boolean isSslEnabled() {
-//    return sslEnabled;
-//  }
-//
-//  public String getSslCiphers() {
-//    return sslCiphers;
-//  }
-//
-//  public String getSslProtocols() {
-//    return sslProtocols;
-//  }
-//
-//  public boolean isSslRequireAuthentication() {
-//    return sslRequireAuthentication;
-//  }
-
   public int getSocketLeaseTime() {
     return socketLeaseTime;
   }


Mime
View raw message