SLIDER-38 more examples
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/84c27fa8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/84c27fa8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/84c27fa8 Branch: refs/heads/develop Commit: 84c27fa833cad10e63e1619a03c1b50a434f5943 Parents: 6adb341 Author: Steve Loughran <ste...@apache.org> Authored: Fri May 23 17:15:01 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Fri May 23 17:15:01 2014 +0100 ---------------------------------------------------------------------- .../org/apache/slider/common/tools/SliderUtils.java | 1 + .../providers/slideram/SliderAMClientProvider.java | 16 ---------------- 2 files changed, 1 insertion(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/84c27fa8/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 0cfb569..5b246d0 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 @@ -36,6 +36,7 @@ import org.apache.hadoop.security.SecurityUtil; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.util.ExitUtil; import org.apache.hadoop.util.VersionInfo; +import org.apache.hadoop.yarn.api.ApplicationConstants; import org.apache.hadoop.yarn.api.records.ApplicationReport; import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.LocalResource; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/84c27fa8/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMClientProvider.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMClientProvider.java b/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMClientProvider.java index 9d13707..e2e0a2d 100644 --- a/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMClientProvider.java +++ b/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMClientProvider.java @@ -39,16 +39,11 @@ import org.apache.slider.core.conf.MapOperations; import org.apache.slider.core.exceptions.BadConfigException; import org.apache.slider.core.exceptions.SliderException; import org.apache.slider.core.launch.AbstractLauncher; -import org.apache.slider.core.launch.CommandLineBuilder; import org.apache.slider.core.launch.JavaCommandLineBuilder; import org.apache.slider.providers.AbstractClientProvider; import org.apache.slider.providers.PlacementPolicy; import org.apache.slider.providers.ProviderRole; import org.apache.slider.providers.ProviderUtils; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider; -import org.codehaus.jackson.node.JsonNodeFactory; -import org.codehaus.jackson.xc.JaxbAnnotationIntrospector; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -171,11 +166,6 @@ public class SliderAMClientProvider extends AbstractClientProvider implements ServiceInstance.class, ServiceNames.class, - JacksonJaxbJsonProvider.class, - JsonFactory.class, - JsonNodeFactory.class, - JaxbAnnotationIntrospector.class, - }; String[] jars = { @@ -186,12 +176,6 @@ public class SliderAMClientProvider extends AbstractClientProvider implements "curator-client.jar", "curator-x-discovery.jar", "curator-x-discovery-service.jar", - - "jackson-jaxrs", - "jackson-core-asl", - "jackson-mapper-asl", - "jackson-xc", - }; ProviderUtils.addDependencyJars(providerResources, fileSystem, tempPath, libdir, jars,