tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bi...@apache.org
Subject git commit: TEZ-1425. Move constants to TezConstants (bikas)
Date Fri, 15 Aug 2014 02:01:02 GMT
Repository: tez
Updated Branches:
  refs/heads/master 84374adc7 -> 0361dd8f2


TEZ-1425. Move constants to TezConstants (bikas)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/0361dd8f
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/0361dd8f
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/0361dd8f

Branch: refs/heads/master
Commit: 0361dd8f2abf25710743a163f30aa5252e6fbb75
Parents: 84374ad
Author: Bikas Saha <bikas@apache.org>
Authored: Thu Aug 14 19:01:02 2014 -0700
Committer: Bikas Saha <bikas@apache.org>
Committed: Thu Aug 14 19:01:02 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../java/org/apache/tez/client/TezClient.java   |  3 +-
 .../org/apache/tez/client/TezClientUtils.java   | 24 +++----
 .../org/apache/tez/common/TezCommonUtils.java   | 15 ++--
 .../common/security/ACLConfigurationParser.java |  5 +-
 .../tez/common/security/DAGAccessControls.java  | 17 ++---
 .../apache/tez/dag/api/TezConfiguration.java    | 75 +-------------------
 .../org/apache/tez/dag/api/TezConstants.java    | 68 +++++++++++++++++-
 .../org/apache/tez/client/TestTezClient.java    | 19 ++---
 .../apache/tez/client/TestTezClientUtils.java   |  6 +-
 .../apache/tez/common/TestTezCommonUtils.java   | 21 +++---
 .../security/TestACLConfigurationParser.java    |  5 +-
 .../tez/common/security/TestACLManager.java     |  5 +-
 .../common/security/TestDAGAccessControls.java  | 34 ++++-----
 .../org/apache/tez/dag/api/TestDAGVerify.java   |  8 +--
 .../tez/common/TezContainerLogAppender.java     |  4 +-
 .../org/apache/tez/common/TezUtilsInternal.java | 10 +--
 .../org/apache/tez/dag/app/DAGAppMaster.java    | 16 ++---
 .../org/apache/tez/dag/app/RecoveryParser.java  |  5 +-
 .../app/rm/container/AMContainerHelpers.java    |  3 +-
 .../security/authorize/TezAMPolicyProvider.java |  6 +-
 .../dag/history/recovery/RecoveryService.java   |  3 +-
 .../mapreduce/client/ResourceMgrDelegate.java   |  4 +-
 .../tez/mapreduce/hadoop/TestMRHelpers.java     | 10 +--
 .../logging/ats/ATSHistoryLoggingService.java   |  3 +-
 .../library/common/shuffle/impl/Shuffle.java    |  4 +-
 .../shuffle/common/impl/ShuffleManager.java     |  4 +-
 27 files changed, 190 insertions(+), 188 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 19e4097..de71ff4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -58,6 +58,7 @@ INCOMPATIBLE CHANGES
   TEZ-1072. Consolidate monitoring APIs in DAGClient
   TEZ-1410. DAGClient#waitForCompletion() methods should not swallow interrupts
   TEZ-1416. tez-api project javadoc/annotations review and clean up
+  TEZ-1425. Move constants to TezConstants
 
 Release 0.4.0-incubating: 2014-04-05
 

http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/tez-api/src/main/java/org/apache/tez/client/TezClient.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/client/TezClient.java b/tez-api/src/main/java/org/apache/tez/client/TezClient.java
index 24744e3..201ba41 100644
--- a/tez-api/src/main/java/org/apache/tez/client/TezClient.java
+++ b/tez-api/src/main/java/org/apache/tez/client/TezClient.java
@@ -44,6 +44,7 @@ import org.apache.tez.dag.api.DAGSubmissionTimedOut;
 import org.apache.tez.dag.api.DagTypeConverters;
 import org.apache.tez.dag.api.SessionNotRunning;
 import org.apache.tez.dag.api.TezConfiguration;
+import org.apache.tez.dag.api.TezConstants;
 import org.apache.tez.dag.api.TezException;
 import org.apache.tez.dag.api.Vertex;
 import org.apache.tez.dag.api.client.DAGClient;
