Author: wang
Date: Wed Jan 29 22:33:09 2014
New Revision: 1562616
URL: http://svn.apache.org/r1562616
Log:
HADOOP-10255. Rename HttpServer to HttpServer2 to retain older HttpServer in
branch-2 for compatibility. Merged from r1561966 in branch-2.
Modified:
hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/ (props
changed)
hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/CHANGES.txt
(props changed)
hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/bin/ (props
changed)
hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/conf/ (props
changed)
hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestJobEndNotifier.java
hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
(props changed)
hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestJobEndNotifier.java
hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/hadoop-mapreduce-examples/
(props changed)
Propchange: hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project:r1561966
Propchange:
hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt:r1561966
Propchange: hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/bin/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/bin:r1561966
Propchange: hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/conf/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/conf:r1561966
Modified:
hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestJobEndNotifier.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestJobEndNotifier.java?rev=1562616&r1=1562615&r2=1562616&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestJobEndNotifier.java
(original)
+++
hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestJobEndNotifier.java
Wed Jan 29 22:33:09 2014
@@ -37,7 +37,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.http.HttpServer;
+import org.apache.hadoop.http.HttpServer2;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.JobContext;
import org.apache.hadoop.mapreduce.MRJobConfig;
@@ -199,7 +199,7 @@ public class TestJobEndNotifier extends
@Test
public void testNotificationOnLastRetryNormalShutdown() throws Exception {
- HttpServer server = startHttpServer();
+ HttpServer2 server = startHttpServer();
// Act like it is the second attempt. Default max attempts is 2
MRApp app = spy(new MRAppWithCustomContainerAllocator(
2, 2, true, this.getClass().getName(), true, 2, true));
@@ -223,7 +223,7 @@ public class TestJobEndNotifier extends
@Test
public void testAbsentNotificationOnNotLastRetryUnregistrationFailure()
throws Exception {
- HttpServer server = startHttpServer();
+ HttpServer2 server = startHttpServer();
MRApp app = spy(new MRAppWithCustomContainerAllocator(2, 2, false,
this.getClass().getName(), true, 1, false));
doNothing().when(app).sysexit();
@@ -250,7 +250,7 @@ public class TestJobEndNotifier extends
@Test
public void testNotificationOnLastRetryUnregistrationFailure()
throws Exception {
- HttpServer server = startHttpServer();
+ HttpServer2 server = startHttpServer();
MRApp app = spy(new MRAppWithCustomContainerAllocator(2, 2, false,
this.getClass().getName(), true, 2, false));
doNothing().when(app).sysexit();
@@ -274,10 +274,10 @@ public class TestJobEndNotifier extends
server.stop();
}
- private static HttpServer startHttpServer() throws Exception {
+ private static HttpServer2 startHttpServer() throws Exception {
new File(System.getProperty(
"build.webapps", "build/webapps") + "/test").mkdirs();
- HttpServer server = new HttpServer.Builder().setName("test")
+ HttpServer2 server = new HttpServer2.Builder().setName("test")
.addEndpoint(URI.create("http://localhost:0";))
.setFindPort(true).build();
server.addServlet("jobend", "/jobend", JobEndServlet.class);
Propchange:
hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml:r1561966
Modified:
hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestJobEndNotifier.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestJobEndNotifier.java?rev=1562616&r1=1562615&r2=1562616&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestJobEndNotifier.java
(original)
+++
hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestJobEndNotifier.java
Wed Jan 29 22:33:09 2014
@@ -34,10 +34,10 @@ import javax.servlet.http.HttpServletRes
import junit.framework.TestCase;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.http.HttpServer;
+import org.apache.hadoop.http.HttpServer2;
public class TestJobEndNotifier extends TestCase {
- HttpServer server;
+ HttpServer2 server;
URL baseUrl;
@SuppressWarnings("serial")
@@ -102,7 +102,7 @@ public class TestJobEndNotifier extends
public void setUp() throws Exception {
new File(System.getProperty("build.webapps", "build/webapps") + "/test"
).mkdirs();
- server = new HttpServer.Builder().setName("test")
+ server = new HttpServer2.Builder().setName("test")
.addEndpoint(URI.create("http://localhost:0";))
.setFindPort(true).build();
server.addServlet("delay", "/delay", DelayServlet.class);
Propchange:
hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/hadoop-mapreduce-examples/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples:r1561966
