This is an automated email from the ASF dual-hosted git repository.
burcham pushed a commit to branch feature/GEODE-8419-backport-1-13
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 8754e5fd0f0be1735c627e849e03345e351db683
Author: Bill Burcham <bill.burc...@gmail.com>
AuthorDate: Mon Oct 5 14:26:33 2020 -0700
GEODE-8419: move SSLUtil to net package in preparation for cherry-pick
---
geode-core/src/main/java/org/apache/geode/internal/admin/SSLConfig.java | 2 +-
.../org/apache/geode/{management/internal => internal/net}/SSLUtil.java | 2 +-
.../src/main/java/org/apache/geode/internal/net/SocketCreator.java | 1 -
.../org/apache/geode/management/internal/api/GeodeConnectionConfig.java | 2 +-
.../apache/geode/management/internal/cli/commands/ConnectCommand.java | 2 +-
.../main/java/org/apache/geode/internal/cache/InternalHttpService.java | 2 +-
6 files changed, 5 insertions(+), 6 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/admin/SSLConfig.java
b/geode-core/src/main/java/org/apache/geode/internal/admin/SSLConfig.java
index b1e3f07..6ed5521 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/SSLConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/SSLConfig.java
@@ -28,9 +28,9 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.geode.annotations.Immutable;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.internal.net.SSLUtil;
import org.apache.geode.internal.security.CallbackInstantiator;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
-import org.apache.geode.management.internal.SSLUtil;
import org.apache.geode.net.SSLParameterExtension;
/**
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/SSLUtil.java
b/geode-core/src/main/java/org/apache/geode/internal/net/SSLUtil.java
similarity index 99%
rename from
geode-core/src/main/java/org/apache/geode/management/internal/SSLUtil.java
rename to geode-core/src/main/java/org/apache/geode/internal/net/SSLUtil.java
index 931539c..0d6598d 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/SSLUtil.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/net/SSLUtil.java
@@ -12,7 +12,7 @@
* or implied. See the License for the specific language governing permissions
and limitations under
* the License.
*/
-package org.apache.geode.management.internal;
+package org.apache.geode.internal.net;
import java.io.FileInputStream;
import java.security.KeyStore;
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
index 1a9a0d3..7981d3c 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
@@ -85,7 +85,6 @@ import org.apache.geode.internal.inet.LocalHostUtil;
import org.apache.geode.internal.util.ArgumentRedactor;
import org.apache.geode.internal.util.PasswordUtil;
import org.apache.geode.logging.internal.log4j.api.LogService;
-import org.apache.geode.management.internal.SSLUtil;
import org.apache.geode.net.SSLParameterExtension;
import org.apache.geode.util.internal.GeodeGlossary;
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/api/GeodeConnectionConfig.java
b/geode-core/src/main/java/org/apache/geode/management/internal/api/GeodeConnectionConfig.java
index 0eeaaf8..53c7318 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/api/GeodeConnectionConfig.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/api/GeodeConnectionConfig.java
@@ -41,12 +41,12 @@ import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.admin.SSLConfig;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.net.SSLConfigurationFactory;
+import org.apache.geode.internal.net.SSLUtil;
import org.apache.geode.internal.net.SocketCreatorFactory;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
import org.apache.geode.logging.internal.log4j.api.LogService;
import org.apache.geode.management.api.ConnectionConfig;
import org.apache.geode.management.client.ClusterManagementServiceBuilder;
-import org.apache.geode.management.internal.SSLUtil;
import
org.apache.geode.management.internal.configuration.messages.ClusterManagementServiceInfo;
import
org.apache.geode.management.internal.configuration.messages.ClusterManagementServiceInfoRequest;
import
org.apache.geode.management.internal.functions.GetMemberInformationFunction;
diff --git
a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java
b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java
index 2531b80..48b601c 100644
---
a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java
+++
b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java
@@ -37,12 +37,12 @@ import org.springframework.shell.core.annotation.CliOption;
import org.apache.geode.annotations.Immutable;
import org.apache.geode.internal.admin.SSLConfig;
import org.apache.geode.internal.net.SSLConfigurationFactory;
+import org.apache.geode.internal.net.SSLUtil;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
import org.apache.geode.management.cli.CliMetaData;
import org.apache.geode.management.cli.ConverterHint;
import org.apache.geode.management.internal.JmxManagerLocatorRequest;
import org.apache.geode.management.internal.JmxManagerLocatorResponse;
-import org.apache.geode.management.internal.SSLUtil;
import org.apache.geode.management.internal.cli.LogWrapper;
import
org.apache.geode.management.internal.cli.converters.ConnectionEndpointConverter;
import org.apache.geode.management.internal.cli.domain.ConnectToLocatorResult;
diff --git
a/geode-http-service/src/main/java/org/apache/geode/internal/cache/InternalHttpService.java
b/geode-http-service/src/main/java/org/apache/geode/internal/cache/InternalHttpService.java
index 12e7d50..d37d645 100644
---
a/geode-http-service/src/main/java/org/apache/geode/internal/cache/InternalHttpService.java
+++
b/geode-http-service/src/main/java/org/apache/geode/internal/cache/InternalHttpService.java
@@ -43,9 +43,9 @@ import
org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.admin.SSLConfig;
import org.apache.geode.internal.net.SSLConfigurationFactory;
+import org.apache.geode.internal.net.SSLUtil;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
import org.apache.geode.logging.internal.log4j.api.LogService;
-import org.apache.geode.management.internal.SSLUtil;
import org.apache.geode.management.internal.beans.CacheServiceMBeanBase;
public class InternalHttpService implements HttpService {
