Index: /FCKeditor.Java/branches/2.4/fckeditor-java-demo/pom.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/fckeditor-java-demo/pom.xml	(revision 1888)
+++ /FCKeditor.Java/branches/2.4/fckeditor-java-demo/pom.xml	(revision 1889)
@@ -69,5 +69,4 @@
 						</manifest>
 						<manifestEntries>
-						<!-- FIXME er zieht die URL nicht raus -->
 							<Implementation-URL>
 								${project.url}
@@ -113,5 +112,5 @@
 	</reporting>
 	<name>FCKeditor.Java Integration Demo Webapp</name>
-	<description>Add a demo description</description>
-	<url>${parent.project.url}</url>
+	<!-- FIXME we need some appropriate description here deriving from the parent -->
+	<description>Add demo description</description>
 </project>
Index: Keditor.Java/branches/2.4/fckeditor-java-demo/src/site/site.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/site/site.xml	(revision 1888)
+++ 	(revision )
@@ -1,77 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-
-	<publishDate position="left" format="yyyy-MM-dd" />
-	<version position="left" />
-	
-	<bannerLeft>
-		<name>fckeditor</name>
-		<src>../images/fckeditor-logo.gif</src>
-		<href>http://www.fckeditor.net/fckeditor-java</href>
-	</bannerLeft>
-	
-	<body>
-		<head>
-			<link rel="shortcut icon" href="../images/favicon.ico"
-				type="image/x-icon"
-			/>
-		</head>
-		<menu name="Introduction">
-			<item name="About" href="../index.html" />
-			<item name="What's new" href="../whatsnew.html" />
-			<item name="Demo" href="../demo.html" />
-			<item name="Installation" href="../installation.html" />
-		</menu>
-		<menu name="Integration">
-			<item name="Overview" href="../integration/overview.html" />
-			<item name="Tag library" href="../integration/taglibrary.html" />
-			<item name="Connector" href="../integration/connector.html" />
-		</menu>
-		<menu name="Reference">
-			<item name="Tag library" href="../fckeditor-java/tagreference.html" />
-			<item name="Configuration" href="../fckeditor-properties.html" />
-		</menu>
-		<!--<menu name="Developers">-->
-		<menu name="Project Documentation">
-			<item name="Changes Report" href="../changes-report.html" />
-			<item name="Dependencies" href="../dependencies.html" />
-			<item name="Issue Tracking" href="../issue-tracking.html" />
-			<item name="Mailing Lists" href="../mail-lists.html" />
-			<item name="Project License" href="../license.html" />
-			<item name="Project Summary" href="../project-summary.html" />
-			<item name="Project Team" href="../team-list.html" />
-			<item name="Source Repository" href="../source-repository.html" />
-		</menu>
-		<menu name="Modules Documentation">
-			<item name="Integration Pack" collapse="false">
-				<item name="Dependencies" href="../fckeditor-java/dependencies.html" />
-				<item name="Module Summary" href="../fckeditor-java/project-summary.html" />
-				<item name="Module Reports" href="../fckeditor-java/project-reports.html" collapse="true">
-					<item name="Cobertura Test Coverage" href="../fckeditor-java/cobertura/index.html" />
-					<item name="CPD Report" href="../fckeditor-java/cpd.html" />
-					<item name="JavaDoc" href="../fckeditor-java/apidocs/index.html" />
-					<item name="Maven Surefire Report" href="../fckeditor-java/surefire-report.html" />
-					<item name="PMD Report" href="../fckeditor-java/pmd.html" />
-					<item name="Source Xref" href="../fckeditor-java/xref/index.html" />
-					<item name="Taglibdoc documentation" href="../fckeditor-java/tlddoc/index.html" />
-					<item name="Tag library validation" href="../taglibvalidation.html" />
-					<item name="Tag List" href="../fckeditor-java/taglist.html" />
-					<!--<item name="Tag reference" href="../fckeditor-java/tagreference.html" />-->
-					<item name="Test JavaDocs" href="../fckeditor-java/testapidocs/index.html" />
-					<item name="Test Source Xref" href="../fckeditor-java/xref-test/index.html" />
-				</item>
-			</item>
-			<item name="Integration Demo" collapse="false">
-				<item name="Dependencies" href="dependencies.html" />
-				<item name="Module Summary" href="project-summary.html" />
-			</item>
-		</menu>
-	</body>
-
-	<poweredBy>
-		<logo name="Maven" href="http://maven.apache.org/"
-			img="http://maven.apache.org/images/logos/maven-inside.png"
-		/>
-	</poweredBy>
-
-</project>
Index: /FCKeditor.Java/branches/2.4/fckeditor-java/pom.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/fckeditor-java/pom.xml	(revision 1888)
+++ /FCKeditor.Java/branches/2.4/fckeditor-java/pom.xml	(revision 1889)
@@ -46,4 +46,5 @@
 				<executions>
 					<execution>
