Merge branch 'feature/SLIDER-322_Slider_to_briefly_support_Java_1.6' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/966c8c83 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/966c8c83 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/966c8c83 Branch: refs/heads/feature/SLIDER-151_REST_API Commit: 966c8c83d84bf0a127b646608821ca9316b179ac Parents: 9aa0299 b6782e1 Author: Steve Loughran <ste...@apache.org> Authored: Thu Aug 14 18:23:46 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Thu Aug 14 18:23:46 2014 +0100 ---------------------------------------------------------------------- pom.xml | 8 +- .../src/main/java/org/apache/slider/Slider.java | 2 +- .../apache/slider/api/ClusterDescription.java | 14 +-- .../org/apache/slider/client/SliderClient.java | 100 +++++++++++++++++-- .../slider/client/SliderYarnClientImpl.java | 8 +- .../common/params/AbstractActionArgs.java | 6 +- .../params/AppAndResouceOptionArgsDelegate.java | 8 +- .../org/apache/slider/common/params/ArgOps.java | 8 +- .../apache/slider/common/params/CommonArgs.java | 4 +- .../common/params/DontSplitArguments.java | 2 +- .../slider/common/tools/ConfigHelper.java | 60 +++++++---- .../slider/common/tools/CoreFileSystem.java | 2 +- .../apache/slider/common/tools/SliderUtils.java | 10 +- .../org/apache/slider/core/conf/ConfTree.java | 6 +- .../slider/core/conf/ConfTreeOperations.java | 4 +- .../apache/slider/core/conf/MapOperations.java | 2 +- .../slider/core/launch/AbstractLauncher.java | 10 +- .../core/launch/ClasspathConstructor.java | 2 +- .../slider/core/launch/CommandLineBuilder.java | 2 +- .../slider/core/main/ServiceLauncher.java | 2 +- .../slider/core/persist/JsonSerDeser.java | 27 ++++- .../registry/docstore/PublishedConfigSet.java | 2 +- .../docstore/PublishedConfiguration.java | 4 +- .../PublishedConfigurationOutputter.java | 12 +++ .../slider/core/registry/docstore/UriMap.java | 2 +- .../slider/core/registry/info/RegistryView.java | 3 +- .../core/registry/info/ServiceInstanceData.java | 4 +- .../apache/slider/core/zk/ZKIntegration.java | 2 +- .../apache/slider/core/zk/ZookeeperUtils.java | 6 +- .../providers/AbstractProviderService.java | 4 +- .../apache/slider/providers/ProviderUtils.java | 2 +- .../providers/agent/AgentClientProvider.java | 2 +- .../providers/agent/AgentLaunchParameter.java | 2 +- .../providers/agent/AgentProviderService.java | 47 +++++---- .../providers/agent/ComponentCommandOrder.java | 9 +- .../agent/application/metadata/Application.java | 8 +- .../agent/application/metadata/Component.java | 2 +- .../slideram/SliderAMClientProvider.java | 4 +- .../slideram/SliderAMProviderService.java | 2 +- .../server/appmaster/SliderAppMaster.java | 37 +++++-- .../appmaster/actions/ActionKillContainer.java | 2 +- .../server/appmaster/actions/QueueService.java | 6 +- .../appmaster/monkey/ChaosMonkeyService.java | 2 +- .../slider/server/appmaster/state/AppState.java | 56 +++++------ .../MostRecentContainerReleaseSelector.java | 2 +- .../server/appmaster/state/NodeInstance.java | 2 +- .../slider/server/appmaster/state/NodeMap.java | 2 +- .../state/OutstandingRequestTracker.java | 6 +- .../appmaster/state/ProviderAppState.java | 4 +- .../server/appmaster/state/RoleHistory.java | 15 ++- .../server/appmaster/state/RoleStatus.java | 2 +- .../server/appmaster/web/SliderAMWebApp.java | 2 +- .../web/SliderAmFilterInitializer.java | 2 +- .../server/appmaster/web/SliderAmIpFilter.java | 8 +- .../server/appmaster/web/WebAppApiImpl.java | 2 +- .../web/rest/publisher/PublisherResource.java | 4 +- .../slider/server/avro/RoleHistoryWriter.java | 6 +- .../server/servicemonitor/MonitorUtils.java | 2 +- .../services/curator/RegistryBinderService.java | 6 +- .../registry/RegistryRestResources.java | 3 +- .../registry/SliderRegistryService.java | 2 +- .../agent/TestAgentProviderService.java | 45 +++++---- .../agent/TestComponentInstanceState.java | 11 +- .../providers/agent/TestHeartbeatMonitor.java | 4 +- .../management/TestAMManagementWebServices.java | 9 +- .../publisher/TestAgentProviderService.java | 2 +- .../workflow/ProcessCommandFactory.java | 6 +- .../slider/test/MiniZooKeeperCluster.java | 6 +- .../accumulo/AccumuloProviderService.java | 19 +++- .../providers/hbase/HBaseClientProvider.java | 6 +- .../providers/hbase/HBaseProviderService.java | 31 +++++- 71 files changed, 476 insertions(+), 240 deletions(-) ----------------------------------------------------------------------
