Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileObjectTestTemplate.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileObjectTestTemplate.java?rev=703244&r1=703243&r2=703244&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileObjectTestTemplate.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileObjectTestTemplate.java Thu Oct 9 13:05:23 2008 @@ -24,7 +24,7 @@ import org.apache.ftpserver.ftplet.AuthorizationRequest; import org.apache.ftpserver.ftplet.FtpFile; import org.apache.ftpserver.ftplet.User; -import org.apache.ftpserver.usermanager.BaseUser; +import org.apache.ftpserver.usermanager.impl.BaseUser; /** *
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileSystemViewTemplate.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileSystemViewTemplate.java?rev=703244&r1=703243&r2=703244&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileSystemViewTemplate.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileSystemViewTemplate.java Thu Oct 9 13:05:23 2008 @@ -21,7 +21,7 @@ import junit.framework.TestCase; -import org.apache.ftpserver.usermanager.BaseUser; +import org.apache.ftpserver.usermanager.impl.BaseUser; /** * Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/BaseUserTest.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/BaseUserTest.java?rev=703244&r1=703243&r2=703244&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/BaseUserTest.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/BaseUserTest.java Thu Oct 9 13:05:23 2008 @@ -23,6 +23,7 @@ import org.apache.ftpserver.ftplet.Authority; import org.apache.ftpserver.ftplet.AuthorizationRequest; +import org.apache.ftpserver.usermanager.impl.BaseUser; /** * Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/ClearTextDbUserManagerTest.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/ClearTextDbUserManagerTest.java?rev=703244&r1=703243&r2=703244&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/ClearTextDbUserManagerTest.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/ClearTextDbUserManagerTest.java Thu Oct 9 13:05:23 2008 @@ -22,8 +22,8 @@ import java.io.File; import org.apache.ftpserver.ftplet.FtpException; -import org.apache.ftpserver.ftplet.UserManager; import org.apache.ftpserver.test.TestUtil; +import org.apache.ftpserver.usermanager.impl.ClearTextPasswordEncryptor; /** * @@ -39,8 +39,8 @@ } - protected UserManager createUserManager() throws FtpException { - DbUserManager manager = (DbUserManager) super.createUserManager(); + protected UserManagerFactory createUserManagerFactory() throws FtpException { + DbUserManagerFactory manager = (DbUserManagerFactory) super.createUserManagerFactory(); manager.setPasswordEncryptor(new ClearTextPasswordEncryptor()); return manager; Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/ClearTextPasswordEncryptorTest.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/ClearTextPasswordEncryptorTest.java?rev=703244&r1=703243&r2=703244&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/ClearTextPasswordEncryptorTest.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/ClearTextPasswordEncryptorTest.java Thu Oct 9 13:05:23 2008 @@ -21,6 +21,8 @@ import junit.framework.TestCase; +import org.apache.ftpserver.usermanager.impl.ClearTextPasswordEncryptor; + /** * * @author The Apache MINA Project ([EMAIL PROTECTED]) Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/ConcurrentLoginPermissionTest.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/ConcurrentLoginPermissionTest.java?rev=703244&r1=703243&r2=703244&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/ConcurrentLoginPermissionTest.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/ConcurrentLoginPermissionTest.java Thu Oct 9 13:05:23 2008 @@ -21,6 +21,9 @@ import junit.framework.TestCase; +import org.apache.ftpserver.usermanager.impl.ConcurrentLoginPermission; +import org.apache.ftpserver.usermanager.impl.ConcurrentLoginRequest; + /** * * @author The Apache MINA Project ([EMAIL PROTECTED]) Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/DbUserManagerTest.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/DbUserManagerTest.java?rev=703244&r1=703243&r2=703244&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/DbUserManagerTest.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/DbUserManagerTest.java Thu Oct 9 13:05:23 2008 @@ -25,7 +25,6 @@ import java.sql.Statement; import org.apache.ftpserver.ftplet.FtpException; -import org.apache.ftpserver.ftplet.UserManager; import org.apache.ftpserver.test.TestUtil; import org.apache.ftpserver.util.IoUtils; import org.hsqldb.jdbc.jdbcDataSource; @@ -57,8 +56,8 @@ stm.execute(ddl); } - protected UserManager createUserManager() throws FtpException { - DbUserManager manager = new DbUserManager(); + protected UserManagerFactory createUserManagerFactory() throws FtpException { + DbUserManagerFactory manager = new DbUserManagerFactory(); manager.setDataSource(ds); manager Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/Md5PasswordEncryptorTest.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/Md5PasswordEncryptorTest.java?rev=703244&r1=703243&r2=703244&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/Md5PasswordEncryptorTest.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/Md5PasswordEncryptorTest.java Thu Oct 9 13:05:23 2008 @@ -19,6 +19,8 @@ package org.apache.ftpserver.usermanager; +import org.apache.ftpserver.usermanager.impl.Md5PasswordEncryptor; + /** * Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/PropertiesUserManagerTest.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/PropertiesUserManagerTest.java?rev=703244&r1=703243&r2=703244&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/PropertiesUserManagerTest.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/PropertiesUserManagerTest.java Thu Oct 9 13:05:23 2008 @@ -25,7 +25,7 @@ import java.util.Properties; import org.apache.ftpserver.ftplet.FtpException; -import org.apache.ftpserver.ftplet.UserManager; +import org.apache.ftpserver.usermanager.impl.ClearTextPasswordEncryptor; import org.apache.ftpserver.util.IoUtils; /** @@ -42,21 +42,21 @@ private void createUserFile() throws IOException { Properties users = new Properties(); - users.setProperty("FtpServer.user.user1.userpassword", "pw1"); - users.setProperty("FtpServer.user.user1.homedirectory", "home"); + users.setProperty("ftpserver.user.user1.userpassword", "pw1"); + users.setProperty("ftpserver.user.user1.homedirectory", "home"); - users.setProperty("FtpServer.user.user2.userpassword", "pw2"); - users.setProperty("FtpServer.user.user2.homedirectory", "home"); - users.setProperty("FtpServer.user.user2.writepermission", "true"); - users.setProperty("FtpServer.user.user2.enableflag", "false"); - users.setProperty("FtpServer.user.user2.idletime", "2"); - users.setProperty("FtpServer.user.user2.uploadrate", "5"); - users.setProperty("FtpServer.user.user2.downloadrate", "1"); - users.setProperty("FtpServer.user.user2.maxloginnumber", "3"); - users.setProperty("FtpServer.user.user2.maxloginperip", "4"); + users.setProperty("ftpserver.user.user2.userpassword", "pw2"); + users.setProperty("ftpserver.user.user2.homedirectory", "home"); + users.setProperty("ftpserver.user.user2.writepermission", "true"); + users.setProperty("ftpserver.user.user2.enableflag", "false"); + users.setProperty("ftpserver.user.user2.idletime", "2"); + users.setProperty("ftpserver.user.user2.uploadrate", "5"); + users.setProperty("ftpserver.user.user2.downloadrate", "1"); + users.setProperty("ftpserver.user.user2.maxloginnumber", "3"); + users.setProperty("ftpserver.user.user2.maxloginperip", "4"); - users.setProperty("FtpServer.user.user3.userpassword", ""); - users.setProperty("FtpServer.user.user3.homedirectory", "home"); + users.setProperty("ftpserver.user.user3.userpassword", ""); + users.setProperty("ftpserver.user.user3.homedirectory", "home"); FileOutputStream fos = new FileOutputStream(USERS_FILE); users.store(fos, null); @@ -64,11 +64,10 @@ fos.close(); } - protected UserManager createUserManager() throws FtpException { - PropertiesUserManager um = new PropertiesUserManager(); + protected UserManagerFactory createUserManagerFactory() throws FtpException { + PropertiesUserManagerFactory um = new PropertiesUserManagerFactory(); um.setFile(USERS_FILE); um.setPasswordEncryptor(new ClearTextPasswordEncryptor()); - um.configure(); return um; Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/SaltedPasswordEncryptorTest.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/SaltedPasswordEncryptorTest.java?rev=703244&r1=703243&r2=703244&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/SaltedPasswordEncryptorTest.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/SaltedPasswordEncryptorTest.java Thu Oct 9 13:05:23 2008 @@ -19,6 +19,8 @@ package org.apache.ftpserver.usermanager; +import org.apache.ftpserver.usermanager.impl.SaltedPasswordEncryptor; + /** * Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/UserManagerTestTemplate.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/UserManagerTestTemplate.java?rev=703244&r1=703243&r2=703244&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/UserManagerTestTemplate.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/UserManagerTestTemplate.java Thu Oct 9 13:05:23 2008 @@ -29,6 +29,13 @@ import org.apache.ftpserver.ftplet.Authority; import org.apache.ftpserver.ftplet.User; import org.apache.ftpserver.ftplet.UserManager; +import org.apache.ftpserver.usermanager.impl.BaseUser; +import org.apache.ftpserver.usermanager.impl.ConcurrentLoginPermission; +import org.apache.ftpserver.usermanager.impl.ConcurrentLoginRequest; +import org.apache.ftpserver.usermanager.impl.TransferRatePermission; +import org.apache.ftpserver.usermanager.impl.TransferRateRequest; +import org.apache.ftpserver.usermanager.impl.WritePermission; +import org.apache.ftpserver.usermanager.impl.WriteRequest; /** * @@ -40,7 +47,7 @@ protected UserManager userManager; - protected abstract UserManager createUserManager() throws Exception; + protected abstract UserManagerFactory createUserManagerFactory() throws Exception; /* * (non-Javadoc) @@ -49,7 +56,7 @@ */ @Override protected void setUp() throws Exception { - userManager = createUserManager(); + userManager = createUserManagerFactory().createUserManager(); } public void testAuthenticate() throws Exception { @@ -241,7 +248,7 @@ userManager.save(user); - UserManager newUserManager = createUserManager(); + UserManager newUserManager = createUserManagerFactory().createUserManager(); User actualUser = newUserManager.getUserByName("newuser"); @@ -283,7 +290,7 @@ user.setPassword("newpw"); userManager.save(user); - UserManager newUserManager = createUserManager(); + UserManager newUserManager = createUserManagerFactory().createUserManager(); User actualUser = newUserManager.getUserByName("newuser"); Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/WritePermissionTest.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/WritePermissionTest.java?rev=703244&r1=703243&r2=703244&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/WritePermissionTest.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/WritePermissionTest.java Thu Oct 9 13:05:23 2008 @@ -21,6 +21,9 @@ import junit.framework.TestCase; +import org.apache.ftpserver.usermanager.impl.WritePermission; +import org.apache.ftpserver.usermanager.impl.WriteRequest; + /** * * @author The Apache MINA Project ([EMAIL PROTECTED]) Modified: mina/ftpserver/trunk/core/src/test/resources/spring-config/config-spring-1.xml URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/resources/spring-config/config-spring-1.xml?rev=703244&r1=703243&r2=703244&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/resources/spring-config/config-spring-1.xml (original) +++ mina/ftpserver/trunk/core/src/test/resources/spring-config/config-spring-1.xml Thu Oct 9 13:05:23 2008 @@ -66,7 +66,7 @@ </ftplets> <!--<file-user-manager file="/tmp/foo.users" encrypt-passwords="true" />--> <user-manager> - <beans:bean class="org.apache.ftpserver.usermanager.PropertiesUserManager"/> + <beans:bean class="org.apache.ftpserver.config.spring.MockUserManager"/> </user-manager> <native-filesystem case-insensitive="true" create-home="true" /> <commands use-default="false">
