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/02/07 19:36:04 UTC
svn commit: r504658 - in /incubator/ftpserver/trunk/core/src:
java/org/apache/ftpserver/usermanager/ test/org/apache/ftpserver/usermanager/
Author: ngn
Date: Wed Feb 7 11:36:03 2007
New Revision: 504658
URL: http://svn.apache.org/viewvc?view=rev&rev=504658
Log:
PropertiesUserManager now a POJO (no longer a implements Component)
Modified:
incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/usermanager/AbstractUserManager.java
incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/usermanager/DbUserManager.java
incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/usermanager/LdapUserManager.java
incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/usermanager/PropertiesUserManager.java
incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/usermanager/PropertiesUserManagerTest.java
incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/usermanager/UserManagerTestTemplate.java
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/usermanager/AbstractUserManager.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/usermanager/AbstractUserManager.java?view=diff&rev=504658&r1=504657&r2=504658
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/usermanager/AbstractUserManager.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/usermanager/AbstractUserManager.java Wed Feb 7 11:36:03 2007
@@ -19,7 +19,6 @@
package org.apache.ftpserver.usermanager;
-import org.apache.ftpserver.ftplet.Component;
import org.apache.ftpserver.ftplet.UserManager;
@@ -27,7 +26,7 @@
* Abstract common base type for {@link UserManager} implementations
*/
public abstract
-class AbstractUserManager implements UserManager, Component {
+class AbstractUserManager implements UserManager {
public static final String ATTR_LOGIN = "uid";
public static final String ATTR_PASSWORD = "userpassword";
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/usermanager/DbUserManager.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/usermanager/DbUserManager.java?view=diff&rev=504658&r1=504657&r2=504658
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/usermanager/DbUserManager.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/usermanager/DbUserManager.java Wed Feb 7 11:36:03 2007
@@ -33,6 +33,7 @@
import org.apache.ftpserver.ftplet.Authentication;
import org.apache.ftpserver.ftplet.AuthenticationFailedException;
import org.apache.ftpserver.ftplet.Authority;
+import org.apache.ftpserver.ftplet.Component;
import org.apache.ftpserver.ftplet.Configuration;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.User;
@@ -48,7 +49,7 @@
* file.
*/
public
-class DbUserManager extends AbstractUserManager {
+class DbUserManager extends AbstractUserManager implements Component {
private Log log;
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/usermanager/LdapUserManager.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/usermanager/LdapUserManager.java?view=diff&rev=504658&r1=504657&r2=504658
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/usermanager/LdapUserManager.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/usermanager/LdapUserManager.java Wed Feb 7 11:36:03 2007
@@ -38,6 +38,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.ftpserver.ftplet.Authentication;
import org.apache.ftpserver.ftplet.AuthenticationFailedException;
+import org.apache.ftpserver.ftplet.Component;
import org.apache.ftpserver.ftplet.Configuration;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.User;
@@ -48,7 +49,7 @@
* Here the assumption is that the java object schema is available (RFC 2713).
*/
public
-class LdapUserManager extends AbstractUserManager {
+class LdapUserManager extends AbstractUserManager implements Component {
// LDAP attributes
private final static String CN = "cn";
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/usermanager/PropertiesUserManager.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/usermanager/PropertiesUserManager.java?view=diff&rev=504658&r1=504657&r2=504658
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/usermanager/PropertiesUserManager.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/usermanager/PropertiesUserManager.java Wed Feb 7 11:36:03 2007
@@ -33,7 +33,6 @@
import org.apache.ftpserver.ftplet.Authentication;
import org.apache.ftpserver.ftplet.AuthenticationFailedException;
import org.apache.ftpserver.ftplet.Authority;
-import org.apache.ftpserver.ftplet.Configuration;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.User;
import org.apache.ftpserver.util.BaseProperties;
@@ -53,9 +52,9 @@
private Log log;
private BaseProperties userDataProp;
- private File userDataFile;
- private boolean isPasswordEncrypt;
- private String adminName;
+ private File userDataFile = new File("./res/user.gen");
+ private boolean isPasswordEncrypt = true;
+ private String adminName = "admin";
/**
@@ -65,12 +64,23 @@
log = factory.getInstance(getClass());
}
+ public void setPropFile(File propFile) {
+ this.userDataFile = propFile;
+ }
+
+ public void setPropPasswordEncrypt(boolean encryptPassword) {
+ this.isPasswordEncrypt = encryptPassword;
+ }
+
+ public void setAdmin(String adminName) {
+ this.adminName = adminName;
+ }
+
/**
* Configure user manager.
*/
- public void configure(Configuration config) throws FtpException {
+ public void configure() throws FtpException {
try {
- userDataFile = new File(config.getString("prop-file", "./res/user.gen"));
File dir = userDataFile.getParentFile();
if( (!dir.exists()) && (!dir.mkdirs()) ) {
String dirName = dir.getAbsolutePath();
@@ -78,9 +88,6 @@
}
userDataFile.createNewFile();
userDataProp = new BaseProperties(userDataFile);
-
- isPasswordEncrypt = config.getBoolean("prop-password-encrypt", true);
- adminName = config.getString("admin", "admin");
}
catch(IOException ex) {
log.fatal("PropertiesUserManager.configure()", ex);
Modified: incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/usermanager/PropertiesUserManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/usermanager/PropertiesUserManagerTest.java?view=diff&rev=504658&r1=504657&r2=504658
==============================================================================
--- incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/usermanager/PropertiesUserManagerTest.java (original)
+++ incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/usermanager/PropertiesUserManagerTest.java Wed Feb 7 11:36:03 2007
@@ -24,7 +24,6 @@
import java.io.IOException;
import java.util.Properties;
-import org.apache.ftpserver.config.PropertiesConfiguration;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.UserManager;
import org.apache.ftpserver.util.IoUtils;
@@ -57,18 +56,14 @@
fos.close();
}
-
- protected Properties createConfig() {
- Properties config = new Properties();
- config.setProperty("config.prop-file", USERS_FILE.getAbsolutePath());
- config.setProperty("config.prop-password-encrypt", "false");
- return config;
- }
+
protected UserManager createUserManager() throws FtpException {
PropertiesUserManager um = new PropertiesUserManager();
- um.configure(new PropertiesConfiguration(createConfig()));
+ um.setPropFile(USERS_FILE);
+ um.setPropPasswordEncrypt(false);
+ um.configure();
return um;
Modified: incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/usermanager/UserManagerTestTemplate.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/usermanager/UserManagerTestTemplate.java?view=diff&rev=504658&r1=504657&r2=504658
==============================================================================
--- incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/usermanager/UserManagerTestTemplate.java (original)
+++ incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/usermanager/UserManagerTestTemplate.java Wed Feb 7 11:36:03 2007
@@ -21,11 +21,9 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.Properties;
import junit.framework.TestCase;
-import org.apache.ftpserver.config.PropertiesConfiguration;
import org.apache.ftpserver.ftplet.Authentication;
import org.apache.ftpserver.ftplet.AuthenticationFailedException;
import org.apache.ftpserver.ftplet.Authority;
@@ -45,8 +43,6 @@
userManager = createUserManager();
}
- protected abstract Properties createConfig();
-
public void testAuthenticate() throws Exception {
assertNotNull(userManager.authenticate(new UsernamePasswordAuthentication("user1", "pw1")));
}
@@ -223,8 +219,7 @@
userManager.save(user);
- PropertiesUserManager newUserManager = new PropertiesUserManager();
- newUserManager.configure(new PropertiesConfiguration(createConfig()));
+ UserManager newUserManager = createUserManager();
User actualUser = newUserManager.getUserByName("newuser");
@@ -267,8 +262,7 @@
user.setPassword("newpw");
userManager.save(user);
- PropertiesUserManager newUserManager = new PropertiesUserManager();
- newUserManager.configure(new PropertiesConfiguration(createConfig()));
+ UserManager newUserManager = createUserManager();
User actualUser = newUserManager.getUserByName("newuser");