Use standard Jenkins POM in Winstone, Refactor the project structure

pom.xml

@@ -1,5 +1,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.jenkins-ci</groupId>
+    <artifactId>jenkins</artifactId>
+    <version>1.40</version>
+  </parent>
+
   <groupId>org.jenkins-ci</groupId>
   <artifactId>winstone</artifactId>
   <version>4.2-SNAPSHOT</version>
@@ -8,6 +14,14 @@
   <name>Winstone</name>
   <description>Winstone is a command line wrapper around Jetty</description>
 
+  <properties>
+    <jetty.version>9.4.8.v20171121</jetty.version>
+    <alpn.api.version>1.1.3.v20160715</alpn.api.version>
+    <java.level>8</java.level>
+    <!-- TODO: remove once FindBugs issues are fixed. 57 so far -->
+    <findbugs.failOnError>false</findbugs.failOnError>
+  </properties>
+
   <licenses>
     <license>
       <name>GNU Lesser General Public License version 2.1</name>
@@ -20,39 +34,11 @@
   </licenses>
 
   <build>
-    <sourceDirectory>src/java</sourceDirectory>
-
-    <resources>
-      <resource>
-        <directory>src/java</directory>
-        <includes>
-          <include>**/*.properties</include>
-        </includes>
-      </resource>
-    </resources>
-
-    <testSourceDirectory>src/test</testSourceDirectory>
-
-    <testResources>
-      <testResource>
-        <directory>src/test</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </testResource>
-    </testResources>
 
     <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.6.1</version>
-        <configuration>
-          <source>1.${java.level}</source>
-          <target>1.${java.level}</target>
-        </configuration>
-      </plugin>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.8</version>
         <executions>
           <execution>
             <id>prepare-testwebapp</id>
@@ -77,17 +63,12 @@
         </executions>
       </plugin>
 
+
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.20</version>
         <configuration>
-          <includes>
-            <include>**/*Test.java</include>
-          </includes>
-          <excludes>
-            <exclude>**/*NaughtyTest.java</exclude>
-            <exclude>winstone/testCase/load/LoadTest.java</exclude>
-          </excludes>
+          <trimStackTrace>false</trimStackTrace> <!-- SUREFIRE-1226 workaround -->
         </configuration>
       </plugin>
 
@@ -114,59 +95,6 @@
         </configuration>
       </plugin>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.4.1</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <requireJavaVersion>
-                  <version>[1.${java.level},)</version>
-                </requireJavaVersion>
-                <enforceBytecodeVersion>
-                  <maxJdkVersion>1.${java.level}</maxJdkVersion>
-                  <ignoredScopes>
-                    <ignoredScope>test</ignoredScope>
-                  </ignoredScopes>
-                </enforceBytecodeVersion>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>extra-enforcer-rules</artifactId>
-            <version>1.0-beta-6</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>animal-sniffer-maven-plugin</artifactId>
-        <version>1.15</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>check</goal>
-            </goals>
-            <id>check</id>
-          </execution>
-        </executions>
-        <configuration>
-          <signature>
-            <groupId>org.codehaus.mojo.signature</groupId>
-            <artifactId>java1${java.level}</artifactId>
-          </signature>
-        </configuration>
-      </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
@@ -205,33 +133,21 @@
         </executions>
       </plugin>
     </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-release-plugin</artifactId>
-          <version>2.5.3</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
   </build>
 
-  <distributionManagement>
-    <repository>
-      <id>maven.jenkins-ci.org</id>
-      <url>https://repo.jenkins-ci.org/releases/</url>
-    </repository>
-    <snapshotRepository>
-      <id>maven.jenkins-ci.org</id>
-      <url>https://repo.jenkins-ci.org/snapshots/</url>
-    </snapshotRepository>
-  </distributionManagement>
-
   <repositories>
     <repository>
       <id>repo.jenkins-ci.org</id>
       <url>http://repo.jenkins-ci.org/public/</url>
     </repository>
-  </repositories>  
+  </repositories>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <id>repo.jenkins-ci.org</id>
+      <url>https://repo.jenkins-ci.org/public/</url>
+    </pluginRepository>
+  </pluginRepositories>
 
   <scm>
     <connection>scm:git:git://github.com/jenkinsci/winstone.git</connection>
@@ -268,7 +184,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.12</version>
       <scope>test</scope>
     </dependency>
 
@@ -331,9 +247,4 @@
 
   </dependencies>
 
-  <properties>
-    <jetty.version>9.4.8.v20171121</jetty.version>
-    <alpn.api.version>1.1.3.v20160715</alpn.api.version>
-    <java.level>8</java.level>
-  </properties>
 </project>

src/java/winstone/ConnectorFactory.java → src/main/java/winstone/ConnectorFactory.java

@@ -9,9 +9,6 @@
 import org.eclipse.jetty.server.Server;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
 import java.util.Map;
 
 /**

src/java/winstone/Http2ConnectorFactory.java → src/main/java/winstone/Http2ConnectorFactory.java

@@ -22,12 +22,10 @@
 
 import org.eclipse.jetty.alpn.ALPN;
 import org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory;
-import org.eclipse.jetty.http.HttpVersion;
 import org.eclipse.jetty.http2.HTTP2Cipher;
 import org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
-import org.eclipse.jetty.server.NegotiatingServerConnectionFactory;
 import org.eclipse.jetty.server.SecureRequestCustomizer;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
@@ -38,8 +36,6 @@
 import java.io.IOException;
 import java.util.Map;
 
-import static org.eclipse.jetty.util.resource.Resource.newClassPathResource;
-
 /**
  * This class add the HTTP/2 Listener This is the class that gets launched
  * by the command line, and owns the server socket, etc.

src/java/winstone/HttpsConnectorFactory.java → src/main/java/winstone/HttpsConnectorFactory.java

@@ -14,9 +14,7 @@
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import winstone.cmdline.Option;
 
-import javax.net.ssl.KeyManagerFactory;
 import java.io.IOException;
-import java.util.Enumeration;
 import java.util.Map;
 
 /**

src/java/winstone/cmdline/CmdLineParser.java → src/main/java/winstone/cmdline/CmdLineParser.java

@@ -8,7 +8,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;

src/java/winstone/realm/ArgumentsRealm.java → src/main/java/winstone/realm/ArgumentsRealm.java

@@ -6,16 +6,12 @@
  */
 package winstone.realm;
 
