tab & checkstyle fixes

pom.xml

@@ -5,82 +5,64 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>com.nesscomputing</groupId>
-    <artifactId>ness-oss-parent</artifactId>
-    <version>28</version>
+    <artifactId>ness-root</artifactId>
+    <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <scm>
-    <connection>scm:git:git://github.com/NessComputing/components-ness-httpserver.git</connection>
-    <developerConnection>scm:git:git@github.com:NessComputing/components-ness-httpserver.git</developerConnection>
-    <url>http://github.com/NessComputing/components-ness-httpserver</url>
-    <tag>HEAD</tag>
-  </scm>
-
   <groupId>com.nesscomputing.components</groupId>
   <artifactId>ness-httpserver</artifactId>
   <name>httpserver</name>
-  <version>2.3.5-SNAPSHOT</version>
   <packaging>jar</packaging>
   <description>Ness HTTP server component. Can be plugged into a service to make it start up on its own.</description>
 
   <properties>
-    <dep.jetty.version>8.1.3.v20120416</dep.jetty.version>
-    <dep.ness.httpclient.version>2.0.5</dep.ness.httpclient.version>
+<!--     <dep.jetty.version>8.1.3.v20120416</dep.jetty.version> -->
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>com.nesscomputing.components</groupId>
       <artifactId>ness-config</artifactId>
-      <version>2.2.0</version>
     </dependency>
 
     <dependency>
       <groupId>com.nesscomputing.components</groupId>
       <artifactId>ness-lifecycle</artifactId>
-      <version>1.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>com.nesscomputing.components</groupId>
       <artifactId>ness-logging</artifactId>
-      <version>1.1.1</version>
     </dependency>
 
     <dependency>
       <groupId>com.nesscomputing.components</groupId>
       <artifactId>ness-jmx4log</artifactId>
-      <version>1.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>com.nesscomputing.components</groupId>
       <artifactId>ness-jmx</artifactId>
-      <version>1.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>com.nesscomputing.components</groupId>
       <artifactId>ness-galaxy</artifactId>
-      <version>1.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>com.nesscomputing.components</groupId>
       <artifactId>ness-serverinfo</artifactId>
-      <version>1.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>org.antlr</groupId>
       <artifactId>stringtemplate</artifactId>
-      <version>3.2.1</version>
     </dependency>
 
     <dependency>
       <groupId>com.nesscomputing</groupId>
       <artifactId>ness-syslog4j</artifactId>
-      <version>0.9.47-NESS-7</version>
     </dependency>
 
     <dependency>
@@ -101,7 +83,6 @@
     <dependency>
       <groupId>net.jpountz.lz4</groupId>
       <artifactId>lz4</artifactId>
-      <version>1.2.0</version>
     </dependency>
 
     <dependency>
