incubator-ftpserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r511288 [3/3] - in /incubator/ftpserver: branches/perftest/ trunk/admin-gui/ trunk/admin-gui/src/java/org/apache/ftpserver/gui/ trunk/admin-gui/src/test/ trunk/core/ trunk/core/src/java/org/apache/ftpserver/ trunk/core/src/java/org/apache/f...
Date Sat, 24 Feb 2007 15:50:25 GMT
Modified: incubator/ftpserver/trunk/ssl-tests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/ssl-tests/pom.xml?view=diff&rev=511288&r1=511287&r2=511288
==============================================================================
--- incubator/ftpserver/trunk/ssl-tests/pom.xml (original)
+++ incubator/ftpserver/trunk/ssl-tests/pom.xml Sat Feb 24 07:50:22 2007
@@ -59,35 +59,18 @@
             <version>1.0-incubator-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>${commons-logging-version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>avalon-framework</groupId>
-                    <artifactId>avalon-framework</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>logkit</groupId>
-                    <artifactId>logkit</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
+         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>${junit-version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+	      <groupId>org.slf4j</groupId>
+	      <artifactId>slf4j-log4j12</artifactId>
+	      <version>${slf4j-version}</version>
+	      <scope>test</scope>
+	    </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>

Modified: incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/SSLTestTemplate.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/SSLTestTemplate.java?view=diff&rev=511288&r1=511287&r2=511288
==============================================================================
--- incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/SSLTestTemplate.java
(original)
+++ incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/SSLTestTemplate.java
Sat Feb 24 07:50:22 2007
@@ -28,8 +28,6 @@
 
 import junit.framework.TestCase;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.commons.net.ProtocolCommandEvent;
 import org.apache.commons.net.ProtocolCommandListener;
 import org.apache.commons.net.ftp.FTPConnectionClosedException;
@@ -41,17 +39,19 @@
 import org.apache.ftpserver.interfaces.FtpServerContext;
 import org.apache.ftpserver.listener.io.IOListener;
 import org.apache.ftpserver.util.IoUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class SSLTestTemplate extends TestCase {
 
+    private static final Logger LOG = LoggerFactory.getLogger(ConfigurableFtpServerContext.class);
+    
     private static final File USERS_FILE = new File(getBaseDir(), "src/test/users.gen");
     protected static final File FTPCLIENT_KEYSTORE = new File(getBaseDir(), "src/test/client.jks");
     protected static final char[] KEYSTORE_PASSWORD = "password".toCharArray();
 
     private static final File FTPSERVER_KEYSTORE = new File(getBaseDir(), "src/test/ftpserver.jks");
 
-    private static final Log log = LogFactory.getLog(SSLTestTemplate.class);
-
     private static final int DEFAULT_PORT = 12322;
 
     protected static final String ADMIN_PASSWORD = "admin";
@@ -205,12 +205,12 @@
         client.addProtocolCommandListener(new ProtocolCommandListener() {
 
             public void protocolCommandSent(ProtocolCommandEvent event) {
-                log.debug("> " + event.getMessage().trim());
+                LOG.debug("> " + event.getMessage().trim());
 
             }
 
             public void protocolReplyReceived(ProtocolCommandEvent event) {
-                log.debug("< " + event.getMessage().trim());
+                LOG.debug("< " + event.getMessage().trim());
             }
         });
 



Mime
View raw message