hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject svn commit: r1077384 - in /hadoop/common/branches/branch-0.20-security-patches/src: core/org/apache/hadoop/http/ mapred/org/apache/hadoop/mapred/ mapred/org/apache/hadoop/mapreduce/lib/input/
Date Fri, 04 Mar 2011 04:09:39 GMT
Author: omalley
Date: Fri Mar  4 04:09:39 2011
New Revision: 1077384

URL: http://svn.apache.org/viewvc?rev=1077384&view=rev
Log:
commit 43ba66e9446178008cd247d306cfde14e1382b46
Author: Vinod Kumar <vinodkv@yahoo-inc.com>
Date:   Mon Apr 12 11:03:39 2010 +0530

    . Fix for several jdiff bugs from

Modified:
    hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/http/HttpServer.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/JobStatus.java
    hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapreduce/lib/input/FileInputFormat.java

Modified: hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/http/HttpServer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/http/HttpServer.java?rev=1077384&r1=1077383&r2=1077384&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/http/HttpServer.java
(original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/http/HttpServer.java
Fri Mar  4 04:09:39 2011
@@ -83,7 +83,7 @@ public class HttpServer implements Filte
 
   // The ServletContext attribute where the daemon Configuration
   // gets stored.
-  public static final String CONF_CONTEXT_ATTRIBUTE = "hadoop.conf";
+  static final String CONF_CONTEXT_ATTRIBUTE = "hadoop.conf";
 
   protected final Server webServer;
   protected final Connector listener;
@@ -93,6 +93,7 @@ public class HttpServer implements Filte
       new HashMap<Context, Boolean>();
   protected final List<String> filterNames = new ArrayList<String>();
   private static final int MAX_RETRIES = 10;
+  private final Configuration conf;
 
   /** Same as this(name, bindAddress, port, findPort, null); */
   public HttpServer(String name, String bindAddress, int port, boolean findPort
@@ -113,6 +114,7 @@ public class HttpServer implements Filte
       boolean findPort, Configuration conf) throws IOException {
     webServer = new Server();
     this.findPort = findPort;
+    this.conf = conf;
 
     listener = createBaseListener(conf);
     listener.setHost(bindAddress);
@@ -132,7 +134,7 @@ public class HttpServer implements Filte
     webAppContext.getServletContext().setAttribute(CONF_CONTEXT_ATTRIBUTE, conf);
     webServer.addHandler(webAppContext);
 
-    addDefaultApps(contexts, appDir, conf);
+    addDefaultApps(contexts, appDir);
     
     defineFilter(webAppContext, "krb5Filter", 
         Krb5AndCertsSslSocketConnector.Krb5SslFilter.class.getName(), 
@@ -188,7 +190,7 @@ public class HttpServer implements Filte
    * @throws IOException
    */
   protected void addDefaultApps(ContextHandlerCollection parent,
-      final String appDir, Configuration conf) throws IOException {
+      final String appDir) throws IOException {
     // set up the context for "/logs/" if "hadoop.log.dir" property is defined. 
     String logDir = System.getProperty("hadoop.log.dir");
     if (logDir != null) {

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=1077384&r1=1077383&r2=1077384&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:09:39 2011
@@ -696,6 +696,11 @@ public class JobHistory {
      */
     public Map<String, Task> getAllTasks() { return allTasks; }
 
+    /**
+     * Get the job acls.
+     * 
+     * @return a {@link Map} from {@link JobACL} to {@link AccessControlList}
+     */
     public Map<JobACL, AccessControlList> getJobACLs() {
       return jobACLs;
     }

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobStatus.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobStatus.java?rev=1077384&r1=1077383&r2=1077384&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobStatus.java
(original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobStatus.java
Fri Mar  4 04:09:39 2011
@@ -35,9 +35,9 @@ import org.apache.hadoop.mapreduce.JobAC
 import org.apache.hadoop.security.authorize.AccessControlList;
 
 /**************************************************
- * Describes the current status of a job.  This is
- * not intended to be a comprehensive piece of data.
- * For that, look at JobProfile.
+ * Describes the current status of a job.
+ * 
+ * @see JobProfile for some more information.
  **************************************************/
 public class JobStatus implements Writable, Cloneable {
 
@@ -172,6 +172,11 @@ public class JobStatus implements Writab
    */
   public synchronized float mapProgress() { return mapProgress; }
 
+  /**
+   * Set the job acls
+   * 
+   * @param acls {@link Map} from {@link JobACL}  to {@link AccessControlList} 
+   */
   protected synchronized void setJobACLs(Map<JobACL, AccessControlList> acls) {
     this.jobACLs = acls;
   }
@@ -283,6 +288,11 @@ public class JobStatus implements Writab
     this.schedulingInfo = schedulingInfo;
   }
   
+  /**
+   * Get the acls for Job.
+   * 
+   * @return a {@link Map} from {@link JobACL} to {@link AccessControlList}
+   */
   public synchronized Map<JobACL, AccessControlList> getJobACLs() {
     return jobACLs;
   }

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapreduce/lib/input/FileInputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapreduce/lib/input/FileInputFormat.java?rev=1077384&r1=1077383&r2=1077384&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapreduce/lib/input/FileInputFormat.java
(original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapreduce/lib/input/FileInputFormat.java
Fri Mar  4 04:09:39 2011
@@ -62,10 +62,7 @@ public abstract class FileInputFormat<K,
       }
     }; 
 
-  /**
-   * {@link #NUM_INPUT_FILES} is not a public constant.
-   */
-  public static final String NUM_INPUT_FILES = "mapreduce.input.num.files";
+  static final String NUM_INPUT_FILES = "mapreduce.input.num.files";
 
   /**
    * Proxy PathFilter that accepts a path only if all filters given in the



Mime
View raw message