Author: dimuthul
Date: Sun Jan 13 20:22:11 2008
New Revision: 12175
Log:
Fixing delete user problem.
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/HybridSQLStorage.java
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/HybridUserStoreAdmin.java
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/HybridSQLStorage.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/HybridSQLStorage.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/HybridSQLStorage.java
Sun Jan 13 20:22:11 2008
@@ -65,10 +65,10 @@
" and um_user_permissions.is_allowed=0";
public static final String DELETE_USER_PERMISSION = "delete from
um_user_permissions"+
- "where um_user_permissions.user_id=?";
+ " where um_user_permissions.user_id=?";
public static final String DELETE_ROLE_PERMISSION = "delete from
um_role_permissions"+
- "where um_role_permissions.user_id=?";
+ " where um_role_permissions.user_id=?";
public static final String GET_ROLE_ATTRIBUTES_SQL = "select *" +
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/HybridUserStoreAdmin.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/HybridUserStoreAdmin.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/HybridUserStoreAdmin.java
Sun Jan 13 20:22:11 2008
@@ -19,9 +19,7 @@
extends HybridUserStoreReader implements UserStoreAdmin {
private UserStoreAdmin defaultAdmin = null;
-
- protected DataSource dataSource = null;
-
+
public HybridUserStoreAdmin(DataSource dSource) throws
UserManagerException {
super(dSource);
HybridSQLStorage store = new HybridSQLStorage();
@@ -68,18 +66,15 @@
admin.deleteRoleCompletely(roleName);
defaultAdmin.setRoleProperties(roleName, new HashMap());
- try {
- dbConnection = dataSource.getConnection();
- PreparedStatement deleteUserStmt = dbConnection
-
.prepareStatement(HybridSQLStorage.DELETE_ROLE_PERMISSION);
- deleteUserStmt.setString(1, roleName);
- deleteUserStmt.executeUpdate();
- dbConnection.commit();
- deleteUserStmt.close();
- } catch (SQLException e) {
- throw new UserManagerException("errorModifyingUserStore", e);
- }
-
+ dbConnection = dataSource.getConnection();
+ PreparedStatement deleteUserStmt = dbConnection
+ .prepareStatement(HybridSQLStorage.DELETE_ROLE_PERMISSION);
+ deleteUserStmt.setString(1, roleName);
+ deleteUserStmt.executeUpdate();
+ dbConnection.commit();
+ deleteUserStmt.close();
+ } catch (SQLException e) {
+ throw new UserManagerException("errorModifyingUserStore", e);
} catch (AxisFault e) {
throw new UserManagerException(e.getMessage());
} finally {
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev