SLIDER-149/YARN-913 move registry package to org.apache.hadoop.registry
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/bfbc67af Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/bfbc67af Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/bfbc67af Branch: refs/heads/feature/SLIDER-481_allow_dedicated_handling_of_exports Commit: bfbc67affeb711bf6d20aa7ca76793ea840660b9 Parents: 29c9824 Author: Steve Loughran <ste...@apache.org> Authored: Tue Oct 7 11:45:26 2014 -0700 Committer: Steve Loughran <ste...@apache.org> Committed: Tue Oct 7 11:45:26 2014 -0700 ---------------------------------------------------------------------- .../funtest/accumulo/AccumuloBasicIT.groovy | 6 +++--- .../org/apache/slider/client/SliderClient.java | 18 +++++++++--------- .../core/registry/retrieve/RegistryRetriever.java | 10 ++++------ .../slider/providers/AbstractProviderService.java | 10 +++++----- .../apache/slider/providers/ProviderService.java | 2 +- .../providers/agent/AgentProviderService.java | 7 +++---- .../slideram/SliderAMProviderService.java | 6 ++---- .../slider/server/appmaster/SliderAppMaster.java | 14 +++++++------- .../server/appmaster/state/RoleInstance.java | 6 +++--- .../server/appmaster/web/SliderAMWebApp.java | 2 +- .../slider/server/appmaster/web/WebAppApi.java | 2 +- .../server/appmaster/web/WebAppApiImpl.java | 2 +- .../web/rest/registry/PathEntryResource.java | 2 +- .../web/rest/registry/RegistryResource.java | 10 +++++----- .../utility/AbstractSliderLaunchedService.java | 6 +++--- .../YarnRegistryViewForProviders.java | 10 +++++----- .../TestStandaloneYarnRegistryAM.groovy | 14 +++++++------- .../model/mock/MockProviderService.groovy | 2 +- .../web/rest/registry/PathEntryMarshalling.groovy | 2 +- .../registry/TestRegistryRestMarshalling.groovy | 2 +- .../registry/TestRegistryRestResources.groovy | 6 +++--- .../org/apache/slider/test/MicroZKCluster.groovy | 6 +++--- .../org/apache/slider/test/SliderTestUtils.groovy | 2 +- .../slider/test/YarnZKMiniClusterTestBase.groovy | 4 +--- .../providers/hbase/HBaseProviderService.java | 8 ++++---- .../hbase/minicluster/live/TestHBaseMaster.groovy | 6 +++--- .../minicluster/live/TestTwoLiveClusters.groovy | 8 ++++---- 27 files changed, 83 insertions(+), 90 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy b/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy index 2f6674e..bb9abba 100644 --- a/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy +++ b/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy @@ -25,7 +25,7 @@ import org.apache.hadoop.security.ProviderUtils import org.apache.hadoop.security.UserGroupInformation import org.apache.hadoop.security.alias.CredentialProvider import org.apache.hadoop.security.alias.CredentialProviderFactory -import org.apache.hadoop.yarn.registry.client.types.ServiceRecord +import org.apache.hadoop.registry.client.types.ServiceRecord import org.apache.slider.accumulo.CustomAuthenticator import org.apache.slider.api.ClusterDescription import org.apache.slider.client.SliderClient @@ -39,8 +39,8 @@ import org.apache.slider.funtest.framework.SliderShell import org.junit.Before import org.junit.Test -import static org.apache.hadoop.yarn.registry.client.binding.RegistryUtils.currentUser -import static org.apache.hadoop.yarn.registry.client.binding.RegistryUtils.servicePath +import static org.apache.hadoop.registry.client.binding.RegistryUtils.currentUser +import static org.apache.hadoop.registry.client.binding.RegistryUtils.servicePath @Slf4j class AccumuloBasicIT extends AccumuloAgentCommandTestBase { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/slider-core/src/main/java/org/apache/slider/client/SliderClient.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java index b3365a7..185e77d 100644 --- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java +++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java @@ -41,15 +41,15 @@ import org.apache.hadoop.yarn.api.records.NodeState; import org.apache.hadoop.yarn.api.records.YarnApplicationState; import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.exceptions.YarnException; -import org.apache.hadoop.yarn.registry.client.api.RegistryConstants; -import org.apache.hadoop.yarn.registry.client.api.RegistryOperations; -import static org.apache.hadoop.yarn.registry.client.binding.RegistryUtils.*; - -import org.apache.hadoop.yarn.registry.client.binding.RegistryUtils; -import org.apache.hadoop.yarn.registry.client.exceptions.NoRecordException; -import org.apache.hadoop.yarn.registry.client.types.Endpoint; -import org.apache.hadoop.yarn.registry.client.types.ServiceRecord; -import org.apache.hadoop.yarn.registry.client.types.yarn.YarnRegistryAttributes; +import org.apache.hadoop.registry.client.api.RegistryConstants; +import org.apache.hadoop.registry.client.api.RegistryOperations; +import static org.apache.hadoop.registry.client.binding.RegistryUtils.*; + +import org.apache.hadoop.registry.client.binding.RegistryUtils; +import org.apache.hadoop.registry.client.exceptions.NoRecordException; +import org.apache.hadoop.registry.client.types.Endpoint; +import org.apache.hadoop.registry.client.types.ServiceRecord; +import org.apache.hadoop.registry.client.types.yarn.YarnRegistryAttributes; import org.apache.slider.api.ClusterDescription; import org.apache.slider.api.ClusterNode; import org.apache.slider.api.InternalKeys; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/slider-core/src/main/java/org/apache/slider/core/registry/retrieve/RegistryRetriever.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/core/registry/retrieve/RegistryRetriever.java b/slider-core/src/main/java/org/apache/slider/core/registry/retrieve/RegistryRetriever.java index df1d675..101efb2 100644 --- a/slider-core/src/main/java/org/apache/slider/core/registry/retrieve/RegistryRetriever.java +++ b/slider-core/src/main/java/org/apache/slider/core/registry/retrieve/RegistryRetriever.java @@ -25,12 +25,10 @@ import com.sun.jersey.api.client.WebResource; import com.sun.jersey.api.client.config.ClientConfig; import com.sun.jersey.api.client.config.DefaultClientConfig; import com.sun.jersey.api.json.JSONConfiguration; -import org.apache.hadoop.fs.PathNotFoundException; -import org.apache.hadoop.yarn.registry.client.binding.RegistryTypeUtils; -import org.apache.hadoop.yarn.registry.client.exceptions.InvalidRecordException; -import org.apache.hadoop.yarn.registry.client.exceptions.RegistryIOException; -import org.apache.hadoop.yarn.registry.client.types.Endpoint; -import org.apache.hadoop.yarn.registry.client.types.ServiceRecord; +import org.apache.hadoop.registry.client.binding.RegistryTypeUtils; +import org.apache.hadoop.registry.client.exceptions.RegistryIOException; +import org.apache.hadoop.registry.client.types.Endpoint; +import org.apache.hadoop.registry.client.types.ServiceRecord; import org.apache.slider.common.tools.SliderUtils; import org.apache.slider.core.exceptions.ExceptionConverter; import org.apache.slider.core.registry.docstore.PublishedConfigSet; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java index 9af970c..04f6d8c 100644 --- a/slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java +++ b/slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java @@ -23,11 +23,11 @@ import org.apache.hadoop.service.Service; import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.client.api.AMRMClient; -import org.apache.hadoop.yarn.registry.client.binding.RegistryTypeUtils; -import org.apache.hadoop.yarn.registry.client.exceptions.InvalidRecordException; -import org.apache.hadoop.yarn.registry.client.types.AddressTypes; -import org.apache.hadoop.yarn.registry.client.types.Endpoint; -import org.apache.hadoop.yarn.registry.client.types.ServiceRecord; +import org.apache.hadoop.registry.client.binding.RegistryTypeUtils; +import org.apache.hadoop.registry.client.exceptions.InvalidRecordException; +import org.apache.hadoop.registry.client.types.AddressTypes; +import org.apache.hadoop.registry.client.types.Endpoint; +import org.apache.hadoop.registry.client.types.ServiceRecord; import org.apache.slider.api.ClusterDescription; import org.apache.slider.common.SliderKeys; import org.apache.slider.common.tools.ConfigHelper; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/slider-core/src/main/java/org/apache/slider/providers/ProviderService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/providers/ProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/ProviderService.java index d78ca0f..b080ecb 100644 --- a/slider-core/src/main/java/org/apache/slider/providers/ProviderService.java +++ b/slider-core/src/main/java/org/apache/slider/providers/ProviderService.java @@ -23,7 +23,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.service.Service; import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.ContainerId; -import org.apache.hadoop.yarn.registry.client.types.ServiceRecord; +import org.apache.hadoop.registry.client.types.ServiceRecord; import org.apache.slider.api.ClusterDescription; import org.apache.slider.common.tools.SliderFileSystem; import org.apache.slider.core.conf.AggregateConf; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java index a3010ea..ca6ae71 100644 --- a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java +++ b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java @@ -28,9 +28,9 @@ import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.LocalResource; import org.apache.hadoop.yarn.api.records.LocalResourceType; -import org.apache.hadoop.yarn.registry.client.types.Endpoint; -import org.apache.hadoop.yarn.registry.client.types.ProtocolTypes; -import org.apache.hadoop.yarn.registry.client.types.ServiceRecord; +import org.apache.hadoop.registry.client.types.Endpoint; +import org.apache.hadoop.registry.client.types.ProtocolTypes; +import org.apache.hadoop.registry.client.types.ServiceRecord; import org.apache.slider.api.ClusterDescription; import org.apache.slider.api.ClusterDescriptionKeys; import org.apache.slider.api.ClusterNode; @@ -52,7 +52,6 @@ import org.apache.slider.core.launch.ContainerLauncher; import org.apache.slider.core.registry.docstore.PublishedConfiguration; import org.apache.slider.core.registry.info.CustomRegistryConstants; import org.apache.slider.providers.AbstractProviderService; -import org.apache.slider.providers.ProviderCompleted; import org.apache.slider.providers.ProviderCore; import org.apache.slider.providers.ProviderRole; import org.apache.slider.providers.ProviderUtils; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMProviderService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMProviderService.java index e28f5a8..601c3f9 100644 --- a/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMProviderService.java +++ b/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMProviderService.java @@ -23,8 +23,8 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdfs.HdfsConfiguration; import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.conf.YarnConfiguration; -import org.apache.hadoop.yarn.registry.client.binding.RegistryTypeUtils; -import org.apache.hadoop.yarn.registry.client.types.ServiceRecord; +import org.apache.hadoop.registry.client.binding.RegistryTypeUtils; +import org.apache.hadoop.registry.client.types.ServiceRecord; import org.apache.slider.common.SliderKeys; import org.apache.slider.common.tools.ConfigHelper; import org.apache.slider.common.tools.SliderFileSystem; @@ -37,7 +37,6 @@ import org.apache.slider.core.launch.ContainerLauncher; import org.apache.slider.core.registry.docstore.PublishedConfiguration; import org.apache.slider.core.registry.info.CustomRegistryConstants; import org.apache.slider.providers.AbstractProviderService; -import org.apache.slider.providers.ProviderCompleted; import org.apache.slider.providers.ProviderCore; import org.apache.slider.providers.ProviderRole; import org.apache.slider.providers.agent.AgentKeys; @@ -51,7 +50,6 @@ import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; import java.util.List; -import java.util.Map; import static org.apache.slider.server.appmaster.web.rest.RestPaths.*; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java index 5f7ebe6..824951c 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java @@ -54,13 +54,13 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.exceptions.InvalidApplicationMasterRequestException; import org.apache.hadoop.yarn.exceptions.YarnException; import org.apache.hadoop.yarn.ipc.YarnRPC; -import org.apache.hadoop.yarn.registry.client.api.RegistryOperations; -import org.apache.hadoop.yarn.registry.client.binding.RegistryPathUtils; -import org.apache.hadoop.yarn.registry.client.types.yarn.PersistencePolicies; -import org.apache.hadoop.yarn.registry.client.types.ServiceRecord; -import org.apache.hadoop.yarn.registry.client.binding.RegistryTypeUtils; -import org.apache.hadoop.yarn.registry.client.types.yarn.YarnRegistryAttributes; -import org.apache.hadoop.yarn.registry.server.integration.RMRegistryOperationsService; +import org.apache.hadoop.registry.client.api.RegistryOperations; +import org.apache.hadoop.registry.client.binding.RegistryPathUtils; +import org.apache.hadoop.registry.client.types.yarn.PersistencePolicies; +import org.apache.hadoop.registry.client.types.ServiceRecord; +import org.apache.hadoop.registry.client.binding.RegistryTypeUtils; +import org.apache.hadoop.registry.client.types.yarn.YarnRegistryAttributes; +import org.apache.hadoop.registry.server.integration.RMRegistryOperationsService; import org.apache.hadoop.yarn.security.AMRMTokenIdentifier; import org.apache.hadoop.yarn.security.client.ClientToAMTokenSecretManager; import org.apache.hadoop.yarn.util.ConverterUtils; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleInstance.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleInstance.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleInstance.java index df5e47e..c6d8f4c 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleInstance.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleInstance.java @@ -22,9 +22,9 @@ import com.google.common.base.Preconditions; import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.NodeId; -import org.apache.hadoop.yarn.registry.client.binding.RegistryTypeUtils; -import org.apache.hadoop.yarn.registry.client.types.Endpoint; -import org.apache.hadoop.yarn.registry.client.types.ProtocolTypes; +import org.apache.hadoop.registry.client.binding.RegistryTypeUtils; +import org.apache.hadoop.registry.client.types.Endpoint; +import org.apache.hadoop.registry.client.types.ProtocolTypes; import org.apache.slider.api.ClusterDescription; import org.apache.slider.api.proto.Messages; import org.apache.slider.common.tools.SliderUtils; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAMWebApp.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAMWebApp.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAMWebApp.java index 34080d6..7f30440 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAMWebApp.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAMWebApp.java @@ -21,7 +21,7 @@ import com.sun.jersey.api.container.filter.GZIPContentEncodingFilter; import com.sun.jersey.api.core.ResourceConfig; import com.sun.jersey.guice.spi.container.servlet.GuiceContainer; import com.sun.jersey.spi.container.servlet.ServletContainer; -import org.apache.hadoop.yarn.registry.client.api.RegistryOperations; +import org.apache.hadoop.registry.client.api.RegistryOperations; import org.apache.hadoop.yarn.webapp.Dispatcher; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.WebApp; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/slider-core/src/main/java/org/apache/slider/server/appmaster/web/WebAppApi.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/WebAppApi.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/WebAppApi.java index 8d91fd4..b7e749e 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/WebAppApi.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/WebAppApi.java @@ -16,7 +16,7 @@ */ package org.apache.slider.server.appmaster.web; -import org.apache.hadoop.yarn.registry.client.api.RegistryOperations; +import org.apache.hadoop.registry.client.api.RegistryOperations; import org.apache.slider.api.SliderClusterProtocol; import org.apache.slider.providers.ProviderService; import org.apache.slider.server.appmaster.state.AppState; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/slider-core/src/main/java/org/apache/slider/server/appmaster/web/WebAppApiImpl.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/WebAppApiImpl.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/WebAppApiImpl.java index 52b53a9..4c0aa6a 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/WebAppApiImpl.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/WebAppApiImpl.java @@ -16,7 +16,7 @@ */ package org.apache.slider.server.appmaster.web; -import org.apache.hadoop.yarn.registry.client.api.RegistryOperations; +import org.apache.hadoop.registry.client.api.RegistryOperations; import org.apache.slider.api.SliderClusterProtocol; import org.apache.slider.common.SliderKeys; import org.apache.slider.providers.ProviderRole; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/registry/PathEntryResource.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/registry/PathEntryResource.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/registry/PathEntryResource.java index 91da408..efb09a8 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/registry/PathEntryResource.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/registry/PathEntryResource.java @@ -18,7 +18,7 @@ package org.apache.slider.server.appmaster.web.rest.registry; -import org.apache.hadoop.yarn.registry.client.types.ServiceRecord; +import org.apache.hadoop.registry.client.types.ServiceRecord; import org.codehaus.jackson.annotate.JsonIgnoreProperties; import org.codehaus.jackson.map.annotate.JsonSerialize; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/registry/RegistryResource.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/registry/RegistryResource.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/registry/RegistryResource.java index fc41e7d..70c0826 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/registry/RegistryResource.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/registry/RegistryResource.java @@ -20,11 +20,11 @@ package org.apache.slider.server.appmaster.web.rest.registry; import com.google.inject.Singleton; import org.apache.hadoop.fs.PathNotFoundException; -import org.apache.hadoop.yarn.registry.client.api.RegistryOperations; -import org.apache.hadoop.yarn.registry.client.exceptions.AuthenticationFailedException; -import org.apache.hadoop.yarn.registry.client.exceptions.InvalidRecordException; -import org.apache.hadoop.yarn.registry.client.exceptions.NoPathPermissionsException; -import org.apache.hadoop.yarn.registry.client.exceptions.NoRecordException; +import org.apache.hadoop.registry.client.api.RegistryOperations; +import org.apache.hadoop.registry.client.exceptions.AuthenticationFailedException; +import org.apache.hadoop.registry.client.exceptions.InvalidRecordException; +import org.apache.hadoop.registry.client.exceptions.NoPathPermissionsException; +import org.apache.hadoop.registry.client.exceptions.NoRecordException; import org.apache.hadoop.yarn.webapp.ForbiddenException; import org.apache.hadoop.yarn.webapp.NotFoundException; import org.apache.slider.server.appmaster.web.WebAppApi; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java b/slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java index ada0047..acdb882 100644 --- a/slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java +++ b/slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java @@ -19,9 +19,9 @@ package org.apache.slider.server.services.utility; import org.apache.hadoop.yarn.conf.YarnConfiguration; -import org.apache.hadoop.yarn.registry.client.api.RegistryConstants; -import org.apache.hadoop.yarn.registry.client.api.RegistryOperations; -import org.apache.hadoop.yarn.registry.client.api.RegistryOperationsFactory; +import org.apache.hadoop.registry.client.api.RegistryConstants; +import org.apache.hadoop.registry.client.api.RegistryOperations; +import org.apache.hadoop.registry.client.api.RegistryOperationsFactory; import org.apache.slider.common.SliderXmlConfKeys; import org.apache.slider.common.tools.SliderUtils; import org.apache.slider.core.exceptions.BadCommandArgumentsException; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/slider-core/src/main/java/org/apache/slider/server/services/yarnregistry/YarnRegistryViewForProviders.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/services/yarnregistry/YarnRegistryViewForProviders.java b/slider-core/src/main/java/org/apache/slider/server/services/yarnregistry/YarnRegistryViewForProviders.java index 10ca85c..4eb91ab 100644 --- a/slider-core/src/main/java/org/apache/slider/server/services/yarnregistry/YarnRegistryViewForProviders.java +++ b/slider-core/src/main/java/org/apache/slider/server/services/yarnregistry/YarnRegistryViewForProviders.java @@ -19,12 +19,12 @@ package org.apache.slider.server.services.yarnregistry; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; -import org.apache.hadoop.yarn.registry.client.api.BindFlags; -import org.apache.hadoop.yarn.registry.client.api.RegistryOperations; -import org.apache.hadoop.yarn.registry.client.binding.RegistryUtils; -import org.apache.hadoop.yarn.registry.client.binding.RegistryPathUtils; +import org.apache.hadoop.registry.client.api.BindFlags; +import org.apache.hadoop.registry.client.api.RegistryOperations; +import org.apache.hadoop.registry.client.binding.RegistryUtils; +import org.apache.hadoop.registry.client.binding.RegistryPathUtils; -import org.apache.hadoop.yarn.registry.client.types.ServiceRecord; +import org.apache.hadoop.registry.client.types.ServiceRecord; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneYarnRegistryAM.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneYarnRegistryAM.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneYarnRegistryAM.groovy index 62b39f0..1f65d2f 100644 --- a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneYarnRegistryAM.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneYarnRegistryAM.groovy @@ -23,15 +23,15 @@ import groovy.util.logging.Slf4j import org.apache.hadoop.yarn.api.records.ApplicationReport import org.apache.hadoop.yarn.api.records.YarnApplicationState import org.apache.hadoop.yarn.conf.YarnConfiguration -import org.apache.hadoop.yarn.registry.client.api.RegistryConstants -import org.apache.hadoop.yarn.registry.client.binding.RegistryTypeUtils -import org.apache.hadoop.yarn.registry.client.impl.RegistryOperationsClient -import org.apache.hadoop.yarn.registry.client.types.RegistryPathStatus -import org.apache.hadoop.yarn.registry.client.types.ServiceRecord -import org.apache.hadoop.yarn.registry.client.types.yarn.YarnRegistryAttributes +import org.apache.hadoop.registry.client.api.RegistryConstants +import org.apache.hadoop.registry.client.binding.RegistryTypeUtils +import org.apache.hadoop.registry.client.impl.RegistryOperationsClient +import org.apache.hadoop.registry.client.types.RegistryPathStatus +import org.apache.hadoop.registry.client.types.ServiceRecord +import org.apache.hadoop.registry.client.types.yarn.YarnRegistryAttributes import org.apache.slider.core.exceptions.UnknownApplicationInstanceException -import static org.apache.hadoop.yarn.registry.client.binding.RegistryUtils.* +import static org.apache.hadoop.registry.client.binding.RegistryUtils.* import org.apache.slider.agent.AgentMiniClusterTestBase import org.apache.slider.api.ClusterNode import org.apache.slider.client.SliderClient http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockProviderService.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockProviderService.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockProviderService.groovy index 07fa327..675aec5 100644 --- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockProviderService.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockProviderService.groovy @@ -25,7 +25,7 @@ import org.apache.hadoop.service.ServiceStateChangeListener import org.apache.hadoop.yarn.api.records.Container import org.apache.hadoop.yarn.api.records.ContainerId import org.apache.hadoop.yarn.client.api.AMRMClient -import org.apache.hadoop.yarn.registry.client.types.ServiceRecord +import org.apache.hadoop.registry.client.types.ServiceRecord import org.apache.slider.api.ClusterDescription import org.apache.slider.common.tools.SliderFileSystem import org.apache.slider.core.conf.AggregateConf http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/PathEntryMarshalling.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/PathEntryMarshalling.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/PathEntryMarshalling.groovy index 3883b25..937bebf 100644 --- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/PathEntryMarshalling.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/PathEntryMarshalling.groovy @@ -18,7 +18,7 @@ package org.apache.slider.server.appmaster.web.rest.registry -import org.apache.hadoop.yarn.registry.client.binding.JsonSerDeser +import org.apache.hadoop.registry.client.binding.JsonSerDeser class PathEntryMarshalling extends JsonSerDeser<PathEntryResource> { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/TestRegistryRestMarshalling.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/TestRegistryRestMarshalling.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/TestRegistryRestMarshalling.groovy index d67dfeb..53dda35 100644 --- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/TestRegistryRestMarshalling.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/TestRegistryRestMarshalling.groovy @@ -19,7 +19,7 @@ package org.apache.slider.server.appmaster.web.rest.registry import groovy.transform.CompileStatic -import org.apache.hadoop.yarn.registry.client.types.yarn.YarnRegistryAttributes +import org.apache.hadoop.registry.client.types.yarn.YarnRegistryAttributes import org.junit.Test /** http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/TestRegistryRestResources.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/TestRegistryRestResources.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/TestRegistryRestResources.groovy index ee678f9..43d109d 100644 --- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/TestRegistryRestResources.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/TestRegistryRestResources.groovy @@ -24,9 +24,9 @@ import com.sun.jersey.api.client.UniformInterfaceException import com.sun.jersey.api.client.WebResource import groovy.transform.CompileStatic import groovy.util.logging.Slf4j -import org.apache.hadoop.yarn.registry.client.api.RegistryConstants -import org.apache.hadoop.yarn.registry.client.binding.RegistryUtils -import org.apache.hadoop.yarn.registry.client.types.yarn.YarnRegistryAttributes +import org.apache.hadoop.registry.client.api.RegistryConstants +import org.apache.hadoop.registry.client.binding.RegistryUtils +import org.apache.hadoop.registry.client.types.yarn.YarnRegistryAttributes import org.apache.slider.api.StatusKeys import org.apache.slider.client.SliderClient import org.apache.slider.common.SliderKeys http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/slider-core/src/test/groovy/org/apache/slider/test/MicroZKCluster.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/test/MicroZKCluster.groovy b/slider-core/src/test/groovy/org/apache/slider/test/MicroZKCluster.groovy index c2d6a32..3d1a2d7 100644 --- a/slider-core/src/test/groovy/org/apache/slider/test/MicroZKCluster.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/test/MicroZKCluster.groovy @@ -21,9 +21,9 @@ package org.apache.slider.test import groovy.transform.CompileStatic import groovy.util.logging.Slf4j import org.apache.hadoop.conf.Configuration -import org.apache.hadoop.yarn.registry.client.api.RegistryOperations -import org.apache.hadoop.yarn.registry.client.impl.zk.RegistryOperationsService -import org.apache.hadoop.yarn.registry.server.services.MicroZookeeperService +import org.apache.hadoop.registry.client.api.RegistryOperations +import org.apache.hadoop.registry.client.impl.zk.RegistryOperationsService +import org.apache.hadoop.registry.server.services.MicroZookeeperService import org.apache.slider.common.tools.SliderUtils @Slf4j http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy index c5e41f7..0b45a5d 100644 --- a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy @@ -31,7 +31,7 @@ import org.apache.hadoop.fs.Path import org.apache.hadoop.util.Shell import org.apache.hadoop.yarn.api.records.ApplicationReport import org.apache.hadoop.yarn.conf.YarnConfiguration -import org.apache.hadoop.yarn.registry.client.types.ServiceRecord +import org.apache.hadoop.registry.client.types.ServiceRecord import org.apache.slider.api.ClusterDescription import org.apache.slider.api.ClusterNode import org.apache.slider.api.RoleKeys http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/slider-core/src/test/groovy/org/apache/slider/test/YarnZKMiniClusterTestBase.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/test/YarnZKMiniClusterTestBase.groovy b/slider-core/src/test/groovy/org/apache/slider/test/YarnZKMiniClusterTestBase.groovy index 197d94d..e182ed2 100644 --- a/slider-core/src/test/groovy/org/apache/slider/test/YarnZKMiniClusterTestBase.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/test/YarnZKMiniClusterTestBase.groovy @@ -23,15 +23,13 @@ import groovy.util.logging.Slf4j import org.apache.hadoop.conf.Configuration import org.apache.hadoop.io.IOUtils import org.apache.hadoop.yarn.conf.YarnConfiguration -import org.apache.hadoop.yarn.registry.client.api.RegistryConstants +import org.apache.hadoop.registry.client.api.RegistryConstants import org.apache.slider.common.SliderXmlConfKeys import org.apache.slider.core.zk.BlockingZKWatcher import org.apache.slider.core.zk.ZKIntegration import java.util.concurrent.atomic.AtomicBoolean -import static org.apache.slider.common.SliderKeys.*; -import static org.apache.slider.common.SliderXMLConfKeysForTesting.*; import static org.apache.slider.test.KeysForTests.*; /** http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java ---------------------------------------------------------------------- diff --git a/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java b/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java index 6375d6f..a36ae70 100644 --- a/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java +++ b/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java @@ -21,10 +21,10 @@ package org.apache.slider.providers.hbase; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.yarn.api.records.Container; -import org.apache.hadoop.yarn.registry.client.binding.RegistryTypeUtils; -import org.apache.hadoop.yarn.registry.client.types.yarn.PersistencePolicies; -import org.apache.hadoop.yarn.registry.client.types.ServiceRecord; -import org.apache.hadoop.yarn.registry.client.types.yarn.YarnRegistryAttributes; +import org.apache.hadoop.registry.client.binding.RegistryTypeUtils; +import org.apache.hadoop.registry.client.types.yarn.PersistencePolicies; +import org.apache.hadoop.registry.client.types.ServiceRecord; +import org.apache.hadoop.registry.client.types.yarn.YarnRegistryAttributes; import org.apache.slider.api.InternalKeys; import org.apache.slider.common.SliderKeys; import org.apache.slider.api.ClusterDescription; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMaster.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMaster.groovy b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMaster.groovy index b73432a..79193c3 100644 --- a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMaster.groovy +++ b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMaster.groovy @@ -20,9 +20,9 @@ package org.apache.slider.providers.hbase.minicluster.live import groovy.transform.CompileStatic import groovy.util.logging.Slf4j -import org.apache.hadoop.yarn.registry.client.binding.RegistryUtils -import org.apache.hadoop.yarn.registry.client.types.ServiceRecord -import org.apache.hadoop.yarn.registry.client.types.yarn.YarnRegistryAttributes +import org.apache.hadoop.registry.client.binding.RegistryUtils +import org.apache.hadoop.registry.client.types.ServiceRecord +import org.apache.hadoop.registry.client.types.yarn.YarnRegistryAttributes import org.apache.slider.common.SliderXmlConfKeys import org.apache.slider.api.ClusterDescription import org.apache.slider.api.RoleKeys http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbc67af/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestTwoLiveClusters.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestTwoLiveClusters.groovy b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestTwoLiveClusters.groovy index bb652b3..b7212d9 100644 --- a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestTwoLiveClusters.groovy +++ b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestTwoLiveClusters.groovy @@ -20,10 +20,10 @@ package org.apache.slider.providers.hbase.minicluster.live import groovy.transform.CompileStatic import groovy.util.logging.Slf4j -import org.apache.hadoop.yarn.registry.client.api.RegistryOperations -import org.apache.hadoop.yarn.registry.client.binding.RegistryUtils -import org.apache.hadoop.yarn.registry.client.binding.RegistryPathUtils -import org.apache.hadoop.yarn.registry.client.types.ServiceRecord +import org.apache.hadoop.registry.client.api.RegistryOperations +import org.apache.hadoop.registry.client.binding.RegistryUtils +import org.apache.hadoop.registry.client.binding.RegistryPathUtils +import org.apache.hadoop.registry.client.types.ServiceRecord import org.apache.slider.common.SliderKeys import org.apache.slider.common.params.Arguments import org.apache.slider.client.SliderClient
