Id now is Long instead of Integer. First unit test is created. hibernate-3.5.jar...

[tools/siman.git] / Workspace / Siman-Common / src / org / splat / kernel / UserDirectory.java

diff --git a/Workspace/Siman-Common/src/org/splat/kernel/UserDirectory.java b/Workspace/Siman-Common/src/org/splat/kernel/UserDirectory.java
index e33de80148b59f94fc1e5d5e864fd950b301a6c5..e9eefeb66405989e0cad0241ca750b8982cd0e2d 100644 (file)
--- a/Workspace/Siman-Common/src/org/splat/kernel/UserDirectory.java
+++ b/Workspace/Siman-Common/src/org/splat/kernel/UserDirectory.java
@@ -69,7 +69,7 @@ public class UserDirectory {
        if (!xtag.equals("users")) throw new MismatchException("filetype");
                org.w3c.dom.NodeList   ulist    = inDoc.getElementsByTagName("user");
        
-        List<String>    result   = (List<String>)session.createSQLQuery("SELECT * FROM user").addScalar("username").list();
+        List<String>    result   = (List<String>)session.createSQLQuery("SELECT * FROM users").addScalar("username").list();
        HashSet<String> members  = new HashSet<String>();
        HashSet<User>   imported = new HashSet<User>();
        for (Iterator<String> i=result.iterator(); i.hasNext();) members.add(i.next());
@@ -155,13 +155,13 @@ public class UserDirectory {
        @SuppressWarnings("unchecked")                            // For the casting List<User>
        public static List<User> selectAllUsers () {
 //  ------------------------------------------
-         String query = "from User order by last asc, first asc";
+         String query = "FROM users order by last asc, first asc";
          return (List<User>)Database.getSession().createQuery(query).list();
        }
 
        public static User selectUser (String username) {
 //  -----------------------------------------------
-         StringBuffer  query = new StringBuffer("from User where username='").append(username).append("'");
+         StringBuffer  query = new StringBuffer("FROM users where username='").append(username).append("'");
          return (User)Database.getSession().createQuery(query.toString()).uniqueResult();
        }
 
@@ -169,7 +169,7 @@ public class UserDirectory {
 //  ----------------------------------------------------------------
 //WARNING: For not encoding the password here, we better call a selectUsersWhere(User.Properties),
 //         but this requires a getPassword in User.Properties nested class.
-         StringBuffer  query = new StringBuffer("from User where username='").append(username).append("' and password");
+         StringBuffer  query = new StringBuffer("FROM users where username='").append(username).append("' and password");
          if (password == null) query = query.append(" is null");
          else                  query = query.append("='").append(String.valueOf(password.hashCode())).append("'");
          
@@ -178,14 +178,14 @@ public class UserDirectory {
 
     public static User selectUser (int index) {
 //  -----------------------------------------
-      StringBuffer  query = new StringBuffer("from User where rid='").append(index).append("'");
+      StringBuffer  query = new StringBuffer("FROM users where rid='").append(index).append("'");
       return (User)Database.getSession().createQuery(query.toString()).uniqueResult();
        }
 
     @SuppressWarnings("unchecked")
        public static List<User> selectUsersWhere (User.Properties... uprop) {
 //  --------------------------------------------------------------------
-      StringBuffer query     = new StringBuffer("from User");
+      StringBuffer query     = new StringBuffer("FROM users");
       String       separator = " where (";
       String       value;