Author: dimuthul
Date: Wed Jan  2 01:48:58 2008
New Revision: 11743

Log:

Adding the SQLStorage 


Added:
   
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/SQLStorage.java
Removed:
   
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/UserStoreData.java
Modified:
   
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultAccessControlAdmin.java
   
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultAuthenticator.java
   
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultAuthorizer.java
   
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultRealm.java
   
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultUserStoreAdmin.java
   
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultUserStoreReader.java
   
trunk/commons/usermanager/modules/core/src/test/java/org/wso2/usermanager/readwrite/DefaultRealmTest.java

Modified: 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultAccessControlAdmin.java
==============================================================================
--- 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultAccessControlAdmin.java
  (original)
+++ 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultAccessControlAdmin.java
  Wed Jan  2 01:48:58 2008
@@ -21,11 +21,11 @@
         super(dataSource, algo);
     }
     
-    public DefaultAccessControlAdmin(DataSource dataSource, String algo, 
UserStoreData store) {
+    public DefaultAccessControlAdmin(DataSource dataSource, String algo, 
SQLStorage store) {
         super(dataSource, algo, store);
     }
     
-    public DefaultAccessControlAdmin(DataSource dataSource, UserStoreData 
store) {
+    public DefaultAccessControlAdmin(DataSource dataSource, SQLStorage store) {
         super(dataSource, DefaultRealmConfig.PERMISSION_BLOCK_FIRST, store);
     }
 

Modified: 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultAuthenticator.java
==============================================================================
--- 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultAuthenticator.java
       (original)
+++ 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultAuthenticator.java
       Wed Jan  2 01:48:58 2008
@@ -23,16 +23,20 @@
 
     protected DefaultRealm realm = null;
     
-    protected UserStoreData data = null;
+    protected SQLStorage data = null;
     
     public DefaultAuthenticator(DataSource dataSource) {
         this.dataSource = dataSource;
-        this.data = new UserStoreData(dataSource);
+        this.data = new SQLStorage(dataSource);
     }
     
-    public DefaultAuthenticator(DataSource dataSource, UserStoreData store) {
+    public DefaultAuthenticator(DataSource dataSource, SQLStorage store) {
         this.dataSource = dataSource;
-        this.data = store;
+        if(store != null){
+            this.data = store;
+        }else{
+            this.data = new SQLStorage(dataSource);
+        }
     }
 
     public boolean authenticate(String userName, Object credentials)
@@ -76,11 +80,11 @@
         return isAuth;
     }
 
-    public UserStoreData getData() {
+    public SQLStorage getData() {
         return data;
     }
 
-    public void setData(UserStoreData data) {
+    public void setData(SQLStorage data) {
         this.data = data;
     }
     

Modified: 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultAuthorizer.java
==============================================================================
--- 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultAuthorizer.java
  (original)
+++ 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultAuthorizer.java
  Wed Jan  2 01:48:58 2008
@@ -17,19 +17,23 @@
 public class DefaultAuthorizer implements Authorizer {
 
     protected DataSource dataSource = null;
-    protected UserStoreData data = null;
+    protected SQLStorage data = null;
     private static Log log = LogFactory.getLog(DefaultAuthorizer.class);
     private String algorithm = null;
     
     public DefaultAuthorizer(DataSource dataSource, String algo) {
         this.dataSource = dataSource;
-        this.data = new UserStoreData(dataSource);
+        this.data = new SQLStorage(dataSource);
         this.algorithm = algo;
     }
 
-    public DefaultAuthorizer(DataSource dataSource, String algo, UserStoreData 
store) {
+    public DefaultAuthorizer(DataSource dataSource, String algo, SQLStorage 
store) {
         this.dataSource = dataSource;
-        this.data = store;
+        if(store != null){
+            this.data = store;
+        }else{
+            this.data = new SQLStorage(dataSource);
+        }
         this.algorithm = algo;
     }
     
@@ -318,11 +322,11 @@
         return result;
     }
 
-    public UserStoreData getData() {
+    public SQLStorage getData() {
         return data;
     }
 
-    public void setData(UserStoreData data) {
+    public void setData(SQLStorage data) {
         this.data = data;
     }
     

Modified: 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultRealm.java
==============================================================================
--- 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultRealm.java
       (original)
+++ 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultRealm.java
       Wed Jan  2 01:48:58 2008
@@ -48,11 +48,12 @@
     protected DefaultUserStoreReader usReader = null;
 
     protected DataSource dataSource = null;
-
+    
+    protected SQLStorage sqlStore = null;
+    
     private static Log log = LogFactory.getLog(DefaultRealm.class);
 
     public DefaultRealm() {
-
     }
 
     public Object getRealmConfiguration() throws UserManagerException {
@@ -70,7 +71,7 @@
             return;
         }
         this.config = (DefaultRealmConfig) configBean;
-
+        
         if (config.getDataSource() == null) {
             BasicDataSource basicDataSource = new BasicDataSource();
             basicDataSource.setUrl(config.getConnectionURL());
@@ -84,13 +85,13 @@
 
         UUIDGenerator.getInitialUUID();
 
-        authenticator = new DefaultAuthenticator(dataSource);
+        authenticator = new DefaultAuthenticator(dataSource, sqlStore);
         authorizer = new DefaultAuthorizer(dataSource, config
-                .getPermissionAlgo());
+                .getPermissionAlgo(), sqlStore);
         aclAdmin = new DefaultAccessControlAdmin(dataSource, config
-                .getPermissionAlgo());
-        usAdmin = new DefaultUserStoreAdmin(dataSource);
-        usReader = new DefaultUserStoreReader(dataSource);
+                .getPermissionAlgo(), sqlStore);
+        usAdmin = new DefaultUserStoreAdmin(dataSource, sqlStore);
+        usReader = new DefaultUserStoreReader(dataSource, sqlStore);
 
     }
 
@@ -115,4 +116,22 @@
         return usReader;
     }
 
+    public DataSource getDataSource() {
+        return dataSource;
+    }
+
+    public void setDataSource(DataSource dataSource) {
+        this.dataSource = dataSource;
+    }
+
+    public SQLStorage getSqlStore() {
+        return sqlStore;
+    }
+
+    public void setSqlStore(SQLStorage sqlStore) {
+        this.sqlStore = sqlStore;
+    }
+    
+    
+
 }

Modified: 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultUserStoreAdmin.java
==============================================================================
--- 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultUserStoreAdmin.java
      (original)
+++ 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultUserStoreAdmin.java
      Wed Jan  2 01:48:58 2008
@@ -27,7 +27,7 @@
         super(dataSource);
     }
 
-    public DefaultUserStoreAdmin(DataSource dataSource, UserStoreData store) {
+    public DefaultUserStoreAdmin(DataSource dataSource, SQLStorage store) {
         super(dataSource, store);
     }
 

Modified: 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultUserStoreReader.java
==============================================================================
--- 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultUserStoreReader.java
     (original)
+++ 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultUserStoreReader.java
     Wed Jan  2 01:48:58 2008
@@ -22,16 +22,20 @@
     private static Log log = LogFactory.getLog(DefaultUserStoreReader.class);
 
     protected DataSource dataSource = null;
-    protected UserStoreData data = null;
+    protected SQLStorage data = null;
     
     public DefaultUserStoreReader(DataSource dataSource) {
         this.dataSource = dataSource;
-        this.data = new UserStoreData(dataSource);
+        this.data = new SQLStorage(dataSource);
     }
 
-    public DefaultUserStoreReader(DataSource dataSource, UserStoreData store) {
+    public DefaultUserStoreReader(DataSource dataSource, SQLStorage store) {
         this.dataSource = dataSource;
-        this.data = store;
+        if(store != null){
+            this.data = store;
+        }else{
+            this.data = new SQLStorage(dataSource);
+        }
     }
     
     public String[] getAllRoleNames() throws UserManagerException {
@@ -308,11 +312,11 @@
         return names;
     }
 
-    public UserStoreData getData() {
+    public SQLStorage getData() {
         return data;
     }
 
-    public void setData(UserStoreData data) {
+    public void setData(SQLStorage data) {
         this.data = data;
     }
     

Added: 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/SQLStorage.java
==============================================================================
--- (empty file)
+++ 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/SQLStorage.java
 Wed Jan  2 01:48:58 2008
@@ -0,0 +1,352 @@
+package org.wso2.usermanager.readwrite;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.sql.DataSource;
+
+import org.wso2.usermanager.UserManagerException;
+
+/**
+ * Represents the user store. If you change this object it will change the way
+ * the DefaultRealmBehaves.
+ */
+public class SQLStorage {
+
+    protected DataSource dataSource = null;
+    
+    public SQLStorage(DataSource dataSource){
+        this.dataSource = dataSource;
+    }
+    
+    public SQLStorage(){
+    
+    }
+    
+    protected String getColumnName(int columnID) {
+        String sqlString = null;
+        switch (columnID) {
+        case DefaultRealmConstants.COLUMN_ID_ATTR_NAME:
+            sqlString = DefaultRealmConstants.COLUMN_NAME_ATTR_NAME;
+            break;
+        case DefaultRealmConstants.COLUMN_ID_ATTR_VALUE:
+            sqlString = DefaultRealmConstants.COLUMN_NAME_ATTR_VALUE;
+            break;
+        case DefaultRealmConstants.COLUMN_ID_ID:
+            sqlString = DefaultRealmConstants.COLUMN_NAME_ID;
+            break;
+        case DefaultRealmConstants.COLUMN_ID_USER_NAME:
+            sqlString = DefaultRealmConstants.COLUMN_NAME_USER_NAME;
+            break;
+        case DefaultRealmConstants.COLUMN_ID_ROLE_NAME:
+            sqlString = DefaultRealmConstants.COLUMN_NAME_ROLE_NAME;
+            break;
+        case DefaultRealmConstants.COLUMN_ID_ROLE_ID:
+            sqlString = DefaultRealmConstants.COLUMN_NAME_ROLE_ID;
+            break;
+        case DefaultRealmConstants.COLUMN_ID_USER_ID:
+            sqlString = DefaultRealmConstants.COLUMN_NAME_USER_ID;
+            break;
+        case DefaultRealmConstants.COLUMN_ID_IS_ALLOWED:
+            sqlString = DefaultRealmConstants.COLUMN_NAME_IS_ALLOWED;
+            break;
+        case DefaultRealmConstants.COLUMN_ID_CREDENTIAL:
+            sqlString = DefaultRealmConstants.COLUMN_NAME_CREDENTIAL;
+            break;
+        case DefaultRealmConstants.COLUMN_ID_ACTION:
+            sqlString = DefaultRealmConstants.COLUMN_NAME_ACTION;
+            break;
+        default:
+            System.out.println("Null");
+            break;
+        }
+        return sqlString;
+
+    }
+    
+    protected String getAuthenticatorSQL(int sqlID){
+        String sqlString = null;
+        switch (sqlID) {
+        case DefaultRealmConstants.GET_USER:
+        sqlString = DefaultRealmConstants.GET_USER_SQL;
+        break;
+        default:
+            System.out.println("Null");
+            break;
+        }
+        return sqlString;
+    }
+    
+    
+    protected String getUserStoreAdminSQL(int sqlID) {
+        String sqlString = null;
+        switch (sqlID) {
+        case DefaultRealmConstants.ADD_USER:
+            sqlString = DefaultRealmConstants.ADD_USER_SQL;
+            break;
+        case DefaultRealmConstants.ADD_ROLE:
+            sqlString = DefaultRealmConstants.ADD_ROLE_SQL;
+            break;
+        case DefaultRealmConstants.ADD_USER_ROLE:
+            sqlString = DefaultRealmConstants.ADD_USER_ROLE_SQL;
+            break;
+        case DefaultRealmConstants.ADD_USER_ATTRIBUTE:
+            sqlString = DefaultRealmConstants.ADD_USER_ATTRIBUTE_SQL;
+            break;
+        case DefaultRealmConstants.ADD_ROLE_ATTRIBUTE:
+            sqlString = DefaultRealmConstants.ADD_ROLE_ATTRIBUTE_SQL;
+            break;
+        case DefaultRealmConstants.UPDATE_USER:
+            sqlString = DefaultRealmConstants.UPDATE_USER_SQL;
+            break;
+        case DefaultRealmConstants.DELETE_USER:
+            sqlString = DefaultRealmConstants.DELETE_USER_SQL;
+            break;
+        case DefaultRealmConstants.DELETE_ROLE:
+            sqlString = DefaultRealmConstants.DELETE_ROLE_SQL;
+            break;
+        case DefaultRealmConstants.DELETE_USER_ROLE:
+            sqlString = DefaultRealmConstants.DELETE_USER_ROLE_SQL;
+            break;
+        case DefaultRealmConstants.DELETE_ROLE_ATTRIBUTE:
+            sqlString = DefaultRealmConstants.DELETE_ROLE_ATTRIBUTE_SQL;
+            break;
+        case DefaultRealmConstants.DELETE_USER_ATTRIBUTE:
+            sqlString = DefaultRealmConstants.DELETE_USER_ATTRIBUTE_SQL;
+            break;
+        case DefaultRealmConstants.GET_ROLE:
+            sqlString = DefaultRealmConstants.GET_ROLE_SQL;
+            break;
+        default:
+            System.out.println("Null");
+            break;
+        }
+        return sqlString;
+    }
+
+    protected String getCommonSQL(int sqlID) {
+        String sqlString = null;
+        switch (sqlID) {
+        case DefaultRealmConstants.GET_USER_ID:
+            sqlString = DefaultRealmConstants.GET_USER_ID_SQL;
+            break;
+        case DefaultRealmConstants.GET_ROLE_ID:
+            sqlString = DefaultRealmConstants.GET_ROLE_ID_SQL;
+            break;
+        case DefaultRealmConstants.GET_USER_ROLES:
+            sqlString = DefaultRealmConstants.GET_USER_ROLES_SQL;
+            break;
+        default:
+            System.out.println("Null");
+            break;
+        }
+        return sqlString;
+    }
+
+    protected String getAccessControlAdminSQL(int sqlID) {
+        String sqlString = null;
+        switch (sqlID) {
+        case DefaultRealmConstants.ADD_PERMISSION:
+            sqlString = DefaultRealmConstants.ADD_PERMISSION_SQL;
+            break;
+        case DefaultRealmConstants.ADD_ROLE_PERMISSION:
+            sqlString = DefaultRealmConstants.ADD_ROLE_PERMISSION_SQL;
+            break;
+        case DefaultRealmConstants.ADD_USER_PERMISSION:
+            sqlString = DefaultRealmConstants.ADD_USER_PERMISSION_SQL;
+            break;
+
+        case DefaultRealmConstants.DELETE_PERMISSION_ON_RESOURCE:
+            sqlString = 
DefaultRealmConstants.DELETE_PERMISSION_ON_RESOURCE_SQL;
+            break;
+        case DefaultRealmConstants.DELETE_USER_PERMISSION:
+            sqlString = DefaultRealmConstants.DELETE_USER_PERMISSION_SQL;
+            break;
+        case DefaultRealmConstants.DELETE_ROLE_PERMISSION:
+            sqlString = DefaultRealmConstants.DELETE_ROLE_PERMISSION_SQL;
+            break;
+
+
+
+        default:
+            break;
+        }
+        return sqlString;
+    }
+
+    protected String getAuthorizerSQL(int sqlID) {
+        String sqlString = null;
+        switch (sqlID) {
+
+        case DefaultRealmConstants.GET_PERMISSION:
+            sqlString = DefaultRealmConstants.GET_PERMISSION_SQL;
+            break;
+        case DefaultRealmConstants.GET_ROLE_AUTHORIZED:
+            sqlString = DefaultRealmConstants.GET_ROLE_AUTHORIZED_SQL;
+            break;
+        case DefaultRealmConstants.GET_USER_AUTHORIZED:
+            sqlString = DefaultRealmConstants.GET_USER_AUTHORIZED_SQL;
+            break;
+        case DefaultRealmConstants.GET_ALLOWED_ROLES_FOR_RESOURCE:
+            sqlString = 
DefaultRealmConstants.GET_ALLOWED_ROLES_FOR_RESOURCE_SQL;
+            break;
+        case DefaultRealmConstants.GET_DENIED_ROLES_FOR_RESOURCE:
+            sqlString = 
DefaultRealmConstants.GET_DENIED_ROLES_FOR_RESOURCE_SQL;
+            break;
+        case DefaultRealmConstants.GET_ALLOWED_USERS_ON_RESOURCE:
+            sqlString = 
DefaultRealmConstants.GET_ALLOWED_USERS_ON_RESOURCE_SQL;
+            break;
+        case DefaultRealmConstants.GET_DENIED_USERS_ON_RESOURCE:
+            sqlString = DefaultRealmConstants.GET_DENIED_USERS_ON_RESOURCE_SQL;
+            break;
+        case DefaultRealmConstants.GET_ROLE_PERMISSION:
+            sqlString = DefaultRealmConstants.GET_ROLE_PERMISSION_SQL;
+            break;
+        case DefaultRealmConstants.GET_USER_PERMISSION:
+            sqlString = DefaultRealmConstants.GET_USER_PERMISSION_SQL;
+            break;
+        case DefaultRealmConstants.GET_RESOURCE_PERMISSION:
+            sqlString = DefaultRealmConstants.GET_RESOURCE_PERMISSION_SQL;
+            break;
+        default:
+            break;
+        }
+        return sqlString;
+    }
+
+    protected String getUserStoreReaderSQL(int sqlID) {
+        String sqlString = null;
+        switch (sqlID) {
+        case DefaultRealmConstants.GET_USER_ROLES:
+            sqlString = DefaultRealmConstants.GET_USER_ROLES_SQL;
+            break;
+        case DefaultRealmConstants.GET_ROLE_ATTRIBUTES:
+            sqlString = DefaultRealmConstants.GET_ROLE_ATTRIBUTES_SQL;
+            break;
+        case DefaultRealmConstants.GET_USER_ATTRIBUTES:
+            sqlString = DefaultRealmConstants.GET_USER_ATTRIBUTES_SQL;
+            break;
+        case DefaultRealmConstants.GET_ATTRIBUTE_NAMES:
+            sqlString = DefaultRealmConstants.GET_ATTRIBUTE_NAMES_SQL;
+            break;
+        case DefaultRealmConstants.GET_USERS_IN_ROLE:
+            sqlString = DefaultRealmConstants.GET_USERS_IN_ROLE_SQL;
+            break;
+        case DefaultRealmConstants.GET_USERS_WITH_PROPERTY:
+            sqlString = DefaultRealmConstants.GET_USERS_WITH_PROPERTY_SQL;
+            break;
+        case DefaultRealmConstants.GET_USERS_WITH_PROPERTY_VALUE:
+            sqlString = 
DefaultRealmConstants.GET_USERS_WITH_PROPERTY_VALUE_SQL;
+            break;
+        case DefaultRealmConstants.GET_USERS_ALL:
+            sqlString = DefaultRealmConstants.GET_USERS_ALL_SQL;
+            break;
+        case DefaultRealmConstants.GET_ROLES_ALL:
+            sqlString = DefaultRealmConstants.GET_ROLES_ALL_SQL;
+            break;
+        default:
+            break;
+        }
+        return sqlString;
+    }
+    
+    public String getUserId(String userName) throws UserManagerException {
+        String id = null;
+        Connection dbConnection = null;
+        try {
+            dbConnection = dataSource.getConnection();
+            if (dbConnection == null) {
+                throw new UserManagerException("null_connection");
+            }
+            PreparedStatement getUserIdStmt = dbConnection
+                    
.prepareStatement(this.getCommonSQL(DefaultRealmConstants.GET_USER_ID));
+            getUserIdStmt.setString(1, userName);
+            ResultSet rs = getUserIdStmt.executeQuery();
+            if (rs.next()) {
+                id = 
rs.getString(this.getColumnName(DefaultRealmConstants.COLUMN_ID_ID));
+            }
+            getUserIdStmt.close();
+        } catch (SQLException e) {
+            throw new UserManagerException("errorReadingFromUserStore", e);
+        } finally {
+            try {
+                if(dbConnection != null){
+                    dbConnection.close();
+                }
+            } catch (SQLException e) {
+                throw new UserManagerException("errorClosingConnection",e);
+            }
+        }
+        return id;
+    }
+
+    public String getRoleId(String roleName) throws UserManagerException {
+        String id = null;
+        Connection dbConnection = null;
+        try {
+            dbConnection = dataSource.getConnection();
+            if (dbConnection == null) {
+                throw new UserManagerException("null_connection");
+            }
+            PreparedStatement getRolIdStmt = dbConnection
+                    
.prepareStatement(this.getCommonSQL(DefaultRealmConstants.GET_ROLE_ID));
+            getRolIdStmt.setString(1, roleName);
+            ResultSet rs = getRolIdStmt.executeQuery();
+            if (rs.next()) {
+                id = 
rs.getString(this.getColumnName(DefaultRealmConstants.COLUMN_ID_ID));
+            }
+            
+            getRolIdStmt.close();
+        } catch (SQLException e) {
+            throw new UserManagerException("errorReadingFromUserStore", e);
+        } finally {
+            try {
+                if(dbConnection != null){
+                    dbConnection.close();
+                }
+            } catch (SQLException e) {
+                throw new UserManagerException("errorClosingConnection",e);
+            }
+        }
+        return id;
+    }
+    
+    
+    public String[] getUserRoles(String userName) throws UserManagerException {
+        String[] names = new String[0];
+        Connection dbConnection = null;
+        try {
+            dbConnection = dataSource.getConnection();
+            if (dbConnection == null) {
+                throw new UserManagerException("null_connection");
+            }
+            PreparedStatement getUserRolesStmt = 
dbConnection.prepareStatement(this.getCommonSQL(DefaultRealmConstants.GET_USER_ROLES));
+            getUserRolesStmt.setString(1, userName);
+            ResultSet rs = getUserRolesStmt.executeQuery();
+            List lst = new LinkedList();
+            String colName = 
this.getColumnName(DefaultRealmConstants.COLUMN_ID_ROLE_NAME);
+            while (rs.next()) {
+                lst.add(rs.getString(colName));
+            }
+            if (lst.size() > 0) {
+                names = (String[]) lst.toArray(new String[lst.size()]);
+            }
+            getUserRolesStmt.close();
+        } catch (SQLException e) {
+            throw new UserManagerException("errorReadingFromUserStore", e);
+        } finally {
+            try {
+                if(dbConnection != null){
+                    dbConnection.close();
+                }
+            } catch (SQLException e) {
+                throw new UserManagerException("errorClosingConnection",e);
+            }
+        }
+        return names;
+    } 
+}

Modified: 
trunk/commons/usermanager/modules/core/src/test/java/org/wso2/usermanager/readwrite/DefaultRealmTest.java
==============================================================================
--- 
trunk/commons/usermanager/modules/core/src/test/java/org/wso2/usermanager/readwrite/DefaultRealmTest.java
   (original)
+++ 
trunk/commons/usermanager/modules/core/src/test/java/org/wso2/usermanager/readwrite/DefaultRealmTest.java
   Wed Jan  2 01:48:58 2008
@@ -39,7 +39,7 @@
 
     DefaultRealmConfig config = null;
 
-    String connURL = "jdbc:derby:target/UserDatabase";
+    String connURL = "jdbc:derby:target/DefaultUserDatabase";
 
     
     protected void setUp() throws Exception {

_______________________________________________
Commons-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/commons-dev

Reply via email to