incubator-ftpserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r474820 - in /incubator/ftpserver/trunk: admin-gui/ core/ core/src/test/org/apache/ftpserver/clienttests/ core/src/test/org/apache/ftpserver/test/ core/xdocs/ ftplet-api/ ssl-tests/ ssl-tests/src/test/org/apache/ftpserver/ssl/
Date Tue, 14 Nov 2006 15:27:55 GMT
Author: ngn
Date: Tue Nov 14 07:27:54 2006
New Revision: 474820

URL: http://svn.apache.org/viewvc?view=rev&rev=474820
Log:
Finishing up the M2 build
Better dependency defintions, with exclusions
Fixes broken tests

Modified:
    incubator/ftpserver/trunk/admin-gui/pom.xml
    incubator/ftpserver/trunk/core/pom.xml
    incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/clienttests/ClientTestTemplate.java
    incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/test/TestUtil.java
    incubator/ftpserver/trunk/core/xdocs/draft-twine-ftpmd5-00.xml
    incubator/ftpserver/trunk/ftplet-api/pom.xml
    incubator/ftpserver/trunk/ssl-tests/pom.xml
    incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/SSLTestTemplate.java

Modified: incubator/ftpserver/trunk/admin-gui/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/admin-gui/pom.xml?view=diff&rev=474820&r1=474819&r2=474820
==============================================================================
--- incubator/ftpserver/trunk/admin-gui/pom.xml (original)
+++ incubator/ftpserver/trunk/admin-gui/pom.xml Tue Nov 14 07:27:54 2006
@@ -71,6 +71,24 @@
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
             <version>1.1</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>
     </dependencies>
 </project>

Modified: incubator/ftpserver/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/pom.xml?view=diff&rev=474820&r1=474819&r2=474820
==============================================================================
--- incubator/ftpserver/trunk/core/pom.xml (original)
+++ incubator/ftpserver/trunk/core/pom.xml Tue Nov 14 07:27:54 2006
@@ -66,8 +66,25 @@
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
             <version>1.1</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>
-
         
         <!-- Only used for testing -->
         <dependency>

Modified: incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/clienttests/ClientTestTemplate.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/clienttests/ClientTestTemplate.java?view=diff&rev=474820&r1=474819&r2=474820
==============================================================================
--- incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/clienttests/ClientTestTemplate.java
(original)
+++ incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/clienttests/ClientTestTemplate.java
Tue Nov 14 07:27:54 2006
@@ -68,7 +68,7 @@
     }
 
     protected Properties createDefaultConfig() {
-        assertTrue("users.gen must exist", USERS_FILE.exists());
+        assertTrue(USERS_FILE.getAbsolutePath() + " must exist", USERS_FILE.exists());
         
         Properties configProps = new Properties();
         configProps.setProperty("config.socket-factory.port", Integer
@@ -144,6 +144,7 @@
             client.connect("localhost", port);
         } catch(FTPConnectionClosedException e) {
             // try again
+            Thread.sleep(200);
             client.connect("localhost", port);
         }
     }

Modified: incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/test/TestUtil.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/test/TestUtil.java?view=diff&rev=474820&r1=474819&r2=474820
==============================================================================
--- incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/test/TestUtil.java (original)
+++ incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/test/TestUtil.java Tue Nov
14 07:27:54 2006
@@ -39,7 +39,7 @@
         if(basedir != null) {
             return new File(basedir);
         } else {
-            return new File("");
+            return new File(".");
         }
     }
     

Modified: incubator/ftpserver/trunk/core/xdocs/draft-twine-ftpmd5-00.xml
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/xdocs/draft-twine-ftpmd5-00.xml?view=diff&rev=474820&r1=474819&r2=474820
==============================================================================
--- incubator/ftpserver/trunk/core/xdocs/draft-twine-ftpmd5-00.xml (original)
+++ incubator/ftpserver/trunk/core/xdocs/draft-twine-ftpmd5-00.xml Tue Nov 14 07:27:54 2006
@@ -88,7 +88,7 @@
    Comments should be directed to James R. Twine (jtwine@jrtwine.com).
 
 J.Twine                      Internet-Draft                   [Page 1]
-
+
 INTERNET-DRAFT   The 'MD5' and "MMD5" FTP Command Extensions   May 2002
 
 Table of Contents
@@ -147,7 +147,7 @@
 
 
 J.Twine                      Internet-Draft                   [Page 2]
-
+
 INTERNET-DRAFT   The 'MD5' and "MMD5" FTP Command Extensions   May 2002
 
 1.  Introduction
@@ -206,7 +206,7 @@
 
 
 J.Twine                      Internet-Draft                   [Page 3]
-
+
 INTERNET-DRAFT   The 'MD5' and "MMD5" FTP Command Extensions   May 2002
 
    A Server implementation could even take that approach one step
@@ -265,7 +265,7 @@
    directory:
 
 J.Twine                      Internet-Draft                   [Page 4]
-
+
 INTERNET-DRAFT   The 'MD5' and "MMD5" FTP Command Extensions   May 2002
 
 	  C> MD5 ".."
@@ -324,7 +324,7 @@
 
 
 J.Twine                      Internet-Draft                   [Page 5]
-
+
 INTERNET-DRAFT   The 'MD5' and "MMD5" FTP Command Extensions   May 2002
    
    This second example demonstrates a request for the MD5 checksums 

Modified: incubator/ftpserver/trunk/ftplet-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/ftplet-api/pom.xml?view=diff&rev=474820&r1=474819&r2=474820
==============================================================================
--- incubator/ftpserver/trunk/ftplet-api/pom.xml (original)
+++ incubator/ftpserver/trunk/ftplet-api/pom.xml Tue Nov 14 07:27:54 2006
@@ -40,8 +40,26 @@
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
             <version>1.1</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>
-    </dependencies>
+        </dependencies>
     
     <properties>
         <maven.compile.source>1.3</maven.compile.source>

Modified: incubator/ftpserver/trunk/ssl-tests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/ssl-tests/pom.xml?view=diff&rev=474820&r1=474819&r2=474820
==============================================================================
--- incubator/ftpserver/trunk/ssl-tests/pom.xml (original)
+++ incubator/ftpserver/trunk/ssl-tests/pom.xml Tue Nov 14 07:27:54 2006
@@ -61,11 +61,35 @@
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
             <version>1.1</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>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.13</version>
             <scope>test</scope>
         </dependency>
         <dependency>

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=474820&r1=474819&r2=474820
==============================================================================
--- 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
Tue Nov 14 07:27:54 2006
@@ -26,6 +26,8 @@
 
 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;
@@ -35,7 +37,6 @@
 import org.apache.ftpserver.config.PropertiesConfiguration;
 import org.apache.ftpserver.interfaces.ServerFtpConfig;
 import org.apache.ftpserver.util.IoUtils;
-import org.apache.log4j.Logger;
 
 public abstract class SSLTestTemplate extends TestCase {
 
@@ -44,7 +45,7 @@
 
     private static final File FTPSERVER_KEYSTORE = new File(getBaseDir(), "src/test/ftpserver.jks");
 
-    private static final Logger log = Logger.getLogger(SSLTestTemplate.class);
+    private static final Log log = LogFactory.getLog(SSLTestTemplate.class);
 
     private static final int DEFAULT_PORT = 12321;
 
@@ -205,6 +206,7 @@
             client.connect("localhost", port);
         } catch (FTPConnectionClosedException e) {
             // try again
+            Thread.sleep(200);
             client.connect("localhost", port);
         }
     }



Mime
View raw message