hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject svn commit: r1077338 - in /hadoop/common/branches/branch-0.20-security-patches/src: core/org/apache/hadoop/security/ hdfs/org/apache/hadoop/hdfs/server/namenode/ hdfs/org/apache/hadoop/hdfs/tools/ mapred/org/apache/hadoop/mapred/ mapred/org/apache/hado...
Date Fri, 04 Mar 2011 04:05:00 GMT
Author: omalley
Date: Fri Mar  4 04:04:58 2011
New Revision: 1077338

URL: http://svn.apache.org/viewvc?rev=1077338&view=rev
Log:
commit a02b25135f868d716adea86c618823f53024cde1
Author: Arun C Murthy <acmurthy@apache.org>
Date:   Thu Mar 18 17:02:47 2010 -0700

    HADOOP-6642 from https://issues.apache.org/jira/secure/attachment/12439225/C6642-1y20.patch
    
    +++ b/YAHOO-CHANGES.txt
    +    HADOOP-6642. Fix javac, javadoc, findbugs warnings. (chrisdo via acmurthy)
    +

Modified:
    hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/security/Krb5AndCertsSslSocketConnector.java
    hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/security/SaslRpcServer.java
    hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
    hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
    hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/tools/DFSck.java
    hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/DisallowedTaskTrackerException.java
    hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/FileAlreadyExistsException.java
    hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/InvalidFileTypeException.java
    hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/InvalidInputException.java
    hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/InvalidJobConfException.java
    hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/IsolationRunner.java
    hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JSPUtil.java
    hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobHistory.java
    hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
    hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobTracker.java
    hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/LocalJobRunner.java
    hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/MapTask.java
    hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/Task.java
    hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
    hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskTrackerStatus.java
    hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java
    hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapreduce/security/token/DelegationTokenRenewal.java
    hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapreduce/server/tasktracker/Localizer.java
    hadoop/common/branches/branch-0.20-security-patches/src/test/findbugsExcludeFile.xml
    hadoop/common/branches/branch-0.20-security-patches/src/webapps/datanode/browseDirectory.jsp
    hadoop/common/branches/branch-0.20-security-patches/src/webapps/datanode/tail.jsp
    hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/analysejobhistory.jsp
    hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobblacklistedtrackers.jsp
    hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobconf.jsp
    hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobconf_history.jsp
    hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobdetails.jsp
    hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobdetailshistory.jsp
    hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobfailures.jsp
    hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobhistory.jsp
    hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobtasks.jsp
    hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobtaskshistory.jsp
    hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobtracker.jsp
    hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/loadhistory.jsp
    hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/machines.jsp
    hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/taskdetails.jsp
    hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/taskdetailshistory.jsp
    hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/taskstats.jsp
    hadoop/common/branches/branch-0.20-security-patches/src/webapps/task/tasktracker.jsp

Modified: hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/security/Krb5AndCertsSslSocketConnector.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/security/Krb5AndCertsSslSocketConnector.java?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/security/Krb5AndCertsSslSocketConnector.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/security/Krb5AndCertsSslSocketConnector.java Fri Mar  4 04:04:58 2011
@@ -20,6 +20,8 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.security.Principal;
+import java.util.List;
+import java.util.Collections;
 import java.util.Random;
 
 import javax.net.ssl.SSLContext;
