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 49F2F200B81 for ; Tue, 13 Sep 2016 22:21:14 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 489FC160AD2; Tue, 13 Sep 2016 20:21:14 +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 44ED6160AAA for ; Tue, 13 Sep 2016 22:21:13 +0200 (CEST) Received: (qmail 3671 invoked by uid 500); 13 Sep 2016 20:21:12 -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 3662 invoked by uid 99); 13 Sep 2016 20:21:12 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Sep 2016 20:21:12 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 0C03E1A563E for ; Tue, 13 Sep 2016 20:21:12 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-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 mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id Zr_GuDXs0vPp for ; Tue, 13 Sep 2016 20:21:09 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 5D87A60DA0 for ; Tue, 13 Sep 2016 20:21:08 +0000 (UTC) Received: (qmail 3547 invoked by uid 99); 13 Sep 2016 20:21:07 -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, 13 Sep 2016 20:21:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 738C8DFC7E; Tue, 13 Sep 2016 20:21:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: udo@apache.org To: commits@geode.incubator.apache.org Date: Tue, 13 Sep 2016 20:21:07 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-geode git commit: GEODE-420: Renaming of ssl-http-alias to ssl-web-alias archived-at: Tue, 13 Sep 2016 20:21:14 -0000 Repository: incubator-geode Updated Branches: refs/heads/develop ee27d73c4 -> e76e2814a GEODE-420: Renaming of ssl-http-alias to ssl-web-alias Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/bf54c902 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/bf54c902 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/bf54c902 Branch: refs/heads/develop Commit: bf54c902774984070d632c5442f9abf42fda340b Parents: a325d07 Author: Udo Kohlmeyer Authored: Wed Sep 14 06:19:46 2016 +1000 Committer: Udo Kohlmeyer Committed: Wed Sep 14 06:19:46 2016 +1000 ---------------------------------------------------------------------- .../web/controllers/RestAPIsWithSSLDUnitTest.java | 9 ++++----- .../gemfire/distributed/ConfigurationProperties.java | 10 +++++----- .../distributed/internal/AbstractDistributionConfig.java | 2 +- .../gemfire/distributed/internal/DistributionConfig.java | 11 +++++------ .../internal/net/SSLConfigurationFactoryTest.java | 6 +++--- 5 files changed, 18 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf54c902/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java index 93efb7a..17c0dcf 100644 --- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java +++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java @@ -70,7 +70,6 @@ import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.security.SecurableCommunicationChannel; -import com.gemstone.gemfire.internal.security.SecurableComponent; import com.gemstone.gemfire.management.ManagementException; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.IgnoredException; @@ -324,7 +323,7 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase { sslPropertyConverter(sslProperties, props, SSL_REQUIRE_AUTHENTICATION, null); sslPropertyConverter(sslProperties, props, SSL_TRUSTSTORE, null); sslPropertyConverter(sslProperties, props, SSL_TRUSTSTORE_PASSWORD, null); - sslPropertyConverter(sslProperties, props, SSL_HTTP_SERVICE_ALIAS, null); + sslPropertyConverter(sslProperties, props, SSL_WEB_ALIAS, null); sslPropertyConverter(sslProperties, props, SSL_ENABLED_COMPONENTS, null); sslPropertyConverter(sslProperties, props, SSL_HTTP_SERVICE_REQUIRE_AUTHENTICATION, null); sslPropertyConverter(sslProperties, props, SSL_DEFAULT_ALIAS, null); @@ -424,7 +423,7 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase { if (!StringUtils.isEmpty(properties.getProperty(INVALID_CLIENT_ALIAS))) { return properties.getProperty(INVALID_CLIENT_ALIAS); } else { - return properties.getProperty(SSL_HTTP_SERVICE_ALIAS); + return properties.getProperty(SSL_WEB_ALIAS); } }).build(); @@ -497,7 +496,7 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase { props.setProperty(SSL_TRUSTSTORE_PASSWORD, "password"); props.setProperty(SSL_KEYSTORE_TYPE, "JKS"); props.setProperty(SSL_ENABLED_COMPONENTS, SecurableCommunicationChannel.WEB.getConstant()); - props.setProperty(SSL_HTTP_SERVICE_ALIAS, "httpservicekey"); + props.setProperty(SSL_WEB_ALIAS, "httpservicekey"); props.setProperty(SSL_HTTP_SERVICE_REQUIRE_AUTHENTICATION, "true"); String restEndpoint = startInfraWithSSL(props, false); validateConnection(restEndpoint, "SSL", props); @@ -514,7 +513,7 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase { props.setProperty(SSL_KEYSTORE_TYPE, "JKS"); props.setProperty(SSL_ENABLED_COMPONENTS, SecurableCommunicationChannel.WEB.getConstant()); props.setProperty(SSL_HTTP_SERVICE_REQUIRE_AUTHENTICATION, "true"); - props.setProperty(SSL_HTTP_SERVICE_ALIAS, "httpservicekey"); + props.setProperty(SSL_WEB_ALIAS, "httpservicekey"); props.setProperty(INVALID_CLIENT_ALIAS, "someAlias"); String restEndpoint = startInfraWithSSL(props, false); validateConnection(restEndpoint, "SSL", props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf54c902/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java index 6db4142..fa0862f 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java @@ -601,15 +601,15 @@ public interface ConfigurationProperties { */ String HTTP_SERVICE_PORT = "http-service-port"; /** - * The static String definition of the "ssl-http-alias" property - *

+ * The static String definition of the "ssl-web-alias" property + *

* Description: This property is to be used if a specific key is to be used for the SSL communications for the HTTP service. *

* Optional * Default: ""

* Since: Geode 1.0 */ - String SSL_HTTP_SERVICE_ALIAS = "ssl-http-alias"; + String SSL_WEB_ALIAS = "ssl-web-alias"; /** * The static String definition of the "http-service-ssl-ciphers" property *

@@ -632,7 +632,7 @@ public interface ConfigurationProperties { *

* Default: false

* Since: GemFire 8.1 - * @deprecated Since Geode 1.0 use {@link #SSL_ENABLED_COMPONENTS} with optional {@link #SSL_HTTP_SERVICE_ALIAS} + * @deprecated Since Geode 1.0 use {@link #SSL_ENABLED_COMPONENTS} with optional {@link #SSL_WEB_ALIAS} */ @Deprecated String HTTP_SERVICE_SSL_ENABLED = "http-service-ssl-enabled"; @@ -1813,7 +1813,7 @@ public interface ConfigurationProperties { * * DescriptionThis property will be set when using multi-key keystores. This will define the alias that * the ssl connection factory would use when no alias has been set for the different component aliases. - * {@link #SSL_CLUSTER_ALIAS}, {@link #SSL_SERVER_ALIAS},{@link #SSL_LOCATOR_ALIAS},{@link #SSL_GATEWAY_ALIAS},{@link #SSL_JMX_ALIAS} , {@link #SSL_HTTP_SERVICE_ALIAS} + * {@link #SSL_CLUSTER_ALIAS}, {@link #SSL_SERVER_ALIAS},{@link #SSL_LOCATOR_ALIAS},{@link #SSL_GATEWAY_ALIAS},{@link #SSL_JMX_ALIAS} , {@link #SSL_WEB_ALIAS} *

* Default: ""

* Since: Geode 1.0 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf54c902/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java index 2a55a17..36f636d 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java @@ -946,7 +946,7 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen m.put(GATEWAY_SSL_TRUSTSTORE_PASSWORD, "Password to unlock the keystore file (store password) specified by javax.net.ssl.trustStore."); - m.put(SSL_HTTP_SERVICE_ALIAS, LocalizedStrings.AbstractDistributionConfig_HTTP_SERVICE_SSL_ALIAS_0.toLocalizedString(Boolean.valueOf(DEFAULT_SSL_ALIAS))); + m.put(SSL_WEB_ALIAS, LocalizedStrings.AbstractDistributionConfig_HTTP_SERVICE_SSL_ALIAS_0.toLocalizedString(Boolean.valueOf(DEFAULT_SSL_ALIAS))); m.put(HTTP_SERVICE_PORT, "If non zero, then the gemfire developer REST service will be deployed and started when the cache is created. Default value is 0."); m.put(HTTP_SERVICE_BIND_ADDRESS, "The address where gemfire developer REST service will listen for remote REST connections. Default is \"\" which causes the Rest service to listen on the host's default address."); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf54c902/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 e90ac3e..27f2884 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 @@ -37,7 +37,6 @@ import com.gemstone.gemfire.internal.ConfigSource; import com.gemstone.gemfire.internal.logging.InternalLogWriter; import com.gemstone.gemfire.internal.logging.LogConfig; import com.gemstone.gemfire.internal.security.SecurableCommunicationChannel; -import com.gemstone.gemfire.internal.security.SecurableComponent; import com.gemstone.gemfire.internal.tcp.Connection; import com.gemstone.gemfire.memcached.GemFireMemcachedServer; @@ -4298,23 +4297,23 @@ public interface DistributionConfig extends Config, LogConfig { * property. * @since Geode 1.0 */ - @ConfigAttributeGetter(name = SSL_HTTP_SERVICE_ALIAS) + @ConfigAttributeGetter(name = SSL_WEB_ALIAS) String getHTTPServiceSSLAlias(); /** - * Sets the value of the {@link ConfigurationProperties#SSL_HTTP_SERVICE_ALIAS} + * Sets the value of the {@link ConfigurationProperties#SSL_WEB_ALIAS} * property. * @since Geode 1.0 */ - @ConfigAttributeSetter(name = SSL_HTTP_SERVICE_ALIAS) + @ConfigAttributeSetter(name = SSL_WEB_ALIAS) void setHTTPServiceSSLAlias(String alias); /** - * The name of the {@link ConfigurationProperties#SSL_HTTP_SERVICE_ALIAS} property + * The name of the {@link ConfigurationProperties#SSL_WEB_ALIAS} property * @since Geode 1.0 */ @ConfigAttribute(type = String.class) - String HTTP_SERVICE_SSL_ALIAS_NAME = SSL_HTTP_SERVICE_ALIAS; + String HTTP_SERVICE_SSL_ALIAS_NAME = SSL_WEB_ALIAS; /** * Returns the value of the {@link ConfigurationProperties#SSL_JMX_ALIAS} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf54c902/geode-core/src/test/java/com/gemstone/gemfire/internal/net/SSLConfigurationFactoryTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/net/SSLConfigurationFactoryTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/net/SSLConfigurationFactoryTest.java index 18729fd..c7f4d8f 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/net/SSLConfigurationFactoryTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/net/SSLConfigurationFactoryTest.java @@ -127,7 +127,7 @@ public class SSLConfigurationFactoryTest extends JUnit4DistributedTestCase { properties.setProperty(SSL_TRUSTSTORE, "someKeyStore"); properties.setProperty(SSL_TRUSTSTORE_PASSWORD, "keystorePassword"); properties.setProperty(SSL_DEFAULT_ALIAS, "defaultAlias"); - properties.setProperty(SSL_HTTP_SERVICE_ALIAS, "httpAlias"); + properties.setProperty(SSL_WEB_ALIAS, "httpAlias"); properties.setProperty(SSL_CIPHERS, "any"); properties.setProperty(SSL_PROTOCOLS, "any"); DistributionConfigImpl distributionConfig = new DistributionConfigImpl(properties); @@ -147,7 +147,7 @@ public class SSLConfigurationFactoryTest extends JUnit4DistributedTestCase { properties.setProperty(SSL_TRUSTSTORE, "someKeyStore"); properties.setProperty(SSL_TRUSTSTORE_PASSWORD, "keystorePassword"); properties.setProperty(SSL_DEFAULT_ALIAS, "defaultAlias"); - properties.setProperty(SSL_HTTP_SERVICE_ALIAS, "httpAlias"); + properties.setProperty(SSL_WEB_ALIAS, "httpAlias"); properties.setProperty(SSL_HTTP_SERVICE_REQUIRE_AUTHENTICATION, "true"); properties.setProperty(SSL_CIPHERS, "any"); properties.setProperty(SSL_PROTOCOLS, "any"); @@ -191,7 +191,7 @@ public class SSLConfigurationFactoryTest extends JUnit4DistributedTestCase { case GATEWAY: return getAliasForComponent(properties, SSL_GATEWAY_ALIAS); case WEB: - return getAliasForComponent(properties, SSL_HTTP_SERVICE_ALIAS); + return getAliasForComponent(properties, SSL_WEB_ALIAS); case JMX: return getAliasForComponent(properties, SSL_JMX_ALIAS); case LOCATOR: