Index: /FCKeditor.Java/branches/2.4/pom.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/pom.xml	(revision 1367)
+++ /FCKeditor.Java/branches/2.4/pom.xml	(revision 1368)
@@ -44,5 +44,5 @@
 			<version>1.4.3</version>
 		</dependency>
-		<!--<dependency>
+		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
@@ -62,5 +62,5 @@
 			<scope>runtime</scope>
 		</dependency>
-	--></dependencies>
+	</dependencies>
 	<build>
 		<finalName>FCKeditor-${project.version}</finalName>
@@ -70,6 +70,6 @@
 				<artifactId>maven-jetty-plugin</artifactId>
 				<configuration>
-<!--					<useTestClasspath>true</useTestClasspath>-->
-					<systemProperties>
+					<useTestClasspath>true</useTestClasspath>
+					<!--<systemProperties>
 						<systemProperty>
 							<name>log4j.configuration</name>
@@ -88,6 +88,6 @@
 						</serverClasses>
 					</webAppConfig>
-				</configuration>
-				<dependencies>
+				--></configuration>
+				<!--<dependencies>
 					<dependency>
 						<groupId>org.slf4j</groupId>
@@ -101,5 +101,5 @@
 					</dependency>
 				</dependencies>
-			</plugin>
+			--></plugin>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -108,5 +108,19 @@
 					<target>jsr14</target>
 				</configuration>
-			</plugin>
+				<executions>
+					<execution>
+						<id>test-compiler</id>
+						<phase>process-test-sources</phase>
+						<goals>
+							<goal>testCompile</goal>
+						</goals>
+						<configuration>
+							<source>1.5</source>
+							<target>1.5</target>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -174,4 +188,16 @@
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<artifactId>maven-surefire-report-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<artifactId>maven-jxr-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<artifactId>maven-pmd-plugin</artifactId>
+				<configuration>
+					<targetJdk>1.5</targetJdk>
+				</configuration>
 			</plugin>
 		</plugins>
@@ -296,3 +322,9 @@
 		<maven>2.0.6</maven>
 	</prerequisites>
+	<distributionManagement>
+    <site>
+      <id>uni-space</id>
+      <url>scp://duesseldorf.mi.fu-berlin.de/home/bude/ossipov/web-home/public_html/fckeditor-java</url>
+    </site>
+  </distributionManagement>
 </project>
