YARN-823. Moved RMAdmin from yarn.client to yarn.client.cli and renamed it to be RMAdminCLI. Contributed by Jian He.

svn merge --ignore-ancestry -c 1493596 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493597 13f79535-47bb-0310-9956-ffa450edef68

hadoop-yarn-project/CHANGES.txt

@@ -137,6 +137,9 @@ Release 2.1.0-beta - UNRELEASED
 
     YARN-828. Removed the unsed YarnVersionAnnotation. (Zhijie Shen via vinodkv)
 
+    YARN-823. Moved RMAdmin from yarn.client to yarn.client.cli and renamed it to
+    be RMAdminCLI. (Jian He via vinodkv)
+
   NEW FEATURES
 
     YARN-482. FS: Extend SchedulingMode to intermediate queues. 

hadoop-yarn-project/hadoop-yarn/bin/yarn

@@ -175,7 +175,7 @@ if [ "$COMMAND" = "classpath" ] ; then
   echo $CLASSPATH
   exit
 elif [ "$COMMAND" = "rmadmin" ] ; then
-  CLASS='org.apache.hadoop.yarn.client.RMAdmin'
+  CLASS='org.apache.hadoop.yarn.client.cli.RMAdminCLI'
   YARN_OPTS="$YARN_OPTS $YARN_CLIENT_OPTS"
 elif [ "$COMMAND" = "application" ] ; then
   CLASS=org.apache.hadoop.yarn.client.cli.ApplicationCLI

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/RMAdmin.java → hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.yarn.client;
+package org.apache.hadoop.yarn.client.cli;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -42,16 +42,16 @@ import org.apache.hadoop.yarn.factories.RecordFactory;
 import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
 import org.apache.hadoop.yarn.ipc.YarnRPC;
 
-public class RMAdmin extends Configured implements Tool {
+public class RMAdminCLI extends Configured implements Tool {
 
   private final RecordFactory recordFactory = 
     RecordFactoryProvider.getRecordFactory(null);
 
-  public RMAdmin() {
+  public RMAdminCLI() {
     super();
   }
 
-  public RMAdmin(Configuration conf) {
+  public RMAdminCLI(Configuration conf) {
     super(conf);
   }
 
@@ -345,7 +345,7 @@ public class RMAdmin extends Configured implements Tool {
   }
 
   public static void main(String[] args) throws Exception {
-    int result = ToolRunner.run(new RMAdmin(), args);
+    int result = ToolRunner.run(new RMAdminCLI(), args);
     System.exit(result);
   }
 }