Index: /FCKeditor.Java/branches/2.4/pom.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/pom.xml	(revision 1910)
+++ /FCKeditor.Java/branches/2.4/pom.xml	(revision 1911)
@@ -3,6 +3,5 @@
 	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"
->
+                      http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.fckeditor</groupId>
@@ -113,41 +112,30 @@
 							<tasks>
 								<copy overwrite="true" todir="src/site"
-									flatten="true"
-								>
+									flatten="true">
 									<fileset dir="..">
 										<include
-											name="src/site/site.xml"
-										/>
+											name="src/site/site.xml" />
 									</fileset>
 								</copy>
 								<replace value="&lt;src&gt;../"
-									token="&lt;src&gt;/" dir=".."
-								>
+									token="&lt;src&gt;/" dir="..">
 									<include
-										name="${pom.artifactId}/src/site/site.xml"
-									/>
+										name="${pom.artifactId}/src/site/site.xml" />
 									<exclude
-										name="fckeditor-java/src/site/site.xml"
-									/>
+										name="fckeditor-java/src/site/site.xml" />
 								</replace>
 								<replace value="href=&quot;../"
-									token="href=&quot;/" dir=".."
-								>
+									token="href=&quot;/" dir="..">
 									<include
-										name="${pom.artifactId}/src/site/site.xml"
-									/>
+										name="${pom.artifactId}/src/site/site.xml" />
 									<exclude
-										name="fckeditor-java/src/site/site.xml"
-									/>
+										name="fckeditor-java/src/site/site.xml" />
 								</replace>
 								<replace value="href=&quot;"
-									token="href=&quot;../${pom.artifactId}/" dir=".."
-								>
+									token="href=&quot;../${pom.artifactId}/" dir="..">
 									<include
-										name="${pom.artifactId}/src/site/site.xml"
-									/>
+										name="${pom.artifactId}/src/site/site.xml" />
 									<exclude
-										name="fckeditor-java/src/site/site.xml"
-									/>
+										name="fckeditor-java/src/site/site.xml" />
 								</replace>
 							</tasks>
@@ -212,7 +200,8 @@
 	<name>FCKeditor.Java Integration</name>
 	<description>
-		The FCKeditor.Java Integration fosters the entire project documentation,
-		the Java library, and a drop-in demo webapp. All three depict and enable
-		you to learn and to integrate the FCKeditor in your web environment.
+		The FCKeditor.Java Integration fosters the entire project
+		documentation, the Java library, and a drop-in demo webapp. All
+		three depict and enable you to learn and to integrate the
+		FCKeditor in your web environment.
 	</description>
 	<url>http://www.fckeditor.net/java</url>
Index: /FCKeditor.Java/branches/2.4/src/main/assembly/bin.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/assembly/bin.xml	(revision 1910)
+++ /FCKeditor.Java/branches/2.4/src/main/assembly/bin.xml	(revision 1911)
@@ -6,4 +6,15 @@
 	</formats>
 	<includeSiteDirectory>true</includeSiteDirectory>
+	<moduleSets>
+		<moduleSet>
+			<excludes>
+				<exclude>*:war</exclude>
+			</excludes>
+			<binaries>
+				<includeDependencies>false</includeDependencies>
+				<unpack>false</unpack>
+			</binaries>
+		</moduleSet>
+	</moduleSets>
 	<fileSets>
 		<fileSet>
@@ -12,15 +23,7 @@
 			</includes>
 		</fileSet>
-		<fileSet>
-			<directory>target</directory>
-			<outputDirectory />
-			<includes>
-				<include>*.jar</include> 
-			</includes>
-		</fileSet>
 	</fileSets>
 	<dependencySets>
 		<dependencySet>
-			<useProjectArtifact>false</useProjectArtifact>
 			<outputDirectory>lib</outputDirectory>
 		</dependencySet>
Index: /FCKeditor.Java/branches/2.4/src/main/assembly/src.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/assembly/src.xml	(revision 1910)
+++ /FCKeditor.Java/branches/2.4/src/main/assembly/src.xml	(revision 1911)
@@ -5,16 +5,24 @@
 		<format>zip</format>
 	</formats>
+	<moduleSets>
+		<moduleSet>
+			<sources>
+				<fileSets>
+					<fileSet>
+						<excludes>
+							<exclude>target/</exclude>
+						</excludes>
+					</fileSet>
+				</fileSets>
+			</sources>
+		</moduleSet>
+	</moduleSets>
 	<fileSets>
 		<fileSet>
 			<includes>
-				<include>**/src/</include>
-				<include>**/README*</include>
-				<include>**/LICENSE*</include>
-				<include>**/NOTICE*</include>
-				<include>**/*.xml</include>
+				<include>src/</include>
+				<include>*.txt</include>
+				<include>*.xml</include>
 			</includes>
-			<excludes>
-				<exclude>**/target/</exclude>
-			</excludes>
 		</fileSet>
 	</fileSets>