+						<id>rewrite-tagreference-links</id>
 						<phase>site</phase>
 						<goals>
@@ -56,7 +57,7 @@
 								/>
 
-								<echo
+								<!--<echo
 									message="Rewriting links in tag reference"
-								/>
+								/>-->
 								<replaceregexp byline="true" flags="m"
 									file="target/site/tagreference.html"
@@ -73,5 +74,5 @@
 					</execution>
 				</executions>
-				<dependencies>
+				<!--<dependencies>
 					<dependency>
 						<groupId>ant</groupId>
@@ -79,5 +80,5 @@
 						<version>1.6.5</version>
 					</dependency>
-				</dependencies>
+				</dependencies>-->
 			</plugin>
 		</plugins>
@@ -89,7 +90,4 @@
 				<groupId>net.sourceforge.maven-taglib</groupId>
 				<artifactId>maven-taglib-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
 			</plugin>
 			<plugin>
@@ -136,3 +134,5 @@
 	
 	<name>FCKeditor.Java Integration Pack</name>
+	<!-- FIXME we need some appropriate description here deriving from the parent -->
+	<description>Add pack description</description>
 </project>
Index: Keditor.Java/branches/2.4/fckeditor-java/src/site/site.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/fckeditor-java/src/site/site.xml	(revision 1888)
+++ 	(revision )
@@ -1,77 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-
-	<publishDate position="left" format="yyyy-MM-dd" />
-	<version position="left" />
-	
-	<bannerLeft>
-		<name>fckeditor</name>
-		<src>../images/fckeditor-logo.gif</src>
-		<href>http://www.fckeditor.net/fckeditor-java</href>
-	</bannerLeft>
-	
-	<body>
-		<head>
-			<link rel="shortcut icon" href="../images/favicon.ico"
-				type="image/x-icon"
-			/>
-		</head>
-		<menu name="Introduction">
-			<item name="About" href="../index.html" />
-			<item name="What's new" href="../whatsnew.html" />
-			<item name="Demo" href="../demo.html" />
-			<item name="Installation" href="../installation.html" />
-		</menu>
-		<menu name="Integration">
-			<item name="Overview" href="../integration/overview.html" />
-			<item name="Tag library" href="../integration/taglibrary.html" />
-			<item name="Connector" href="../integration/connector.html" />
-		</menu>
-		<menu name="Reference">
-			<item name="Tag library" href="tagreference.html" />
-			<item name="Configuration" href="../fckeditor-properties.html" />
-		</menu>
-		<!--<menu name="Developers">-->
-		<menu name="Project Documentation">
-			<item name="Changes Report" href="../changes-report.html" />
-			<item name="Dependencies" href="../dependencies.html" />
-			<item name="Issue Tracking" href="../issue-tracking.html" />
-			<item name="Mailing Lists" href="../mail-lists.html" />
-			<item name="Project License" href="../license.html" />
-			<item name="Project Summary" href="../project-summary.html" />
-			<item name="Project Team" href="../team-list.html" />
-			<item name="Source Repository" href="../source-repository.html" />
-		</menu>
-		<menu name="Modules Documentation">
-			<item name="Integration Pack" collapse="false">
-				<item name="Dependencies" href="dependencies.html" />
-				<item name="Module Summary" href="project-summary.html" />
-				<item name="Module Reports" href="project-reports.html" collapse="true">
-					<item name="Cobertura Test Coverage" href="cobertura/index.html" />
-					<item name="CPD Report" href="cpd.html" />
-					<item name="JavaDoc" href="apidocs/index.html" />
-					<item name="Maven Surefire Report" href="surefire-report.html" />
-					<item name="PMD Report" href="pmd.html" />
-					<item name="Source Xref" href="xref/index.html" />
-					<item name="Taglibdoc documentation" href="tlddoc/index.html" />
-					<item name="Tag library validation" href="taglibvalidation.html" />
-					<item name="Tag List" href="taglist.html" />
-					<!--<item name="Tag reference" href="tagreference.html" />-->
-					<item name="Test JavaDocs" href="testapidocs/index.html" />
-					<item name="Test Source Xref" href="xref-test/index.html" />
-				</item>
-			</item>
-			<item name="Integration Demo" collapse="false">
-				<item name="Dependencies" href="../fckeditor-java-demo/dependencies.html" />
-				<item name="Module Summary" href="../fckeditor-java-demo/project-summary.html" />
-			</item>
-		</menu>
-	</body>
-
-	<poweredBy>
-		<logo name="Maven" href="http://maven.apache.org/"
-			img="http://maven.apache.org/images/logos/maven-inside.png"
-		/>
-	</poweredBy>
-
-</project>
Index: /FCKeditor.Java/branches/2.4/pom.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/pom.xml	(revision 1888)
+++ /FCKeditor.Java/branches/2.4/pom.xml	(revision 1889)
@@ -88,5 +88,4 @@
 						</manifest>
 						<manifestEntries>
