Index: /FCKeditor.Java/branches/2.4/pom.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/pom.xml	(revision 1360)
+++ /FCKeditor.Java/branches/2.4/pom.xml	(revision 1361)
@@ -39,11 +39,4 @@
 			<scope>test</scope>
 		</dependency>
-		<!-- the slf4j commons-logging replacement -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl104-over-slf4j</artifactId>
-			<version>1.4.2</version>
-		</dependency>
-		<!-- the other slf4j jars -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -51,9 +44,9 @@
 			<version>1.4.3</version>
 		</dependency>
-		<!-- using log4j as backend -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
 			<version>1.4.3</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -61,4 +54,11 @@
 			<artifactId>log4j</artifactId>
 			<version>1.2.14</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-nop</artifactId>
+			<version>1.4.3</version>
+			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
@@ -69,10 +69,37 @@
 				<groupId>org.mortbay.jetty</groupId>
 				<artifactId>maven-jetty-plugin</artifactId>
-			</plugin>
+				<configuration>
+					<useTestClasspath>true</useTestClasspath>
+					<!--<systemProperties>
+						<systemProperty>
+							<name>log4j.configuration</name>
+							<value>
+								file:./target/test-classes/log4j.properties
+							</value>
+						</systemProperty>
+						<systemProperty>
+							<name>log4j.debug</name>
+							<value>true</value>
+						</systemProperty>
+					</systemProperties>
+				--></configuration>
+				<!--<dependencies>
+					<dependency>
+						<groupId>org.slf4j</groupId>
+						<artifactId>slf4j-log4j12</artifactId>
+						<version>1.4.3</version>
+					</dependency>
+					<dependency>
+						<groupId>log4j</groupId>
+						<artifactId>log4j</artifactId>
+						<version>1.2.14</version>
+					</dependency>
+				</dependencies>
+			--></plugin>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
 					<source>1.5</source>
-					<target>1.5</target>
+					<target>jsr14</target>
 				</configuration>
 			</plugin>
@@ -109,5 +136,7 @@
 					</webResources>
 					<webXml>src/main/webapp/WEB-INF/web_war.xml</webXml>
-					<warSourceExcludes>WEB-INF/web_*.xml,WEB-INF/tld/</warSourceExcludes>
+					<warSourceExcludes>
+						WEB-INF/web_*.xml,WEB-INF/tld/
+					</warSourceExcludes>
 				</configuration>
 			</plugin>
@@ -132,18 +161,15 @@
 	</build>
 
-	<!-- commented out for now since it produces errors
-		<reporting>
+	<reporting>
 		<plugins>
-		
-		<plugin>
-		<groupId>net.sourceforge.maven-taglib</groupId>
-		<artifactId>maven-taglib-plugin</artifactId>
-		</plugin>
-		<plugin>
-		<artifactId>maven-javadoc-plugin</artifactId>
-		</plugin>
+			<plugin>
+				<groupId>net.sourceforge.maven-taglib</groupId>
+				<artifactId>maven-taglib-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+			</plugin>
 		</plugins>
-		</reporting>
-	-->
+	</reporting>
 
 	<name>FCKeditor - Java Connector</name>
Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/connector/ConnectorServlet.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/connector/ConnectorServlet.java	(revision 1360)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/connector/ConnectorServlet.java	(revision 1361)
@@ -76,5 +76,5 @@
 
     private static final long serialVersionUID = -5742008970929377161L;
-    private final Logger logger = LoggerFactory.getLogger(ConnectorServlet.class); 
+    private static final Logger logger = LoggerFactory.getLogger(ConnectorServlet.class); 
 
     
Index: Keditor.Java/branches/2.4/src/main/resources/log4j.properties
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/resources/log4j.properties	(revision 1360)
+++ 	(revision )
@@ -1,13 +1,0 @@
-log4j.rootLogger=DEBUG, SOCKET
-log4j.appender.FILE=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
-#log4j.appender.FILE.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss,SSS} %-5p %c - %m%n
-log4j.appender.FILE.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %c - %m%n
-log4j.appender.FILE.file=log/pmcms.log
-
-log4j.appender.SOCKET=org.apache.log4j.net.SocketAppender
-log4j.appender.SOCKET.RemoteHost=localhost
-log4j.appender.SOCKET.Port=4445
-
-
-log4j.logger.org.apache=WARN