From d6e5d827f694726eac784d68b1c00bedc9470742 Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Tue, 6 May 2014 19:44:03 +0200
Subject: [PATCH] Removed obsolete FastCGI modules.

---
 jetty-fcgi/fcgi-distribution/pom.xml          | 70 -------------------
 .../src/main/assembly/distribution.xml        | 31 --------
 .../main/config/webapps/wordpress-example.xml | 68 ------------------
 jetty-fcgi/fcgi-http-client-transport/pom.xml | 43 ------------
 .../test/resources/jetty-logging.properties   |  3 -
 jetty-fcgi/fcgi-proxy/pom.xml                 | 55 ---------------
 jetty-fcgi/pom.xml                            |  3 -
 7 files changed, 273 deletions(-)
 delete mode 100644 jetty-fcgi/fcgi-distribution/pom.xml
 delete mode 100644 jetty-fcgi/fcgi-distribution/src/main/assembly/distribution.xml
 delete mode 100644 jetty-fcgi/fcgi-distribution/src/main/config/webapps/wordpress-example.xml
 delete mode 100644 jetty-fcgi/fcgi-http-client-transport/pom.xml
 delete mode 100644 jetty-fcgi/fcgi-http-client-transport/src/test/resources/jetty-logging.properties
 delete mode 100644 jetty-fcgi/fcgi-proxy/pom.xml

