SLIDER-171: mark up some methods as clearly not for use x-platform, but only for local setup of miniclusters
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/613dbec8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/613dbec8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/613dbec8 Branch: refs/heads/develop Commit: 613dbec829810edff005c9b8aee00eba8f8bc1b8 Parents: 0317c41 Author: Steve Loughran <ste...@apache.org> Authored: Tue Jul 1 21:44:35 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Tue Jul 1 21:44:35 2014 +0100 ---------------------------------------------------------------------- .../org/apache/slider/common/tools/SliderUtils.java | 2 +- .../slider/core/launch/ClasspathConstructor.java | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/613dbec8/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java index 62e61c9..7c89321 100644 --- a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java +++ b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java @@ -1144,7 +1144,7 @@ public final class SliderUtils { if (usingMiniMRCluster) { // for mini cluster we pass down the java CP properties // and nothing else - classpath.appendAll(classpath.javaVMClasspath()); + classpath.appendAll(classpath.localJVMClasspath()); } else { classpath.addLibDir(libdir); if (sliderConfDir != null) { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/613dbec8/slider-core/src/main/java/org/apache/slider/core/launch/ClasspathConstructor.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/core/launch/ClasspathConstructor.java b/slider-core/src/main/java/org/apache/slider/core/launch/ClasspathConstructor.java index ca325d1..5b74c03 100644 --- a/slider-core/src/main/java/org/apache/slider/core/launch/ClasspathConstructor.java +++ b/slider-core/src/main/java/org/apache/slider/core/launch/ClasspathConstructor.java @@ -123,12 +123,12 @@ public class ClasspathConstructor { public void addRemoteClasspathEnvVar() { - append(ApplicationConstants.Environment.CLASSPATH.$()); + append(ApplicationConstants.Environment.CLASSPATH.$$()); } public void insertRemoteClasspathEnvVar() { - append(ApplicationConstants.Environment.CLASSPATH.$()); + append(ApplicationConstants.Environment.CLASSPATH.$$()); } @@ -152,12 +152,22 @@ public class ClasspathConstructor { return dir; } + /** + * Split a classpath. This uses the local path separator so MUST NOT + * be used to work with remote classpaths + * @param localpath local path + * @return a splite + */ public Collection<String> splitClasspath(String localpath) { String separator = System.getProperty("path.separator"); return StringUtils.getStringCollection(localpath, separator); } - public Collection<String> javaVMClasspath() { + /** + * Get the local JVM classpath split up + * @return the list of entries on the JVM classpath env var + */ + public Collection<String> localJVMClasspath() { return splitClasspath(System.getProperty("java.class.path")); }