This is an automated email from the ASF dual-hosted git repository. upthewaterspout pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push: new e10cf65 GEODE-7852: Move sni test files to a test specific dir e10cf65 is described below commit e10cf659e82ea536e8edac2b85048cf921ccb674 Author: Dan Smith <upthewatersp...@apache.org> AuthorDate: Mon Mar 30 08:46:37 2020 -0700 GEODE-7852: Move sni test files to a test specific dir Most of these resources are fairly specific to this test. Moving them all to a package named sni. --- .../geode/client/{ => sni}/ClientSNIAcceptanceTest.java | 7 ++++--- .../org/apache/geode/client/{ => sni}/docker-compose.yml | 0 .../geode/client/{ => sni}/geode-config/gemfire.properties | 0 .../client/{ => sni}/geode-config/gfsecurity.properties | 0 .../client/{ => sni}/geode-config/locator-keystore.jks | Bin .../geode/client/{ => sni}/geode-config/server-keystore.jks | Bin .../geode/client/{ => sni}/geode-config/truststore.jks | Bin .../resources/org/apache/geode/client/{ => sni}/haproxy.cfg | 0 .../org/apache/geode/client/{ => sni}/scripts/forever | 0 .../geode/client/{ => sni}/scripts/geode-starter.gfsh | 0 10 files changed, 4 insertions(+), 3 deletions(-) diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/client/ClientSNIAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/client/sni/ClientSNIAcceptanceTest.java similarity index 97% rename from geode-assembly/src/acceptanceTest/java/org/apache/geode/client/ClientSNIAcceptanceTest.java rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/client/sni/ClientSNIAcceptanceTest.java index 29fc110..69aa5d8 100644 --- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/client/ClientSNIAcceptanceTest.java +++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/client/sni/ClientSNIAcceptanceTest.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.client; +package org.apache.geode.client.sni; import static com.palantir.docker.compose.execution.DockerComposeExecArgument.arguments; import static com.palantir.docker.compose.execution.DockerComposeExecOption.options; @@ -64,8 +64,9 @@ public class ClientSNIAcceptanceTest { @Before public void before() throws IOException, InterruptedException { trustStorePath = - createTempFileFromResource(ClientSNIAcceptanceTest.class, "geode-config/truststore.jks") - .getAbsolutePath(); + createTempFileFromResource(ClientSNIAcceptanceTest.class, + "geode-config/truststore.jks") + .getAbsolutePath(); docker.exec(options("-T"), "geode", arguments("gfsh", "run", "--file=/geode/scripts/geode-starter.gfsh")); } diff --git a/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/docker-compose.yml b/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/docker-compose.yml similarity index 100% rename from geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/docker-compose.yml rename to geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/docker-compose.yml diff --git a/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/geode-config/gemfire.properties b/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/geode-config/gemfire.properties similarity index 100% rename from geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/geode-config/gemfire.properties rename to geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/geode-config/gemfire.properties diff --git a/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/geode-config/gfsecurity.properties b/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/geode-config/gfsecurity.properties similarity index 100% rename from geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/geode-config/gfsecurity.properties rename to geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/geode-config/gfsecurity.properties diff --git a/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/geode-config/locator-keystore.jks b/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/geode-config/locator-keystore.jks similarity index 100% rename from geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/geode-config/locator-keystore.jks rename to geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/geode-config/locator-keystore.jks diff --git a/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/geode-config/server-keystore.jks b/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/geode-config/server-keystore.jks similarity index 100% rename from geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/geode-config/server-keystore.jks rename to geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/geode-config/server-keystore.jks diff --git a/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/geode-config/truststore.jks b/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/geode-config/truststore.jks similarity index 100% rename from geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/geode-config/truststore.jks rename to geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/geode-config/truststore.jks diff --git a/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/haproxy.cfg b/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/haproxy.cfg similarity index 100% rename from geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/haproxy.cfg rename to geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/haproxy.cfg diff --git a/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/scripts/forever b/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/scripts/forever similarity index 100% rename from geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/scripts/forever rename to geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/scripts/forever diff --git a/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/scripts/geode-starter.gfsh b/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/scripts/geode-starter.gfsh similarity index 100% rename from geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/scripts/geode-starter.gfsh rename to geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/scripts/geode-starter.gfsh