diff --git a/conf/hbase-env.sh b/conf/hbase-env.sh index d9879c6280..c3aacf51f2 100644 --- a/conf/hbase-env.sh +++ b/conf/hbase-env.sh @@ -41,7 +41,8 @@ # Below are what we set by default. May only work with SUN JVM. # For more on why as well as other possible settings, # see http://hbase.apache.org/book.html#performance -export HBASE_OPTS="-XX:+UseConcMarkSweepGC" +# export HBASE_OPTS="-XX:+UseConcMarkSweepGC" +export HBASE_OPTS="-XX:+UseConcMarkSweepGC -verbose:class" # Uncomment one of the below three options to enable java garbage collection logging for the server-side processes. diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java index eb3fc26e7d..70d49304ec 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -66,10 +66,11 @@ import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.jmx.MBeanContainer; import org.eclipse.jetty.servlet.FilterHolder; -import org.glassfish.jersey.jackson1.Jackson1Feature; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.servlet.ServletContainer; +import org.glassfish.jersey.internal.RuntimeDelegateImpl; +import javax.ws.rs.ext.RuntimeDelegate; import javax.servlet.DispatcherType; /** @@ -237,7 +238,7 @@ public class RESTServer implements Constants { // set up the Jersey servlet container for Jetty ResourceConfig application = new ResourceConfig(). - packages("org.apache.hadoop.hbase.rest").register(Jackson1Feature.class); + packages("org.apache.hadoop.hbase.rest"); ServletHolder sh = new ServletHolder(new ServletContainer(application)); // Set the default max thread number to 100 to limit @@ -326,7 +327,11 @@ public class RESTServer implements Constants { server.addConnector(serverConnector); server.setStopAtShutdown(true); - // set up context + // Load jersey2 RuntimeDelegate else we get jersey1 default which + // isn't on our classpath. + RuntimeDelegate.setInstance(new RuntimeDelegateImpl()); + + // Set up context ServletContextHandler ctxHandler = new ServletContextHandler(server, "/", ServletContextHandler.SESSIONS); ctxHandler.addServlet(sh, PATH_SPEC_ANY); if (authFilter != null) { diff --git a/pom.xml b/pom.xml index 5040361f30..d505f6499f 100755 --- a/pom.xml +++ b/pom.xml @@ -1561,6 +1561,12 @@ org.apache.hbase hbase-hadoop-compat ${project.version} + + + com.sun.jersey + jersey-core + + org.apache.hbase @@ -1568,6 +1574,12 @@ ${project.version} test-jar test + + + com.sun.jersey + jersey-core + + org.apache.hbase @@ -2321,6 +2333,10 @@ hadoop-mapreduce-client-core ${hadoop-two.version} + + com.sun.jersey + jersey-core + io.netty netty @@ -2337,6 +2353,14 @@ ${hadoop-two.version} + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-core + + io.netty netty @@ -2354,6 +2378,10 @@ test + com.sun.jersey + jersey-core + + io.netty netty @@ -2368,6 +2396,10 @@ hadoop-hdfs + com.sun.jersey + jersey-core + + javax.servlet.jsp jsp-api @@ -2398,6 +2430,10 @@ test + com.sun.jersey + jersey-core + + javax.servlet.jsp jsp-api @@ -2430,6 +2466,10 @@ ${hadoop-two.version} + com.sun.jersey + jersey-core + + javax.servlet.jsp jsp-api @@ -2467,6 +2507,10 @@ hadoop-minicluster ${hadoop-two.version} + + com.sun.jersey + jersey-core + commons-httpclient commons-httpclient @@ -2498,6 +2542,12 @@ hadoop-minikdc ${hadoop-two.version} test + + + com.sun.jersey + jersey-core + + @@ -2532,6 +2582,10 @@ ${hadoop-three.version} + com.sun.jersey + jersey-core + + io.netty netty @@ -2543,6 +2597,10 @@ ${hadoop-three.version} + com.sun.jersey + jersey-core + + io.netty netty @@ -2556,6 +2614,10 @@ test + com.sun.jersey + jersey-core + + io.netty netty @@ -2592,6 +2654,10 @@ test + com.sun.jersey + jersey-core + + javax.servlet.jsp jsp-api @@ -2615,6 +2681,10 @@ ${hadoop-three.version} + com.sun.jersey + jersey-core + + com.google.guava guava @@ -2626,6 +2696,10 @@ ${hadoop-three.version} + com.sun.jersey + jersey-core + + javax.servlet.jsp jsp-api @@ -2655,6 +2729,12 @@ org.apache.hadoop hadoop-client ${hadoop-three.version} + + + com.sun.jersey + jersey-core + + org.apache.hadoop @@ -2668,6 +2748,10 @@ hadoop-minicluster ${hadoop-three.version} + + com.sun.jersey + jersey-core + commons-httpclient commons-httpclient