GEODE-420: fix Pulse test when not using any SSLConfig (cherry picked from commit e04519d)
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/17cc4724 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/17cc4724 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/17cc4724 Branch: refs/heads/develop Commit: 17cc4724b5e53d6660dcffc17f63a267078cdc63 Parents: 864fc08 Author: Jinmei Liao <jil...@pivotal.io> Authored: Mon Oct 3 10:51:05 2016 -0700 Committer: Jinmei Liao <jil...@pivotal.io> Committed: Wed Oct 5 12:19:24 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/geode/management/internal/JettyHelper.java | 4 +--- .../apache/geode/tools/pulse/testbed/driver/PulseUITest.java | 5 ++--- .../org/apache/geode/tools/pulse/tests/PulseAbstractTest.java | 5 ++--- 3 files changed, 5 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/17cc4724/geode-core/src/main/java/org/apache/geode/management/internal/JettyHelper.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/JettyHelper.java b/geode-core/src/main/java/org/apache/geode/management/internal/JettyHelper.java index 089dbac..f1906b1 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/JettyHelper.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/JettyHelper.java @@ -36,8 +36,6 @@ import org.apache.geode.GemFireConfigException; import org.apache.geode.internal.admin.SSLConfig; import org.apache.geode.internal.lang.StringUtils; import org.apache.geode.internal.logging.LogService; -import org.apache.geode.internal.net.SSLConfigurationFactory; -import org.apache.geode.internal.security.SecurableCommunicationChannel; /** * @since GemFire 8.1 @@ -197,7 +195,7 @@ public class JettyHelper { if (args.length > 1) { System.out.printf("Temporary Directory @ ($1%s)%n", USER_DIR); - final Server jetty = JettyHelper.initJetty(null, 8090, SSLConfigurationFactory.getSSLConfigForComponent(SecurableCommunicationChannel.WEB)); + final Server jetty = JettyHelper.initJetty(null, 8090, new SSLConfig()); for (int index = 0; index < args.length; index += 2) { final String webAppContext = args[index]; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/17cc4724/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/driver/PulseUITest.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/driver/PulseUITest.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/driver/PulseUITest.java index a2365a2..a4062e5 100644 --- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/driver/PulseUITest.java +++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/driver/PulseUITest.java @@ -35,8 +35,7 @@ import org.openqa.selenium.firefox.FirefoxDriver; import org.openqa.selenium.support.ui.ExpectedCondition; import org.openqa.selenium.support.ui.WebDriverWait; -import org.apache.geode.internal.net.SSLConfigurationFactory; -import org.apache.geode.internal.security.SecurableCommunicationChannel; +import org.apache.geode.internal.admin.SSLConfig; import org.apache.geode.management.internal.JettyHelper; import org.apache.geode.test.junit.categories.UITest; import org.apache.geode.tools.pulse.testbed.GemFireDistributedSystem.Locator; @@ -72,7 +71,7 @@ public class PulseUITest { path = getPulseWarPath(); //System.setProperty("pulse.propMockDataUpdaterClass", "org.apache.geode.tools.pulse.testbed.PropMockDataUpdater"); - jetty = JettyHelper.initJetty(host, port, SSLConfigurationFactory.getSSLConfigForComponent(SecurableCommunicationChannel.WEB)); + jetty = JettyHelper.initJetty(host, port, new SSLConfig()); JettyHelper.addWebApplication(jetty, context, getPulseWarPath()); jetty.start(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/17cc4724/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/PulseAbstractTest.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/PulseAbstractTest.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/PulseAbstractTest.java index 5024250..ff70b35 100644 --- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/PulseAbstractTest.java +++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/PulseAbstractTest.java @@ -44,8 +44,7 @@ import org.openqa.selenium.support.ui.ExpectedCondition; import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.WebDriverWait; -import org.apache.geode.internal.net.SSLConfigurationFactory; -import org.apache.geode.internal.security.SecurableCommunicationChannel; +import org.apache.geode.internal.admin.SSLConfig; import org.apache.geode.management.internal.JettyHelper; import org.apache.geode.tools.pulse.internal.data.PulseConstants; @@ -148,7 +147,7 @@ public abstract class PulseAbstractTest extends PulseBaseTest { int port = 8080; String context = "/pulse"; - jetty = JettyHelper.initJetty(host, port, SSLConfigurationFactory.getSSLConfigForComponent(SecurableCommunicationChannel.WEB)); + jetty = JettyHelper.initJetty(host, port, new SSLConfig()); JettyHelper.addWebApplication(jetty, context, getPulseWarPath()); jetty.start();
