From 45a42ea8a34412182c2bc64ad9dabb773df35ef4 Mon Sep 17 00:00:00 2001
From: Erlend Hamnaberg <ngarthl@gmail.com>
Date: Fri, 6 Nov 2009 20:13:29 +0100
Subject: [PATCH] New structure

---
 common/common-image/pom.xml | 28 +++++++++++++++++++++
 common/common-io/pom.xml    | 18 ++++++++++++++
 common/common-lang/pom.xml  | 18 ++++++++++++++
 common/pom.xml              | 49 +++++++++++++++++++++++++++++++++++++
 parent-pom.xml => pom.xml   | 35 +++++++++++++++++++++++---
 5 files changed, 145 insertions(+), 3 deletions(-)
 create mode 100644 common/common-image/pom.xml
 create mode 100644 common/common-io/pom.xml
 create mode 100644 common/common-lang/pom.xml
 create mode 100644 common/pom.xml
 rename parent-pom.xml => pom.xml (77%)

diff --git a/common/common-image/pom.xml b/common/common-image/pom.xml
new file mode 100644
index 00000000..b09bcff8
--- /dev/null
+++ b/common/common-image/pom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<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>com.twelvemonkeys.common</groupId>
+        <artifactId>common</artifactId>
+        <version>2.3-SNAPSHOT</version>
+    </parent>
+    <artifactId>common-image</artifactId>
+    <packaging>jar</packaging>
+    <name>TwelveMonkeys :: Common :: Image</name>
+    <description>
+        The TwelveMonkeys Common Image support
+    </description>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>jmagick</groupId>
+            <artifactId>jmagick</artifactId>
+            <version>6.2.4</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/common/common-io/pom.xml b/common/common-io/pom.xml
new file mode 100644
index 00000000..5b8b2d53
--- /dev/null
+++ b/common/common-io/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<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>com.twelvemonkeys.common</groupId>
+        <artifactId>common</artifactId>
+        <version>2.3-SNAPSHOT</version>
+    </parent>
+    <artifactId>common-io</artifactId>
+    <packaging>jar</packaging>
+    <name>TwelveMonkeys :: Common :: IO</name>
+    <description>
+        The TwelveMonkeys IO support
+    </description>
+
+</project>
diff --git a/common/common-lang/pom.xml b/common/common-lang/pom.xml
new file mode 100644
index 00000000..36af4cf1
--- /dev/null
+++ b/common/common-lang/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<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>com.twelvemonkeys.common</groupId>
+        <artifactId>common</artifactId>
+        <version>2.3-SNAPSHOT</version>
+    </parent>
+    <artifactId>common-lang</artifactId>
+    <packaging>jar</packaging>
+    <name>TwelveMonkeys :: Common :: Language support</name>
+    <description>
+        The TwelveMonkeys Common Language support
+    </description>
+
+</project>
diff --git a/common/pom.xml b/common/pom.xml
new file mode 100644
index 00000000..d34aa0ff
--- /dev/null
+++ b/common/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<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>com.twelvemonkeys</groupId>
+        <artifactId>twelvemonkeys-parent</artifactId>
+        <version>2.3-SNAPSHOT</version>
+    </parent>
+    <groupId>com.twelvemonkeys.common</groupId>
+    <artifactId>common</artifactId>
+    <packaging>pom</packaging>
+    <name>TwelveMonkeys :: Common</name>
+    <description>
+        The TwelveMonkeys Common library. Contains common utility classes.
+    </description>
+
+    <modules>
+     <module>common-io</module>
+     <module>common-lang</module>
+     <module>common-image</module>
+    </modules>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>jmagick</groupId>
+            <artifactId>jmagick</artifactId>
+            <version>6.2.4</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit-dep</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>jmock</groupId>
+            <artifactId>jmock-cglib</artifactId>
+            <version>1.0.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/parent-pom.xml b/pom.xml
similarity index 77%
rename from parent-pom.xml
rename to pom.xml
index 57581f55..88ff2428 100755
--- a/parent-pom.xml
+++ b/pom.xml
@@ -5,9 +5,17 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.twelvemonkeys</groupId>
     <artifactId>twelvemonkeys-parent</artifactId>
-    <version>2.0</version>
+    <version>2.3-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>Twelvemonkeys</name>
+    <name>Twelvemonkeys</name>
+
+    <modules>
+        <module>common</module>
+        <module>twelvemonkeys-core</module>
+        <!--<module>twelvemonkeys-servlet</module>
+        <module>twelvemonkeys-imageio</module>
+        <module>twelvemonkeys-sandbox</module>-->
+    </modules>
 
     <developers>
         <developer>
@@ -34,7 +42,28 @@
 
     <build>
         <pluginManagement>
-            <plugins>
+            <plugins>
+              <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Implementation-Title>${project.name}</Implementation-Title>
+                            <Implementation-Vendor>TwelveMonkeys</Implementation-Vendor>
+                            <Implementation-Version>${project.version}</Implementation-Version>
+                            <Implementation-URL>http://github.com/haraldk/TwelveMonkeys</Implementation-URL>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                  <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
                     <inherited>true</inherited>