From 9f3a7351fdcac40740155e684c0c5ab12face821 Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Wed, 4 Sep 2013 16:23:38 +0200
Subject: [PATCH] Reorganized project structure to support multi modules.

---
 fcgi-core/pom.xml                             | 40 +++++++++++++
 .../java/org/eclipse/jetty/fcgi/FCGI.java     |  0
 .../jetty/fcgi/generator/ClientGenerator.java |  0
 .../jetty/fcgi/generator/Generator.java       |  0
 .../jetty/fcgi/generator/ServerGenerator.java |  0
 .../parser/BeginRequestContentParser.java     |  0
 .../jetty/fcgi/parser/ClientParser.java       |  0
 .../jetty/fcgi/parser/ContentParser.java      |  0
 .../fcgi/parser/EndRequestContentParser.java  |  0
 .../jetty/fcgi/parser/HeaderParser.java       |  0
 .../fcgi/parser/ParamsContentParser.java      |  0
 .../org/eclipse/jetty/fcgi/parser/Parser.java |  0
 .../fcgi/parser/ResponseContentParser.java    |  0
 .../jetty/fcgi/parser/ServerParser.java       |  0
 .../fcgi/parser/StreamContentParser.java      |  0
 .../fcgi/generator/ClientGeneratorTest.java   |  0
 .../jetty/fcgi/parser/ClientParserTest.java   |  0
 pom.xml                                       | 56 +++++++------------
 18 files changed, 59 insertions(+), 37 deletions(-)
 create mode 100644 fcgi-core/pom.xml
 rename {src => fcgi-core/src}/main/java/org/eclipse/jetty/fcgi/FCGI.java (100%)
 rename {src => fcgi-core/src}/main/java/org/eclipse/jetty/fcgi/generator/ClientGenerator.java (100%)
 rename {src => fcgi-core/src}/main/java/org/eclipse/jetty/fcgi/generator/Generator.java (100%)
 rename {src => fcgi-core/src}/main/java/org/eclipse/jetty/fcgi/generator/ServerGenerator.java (100%)
 rename {src => fcgi-core/src}/main/java/org/eclipse/jetty/fcgi/parser/BeginRequestContentParser.java (100%)
 rename {src => fcgi-core/src}/main/java/org/eclipse/jetty/fcgi/parser/ClientParser.java (100%)
 rename {src => fcgi-core/src}/main/java/org/eclipse/jetty/fcgi/parser/ContentParser.java (100%)
 rename {src => fcgi-core/src}/main/java/org/eclipse/jetty/fcgi/parser/EndRequestContentParser.java (100%)
 rename {src => fcgi-core/src}/main/java/org/eclipse/jetty/fcgi/parser/HeaderParser.java (100%)
 rename {src => fcgi-core/src}/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java (100%)
 rename {src => fcgi-core/src}/main/java/org/eclipse/jetty/fcgi/parser/Parser.java (100%)
 rename {src => fcgi-core/src}/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java (100%)
 rename {src => fcgi-core/src}/main/java/org/eclipse/jetty/fcgi/parser/ServerParser.java (100%)
 rename {src => fcgi-core/src}/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java (100%)
 rename {src => fcgi-core/src}/test/java/org/eclipse/jetty/fcgi/generator/ClientGeneratorTest.java (100%)
 rename {src => fcgi-core/src}/test/java/org/eclipse/jetty/fcgi/parser/ClientParserTest.java (100%)

