This is an automated email from the ASF dual-hosted git repository. jensdeppe pushed a commit to branch feature/GEODE-5212 in repository https://gitbox.apache.org/repos/asf/geode.git
commit 992898437084eadd8231b9ca375fa7b877fbaf6e Author: Jens Deppe <[email protected]> AuthorDate: Mon Aug 6 12:49:33 2018 -0700 Testing converting classpaths to manifest jar for various launcher tests --- .../apache/geode/distributed/LauncherIntegrationTestCase.java | 2 +- .../java/org/apache/geode/distributed/LocatorCommand.java | 11 +++++++++-- .../geode/distributed/LocatorLauncherIntegrationTestCase.java | 2 +- .../distributed/LocatorLauncherRemoteIntegrationTestCase.java | 2 +- .../java/org/apache/geode/distributed/ServerCommand.java | 11 +++++++++-- .../distributed/ServerLauncherRemoteIntegrationTestCase.java | 2 +- .../java/org/apache/geode/distributed/UsesLocatorCommand.java | 3 +++ .../java/org/apache/geode/distributed/UsesServerCommand.java | 3 +++ 8 files changed, 28 insertions(+), 8 deletions(-) diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LauncherIntegrationTestCase.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LauncherIntegrationTestCase.java index e2d40ec..05aac11 100755 --- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LauncherIntegrationTestCase.java +++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LauncherIntegrationTestCase.java @@ -247,7 +247,7 @@ public abstract class LauncherIntegrationTestCase { return getProcessType().getStopRequestFileName(); } - protected File getWorkingDirectory() { + public File getWorkingDirectory() { return temporaryFolder.getRoot(); } diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorCommand.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorCommand.java index ef809af..e2553b0 100644 --- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorCommand.java +++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorCommand.java @@ -14,10 +14,13 @@ */ package org.apache.geode.distributed; +import java.io.File; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.apache.geode.distributed.LocatorLauncher.Command; +import org.apache.geode.test.process.ProcessWrapper; public class LocatorCommand { @@ -33,12 +36,16 @@ public class LocatorCommand { // do nothing } - public LocatorCommand(final UsesLocatorCommand user) { + public LocatorCommand(final UsesLocatorCommand user) throws Exception { this.javaPath = user.getJavaPath(); this.jvmArguments = user.getJvmArguments(); - this.classPath = user.getClassPath(); this.name = user.getName(); this.command = Command.START; + + String classPath = user.getClassPath(); + List<String> parts = Arrays.asList(classPath.split(File.pathSeparator)); + this.classPath = + ProcessWrapper.createManifestJar(parts, user.getWorkingDirectory().getAbsolutePath()); } public LocatorCommand withJavaPath(final String javaPath) { diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherIntegrationTestCase.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherIntegrationTestCase.java index f5bd2d6..e0faa85 100755 --- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherIntegrationTestCase.java +++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherIntegrationTestCase.java @@ -97,7 +97,7 @@ public abstract class LocatorLauncherIntegrationTestCase extends LauncherIntegra return builder.build(); } - protected LocatorLauncher givenRunningLocator() { + protected LocatorLauncher givenRunningLocator() throws Exception { return givenRunningLocator(newBuilder()); } diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTestCase.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTestCase.java index b74eccc..da69236 100644 --- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTestCase.java +++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTestCase.java @@ -106,7 +106,7 @@ public abstract class LocatorLauncherRemoteIntegrationTestCase assertThat(process.isAlive()).isFalse(); } - protected LocatorLauncher givenRunningLocator() { + protected LocatorLauncher givenRunningLocator() throws Exception { return givenRunningLocator(new LocatorCommand(this).withCommand(Command.START)); } diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerCommand.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerCommand.java index ca1bfd9..a248656 100644 --- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerCommand.java +++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerCommand.java @@ -14,10 +14,13 @@ */ package org.apache.geode.distributed; +import java.io.File; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.apache.geode.distributed.ServerLauncher.Command; +import org.apache.geode.test.process.ProcessWrapper; public class ServerCommand { @@ -34,13 +37,17 @@ public class ServerCommand { // do nothing } - public ServerCommand(final UsesServerCommand user) { + public ServerCommand(final UsesServerCommand user) throws Exception { this.javaPath = user.getJavaPath(); this.jvmArguments = user.getJvmArguments(); - this.classPath = user.getClassPath(); this.name = user.getName(); this.disableDefaultServer = user.getDisableDefaultServer(); this.command = Command.START; + + String classPath = user.getClassPath(); + List<String> parts = Arrays.asList(classPath.split(File.pathSeparator)); + this.classPath = + ProcessWrapper.createManifestJar(parts, user.getWorkingDirectory().getAbsolutePath()); } public ServerCommand withJavaPath(final String javaPath) { diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTestCase.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTestCase.java index a589ca0..4ab3146 100644 --- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTestCase.java +++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTestCase.java @@ -55,7 +55,7 @@ public abstract class ServerLauncherRemoteIntegrationTestCase private ServerCommand serverCommand; @Before - public void setUpServerLauncherRemoteIntegrationTestCase() { + public void setUpServerLauncherRemoteIntegrationTestCase() throws Exception { serverCommand = new ServerCommand(this); } diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/UsesLocatorCommand.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/UsesLocatorCommand.java index 983a7a3..1433fae 100644 --- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/UsesLocatorCommand.java +++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/UsesLocatorCommand.java @@ -14,6 +14,7 @@ */ package org.apache.geode.distributed; +import java.io.File; import java.util.List; public interface UsesLocatorCommand { @@ -25,4 +26,6 @@ public interface UsesLocatorCommand { String getClassPath(); String getName(); + + File getWorkingDirectory(); } diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/UsesServerCommand.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/UsesServerCommand.java index 6ac7f8e..5b1e9b3 100644 --- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/UsesServerCommand.java +++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/UsesServerCommand.java @@ -14,6 +14,7 @@ */ package org.apache.geode.distributed; +import java.io.File; import java.util.List; public interface UsesServerCommand { @@ -27,4 +28,6 @@ public interface UsesServerCommand { String getName(); boolean getDisableDefaultServer(); + + File getWorkingDirectory(); }