-							<!-- FIXME jede jar soll die main URL haben und keine unterURL -->
 							<Implementation-URL>
 								${project.url}
@@ -101,29 +100,44 @@
 				<version>2.0-beta-5</version>
 			</plugin>
-			 <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>pre-site</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <tasks>
-				<echo message="Copying site.xml to ${pom.artifactId}" />
-                <copy overwrite="true" todir="src/site" flatten="true" file="../src/site/site.xml">
-                </copy>
-                <replace value="href=&quot;../" token="href=&quot;/" dir="..">
-                  <include name="${pom.artifactId}/src/site/site.xml" />
-                  <exclude name="displaytag-doc/src/site/site.xml" />
-                </replace>
-                <replace value="href=&quot;" token="href=&quot;../${pom.artifactId}/" dir="..">
-                  <include name="${pom.artifactId}/src/site/site.xml" />
-                  <exclude name="displaytag-doc/src/site/site.xml" />
-                </replace>
-              </tasks>
-            </configuration>
-          </execution>
-        </executions>
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>rewrite-site-links</id>
+						<phase>pre-site</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<copy overwrite="true" todir="src/site" flatten="true">
+									<fileset dir="..">
+										<include name="src/site/site.xml" />
+									</fileset>
+								</copy>
+								<replace value="&lt;src&gt;../" token="&lt;src&gt;/" dir="..">
+									<include name="${pom.artifactId}/src/site/site.xml" />
+									<exclude name="fckeditor-java-parent/src/site/site.xml" />
+								</replace>
+								<replace value="href=&quot;../" token="href=&quot;/" dir="..">
+									<include name="${pom.artifactId}/src/site/site.xml" />
+									<exclude name="fckeditor-java-parent/src/site/site.xml" />
+								</replace>
+								<replace value="href=&quot;" token="href=&quot;../${pom.artifactId}/" dir="..">
+									<include name="${pom.artifactId}/src/site/site.xml" />
+									<exclude name="fckeditor-java-parent/src/site/site.xml" />
+								</replace>
+							</tasks>
+						</configuration>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>ant</groupId>
+						<artifactId>ant-nodeps</artifactId>
+						<version>1.6.5</version>
+					</dependency>
+				</dependencies>
+			</plugin>
 		</plugins>
 	</build>
@@ -163,4 +177,10 @@
 					</reportSet>
 				</reportSets>
+			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<quiet>true</quiet>
+				</configuration>
 			</plugin>
 		</plugins>
Index: /FCKeditor.Java/branches/2.4/src/site/site.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/src/site/site.xml	(revision 1888)
+++ /FCKeditor.Java/branches/2.4/src/site/site.xml	(revision 1889)
@@ -7,5 +7,5 @@
 	<bannerLeft>
 		<name>fckeditor</name>
-		<src>images/fckeditor-logo.gif</src>
+		<src>/images/fckeditor-logo.gif</src>
 		<href>http://www.fckeditor.net/fckeditor-java</href>
 	</bannerLeft>
@@ -13,56 +13,56 @@
 	<body>
 		<head>
-			<link rel="shortcut icon" href="images/favicon.ico"
+			<link rel="shortcut icon" href="/images/favicon.ico"
 				type="image/x-icon"
 			/>
 		</head>
 		<menu name="Introduction">
-			<item name="About" href="index.html" />
-			<item name="What's new" href="whatsnew.html" />
-			<item name="Demo" href="demo.html" />
-			<item name="Installation" href="installation.html" />
+			<item name="About" href="/index.html" />
+			<item name="What's new" href="/whatsnew.html" />
+			<item name="Demo" href="/demo.html" />
+			<item name="Installation" href="/installation.html" />
 		</menu>
 		<menu name="Integration">
-			<item name="Overview" href="integration/overview.html" />
-			<item name="Tag library" href="integration/taglibrary.html" />
-			<item name="Connector" href="integration/connector.html" />
+			<item name="Overview" href="/integration/overview.html" />
+			<item name="Tag library" href="/integration/taglibrary.html" />
+			<item name="Connector" href="/integration/connector.html" />
 		</menu>
 		<menu name="Reference">