@@ -548,7 +549,7 @@ public class TezClient {
     
     verifySessionStateForSubmission();
     
-    DAG dag = new org.apache.tez.dag.api.DAG(TezConfiguration.TEZ_PREWARM_DAG_NAME_PREFIX + "_"
+    DAG dag = new org.apache.tez.dag.api.DAG(TezConstants.TEZ_PREWARM_DAG_NAME_PREFIX + "_"
         + preWarmDAGCounter++);
     dag.addVertex(preWarmVertex);
     

http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java b/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
index efe4237..0362c05 100644
--- a/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
+++ b/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
@@ -537,7 +537,7 @@ public class TezClientUtils {
         TezClientUtils.createLocalResource(fs,
             binaryConfPath, LocalResourceType.FILE,
             LocalResourceVisibility.APPLICATION);
-    localResources.put(TezConfiguration.TEZ_PB_BINARY_CONF_NAME,
+    localResources.put(TezConstants.TEZ_PB_BINARY_CONF_NAME,
         binaryConfLRsrc);
 
     // Create Session Jars definition to be sent to AM as a local resource
@@ -547,7 +547,7 @@ public class TezClientUtils {
       Map<String, LocalResource> sessionJars =
         new HashMap<String, LocalResource>(tezJarResources.size() + 1);
       sessionJars.putAll(tezJarResources);
-      sessionJars.put(TezConfiguration.TEZ_PB_BINARY_CONF_NAME,
+      sessionJars.put(TezConstants.TEZ_PB_BINARY_CONF_NAME,
         binaryConfLRsrc);
       DAGProtos.PlanLocalResourcesProto proto =
         DagTypeConverters.convertFromLocalResources(sessionJars);
@@ -573,7 +573,7 @@ public class TezClientUtils {
         sessionJarsPath, LocalResourceType.FILE,
         LocalResourceVisibility.APPLICATION);
     localResources.put(
-      TezConfiguration.TEZ_SESSION_LOCAL_RESOURCES_PB_FILE_NAME,
+      TezConstants.TEZ_SESSION_LOCAL_RESOURCES_PB_FILE_NAME,
       sessionJarsPBLRsrc);
 
     String user = UserGroupInformation.getCurrentUser().getShortUserName();
@@ -588,7 +588,7 @@ public class TezClientUtils {
         if (tezJarResources != null) {
           v.getTaskLocalFiles().putAll(tezJarResources);
         }
-        v.getTaskLocalFiles().put(TezConfiguration.TEZ_PB_BINARY_CONF_NAME,
+        v.getTaskLocalFiles().put(TezConstants.TEZ_PB_BINARY_CONF_NAME,
             binaryConfLRsrc);
 
         Map<String, String> taskEnv = v.getTaskEnvironment();
@@ -606,7 +606,7 @@ public class TezClientUtils {
             + tezSysStagingPath + " binaryConfPath :" + binaryConfPath + " sessionJarsPath :"
             + sessionJarsPath + " binaryPlanPath :" + binaryPath);
       }
-      amConfig.getTezConfiguration().set(TezConfiguration.TEZ_AM_PLAN_REMOTE_PATH,
+      amConfig.getTezConfiguration().set(TezConstants.TEZ_AM_PLAN_REMOTE_PATH,
           binaryPath.toUri().toString());
 
       DAGPlan dagPB = dag.createDag(amConfig.getTezConfiguration());
@@ -623,14 +623,14 @@ public class TezClientUtils {
         }
       }
 
-      localResources.put(TezConfiguration.TEZ_PB_PLAN_BINARY_NAME,
+      localResources.put(TezConstants.TEZ_PB_PLAN_BINARY_NAME,
         TezClientUtils.createLocalResource(fs,
           binaryPath, LocalResourceType.FILE,
           LocalResourceVisibility.APPLICATION));
 
       if (Level.DEBUG.isGreaterOrEqual(Level.toLevel(amLogLevel))) {
         Path textPath = localizeDagPlanAsText(dagPB, fs, amConfig, strAppId, tezSysStagingPath);
-        localResources.put(TezConfiguration.TEZ_PB_PLAN_TEXT_NAME,
+        localResources.put(TezConstants.TEZ_PB_PLAN_TEXT_NAME,
             TezClientUtils.createLocalResource(fs,
                 textPath, LocalResourceType.FILE,
                 LocalResourceVisibility.APPLICATION));
@@ -646,7 +646,7 @@ public class TezClientUtils {
     ApplicationSubmissionContext appContext = Records
         .newRecord(ApplicationSubmissionContext.class);
 
-    appContext.setApplicationType(TezConfiguration.TEZ_APPLICATION_TYPE);
+    appContext.setApplicationType(TezConstants.TEZ_APPLICATION_TYPE);
     appContext.setApplicationId(appId);
     appContext.setResource(capability);
     if (amConfig.getQueueName() != null) {
@@ -670,7 +670,7 @@ public class TezClientUtils {
   static void maybeAddDefaultLoggingJavaOpts(String logLevel, List<String> vargs) {
     if (vargs != null && !vargs.isEmpty()) {
       for (String arg : vargs) {
-        if (arg.contains(TezConfiguration.TEZ_ROOT_LOGGER_NAME)) {
+        if (arg.contains(TezConstants.TEZ_ROOT_LOGGER_NAME)) {
           return ;
         }
       }
@@ -711,11 +711,11 @@ public class TezClientUtils {
   public static void addLog4jSystemProperties(String logLevel,
       List<String> vargs) {
     vargs.add("-Dlog4j.configuration="
-        + TezConfiguration.TEZ_CONTAINER_LOG4J_PROPERTIES_FILE);
+        + TezConstants.TEZ_CONTAINER_LOG4J_PROPERTIES_FILE);
     vargs.add("-D" + YarnConfiguration.YARN_APP_CONTAINER_LOG_DIR + "="
         + ApplicationConstants.LOG_DIR_EXPANSION_VAR);
-    vargs.add("-D" + TezConfiguration.TEZ_ROOT_LOGGER_NAME + "=" + logLevel
-        + "," + TezConfiguration.TEZ_CONTAINER_LOGGER_NAME);
+    vargs.add("-D" + TezConstants.TEZ_ROOT_LOGGER_NAME + "=" + logLevel
+        + "," + TezConstants.TEZ_CONTAINER_LOGGER_NAME);
   }
 
   static Configuration createFinalTezConfForApp(TezConfiguration tezConf,

http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/tez-api/src/main/java/org/apache/tez/common/TezCommonUtils.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/common/TezCommonUtils.java b/tez-api/src/main/java/org/apache/tez/common/TezCommonUtils.java
index edb8e8e..cf77342 100644
--- a/tez-api/src/main/java/org/apache/tez/common/TezCommonUtils.java
+++ b/tez-api/src/main/java/org/apache/tez/common/TezCommonUtils.java
@@ -34,6 +34,7 @@ import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.tez.client.TezClient;
 import org.apache.tez.dag.api.TezConfiguration;
+import org.apache.tez.dag.api.TezConstants;
 import org.apache.tez.dag.api.TezUncheckedException;
 
 import com.google.protobuf.ByteString;
@@ -145,7 +146,7 @@ public class TezCommonUtils {
    */
   @Private
   public static Path getTezConfStagingPath(Path tezSysStagingPath) {
-    return new Path(tezSysStagingPath, TezConfiguration.TEZ_PB_BINARY_CONF_NAME);
+    return new Path(tezSysStagingPath, TezConstants.TEZ_PB_BINARY_CONF_NAME);
   }
 
   /**
@@ -159,7 +160,7 @@ public class TezCommonUtils {
    */
   @Private
   public static Path getTezSessionJarStagingPath(Path tezSysStagingPath) {
-    return new Path(tezSysStagingPath, TezConfiguration.TEZ_SESSION_LOCAL_RESOURCES_PB_FILE_NAME);
+    return new Path(tezSysStagingPath, TezConstants.TEZ_SESSION_LOCAL_RESOURCES_PB_FILE_NAME);
   }
 
   /**
@@ -173,7 +174,7 @@ public class TezCommonUtils {
    */
   @Private
   public static Path getTezBinPlanStagingPath(Path tezSysStagingPath) {
-    return new Path(tezSysStagingPath, TezConfiguration.TEZ_PB_PLAN_BINARY_NAME);
+    return new Path(tezSysStagingPath, TezConstants.TEZ_PB_PLAN_BINARY_NAME);
   }
 
   /**
@@ -187,7 +188,7 @@ public class TezCommonUtils {
    */
   @Private
   public static Path getTezTextPlanStagingPath(Path tezSysStagingPath) {
-    return new Path(tezSysStagingPath, TezConfiguration.TEZ_PB_PLAN_TEXT_NAME);
+    return new Path(tezSysStagingPath, TezConstants.TEZ_PB_PLAN_TEXT_NAME);
   }
 
   /**
@@ -206,7 +207,7 @@ public class TezCommonUtils {
   public static Path getRecoveryPath(Path tezSysStagingPath, Configuration conf)
       throws IOException {
     Path baseReecoveryPath = new Path(tezSysStagingPath,
-        TezConfiguration.DAG_RECOVERY_DATA_DIR_NAME);
+        TezConstants.DAG_RECOVERY_DATA_DIR_NAME);
     FileSystem recoveryFS = baseReecoveryPath.getFileSystem(conf);
     return recoveryFS.makeQualified(baseReecoveryPath);
   }
@@ -240,7 +241,7 @@ public class TezCommonUtils {
    */
   @Private
   public static Path getDAGRecoveryPath(Path attemptRecoverPath, String dagID) {
-    return new Path(attemptRecoverPath, dagID + TezConfiguration.DAG_RECOVERY_RECOVER_FILE_SUFFIX);
+    return new Path(attemptRecoverPath, dagID + TezConstants.DAG_RECOVERY_RECOVER_FILE_SUFFIX);
   }
 
   /**
@@ -254,7 +255,7 @@ public class TezCommonUtils {
    */
   @Private
   public static Path getSummaryRecoveryPath(Path attemptRecoverPath) {
-    return new Path(attemptRecoverPath, TezConfiguration.DAG_RECOVERY_SUMMARY_FILE_SUFFIX);
+    return new Path(attemptRecoverPath, TezConstants.DAG_RECOVERY_SUMMARY_FILE_SUFFIX);
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/tez-api/src/main/java/org/apache/tez/common/security/ACLConfigurationParser.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/common/security/ACLConfigurationParser.java b/tez-api/src/main/java/org/apache/tez/common/security/ACLConfigurationParser.java
index b31c48d..6ad87fa 100644
--- a/tez-api/src/main/java/org/apache/tez/common/security/ACLConfigurationParser.java
+++ b/tez-api/src/main/java/org/apache/tez/common/security/ACLConfigurationParser.java
@@ -30,6 +30,7 @@ import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.tez.dag.api.TezConfiguration;
+import org.apache.tez.dag.api.TezConstants;
 
 import com.google.common.collect.Sets;
 
@@ -63,8 +64,8 @@ public class ACLConfigurationParser {
       parseACLType(TezConfiguration.TEZ_AM_VIEW_ACLS, ACLType.AM_VIEW_ACL);
       parseACLType(TezConfiguration.TEZ_AM_MODIFY_ACLS, ACLType.AM_MODIFY_ACL);
     } else {
-      parseACLType(TezConfiguration.TEZ_DAG_VIEW_ACLS, ACLType.DAG_VIEW_ACL);
-      parseACLType(TezConfiguration.TEZ_DAG_MODIFY_ACLS, ACLType.DAG_MODIFY_ACL);
+      parseACLType(TezConstants.TEZ_DAG_VIEW_ACLS, ACLType.DAG_VIEW_ACL);
+      parseACLType(TezConstants.TEZ_DAG_MODIFY_ACLS, ACLType.DAG_MODIFY_ACL);
     }
   }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/tez-api/src/main/java/org/apache/tez/common/security/DAGAccessControls.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/common/security/DAGAccessControls.java b/tez-api/src/main/java/org/apache/tez/common/security/DAGAccessControls.java
index c404404..94e3649 100644
--- a/tez-api/src/main/java/org/apache/tez/common/security/DAGAccessControls.java
+++ b/tez-api/src/main/java/org/apache/tez/common/security/DAGAccessControls.java
@@ -24,11 +24,9 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.tez.dag.api.TezConfiguration;
+import org.apache.tez.dag.api.TezConstants;
 
 /**
  * Access controls for the DAG
@@ -57,8 +55,8 @@ public class DAGAccessControls {
    */
   public DAGAccessControls(String viewACLsStr, String modifyACLsStr) {
     final Configuration conf = new Configuration(false);
-    conf.set(TezConfiguration.TEZ_DAG_VIEW_ACLS, (viewACLsStr != null ? viewACLsStr : ""));
-    conf.set(TezConfiguration.TEZ_DAG_MODIFY_ACLS, (modifyACLsStr != null ? modifyACLsStr : ""));
+    conf.set(TezConstants.TEZ_DAG_VIEW_ACLS, (viewACLsStr != null ? viewACLsStr : ""));
+    conf.set(TezConstants.TEZ_DAG_MODIFY_ACLS, (modifyACLsStr != null ? modifyACLsStr : ""));
     ACLConfigurationParser parser = new ACLConfigurationParser(conf, true);
 
     this.usersWithViewACLs = new HashSet<String>();
@@ -153,20 +151,19 @@ public class DAGAccessControls {
   @Private
   public void serializeToConfiguration(Configuration conf) {
     if (usersWithViewACLs.contains(ACLManager.WILDCARD_ACL_VALUE)) {
-      conf.set(TezConfiguration.TEZ_DAG_VIEW_ACLS, ACLManager.WILDCARD_ACL_VALUE);
+      conf.set(TezConstants.TEZ_DAG_VIEW_ACLS, ACLManager.WILDCARD_ACL_VALUE);
     } else {
       String userList = ACLManager.toCommaSeparatedString(usersWithViewACLs);
       String groupList = ACLManager.toCommaSeparatedString(groupsWithViewACLs);
-      conf.set(TezConfiguration.TEZ_DAG_VIEW_ACLS,
+      conf.set(TezConstants.TEZ_DAG_VIEW_ACLS,
           userList + " " + groupList);
     }
     if (usersWithModifyACLs.contains(ACLManager.WILDCARD_ACL_VALUE)) {
-      conf.set(TezConfiguration.TEZ_DAG_MODIFY_ACLS, ACLManager.WILDCARD_ACL_VALUE);
+      conf.set(TezConstants.TEZ_DAG_MODIFY_ACLS, ACLManager.WILDCARD_ACL_VALUE);
     } else {
       String userList = ACLManager.toCommaSeparatedString(usersWithModifyACLs);
       String groupList = ACLManager.toCommaSeparatedString(groupsWithModifyACLs);
-      conf.set(TezConfiguration.TEZ_DAG_MODIFY_ACLS,
-          userList + " " + groupList);
+      conf.set(TezConstants.TEZ_DAG_MODIFY_ACLS, userList + " " + groupList);
     }
   }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java b/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
index 7a46d54..4f22eb5 100644
--- a/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
+++ b/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
@@ -153,19 +153,6 @@ public class TezConfiguration extends Configuration {
       TEZ_AM_PREFIX + "counters.groups.max.keys";
   public static final int TEZ_AM_COUNTERS_GROUPS_MAX_KEYS_DEFAULT = 500;
 
-  
-  /*
-   * MR AM Service Authorization
-   * These are the same as MR which allows Tez to run in secure
-   * mode without configuring service ACLs
-   */
-  public static final String   
-  TEZ_AM_SECURITY_SERVICE_AUTHORIZATION_TASK_UMBILICAL =
-      "security.job.task.protocol.acl";
-  public static final String   
-  TEZ_AM_SECURITY_SERVICE_AUTHORIZATION_CLIENT =
-      "security.job.client.protocol.acl";
-
   /**
    * Upper limit on the number of threads user to launch containers in the app
    * master. Expect level config, you shouldn't be needing it in most cases.
@@ -232,16 +219,6 @@ public class TezConfiguration extends Configuration {
       + "resource.cpu.vcores";
   public static final int TEZ_TASK_RESOURCE_CPU_VCORES_DEFAULT = 1; 
 
-  /**
-   * The complete path to the serialized dag plan file
-   * <code>TEZ_AM_PLAN_PB_BINARY</code>. Used to make the plan available to
-   * individual tasks if needed. This will typically be a path in the job submit
-   * directory.
-   */
-  @Private
-  public static final String TEZ_AM_PLAN_REMOTE_PATH = TEZ_AM_PREFIX
-      + "dag-am-plan.remote.path";
-
   /** The maximum heartbeat interval between the AM and RM in milliseconds */
   public static final String TEZ_AM_RM_HEARTBEAT_INTERVAL_MS_MAX = TEZ_AM_PREFIX
       + "am-rm.heartbeat.interval-ms.max";
@@ -412,21 +389,6 @@ public class TezConfiguration extends Configuration {
       TEZ_AM_PREFIX + "session.min.held-containers";
   public static final int TEZ_AM_SESSION_MIN_HELD_CONTAINERS_DEFAULT = 0;
 
-
-  public static final String TEZ_PB_BINARY_CONF_NAME = "tez-conf.pb";
-  public static final String TEZ_PB_PLAN_BINARY_NAME = "tez-dag.pb";
-  public static final String TEZ_PB_PLAN_TEXT_NAME = "tez-dag.pb.txt";
-
-  /*
-   * Logger properties
-   */
-  public static final String TEZ_CONTAINER_LOG4J_PROPERTIES_FILE = "tez-container-log4j.properties";
-  public static final String TEZ_CONTAINER_LOGGER_NAME = "CLA";
-  public static final String TEZ_ROOT_LOGGER_NAME = "tez.root.logger";
-  public static final String TEZ_CONTAINER_LOG_FILE_NAME = "syslog";
-  public static final String TEZ_CONTAINER_ERR_FILE_NAME = "stderr";
-  public static final String TEZ_CONTAINER_OUT_FILE_NAME = "stdout";
-
   /**
    * The location of the Tez libraries which will be localized for DAGs.
    * This follows the following semantics
@@ -463,8 +425,6 @@ public class TezConfiguration extends Configuration {
   public static final String TEZ_USE_CLUSTER_HADOOP_LIBS = TEZ_PREFIX + "use.cluster.hadoop-libs";
   public static final boolean TEZ_USE_CLUSTER_HADOOP_LIBS_DEFAULT = false;
 
-  public static final String TEZ_APPLICATION_TYPE = "TEZ";
-
   // TODO move this to TEZGrouper which is in runtime-library
   public static final String TEZ_AM_GROUPING_SPLIT_COUNT = TEZ_AM_PREFIX +
       "grouping.split-count";
@@ -506,16 +466,13 @@ public class TezConfiguration extends Configuration {
   public static final float TEZ_AM_GROUPING_RACK_SPLIT_SIZE_REDUCTION_DEFAULT = 0.75f;
 
 
-  @Private
   /**
    * Session-related properties
    */
+  @Private
   public static final String TEZ_SESSION_PREFIX =
       TEZ_PREFIX + "session.";
 
-  public static final String TEZ_SESSION_LOCAL_RESOURCES_PB_FILE_NAME =
-    TEZ_SESSION_PREFIX + "local-resources.pb";
-
   /**
    * Time (in seconds) to wait for AM to come up when trying to submit a DAG
    * from the client.
@@ -538,9 +495,9 @@ public class TezConfiguration extends Configuration {
    * The queue name for all jobs being submitted as part of a session, or for
    * non session jobs.
    */
-  public static final String TEZ_QUEUE_NAME = 
-      TEZ_PREFIX + "queue.name";
+  public static final String TEZ_QUEUE_NAME = TEZ_PREFIX + "queue.name";
 
+  @Unstable
   public static final String TEZ_GENERATE_DEBUG_ARTIFACTS =
       TEZ_PREFIX + "generate.debug.artifacts";
   public static final boolean TEZ_GENERATE_DEBUG_ARTIFACTS_DEFAULT = true;
@@ -571,17 +528,6 @@ public class TezConfiguration extends Configuration {
   public static final String TEZ_TASK_SPECIFIC_LAUNCH_CMD_OPTS = TEZ_PREFIX + "task-specific" +
       ".launch.cmd-opts";
 
-  /**
-   * The service id for the NodeManager plugin used to share intermediate data
-   * between vertices.
-   */
-  @Private
-  public static final String TEZ_SHUFFLE_HANDLER_SERVICE_ID = "mapreduce_shuffle";
-
-
-  @Private
-  public static final String TEZ_PREWARM_DAG_NAME_PREFIX = "TezPreWarmDAG";
-
   public static final String TEZ_HISTORY_LOGGING_SERVICE_CLASS =
       TEZ_PREFIX + "history.logging.service.class";
 
@@ -615,10 +561,6 @@ public class TezConfiguration extends Configuration {
       TEZ_PREFIX + "dag.recovery.flush.interval.secs";
   public static final int DAG_RECOVERY_FLUSH_INTERVAL_SECS_DEFAULT = 30;
 
-  public static final String DAG_RECOVERY_DATA_DIR_NAME = "recovery";
-  public static final String DAG_RECOVERY_SUMMARY_FILE_SUFFIX = "summary";
-  public static final String DAG_RECOVERY_RECOVER_FILE_SUFFIX = ".recovery";
-  
   /**
    *  Tez Local Mode flag. Not valid till Tez-684 get checked-in
    */
@@ -686,16 +628,5 @@ public class TezConfiguration extends Configuration {
    * such as submitting DAGs, pre-warming the session, killing DAGs or shutting down the session.
    */
   public static final String TEZ_AM_MODIFY_ACLS = TEZ_AM_PREFIX + "modify-acls";
-  /**
-   * DAG view ACLs. This allows the specified users/groups to view the status of the given DAG.
-   */
-  @Private
-  public static final String TEZ_DAG_VIEW_ACLS = TEZ_AM_PREFIX + "dag.view-acls";
-  /**
-   * DAG modify ACLs. This allows the specified users/groups to run modify operations on the DAG
-   * such as killing the DAG.
-   */
-  @Private
-  public static final String TEZ_DAG_MODIFY_ACLS = TEZ_AM_PREFIX + "dag.modify-acls";
 
 }

http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/tez-api/src/main/java/org/apache/tez/dag/api/TezConstants.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/dag/api/TezConstants.java b/tez-api/src/main/java/org/apache/tez/dag/api/TezConstants.java
index 406a09f..537013a 100644
--- a/tez-api/src/main/java/org/apache/tez/dag/api/TezConstants.java
+++ b/tez-api/src/main/java/org/apache/tez/dag/api/TezConstants.java
@@ -18,12 +18,12 @@
 
 package org.apache.tez.dag.api;
 
-import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceAudience.Private;
 
 /**
  * Specifies all constant values in Tez
  */
-@InterfaceAudience.Private
+@Private
 public class TezConstants {
 
 
@@ -36,5 +36,69 @@ public class TezConstants {
   public static final String TEZ_SESSION_MODE_CLI_OPTION = "session";
 
   public static final String TEZ_TAR_LR_NAME = "tezlib";
+  
+  /*
+   * Tez AM Service Authorization
+   * These are the same as MR which allows Tez to run in secure
+   * mode without configuring service ACLs
+   */
+  public static final String   
+  TEZ_AM_SECURITY_SERVICE_AUTHORIZATION_TASK_UMBILICAL =
+      "security.job.task.protocol.acl";
+  public static final String   
+  TEZ_AM_SECURITY_SERVICE_AUTHORIZATION_CLIENT =
+      "security.job.client.protocol.acl";
+
+  public static final String TEZ_PB_BINARY_CONF_NAME = "tez-conf.pb";
+  public static final String TEZ_PB_PLAN_BINARY_NAME = "tez-dag.pb";
+  public static final String TEZ_PB_PLAN_TEXT_NAME = "tez-dag.pb.txt";
+
+  /*
+   * Logger properties
+   */
+  public static final String TEZ_CONTAINER_LOG4J_PROPERTIES_FILE = "tez-container-log4j.properties";
+  public static final String TEZ_CONTAINER_LOGGER_NAME = "CLA";
+  public static final String TEZ_ROOT_LOGGER_NAME = "tez.root.logger";
+  public static final String TEZ_CONTAINER_LOG_FILE_NAME = "syslog";
+  public static final String TEZ_CONTAINER_ERR_FILE_NAME = "stderr";
+  public static final String TEZ_CONTAINER_OUT_FILE_NAME = "stdout";
+
+  public static final String TEZ_SESSION_LOCAL_RESOURCES_PB_FILE_NAME =
+    TezConfiguration.TEZ_SESSION_PREFIX + "local-resources.pb";
+  
+  public static final String TEZ_APPLICATION_TYPE = "TEZ";
+
+  /**
+   * The service id for the NodeManager plugin used to share intermediate data
+   * between vertices.
+   */
+  public static final String TEZ_SHUFFLE_HANDLER_SERVICE_ID = "mapreduce_shuffle";
+  
+  public static final String TEZ_PREWARM_DAG_NAME_PREFIX = "TezPreWarmDAG";
 
+  public static final String DAG_RECOVERY_DATA_DIR_NAME = "recovery";
+  public static final String DAG_RECOVERY_SUMMARY_FILE_SUFFIX = "summary";
+  public static final String DAG_RECOVERY_RECOVER_FILE_SUFFIX = ".recovery";
+
+
+  // Configuration keys used internally and not set by the users
+  
+  /**
+   * The complete path to the serialized dag plan file
+   * <code>TEZ_AM_PLAN_PB_BINARY</code>. Used to make the plan available to
+   * individual tasks if needed. This will be inside the staging dir
+   */
+  public static final String TEZ_AM_PLAN_REMOTE_PATH = "dag-am-plan.remote.path";
+
+  // These are session specific DAG ACL's. Currently here because these can only be specified
+  // via code in the API.
+  /**
+   * DAG view ACLs. This allows the specified users/groups to view the status of the given DAG.
+   */
+  public static final String TEZ_DAG_VIEW_ACLS = TezConfiguration.TEZ_AM_PREFIX + "dag.view-acls";
+  /**
+   * DAG modify ACLs. This allows the specified users/groups to run modify operations on the DAG
+   * such as killing the DAG.
+   */
+  public static final String TEZ_DAG_MODIFY_ACLS = TezConfiguration.TEZ_AM_PREFIX + "dag.modify-acls";
 }

http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/tez-api/src/test/java/org/apache/tez/client/TestTezClient.java
----------------------------------------------------------------------
diff --git a/tez-api/src/test/java/org/apache/tez/client/TestTezClient.java b/tez-api/src/test/java/org/apache/tez/client/TestTezClient.java
index 99a19c6..1d8e657 100644
--- a/tez-api/src/test/java/org/apache/tez/client/TestTezClient.java
+++ b/tez-api/src/test/java/org/apache/tez/client/TestTezClient.java
@@ -46,6 +46,7 @@ import org.apache.hadoop.yarn.exceptions.YarnException;
 import org.apache.tez.dag.api.DAG;
 import org.apache.tez.dag.api.ProcessorDescriptor;
 import org.apache.tez.dag.api.TezConfiguration;
+import org.apache.tez.dag.api.TezConstants;
 import org.apache.tez.dag.api.TezException;
 import org.apache.tez.dag.api.Vertex;
 import org.apache.tez.dag.api.client.DAGClient;
@@ -132,9 +133,9 @@ public class TestTezClient {
       ApplicationSubmissionContext context = captor.getValue();
       Assert.assertEquals(3, context.getAMContainerSpec().getLocalResources().size());
       Assert.assertTrue(context.getAMContainerSpec().getLocalResources().containsKey(
-          TezConfiguration.TEZ_SESSION_LOCAL_RESOURCES_PB_FILE_NAME));
+          TezConstants.TEZ_SESSION_LOCAL_RESOURCES_PB_FILE_NAME));
       Assert.assertTrue(context.getAMContainerSpec().getLocalResources().containsKey(
-          TezConfiguration.TEZ_PB_BINARY_CONF_NAME));
+          TezConstants.TEZ_PB_BINARY_CONF_NAME));
       Assert.assertTrue(context.getAMContainerSpec().getLocalResources().containsKey(
           lrName1));
     } else {
@@ -155,11 +156,11 @@ public class TestTezClient {
       ApplicationSubmissionContext context = captor.getValue();
       Assert.assertEquals(4, context.getAMContainerSpec().getLocalResources().size());
       Assert.assertTrue(context.getAMContainerSpec().getLocalResources().containsKey(
-          TezConfiguration.TEZ_SESSION_LOCAL_RESOURCES_PB_FILE_NAME));
+          TezConstants.TEZ_SESSION_LOCAL_RESOURCES_PB_FILE_NAME));
       Assert.assertTrue(context.getAMContainerSpec().getLocalResources().containsKey(
-          TezConfiguration.TEZ_PB_BINARY_CONF_NAME));
+          TezConstants.TEZ_PB_BINARY_CONF_NAME));
       Assert.assertTrue(context.getAMContainerSpec().getLocalResources().containsKey(
-          TezConfiguration.TEZ_PB_PLAN_BINARY_NAME));
+          TezConstants.TEZ_PB_PLAN_BINARY_NAME));
       Assert.assertTrue(context.getAMContainerSpec().getLocalResources().containsKey(
           lrName1));
     }
@@ -197,11 +198,11 @@ public class TestTezClient {
       ApplicationSubmissionContext context = captor.getValue();
       Assert.assertEquals(5, context.getAMContainerSpec().getLocalResources().size());
       Assert.assertTrue(context.getAMContainerSpec().getLocalResources().containsKey(
-          TezConfiguration.TEZ_SESSION_LOCAL_RESOURCES_PB_FILE_NAME));
+          TezConstants.TEZ_SESSION_LOCAL_RESOURCES_PB_FILE_NAME));
       Assert.assertTrue(context.getAMContainerSpec().getLocalResources().containsKey(
-          TezConfiguration.TEZ_PB_BINARY_CONF_NAME));
+          TezConstants.TEZ_PB_BINARY_CONF_NAME));
       Assert.assertTrue(context.getAMContainerSpec().getLocalResources().containsKey(
-          TezConfiguration.TEZ_PB_PLAN_BINARY_NAME));
+          TezConstants.TEZ_PB_PLAN_BINARY_NAME));
       Assert.assertTrue(context.getAMContainerSpec().getLocalResources().containsKey(
           lrName1));
       Assert.assertTrue(context.getAMContainerSpec().getLocalResources().containsKey(
@@ -231,7 +232,7 @@ public class TestTezClient {
     ArgumentCaptor<SubmitDAGRequestProto> captor1 = ArgumentCaptor.forClass(SubmitDAGRequestProto.class);
     verify(client.sessionAmProxy, times(1)).submitDAG((RpcController)any(), (SubmitDAGRequestProto) any());
     SubmitDAGRequestProto proto = captor1.getValue();
-    Assert.assertTrue(proto.getDAGPlan().getName().startsWith(TezConfiguration.TEZ_PREWARM_DAG_NAME_PREFIX));
+    Assert.assertTrue(proto.getDAGPlan().getName().startsWith(TezConstants.TEZ_PREWARM_DAG_NAME_PREFIX));
 
     client.stop();
   }

http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/tez-api/src/test/java/org/apache/tez/client/TestTezClientUtils.java
----------------------------------------------------------------------
diff --git a/tez-api/src/test/java/org/apache/tez/client/TestTezClientUtils.java b/tez-api/src/test/java/org/apache/tez/client/TestTezClientUtils.java
index c44db47..eba7989 100644
--- a/tez-api/src/test/java/org/apache/tez/client/TestTezClientUtils.java
+++ b/tez-api/src/test/java/org/apache/tez/client/TestTezClientUtils.java
@@ -33,7 +33,6 @@ import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.hdfs.DistributedFileSystem;
 import org.apache.hadoop.security.Credentials;
-import org.apache.hadoop.util.Shell;
 import org.apache.hadoop.yarn.api.records.LocalResource;
 import org.apache.hadoop.yarn.api.records.LocalResourceVisibility;
 import org.apache.hadoop.yarn.api.records.Resource;
@@ -41,7 +40,6 @@ import org.apache.tez.dag.api.TezConfiguration;
 import org.apache.tez.dag.api.TezConstants;
 import org.apache.tez.dag.api.TezUncheckedException;
 import org.junit.Assert;
-import org.junit.Assume;
 import org.junit.Test;
 
 /**
@@ -220,8 +218,8 @@ public class TestTezClientUtils {
     String origJavaOpts = null;
     String javaOpts = TezClientUtils.maybeAddDefaultLoggingJavaOpts("FOOBAR", origJavaOpts);
     Assert.assertNotNull(javaOpts);
-    Assert.assertTrue(javaOpts.contains("-D" + TezConfiguration.TEZ_ROOT_LOGGER_NAME + "=FOOBAR")
-        && javaOpts.contains(TezConfiguration.TEZ_CONTAINER_LOG4J_PROPERTIES_FILE));
+    Assert.assertTrue(javaOpts.contains("-D" + TezConstants.TEZ_ROOT_LOGGER_NAME + "=FOOBAR")
+        && javaOpts.contains(TezConstants.TEZ_CONTAINER_LOG4J_PROPERTIES_FILE));
   }
 
   // To run this test case see TestTezCommonUtils::testLocalResourceVisibility

http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/tez-api/src/test/java/org/apache/tez/common/TestTezCommonUtils.java
----------------------------------------------------------------------
diff --git a/tez-api/src/test/java/org/apache/tez/common/TestTezCommonUtils.java b/tez-api/src/test/java/org/apache/tez/common/TestTezCommonUtils.java
index 79a35bb..d078e8f 100644
--- a/tez-api/src/test/java/org/apache/tez/common/TestTezCommonUtils.java
+++ b/tez-api/src/test/java/org/apache/tez/common/TestTezCommonUtils.java
@@ -29,6 +29,7 @@ import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.tez.client.TestTezClientUtils;
 import org.apache.tez.dag.api.TezConfiguration;
+import org.apache.tez.dag.api.TezConstants;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -126,7 +127,7 @@ public class TestTezCommonUtils {
     Path confStageDir = TezCommonUtils.getTezConfStagingPath(stageDir);
     String expectedDir = RESOLVED_STAGE_DIR + File.separatorChar
         + TezCommonUtils.TEZ_SYSTEM_SUB_DIR + File.separatorChar + strAppId + File.separator
-        + TezConfiguration.TEZ_PB_BINARY_CONF_NAME;
+        + TezConstants.TEZ_PB_BINARY_CONF_NAME;
     Assert.assertEquals(confStageDir.toString(), expectedDir);
   }
 
@@ -138,7 +139,7 @@ public class TestTezCommonUtils {
     Path confStageDir = TezCommonUtils.getTezSessionJarStagingPath(stageDir);
     String expectedDir = RESOLVED_STAGE_DIR + File.separatorChar
         + TezCommonUtils.TEZ_SYSTEM_SUB_DIR + File.separatorChar + strAppId + File.separator
-        + TezConfiguration.TEZ_SESSION_LOCAL_RESOURCES_PB_FILE_NAME;
+        + TezConstants.TEZ_SESSION_LOCAL_RESOURCES_PB_FILE_NAME;
     Assert.assertEquals(confStageDir.toString(), expectedDir);
   }
 
@@ -150,7 +151,7 @@ public class TestTezCommonUtils {
     Path confStageDir = TezCommonUtils.getTezBinPlanStagingPath(stageDir);
     String expectedDir = RESOLVED_STAGE_DIR + File.separatorChar
         + TezCommonUtils.TEZ_SYSTEM_SUB_DIR + File.separatorChar + strAppId + File.separator
-        + TezConfiguration.TEZ_PB_PLAN_BINARY_NAME;
+        + TezConstants.TEZ_PB_PLAN_BINARY_NAME;
     Assert.assertEquals(confStageDir.toString(), expectedDir);
   }
 
@@ -162,7 +163,7 @@ public class TestTezCommonUtils {
     Path confStageDir = TezCommonUtils.getTezTextPlanStagingPath(stageDir);
     String expectedDir = RESOLVED_STAGE_DIR + File.separatorChar
         + TezCommonUtils.TEZ_SYSTEM_SUB_DIR + File.separatorChar + strAppId + File.separator
-        + TezConfiguration.TEZ_PB_PLAN_TEXT_NAME;
+        + TezConstants.TEZ_PB_PLAN_TEXT_NAME;
     Assert.assertEquals(confStageDir.toString(), expectedDir);
   }
 
@@ -174,7 +175,7 @@ public class TestTezCommonUtils {
     Path confStageDir = TezCommonUtils.getRecoveryPath(stageDir, conf);
     String expectedDir = RESOLVED_STAGE_DIR + File.separatorChar
         + TezCommonUtils.TEZ_SYSTEM_SUB_DIR + File.separatorChar + strAppId + File.separator
-        + TezConfiguration.DAG_RECOVERY_DATA_DIR_NAME;
+        + TezConstants.DAG_RECOVERY_DATA_DIR_NAME;
     Assert.assertEquals(confStageDir.toString(), expectedDir);
   }
 
@@ -188,7 +189,7 @@ public class TestTezCommonUtils {
 
     String expectedDir = RESOLVED_STAGE_DIR + File.separatorChar
         + TezCommonUtils.TEZ_SYSTEM_SUB_DIR + File.separatorChar + strAppId + File.separator
-        + TezConfiguration.DAG_RECOVERY_DATA_DIR_NAME + File.separator + "2";
+        + TezConstants.DAG_RECOVERY_DATA_DIR_NAME + File.separator + "2";
     Assert.assertEquals(recoveryStageDir.toString(), expectedDir);
   }
 
@@ -204,8 +205,8 @@ public class TestTezCommonUtils {
 
     String expectedDir = RESOLVED_STAGE_DIR + File.separatorChar
         + TezCommonUtils.TEZ_SYSTEM_SUB_DIR + File.separatorChar + strAppId + File.separator
-        + TezConfiguration.DAG_RECOVERY_DATA_DIR_NAME + File.separator + "2" + File.separator
-        + "dag_123" + TezConfiguration.DAG_RECOVERY_RECOVER_FILE_SUFFIX;
+        + TezConstants.DAG_RECOVERY_DATA_DIR_NAME + File.separator + "2" + File.separator
+        + "dag_123" + TezConstants.DAG_RECOVERY_RECOVER_FILE_SUFFIX;
     Assert.assertEquals(dagRecoveryPathj.toString(), expectedDir);
   }
 
@@ -220,8 +221,8 @@ public class TestTezCommonUtils {
 
     String expectedDir = RESOLVED_STAGE_DIR + File.separatorChar
         + TezCommonUtils.TEZ_SYSTEM_SUB_DIR + File.separatorChar + strAppId + File.separator
-        + TezConfiguration.DAG_RECOVERY_DATA_DIR_NAME + File.separator + "2" + File.separator
-        + TezConfiguration.DAG_RECOVERY_SUMMARY_FILE_SUFFIX;
+        + TezConstants.DAG_RECOVERY_DATA_DIR_NAME + File.separator + "2" + File.separator
+        + TezConstants.DAG_RECOVERY_SUMMARY_FILE_SUFFIX;
     Assert.assertEquals(summaryRecoveryPathj.toString(), expectedDir);
   }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/tez-api/src/test/java/org/apache/tez/common/security/TestACLConfigurationParser.java
----------------------------------------------------------------------
diff --git a/tez-api/src/test/java/org/apache/tez/common/security/TestACLConfigurationParser.java b/tez-api/src/test/java/org/apache/tez/common/security/TestACLConfigurationParser.java
index 67f81ce..08a3552 100644
--- a/tez-api/src/test/java/org/apache/tez/common/security/TestACLConfigurationParser.java
+++ b/tez-api/src/test/java/org/apache/tez/common/security/TestACLConfigurationParser.java
@@ -20,6 +20,7 @@ package org.apache.tez.common.security;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.tez.dag.api.TezConfiguration;
+import org.apache.tez.dag.api.TezConstants;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -83,7 +84,7 @@ public class TestACLConfigurationParser {
     Configuration conf = new Configuration(false);
     String viewACLs = "user1,user4 grp3,grp4,grp5";
     String modifyACLs = "user3 grp4";
-    conf.set(TezConfiguration.TEZ_DAG_VIEW_ACLS, viewACLs);
+    conf.set(TezConstants.TEZ_DAG_VIEW_ACLS, viewACLs);
 
     ACLConfigurationParser parser = new ACLConfigurationParser(conf, true);
     Assert.assertTrue(parser.getAllowedUsers().containsKey(ACLType.DAG_VIEW_ACL));
@@ -97,7 +98,7 @@ public class TestACLConfigurationParser {
     Assert.assertTrue(parser.getAllowedGroups().get(ACLType.DAG_VIEW_ACL).contains("grp4"));
     Assert.assertTrue(parser.getAllowedGroups().get(ACLType.DAG_VIEW_ACL).contains("grp5"));
 
-    conf.set(TezConfiguration.TEZ_DAG_MODIFY_ACLS, modifyACLs);
+    conf.set(TezConstants.TEZ_DAG_MODIFY_ACLS, modifyACLs);
     parser = new ACLConfigurationParser(conf, true);
     Assert.assertTrue(parser.getAllowedUsers().containsKey(ACLType.DAG_VIEW_ACL));
     Assert.assertTrue(parser.getAllowedUsers().containsKey(ACLType.DAG_MODIFY_ACL));

http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/tez-api/src/test/java/org/apache/tez/common/security/TestACLManager.java
----------------------------------------------------------------------
diff --git a/tez-api/src/test/java/org/apache/tez/common/security/TestACLManager.java b/tez-api/src/test/java/org/apache/tez/common/security/TestACLManager.java
index b5d30e4..cc7260c 100644
--- a/tez-api/src/test/java/org/apache/tez/common/security/TestACLManager.java
+++ b/tez-api/src/test/java/org/apache/tez/common/security/TestACLManager.java
@@ -29,6 +29,7 @@ import java.util.Set;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.api.records.ApplicationAccessType;
 import org.apache.tez.dag.api.TezConfiguration;
+import org.apache.tez.dag.api.TezConstants;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -270,8 +271,8 @@ public class TestACLManager {
     String dagViewACLs = "user6,   grp5  ";
     // DAG Modify ACLs: user3, grp6, grp7
     String dagModifyACLs = "user6,user5 ";
-    conf.set(TezConfiguration.TEZ_DAG_VIEW_ACLS, dagViewACLs);
-    conf.set(TezConfiguration.TEZ_DAG_MODIFY_ACLS, dagModifyACLs);
+    conf.set(TezConstants.TEZ_DAG_VIEW_ACLS, dagViewACLs);
+    conf.set(TezConstants.TEZ_DAG_MODIFY_ACLS, dagModifyACLs);
 
     String dagUser = "dagUser";
 

http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/tez-api/src/test/java/org/apache/tez/common/security/TestDAGAccessControls.java
----------------------------------------------------------------------
diff --git a/tez-api/src/test/java/org/apache/tez/common/security/TestDAGAccessControls.java b/tez-api/src/test/java/org/apache/tez/common/security/TestDAGAccessControls.java
index e6dd359..574e81f 100644
--- a/tez-api/src/test/java/org/apache/tez/common/security/TestDAGAccessControls.java
+++ b/tez-api/src/test/java/org/apache/tez/common/security/TestDAGAccessControls.java
@@ -21,7 +21,7 @@ package org.apache.tez.common.security;
 import java.util.Arrays;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.tez.dag.api.TezConfiguration;
+import org.apache.tez.dag.api.TezConstants;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -37,11 +37,11 @@ public class TestDAGAccessControls {
 
     Configuration conf = new Configuration(false);
     dagAccessControls.serializeToConfiguration(conf);
-    Assert.assertNotNull(conf.get(TezConfiguration.TEZ_DAG_VIEW_ACLS));
-    Assert.assertNotNull(conf.get(TezConfiguration.TEZ_DAG_MODIFY_ACLS));
+    Assert.assertNotNull(conf.get(TezConstants.TEZ_DAG_VIEW_ACLS));
+    Assert.assertNotNull(conf.get(TezConstants.TEZ_DAG_MODIFY_ACLS));
 
-    Assert.assertEquals("u1 g1", conf.get(TezConfiguration.TEZ_DAG_VIEW_ACLS));
-    Assert.assertEquals("u2 g2", conf.get(TezConfiguration.TEZ_DAG_MODIFY_ACLS));
+    Assert.assertEquals("u1 g1", conf.get(TezConstants.TEZ_DAG_VIEW_ACLS));
+    Assert.assertEquals("u2 g2", conf.get(TezConstants.TEZ_DAG_MODIFY_ACLS));
   }
 
   @Test
@@ -54,11 +54,11 @@ public class TestDAGAccessControls {
 
     Configuration conf = new Configuration(false);
     dagAccessControls.serializeToConfiguration(conf);
-    Assert.assertNotNull(conf.get(TezConfiguration.TEZ_DAG_VIEW_ACLS));
-    Assert.assertNotNull(conf.get(TezConfiguration.TEZ_DAG_MODIFY_ACLS));
+    Assert.assertNotNull(conf.get(TezConstants.TEZ_DAG_VIEW_ACLS));
+    Assert.assertNotNull(conf.get(TezConstants.TEZ_DAG_MODIFY_ACLS));
 
-    Assert.assertEquals("*", conf.get(TezConfiguration.TEZ_DAG_VIEW_ACLS));
-    Assert.assertEquals("*", conf.get(TezConfiguration.TEZ_DAG_MODIFY_ACLS));
+    Assert.assertEquals("*", conf.get(TezConstants.TEZ_DAG_VIEW_ACLS));
+    Assert.assertEquals("*", conf.get(TezConstants.TEZ_DAG_MODIFY_ACLS));
   }
 
   @Test
@@ -69,11 +69,11 @@ public class TestDAGAccessControls {
 
     Configuration conf = new Configuration(false);
     dagAccessControls.serializeToConfiguration(conf);
-    Assert.assertNotNull(conf.get(TezConfiguration.TEZ_DAG_VIEW_ACLS));
-    Assert.assertNotNull(conf.get(TezConfiguration.TEZ_DAG_MODIFY_ACLS));
+    Assert.assertNotNull(conf.get(TezConstants.TEZ_DAG_VIEW_ACLS));
+    Assert.assertNotNull(conf.get(TezConstants.TEZ_DAG_MODIFY_ACLS));
 
-    Assert.assertEquals(" g1", conf.get(TezConfiguration.TEZ_DAG_VIEW_ACLS));
-    Assert.assertEquals(" g2", conf.get(TezConfiguration.TEZ_DAG_MODIFY_ACLS));
+    Assert.assertEquals(" g1", conf.get(TezConstants.TEZ_DAG_VIEW_ACLS));
+    Assert.assertEquals(" g2", conf.get(TezConstants.TEZ_DAG_MODIFY_ACLS));
   }
 
   @Test
@@ -82,11 +82,11 @@ public class TestDAGAccessControls {
 
     Configuration conf = new Configuration(false);
     dagAccessControls.serializeToConfiguration(conf);
-    Assert.assertNotNull(conf.get(TezConfiguration.TEZ_DAG_VIEW_ACLS));
-    Assert.assertNotNull(conf.get(TezConfiguration.TEZ_DAG_MODIFY_ACLS));
+    Assert.assertNotNull(conf.get(TezConstants.TEZ_DAG_VIEW_ACLS));
+    Assert.assertNotNull(conf.get(TezConstants.TEZ_DAG_MODIFY_ACLS));
 
-    Assert.assertEquals(" ", conf.get(TezConfiguration.TEZ_DAG_VIEW_ACLS));
-    Assert.assertEquals(" ", conf.get(TezConfiguration.TEZ_DAG_MODIFY_ACLS));
+    Assert.assertEquals(" ", conf.get(TezConstants.TEZ_DAG_VIEW_ACLS));
+    Assert.assertEquals(" ", conf.get(TezConstants.TEZ_DAG_MODIFY_ACLS));
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/tez-api/src/test/java/org/apache/tez/dag/api/TestDAGVerify.java
----------------------------------------------------------------------
diff --git a/tez-api/src/test/java/org/apache/tez/dag/api/TestDAGVerify.java b/tez-api/src/test/java/org/apache/tez/dag/api/TestDAGVerify.java
index 61ac366..4f54c4e 100644
--- a/tez-api/src/test/java/org/apache/tez/dag/api/TestDAGVerify.java
+++ b/tez-api/src/test/java/org/apache/tez/dag/api/TestDAGVerify.java
@@ -913,18 +913,18 @@ public class TestDAGVerify {
 
     Configuration conf = new Configuration(false);
     DAGPlan dagPlan = dag.createDag(conf);
-    Assert.assertNull(conf.get(TezConfiguration.TEZ_DAG_VIEW_ACLS));
-    Assert.assertNull(conf.get(TezConfiguration.TEZ_DAG_MODIFY_ACLS));
+    Assert.assertNull(conf.get(TezConstants.TEZ_DAG_VIEW_ACLS));
+    Assert.assertNull(conf.get(TezConstants.TEZ_DAG_MODIFY_ACLS));
 
     ConfigurationProto confProto = dagPlan.getDagKeyValues();
     boolean foundViewAcls = false;
     boolean foundModifyAcls = false;
 
     for (PlanKeyValuePair pair : confProto.getConfKeyValuesList()) {
-      if (pair.getKey().equals(TezConfiguration.TEZ_DAG_VIEW_ACLS)) {
+      if (pair.getKey().equals(TezConstants.TEZ_DAG_VIEW_ACLS)) {
         foundViewAcls = true;
         Assert.assertEquals("u1 g1", pair.getValue());
-      } else if (pair.getKey().equals(TezConfiguration.TEZ_DAG_MODIFY_ACLS)) {
+      } else if (pair.getKey().equals(TezConstants.TEZ_DAG_MODIFY_ACLS)) {
         foundModifyAcls = true;
         Assert.assertEquals("*", pair.getValue());
       }

http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/tez-common/src/main/java/org/apache/tez/common/TezContainerLogAppender.java
----------------------------------------------------------------------
diff --git a/tez-common/src/main/java/org/apache/tez/common/TezContainerLogAppender.java b/tez-common/src/main/java/org/apache/tez/common/TezContainerLogAppender.java
index a6455c3..cfb1e92 100644
--- a/tez-common/src/main/java/org/apache/tez/common/TezContainerLogAppender.java
+++ b/tez-common/src/main/java/org/apache/tez/common/TezContainerLogAppender.java
@@ -23,7 +23,7 @@ import java.io.File;
 import org.apache.hadoop.classification.InterfaceAudience.Public;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.log4j.FileAppender;
-import org.apache.tez.dag.api.TezConfiguration;
+import org.apache.tez.dag.api.TezConstants;
 
 /**
  * A simple log4j-appender for a tez container's logs.
@@ -33,7 +33,7 @@ import org.apache.tez.dag.api.TezConfiguration;
 @Unstable
 public class TezContainerLogAppender extends FileAppender {
   private String containerLogDir;
-  private String logFileName = TezConfiguration.TEZ_CONTAINER_LOG_FILE_NAME;
+  private String logFileName = TezConstants.TEZ_CONTAINER_LOG_FILE_NAME;
   //so that log4j can configure it from the configuration(log4j.properties). 
 
   @Override

http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/tez-common/src/main/java/org/apache/tez/common/TezUtilsInternal.java
----------------------------------------------------------------------
diff --git a/tez-common/src/main/java/org/apache/tez/common/TezUtilsInternal.java b/tez-common/src/main/java/org/apache/tez/common/TezUtilsInternal.java
index 05feae7..add8d92 100644
--- a/tez-common/src/main/java/org/apache/tez/common/TezUtilsInternal.java
+++ b/tez-common/src/main/java/org/apache/tez/common/TezUtilsInternal.java
@@ -39,7 +39,7 @@ import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.yarn.api.ApplicationConstants.Environment;
 import org.apache.log4j.Appender;
 import org.apache.log4j.Logger;
-import org.apache.tez.dag.api.TezConfiguration;
+import org.apache.tez.dag.api.TezConstants;
 import org.apache.tez.dag.api.records.DAGProtos.ConfigurationProto;
 import org.apache.tez.dag.api.records.DAGProtos.PlanKeyValuePair;
 
@@ -57,7 +57,7 @@ public class TezUtilsInternal {
     ConfigurationProto.Builder confProtoBuilder = ConfigurationProto.newBuilder();
     try {
       confPBBinaryStream =
-          new FileInputStream(new File(baseDir, TezConfiguration.TEZ_PB_BINARY_CONF_NAME));
+          new FileInputStream(new File(baseDir, TezConstants.TEZ_PB_BINARY_CONF_NAME));
       confProtoBuilder.mergeFrom(confPBBinaryStream);
     } finally {
       if (confPBBinaryStream != null) {
@@ -157,19 +157,19 @@ public class TezUtilsInternal {
     LOG.info("Redirecting log file based on addend: " + addend);
 
     Appender appender = Logger.getRootLogger().getAppender(
-        TezConfiguration.TEZ_CONTAINER_LOGGER_NAME);
+        TezConstants.TEZ_CONTAINER_LOGGER_NAME);
     if (appender != null) {
       if (appender instanceof TezContainerLogAppender) {
         TezContainerLogAppender claAppender = (TezContainerLogAppender) appender;
         claAppender.setLogFileName(constructLogFileName(
-            TezConfiguration.TEZ_CONTAINER_LOG_FILE_NAME, addend));
+            TezConstants.TEZ_CONTAINER_LOG_FILE_NAME, addend));
         claAppender.activateOptions();
       } else {
         LOG.warn("Appender is a " + appender.getClass() + "; require an instance of "
             + TezContainerLogAppender.class.getName() + " to reconfigure the logger output");
       }
     } else {
-      LOG.warn("Not configured with appender named: " + TezConfiguration.TEZ_CONTAINER_LOGGER_NAME
+      LOG.warn("Not configured with appender named: " + TezConstants.TEZ_CONTAINER_LOGGER_NAME
           + ". Cannot reconfigure logger output");
     }
   }

http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java b/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
index 50365ad..3e65aed 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
@@ -402,7 +402,7 @@ public class DAGAppMaster extends AbstractService {
       FileInputStream sessionResourcesStream = null;
       try {
         sessionResourcesStream = new FileInputStream(
-          new File(workingDirectory, TezConfiguration.TEZ_SESSION_LOCAL_RESOURCES_PB_FILE_NAME));
+          new File(workingDirectory, TezConstants.TEZ_SESSION_LOCAL_RESOURCES_PB_FILE_NAME));
         PlanLocalResourcesProto sessionLocalResourcesProto =
           PlanLocalResourcesProto.parseDelimitedFrom(sessionResourcesStream);
         PlanLocalResourcesProto amLocalResourceProto = PlanLocalResourcesProto
@@ -490,25 +490,25 @@ public class DAGAppMaster extends AbstractService {
         switch(finishEvt.getDAGState()) {
         case SUCCEEDED:
           if (!currentDAG.getName().startsWith(
-              TezConfiguration.TEZ_PREWARM_DAG_NAME_PREFIX)) {
+              TezConstants.TEZ_PREWARM_DAG_NAME_PREFIX)) {
             successfulDAGs.incrementAndGet();
           }
           break;
         case FAILED:
           if (!currentDAG.getName().startsWith(
-              TezConfiguration.TEZ_PREWARM_DAG_NAME_PREFIX)) {
+              TezConstants.TEZ_PREWARM_DAG_NAME_PREFIX)) {
             failedDAGs.incrementAndGet();
           }
           break;
         case KILLED:
           if (!currentDAG.getName().startsWith(
-              TezConfiguration.TEZ_PREWARM_DAG_NAME_PREFIX)) {
+              TezConstants.TEZ_PREWARM_DAG_NAME_PREFIX)) {
             killedDAGs.incrementAndGet();
           }
           break;
         case ERROR:
           if (!currentDAG.getName().startsWith(
-              TezConfiguration.TEZ_PREWARM_DAG_NAME_PREFIX)) {
+              TezConstants.TEZ_PREWARM_DAG_NAME_PREFIX)) {
             failedDAGs.incrementAndGet();
           }
         default:
@@ -980,9 +980,9 @@ public class DAGAppMaster extends AbstractService {
       LOG.debug("Invoked with additional local resources: " + additionalResources);
       
       LOG.debug("Writing DAG plan to: "
-          + TezConfiguration.TEZ_PB_PLAN_TEXT_NAME);
+          + TezConstants.TEZ_PB_PLAN_TEXT_NAME);
 
-      File outFile = new File(TezConfiguration.TEZ_PB_PLAN_TEXT_NAME);
+      File outFile = new File(TezConstants.TEZ_PB_PLAN_TEXT_NAME);
       try {
         PrintWriter printWriter = new PrintWriter(outFile);
         String dagPbString = dagPlan.toString();
@@ -1783,7 +1783,7 @@ public class DAGAppMaster extends AbstractService {
 
       // Read the protobuf DAG
       dagPBBinaryStream = new FileInputStream(new File(workingDirectory,
-          TezConfiguration.TEZ_PB_PLAN_BINARY_NAME));
+          TezConstants.TEZ_PB_PLAN_BINARY_NAME));
       dagPlan = DAGPlan.parseFrom(dagPBBinaryStream);
 
       startDAG(dagPlan, null);

http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/tez-dag/src/main/java/org/apache/tez/dag/app/RecoveryParser.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/RecoveryParser.java b/tez-dag/src/main/java/org/apache/tez/dag/app/RecoveryParser.java
index bcd9e9e..de9979d 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/RecoveryParser.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/RecoveryParser.java
@@ -37,6 +37,7 @@ import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.yarn.api.records.LocalResource;
 import org.apache.tez.common.TezCommonUtils;
 import org.apache.tez.dag.api.TezConfiguration;
+import org.apache.tez.dag.api.TezConstants;
 import org.apache.tez.dag.app.dag.DAGState;
 import org.apache.tez.dag.app.dag.Task;
 import org.apache.tez.dag.app.dag.Vertex;
@@ -285,7 +286,7 @@ public class RecoveryParser {
   private Path getDAGRecoveryFilePath(Path recoveryDataDir,
       TezDAGID dagID) {
     return new Path(recoveryDataDir,
-        dagID.toString() + TezConfiguration.DAG_RECOVERY_RECOVER_FILE_SUFFIX);
+        dagID.toString() + TezConstants.DAG_RECOVERY_RECOVER_FILE_SUFFIX);
   }
 
   private FSDataInputStream getDAGRecoveryStream(Path recoveryDataDir,
@@ -302,7 +303,7 @@ public class RecoveryParser {
       TezDAGID dagID)
       throws IOException {
     Path dagRecoveryPath = new Path(recoveryDataDir,
-        dagID.toString() + TezConfiguration.DAG_RECOVERY_RECOVER_FILE_SUFFIX);
+        dagID.toString() + TezConstants.DAG_RECOVERY_RECOVER_FILE_SUFFIX);
     return recoveryFS.create(dagRecoveryPath, true, recoveryBufferSize);
   }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java
index db776a4..5eb1e67 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java
@@ -49,6 +49,7 @@ import org.apache.tez.client.TezClientUtils;
 import org.apache.tez.common.security.JobTokenIdentifier;
 import org.apache.tez.common.security.TokenCache;
 import org.apache.tez.dag.api.TezConfiguration;
+import org.apache.tez.dag.api.TezConstants;
 import org.apache.tez.dag.api.TezUncheckedException;
 import org.apache.tez.dag.app.AppContext;
 import org.apache.tez.dag.records.TezDAGID;
@@ -123,7 +124,7 @@ public class AMContainerHelpers {
 
       // Add shuffle token
       LOG.info("Putting shuffle token in serviceData");
-      serviceData.put(TezConfiguration.TEZ_SHUFFLE_HANDLER_SERVICE_ID,
+      serviceData.put(TezConstants.TEZ_SHUFFLE_HANDLER_SERVICE_ID,
           serializeServiceData(TokenCache.getSessionToken(containerCredentials)));
     } catch (IOException e) {
       throw new TezUncheckedException(e);

http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/tez-dag/src/main/java/org/apache/tez/dag/app/security/authorize/TezAMPolicyProvider.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/security/authorize/TezAMPolicyProvider.java b/tez-dag/src/main/java/org/apache/tez/dag/app/security/authorize/TezAMPolicyProvider.java
index 235cc06..c401e5d 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/security/authorize/TezAMPolicyProvider.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/security/authorize/TezAMPolicyProvider.java
@@ -22,7 +22,7 @@ import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.security.authorize.PolicyProvider;
 import org.apache.hadoop.security.authorize.Service;
 import org.apache.tez.common.TezTaskUmbilicalProtocol;
-import org.apache.tez.dag.api.TezConfiguration;
+import org.apache.tez.dag.api.TezConstants;
 import org.apache.tez.dag.api.client.rpc.DAGClientAMProtocolBlockingPB;
 
 /**
@@ -35,10 +35,10 @@ public class TezAMPolicyProvider extends PolicyProvider {
   private static final Service[] tezApplicationMasterServices = 
       new Service[] {
     new Service(
-        TezConfiguration.TEZ_AM_SECURITY_SERVICE_AUTHORIZATION_TASK_UMBILICAL,
+        TezConstants.TEZ_AM_SECURITY_SERVICE_AUTHORIZATION_TASK_UMBILICAL,
           TezTaskUmbilicalProtocol.class),
     new Service(
-    	TezConfiguration.TEZ_AM_SECURITY_SERVICE_AUTHORIZATION_CLIENT,
+    	TezConstants.TEZ_AM_SECURITY_SERVICE_AUTHORIZATION_CLIENT,
           DAGClientAMProtocolBlockingPB.class)
   };
 

http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/tez-dag/src/main/java/org/apache/tez/dag/history/recovery/RecoveryService.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/history/recovery/RecoveryService.java b/tez-dag/src/main/java/org/apache/tez/dag/history/recovery/RecoveryService.java
index 3552c04..737fde8 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/history/recovery/RecoveryService.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/history/recovery/RecoveryService.java
@@ -37,6 +37,7 @@ import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.service.AbstractService;
 import org.apache.tez.common.TezCommonUtils;
 import org.apache.tez.dag.api.TezConfiguration;
+import org.apache.tez.dag.api.TezConstants;
 import org.apache.tez.dag.app.AppContext;
 import org.apache.tez.dag.history.DAGHistoryEvent;
 import org.apache.tez.dag.history.HistoryEventType;
@@ -200,7 +201,7 @@ public class RecoveryService extends AbstractService {
       String dagName = dagSubmittedEvent.getDAGName();
       if (dagName != null
           && dagName.startsWith(
-          TezConfiguration.TEZ_PREWARM_DAG_NAME_PREFIX)) {
+              TezConstants.TEZ_PREWARM_DAG_NAME_PREFIX)) {
         // Skip recording pre-warm DAG events
         skippedDAGs.add(dagId);
         return;

http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/client/ResourceMgrDelegate.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/client/ResourceMgrDelegate.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/client/ResourceMgrDelegate.java
index ac131a1..47ff04d 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/client/ResourceMgrDelegate.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/client/ResourceMgrDelegate.java
@@ -46,7 +46,7 @@ import org.apache.hadoop.yarn.client.api.YarnClient;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.exceptions.YarnException;
 import org.apache.hadoop.yarn.util.ConverterUtils;
-import org.apache.tez.dag.api.TezConfiguration;
+import org.apache.tez.dag.api.TezConstants;
 import org.apache.tez.mapreduce.hadoop.MRJobConfig;
 
 public class ResourceMgrDelegate {
@@ -85,7 +85,7 @@ public class ResourceMgrDelegate {
   public JobStatus[] getAllJobs() throws IOException, InterruptedException {
     try {
       Set<String> appTypes = new HashSet<String>(1);
-      appTypes.add(TezConfiguration.TEZ_APPLICATION_TYPE);
+      appTypes.add(TezConstants.TEZ_APPLICATION_TYPE);
       return TypeConverter.fromYarnApps(client.getApplications(appTypes),
           this.conf);
     } catch (YarnException e) {

http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/hadoop/TestMRHelpers.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/hadoop/TestMRHelpers.java b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/hadoop/TestMRHelpers.java
index 9d0966d..a405cba 100644
--- a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/hadoop/TestMRHelpers.java
+++ b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/hadoop/TestMRHelpers.java
@@ -27,7 +27,7 @@ import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapreduce.MRJobConfig;
 import org.apache.hadoop.yarn.api.ApplicationConstants.Environment;
 import org.apache.hadoop.yarn.api.records.Resource;
-import org.apache.tez.dag.api.TezConfiguration;
+import org.apache.tez.dag.api.TezConstants;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -56,9 +56,9 @@ public class TestMRHelpers {
     Assert.assertTrue(opts.indexOf("fooMapAdminOpts")
         < opts.indexOf("fooMapJavaOpts"));
     Assert.assertTrue(opts.contains(" -D"
-        + TezConfiguration.TEZ_ROOT_LOGGER_NAME + "=FATAL"));
+        + TezConstants.TEZ_ROOT_LOGGER_NAME + "=FATAL"));
     Assert.assertFalse(opts.contains(" -D"
-        + TezConfiguration.TEZ_ROOT_LOGGER_NAME + "=TRACE"));
+        + TezConstants.TEZ_ROOT_LOGGER_NAME + "=TRACE"));
   }
 
   @Test
@@ -73,9 +73,9 @@ public class TestMRHelpers {
     Assert.assertTrue(opts.indexOf("fooReduceAdminOpts")
         < opts.indexOf("fooReduceJavaOpts"));
     Assert.assertFalse(opts.contains(" -D"
-        + TezConfiguration.TEZ_ROOT_LOGGER_NAME + "=FATAL"));
+        + TezConstants.TEZ_ROOT_LOGGER_NAME + "=FATAL"));
     Assert.assertTrue(opts.contains(" -D"
-        + TezConfiguration.TEZ_ROOT_LOGGER_NAME + "=TRACE"));
+        + TezConstants.TEZ_ROOT_LOGGER_NAME + "=TRACE"));
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/tez-plugins/tez-yarn-timeline-history/src/main/java/org/apache/tez/dag/history/logging/ats/ATSHistoryLoggingService.java
----------------------------------------------------------------------
diff --git a/tez-plugins/tez-yarn-timeline-history/src/main/java/org/apache/tez/dag/history/logging/ats/ATSHistoryLoggingService.java b/tez-plugins/tez-yarn-timeline-history/src/main/java/org/apache/tez/dag/history/logging/ats/ATSHistoryLoggingService.java
index 11114b6..aa1dd06 100644
--- a/tez-plugins/tez-yarn-timeline-history/src/main/java/org/apache/tez/dag/history/logging/ats/ATSHistoryLoggingService.java
+++ b/tez-plugins/tez-yarn-timeline-history/src/main/java/org/apache/tez/dag/history/logging/ats/ATSHistoryLoggingService.java
@@ -29,6 +29,7 @@ import org.apache.hadoop.yarn.api.records.timeline.TimelinePutResponse;
 import org.apache.hadoop.yarn.api.records.timeline.TimelinePutResponse.TimelinePutError;
 import org.apache.hadoop.yarn.client.api.TimelineClient;
 import org.apache.tez.dag.api.TezConfiguration;
+import org.apache.tez.dag.api.TezConstants;
 import org.apache.tez.dag.history.DAGHistoryEvent;
 import org.apache.tez.dag.history.HistoryEventType;
 import org.apache.tez.dag.history.events.DAGSubmittedEvent;
@@ -166,7 +167,7 @@ public class ATSHistoryLoggingService extends HistoryLoggingService {
       String dagName = dagSubmittedEvent.getDAGName();
       if (dagName != null
           && dagName.startsWith(
-          TezConfiguration.TEZ_PREWARM_DAG_NAME_PREFIX)) {
+              TezConstants.TEZ_PREWARM_DAG_NAME_PREFIX)) {
         // Skip recording pre-warm DAG events
         skippedDAGs.add(dagId);
         return;

http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/Shuffle.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/Shuffle.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/Shuffle.java
index 49853f9..b587a48 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/Shuffle.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/Shuffle.java
@@ -44,7 +44,7 @@ import org.apache.tez.common.TezRuntimeFrameworkConfigs;
 import org.apache.tez.common.TezUtilsInternal;
 import org.apache.tez.common.counters.TaskCounter;
 import org.apache.tez.common.counters.TezCounter;
-import org.apache.tez.dag.api.TezConfiguration;
+import org.apache.tez.dag.api.TezConstants;
 import org.apache.tez.runtime.api.Event;
 import org.apache.tez.runtime.api.InputContext;
 import org.apache.tez.runtime.library.api.TezRuntimeConfiguration;
@@ -123,7 +123,7 @@ public class Shuffle implements ExceptionReporter {
     
     this.jobTokenSecret = ShuffleUtils
         .getJobTokenSecretFromTokenBytes(inputContext
-            .getServiceConsumerMetaData(TezConfiguration.TEZ_SHUFFLE_HANDLER_SERVICE_ID));
+            .getServiceConsumerMetaData(TezConstants.TEZ_SHUFFLE_HANDLER_SERVICE_ID));
     
     if (ConfigUtils.isIntermediateInputCompressed(conf)) {
       Class<? extends CompressionCodec> codecClass =

http://git-wip-us.apache.org/repos/asf/tez/blob/0361dd8f/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/shuffle/common/impl/ShuffleManager.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/shuffle/common/impl/ShuffleManager.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/shuffle/common/impl/ShuffleManager.java
index 5c3f8fd..3ae3615 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/shuffle/common/impl/ShuffleManager.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/shuffle/common/impl/ShuffleManager.java
@@ -46,7 +46,7 @@ import org.apache.hadoop.io.compress.CompressionCodec;
 import org.apache.tez.common.TezUtilsInternal;
 import org.apache.tez.common.counters.TaskCounter;
 import org.apache.tez.common.counters.TezCounter;
-import org.apache.tez.dag.api.TezConfiguration;
+import org.apache.tez.dag.api.TezConstants;
 import org.apache.tez.dag.api.TezUncheckedException;
 import org.apache.tez.runtime.api.Event;
 import org.apache.tez.runtime.api.InputContext;
@@ -186,7 +186,7 @@ public class ShuffleManager implements FetcherCallback {
     
     this.shuffleSecret = ShuffleUtils
         .getJobTokenSecretFromTokenBytes(inputContext
-            .getServiceConsumerMetaData(TezConfiguration.TEZ_SHUFFLE_HANDLER_SERVICE_ID));
+            .getServiceConsumerMetaData(TezConstants.TEZ_SHUFFLE_HANDLER_SERVICE_ID));
     httpConnectionParams =
         ShuffleUtils.constructHttpShuffleConnectionParams(conf);
     LOG.info(this.getClass().getSimpleName() + " : numInputs=" + numInputs + ", compressionCodec="


Mime
View raw message