@@ -112,55 +93,41 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>${dep.jetty.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.eclipse.jetty.orbit</groupId>
-          <artifactId>javax.servlet</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jmx</artifactId>
-      <version>${dep.jetty.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
-      <version>${dep.jetty.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-io</artifactId>
-      <version>${dep.jetty.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-http</artifactId>
-      <version>${dep.jetty.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-continuation</artifactId>
-      <version>${dep.jetty.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-security</artifactId>
-      <version>${dep.jetty.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
-      <version>${dep.jetty.version}</version>
     </dependency>
 
     <dependency>
@@ -171,7 +138,6 @@
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-core</artifactId>
-      <version>1.16</version>
       <optional>true</optional>
     </dependency>
 
@@ -202,7 +168,7 @@
 
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
+      <artifactId>annotations</artifactId>
     </dependency>
 
     <dependency>
@@ -220,14 +186,12 @@
     <dependency>
       <groupId>com.nesscomputing.components</groupId>
       <artifactId>ness-httpclient</artifactId>
-      <version>${dep.ness.httpclient.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>com.nesscomputing.components</groupId>
       <artifactId>ness-httpclient</artifactId>
-      <version>${dep.ness.httpclient.version}</version>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>

src/main/java/com/nesscomputing/httpserver/AbstractJetty8HttpServer.java

@@ -29,6 +29,18 @@
 import javax.servlet.DispatcherType;
 import javax.servlet.Servlet;
 
+import com.google.common.base.Preconditions;
+import com.google.common.base.Throwables;
+import com.google.common.collect.Sets;
+import com.google.common.primitives.Ints;
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+import com.google.inject.servlet.GuiceFilter;
+
+import com.nesscomputing.lifecycle.LifecycleStage;
+import com.nesscomputing.lifecycle.guice.OnStage;
+import com.nesscomputing.logging.Log;
+
 import org.apache.commons.lang3.ObjectUtils;
 import org.eclipse.jetty.jmx.MBeanContainer;
 import org.eclipse.jetty.server.Handler;
@@ -43,16 +55,6 @@
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
-import com.google.common.collect.Sets;
-import com.google.common.primitives.Ints;
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
-import com.google.inject.servlet.GuiceFilter;
-import com.nesscomputing.lifecycle.LifecycleStage;
-import com.nesscomputing.lifecycle.guice.OnStage;
-import com.nesscomputing.logging.Log;
 
 public abstract class AbstractJetty8HttpServer implements HttpServer
 {

src/main/java/com/nesscomputing/httpserver/GalaxyJetty8HttpServer.java

@@ -25,6 +25,7 @@
 import com.google.common.collect.ImmutableMap.Builder;
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
+
 import com.nesscomputing.galaxy.GalaxyConfig;
 import com.nesscomputing.galaxy.GalaxyIp;
 

src/main/java/com/nesscomputing/httpserver/HttpConnector.java

@@ -19,12 +19,12 @@
 
 import javax.annotation.Nonnull;
 
+import com.google.common.base.Preconditions;
+
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.eclipse.jetty.server.Connector;
 
-import com.google.common.base.Preconditions;
-
 /**
  * Describes a connector used by a server.
  */

src/main/java/com/nesscomputing/httpserver/HttpServerConfig.java

@@ -75,7 +75,7 @@ public TimeSpan getMaxIdletime()
     @DefaultNull
     public TimeSpan getShutdownTimeout()
     {
-    	return new TimeSpan(1, TimeUnit.SECONDS);
+        return new TimeSpan(1, TimeUnit.SECONDS);
     }
 
     @Config("ness.httpserver.ssl-keystore")

src/main/java/com/nesscomputing/httpserver/HttpServerHandlerBinder.java

@@ -19,14 +19,13 @@
 
 import javax.servlet.Servlet;
 
-import org.eclipse.jetty.server.Handler;
-import org.eclipse.jetty.server.handler.HandlerWrapper;
-
 import com.google.inject.Binder;
 import com.google.inject.binder.LinkedBindingBuilder;
 import com.google.inject.multibindings.Multibinder;
 import com.google.inject.name.Names;
-import com.google.inject.servlet.GuiceFilter;
+
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.handler.HandlerWrapper;
 
 
 /**

src/main/java/com/nesscomputing/httpserver/InvalidRequestServlet.java

@@ -23,6 +23,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 import com.google.inject.Singleton;
+
 import com.nesscomputing.logging.Log;
 
 /**
@@ -31,9 +32,9 @@
 @Singleton
 class InvalidRequestServlet extends HttpServlet
 {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	private static final Log LOG = Log.findLog();
+    private static final Log LOG = Log.findLog();
 
     @Override
     public void service(final HttpServletRequest req, final HttpServletResponse res) throws IOException

src/main/java/com/nesscomputing/httpserver/SoloJetty8HttpServer.java

@@ -22,13 +22,13 @@
 
 import javax.servlet.Servlet;
 
-import org.apache.commons.lang3.ArrayUtils;
-
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 /**
  * A standalone, non-galaxy http Server.
  */

src/main/java/com/nesscomputing/httpserver/jetty/ClasspathResourceHandler.java

@@ -26,6 +26,8 @@
 import com.google.common.io.ByteStreams;
 import com.google.inject.Inject;
 
+import com.nesscomputing.httpserver.HttpServerConfig;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jetty.http.HttpHeaders;
@@ -37,8 +39,6 @@
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 
-import com.nesscomputing.httpserver.HttpServerConfig;
-
 /**
  * Serves files from a given folder on the classpath through jetty.
  * Intended to serve a couple of static files e.g. for javascript or HTML.

src/main/java/com/nesscomputing/httpserver/jetty/StaticResourceHandlerProvider.java

@@ -19,15 +19,16 @@
 
 import javax.annotation.Nonnull;
 
-import org.eclipse.jetty.server.Handler;
-import org.eclipse.jetty.server.handler.ContextHandler;
-import org.eclipse.jetty.server.handler.ResourceHandler;
-
 import com.google.common.base.Preconditions;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
+
 import com.nesscomputing.httpserver.HttpServerConfig;
 
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.server.handler.ResourceHandler;
+
 /**
  * Serves static resources from a path in the filesystem. The location should be in the galaxy tarball and set by configuration.
  */

src/main/java/com/nesscomputing/httpserver/jetty/TransparentCompressionFilter.java

@@ -35,6 +35,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.google.inject.Singleton;
+
+import com.nesscomputing.logging.Log;
+
 import net.jpountz.lz4.LZ4BlockOutputStream;
 
 import org.eclipse.jetty.continuation.Continuation;
@@ -44,9 +48,6 @@
 import org.eclipse.jetty.http.gzip.AbstractCompressedStream;
 import org.eclipse.jetty.http.gzip.CompressedResponseWrapper;
 
-import com.google.inject.Singleton;
-import com.nesscomputing.logging.Log;
-
 /**
  * <b>NOTE: this is a copy of the Jetty GzipFilter, updated to add LZ4 support!</b>
  *
@@ -113,9 +114,9 @@ public class TransparentCompressionFilter implements Filter
 {
     private static final Log LOG = Log.findLog();
 
-    private final static String LZ4 = "lz4";
-    private final static String GZIP="gzip";
-    private final static String DEFLATE="deflate";
+    private static final String LZ4 = "lz4";
+    private static final String GZIP="gzip";
+    private static final String DEFLATE="deflate";
 
     protected Set<String> _mimeTypes;
     protected int _bufferSize=8192;

src/main/java/com/nesscomputing/httpserver/log/LogFieldBinder.java

@@ -19,6 +19,7 @@
 import com.google.inject.Binder;
 import com.google.inject.binder.LinkedBindingBuilder;
 import com.google.inject.multibindings.MapBinder;
+
 import com.nesscomputing.httpserver.log.LogFields.LogField;