-			<item name="Tag library" href="fckeditor-java/tagreference.html" />
-			<item name="Configuration" href="fckeditor-properties.html" />
+			<item name="Tag library" href="/fckeditor-java/tagreference.html" />
+			<item name="Configuration" href="/fckeditor-properties.html" />
 		</menu>
 		<!--<menu name="Developers">-->
 		<menu name="Project Documentation">
-			<item name="Changes Report" href="changes-report.html" />
-			<item name="Dependencies" href="dependencies.html" />
-			<item name="Issue Tracking" href="issue-tracking.html" />
-			<item name="Mailing Lists" href="mail-lists.html" />
-			<item name="Project License" href="license.html" />
-			<item name="Project Summary" href="project-summary.html" />
-			<item name="Project Team" href="team-list.html" />
-			<item name="Source Repository" href="source-repository.html" />
+			<item name="Changes Report" href="/changes-report.html" />
+			<item name="Dependencies" href="/dependencies.html" />
+			<item name="Issue Tracking" href="/issue-tracking.html" />
+			<item name="Mailing Lists" href="/mail-lists.html" />
+			<item name="Project License" href="/license.html" />
+			<item name="Project Summary" href="/project-summary.html" />
+			<item name="Project Team" href="/team-list.html" />
+			<item name="Source Repository" href="/source-repository.html" />
 		</menu>
 		<menu name="Modules Documentation">
 			<item name="Integration Pack" collapse="false">
-				<item name="Dependencies" href="fckeditor-java/dependencies.html" />
-				<item name="Module Summary" href="fckeditor-java/project-summary.html" />
-				<item name="Module Reports" href="fckeditor-java/project-reports.html" collapse="true">
-					<item name="Cobertura Test Coverage" href="fckeditor-java/cobertura/index.html" />
-					<item name="CPD Report" href="fckeditor-java/cpd.html" />
-					<item name="JavaDoc" href="fckeditor-java/apidocs/index.html" />
-					<item name="Maven Surefire Report" href="fckeditor-java/surefire-report.html" />
-					<item name="PMD Report" href="fckeditor-java/pmd.html" />
-					<item name="Source Xref" href="fckeditor-java/xref/index.html" />
-					<item name="Taglibdoc documentation" href="fckeditor-java/tlddoc/index.html" />
-					<item name="Tag library validation" href="taglibvalidation.html" />
-					<item name="Tag List" href="fckeditor-java/taglist.html" />
-					<!--<item name="Tag reference" href="fckeditor-java/tagreference.html" />-->
-					<item name="Test JavaDocs" href="fckeditor-java/testapidocs/index.html" />
-					<item name="Test Source Xref" href="fckeditor-java/xref-test/index.html" />
+				<item name="Dependencies" href="/fckeditor-java/dependencies.html" />
+				<item name="Module Summary" href="/fckeditor-java/project-summary.html" />
+				<item name="Module Reports" href="/fckeditor-java/project-reports.html" collapse="true">
+					<item name="Cobertura Test Coverage" href="/fckeditor-java/cobertura/index.html" />
+					<item name="CPD Report" href="/fckeditor-java/cpd.html" />
+					<item name="JavaDoc" href="/fckeditor-java/apidocs/index.html" />
+					<item name="Maven Surefire Report" href="/fckeditor-java/surefire-report.html" />
+					<item name="PMD Report" href="/fckeditor-java/pmd.html" />
+					<item name="Source Xref" href="/fckeditor-java/xref/index.html" />
+					<item name="Taglibdoc documentation" href="/fckeditor-java/tlddoc/index.html" />
+					<item name="Tag library validation" href="/fckeditor-java/taglibvalidation.html" />
+					<item name="Tag List" href="/fckeditor-java/taglist.html" />
+					<!--<item name="Tag reference" href="/fckeditor-java/tagreference.html" />-->
+					<item name="Test JavaDocs" href="/fckeditor-java/testapidocs/index.html" />
+					<item name="Test Source Xref" href="/fckeditor-java/xref-test/index.html" />
 				</item>
 			</item>
 			<item name="Integration Demo" collapse="false">
-				<item name="Dependencies" href="fckeditor-java-demo/dependencies.html" />
-				<item name="Module Summary" href="fckeditor-java-demo/project-summary.html" />
+				<item name="Dependencies" href="/fckeditor-java-demo/dependencies.html" />
+				<item name="Module Summary" href="/fckeditor-java-demo/project-summary.html" />
 			</item>
 		</menu>