@@ -52,10 +54,11 @@ import org.mortbay.jetty.security.SslSoc
  * running with Kerberos support.
  */
 public class Krb5AndCertsSslSocketConnector extends SslSocketConnector {
-  public static final String[] KRB5_CIPHER_SUITES = 
-    new String [] {"TLS_KRB5_WITH_3DES_EDE_CBC_SHA"};
+  public static final List<String> KRB5_CIPHER_SUITES = 
+    Collections.unmodifiableList(Collections.singletonList(
+          "TLS_KRB5_WITH_3DES_EDE_CBC_SHA"));
   static {
-    System.setProperty("https.cipherSuites", KRB5_CIPHER_SUITES[0]);
+    System.setProperty("https.cipherSuites", KRB5_CIPHER_SUITES.get(0));
   }
   
   private static final Log LOG = LogFactory
@@ -136,11 +139,12 @@ public class Krb5AndCertsSslSocketConnec
       String [] combined;
       if(useCerts) { // combine the cipher suites
         String[] certs = ss.getEnabledCipherSuites();
-        combined = new String[certs.length + KRB5_CIPHER_SUITES.length];
+        combined = new String[certs.length + KRB5_CIPHER_SUITES.size()];
         System.arraycopy(certs, 0, combined, 0, certs.length);
-        System.arraycopy(KRB5_CIPHER_SUITES, 0, combined, certs.length, KRB5_CIPHER_SUITES.length);
+        System.arraycopy(KRB5_CIPHER_SUITES.toArray(new String[0]), 0, combined,
+              certs.length, KRB5_CIPHER_SUITES.size());
       } else { // Just enable Kerberos auth
-        combined = KRB5_CIPHER_SUITES;
+        combined = KRB5_CIPHER_SUITES.toArray(new String[0]);
       }
       
       ss.setEnabledCipherSuites(combined);

Modified: hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/security/SaslRpcServer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/security/SaslRpcServer.java?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/security/SaslRpcServer.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/security/SaslRpcServer.java Fri Mar  4 04:04:58 2011
@@ -202,8 +202,8 @@ public class SaslRpcServer {
         }
         if (ac.isAuthorized()) {
           if (LOG.isDebugEnabled()) {
-            String username = getIdentifier(authzid, secretManager).getUser()
-            .getUserName().toString();
+            String username =
+              getIdentifier(authzid, secretManager).getUser().getUserName();
             LOG.debug("SASL server DIGEST-MD5 callback: setting "
                 + "canonicalized client ID: " + username);
           }

Modified: hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java Fri Mar  4 04:04:58 2011
@@ -75,6 +75,7 @@ import java.io.DataOutputStream;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.Map.Entry;
 
 import javax.management.NotCompliantMBeanException;
@@ -145,7 +146,8 @@ public class FSNamesystem implements FSC
   private long accessTokenLifetime;
   
   // Scan interval is not configurable.
-  private final long DELEGATION_TOKEN_REMOVER_SCAN_INTERVAL = 3600000; // 1 hour
+  private static final long DELEGATION_TOKEN_REMOVER_SCAN_INTERVAL =
+    TimeUnit.MILLISECONDS.convert(1, TimeUnit.HOURS);
   private DelegationTokenSecretManager dtSecretManager;
 
   volatile long pendingReplicationBlocksCount = 0L;

Modified: hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java Fri Mar  4 04:04:58 2011
@@ -201,7 +201,7 @@ public class SecondaryNameNode implement
           
           if(UserGroupInformation.isSecurityEnabled()) {
             System.setProperty("https.cipherSuites", 
-                Krb5AndCertsSslSocketConnector.KRB5_CIPHER_SUITES[0]);
+                Krb5AndCertsSslSocketConnector.KRB5_CIPHER_SUITES.get(0));
             InetSocketAddress secInfoSocAddr = 
               NetUtils.createSocketAddr(infoBindAddress + ":"+ conf.get(
                 "dfs.secondary.https.port", infoBindAddress + ":" + 0));

Modified: hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/tools/DFSck.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/tools/DFSck.java?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/tools/DFSck.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/tools/DFSck.java Fri Mar  4 04:04:58 2011
@@ -113,7 +113,7 @@ public class DFSck extends Configured im
 
           String proto = "http://";
           if(UserGroupInformation.isSecurityEnabled()) { 
-             System.setProperty("https.cipherSuites", Krb5AndCertsSslSocketConnector.KRB5_CIPHER_SUITES[0]);
+             System.setProperty("https.cipherSuites", Krb5AndCertsSslSocketConnector.KRB5_CIPHER_SUITES.get(0));
              proto = "https://";
           }
           

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/DisallowedTaskTrackerException.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/DisallowedTaskTrackerException.java?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/DisallowedTaskTrackerException.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/DisallowedTaskTrackerException.java Fri Mar  4 04:04:58 2011
@@ -29,6 +29,8 @@ import java.io.IOException;
  */
 class DisallowedTaskTrackerException extends IOException {
 
+  private static final long serialVersionUID = 1L;
+
   public DisallowedTaskTrackerException(TaskTrackerStatus tracker) {
     super("Tasktracker denied communication with jobtracker: " + tracker.getTrackerName());
   }

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/FileAlreadyExistsException.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/FileAlreadyExistsException.java?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/FileAlreadyExistsException.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/FileAlreadyExistsException.java Fri Mar  4 04:04:58 2011
@@ -27,6 +27,8 @@ import java.io.IOException;
 public class FileAlreadyExistsException
     extends IOException {
 
+  private static final long serialVersionUID = 1L;
+
   public FileAlreadyExistsException() {
     super();
   }

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/InvalidFileTypeException.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/InvalidFileTypeException.java?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/InvalidFileTypeException.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/InvalidFileTypeException.java Fri Mar  4 04:04:58 2011
@@ -27,6 +27,8 @@ import java.io.IOException;
 public class InvalidFileTypeException
     extends IOException {
 
+  private static final long serialVersionUID = 1L;
+
   public InvalidFileTypeException() {
     super();
   }

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/InvalidInputException.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/InvalidInputException.java?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/InvalidInputException.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/InvalidInputException.java Fri Mar  4 04:04:58 2011
@@ -27,6 +27,8 @@ import java.util.Iterator;
  * by one.
  */
 public class InvalidInputException extends IOException {
+ 
+  private static final long serialVersionUID = 1L;
   private List<IOException> problems;
   
   /**

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/InvalidJobConfException.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/InvalidJobConfException.java?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/InvalidJobConfException.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/InvalidJobConfException.java Fri Mar  4 04:04:58 2011
@@ -27,6 +27,8 @@ import java.io.IOException;
 public class InvalidJobConfException
     extends IOException {
 
+  private static final long serialVersionUID = 1L;
+
   public InvalidJobConfException() {
     super();
   }

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/IsolationRunner.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/IsolationRunner.java?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/IsolationRunner.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/IsolationRunner.java Fri Mar  4 04:04:58 2011
@@ -120,7 +120,7 @@ public class IsolationRunner {
   
   private ClassLoader makeClassLoader(JobConf conf, 
                                              File workDir) throws IOException {
-    List<String> classPaths = new ArrayList();
+    List<String> classPaths = new ArrayList<String>();
     // Add jar clas files (includes lib/* and classes/*)
     String jar = conf.getJar();
     if (jar != null) {

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JSPUtil.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JSPUtil.java?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JSPUtil.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JSPUtil.java Fri Mar  4 04:04:58 2011
@@ -529,7 +529,7 @@ class JSPUtil {
       }
     } else {
       // no authorization needed
-      job = JSPUtil.getJobInfo(logFile, fs, jobTracker, user);
+      job = JSPUtil.getJobInfo(logFile, fs, jobTracker, null);
     }
     return job;
   }

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobHistory.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobHistory.java?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobHistory.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobHistory.java Fri Mar  4 04:04:58 2011
@@ -1141,7 +1141,8 @@ public class JobHistory {
      * @deprecated Use 
      *     {@link #logSubmitted(JobID, JobConf, String, long, boolean)} instead.
      */
-    public static void logSubmitted(JobID jobId, JobConf jobConf, 
+     @Deprecated
+     public static void logSubmitted(JobID jobId, JobConf jobConf, 
                                     String jobConfPath, long submitTime) 
     throws IOException {
       logSubmitted(jobId, jobConf, jobConfPath, submitTime, true);
@@ -1499,6 +1500,7 @@ public class JobHistory {
      * @param restartCount number of times the job got restarted
      * @deprecated Use {@link #logJobInfo(JobID, long, long)} instead.
      */
+    @Deprecated
     public static void logJobInfo(JobID jobid, long submitTime, long launchTime,
                                   int restartCount){
       logJobInfo(jobid, submitTime, launchTime);

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java Fri Mar  4 04:04:58 2011
@@ -286,6 +286,7 @@ public class JobInProgress {
    * Create an almost empty JobInProgress, which can be used only for tests
    */
   protected JobInProgress(JobID jobid, JobConf conf, JobTracker tracker) {
+    System.out.println("DEBUG3");
     this.conf = conf;
     this.jobId = jobid;
     this.numMapTasks = conf.getNumMapTasks();
@@ -319,22 +320,6 @@ public class JobInProgress {
     }
   }
   
-  /**
-   * Create a JobInProgress with the given job file, plus a handle
-   * to the tracker.
-   */
-  public JobInProgress(JobID jobid, JobTracker jobtracker, 
-                       JobConf default_conf) 
-  throws IOException, InterruptedException {
-    this(jobid, jobtracker, default_conf, 0);
-  }
-  
-  public JobInProgress(JobID jobid, JobTracker jobtracker, 
-                       JobConf default_conf, int rCount) 
-  throws IOException, InterruptedException {
-    this(jobtracker, default_conf, null, rCount, null);
-  }
-
   JobInProgress(JobTracker jobtracker, final JobConf default_conf, 
       JobInfo jobInfo, int rCount, Credentials ts) 
   throws IOException, InterruptedException {

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobTracker.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobTracker.java?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobTracker.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobTracker.java Fri Mar  4 04:04:58 2011
@@ -167,8 +167,8 @@ public class JobTracker implements MRCon
   // in a second
   static final String JT_HEARTBEATS_IN_SECOND = "mapred.heartbeats.in.second";
   private int NUM_HEARTBEATS_IN_SECOND;
-  private final int DEFAULT_NUM_HEARTBEATS_IN_SECOND = 100;
-  private final int MIN_NUM_HEARTBEATS_IN_SECOND = 1;
+  private static final int DEFAULT_NUM_HEARTBEATS_IN_SECOND = 100;
+  private static final int MIN_NUM_HEARTBEATS_IN_SECOND = 1;
   
   // Scaling factor for heartbeats, used for testing only
   static final String JT_HEARTBEATS_SCALING_FACTOR = 
@@ -220,6 +220,9 @@ public class JobTracker implements MRCon
    * A client tried to submit a job before the Job Tracker was ready.
    */
   public static class IllegalStateException extends IOException {
+ 
+    private static final long serialVersionUID = 1L;
+
     public IllegalStateException(String msg) {
       super(msg);
     }
@@ -1620,6 +1623,8 @@ public class JobTracker implements MRCon
       fs.rename(tmpRestartFile, restartFile);
     }
 
+                                   // mapred.JobID::forName returns
+    @SuppressWarnings("unchecked") // mapreduce.JobID
     public void recover() {
       if (!shouldRecover()) {
         // clean up jobs structure
@@ -1674,8 +1679,10 @@ public class JobTracker implements MRCon
           /* THIS PART OF THE CODE IS USELESS. JOB RECOVERY SHOULD BE
            * BACKPORTED (MAPREDUCE-873)
            */
-          job = new JobInProgress(JobTracker.this, conf, null, 
-                                  restartCount, new Credentials() /*HACK*/);
+          job = new JobInProgress(JobTracker.this, conf,
+              new JobInfo((org.apache.hadoop.mapreduce.JobID) id,
+                new Text(user), new Path(getStagingAreaDirInternal(user))),
+              restartCount, new Credentials() /*HACK*/);
 
           // 2. Check if the user has appropriate access
           // Get the user group info for the job's owner
@@ -3696,16 +3703,12 @@ public class JobTracker implements MRCon
    */
   public String getStagingAreaDir() throws IOException {
     try{
-      final String user = UserGroupInformation.getCurrentUser().getShortUserName();
+      final String user =
+        UserGroupInformation.getCurrentUser().getShortUserName();
       return mrOwner.doAs(new PrivilegedExceptionAction<String>() {
         @Override
         public String run() throws Exception {
-          Path stagingRootDir =
-            new Path(conf.get("mapreduce.jobtracker.staging.root.dir",
-                "/tmp/hadoop/mapred/staging"));
-          FileSystem fs = stagingRootDir.getFileSystem(conf);
-          return fs.makeQualified(new Path(stagingRootDir,
-                                    user+"/.staging")).toString();
+          return getStagingAreaDirInternal(user);
         }
       });
     } catch(InterruptedException ie) {
@@ -3713,6 +3716,15 @@ public class JobTracker implements MRCon
     }
   }
 
+  private String getStagingAreaDirInternal(String user) throws IOException {
+    final Path stagingRootDir =
+      new Path(conf.get("mapreduce.jobtracker.staging.root.dir",
+            "/tmp/hadoop/mapred/staging"));
+    final FileSystem fs = stagingRootDir.getFileSystem(conf);
+    return fs.makeQualified(new Path(stagingRootDir,
+                              user+"/.staging")).toString();
+  }
+
   /**
    * Adds a job to the jobtracker. Make sure that the checks are inplace before
    * adding a job. This is the core job submission logic
@@ -4140,13 +4152,13 @@ public class JobTracker implements MRCon
       Vector<TaskInProgress> completeTasks = job.reportCleanupTIPs(true);
       for (Iterator<TaskInProgress> it = completeTasks.iterator();
            it.hasNext();) {
-        TaskInProgress tip = (TaskInProgress) it.next();
+        TaskInProgress tip = it.next();
         reports.add(tip.generateSingleReport());
       }
       Vector<TaskInProgress> incompleteTasks = job.reportCleanupTIPs(false);
       for (Iterator<TaskInProgress> it = incompleteTasks.iterator(); 
            it.hasNext();) {
-        TaskInProgress tip = (TaskInProgress) it.next();
+        TaskInProgress tip = it.next();
         reports.add(tip.generateSingleReport());
       }
       return reports.toArray(new TaskReport[reports.size()]);
@@ -4169,13 +4181,13 @@ public class JobTracker implements MRCon
       Vector<TaskInProgress> completeTasks = job.reportSetupTIPs(true);
       for (Iterator<TaskInProgress> it = completeTasks.iterator();
            it.hasNext();) {
-        TaskInProgress tip = (TaskInProgress) it.next();
+        TaskInProgress tip =  it.next();
         reports.add(tip.generateSingleReport());
       }
       Vector<TaskInProgress> incompleteTasks = job.reportSetupTIPs(false);
       for (Iterator<TaskInProgress> it = incompleteTasks.iterator(); 
            it.hasNext();) {
-        TaskInProgress tip = (TaskInProgress) it.next();
+        TaskInProgress tip =  it.next();
         reports.add(tip.generateSingleReport());
       }
       return reports.toArray(new TaskReport[reports.size()]);
@@ -4761,7 +4773,7 @@ public class JobTracker implements MRCon
         jobStatusList.add(status);
       }
     }
-    return (JobStatus[]) jobStatusList.toArray(
+    return  jobStatusList.toArray(
         new JobStatus[jobStatusList.size()]);
   }
 

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/LocalJobRunner.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/LocalJobRunner.java?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/LocalJobRunner.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/LocalJobRunner.java Fri Mar  4 04:04:58 2011
@@ -166,6 +166,7 @@ class LocalJobRunner implements JobSubmi
       return profile;
     }
     
+    @SuppressWarnings("unchecked")
     @Override
     public void run() {
       JobID jobId = profile.getJobID();

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/MapTask.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/MapTask.java?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/MapTask.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/MapTask.java Fri Mar  4 04:04:58 2011
@@ -80,7 +80,6 @@ class MapTask extends Task {
   public static final int MAP_OUTPUT_INDEX_RECORD_LENGTH = 24;
 
   private TaskSplitIndex splitMetaInfo = new TaskSplitIndex();
-  private String splitClass;
   private final static int APPROX_HEADER_LENGTH = 150;
 
   private static final Log LOG = LogFactory.getLog(MapTask.class.getName());

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/Task.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/Task.java?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/Task.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/Task.java Fri Mar  4 04:04:58 2011
@@ -1198,6 +1198,7 @@ abstract public class Task implements Wr
                          ) throws IOException, InterruptedException, 
                                   ClassNotFoundException;
 
+    @SuppressWarnings("unchecked")
     static <K,V> 
     CombinerRunner<K,V> create(JobConf job,
                                TaskAttemptID taskId,
@@ -1207,6 +1208,7 @@ abstract public class Task implements Wr
                               ) throws ClassNotFoundException {
       Class<? extends Reducer<K,V,K,V>> cls = 
         (Class<? extends Reducer<K,V,K,V>>) job.getCombinerClass();
+
       if (cls != null) {
         return new OldCombinerRunner(cls, job, inputCounter, reporter);
       }
@@ -1231,6 +1233,7 @@ abstract public class Task implements Wr
     private final Class<V> valueClass;
     private final RawComparator<K> comparator;
 
+    @SuppressWarnings("unchecked")
     protected OldCombinerRunner(Class<? extends Reducer<K,V,K,V>> cls,
                                 JobConf conf,
                                 Counters.Counter inputCounter,
@@ -1273,6 +1276,7 @@ abstract public class Task implements Wr
     private final Class<V> valueClass;
     private final org.apache.hadoop.mapreduce.OutputCommitter committer;
 
+    @SuppressWarnings("unchecked")
     NewCombinerRunner(Class reducerClass,
                       JobConf job,
                       org.apache.hadoop.mapreduce.TaskAttemptID taskId,
@@ -1307,6 +1311,7 @@ abstract public class Task implements Wr
       }
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     void combine(RawKeyValueIterator iterator, 
                  OutputCollector<K,V> collector

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskTracker.java?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskTracker.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskTracker.java Fri Mar  4 04:04:58 2011
@@ -1032,8 +1032,7 @@ public class TaskTracker 
     
     // set the location of the token file into jobConf to transfer 
     // the name to TaskRunner
-    localJobConf.set(TokenCache.JOB_TOKENS_FILENAME,
-        localJobTokenFile.toString());
+    localJobConf.set(TokenCache.JOB_TOKENS_FILENAME, localJobTokenFile);
     // create the 'job-work' directory: job-specific shared directory for use as
     // scratch space by all tasks of the same job running on this TaskTracker.
     Path workDir =
@@ -3392,6 +3391,7 @@ public class TaskTracker 
    * to other nodes.
    */
   public static class MapOutputServlet extends HttpServlet {
+    private static final long serialVersionUID = 1L;
     private static final int MAX_BYTES_TO_READ = 64 * 1024;
     @Override
     public void doGet(HttpServletRequest request, 
@@ -3682,7 +3682,7 @@ public class TaskTracker 
         fConf.getClass(MAPRED_TASKTRACKER_MEMORY_CALCULATOR_PLUGIN_PROPERTY,
             null, MemoryCalculatorPlugin.class);
     MemoryCalculatorPlugin memoryCalculatorPlugin =
-        (MemoryCalculatorPlugin) MemoryCalculatorPlugin
+        MemoryCalculatorPlugin
             .getMemoryCalculatorPlugin(clazz, fConf);
     LOG.info(" Using MemoryCalculatorPlugin : " + memoryCalculatorPlugin);
 

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskTrackerStatus.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskTrackerStatus.java?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskTrackerStatus.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskTrackerStatus.java Fri Mar  4 04:04:58 2011
@@ -279,8 +279,7 @@ public class TaskTrackerStatus implement
    */
   public int countMapTasks() {
     int mapCount = 0;
-    for (Iterator<TaskStatus> it = taskReports.iterator(); it.hasNext();) {
-      TaskStatus ts = (TaskStatus) it.next();
+    for (TaskStatus ts : taskReports) {
       if (ts.getIsMap() && isTaskRunning(ts)) {
         mapCount++;
       }
@@ -294,8 +293,7 @@ public class TaskTrackerStatus implement
    */
   public int countOccupiedMapSlots() {
     int mapSlotsCount = 0;
-    for (Iterator<TaskStatus> it = taskReports.iterator(); it.hasNext();) {
-      TaskStatus ts = (TaskStatus) it.next();
+    for (TaskStatus ts : taskReports) {
       if (ts.getIsMap() && isTaskRunning(ts)) {
         mapSlotsCount += ts.getNumSlots();
       }
@@ -317,8 +315,7 @@ public class TaskTrackerStatus implement
    */
   public int countReduceTasks() {
     int reduceCount = 0;
-    for (Iterator<TaskStatus> it = taskReports.iterator(); it.hasNext();) {
-      TaskStatus ts = (TaskStatus) it.next();
+    for (TaskStatus ts : taskReports) {
       if ((!ts.getIsMap()) && isTaskRunning(ts)) {
         reduceCount++;
       }
@@ -332,8 +329,7 @@ public class TaskTrackerStatus implement
    */
   public int countOccupiedReduceSlots() {
     int reduceSlotsCount = 0;
-    for (Iterator<TaskStatus> it = taskReports.iterator(); it.hasNext();) {
-      TaskStatus ts = (TaskStatus) it.next();
+    for (TaskStatus ts : taskReports) {
       if ((!ts.getIsMap()) && isTaskRunning(ts)) {
         reduceSlotsCount += ts.getNumSlots();
       }

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java Fri Mar  4 04:04:58 2011
@@ -90,6 +90,8 @@ public class MultithreadedMapRunner<K1, 
    * queue, to a put, which waits on a full queue.
    */
   private static class BlockingArrayQueue extends ArrayBlockingQueue<Runnable> {
+ 
+    private static final long serialVersionUID = 1L;
     public BlockingArrayQueue(int capacity) {
       super(capacity);
     }

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapreduce/security/token/DelegationTokenRenewal.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapreduce/security/token/DelegationTokenRenewal.java?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapreduce/security/token/DelegationTokenRenewal.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapreduce/security/token/DelegationTokenRenewal.java Fri Mar  4 04:04:58 2011
@@ -81,12 +81,14 @@ public class DelegationTokenRenewal {
     public void setTimerTask(TimerTask tTask) {
       timerTask = tTask;
     }
+    @Override
     public String toString() {
       return token + ";exp="+expirationDate;
     }
     @Override
-    public boolean equals (Object obj) {
-      return token.equals(((DelegationTokenToRenew)obj).token);
+    public boolean equals(Object obj) {
+      return obj instanceof DelegationTokenToRenew &&
+        token.equals(((DelegationTokenToRenew)obj).token);
     }
     @Override
     public int hashCode() {

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapreduce/server/tasktracker/Localizer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapreduce/server/tasktracker/Localizer.java?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapreduce/server/tasktracker/Localizer.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapreduce/server/tasktracker/Localizer.java Fri Mar  4 04:04:58 2011
@@ -356,7 +356,7 @@ public class Localizer {
     if (!initStatus) {
       throw new IOException("Not able to initialize attempt directories "
           + "in any of the configured local directories for the attempt "
-          + attemptId.toString());
+          + attemptId);
     }
   }
 

Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/findbugsExcludeFile.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/findbugsExcludeFile.xml?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/test/findbugsExcludeFile.xml (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/test/findbugsExcludeFile.xml Fri Mar  4 04:04:58 2011
@@ -119,4 +119,11 @@
        </Or>
        <Bug pattern="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD" />
      </Match>
+     <!--
+        Call to System.exit is intentional, HADOOP-249
+     <-->
+     <Match>
+       <Class name="org.apache.hadoop.mapred.Child" />
+       <Bug pattern="DM_EXIT" />
+     </Match>
 </FindBugsFilter>

Modified: hadoop/common/branches/branch-0.20-security-patches/src/webapps/datanode/browseDirectory.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/webapps/datanode/browseDirectory.jsp?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/webapps/datanode/browseDirectory.jsp (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/webapps/datanode/browseDirectory.jsp Fri Mar  4 04:04:58 2011
@@ -131,7 +131,7 @@
               cols[4] = "";
             }
             String datanodeUrl = req.getRequestURL()+"?dir="+
-              URLEncoder.encode(files[i].getFullName(target).toString(), "UTF-8") + 
+              URLEncoder.encode(files[i].getFullName(target), "UTF-8") + 
               "&namenodeInfoPort=" + namenodeInfoPort + JspHelper.SET_DELEGATION + 
               tokenString;
             cols[0] = "<a href=\""+datanodeUrl+"\">"+localname+"</a>";

Modified: hadoop/common/branches/branch-0.20-security-patches/src/webapps/datanode/tail.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/webapps/datanode/tail.jsp?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/webapps/datanode/tail.jsp (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/webapps/datanode/tail.jsp Fri Mar  4 04:04:58 2011
@@ -22,7 +22,7 @@
 %>
 
 <%!
-  JspHelper jspHelper = new JspHelper();
+  static JspHelper jspHelper = new JspHelper();
 
   public void generateFileChunks(JspWriter out, HttpServletRequest req,
                                  Configuration conf

Modified: hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/analysejobhistory.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/analysejobhistory.jsp?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/analysejobhistory.jsp (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/analysejobhistory.jsp Fri Mar  4 04:04:58 2011
@@ -14,6 +14,8 @@
 <%!	private static SimpleDateFormat dateFormat 
                               = new SimpleDateFormat("d/MM HH:mm:ss") ; 
 %>
+<%!	private static final long serialVersionUID = 1L;
+%>
 <html><body>
 <%
   String logFile = request.getParameter("logFile");

Modified: hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobblacklistedtrackers.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobblacklistedtrackers.jsp?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobblacklistedtrackers.jsp (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobblacklistedtrackers.jsp Fri Mar  4 04:04:58 2011
@@ -9,6 +9,8 @@
   import="org.apache.hadoop.mapred.JSPUtil.JobWithViewAccessCheck"
   import="org.apache.hadoop.util.*"
 %>
+<%!	private static final long serialVersionUID = 1L;
+%>
 
 <%
   JobTracker tracker = (JobTracker) application.getAttribute("job.tracker");

Modified: hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobconf.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobconf.jsp?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobconf.jsp (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobconf.jsp Fri Mar  4 04:04:58 2011
@@ -8,6 +8,8 @@
   import="org.apache.hadoop.mapred.JSPUtil.JobWithViewAccessCheck"
   import="org.apache.hadoop.util.*"
 %>
+<%!	private static final long serialVersionUID = 1L;
+%>
 
 
 <%

Modified: hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobconf_history.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobconf_history.jsp?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobconf_history.jsp (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobconf_history.jsp Fri Mar  4 04:04:58 2011
@@ -12,6 +12,8 @@
   import="org.apache.hadoop.security.AccessControlException"
 %>
 
+<%!	private static final long serialVersionUID = 1L;
+%>
 
 <%
   JobTracker tracker = (JobTracker) application.getAttribute("job.tracker");
@@ -23,7 +25,7 @@
   }
 
   Path logFile = new Path(logFileString);
-  String jobId = JSPUtil.getJobID(logFile.getName()).toString();
+  String jobId = JSPUtil.getJobID(logFile.getName());
 
 %>
   

Modified: hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobdetails.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobdetails.jsp?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobdetails.jsp (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobdetails.jsp Fri Mar  4 04:04:58 2011
@@ -18,6 +18,9 @@
   import="org.apache.hadoop.security.authorize.AccessControlList"
 %>
 
+<%!	private static final long serialVersionUID = 1L;
+%>
+
 <%
   final JobTracker tracker = (JobTracker) application.getAttribute(
       "job.tracker");

Modified: hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobdetailshistory.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobdetailshistory.jsp?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobdetailshistory.jsp (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobdetailshistory.jsp Fri Mar  4 04:04:58 2011
@@ -14,6 +14,8 @@
   import="org.apache.hadoop.mapreduce.JobACL"
   import="org.apache.hadoop.security.authorize.AccessControlList"
 %>
+<%!	private static final long serialVersionUID = 1L;
+%>
 
 <%! static SimpleDateFormat dateFormat = new SimpleDateFormat("d-MMM-yyyy HH:mm:ss") ; %>
 <%

Modified: hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobfailures.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobfailures.jsp?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobfailures.jsp (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobfailures.jsp Fri Mar  4 04:04:58 2011
@@ -11,6 +11,9 @@
   import="org.apache.hadoop.util.*"
 %>
 
+<%!	private static final long serialVersionUID = 1L;
+%>
+
 <%
   JobTracker tracker = (JobTracker) application.getAttribute("job.tracker");
   String trackerName = 

Modified: hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobhistory.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobhistory.jsp?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobhistory.jsp (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobhistory.jsp Fri Mar  4 04:04:58 2011
@@ -21,6 +21,8 @@
   private static SimpleDateFormat dateFormat = 
                                     new SimpleDateFormat("d/MM HH:mm:ss");
 %>
+<%!	private static final long serialVersionUID = 1L;
+%>
 <html>
 <head>
 <script type="text/JavaScript">

Modified: hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobtasks.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobtasks.jsp?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobtasks.jsp (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobtasks.jsp Fri Mar  4 04:04:58 2011
@@ -11,6 +11,8 @@
   import="java.lang.Integer"
   import="java.text.SimpleDateFormat"
 %>
+<%!	private static final long serialVersionUID = 1L;
+%>
 <%! static SimpleDateFormat dateFormat = new SimpleDateFormat("d-MMM-yyyy HH:mm:ss") ; %>
 <%
   final JobTracker tracker = (JobTracker) application.getAttribute("job.tracker");

Modified: hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobtaskshistory.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobtaskshistory.jsp?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobtaskshistory.jsp (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobtaskshistory.jsp Fri Mar  4 04:04:58 2011
@@ -15,6 +15,8 @@
   private static SimpleDateFormat dateFormat =
                                     new SimpleDateFormat("d/MM HH:mm:ss") ; 
 %>
+<%!	private static final long serialVersionUID = 1L;
+%>
 
 <%	
   String logFile = request.getParameter("logFile");

Modified: hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobtracker.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobtracker.jsp?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobtracker.jsp (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobtracker.jsp Fri Mar  4 04:04:58 2011
@@ -10,6 +10,8 @@
   import="org.apache.hadoop.mapreduce.*"
   import="org.apache.hadoop.util.*"
 %>
+<%!	private static final long serialVersionUID = 1L;
+%>
 <%
   JobTracker tracker = (JobTracker) application.getAttribute("job.tracker");
   ClusterStatus status = tracker.getClusterStatus();

Modified: hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/loadhistory.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/loadhistory.jsp?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/loadhistory.jsp (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/loadhistory.jsp Fri Mar  4 04:04:58 2011
@@ -9,6 +9,8 @@
   import="java.text.SimpleDateFormat"  
   import="org.apache.hadoop.mapred.JobHistory.*"
 %>
+<%!	private static final long serialVersionUID = 1L;
+%>
 <%
     PathFilter jobLogFileFilter = new PathFilter() {
       public boolean accept(Path path) {
@@ -40,7 +42,7 @@
     }
 	
     if (null == job) {
-      String jobLogFile = (String)request.getParameter("logFile");
+      String jobLogFile = request.getParameter("logFile");
       job = new JobHistory.JobInfo(jobId); 
       DefaultJobHistoryParser.parseJobTasks(jobLogFile, job, fs) ; 
       request.getSession().setAttribute("job", job);

Modified: hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/machines.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/machines.jsp?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/machines.jsp (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/machines.jsp Fri Mar  4 04:04:58 2011
@@ -8,6 +8,8 @@
   import="org.apache.hadoop.mapred.*"
   import="org.apache.hadoop.util.*"
 %>
+<%!	private static final long serialVersionUID = 1L;
+%>
 <%
   JobTracker tracker = (JobTracker) application.getAttribute("job.tracker");
   String trackerName = 

Modified: hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/taskdetails.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/taskdetails.jsp?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/taskdetails.jsp (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/taskdetails.jsp Fri Mar  4 04:04:58 2011
@@ -17,6 +17,8 @@
 <%!static SimpleDateFormat dateFormat = new SimpleDateFormat(
       "d-MMM-yyyy HH:mm:ss");
 %>
+<%!	private static final long serialVersionUID = 1L;
+%>
 <%!private void printConfirm(JspWriter out,
       String attemptid, String action) throws IOException {
     String url = "taskdetails.jsp?attemptid=" + attemptid;

Modified: hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/taskdetailshistory.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/taskdetailshistory.jsp?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/taskdetailshistory.jsp (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/taskdetailshistory.jsp Fri Mar  4 04:04:58 2011
@@ -12,6 +12,8 @@
 %>
 
 <%!	private static SimpleDateFormat dateFormat = new SimpleDateFormat("d/MM HH:mm:ss") ; %>
+<%!	private static final long serialVersionUID = 1L;
+%>
 
 <%	
   String logFile = request.getParameter("logFile");

Modified: hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/taskstats.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/taskstats.jsp?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/taskstats.jsp (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/taskstats.jsp Fri Mar  4 04:04:58 2011
@@ -12,6 +12,8 @@
   import="org.apache.hadoop.util.*"
   import="java.text.SimpleDateFormat"  
 %>
+<%!	private static final long serialVersionUID = 1L;
+%>
 <%
   JobTracker tracker = (JobTracker) application.getAttribute("job.tracker");
   String trackerName = 

Modified: hadoop/common/branches/branch-0.20-security-patches/src/webapps/task/tasktracker.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/webapps/task/tasktracker.jsp?rev=1077338&r1=1077337&r2=1077338&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/webapps/task/tasktracker.jsp (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/webapps/task/tasktracker.jsp Fri Mar  4 04:04:58 2011
@@ -9,6 +9,8 @@
   import="org.apache.hadoop.mapred.*"
   import="org.apache.hadoop.util.*"
 %>
+<%!	private static final long serialVersionUID = 1L;
+%>
 <%
   TaskTracker tracker = (TaskTracker) application.getAttribute("task.tracker");
   String trackerName = tracker.getName();



Mime
View raw message