svn commit: r949796 - in /hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop: mapred/AdminOperationsProtocol.java mapred/InterTrackerProtocol.java mapreduce/protocol/ClientProtocol.java

[to...@apache.org]

Author: tomwhite
Date: Mon May 31 16:26:31 2010
New Revision: 949796

URL: http://svn.apache.org/viewvc?rev=949796&view=rev
Log:
Revert changes made for HADOOP 6600 since these aren't actually in 0.21

Modified:
    hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/AdminOperationsProtocol.java
    hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/InterTrackerProtocol.java
    hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/protocol/ClientProtocol.java

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/AdminOperationsProtocol.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/AdminOperationsProtocol.java?rev=949796&r1=949795&r2=949796&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/AdminOperationsProtocol.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/AdminOperationsProtocol.java Mon May 31 16:26:31 2010
@@ -23,15 +23,14 @@ import java.io.IOException;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.ipc.VersionedProtocol;
-import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
+import org.apache.hadoop.mapreduce.MRJobConfig;
 import org.apache.hadoop.security.KerberosInfo;
 
 /**
  * Protocol for admin operations. This is a framework-public interface and is
  * NOT_TO_BE_USED_BY_USERS_DIRECTLY.
  */
-@KerberosInfo(
-	    serverPrincipal = JTConfig.JT_USER_NAME)
+@KerberosInfo(MRJobConfig.JOB_JOBTRACKER_ID)
 @InterfaceAudience.Private
 @InterfaceStability.Stable
 public interface AdminOperationsProtocol extends VersionedProtocol {

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/InterTrackerProtocol.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/InterTrackerProtocol.java?rev=949796&r1=949795&r2=949796&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/InterTrackerProtocol.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/InterTrackerProtocol.java Mon May 31 16:26:31 2010
@@ -24,17 +24,13 @@ import org.apache.hadoop.classification.
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.ipc.VersionedProtocol;
 import org.apache.hadoop.mapreduce.MRJobConfig;
-import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
-import org.apache.hadoop.mapreduce.server.tasktracker.TTConfig;
 import org.apache.hadoop.security.KerberosInfo;
 
 /** 
  * Protocol that a TaskTracker and the central JobTracker use to communicate.
  * The JobTracker is the Server, which implements this protocol.
  */ 
-@KerberosInfo(
-	    serverPrincipal = JTConfig.JT_USER_NAME,
-	    clientPrincipal = TTConfig.TT_USER_NAME)
+@KerberosInfo(MRJobConfig.JOB_JOBTRACKER_ID)
 @InterfaceAudience.Private
 @InterfaceStability.Stable
 interface InterTrackerProtocol extends VersionedProtocol {

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/protocol/ClientProtocol.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/protocol/ClientProtocol.java?rev=949796&r1=949795&r2=949796&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/protocol/ClientProtocol.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/protocol/ClientProtocol.java Mon May 31 16:26:31 2010
@@ -39,7 +39,6 @@ import org.apache.hadoop.mapreduce.TaskT
 import org.apache.hadoop.mapreduce.TaskType;
 import org.apache.hadoop.mapreduce.security.token.delegation.DelegationTokenIdentifier;
 import org.apache.hadoop.security.TokenStorage;
-import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
 import org.apache.hadoop.mapreduce.server.jobtracker.State;
 import org.apache.hadoop.security.KerberosInfo;
 import org.apache.hadoop.security.token.Token;
@@ -50,8 +49,7 @@ import org.apache.hadoop.security.token.
  * JobClient can use these methods to submit a Job for execution, and learn about
  * the current system status.
  */ 
-@KerberosInfo(
-	    serverPrincipal = JTConfig.JT_USER_NAME)
+@KerberosInfo(MRJobConfig.JOB_JOBTRACKER_ID)
 @TokenInfo(DelegationTokenSelector.class)
 @InterfaceAudience.Private
 @InterfaceStability.Stable