diff --git a/fcgi-core/pom.xml b/fcgi-core/pom.xml
new file mode 100644
index 00000000000..cd17ca6e88b
--- /dev/null
+++ b/fcgi-core/pom.xml
@@ -0,0 +1,40 @@
+<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">
+    <parent>
+        <groupId>org.eclipse.jetty.fcgi</groupId>
+        <artifactId>fcgi-parent</artifactId>
+        <version>9.1.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>fcgi-core</artifactId>
+    <name>Jetty :: FastCGI :: Core</name>
+
+    <properties>
+        <bundle-symbolic-name>${project.groupId}.core</bundle-symbolic-name>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-util</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-io</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-http</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/src/main/java/org/eclipse/jetty/fcgi/FCGI.java b/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/FCGI.java
similarity index 100%
rename from src/main/java/org/eclipse/jetty/fcgi/FCGI.java
rename to fcgi-core/src/main/java/org/eclipse/jetty/fcgi/FCGI.java
diff --git a/src/main/java/org/eclipse/jetty/fcgi/generator/ClientGenerator.java b/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/generator/ClientGenerator.java
similarity index 100%
rename from src/main/java/org/eclipse/jetty/fcgi/generator/ClientGenerator.java
rename to fcgi-core/src/main/java/org/eclipse/jetty/fcgi/generator/ClientGenerator.java
diff --git a/src/main/java/org/eclipse/jetty/fcgi/generator/Generator.java b/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/generator/Generator.java
similarity index 100%
rename from src/main/java/org/eclipse/jetty/fcgi/generator/Generator.java
rename to fcgi-core/src/main/java/org/eclipse/jetty/fcgi/generator/Generator.java
diff --git a/src/main/java/org/eclipse/jetty/fcgi/generator/ServerGenerator.java b/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/generator/ServerGenerator.java
similarity index 100%
rename from src/main/java/org/eclipse/jetty/fcgi/generator/ServerGenerator.java
rename to fcgi-core/src/main/java/org/eclipse/jetty/fcgi/generator/ServerGenerator.java
diff --git a/src/main/java/org/eclipse/jetty/fcgi/parser/BeginRequestContentParser.java b/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/BeginRequestContentParser.java
similarity index 100%
rename from src/main/java/org/eclipse/jetty/fcgi/parser/BeginRequestContentParser.java
rename to fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/BeginRequestContentParser.java
diff --git a/src/main/java/org/eclipse/jetty/fcgi/parser/ClientParser.java b/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/ClientParser.java
similarity index 100%
rename from src/main/java/org/eclipse/jetty/fcgi/parser/ClientParser.java
rename to fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/ClientParser.java
diff --git a/src/main/java/org/eclipse/jetty/fcgi/parser/ContentParser.java b/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/ContentParser.java
similarity index 100%
rename from src/main/java/org/eclipse/jetty/fcgi/parser/ContentParser.java
rename to fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/ContentParser.java
diff --git a/src/main/java/org/eclipse/jetty/fcgi/parser/EndRequestContentParser.java b/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/EndRequestContentParser.java
similarity index 100%
rename from src/main/java/org/eclipse/jetty/fcgi/parser/EndRequestContentParser.java
rename to fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/EndRequestContentParser.java
diff --git a/src/main/java/org/eclipse/jetty/fcgi/parser/HeaderParser.java b/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/HeaderParser.java
similarity index 100%
rename from src/main/java/org/eclipse/jetty/fcgi/parser/HeaderParser.java
rename to fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/HeaderParser.java
diff --git a/src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java b/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java
similarity index 100%
rename from src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java
rename to fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java
diff --git a/src/main/java/org/eclipse/jetty/fcgi/parser/Parser.java b/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/Parser.java
similarity index 100%
rename from src/main/java/org/eclipse/jetty/fcgi/parser/Parser.java
rename to fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/Parser.java
diff --git a/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java b/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java
similarity index 100%
rename from src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java
rename to fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java
diff --git a/src/main/java/org/eclipse/jetty/fcgi/parser/ServerParser.java b/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/ServerParser.java
similarity index 100%
rename from src/main/java/org/eclipse/jetty/fcgi/parser/ServerParser.java
rename to fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/ServerParser.java
diff --git a/src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java b/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java
similarity index 100%
rename from src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java
rename to fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java
diff --git a/src/test/java/org/eclipse/jetty/fcgi/generator/ClientGeneratorTest.java b/fcgi-core/src/test/java/org/eclipse/jetty/fcgi/generator/ClientGeneratorTest.java
similarity index 100%
rename from src/test/java/org/eclipse/jetty/fcgi/generator/ClientGeneratorTest.java
rename to fcgi-core/src/test/java/org/eclipse/jetty/fcgi/generator/ClientGeneratorTest.java
diff --git a/src/test/java/org/eclipse/jetty/fcgi/parser/ClientParserTest.java b/fcgi-core/src/test/java/org/eclipse/jetty/fcgi/parser/ClientParserTest.java
similarity index 100%
rename from src/test/java/org/eclipse/jetty/fcgi/parser/ClientParserTest.java
rename to fcgi-core/src/test/java/org/eclipse/jetty/fcgi/parser/ClientParserTest.java
diff --git a/pom.xml b/pom.xml
index 9d6f12fdee1..2ee5ba465ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,12 +7,14 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>jetty-fcgi</artifactId>
+    <groupId>org.eclipse.jetty.fcgi</groupId>
+    <artifactId>fcgi-parent</artifactId>
+    <packaging>pom</packaging>
     <name>Jetty :: FastCGI</name>
 
-    <properties>
-        <bundle-symbolic-name>${project.groupId}.fcgi</bundle-symbolic-name>
-    </properties>
+    <modules>
+        <module>fcgi-core</module>
+    </modules>
 
     <build>
         <plugins>
@@ -46,13 +48,14 @@
                         </goals>
                         <configuration>
                             <instructions>
-                                <Import-Package>javax.net.*,*</Import-Package>
+                                <Export-Package>${bundle-symbolic-name}.*;version="9.1"</Export-Package>
+                                <Import-Package>org.eclipse.jetty.*;version="[9.0,10.0)",*</Import-Package>
+                                <_nouses>true</_nouses>
                             </instructions>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-            <!-- Required for OSGI -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -62,39 +65,18 @@
                     </archive>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <configuration>
-                    <onlyAnalyze>org.eclipse.jetty.fcgi.*</onlyAnalyze>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-util</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-io</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-http</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.11</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
 </project>