Index: Keditor.Java/branches/2.4/src/test/java/net/fckeditor/tool/Util_getSet.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/test/java/net/fckeditor/tool/Util_getSet.java	(revision 1367)
+++ 	(revision )
@@ -1,63 +1,0 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
- * 
- * == BEGIN LICENSE ==
- * 
- * Licensed under the terms of any of the following licenses at your
- * choice:
- * 
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- * 
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- * 
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- * 
- * == END LICENSE ==
- */
-package net.fckeditor.tool;
-
-import static org.junit.Assert.assertTrue;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.junit.Test;
-
-/**
- * Tests for {@link Utils#getSet(String, String)}.
- *
- * @version $Id: Util_getSet.java 1184 2008-01-03 10:39:36Z th-schwarz $
- * @author <a href="mailto:th-schwarz@users.sourceforge.net">Thilo Schwarz</a>
- */
-public class Util_getSet {
-
-    @Test
-    public void test_getSet01() throws Exception {
-	Set<String> set = new HashSet<String>();
-	set.add("a");
-	set.add("ab");
-	set.add("c");
-	
-	Set<String> newSet = Utils.getSet("a|Ab|c", "|");
-	for (String string : newSet) {
-	    assertTrue(set.contains(string));
-	}
-    }
-    
-    @Test
-    public void test_getSet02() throws Exception {
-	Set<String> set = new HashSet<String>();
-	set.add("png");
-	set.add("jpg");
-	set.add("gif");
-	
-	Set<String> newSet = Utils.getSet("png|jpg|gif");
-	for (String string : newSet) {
-	    assertTrue(set.contains(string));
-	}
-    }
-}
Index: Keditor.Java/branches/2.4/src/test/java/net/fckeditor/tool/Util_replace.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/test/java/net/fckeditor/tool/Util_replace.java	(revision 1367)
+++ 	(revision )
@@ -1,58 +1,0 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
- * 
- * == BEGIN LICENSE ==
- * 
- * Licensed under the terms of any of the following licenses at your
- * choice:
- * 
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- * 
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- * 
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- * 
- * == END LICENSE ==
- */
-package net.fckeditor.tool;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-/**
- * Tests for {@link Utils#replaceAll(String, String, String)};
- *
- * @version $Id: Util_replace.java 1184 2008-01-03 10:39:36Z th-schwarz $
- * @author <a href="mailto:th-schwarz@users.sourceforge.net">Thilo Schwarz</a>
- */
-public class Util_replace {
-
-    @Test
-    public void test_replace01() {
-	String str =  Utils.replaceAll("//a/b//c", "//", "/");
-	assertEquals(str, "/a/b/c");
-    }
-
-    @Test
-    public void test_replace02() {
-	String str = Utils.replaceAll(null, "a", "c");
-	assertEquals(str, "");
-    }
-
-    @Test
-    public void test_replace03() {
-	String str = Utils.replaceAll("foo", null, "c");
-	assertEquals(str, "foo");
-    }
-
-    @Test
-    public void test_replace04() {
-	String str = Utils.replaceAll("foo", "o", "a");
-	assertEquals(str, "faa");
-    }
-}
Index: /FCKeditor.Java/branches/2.4/src/test/java/net/fckeditor/tool/UtilsTest.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/test/java/net/fckeditor/tool/UtilsTest.java	(revision 1368)
+++ /FCKeditor.Java/branches/2.4/src/test/java/net/fckeditor/tool/UtilsTest.java	(revision 1368)
@@ -0,0 +1,88 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * 
+ * == BEGIN LICENSE ==
+ * 
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ * 
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ * 
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ * 
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ * 
+ * == END LICENSE ==
+ */
+package net.fckeditor.tool;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.Test;
+
+/**
+ * Tests for {@link Utils};
+ * 
+ * @version $Id$
+ * @author <a href="mailto:th-schwarz@users.sourceforge.net">Thilo Schwarz</a>
+ */
+public class UtilsTest {
+
+	@Test
+	public void getSet01() {
+		Set<String> set = new HashSet<String>();
+		set.add("a");
+		set.add("ab");
+		set.add("c");
+
+		Set<String> newSet = Utils.getSet("a|Ab|c", "|");
+		for (String string : newSet) {
+			assertTrue(set.contains(string));
+		}
+	}
+
+	@Test
+	public void getSet02() {
+		Set<String> set = new HashSet<String>();
+		set.add("png");
+		set.add("jpg");
+		set.add("gif");
+
+		Set<String> newSet = Utils.getSet("png|jpg|gif");
+		for (String string : newSet) {
+			assertTrue(set.contains(string));
+		}
+	}
+
+	@Test
+	public void replaceAll01() {
+		String str = Utils.replaceAll("//a/b//c", "//", "/");
+		assertEquals(str, "/a/b/c");
+	}
+
+	@Test
+	public void replaceAll02() {
+		String str = Utils.replaceAll(null, "a", "c");
+		assertEquals(str, "");
+	}
+
+	@Test
+	public void replaceAll03() {
+		String str = Utils.replaceAll("foo", null, "c");
+		assertEquals(str, "foo");
+	}
+
+	@Test
+	public void replaceAll04() {
+		String str = Utils.replaceAll("foo", "o", "a");
+		assertEquals(str, "faa");
+	}
+}
Index: Keditor.Java/branches/2.4/src/test/java/net/fckeditor/tool/Utils_getSet.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/test/java/net/fckeditor/tool/Utils_getSet.java	(revision 1367)
+++ 	(revision )
@@ -1,63 +1,0 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
- * 
- * == BEGIN LICENSE ==
- * 
- * Licensed under the terms of any of the following licenses at your
- * choice:
- * 
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- * 
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- * 
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- * 
- * == END LICENSE ==
- */
-package net.fckeditor.tool;
-
-import static org.junit.Assert.*;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.junit.Test;
-
-/**
- * Tests for {@link Utils#getSet(String, String)}.
- *
- * @version $Id: Util_getSet.java 1184 2008-01-03 10:39:36Z th-schwarz $
- * @author <a href="mailto:th-schwarz@users.sourceforge.net">Thilo Schwarz</a>
- */
-public class Utils_getSet {
-
-    @Test
-    public void test_getSet01() throws Exception {
-	Set<String> set = new HashSet<String>();
-	set.add("a");
-	set.add("ab");
-	set.add("c");
-	
-	Set<String> newSet = Utils.getSet("a|Ab|c", "|");
-	for (String string : newSet) {
-	    assertTrue(set.contains(string));
-	}
-    }
-    
-    @Test
-    public void test_getSet02() throws Exception {
-	Set<String> set = new HashSet<String>();
-	set.add("png");
-	set.add("jpg");
-	set.add("gif");
-	
-	Set<String> newSet = Utils.getSet("png|jpg|gif");
-	for (String string : newSet) {
-	    assertTrue(set.contains(string));
-	}
-    }
-}
Index: Keditor.Java/branches/2.4/src/test/java/net/fckeditor/tool/Utils_replace.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/test/java/net/fckeditor/tool/Utils_replace.java	(revision 1367)
+++ 	(revision )
@@ -1,58 +1,0 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
- * 
- * == BEGIN LICENSE ==
- * 
- * Licensed under the terms of any of the following licenses at your
- * choice:
- * 
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- * 
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- * 
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- * 
- * == END LICENSE ==
- */
-package net.fckeditor.tool;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-/**
- * Tests for {@link Utils#replaceAll(String, String, String)};
- *
- * @version $Id: Util_replace.java 1184 2008-01-03 10:39:36Z th-schwarz $
- * @author <a href="mailto:th-schwarz@users.sourceforge.net">Thilo Schwarz</a>
- */
-public class Utils_replace {
-
-    @Test
-    public void test_replace01() {
-	String str =  Utils.replaceAll("//a/b//c", "//", "/");
-	assertEquals(str, "/a/b/c");
-    }
-
-    @Test
-    public void test_replace02() {
-	String str = Utils.replaceAll(null, "a", "c");
-	assertEquals(str, "");
-    }
-
-    @Test
-    public void test_replace03() {
-	String str = Utils.replaceAll("foo", null, "c");
-	assertEquals(str, "foo");
-    }
-
-    @Test
-    public void test_replace04() {
-	String str = Utils.replaceAll("foo", "o", "a");
-	assertEquals(str, "faa");
-    }
-}