Index: /FCKeditor.Java/branches/2.4/pom.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/pom.xml	(revision 1348)
+++ /FCKeditor.Java/branches/2.4/pom.xml	(revision 1349)
@@ -36,5 +36,5 @@
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>3.8.2</version>
+			<version>4.4</version>
 			<scope>test</scope>
 		</dependency>
@@ -74,5 +74,5 @@
 				<configuration>
 					<source>1.5</source>
-					<target>jsr14</target>
+					<target>1.5</target>
 				</configuration>
 			</plugin>
Index: Keditor.Java/branches/2.4/src/test/java/net/fckeditor/tool/TestResourceStream.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/test/java/net/fckeditor/tool/TestResourceStream.java	(revision 1348)
+++ 	(revision )
@@ -1,23 +1,0 @@
-package net.fckeditor.tool;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-import java.util.ResourceBundle;
-
-public class TestResourceStream {
-	
-	public static void main(String[] args) throws IOException {
-		
-		Properties pros = new Properties();
-		InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("com/fredck/fckeditor/default.properties");
-		//InputStream is = Properties.class.getClassLoader().getResourceAsStream("/com/fredck/fckeditor/default.properties");
-		ResourceBundle bundle = ResourceBundle.getBundle("com.fredck.fckeditor.default");
-		
-		pros.load(is);
-		System.out.println(pros.getProperty("fckeditor.dir"));
-		System.out.println(bundle.getString("fckeditor.dir"));
-		
-	}
-
-}
Index: /FCKeditor.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 1348)
+++ /FCKeditor.Java/branches/2.4/src/test/java/net/fckeditor/tool/Util_getSet.java	(revision 1349)
@@ -21,9 +21,10 @@
 package net.fckeditor.tool;
 
+import static org.junit.Assert.assertTrue;
+
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Set;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 /**
@@ -33,29 +34,29 @@
  * @author <a href="mailto:th-schwarz@users.sourceforge.net">Thilo Schwarz</a>
  */
-public class Util_getSet extends TestCase {
+public class Util_getSet {
 
+    @Test
     public void test_getSet01() throws Exception {
-	Set set = new HashSet();
+	Set<String> set = new HashSet<String>();
 	set.add("a");
 	set.add("ab");
 	set.add("c");
 	
-	Set newSet = Utils.getSet("a|Ab|c", "|");
-	for (Iterator iterator = newSet.iterator(); iterator.hasNext();) {
-	    String val = (String) iterator.next();
-	    assertEquals(true, set.contains(val));
+	Set<String> newSet = Utils.getSet("a|Ab|c", "|");
+	for (String string : newSet) {
+	    assertTrue(set.contains(string));
 	}
     }
     
+    @Test
     public void test_getSet02() throws Exception {
-	Set set = new HashSet();
+	Set<String> set = new HashSet<String>();
 	set.add("png");
 	set.add("jpg");
 	set.add("gif");
 	
-	Set newSet = Utils.getSet("png|jpg|gif");
-	for (Iterator iterator = newSet.iterator(); iterator.hasNext();) {
-	    String val = (String) iterator.next();
-	    assertEquals(true, set.contains(val));
+	Set<String> newSet = Utils.getSet("png|jpg|gif");
+	for (String string : newSet) {
+	    assertTrue(set.contains(string));
 	}
     }
Index: /FCKeditor.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 1348)
+++ /FCKeditor.Java/branches/2.4/src/test/java/net/fckeditor/tool/Util_replace.java	(revision 1349)
@@ -21,5 +21,7 @@
 package net.fckeditor.tool;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.*;
+
+import org.junit.Test;
 
 /**
@@ -29,11 +31,13 @@
  * @author <a href="mailto:th-schwarz@users.sourceforge.net">Thilo Schwarz</a>
  */
-public class Util_replace extends TestCase {
+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");
@@ -41,4 +45,5 @@
     }
 
+    @Test
     public void test_replace03() {
 	String str = Utils.replaceAll("foo", null, "c");
@@ -46,4 +51,5 @@
     }
 
+    @Test
     public void test_replace04() {
 	String str = Utils.replaceAll("foo", "o", "a");