Index: /FCKeditor.Java/trunk/java-core/pom.xml
===================================================================
--- /FCKeditor.Java/trunk/java-core/pom.xml	(revision 2479)
+++ /FCKeditor.Java/trunk/java-core/pom.xml	(revision 2480)
@@ -1,3 +1,5 @@
-<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">
+<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>java-core</artifactId>
@@ -70,8 +72,12 @@
 						<configuration>
 							<tasks>
-								<property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp" />
-								<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;" />
+								<property name="ant.regexp.regexpimpl"
+									value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp" />
+								<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>
@@ -86,4 +92,15 @@
 					</dependency>
 					</dependencies>-->
+			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
@@ -136,4 +153,17 @@
 				</reportSets>
 			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<quiet>true</quiet>
+				</configuration>
+				<reportSets>
+					<reportSet>
+						<reports>
+							<report>javadoc</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
 		</plugins>
 	</reporting>
@@ -142,6 +172,7 @@
 	<description>
 		This Java library enables the FCKeditor to be used in a
-		Servlet/J2EE environment. It provides JSP tags for creating a FCKeditor
-		instance and a Servlet handling server-side user files and folders.
+		Servlet/J2EE environment. It provides JSP tags for creating a
+		FCKeditor instance and a Servlet handling server-side user files
+		and folders.
 	</description>
 	<url>http://java.fckeditor.net</url>
Index: /FCKeditor.Java/trunk/java-demo/pom.xml
===================================================================
--- /FCKeditor.Java/trunk/java-demo/pom.xml	(revision 2479)
+++ /FCKeditor.Java/trunk/java-demo/pom.xml	(revision 2480)
@@ -1,3 +1,5 @@
-<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">
+<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>java-demo</artifactId>
Index: /FCKeditor.Java/trunk/pom.xml
===================================================================
--- /FCKeditor.Java/trunk/pom.xml	(revision 2479)
+++ /FCKeditor.Java/trunk/pom.xml	(revision 2480)
@@ -1,3 +1,5 @@
-<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">
+<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>
 	<groupId>net.fckeditor</groupId>
@@ -10,8 +12,12 @@
 	</modules>
 	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<project.build.sourceEncoding>
+			UTF-8
+		</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>
+			UTF-8
+		</project.reporting.outputEncoding>
 		<slf4j.version>1.5.2</slf4j.version>
-		
+
 		<!-- site plugin properties for Velocity -->
 		<slf4jVersion>${slf4j.version}</slf4jVersion>
@@ -34,4 +40,8 @@
 				</plugin>
 				<plugin>
+					<artifactId>maven-javadoc-plugin</artifactId>
+					<version>2.5</version>
+				</plugin>
+				<plugin>
 					<artifactId>maven-deploy-plugin</artifactId>
 					<version>2.4</version>
@@ -62,5 +72,5 @@
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.2-beta-1</version>
+				<version>2.2-beta-2</version>
 				<configuration>
 					<descriptors>
@@ -73,16 +83,4 @@
 					</descriptors>
 				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.5</version>
-				<executions>
-					<execution>
-						<id>attach-javadocs</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
 			</plugin>
 			<plugin>
@@ -115,24 +113,38 @@
 						<configuration>
 							<tasks>
-								<copy overwrite="true" todir="src/site" flatten="true">
+								<copy overwrite="true" todir="src/site"
+									flatten="true">
 									<fileset dir="..">
-										<include name="src/site/site.xml" />
+										<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/src/site/site.xml" />
+								<replace value="&lt;src&gt;../"
+									token="&lt;src&gt;/" dir="..">
+									<include
+										name="${pom.artifactId}/src/site/site.xml" />
+									<exclude
+										name="fckeditor-java/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/src/site/site.xml" />
+								<replace value="href=&quot;../"
+									token="href=&quot;/" dir="..">
+									<include
+										name="${pom.artifactId}/src/site/site.xml" />
+									<exclude
+										name="fckeditor-java/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/src/site/site.xml" />
+								<replace value="href=&quot;"
+									token="href=&quot;../${pom.artifactId}/" dir="..">
+									<include
+										name="${pom.artifactId}/src/site/site.xml" />
+									<exclude
+										name="fckeditor-java/src/site/site.xml" />
 								</replace>
-								<replace value="href=&quot;../images" token="href=&quot;images" dir="..">
-									<include name="${pom.artifactId}/src/site/site.xml" />
-									<exclude name="fckeditor-java/src/site/site.xml" />
+								<replace value="href=&quot;../images"
+									token="href=&quot;images" dir="..">
+									<include
+										name="${pom.artifactId}/src/site/site.xml" />
+									<exclude
+										name="fckeditor-java/src/site/site.xml" />
 								</replace>
 							</tasks>
@@ -160,4 +172,5 @@
 				</artifactId>
 				<version>2.1</version>
+				<inherited>false</inherited>
 				<reportSets>
 					<reportSet>
@@ -189,10 +202,4 @@
 					</reportSet>
 				</reportSets>
