Refactored FastCGI module into just two modules, client (for usage of

a standalone FCGI client) and server.

jetty-fcgi/fcgi-client/pom.xml

@@ -9,11 +9,11 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>fcgi-core</artifactId>
+    <artifactId>fcgi-client</artifactId>
-    <name>Jetty :: FastCGI :: Core</name>
+    <name>Jetty :: FastCGI :: Client</name>
 
     <properties>
-        <bundle-symbolic-name>${project.groupId}.core</bundle-symbolic-name>
+        <bundle-symbolic-name>${project.groupId}.client</bundle-symbolic-name>
     </properties>
 
     <dependencies>
@@ -32,6 +32,11 @@
             <artifactId>jetty-http</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-client</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 
 </project>

jetty-fcgi/fcgi-server/pom.xml

@@ -17,9 +17,18 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.jetty.fcgi</groupId>
-            <artifactId>fcgi-core</artifactId>
+            <artifactId>fcgi-client</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-proxy</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -27,6 +36,19 @@
             <artifactId>jetty-server</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlet</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty.spdy</groupId>
+            <artifactId>spdy-http-server</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/proxy/FastCGIProxyServlet.java

@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.fcgi.proxy;
+package org.eclipse.jetty.fcgi.server.proxy;
 
 import java.net.URI;
 import java.util.regex.Matcher;

jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/proxy/TryFilesFilter.java

@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.fcgi.proxy;
+package org.eclipse.jetty.fcgi.server.proxy;
 
 import java.io.IOException;
 import java.net.URISyntaxException;

jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/AbstractHttpClientServerTest.java

@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.fcgi.client.http;
+package org.eclipse.jetty.fcgi.server;
 
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -25,7 +25,8 @@ import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.HttpDestination;
 import org.eclipse.jetty.client.LeakTrackingConnectionPool;
 import org.eclipse.jetty.client.Origin;
-import org.eclipse.jetty.fcgi.server.ServerFCGIConnectionFactory;
+import org.eclipse.jetty.fcgi.client.http.HttpClientTransportOverFCGI;
+import org.eclipse.jetty.fcgi.client.http.HttpDestinationOverFCGI;
 import org.eclipse.jetty.http.HttpScheme;
 import org.eclipse.jetty.io.ArrayByteBufferPool;
 import org.eclipse.jetty.io.LeakTrackingByteBufferPool;

jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/EmptyServerHandler.java

@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.fcgi.client.http;
+package org.eclipse.jetty.fcgi.server;
 
 import java.io.IOException;
 import javax.servlet.ServletException;

jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/ExternalFastCGIServerTest.java

@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.fcgi.client.http;
+package org.eclipse.jetty.fcgi.server;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.api.ContentResponse;
+import org.eclipse.jetty.fcgi.client.http.HttpClientTransportOverFCGI;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;

jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java

@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.fcgi.client.http;
+package org.eclipse.jetty.fcgi.server;
 
 import java.io.EOFException;
 import java.io.IOException;

jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/DrupalSPDYFastCGIProxyServer.java

@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.fcgi.proxy;
+package org.eclipse.jetty.fcgi.server.proxy;
 
 import java.util.HashMap;
 import java.util.Map;

jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/WordPressSPDYFastCGIProxyServer.java

@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.fcgi.proxy;
+package org.eclipse.jetty.fcgi.server.proxy;
 
 import java.util.EnumSet;
 import java.util.HashMap;

jetty-fcgi/pom.xml

@@ -15,11 +15,11 @@
     <name>Jetty :: FastCGI :: Parent</name>
 
     <modules>
-        <module>fcgi-core</module>
+        <module>fcgi-client</module>
-        <module>fcgi-http-client-transport</module>
+        <!--<module>fcgi-http-client-transport</module>-->
         <module>fcgi-server</module>
-        <module>fcgi-proxy</module>
+        <!--<module>fcgi-proxy</module>-->
-        <module>fcgi-distribution</module>
+        <!--<module>fcgi-distribution</module>-->
     </modules>
 
     <dependencies>