You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ji...@apache.org on 2014/01/30 22:11:24 UTC
svn commit: r1562964 [2/2] - in
/hadoop/common/branches/HDFS-5698/hadoop-common-project:
hadoop-auth/src/site/apt/ hadoop-common/ hadoop-common/dev-support/
hadoop-common/src/main/docs/ hadoop-common/src/main/java/
hadoop-common/src/main/java/org/apach...
Modified: hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java?rev=1562964&r1=1562963&r2=1562964&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java (original)
+++ hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java Thu Jan 30 21:11:21 2014
@@ -51,7 +51,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeys;
-import org.apache.hadoop.http.HttpServer.QuotingInputFilter.RequestQuoter;
+import org.apache.hadoop.http.HttpServer2.QuotingInputFilter.RequestQuoter;
import org.apache.hadoop.http.resource.JerseyResource;
import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.security.Groups;
@@ -70,7 +70,7 @@ import static org.mockito.Mockito.*;
public class TestHttpServer extends HttpServerFunctionalTest {
static final Log LOG = LogFactory.getLog(TestHttpServer.class);
- private static HttpServer server;
+ private static HttpServer2 server;
private static URL baseUrl;
private static final int MAX_THREADS = 10;
@@ -150,7 +150,7 @@ public class TestHttpServer extends Http
@BeforeClass public static void setup() throws Exception {
Configuration conf = new Configuration();
- conf.setInt(HttpServer.HTTP_MAX_THREADS, 10);
+ conf.setInt(HttpServer2.HTTP_MAX_THREADS, 10);
server = createTestServer(conf);
server.addServlet("echo", "/echo", EchoServlet.class);
server.addServlet("echomap", "/echomap", EchoMapServlet.class);
@@ -357,7 +357,7 @@ public class TestHttpServer extends Http
Configuration conf = new Configuration();
// Authorization is disabled by default
- conf.set(HttpServer.FILTER_INITIALIZER_PROPERTY,
+ conf.set(HttpServer2.FILTER_INITIALIZER_PROPERTY,
DummyFilterInitializer.class.getName());
conf.set(CommonConfigurationKeys.HADOOP_SECURITY_GROUP_MAPPING,
MyGroupsProvider.class.getName());
@@ -366,9 +366,9 @@ public class TestHttpServer extends Http
MyGroupsProvider.mapping.put("userA", Arrays.asList("groupA"));
MyGroupsProvider.mapping.put("userB", Arrays.asList("groupB"));
- HttpServer myServer = new HttpServer.Builder().setName("test")
+ HttpServer2 myServer = new HttpServer2.Builder().setName("test")
.addEndpoint(new URI("http://localhost:0")).setFindPort(true).build();
- myServer.setAttribute(HttpServer.CONF_CONTEXT_ATTRIBUTE, conf);
+ myServer.setAttribute(HttpServer2.CONF_CONTEXT_ATTRIBUTE, conf);
myServer.start();
String serverURL = "http://" + NetUtils.getHostPortString(myServer.getConnectorAddress(0)) + "/";
for (String servlet : new String[] { "conf", "logs", "stacks",
@@ -394,7 +394,7 @@ public class TestHttpServer extends Http
true);
conf.setBoolean(CommonConfigurationKeys.HADOOP_SECURITY_INSTRUMENTATION_REQUIRES_ADMIN,
true);
- conf.set(HttpServer.FILTER_INITIALIZER_PROPERTY,
+ conf.set(HttpServer2.FILTER_INITIALIZER_PROPERTY,
DummyFilterInitializer.class.getName());
conf.set(CommonConfigurationKeys.HADOOP_SECURITY_GROUP_MAPPING,
@@ -407,10 +407,10 @@ public class TestHttpServer extends Http
MyGroupsProvider.mapping.put("userD", Arrays.asList("groupD"));
MyGroupsProvider.mapping.put("userE", Arrays.asList("groupE"));
- HttpServer myServer = new HttpServer.Builder().setName("test")
+ HttpServer2 myServer = new HttpServer2.Builder().setName("test")
.addEndpoint(new URI("http://localhost:0")).setFindPort(true).setConf(conf)
.setACL(new AccessControlList("userA,userB groupC,groupD")).build();
- myServer.setAttribute(HttpServer.CONF_CONTEXT_ATTRIBUTE, conf);
+ myServer.setAttribute(HttpServer2.CONF_CONTEXT_ATTRIBUTE, conf);
myServer.start();
String serverURL = "http://"
@@ -468,39 +468,39 @@ public class TestHttpServer extends Http
Configuration conf = new Configuration();
conf.setBoolean(CommonConfigurationKeys.HADOOP_SECURITY_AUTHORIZATION, false);
ServletContext context = Mockito.mock(ServletContext.class);
- Mockito.when(context.getAttribute(HttpServer.CONF_CONTEXT_ATTRIBUTE)).thenReturn(conf);
- Mockito.when(context.getAttribute(HttpServer.ADMINS_ACL)).thenReturn(null);
+ Mockito.when(context.getAttribute(HttpServer2.CONF_CONTEXT_ATTRIBUTE)).thenReturn(conf);
+ Mockito.when(context.getAttribute(HttpServer2.ADMINS_ACL)).thenReturn(null);
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
Mockito.when(request.getRemoteUser()).thenReturn(null);
HttpServletResponse response = Mockito.mock(HttpServletResponse.class);
//authorization OFF
- Assert.assertTrue(HttpServer.hasAdministratorAccess(context, request, response));
+ Assert.assertTrue(HttpServer2.hasAdministratorAccess(context, request, response));
//authorization ON & user NULL
response = Mockito.mock(HttpServletResponse.class);
conf.setBoolean(CommonConfigurationKeys.HADOOP_SECURITY_AUTHORIZATION, true);
- Assert.assertFalse(HttpServer.hasAdministratorAccess(context, request, response));
+ Assert.assertFalse(HttpServer2.hasAdministratorAccess(context, request, response));
Mockito.verify(response).sendError(Mockito.eq(HttpServletResponse.SC_UNAUTHORIZED), Mockito.anyString());
//authorization ON & user NOT NULL & ACLs NULL
response = Mockito.mock(HttpServletResponse.class);
Mockito.when(request.getRemoteUser()).thenReturn("foo");
- Assert.assertTrue(HttpServer.hasAdministratorAccess(context, request, response));
+ Assert.assertTrue(HttpServer2.hasAdministratorAccess(context, request, response));
//authorization ON & user NOT NULL & ACLs NOT NULL & user not in ACLs
response = Mockito.mock(HttpServletResponse.class);
AccessControlList acls = Mockito.mock(AccessControlList.class);
Mockito.when(acls.isUserAllowed(Mockito.<UserGroupInformation>any())).thenReturn(false);
- Mockito.when(context.getAttribute(HttpServer.ADMINS_ACL)).thenReturn(acls);
- Assert.assertFalse(HttpServer.hasAdministratorAccess(context, request, response));
+ Mockito.when(context.getAttribute(HttpServer2.ADMINS_ACL)).thenReturn(acls);
+ Assert.assertFalse(HttpServer2.hasAdministratorAccess(context, request, response));
Mockito.verify(response).sendError(Mockito.eq(HttpServletResponse.SC_UNAUTHORIZED), Mockito.anyString());
//authorization ON & user NOT NULL & ACLs NOT NULL & user in in ACLs
response = Mockito.mock(HttpServletResponse.class);
Mockito.when(acls.isUserAllowed(Mockito.<UserGroupInformation>any())).thenReturn(true);
- Mockito.when(context.getAttribute(HttpServer.ADMINS_ACL)).thenReturn(acls);
- Assert.assertTrue(HttpServer.hasAdministratorAccess(context, request, response));
+ Mockito.when(context.getAttribute(HttpServer2.ADMINS_ACL)).thenReturn(acls);
+ Assert.assertTrue(HttpServer2.hasAdministratorAccess(context, request, response));
}
@@ -508,38 +508,27 @@ public class TestHttpServer extends Http
public void testRequiresAuthorizationAccess() throws Exception {
Configuration conf = new Configuration();
ServletContext context = Mockito.mock(ServletContext.class);
- Mockito.when(context.getAttribute(HttpServer.CONF_CONTEXT_ATTRIBUTE)).thenReturn(conf);
+ Mockito.when(context.getAttribute(HttpServer2.CONF_CONTEXT_ATTRIBUTE)).thenReturn(conf);
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
HttpServletResponse response = Mockito.mock(HttpServletResponse.class);
//requires admin access to instrumentation, FALSE by default
- Assert.assertTrue(HttpServer.isInstrumentationAccessAllowed(context, request, response));
+ Assert.assertTrue(HttpServer2.isInstrumentationAccessAllowed(context, request, response));
//requires admin access to instrumentation, TRUE
conf.setBoolean(CommonConfigurationKeys.HADOOP_SECURITY_INSTRUMENTATION_REQUIRES_ADMIN, true);
conf.setBoolean(CommonConfigurationKeys.HADOOP_SECURITY_AUTHORIZATION, true);
AccessControlList acls = Mockito.mock(AccessControlList.class);
Mockito.when(acls.isUserAllowed(Mockito.<UserGroupInformation>any())).thenReturn(false);
- Mockito.when(context.getAttribute(HttpServer.ADMINS_ACL)).thenReturn(acls);
- Assert.assertFalse(HttpServer.isInstrumentationAccessAllowed(context, request, response));
- }
-
- @Test
- @SuppressWarnings("deprecation")
- public void testOldConstructor() throws Exception {
- HttpServer server = new HttpServer("test", "0.0.0.0", 0, false);
- try {
- server.start();
- } finally {
- server.stop();
- }
+ Mockito.when(context.getAttribute(HttpServer2.ADMINS_ACL)).thenReturn(acls);
+ Assert.assertFalse(HttpServer2.isInstrumentationAccessAllowed(context, request, response));
}
@Test public void testBindAddress() throws Exception {
checkBindAddress("localhost", 0, false).stop();
// hang onto this one for a bit more testing
- HttpServer myServer = checkBindAddress("localhost", 0, false);
- HttpServer myServer2 = null;
+ HttpServer2 myServer = checkBindAddress("localhost", 0, false);
+ HttpServer2 myServer2 = null;
try {
int port = myServer.getConnectorAddress(0).getPort();
// it's already in use, true = expect a higher port
@@ -558,9 +547,9 @@ public class TestHttpServer extends Http
}
}
- private HttpServer checkBindAddress(String host, int port, boolean findPort)
+ private HttpServer2 checkBindAddress(String host, int port, boolean findPort)
throws Exception {
- HttpServer server = createServer(host, port);
+ HttpServer2 server = createServer(host, port);
try {
// not bound, ephemeral should return requested port (0 for ephemeral)
List<?> listeners = (List<?>) Whitebox.getInternalState(server,
@@ -608,7 +597,7 @@ public class TestHttpServer extends Http
public void testHttpServerBuilderWithExternalConnector() throws Exception {
Connector c = mock(Connector.class);
doReturn("localhost").when(c).getHost();
- HttpServer s = new HttpServer.Builder().setName("test").setConnector(c)
+ HttpServer2 s = new HttpServer2.Builder().setName("test").setConnector(c)
.build();
s.stop();
}
Modified: hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServerLifecycle.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServerLifecycle.java?rev=1562964&r1=1562963&r2=1562964&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServerLifecycle.java (original)
+++ hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServerLifecycle.java Thu Jan 30 21:11:21 2014
@@ -23,18 +23,18 @@ import org.junit.Test;
public class TestHttpServerLifecycle extends HttpServerFunctionalTest {
/**
- * Check that a server is alive by probing the {@link HttpServer#isAlive()} method
+ * Check that a server is alive by probing the {@link HttpServer2#isAlive()} method
* and the text of its toString() description
* @param server server
*/
- private void assertAlive(HttpServer server) {
+ private void assertAlive(HttpServer2 server) {
assertTrue("Server is not alive", server.isAlive());
- assertToStringContains(server, HttpServer.STATE_DESCRIPTION_ALIVE);
+ assertToStringContains(server, HttpServer2.STATE_DESCRIPTION_ALIVE);
}
- private void assertNotLive(HttpServer server) {
+ private void assertNotLive(HttpServer2 server) {
assertTrue("Server should not be live", !server.isAlive());
- assertToStringContains(server, HttpServer.STATE_DESCRIPTION_NOT_LIVE);
+ assertToStringContains(server, HttpServer2.STATE_DESCRIPTION_NOT_LIVE);
}
/**
@@ -43,12 +43,12 @@ public class TestHttpServerLifecycle ext
* @throws Throwable on failure
*/
@Test public void testCreatedServerIsNotAlive() throws Throwable {
- HttpServer server = createTestServer();
+ HttpServer2 server = createTestServer();
assertNotLive(server);
}
@Test public void testStopUnstartedServer() throws Throwable {
- HttpServer server = createTestServer();
+ HttpServer2 server = createTestServer();
stop(server);
}
@@ -59,7 +59,7 @@ public class TestHttpServerLifecycle ext
*/
@Test
public void testStartedServerIsAlive() throws Throwable {
- HttpServer server = null;
+ HttpServer2 server = null;
server = createTestServer();
assertNotLive(server);
server.start();
@@ -78,22 +78,22 @@ public class TestHttpServerLifecycle ext
requestLogAppender.setName("httprequestlog");
requestLogAppender.setFilename(System.getProperty("test.build.data", "/tmp/")
+ "jetty-name-yyyy_mm_dd.log");
- Logger.getLogger(HttpServer.class.getName() + ".test").addAppender(requestLogAppender);
- HttpServer server = null;
+ Logger.getLogger(HttpServer2.class.getName() + ".test").addAppender(requestLogAppender);
+ HttpServer2 server = null;
server = createTestServer();
assertNotLive(server);
server.start();
assertAlive(server);
stop(server);
- Logger.getLogger(HttpServer.class.getName() + ".test").removeAppender(requestLogAppender);
+ Logger.getLogger(HttpServer2.class.getName() + ".test").removeAppender(requestLogAppender);
}
/**
- * Assert that the result of {@link HttpServer#toString()} contains the specific text
+ * Assert that the result of {@link HttpServer2#toString()} contains the specific text
* @param server server to examine
* @param text text to search for
*/
- private void assertToStringContains(HttpServer server, String text) {
+ private void assertToStringContains(HttpServer2 server, String text) {
String description = server.toString();
assertTrue("Did not find \"" + text + "\" in \"" + description + "\"",
description.contains(text));
@@ -105,7 +105,7 @@ public class TestHttpServerLifecycle ext
* @throws Throwable on failure
*/
@Test public void testStoppedServerIsNotAlive() throws Throwable {
- HttpServer server = createAndStartTestServer();
+ HttpServer2 server = createAndStartTestServer();
assertAlive(server);
stop(server);
assertNotLive(server);
@@ -117,7 +117,7 @@ public class TestHttpServerLifecycle ext
* @throws Throwable on failure
*/
@Test public void testStoppingTwiceServerIsAllowed() throws Throwable {
- HttpServer server = createAndStartTestServer();
+ HttpServer2 server = createAndStartTestServer();
assertAlive(server);
stop(server);
assertNotLive(server);
@@ -133,7 +133,7 @@ public class TestHttpServerLifecycle ext
*/
@Test
public void testWepAppContextAfterServerStop() throws Throwable {
- HttpServer server = null;
+ HttpServer2 server = null;
String key = "test.attribute.key";
String value = "test.attribute.value";
server = createTestServer();
Modified: hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServerWebapps.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServerWebapps.java?rev=1562964&r1=1562963&r2=1562964&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServerWebapps.java (original)
+++ hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServerWebapps.java Thu Jan 30 21:11:21 2014
@@ -36,7 +36,7 @@ public class TestHttpServerWebapps exten
*/
@Test
public void testValidServerResource() throws Throwable {
- HttpServer server = null;
+ HttpServer2 server = null;
try {
server = createServer("test");
} finally {
@@ -51,7 +51,7 @@ public class TestHttpServerWebapps exten
@Test
public void testMissingServerResource() throws Throwable {
try {
- HttpServer server = createServer("NoSuchWebapp");
+ HttpServer2 server = createServer("NoSuchWebapp");
//should not have got here.
//close the server
String serverDescription = server.toString();
Modified: hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestPathFilter.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestPathFilter.java?rev=1562964&r1=1562963&r2=1562964&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestPathFilter.java (original)
+++ hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestPathFilter.java Thu Jan 30 21:11:21 2014
@@ -40,7 +40,7 @@ import org.apache.hadoop.net.NetUtils;
import org.junit.Test;
public class TestPathFilter extends HttpServerFunctionalTest {
- static final Log LOG = LogFactory.getLog(HttpServer.class);
+ static final Log LOG = LogFactory.getLog(HttpServer2.class);
static final Set<String> RECORDS = new TreeSet<String>();
/** A very simple filter that records accessed uri's */
@@ -107,10 +107,10 @@ public class TestPathFilter extends Http
Configuration conf = new Configuration();
//start a http server with CountingFilter
- conf.set(HttpServer.FILTER_INITIALIZER_PROPERTY,
+ conf.set(HttpServer2.FILTER_INITIALIZER_PROPERTY,
RecordingFilter.Initializer.class.getName());
String[] pathSpecs = { "/path", "/path/*" };
- HttpServer http = createTestServer(conf, pathSpecs);
+ HttpServer2 http = createTestServer(conf, pathSpecs);
http.start();
final String baseURL = "/path";
Modified: hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestSSLHttpServer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestSSLHttpServer.java?rev=1562964&r1=1562963&r2=1562964&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestSSLHttpServer.java (original)
+++ hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestSSLHttpServer.java Thu Jan 30 21:11:21 2014
@@ -48,7 +48,7 @@ public class TestSSLHttpServer extends H
private static final Log LOG = LogFactory.getLog(TestSSLHttpServer.class);
private static Configuration conf;
- private static HttpServer server;
+ private static HttpServer2 server;
private static URL baseUrl;
private static String keystoresDir;
private static String sslConfDir;
@@ -57,7 +57,7 @@ public class TestSSLHttpServer extends H
@BeforeClass
public static void setup() throws Exception {
conf = new Configuration();
- conf.setInt(HttpServer.HTTP_MAX_THREADS, 10);
+ conf.setInt(HttpServer2.HTTP_MAX_THREADS, 10);
File base = new File(BASEDIR);
FileUtil.fullyDelete(base);
@@ -73,7 +73,7 @@ public class TestSSLHttpServer extends H
clientSslFactory = new SSLFactory(SSLFactory.Mode.CLIENT, sslConf);
clientSslFactory.init();
- server = new HttpServer.Builder()
+ server = new HttpServer2.Builder()
.setName("test")
.addEndpoint(new URI("https://localhost"))
.setConf(conf)
Modified: hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestServletFilter.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestServletFilter.java?rev=1562964&r1=1562963&r2=1562964&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestServletFilter.java (original)
+++ hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestServletFilter.java Thu Jan 30 21:11:21 2014
@@ -40,7 +40,7 @@ import org.apache.hadoop.test.GenericTes
import org.junit.Test;
public class TestServletFilter extends HttpServerFunctionalTest {
- static final Log LOG = LogFactory.getLog(HttpServer.class);
+ static final Log LOG = LogFactory.getLog(HttpServer2.class);
static volatile String uri = null;
/** A very simple filter which record the uri filtered. */
@@ -105,9 +105,9 @@ public class TestServletFilter extends H
Configuration conf = new Configuration();
//start a http server with CountingFilter
- conf.set(HttpServer.FILTER_INITIALIZER_PROPERTY,
+ conf.set(HttpServer2.FILTER_INITIALIZER_PROPERTY,
SimpleFilter.Initializer.class.getName());
- HttpServer http = createTestServer(conf);
+ HttpServer2 http = createTestServer(conf);
http.start();
final String fsckURL = "/fsck";
@@ -167,9 +167,9 @@ public class TestServletFilter extends H
public void testServletFilterWhenInitThrowsException() throws Exception {
Configuration conf = new Configuration();
// start a http server with ErrorFilter
- conf.set(HttpServer.FILTER_INITIALIZER_PROPERTY,
+ conf.set(HttpServer2.FILTER_INITIALIZER_PROPERTY,
ErrorFilter.Initializer.class.getName());
- HttpServer http = createTestServer(conf);
+ HttpServer2 http = createTestServer(conf);
try {
http.start();
fail("expecting exception");
@@ -186,8 +186,8 @@ public class TestServletFilter extends H
public void testContextSpecificServletFilterWhenInitThrowsException()
throws Exception {
Configuration conf = new Configuration();
- HttpServer http = createTestServer(conf);
- HttpServer.defineFilter(http.webAppContext,
+ HttpServer2 http = createTestServer(conf);
+ HttpServer2.defineFilter(http.webAppContext,
"ErrorFilter", ErrorFilter.class.getName(),
null, null);
try {
Modified: hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/jmx/TestJMXJsonServlet.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/jmx/TestJMXJsonServlet.java?rev=1562964&r1=1562963&r2=1562964&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/jmx/TestJMXJsonServlet.java (original)
+++ hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/jmx/TestJMXJsonServlet.java Thu Jan 30 21:11:21 2014
@@ -24,7 +24,7 @@ import java.util.regex.Pattern;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.http.HttpServer;
+import org.apache.hadoop.http.HttpServer2;
import org.apache.hadoop.http.HttpServerFunctionalTest;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -32,7 +32,7 @@ import org.junit.Test;
public class TestJMXJsonServlet extends HttpServerFunctionalTest {
private static final Log LOG = LogFactory.getLog(TestJMXJsonServlet.class);
- private static HttpServer server;
+ private static HttpServer2 server;
private static URL baseUrl;
@BeforeClass public static void setup() throws Exception {
Modified: hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/log/TestLogLevel.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/log/TestLogLevel.java?rev=1562964&r1=1562963&r2=1562964&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/log/TestLogLevel.java (original)
+++ hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/log/TestLogLevel.java Thu Jan 30 21:11:21 2014
@@ -20,7 +20,7 @@ package org.apache.hadoop.log;
import java.io.*;
import java.net.*;
-import org.apache.hadoop.http.HttpServer;
+import org.apache.hadoop.http.HttpServer2;
import org.apache.hadoop.net.NetUtils;
import junit.framework.TestCase;
@@ -44,7 +44,7 @@ public class TestLogLevel extends TestCa
log.error("log.error1");
assertTrue(!Level.ERROR.equals(log.getEffectiveLevel()));
- HttpServer server = new HttpServer.Builder().setName("..")
+ HttpServer2 server = new HttpServer2.Builder().setName("..")
.addEndpoint(new URI("http://localhost:0")).setFindPort(true)
.build();
Modified: hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestAuthenticationFilter.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestAuthenticationFilter.java?rev=1562964&r1=1562963&r2=1562964&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestAuthenticationFilter.java (original)
+++ hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestAuthenticationFilter.java Thu Jan 30 21:11:21 2014
@@ -18,7 +18,7 @@ package org.apache.hadoop.security;
import junit.framework.TestCase;
-import org.apache.hadoop.http.HttpServer;
+import org.apache.hadoop.http.HttpServer2;
import org.apache.hadoop.security.authentication.server.AuthenticationFilter;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.http.FilterContainer;
@@ -49,7 +49,7 @@ public class TestAuthenticationFilter ex
AuthenticationFilterInitializer.SIGNATURE_SECRET_FILE,
secretFile.getAbsolutePath());
- conf.set(HttpServer.BIND_ADDRESS, "barhost");
+ conf.set(HttpServer2.BIND_ADDRESS, "barhost");
FilterContainer container = Mockito.mock(FilterContainer.class);
Mockito.doAnswer(
Modified: hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java?rev=1562964&r1=1562963&r2=1562964&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java (original)
+++ hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java Thu Jan 30 21:11:21 2014
@@ -331,7 +331,9 @@ public class TestSecurityUtil {
@Test
public void testSocketAddrWithIP() {
- verifyServiceAddr("127.0.0.1", "127.0.0.1");
+ String staticHost = "127.0.0.1";
+ NetUtils.addStaticResolution(staticHost, "localhost");
+ verifyServiceAddr(staticHost, "127.0.0.1");
}
@Test
Modified: hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestVersionUtil.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestVersionUtil.java?rev=1562964&r1=1562963&r2=1562964&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestVersionUtil.java (original)
+++ hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestVersionUtil.java Thu Jan 30 21:11:21 2014
@@ -28,10 +28,30 @@ public class TestVersionUtil {
// Equal versions are equal.
assertEquals(0, VersionUtil.compareVersions("2.0.0", "2.0.0"));
assertEquals(0, VersionUtil.compareVersions("2.0.0a", "2.0.0a"));
- assertEquals(0, VersionUtil.compareVersions("1", "1"));
assertEquals(0, VersionUtil.compareVersions(
"2.0.0-SNAPSHOT", "2.0.0-SNAPSHOT"));
-
+
+ assertEquals(0, VersionUtil.compareVersions("1", "1"));
+ assertEquals(0, VersionUtil.compareVersions("1", "1.0"));
+ assertEquals(0, VersionUtil.compareVersions("1", "1.0.0"));
+
+ assertEquals(0, VersionUtil.compareVersions("1.0", "1"));
+ assertEquals(0, VersionUtil.compareVersions("1.0", "1.0"));
+ assertEquals(0, VersionUtil.compareVersions("1.0", "1.0.0"));
+
+ assertEquals(0, VersionUtil.compareVersions("1.0.0", "1"));
+ assertEquals(0, VersionUtil.compareVersions("1.0.0", "1.0"));
+ assertEquals(0, VersionUtil.compareVersions("1.0.0", "1.0.0"));
+
+ assertEquals(0, VersionUtil.compareVersions("1.0.0-alpha-1", "1.0.0-a1"));
+ assertEquals(0, VersionUtil.compareVersions("1.0.0-alpha-2", "1.0.0-a2"));
+ assertEquals(0, VersionUtil.compareVersions("1.0.0-alpha1", "1.0.0-alpha-1"));
+
+ assertEquals(0, VersionUtil.compareVersions("1a0", "1.0.0-alpha-0"));
+ assertEquals(0, VersionUtil.compareVersions("1a0", "1-a0"));
+ assertEquals(0, VersionUtil.compareVersions("1.a0", "1-a0"));
+ assertEquals(0, VersionUtil.compareVersions("1.a0", "1.0.0-alpha-0"));
+
// Assert that lower versions are lower, and higher versions are higher.
assertExpectedValues("1", "2.0.0");
assertExpectedValues("1.0.0", "2");
@@ -51,15 +71,27 @@ public class TestVersionUtil {
assertExpectedValues("1.0.2a", "1.0.2ab");
assertExpectedValues("1.0.0a1", "1.0.0a2");
assertExpectedValues("1.0.0a2", "1.0.0a10");
+ // The 'a' in "1.a" is not followed by digit, thus not treated as "alpha",
+ // and treated larger than "1.0", per maven's ComparableVersion class
+ // implementation.
assertExpectedValues("1.0", "1.a");
- assertExpectedValues("1.0", "1.a0");
+ //The 'a' in "1.a0" is followed by digit, thus treated as "alpha-<digit>"
+ assertExpectedValues("1.a0", "1.0");
+ assertExpectedValues("1a0", "1.0");
+ assertExpectedValues("1.0.1-alpha-1", "1.0.1-alpha-2");
+ assertExpectedValues("1.0.1-beta-1", "1.0.1-beta-2");
// Snapshot builds precede their eventual releases.
assertExpectedValues("1.0-SNAPSHOT", "1.0");
- assertExpectedValues("1.0", "1.0.0-SNAPSHOT");
+ assertExpectedValues("1.0.0-SNAPSHOT", "1.0");
assertExpectedValues("1.0.0-SNAPSHOT", "1.0.0");
assertExpectedValues("1.0.0", "1.0.1-SNAPSHOT");
assertExpectedValues("1.0.1-SNAPSHOT", "1.0.1");
+ assertExpectedValues("1.0.1-SNAPSHOT", "1.0.2");
+
+ assertExpectedValues("1.0.1-alpha-1", "1.0.1-SNAPSHOT");
+ assertExpectedValues("1.0.1-beta-1", "1.0.1-SNAPSHOT");
+ assertExpectedValues("1.0.1-beta-2", "1.0.1-SNAPSHOT");
}
private static void assertExpectedValues(String lower, String higher) {