-			</plugin>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<configuration>
-					<quiet>true</quiet>
-				</configuration>
 			</plugin>
 		</plugins>
@@ -303,6 +310,10 @@
 	</mailingLists>
 	<scm>
-		<connection>scm:svn:http://svn.fckeditor.net/FCKeditor.Java/trunk</connection>
-		<developerConnection>scm:svn:https://svn.fckeditor.net/FCKeditor.Java/trunk</developerConnection>
+		<connection>
+			scm:svn:http://svn.fckeditor.net/FCKeditor.Java/trunk
+		</connection>
+		<developerConnection>
+			scm:svn:https://svn.fckeditor.net/FCKeditor.Java/trunk
+		</developerConnection>
 		<url>http://dev.fckeditor.net/browser/FCKeditor.Java/trunk</url>
 	</scm>
@@ -313,19 +324,13 @@
 		<repository>
 			<id>local</id>
-			<url>
-				file:///home/mosipov/public_html/m2repo
-			</url>
+			<url>file:///home/mosipov/public_html/m2repo</url>
 		</repository>
 		<snapshotRepository>
 			<id>local</id>
-			<url>
-				file:///home/mosipov/public_html/m2repo-snapshots
-			</url>
+			<url>file:///home/mosipov/public_html/m2repo-snapshots</url>
 		</snapshotRepository>
 		<site>
 			<id>local</id>
-			<url>
-				file:///home/mosipov/public_html/docs
-			</url>
+			<url>file:///home/mosipov/public_html/docs</url>
 		</site>
 	</distributionManagement>
Index: /FCKeditor.Java/trunk/src/changes/changes.xml
===================================================================
--- /FCKeditor.Java/trunk/src/changes/changes.xml	(revision 2479)
+++ /FCKeditor.Java/trunk/src/changes/changes.xml	(revision 2480)
@@ -7,5 +7,5 @@
 	<body>
 		<release version="2.5" date="in SVN"
-			description="Introduced path abstraction and locale resolver, minor bugfixes.">
+			description="Introduced path abstraction and locale resolver, minor bugfixes and enhancements.">
 			<action dev="mosipov" type="fix" issue="2355">FCK:editor output is not XHTML 1.0 compliant</action>
 			<action dev="mosipov" type="fix" issue="2359">fckeditor-java-demo fails in Glassfish</action>
Index: /FCKeditor.Java/trunk/src/main/assembly/bin.xml
===================================================================
--- /FCKeditor.Java/trunk/src/main/assembly/bin.xml	(revision 2479)
+++ /FCKeditor.Java/trunk/src/main/assembly/bin.xml	(revision 2480)
@@ -19,5 +19,5 @@
 				</dependencySets>
 				<outputFileNameMapping>
-					fckeditor-${artifactId}-${version}.${extension}
+					fckeditor-${module.artifactId}-${module.version}.${module.extension}
 				</outputFileNameMapping>
 				<unpack>false</unpack>
@@ -32,5 +32,5 @@
 				<includeDependencies>false</includeDependencies>
 				<outputFileNameMapping>
-					fckeditor-${artifactId}-${version}-${classifier}.${extension}
+					fckeditor-${module.artifactId}-${module.version}-${module.classifier}.${module.extension}
 				</outputFileNameMapping>
 				<unpack>false</unpack>
@@ -43,5 +43,5 @@
 					<fileSet>
 						<outputDirectory>
-							site/${artifactId}
+							site/${module.artifactId}
 						</outputDirectory>
 						<directory>target/site</directory>
Index: /FCKeditor.Java/trunk/src/main/assembly/src.xml
===================================================================
--- /FCKeditor.Java/trunk/src/main/assembly/src.xml	(revision 2479)
+++ /FCKeditor.Java/trunk/src/main/assembly/src.xml	(revision 2480)
@@ -6,24 +6,11 @@
 		<format>tar.gz</format>
 	</formats>
-	<moduleSets>
-		<moduleSet>
-			<sources>
-				<fileSets>
-					<fileSet>
-						<excludes>
-							<exclude>target/</exclude>
-						</excludes>
-					</fileSet>
-				</fileSets>
-			</sources>
-		</moduleSet>
-	</moduleSets>
 	<fileSets>
 		<fileSet>
-			<includes>
-				<include>src/</include>
-				<include>*.txt</include>
-				<include>*.xml</include>
-			</includes>
+			<excludes>
+				<exclude>**/target/</exclude>
+				<exclude>**/.settings/</exclude>
+				<exclude>**/.*</exclude>
+			</excludes>
 		</fileSet>
 	</fileSets>
Index: /FCKeditor.Java/trunk/src/site/site.xml
===================================================================
--- /FCKeditor.Java/trunk/src/site/site.xml	(revision 2479)
+++ /FCKeditor.Java/trunk/src/site/site.xml	(revision 2480)
@@ -95,7 +95,4 @@
 						href="/java-core/taglist.html"
 					/>
-					<item name="Test JavaDocs"
-						href="/java-core/testapidocs/index.html"
-					/>
 					<item name="Test Source Xref"
 						href="/java-core/xref-test/index.html"