Author: ngn Date: Fri Oct 31 07:00:43 2008 New Revision: 709420 URL: http://svn.apache.org/viewvc?rev=709420&view=rev Log: Improvements for OSGi for the UserManager (was unusable from OSGi due to encryptors not being visible and returning an private class in the factories
Added: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/ClearTextPasswordEncryptor.java (contents, props changed) - copied, changed from r706556, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/ClearTextPasswordEncryptor.java mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/Md5PasswordEncryptor.java (contents, props changed) - copied, changed from r706556, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/Md5PasswordEncryptor.java mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/SaltedPasswordEncryptor.java (contents, props changed) - copied, changed from r706556, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/SaltedPasswordEncryptor.java Removed: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/ClearTextPasswordEncryptor.java mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/Md5PasswordEncryptor.java mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/SaltedPasswordEncryptor.java Modified: mina/ftpserver/trunk/core/pom.xml mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/UserManagerBeanDefinitionParser.java mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/DbUserManagerFactory.java mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/PropertiesUserManagerFactory.java mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/AbstractUserManager.java mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ConnectTest.java mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/DbUserManagerConfigTest.java mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/FileUserManagerConfigTest.java mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTestTemplate.java mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/ClearTextDbUserManagerTest.java mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/ClearTextPasswordEncryptorTest.java mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/Md5PasswordEncryptorTest.java mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/PropertiesUserManagerTest.java mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/SaltedPasswordEncryptorTest.java Modified: mina/ftpserver/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/pom.xml?rev=709420&r1=709419&r2=709420&view=diff ============================================================================== --- mina/ftpserver/trunk/core/pom.xml (original) +++ mina/ftpserver/trunk/core/pom.xml Fri Oct 31 07:00:43 2008 @@ -67,6 +67,7 @@ <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor> <Export-Package> org.apache.ftpserver, org.apache.ftpserver.command, + org.apache.ftpserver.config.spring, org.apache.ftpserver.filesystem.nativefs, org.apache.ftpserver.ftpletcontainer, org.apache.ftpserver.listener, org.apache.ftpserver.main, @@ -75,7 +76,6 @@ </Export-Package> <Private-Package> org.apache.ftpserver.command.impl, org.apache.ftpserver.command.impl.listing, - org.apache.ftpserver.config.spring, org.apache.ftpserver.filesystem.nativefs.impl, org.apache.ftpserver.ftpletcontainer.impl, org.apache.ftpserver.impl, org.apache.ftpserver.listener.nio, Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/UserManagerBeanDefinitionParser.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/UserManagerBeanDefinitionParser.java?rev=709420&r1=709419&r2=709420&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/UserManagerBeanDefinitionParser.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/UserManagerBeanDefinitionParser.java Fri Oct 31 07:00:43 2008 @@ -19,11 +19,11 @@ package org.apache.ftpserver.config.spring; +import org.apache.ftpserver.usermanager.ClearTextPasswordEncryptor; import org.apache.ftpserver.usermanager.DbUserManagerFactory; +import org.apache.ftpserver.usermanager.Md5PasswordEncryptor; import org.apache.ftpserver.usermanager.PropertiesUserManagerFactory; -import org.apache.ftpserver.usermanager.impl.ClearTextPasswordEncryptor; -import org.apache.ftpserver.usermanager.impl.Md5PasswordEncryptor; -import org.apache.ftpserver.usermanager.impl.SaltedPasswordEncryptor; +import org.apache.ftpserver.usermanager.SaltedPasswordEncryptor; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanDefinitionHolder; import org.springframework.beans.factory.support.BeanDefinitionBuilder; Copied: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/ClearTextPasswordEncryptor.java (from r706556, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/ClearTextPasswordEncryptor.java) URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/ClearTextPasswordEncryptor.java?p2=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/ClearTextPasswordEncryptor.java&p1=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/ClearTextPasswordEncryptor.java&r1=706556&r2=709420&rev=709420&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/ClearTextPasswordEncryptor.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/ClearTextPasswordEncryptor.java Fri Oct 31 07:00:43 2008 @@ -17,9 +17,8 @@ * under the License. */ -package org.apache.ftpserver.usermanager.impl; +package org.apache.ftpserver.usermanager; -import org.apache.ftpserver.usermanager.PasswordEncryptor; Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/ClearTextPasswordEncryptor.java ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/ClearTextPasswordEncryptor.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/DbUserManagerFactory.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/DbUserManagerFactory.java?rev=709420&r1=709419&r2=709420&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/DbUserManagerFactory.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/DbUserManagerFactory.java Fri Oct 31 07:00:43 2008 @@ -24,7 +24,6 @@ import org.apache.ftpserver.FtpServerConfigurationException; import org.apache.ftpserver.ftplet.UserManager; import org.apache.ftpserver.usermanager.impl.DbUserManager; -import org.apache.ftpserver.usermanager.impl.Md5PasswordEncryptor; /** * Factory for database backed [EMAIL PROTECTED] UserManager} instances. @@ -54,7 +53,7 @@ private PasswordEncryptor passwordEncryptor = new Md5PasswordEncryptor(); - public DbUserManager createUserManager() { + public UserManager createUserManager() { if (dataSource == null) { throw new FtpServerConfigurationException( "Required data source not provided"); Copied: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/Md5PasswordEncryptor.java (from r706556, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/Md5PasswordEncryptor.java) URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/Md5PasswordEncryptor.java?p2=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/Md5PasswordEncryptor.java&p1=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/Md5PasswordEncryptor.java&r1=706556&r2=709420&rev=709420&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/Md5PasswordEncryptor.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/Md5PasswordEncryptor.java Fri Oct 31 07:00:43 2008 @@ -17,9 +17,8 @@ * under the License. */ -package org.apache.ftpserver.usermanager.impl; +package org.apache.ftpserver.usermanager; -import org.apache.ftpserver.usermanager.PasswordEncryptor; import org.apache.ftpserver.util.EncryptUtils; Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/Md5PasswordEncryptor.java ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/Md5PasswordEncryptor.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/PropertiesUserManagerFactory.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/PropertiesUserManagerFactory.java?rev=709420&r1=709419&r2=709420&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/PropertiesUserManagerFactory.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/PropertiesUserManagerFactory.java Fri Oct 31 07:00:43 2008 @@ -21,10 +21,8 @@ import java.io.File; -import org.apache.ftpserver.usermanager.impl.Md5PasswordEncryptor; +import org.apache.ftpserver.ftplet.UserManager; import org.apache.ftpserver.usermanager.impl.PropertiesUserManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Factory for the properties file based <code>UserManager</code> implementation. @@ -45,7 +43,7 @@ /** * Creates a [EMAIL PROTECTED] PropertiesUserManager} instance based on the provided configuration */ - public PropertiesUserManager createUserManager() { + public UserManager createUserManager() { return new PropertiesUserManager(passwordEncryptor, userDataFile, adminName); } Copied: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/SaltedPasswordEncryptor.java (from r706556, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/SaltedPasswordEncryptor.java) URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/SaltedPasswordEncryptor.java?p2=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/SaltedPasswordEncryptor.java&p1=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/SaltedPasswordEncryptor.java&r1=706556&r2=709420&rev=709420&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/SaltedPasswordEncryptor.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/SaltedPasswordEncryptor.java Fri Oct 31 07:00:43 2008 @@ -17,11 +17,10 @@ * under the License. */ -package org.apache.ftpserver.usermanager.impl; +package org.apache.ftpserver.usermanager; import java.security.SecureRandom; -import org.apache.ftpserver.usermanager.PasswordEncryptor; import org.apache.ftpserver.util.EncryptUtils; /** Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/SaltedPasswordEncryptor.java ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/SaltedPasswordEncryptor.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/AbstractUserManager.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/AbstractUserManager.java?rev=709420&r1=709419&r2=709420&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/AbstractUserManager.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/AbstractUserManager.java Fri Oct 31 07:00:43 2008 @@ -21,6 +21,7 @@ import org.apache.ftpserver.ftplet.FtpException; import org.apache.ftpserver.ftplet.UserManager; +import org.apache.ftpserver.usermanager.Md5PasswordEncryptor; import org.apache.ftpserver.usermanager.PasswordEncryptor; /** Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java?rev=709420&r1=709419&r2=709420&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java Fri Oct 31 07:00:43 2008 @@ -32,8 +32,8 @@ import org.apache.ftpserver.impl.DefaultFtpServer; import org.apache.ftpserver.listener.ListenerFactory; import org.apache.ftpserver.test.TestUtil; +import org.apache.ftpserver.usermanager.ClearTextPasswordEncryptor; import org.apache.ftpserver.usermanager.PropertiesUserManagerFactory; -import org.apache.ftpserver.usermanager.impl.ClearTextPasswordEncryptor; import org.apache.ftpserver.util.IoUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ConnectTest.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ConnectTest.java?rev=709420&r1=709419&r2=709420&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ConnectTest.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ConnectTest.java Fri Oct 31 07:00:43 2008 @@ -48,4 +48,5 @@ assertEquals(port, ((NioListener) server.getServerContext() .getListener("default")).getPort()); } + } Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/DbUserManagerConfigTest.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/DbUserManagerConfigTest.java?rev=709420&r1=709419&r2=709420&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/DbUserManagerConfigTest.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/DbUserManagerConfigTest.java Fri Oct 31 07:00:43 2008 @@ -19,9 +19,10 @@ package org.apache.ftpserver.config.spring; +import org.apache.ftpserver.FtpServer; import org.apache.ftpserver.impl.DefaultFtpServer; +import org.apache.ftpserver.usermanager.SaltedPasswordEncryptor; import org.apache.ftpserver.usermanager.impl.DbUserManager; -import org.apache.ftpserver.usermanager.impl.SaltedPasswordEncryptor; import org.hsqldb.jdbc.jdbcDataSource; /** @@ -33,7 +34,7 @@ public class DbUserManagerConfigTest extends SpringConfigTestTemplate { public void test() throws Throwable { - DefaultFtpServer server = createServer("<db-user-manager encrypt-passwords=\"salted\">" + DefaultFtpServer server = (DefaultFtpServer) createServer("<db-user-manager encrypt-passwords=\"salted\">" + "<data-source>" + " <beans:bean class=\"org.hsqldb.jdbc.jdbcDataSource\">" + " <beans:property name=\"database\" value=\"jdbc:hsqldb:mem:foo\" />" Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/FileUserManagerConfigTest.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/FileUserManagerConfigTest.java?rev=709420&r1=709419&r2=709420&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/FileUserManagerConfigTest.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/FileUserManagerConfigTest.java Fri Oct 31 07:00:43 2008 @@ -21,11 +21,12 @@ import java.io.File; +import org.apache.ftpserver.FtpServer; import org.apache.ftpserver.impl.DefaultFtpServer; -import org.apache.ftpserver.usermanager.impl.ClearTextPasswordEncryptor; -import org.apache.ftpserver.usermanager.impl.Md5PasswordEncryptor; +import org.apache.ftpserver.usermanager.ClearTextPasswordEncryptor; +import org.apache.ftpserver.usermanager.Md5PasswordEncryptor; +import org.apache.ftpserver.usermanager.SaltedPasswordEncryptor; import org.apache.ftpserver.usermanager.impl.PropertiesUserManager; -import org.apache.ftpserver.usermanager.impl.SaltedPasswordEncryptor; /** * @@ -38,7 +39,7 @@ private static final String USER_FILE_PATH = "src/test/resources/users.properties"; private PropertiesUserManager createPropertiesUserManager(String config) { - DefaultFtpServer server = createServer(config); + DefaultFtpServer server = (DefaultFtpServer) createServer(config); return (PropertiesUserManager) server.getUserManager(); } Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTestTemplate.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTestTemplate.java?rev=709420&r1=709419&r2=709420&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTestTemplate.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTestTemplate.java Fri Oct 31 07:00:43 2008 @@ -21,7 +21,7 @@ import junit.framework.TestCase; -import org.apache.ftpserver.impl.DefaultFtpServer; +import org.apache.ftpserver.FtpServer; import org.springframework.beans.factory.xml.XmlBeanFactory; import org.springframework.core.io.ByteArrayResource; @@ -33,7 +33,7 @@ */ public abstract class SpringConfigTestTemplate extends TestCase { - protected DefaultFtpServer createServer(String config) { + protected FtpServer createServer(String config) { String completeConfig = "<server id=\"server\" xmlns=\"http://mina.apache.org/ftpserver/spring/v1\" " + "xmlns:beans=\"http://www.springframework.org/schema/beans\" " + "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " @@ -47,7 +47,7 @@ XmlBeanFactory factory = new XmlBeanFactory( new ByteArrayResource(completeConfig.getBytes())); - return (DefaultFtpServer) factory.getBean("server"); + return (FtpServer) factory.getBean("server"); } } Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/ClearTextDbUserManagerTest.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/ClearTextDbUserManagerTest.java?rev=709420&r1=709419&r2=709420&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/ClearTextDbUserManagerTest.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/ClearTextDbUserManagerTest.java Fri Oct 31 07:00:43 2008 @@ -23,9 +23,9 @@ import org.apache.ftpserver.ftplet.FtpException; import org.apache.ftpserver.test.TestUtil; +import org.apache.ftpserver.usermanager.ClearTextPasswordEncryptor; import org.apache.ftpserver.usermanager.DbUserManagerFactory; import org.apache.ftpserver.usermanager.UserManagerFactory; -import org.apache.ftpserver.usermanager.impl.ClearTextPasswordEncryptor; /** * Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/ClearTextPasswordEncryptorTest.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/ClearTextPasswordEncryptorTest.java?rev=709420&r1=709419&r2=709420&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/ClearTextPasswordEncryptorTest.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/ClearTextPasswordEncryptorTest.java Fri Oct 31 07:00:43 2008 @@ -21,8 +21,8 @@ import junit.framework.TestCase; +import org.apache.ftpserver.usermanager.ClearTextPasswordEncryptor; import org.apache.ftpserver.usermanager.PasswordEncryptor; -import org.apache.ftpserver.usermanager.impl.ClearTextPasswordEncryptor; /** * Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/Md5PasswordEncryptorTest.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/Md5PasswordEncryptorTest.java?rev=709420&r1=709419&r2=709420&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/Md5PasswordEncryptorTest.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/Md5PasswordEncryptorTest.java Fri Oct 31 07:00:43 2008 @@ -19,8 +19,8 @@ package org.apache.ftpserver.usermanager.impl; +import org.apache.ftpserver.usermanager.Md5PasswordEncryptor; import org.apache.ftpserver.usermanager.PasswordEncryptor; -import org.apache.ftpserver.usermanager.impl.Md5PasswordEncryptor; /** Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/PropertiesUserManagerTest.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/PropertiesUserManagerTest.java?rev=709420&r1=709419&r2=709420&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/PropertiesUserManagerTest.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/PropertiesUserManagerTest.java Fri Oct 31 07:00:43 2008 @@ -25,9 +25,9 @@ import java.util.Properties; import org.apache.ftpserver.ftplet.FtpException; +import org.apache.ftpserver.usermanager.ClearTextPasswordEncryptor; import org.apache.ftpserver.usermanager.PropertiesUserManagerFactory; import org.apache.ftpserver.usermanager.UserManagerFactory; -import org.apache.ftpserver.usermanager.impl.ClearTextPasswordEncryptor; import org.apache.ftpserver.util.IoUtils; /** Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/SaltedPasswordEncryptorTest.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/SaltedPasswordEncryptorTest.java?rev=709420&r1=709419&r2=709420&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/SaltedPasswordEncryptorTest.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/SaltedPasswordEncryptorTest.java Fri Oct 31 07:00:43 2008 @@ -20,7 +20,7 @@ package org.apache.ftpserver.usermanager.impl; import org.apache.ftpserver.usermanager.PasswordEncryptor; -import org.apache.ftpserver.usermanager.impl.SaltedPasswordEncryptor; +import org.apache.ftpserver.usermanager.SaltedPasswordEncryptor; /**