From e7082c371b2c71815256956010fac4e6e26e87cc Mon Sep 17 00:00:00 2001 From: Vinod Kumar Vavilapalli Date: Wed, 5 Sep 2012 17:55:53 +0000 Subject: [PATCH] YARN-83. Change package of YarnClient to org.apache.hadoop. Contributed by Bikas Saha. svn merge --ignore-ancestry -c 1381273 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381275 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-yarn-project/CHANGES.txt | 2 ++ .../hadoop/yarn/applications/distributedshell/Client.java | 2 +- .../java/org/{ => apache}/hadoop/yarn/client/YarnClient.java | 2 +- .../org/{ => apache}/hadoop/yarn/client/YarnClientImpl.java | 2 +- .../org/{ => apache}/hadoop/yarn/client/TestYarnClient.java | 4 +++- 5 files changed, 8 insertions(+), 4 deletions(-) rename hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/{ => apache}/hadoop/yarn/client/YarnClient.java (99%) rename hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/{ => apache}/hadoop/yarn/client/YarnClientImpl.java (99%) rename hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/{ => apache}/hadoop/yarn/client/TestYarnClient.java (90%) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index ef3f18c591f..27e0cb71f99 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -70,6 +70,8 @@ Release 0.23.4 - UNRELEASED IMPROVEMENTS + Change package of YarnClient to org.apache.hadoop. (Bikas Saha via vinodkv) + OPTIMIZATIONS BUG FIXES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java index c5e04a8c4da..3a4a51591a3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java @@ -61,11 +61,11 @@ import org.apache.hadoop.yarn.api.records.QueueUserACLInfo; import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.api.records.YarnApplicationState; import org.apache.hadoop.yarn.api.records.YarnClusterMetrics; +import org.apache.hadoop.yarn.client.YarnClientImpl; import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.exceptions.YarnRemoteException; import org.apache.hadoop.yarn.util.ConverterUtils; import org.apache.hadoop.yarn.util.Records; -import org.hadoop.yarn.client.YarnClientImpl; /** * Client for Distributed Shell application submission to YARN. diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/hadoop/yarn/client/YarnClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/YarnClient.java similarity index 99% rename from hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/hadoop/yarn/client/YarnClient.java rename to hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/YarnClient.java index eca80c919f6..20235d065e2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/hadoop/yarn/client/YarnClient.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/YarnClient.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.hadoop.yarn.client; +package org.apache.hadoop.yarn.client; import java.util.List; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/hadoop/yarn/client/YarnClientImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/YarnClientImpl.java similarity index 99% rename from hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/hadoop/yarn/client/YarnClientImpl.java rename to hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/YarnClientImpl.java index 927a261e75d..e8815c62060 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/hadoop/yarn/client/YarnClientImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/YarnClientImpl.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.hadoop.yarn.client; +package org.apache.hadoop.yarn.client; import java.net.InetSocketAddress; import java.util.ArrayList; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/hadoop/yarn/client/TestYarnClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestYarnClient.java similarity index 90% rename from hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/hadoop/yarn/client/TestYarnClient.java rename to hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestYarnClient.java index d0fc31f454b..eb57e4194ba 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/hadoop/yarn/client/TestYarnClient.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestYarnClient.java @@ -16,9 +16,11 @@ * limitations under the License. */ -package org.hadoop.yarn.client; +package org.apache.hadoop.yarn.client; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.yarn.client.YarnClient; +import org.apache.hadoop.yarn.client.YarnClientImpl; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; import org.junit.Test;