-import org.eclipse.jetty.security.AbstractLoginService;
 import org.eclipse.jetty.security.HashLoginService;
 import org.eclipse.jetty.security.UserStore;
-import org.eclipse.jetty.util.security.Credential;
 import winstone.Logger;
 import winstone.WinstoneResourceBundle;
 import winstone.cmdline.Option;
 
-import javax.security.auth.Subject;
-import java.security.Principal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

src/java/winstone/realm/FileRealm.java → src/main/java/winstone/realm/FileRealm.java

@@ -6,7 +6,6 @@
  */
 package winstone.realm;
 
-import org.eclipse.jetty.security.AbstractLoginService;
 import org.eclipse.jetty.security.HashLoginService;
 import org.eclipse.jetty.security.UserStore;
 import org.w3c.dom.Document;
@@ -16,13 +15,11 @@
 import winstone.WinstoneResourceBundle;
 import winstone.cmdline.Option;
 
-import javax.security.auth.Subject;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
-import java.security.Principal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

src/java/winstone/tools/WinstoneControlOption.java → src/main/java/winstone/tools/WinstoneControlOption.java

@@ -1,8 +1,5 @@
 package winstone.tools;
 
-import winstone.cmdline.Option;
-import winstone.cmdline.Option.OInt;
-
 /**
  * @author Kohsuke Kawaguchi
  */

src/test/winstone/HttpConnectorFactoryTest.java → src/test/java/winstone/HttpConnectorFactoryTest.java

@@ -1,6 +1,7 @@
 package winstone;
 
 import org.junit.Test;
+import winstone.Launcher;
 
 import java.util.HashMap;
 import java.util.Map;

src/test/winstone/HttpsConnectorFactoryTest.java → src/test/java/winstone/HttpsConnectorFactoryTest.java

@@ -2,12 +2,11 @@
 
 import org.apache.commons.io.IOUtils;
 import org.junit.Test;
+import winstone.Launcher;
 
-import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLHandshakeException;
-import javax.net.ssl.SSLSession;
 import javax.net.ssl.X509TrustManager;
 import java.net.URL;
 import java.util.HashMap;

src/test/winstone/LauncherTest.java → src/test/java/winstone/LauncherTest.java

@@ -2,6 +2,7 @@
 
 import com.meterware.httpunit.WebResponse;
 import org.junit.Test;
+import winstone.Launcher;
 
 import java.util.HashMap;
 import java.util.Map;

src/test/winstone/testCase/load/LoadTest.java → src/test/java/winstone/testCase/load/LoadTest.java

@@ -11,6 +11,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.junit.Ignore;
 import winstone.Logger;
 import winstone.WinstoneResourceBundle;
 
@@ -27,6 +28,7 @@
  * @author <a href="mailto:[email protected]">Rick Knowles</a>
  * @version $Id: LoadTest.java,v 1.2 2006/02/28 07:32:49 rickknowles Exp $
  */
+@Ignore("Intended to be run manually")
 public class LoadTest {
     private String url;
     private boolean useKeepAlives;

src/testwebapp/WEB-INF/web.xml

@@ -37,7 +37,7 @@
 
 	<servlet>
 		<servlet-name>CountRequestsServlet</servlet-name>
-		<servlet-class>winstone.testApplication.servlets.CountRequestsServlet</servlet-class>    
+		<servlet-class>winstone.testApplication.servlets.CountRequestsServlet</servlet-class>
 		<init-param>
 			<param-name>offset</param-name>
 			<param-value>1000</param-value>
@@ -47,7 +47,7 @@
 
 	<servlet>
 		<servlet-name>UnavailableAtInitServlet</servlet-name>
-		<servlet-class>winstone.testApplication.servlets.UnavailableServlet</servlet-class>    
+		<servlet-class>winstone.testApplication.servlets.UnavailableServlet</servlet-class>
 		<init-param>
 			<param-name>errorTime</param-name>
 			<param-value>init</param-value>
@@ -56,7 +56,7 @@
 
 	<servlet>
 		<servlet-name>UnavailableAtGetServlet</servlet-name>
-		<servlet-class>winstone.testApplication.servlets.UnavailableServlet</servlet-class>    
+		<servlet-class>winstone.testApplication.servlets.UnavailableServlet</servlet-class>
 		<init-param>
 			<param-name>errorTime</param-name>
 			<param-value>get</param-value>