Author: dimuthul
Date: Sun Dec 16 22:09:45 2007
New Revision: 11199
Log:
Adding userstore changes ....... to support Common Infrastructure
Removed:
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultCommons.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/DefaultAuthorizer.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/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/DefaultAccessControlAdmin.java
(original)
+++
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultAccessControlAdmin.java
Sun Dec 16 22:09:45 2007
@@ -40,7 +40,7 @@
}else{
throw new UserManagerException("nullData");
}
- String uid = DefaultCommons.getUserId(userName, data);
+ String uid = data.getUserId(userName);
PreparedStatement clearUPStmt = dbConnection
.prepareStatement(data.getAccessControlAdminSQL(DefaultRealmConstants.DELETE_USER_PERMISSION));
@@ -63,7 +63,7 @@
throws UserManagerException {
String permissionId = this.getOrAddPermissionId(resourceId, action);
- String userId = DefaultCommons.getUserId(userName, data);
+ String userId = data.getUserId(userName);
if (userId == null) {
throw new UserManagerException("nullUser");
@@ -98,7 +98,7 @@
public void authorizeRole(String roleName, String resourceId, String
action)
throws UserManagerException {
- String roleId = DefaultCommons.getRoleId(roleName, data);
+ String roleId = data.getRoleId(roleName);
if (roleId == null) {
throw new UserManagerException("nullRole");
@@ -134,7 +134,7 @@
public void denyRole(String roleName, String resourceId, String action)
throws UserManagerException {
- String roleId = DefaultCommons.getRoleId(roleName, data);
+ String roleId = data.getRoleId(roleName);
if (roleId == null) {
throw new UserManagerException("nullRole");
@@ -188,7 +188,7 @@
throw new UserManagerException("nullData");
}
- String rid = DefaultCommons.getUserId(roleName, data);
+ String rid = data.getUserId(roleName);
PreparedStatement deleteRolesStmt = dbConnection
.prepareStatement(data.getAccessControlAdminSQL(DefaultRealmConstants.DELETE_ROLE_PERMISSION));
@@ -334,7 +334,7 @@
public void authorizeUser(String userName, String resourceId, String
action)
throws UserManagerException {
- String userId = DefaultCommons.getUserId(userName, data);
+ String userId = data.getUserId(userName);
if (userId == null) {
throw new UserManagerException("nullUser");
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
Sun Dec 16 22:09:45 2007
@@ -195,7 +195,7 @@
boolean onceAllowed = false;
if (isAuthorized == null) {
- String[] roles = DefaultCommons.getUserRoles(userName, data);
+ String[] roles = data.getUserRoles(userName);
for (int i = 0; i < roles.length; i++) {
String roleName = roles[i];
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
Sun Dec 16 22:09:45 2007
@@ -139,7 +139,7 @@
public void setUserProperties(String userName, Map properties)
throws UserManagerException {
- String userid = DefaultCommons.getUserId(userName, data);
+ String userid = data.getUserId(userName);
if (userid == null) {
throw new UserManagerException("nullUser");
}
@@ -189,7 +189,7 @@
public void setRoleProperties(String roleName, Map properties)
throws UserManagerException {
- String roleid = DefaultCommons.getRoleId(roleName, data);
+ String roleid = data.getRoleId(roleName);
if (roleid == null) {
throw new UserManagerException("nullRole");
}
@@ -284,8 +284,8 @@
public void addUserToRole(String userName, String roleName)
throws UserManagerException {
- String userid = DefaultCommons.getUserId(userName, data);
- String roleid = DefaultCommons.getRoleId(roleName, data);
+ String userid = data.getUserId(userName);
+ String roleid = data.getRoleId(roleName);
if (roleid == null || userid == null) {
throw new UserManagerException("nullData");
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
Sun Dec 16 22:09:45 2007
@@ -188,12 +188,12 @@
}
public String[] getUserRoles(String userName) throws UserManagerException {
- return DefaultCommons.getUserRoles(userName, data);
+ return data.getUserRoles(userName);
}
public boolean isExistingUser(String userName) throws UserManagerException
{
boolean isExisting = false;
- if (DefaultCommons.getUserId(userName, data) != null) {
+ if (data.getUserId(userName) != null) {
isExisting = true;
}
return isExisting;
Modified:
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/UserStoreData.java
==============================================================================
---
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/UserStoreData.java
(original)
+++
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/UserStoreData.java
Sun Dec 16 22:09:45 2007
@@ -1,5 +1,15 @@
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 org.wso2.usermanager.UserManagerException;
+import org.wso2.usermanager.pool.SimplePoolManager;
+
/**
* Represents the user store. If you change this object it will change the way
* the DefaultRealmBehaves.
@@ -232,4 +242,87 @@
}
return sqlString;
}
+
+ public String getUserId(String userName) throws UserManagerException {
+ String id = null;
+
+ SimplePoolManager poolMan = SimplePoolManager.getInstance();
+ Connection dbConnection = poolMan.getConnection();
+ if (dbConnection == null) {
+ throw new UserManagerException("null_connection");
+ }
+
+ try {
+ 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 {
+ poolMan.freeConnection(dbConnection);
+ SimplePoolManager.freeInstance();
+ }
+ return id;
+ }
+
+ public String getRoleId(String roleName) throws UserManagerException {
+ String id = null;
+
+ SimplePoolManager poolMan = SimplePoolManager.getInstance();
+ Connection dbConnection = poolMan.getConnection();
+ if (dbConnection == null) {
+ throw new UserManagerException("null_connection");
+ }
+ try {
+ 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 {
+ poolMan.freeConnection(dbConnection);
+ SimplePoolManager.freeInstance();
+ }
+ return id;
+ }
+
+
+ public String[] getUserRoles(String userName) throws UserManagerException {
+ String[] names = new String[0];
+ SimplePoolManager poolMan = SimplePoolManager.getInstance();
+ Connection dbConnection = poolMan.getConnection();
+ if (dbConnection == null) {
+ throw new UserManagerException("null_connection");
+ }
+ try {
+ 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 {
+ poolMan.freeConnection(dbConnection);
+ SimplePoolManager.freeInstance();
+ }
+ return names;
+ }
}
_______________________________________________
Commons-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/commons-dev
