From ftpserver-commits-return-248-apmail-incubator-ftpserver-commits-archive=incubator.apache.org@incubator.apache.org Sat Dec 08 22:03:46 2007 Return-Path: Delivered-To: apmail-incubator-ftpserver-commits-archive@www.apache.org Received: (qmail 19279 invoked from network); 8 Dec 2007 22:03:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Dec 2007 22:03:46 -0000 Received: (qmail 21863 invoked by uid 500); 8 Dec 2007 22:03:35 -0000 Delivered-To: apmail-incubator-ftpserver-commits-archive@incubator.apache.org Received: (qmail 21848 invoked by uid 500); 8 Dec 2007 22:03:35 -0000 Mailing-List: contact ftpserver-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ftpserver-dev@incubator.apache.org Delivered-To: mailing list ftpserver-commits@incubator.apache.org Received: (qmail 21837 invoked by uid 99); 8 Dec 2007 22:03:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Dec 2007 14:03:35 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Dec 2007 22:03:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 68E6D1A9832; Sat, 8 Dec 2007 14:03:25 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r602567 - in /incubator/ftpserver/trunk/core: ./ src/main/java/org/apache/ftpserver/message/ src/main/resources/ src/main/resources/org/ src/main/resources/org/apache/ src/main/resources/org/apache/ftpserver/ src/main/resources/org/apache/f... Date: Sat, 08 Dec 2007 22:03:24 -0000 To: ftpserver-commits@incubator.apache.org From: ngn@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071208220325.68E6D1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ngn Date: Sat Dec 8 14:03:23 2007 New Revision: 602567 URL: http://svn.apache.org/viewvc?rev=602567&view=rev Log: Restructuring to maven conventions Added: incubator/ftpserver/trunk/core/src/main/resources/ incubator/ftpserver/trunk/core/src/main/resources/org/ incubator/ftpserver/trunk/core/src/main/resources/org/apache/ incubator/ftpserver/trunk/core/src/main/resources/org/apache/ftpserver/ incubator/ftpserver/trunk/core/src/main/resources/org/apache/ftpserver/message/ incubator/ftpserver/trunk/core/src/main/resources/org/apache/ftpserver/message/FtpStatus.properties - copied unchanged from r602563, incubator/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/FtpStatus.properties incubator/ftpserver/trunk/core/src/main/resources/org/apache/ftpserver/message/FtpStatus_en.properties - copied unchanged from r602563, incubator/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/FtpStatus_en.properties incubator/ftpserver/trunk/core/src/main/resources/org/apache/ftpserver/message/FtpStatus_zh-tw.properties - copied unchanged from r602563, incubator/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/FtpStatus_zh-tw.properties incubator/ftpserver/trunk/core/src/test/resources/ incubator/ftpserver/trunk/core/src/test/resources/XmlConfigurationHandler-test.xml - copied unchanged from r602563, incubator/ftpserver/trunk/core/src/test/java/XmlConfigurationHandler-test.xml incubator/ftpserver/trunk/core/src/test/resources/dbusermanagertest-hsql.sql - copied unchanged from r602563, incubator/ftpserver/trunk/core/src/test/java/dbusermanagertest-hsql.sql incubator/ftpserver/trunk/core/src/test/resources/keymanager-test.jks - copied unchanged from r602563, incubator/ftpserver/trunk/core/src/test/java/keymanager-test.jks incubator/ftpserver/trunk/core/src/test/resources/log4j.properties - copied unchanged from r602563, incubator/ftpserver/trunk/core/src/test/java/log4j.properties incubator/ftpserver/trunk/core/src/test/resources/users.gen - copied unchanged from r602563, incubator/ftpserver/trunk/core/src/test/java/users.gen Removed: incubator/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/FtpStatus.properties incubator/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/FtpStatus_en.properties incubator/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/FtpStatus_zh-tw.properties incubator/ftpserver/trunk/core/src/test/java/XmlConfigurationHandler-test.xml incubator/ftpserver/trunk/core/src/test/java/dbusermanagertest-hsql.sql incubator/ftpserver/trunk/core/src/test/java/keymanager-test.jks incubator/ftpserver/trunk/core/src/test/java/log4j.properties incubator/ftpserver/trunk/core/src/test/java/users.gen Modified: incubator/ftpserver/trunk/core/pom.xml incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/XmlConfigurationTest.java incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/AliasKeymanagerTest.java incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/ExtendedAliasKeymanagerTest.java incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/DbUserManagerTest.java Modified: incubator/ftpserver/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/pom.xml?rev=602567&r1=602566&r2=602567&view=diff ============================================================================== --- incubator/ftpserver/trunk/core/pom.xml (original) +++ incubator/ftpserver/trunk/core/pom.xml Sat Dec 8 14:03:23 2007 @@ -17,6 +17,7 @@ + src/main/resources **/*.properties @@ -24,6 +25,7 @@ + src/test/resources *.properties Modified: incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java?rev=602567&r1=602566&r2=602567&view=diff ============================================================================== --- incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java (original) +++ incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java Sat Dec 8 14:03:23 2007 @@ -60,7 +60,7 @@ protected FTPClient client; - private static final File USERS_FILE = new File(TestUtil.getBaseDir(), "src/test/users.gen"); + private static final File USERS_FILE = new File(TestUtil.getBaseDir(), "src/test/resources/users.gen"); private static final File TEST_TMP_DIR = new File("test-tmp"); protected static final File ROOT_DIR = new File(TEST_TMP_DIR, "ftproot"); Modified: incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/XmlConfigurationTest.java URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/XmlConfigurationTest.java?rev=602567&r1=602566&r2=602567&view=diff ============================================================================== --- incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/XmlConfigurationTest.java (original) +++ incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/XmlConfigurationTest.java Sat Dec 8 14:03:23 2007 @@ -28,7 +28,7 @@ public class XmlConfigurationTest extends ConfigurationTestTemplate { protected Configuration createConfiguration() throws Exception { - File xmlFile = new File(TestUtil.getBaseDir(), "src/test/XmlConfigurationHandler-test.xml"); + File xmlFile = new File(TestUtil.getBaseDir(), "src/test/resources/XmlConfigurationHandler-test.xml"); FileInputStream fis = new FileInputStream(xmlFile); XmlConfigurationHandler handler = new XmlConfigurationHandler(fis); Modified: incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/AliasKeymanagerTest.java URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/AliasKeymanagerTest.java?rev=602567&r1=602566&r2=602567&view=diff ============================================================================== --- incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/AliasKeymanagerTest.java (original) +++ incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/AliasKeymanagerTest.java Sat Dec 8 14:03:23 2007 @@ -36,7 +36,7 @@ protected void setUp() throws Exception { KeyStore ks = KeyStore.getInstance("JKS"); - FileInputStream fis = new FileInputStream("src/test/keymanager-test.jks"); + FileInputStream fis = new FileInputStream("src/test/resources/keymanager-test.jks"); ks.load(fis, "".toCharArray()); KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509"); Modified: incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/ExtendedAliasKeymanagerTest.java URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/ExtendedAliasKeymanagerTest.java?rev=602567&r1=602566&r2=602567&view=diff ============================================================================== --- incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/ExtendedAliasKeymanagerTest.java (original) +++ incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/ExtendedAliasKeymanagerTest.java Sat Dec 8 14:03:23 2007 @@ -36,7 +36,7 @@ protected void setUp() throws Exception { KeyStore ks = KeyStore.getInstance("JKS"); - FileInputStream fis = new FileInputStream("src/test/keymanager-test.jks"); + FileInputStream fis = new FileInputStream("src/test/resources/keymanager-test.jks"); ks.load(fis, "".toCharArray()); KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509"); Modified: incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/DbUserManagerTest.java URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/DbUserManagerTest.java?rev=602567&r1=602566&r2=602567&view=diff ============================================================================== --- incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/DbUserManagerTest.java (original) +++ incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/DbUserManagerTest.java Sat Dec 8 14:03:23 2007 @@ -32,7 +32,7 @@ public class DbUserManagerTest extends UserManagerTestTemplate { - private static final File INIT_SQL_SCRIPT = new File(TestUtil.getBaseDir(), "src/test/dbusermanagertest-hsql.sql"); + private static final File INIT_SQL_SCRIPT = new File(TestUtil.getBaseDir(), "src/test/resources/dbusermanagertest-hsql.sql"); private jdbcDataSource ds; private Connection conn;