Author: ngn
Date: Wed Jul 30 11:05:19 2008
New Revision: 681154
URL: http://svn.apache.org/viewvc?rev=681154&view=rev
Log:
Replacing UID with USERID to make the DbUserManager work on Oracle
(FTPSERVER-60 & FTPSERVER-142)
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/AbstractUserManager.java
mina/ftpserver/trunk/distribution/res/ftp-db.sql
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/AbstractUserManager.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/AbstractUserManager.java?rev=681154&r1=681153&r2=681154&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/AbstractUserManager.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/AbstractUserManager.java
Wed Jul 30 11:05:19 2008
@@ -29,7 +29,7 @@
public abstract
class AbstractUserManager implements UserManager {
- public static final String ATTR_LOGIN = "uid";
+ public static final String ATTR_LOGIN = "userid";
public static final String ATTR_PASSWORD = "userpassword";
public static final String ATTR_HOME = "homedirectory";
public static final String ATTR_WRITE_PERM = "writepermission";
@@ -37,8 +37,8 @@
public static final String ATTR_MAX_IDLE_TIME = "idletime";
public static final String ATTR_MAX_UPLOAD_RATE = "uploadrate";
public static final String ATTR_MAX_DOWNLOAD_RATE = "downloadrate";
- public static final String ATTR_MAX_LOGIN_NUMBER = "maxloginnumber";
- public static final String ATTR_MAX_LOGIN_PER_IP = "maxloginperip";
+ public static final String ATTR_MAX_LOGIN_NUMBER = "maxloginnumber";
+ public static final String ATTR_MAX_LOGIN_PER_IP = "maxloginperip";
private String adminName = "admin";
Modified: mina/ftpserver/trunk/distribution/res/ftp-db.sql
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/distribution/res/ftp-db.sql?rev=681154&r1=681153&r2=681154&view=diff
==============================================================================
--- mina/ftpserver/trunk/distribution/res/ftp-db.sql (original)
+++ mina/ftpserver/trunk/distribution/res/ftp-db.sql Wed Jul 30 11:05:19 2008
@@ -16,7 +16,7 @@
-- under the License.
CREATE TABLE FTP_USER (
- uid VARCHAR(64) NOT NULL PRIMARY KEY,
+ userid VARCHAR(64) NOT NULL PRIMARY KEY,
userpassword VARCHAR(64),
homedirectory VARCHAR(128) NOT NULL,
enableflag BOOLEAN DEFAULT TRUE,