diff --git a/jetty-fcgi/fcgi-distribution/pom.xml b/jetty-fcgi/fcgi-distribution/pom.xml
deleted file mode 100644
index 81d03d9e236..00000000000
--- a/jetty-fcgi/fcgi-distribution/pom.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>fcgi-parent</artifactId>
-        <groupId>org.eclipse.jetty.fcgi</groupId>
-        <version>9.2.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>fcgi-distribution</artifactId>
-    <packaging>pom</packaging>
-    <name>Jetty :: FastCGI :: Distribution</name>
-
-    <properties>
-        <distribution-directory>${project.build.directory}/distribution</distribution-directory>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-jars</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <includeGroupIds>org.eclipse.jetty.fcgi</includeGroupIds>
-                            <excludeArtifactIds>fcgi-server</excludeArtifactIds>
-                            <includeTypes>jar</includeTypes>
-                            <outputDirectory>${distribution-directory}/lib/fcgi</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>assemble</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>assembly</goal>
-                        </goals>
-                        <configuration>
-                            <finalName>jetty-fcgi-${project.version}</finalName>
-                            <descriptors>
-                                <descriptor>src/main/assembly/distribution.xml</descriptor>
-                            </descriptors>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse.jetty.fcgi</groupId>
-            <artifactId>fcgi-proxy</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/jetty-fcgi/fcgi-distribution/src/main/assembly/distribution.xml b/jetty-fcgi/fcgi-distribution/src/main/assembly/distribution.xml
deleted file mode 100644
index df1f093682d..00000000000
--- a/jetty-fcgi/fcgi-distribution/src/main/assembly/distribution.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-
-    <id>distribution</id>
-
-    <formats>
-        <format>tar.gz</format>
-    </formats>
-
-    <includeBaseDirectory>false</includeBaseDirectory>
-
-    <fileSets>
-        <fileSet>
-            <directory>${project.basedir}/src/main/config/modules</directory>
-            <outputDirectory>/modules</outputDirectory>
-            <includes>
-                <include>*.mod</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>${distribution-directory}</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>lib/**</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-
-</assembly>
diff --git a/jetty-fcgi/fcgi-distribution/src/main/config/webapps/wordpress-example.xml b/jetty-fcgi/fcgi-distribution/src/main/config/webapps/wordpress-example.xml
deleted file mode 100644
index 9ec42697473..00000000000
--- a/jetty-fcgi/fcgi-distribution/src/main/config/webapps/wordpress-example.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0"  encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
-<Configure class="org.eclipse.jetty.servlet.ServletContextHandler">
-
-    <New id="root" class="java.lang.String">
-        <Arg>/var/www/wordpress-3.7.1</Arg>
-    </New>
-
-    <Set name="contextPath">/wp</Set>
-    <Set name="resourceBase"><Ref refid="root" /></Set>
-    <Set name="welcomeFiles">
-        <Array type="String"><Item>index.php</Item></Array>
-    </Set>
-
-    <Call name="addFilter">
-        <Arg>org.eclipse.jetty.fcgi.proxy.TryFilesFilter</Arg>
-        <Arg>/*</Arg>
-        <Arg>
-            <Call name="of" class="java.util.EnumSet">
-                <Arg><Get name="REQUEST" class="javax.servlet.DispatcherType" /></Arg>
-            </Call>
-        </Arg>
-        <Call name="setInitParameter">
-            <Arg>files</Arg>
-            <Arg>$path /index.php?p=$path</Arg>
-        </Call>
-    </Call>
-
-    <Call name="addServlet">
-        <Arg>
-            <New class="org.eclipse.jetty.servlet.ServletHolder">
-                <Arg>default</Arg>
-                <Arg>
-                    <Call name="forName" class="java.lang.Class">
-                        <Arg>org.eclipse.jetty.servlet.DefaultServlet</Arg>
-                    </Call>
-                </Arg>
-                <Call name="setInitParameter">
-                    <Arg>dirAllowed</Arg>
-                    <Arg>false</Arg>
-                </Call>
-            </New>
-        </Arg>
-        <Arg>/</Arg>
-    </Call>
-
-    <Call name="addServlet">
-        <Arg>org.eclipse.jetty.fcgi.proxy.FastCGIProxyServlet</Arg>
-        <Arg>*.php</Arg>
-        <Call name="setInitParameter">
-            <Arg>proxyTo</Arg>
-            <Arg>http://localhost:9000</Arg>
-        </Call>
-        <Call name="setInitParameter">
-            <Arg>prefix</Arg>
-            <Arg>/</Arg>
-        </Call>
-        <Call name="setInitParameter">
-            <Arg>scriptRoot</Arg>
-            <Arg><Ref refid="root" /></Arg>
-        </Call>
-        <Call name="setInitParameter">
-            <Arg>scriptPattern</Arg>
-            <Arg>(.+?\\.php)</Arg>
-        </Call>
-    </Call>
-
-</Configure>
diff --git a/jetty-fcgi/fcgi-http-client-transport/pom.xml b/jetty-fcgi/fcgi-http-client-transport/pom.xml
deleted file mode 100644
index d911c12528c..00000000000
--- a/jetty-fcgi/fcgi-http-client-transport/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>org.eclipse.jetty.fcgi</groupId>
-        <artifactId>fcgi-parent</artifactId>
-        <version>9.2.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>fcgi-http-client-transport</artifactId>
-    <name>Jetty :: FastCGI :: HTTP Client Transport</name>
-
-    <properties>
-        <bundle-symbolic-name>${project.groupId}.client.http</bundle-symbolic-name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse.jetty.fcgi</groupId>
-            <artifactId>fcgi-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-client</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.jetty.fcgi</groupId>
-            <artifactId>fcgi-server</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>jetty-test-helper</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/jetty-fcgi/fcgi-http-client-transport/src/test/resources/jetty-logging.properties b/jetty-fcgi/fcgi-http-client-transport/src/test/resources/jetty-logging.properties
deleted file mode 100644
index b8df62d071d..00000000000
--- a/jetty-fcgi/fcgi-http-client-transport/src/test/resources/jetty-logging.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
-#org.eclipse.jetty.client.LEVEL=DEBUG
-#org.eclipse.jetty.fcgi.LEVEL=DEBUG
diff --git a/jetty-fcgi/fcgi-proxy/pom.xml b/jetty-fcgi/fcgi-proxy/pom.xml
deleted file mode 100644
index 149d189df73..00000000000
--- a/jetty-fcgi/fcgi-proxy/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>fcgi-parent</artifactId>
-        <groupId>org.eclipse.jetty.fcgi</groupId>
-        <version>9.2.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>fcgi-proxy</artifactId>
-    <name>Jetty :: FastCGI :: Proxy</name>
-
-    <properties>
-        <bundle-symbolic-name>${project.groupId}.proxy</bundle-symbolic-name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty.fcgi</groupId>
-            <artifactId>fcgi-http-client-transport</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-proxy</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-server</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </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>
diff --git a/jetty-fcgi/pom.xml b/jetty-fcgi/pom.xml
index d309fec8a21..ff2f37caad5 100644
--- a/jetty-fcgi/pom.xml
+++ b/jetty-fcgi/pom.xml
@@ -14,10 +14,7 @@
 
     <modules>
         <module>fcgi-client</module>
-        <!--<module>fcgi-http-client-transport</module>-->
         <module>fcgi-server</module>
-        <!--<module>fcgi-proxy</module>-->
-        <!--<module>fcgi-distribution</module>-->
     </modules>
 
     <dependencies>