Index: /FCKeditor.Java/branches/2.4/build.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/build.xml	(revision 1873)
+++ /FCKeditor.Java/branches/2.4/build.xml	(revision 1874)
@@ -34,8 +34,4 @@
 	</target>
 
-	<target name="deploy-tld" description="Deploys the taglib descriptor into the webapp">
-		<copy todir="src/main/webapp/WEB-INF/tld" file="src/main/resources/META-INF/FCKeditor.tld" />
-	</target>
-
 	<target name="rewrite-links" description="rewrites plain links in real links">
 
Index: /FCKeditor.Java/branches/2.4/fckeditor-java-demo/pom.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/fckeditor-java-demo/pom.xml	(revision 1874)
+++ /FCKeditor.Java/branches/2.4/fckeditor-java-demo/pom.xml	(revision 1874)
@@ -0,0 +1,116 @@
+<?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"
+>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>fckeditor-java-demo</artifactId>
+	<packaging>war</packaging>
+	<dependencies>
+		<dependency>
+			<groupId>net.fckeditor</groupId>
+			<artifactId>fckeditor-java</artifactId>
+			<version>${parent.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<version>1.5.0</version>
+			<scope>runtime</scope>
+		</dependency>
+	</dependencies>
+	<parent>
+		<groupId>net.fckeditor</groupId>
+		<artifactId>fckeditor-java-parent</artifactId>
+		<version>2.4-SNAPSHOT</version>
+	</parent>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.mortbay.jetty</groupId>
+				<artifactId>maven-jetty-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<artifactId>maven-war-plugin</artifactId>
+				<configuration>
+					<webResources>
+						<resource>
+							<targetPath>fckeditor</targetPath>
+							<!-- FIXME hier einen relativen Pfad setzen -->
+							<directory>D:\workspace\fckeditor</directory>
+							<filtering>false</filtering>
+							<includes>
+								<include>_samples/_plugins/</include>
+								<include>editor/</include>
+								<include>fckconfig.js</include>
+								<include>*.xml</include>
+							</includes>
+							<excludes>
+								<exclude>
+									editor/filemanager/connectors/
+								</exclude>
+							</excludes>
+						</resource>
+						<resource>
+							<directory>..</directory>
+							<filtering>false</filtering>
+							<includes>
+								<include>LICENSE.txt</include>
+							</includes>
+						</resource>
+					</webResources>
+					<archive>
+						<addMavenDescriptor>false</addMavenDescriptor>
+						<manifest>
+							<addDefaultImplementationEntries>
+								true
+							</addDefaultImplementationEntries>
+						</manifest>
+						<manifestEntries>
+						<!-- FIXME er zieht die URL nicht raus -->
+							<Implementation-URL>
+								${fckeditor-java.parent.url}
+							</Implementation-URL>
+							<Built-By>${organization.name}</Built-By>
+						</manifestEntries>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-clean-plugin</artifactId>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>src/main/webapp</directory>
+							<includes>
+								<include>fckeditor/</include>
+								<include>userfiles/</include>
+							</includes>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	
+	<reporting>
+		<plugins>
+			<plugin>
+				<artifactId>
+					maven-project-info-reports-plugin
+				</artifactId>
+				<reportSets>
+					<reportSet>
+						<reports>
+							<report>dependencies</report>
+							<report>summary</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
+		</plugins>
+	</reporting>
+	<name>FCKeditor - Java Integration Demo Webapp</name>
+</project>
Index: /FCKeditor.Java/branches/2.4/fckeditor-java/pom.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/fckeditor-java/pom.xml	(revision 1874)
+++ /FCKeditor.Java/branches/2.4/fckeditor-java/pom.xml	(revision 1874)
@@ -0,0 +1,146 @@
+<?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"
+>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>fckeditor-java</artifactId>
+	<packaging>jar</packaging>
+	<dependencies>
+		<dependency>
+		<groupId>javax.servlet</groupId>
+		<artifactId>servlet-api</artifactId>
+		<version>2.4</version>
+		<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet.jsp</groupId>
+			<artifactId>jsp-api</artifactId>
+			<version>2.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.4</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-nop</artifactId>
+			<version>1.5.0</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<parent>
+		<groupId>net.fckeditor</groupId>
+		<artifactId>fckeditor-java-parent</artifactId>
+		<version>2.4-SNAPSHOT</version>
+	</parent>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>site</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<property name="ant.regexp.regexpimpl"
+									value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp"
+								/>
+
+								<echo
+									message="Rewriting links in tag reference"
+								/>
+								<replaceregexp byline="true" flags="m"
+									file="target/site/tagreference.html"
+								>
+									<regexp
+										pattern="&amp;lt;a href=&amp;quot;(\p{Graph}+)&amp;quot;\s*&amp;gt;(\p{Graph}+)&amp;lt;/a&amp;gt;"
+									/>
+									<substitution
+										expression="&lt;a href=&quot;\1&quot;&gt;\2&lt;/a&gt;"
+									/>
+								</replaceregexp>
+							</tasks>
+						</configuration>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>ant</groupId>
+						<artifactId>ant-nodeps</artifactId>
+						<version>1.6.5</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+	</build>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>net.sourceforge.maven-taglib</groupId>
+				<artifactId>maven-taglib-plugin</artifactId>
+				<version>2.3.1</version>
+			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.4</version>
+			</plugin>
+			<plugin>
+				<artifactId>maven-surefire-report-plugin</artifactId>
+				<version>2.4.2</version>
+			</plugin>
+			<plugin>
+				<artifactId>maven-jxr-plugin</artifactId>
+				<version>2.1</version>
+			</plugin>
+			<plugin>
+				<artifactId>maven-pmd-plugin</artifactId>
+				<version>2.3</version>
+				<configuration>
+					<targetJdk>1.5</targetJdk>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>cobertura-maven-plugin</artifactId>
+				<version>2.2</version>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>taglist-maven-plugin</artifactId>
+				<version>2.1</version>
+				<configuration>
+					<tags>
+						<tag>TODO</tag>
+						<tag>FIXME</tag>
+					</tags>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>
+					maven-project-info-reports-plugin
+				</artifactId>
+				<version>2.0.1</version>
+				<reportSets>
+					<reportSet>
+						<reports>
+							<report>dependencies</report>
+							<report>summary</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
+		</plugins>
+	</reporting>
+	
+	<name>FCKeditor - Java Integration</name>
+</project>
Index: /FCKeditor.Java/branches/2.4/pom.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/pom.xml	(revision 1873)
+++ /FCKeditor.Java/branches/2.4/pom.xml	(revision 1874)
@@ -7,7 +7,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.fckeditor</groupId>
-	<artifactId>fckeditor-java</artifactId>
+	<artifactId>fckeditor-java-parent</artifactId>
 	<version>2.4-SNAPSHOT</version>
-	<packaging>jar</packaging>
+	<packaging>pom</packaging>
 	<dependencies>
 		<dependency>
@@ -22,60 +22,18 @@
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.4</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet.jsp</groupId>
-			<artifactId>jsp-api</artifactId>
-			<version>2.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.4</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 			<version>1.5.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>nlog4j</artifactId>
-			<version>1.2.25</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-nop</artifactId>
-			<version>1.5.0</version>
-			<scope>runtime</scope>
-			<optional>true</optional>
-			<exclusions>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-api</artifactId>
-				</exclusion>
-			</exclusions>		
-		</dependency>
 	</dependencies>
+	<modules>
+		<module>fckeditor-java</module>
+		<module>fckeditor-java-demo</module>
+	</modules>
 	<build>
 		<defaultGoal>package</defaultGoal>
 		<plugins>
 			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
-				<version>6.1.7</version>
-				<configuration>
-					<useTestClasspath>true</useTestClasspath>
-				</configuration>
-			</plugin>
-			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.0.2</version>
 				<configuration>
 					<source>1.5</source>
@@ -98,5 +56,4 @@
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.2-beta-2</version>
 				<configuration>
 					<descriptors>
@@ -111,117 +68,5 @@
 			</plugin>
 			<plugin>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>2.1-alpha-1</version>
-				<configuration>
-					<webResources>
-						<resource>
-							<targetPath>fckeditor</targetPath>
-							<directory>../fckeditor</directory>
-							<filtering>false</filtering>
-							<includes>
-								<include>_samples/_plugins/</include>
-								<include>editor/</include>
-								<include>fckconfig.js</include>
-								<include>*.xml</include>
-							</includes>
-							<excludes>
-								<exclude>
-									editor/filemanager/connectors/
-								</exclude>
-							</excludes>
-						</resource>
-						<resource>
-							<targetPath>WEB-INF/classes</targetPath>
-							<directory>src/test/resources</directory>
-							<filtering>false</filtering>
-							<includes>
-								<include>fckeditor.properties</include>
-							</includes>
-						</resource>
-						<resource>
-							<directory>${basedir}</directory>
-							<filtering>false</filtering>
-							<includes>
-								<include>LICENSE.txt</include>
-							</includes>
-						</resource>
-					</webResources>
-					<warSourceExcludes>WEB-INF/tld/</warSourceExcludes>
-					<archive>
-						<addMavenDescriptor>false</addMavenDescriptor>
-						<manifest>
-							<addDefaultImplementationEntries>
-								true
-							</addDefaultImplementationEntries>
-						</manifest>
-						<manifestEntries>
-							<Implementation-URL>
-								${pom.url}
-							</Implementation-URL>
-							<Built-By>${organization.name}</Built-By>
-						</manifestEntries>
-					</archive>
-					<archiveClasses>true</archiveClasses>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-clean-plugin</artifactId>
-				<version>2.2</version>
-				<configuration>
-					<filesets>
-						<fileset>
-							<directory>src/main/webapp</directory>
-							<includes>
-								<include>fckeditor/</include>
-								<include>userfiles/</include>
-								<include>WEB-INF/tld/</include>
-							</includes>
-						</fileset>
-					</filesets>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.1</version>
-				<executions>
-					<execution>
-						<phase>site</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<tasks>
-								<property name="ant.regexp.regexpimpl"
-									value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp"
-								/>
-
-								<echo
-									message="Rewriting links in tag reference"
-								/>
-								<replaceregexp byline="true" flags="m"
-									file="target/site/tagreference.html"
-								>
-									<regexp
-										pattern="&amp;lt;a href=&amp;quot;(\p{Graph}+)&amp;quot;\s*&amp;gt;(\p{Graph}+)&amp;lt;/a&amp;gt;"
-									/>
-									<substitution
-										expression="&lt;a href=&quot;\1&quot;&gt;\2&lt;/a&gt;"
-									/>
-								</replaceregexp>
-							</tasks>
-						</configuration>
-					</execution>
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>ant</groupId>
-						<artifactId>ant-nodeps</artifactId>
-						<version>1.6.5</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.4</version>
 				<executions>
 					<execution>
@@ -235,5 +80,4 @@
 			<plugin>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.2</version>
 				<configuration>
 					<archive>
@@ -244,4 +88,5 @@
 						</manifest>
 						<manifestEntries>
+							<!-- FIXME jede jar soll die main URL haben und keine unterURL -->
 							<Implementation-URL>
 								${pom.url}
@@ -252,16 +97,4 @@
 				</configuration>
 			</plugin>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.2</version>
-			</plugin>
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.4.2</version>
-			</plugin>
-			<plugin>
-				<artifactId>maven-site-plugin</artifactId>
-				<version>2.0-beta-6</version>
-			</plugin>
 		</plugins>
 	</build>
@@ -270,48 +103,7 @@
 		<plugins>
 			<plugin>
-				<groupId>net.sourceforge.maven-taglib</groupId>
-				<artifactId>maven-taglib-plugin</artifactId>
-				<version>2.3.1</version>
-			</plugin>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.4</version>
-			</plugin>
-			<plugin>
-				<artifactId>maven-surefire-report-plugin</artifactId>
-				<version>2.4.2</version>
-			</plugin>
-			<plugin>
-				<artifactId>maven-jxr-plugin</artifactId>
-				<version>2.1</version>
-			</plugin>
-			<plugin>
-				<artifactId>maven-pmd-plugin</artifactId>
-				<version>2.3</version>
-				<configuration>
-					<targetJdk>1.5</targetJdk>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.2</version>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>taglist-maven-plugin</artifactId>
-				<version>2.1</version>
-				<configuration>
-					<tags>
-						<tag>TODO</tag>
-						<tag>FIXME</tag>
-					</tags>
-				</configuration>
-			</plugin>
-			<plugin>
 				<artifactId>
 					maven-project-info-reports-plugin
 				</artifactId>
-				<version>2.0.1</version>
 				<reportSets>
 					<reportSet>
@@ -330,5 +122,4 @@
 			<plugin>
 				<artifactId>maven-changes-plugin</artifactId>
-				<version>2.0-beta-2</version>
 				<configuration>
 					<issueLinkTemplate>
@@ -347,5 +138,5 @@
 	</reporting>
 
-	<name>FCKeditor - Java Integration</name>
+	<name>FCKeditor - Java Integration Super POM</name>
 	<description>
 		This Java library enables the FCKeditor to be used in a