Author: ngn
Date: Wed Jul 30 11:10:28 2008
New Revision: 681159
URL: http://svn.apache.org/viewvc?rev=681159&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/command/SITE_DESCUSER.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/BaseUser.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/DbUserManagerTest.java
mina/ftpserver/trunk/core/src/test/resources/dbusermanagertest-hsql.sql
mina/ftpserver/trunk/distribution/res/conf/ftpd-full.xml
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_DESCUSER.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_DESCUSER.java?rev=681159&r1=681158&r2=681159&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_DESCUSER.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_DESCUSER.java
Wed Jul 30 11:10:28 2008
@@ -90,7 +90,7 @@
// send the user information
StringBuffer sb = new StringBuffer(128);
sb.append("\n");
- sb.append("uid : ").append(user.getName()).append("\n");
+ sb.append("userid : ").append(user.getName()).append("\n");
sb.append("userpassword : ********\n");
sb.append("homedirectory :
").append(user.getHomeDirectory()).append("\n");
sb.append("writepermission : ").append(user.authorize(new
WriteRequest())).append("\n");
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/BaseUser.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/BaseUser.java?rev=681159&r1=681158&r2=681159&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/BaseUser.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/BaseUser.java
Wed Jul 30 11:10:28 2008
@@ -31,7 +31,7 @@
* Generic user class.
* The user attributes are:
* <ul>
- * <li>uid</li>
+ * <li>userid</li>
* <li>userpassword</li>
* <li>enableflag</li>
* <li>homedirectory</li>
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=681159&r1=681158&r2=681159&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
Wed Jul 30 11:10:28 2008
@@ -51,13 +51,13 @@
DbUserManager manager = new DbUserManager();
manager.setDataSource(ds);
- manager.setSqlUserInsert("INSERT INTO FTP_USER (uid, userpassword,
homedirectory, enableflag, writepermission, idletime, uploadrate, downloadrate,
maxloginnumber, maxloginperip) VALUES ('{uid}', '{userpassword}',
'{homedirectory}', '{enableflag}', '{writepermission}', {idletime},
{uploadrate}, {downloadrate}, {maxloginnumber}, {maxloginperip})");
- manager.setSqlUserUpdate("UPDATE FTP_USER SET
userpassword='{userpassword}',homedirectory='{homedirectory}',enableflag='{enableflag}',writepermission='{writepermission}',idletime={idletime},uploadrate={uploadrate},downloadrate={downloadrate},maxloginnumber={maxloginnumber},
maxloginperip={maxloginperip} WHERE uid='{uid}'");
- manager.setSqlUserDelete("DELETE FROM FTP_USER WHERE uid = '{uid}'");
- manager.setSqlUserSelect("SELECT * FROM FTP_USER WHERE uid = '{uid}'");
- manager.setSqlUserSelectAll("SELECT uid FROM FTP_USER ORDER BY uid");
- manager.setSqlUserAuthenticate("SELECT uid FROM FTP_USER WHERE
uid='{uid}' AND userpassword='{userpassword}'");
- manager.setSqlUserAdmin("SELECT uid FROM FTP_USER WHERE uid='{uid}'
AND uid='admin'");
+ manager.setSqlUserInsert("INSERT INTO FTP_USER (userid, userpassword,
homedirectory, enableflag, writepermission, idletime, uploadrate, downloadrate,
maxloginnumber, maxloginperip) VALUES ('{userid}', '{userpassword}',
'{homedirectory}', '{enableflag}', '{writepermission}', {idletime},
{uploadrate}, {downloadrate}, {maxloginnumber}, {maxloginperip})");
+ manager.setSqlUserUpdate("UPDATE FTP_USER SET
userpassword='{userpassword}',homedirectory='{homedirectory}',enableflag='{enableflag}',writepermission='{writepermission}',idletime={idletime},uploadrate={uploadrate},downloadrate={downloadrate},maxloginnumber={maxloginnumber},
maxloginperip={maxloginperip} WHERE userid='{userid}'");
+ manager.setSqlUserDelete("DELETE FROM FTP_USER WHERE userid =
'{userid}'");
+ manager.setSqlUserSelect("SELECT * FROM FTP_USER WHERE userid =
'{userid}'");
+ manager.setSqlUserSelectAll("SELECT userid FROM FTP_USER ORDER BY
userid");
+ manager.setSqlUserAuthenticate("SELECT userid FROM FTP_USER WHERE
userid='{userid}' AND userpassword='{userpassword}'");
+ manager.setSqlUserAdmin("SELECT userid FROM FTP_USER WHERE
userid='{userid}' AND userid='admin'");
return manager;
Modified:
mina/ftpserver/trunk/core/src/test/resources/dbusermanagertest-hsql.sql
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/resources/dbusermanagertest-hsql.sql?rev=681159&r1=681158&r2=681159&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/resources/dbusermanagertest-hsql.sql
(original)
+++ mina/ftpserver/trunk/core/src/test/resources/dbusermanagertest-hsql.sql Wed
Jul 30 11:10:28 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,
@@ -28,8 +28,8 @@
maxloginperip INT DEFAULT 0
);
-INSERT INTO FTP_USER (uid, userpassword, homedirectory) VALUES ('user1',
'pw1', 'home');
+INSERT INTO FTP_USER (userid, userpassword, homedirectory) VALUES ('user1',
'pw1', 'home');
INSERT INTO FTP_USER VALUES ('user2', 'pw2', 'home', false, true, 2, 5, 1, 3,
4);
-INSERT INTO FTP_USER (uid, userpassword, homedirectory) VALUES ('user3', '',
'home');
-INSERT INTO FTP_USER (uid, userpassword, homedirectory) VALUES ('admin',
'admin', 'home');
+INSERT INTO FTP_USER (userid, userpassword, homedirectory) VALUES ('user3',
'', 'home');
+INSERT INTO FTP_USER (userid, userpassword, homedirectory) VALUES ('admin',
'admin', 'home');
Modified: mina/ftpserver/trunk/distribution/res/conf/ftpd-full.xml
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/distribution/res/conf/ftpd-full.xml?rev=681159&r1=681158&r2=681159&view=diff
==============================================================================
--- mina/ftpserver/trunk/distribution/res/conf/ftpd-full.xml (original)
+++ mina/ftpserver/trunk/distribution/res/conf/ftpd-full.xml Wed Jul 30
11:10:28 2008
@@ -52,24 +52,24 @@
<data-source>
<beans:bean class="some.datasoure.class" />
</data-source>
- <insert-user>INSERT INTO FTP_USER (uid, userpassword,
+ <insert-user>INSERT INTO FTP_USER (userid, userpassword,
homedirectory, enableflag, writepermission, idletime,
uploadrate,
- downloadrate) VALUES ('{uid}', '{userpassword}',
'{homedirectory}',
+ downloadrate) VALUES ('{userid}', '{userpassword}',
'{homedirectory}',
'{enableflag}', '{writepermission}', {idletime},
{uploadrate},
{downloadrate})</insert-user>
<update-user>UPDATE FTP_USER SET
userpassword='{userpassword}',homedirectory='{homedirectory}',enableflag='{enableflag}',writepermission='{writepermission}',idletime={idletime},uploadrate={uploadrate},downloadrate={downloadrate}
- WHERE uid='{uid}'</update-user>
- <delete-user>DELETE FROM FTP_USER WHERE uid = '{uid}'
+ WHERE userid='{userid}'</update-user>
+ <delete-user>DELETE FROM FTP_USER WHERE userid = '{userid}'
</delete-user>
- <select-user>SELECT uid, userpassword, homedirectory,
+ <select-user>SELECT userid, userpassword, homedirectory,
enableflag, writepermission, idletime, uploadrate,
downloadrate FROM
- FTP_USER WHERE uid = '{uid}'</select-user>
- <select-all-users>SELECT uid FROM FTP_USER ORDER BY uid
+ FTP_USER WHERE userid = '{userid}'</select-user>
+ <select-all-users>SELECT userid FROM FTP_USER ORDER BY userid
</select-all-users>
- <is-admin>SELECT uid FROM FTP_USER WHERE uid='{uid}' AND
- uid='admin'</is-admin>
- <authenticate>SELECT uid from FTP_USER WHERE uid='{uid}' AND
+ <is-admin>SELECT userid FROM FTP_USER WHERE userid='{userid}'
AND
+ userid='admin'</is-admin>
+ <authenticate>SELECT userid from FTP_USER WHERE
userid='{userid}' AND
userpassword='{userpassword}'</authenticate>
</db-user-manager> -->
<!-- The file system -->
