You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ftpserver-commits@incubator.apache.org by ng...@apache.org on 2007/12/08 22:03:24 UTC
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...
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 @@
<build>
<resources>
<resource>
+ <directory>src/main/resources</directory>
<includes>
<include>**/*.properties</include>
</includes>
@@ -24,6 +25,7 @@
</resources>
<testResources>
<testResource>
+ <directory>src/test/resources</directory>
<includes>
<include>*.properties</include>
</includes>
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;