Author: dimuthul
Date: Tue Dec 18 01:18:47 2007
New Revision: 11359
Log:
Fixing bugs in this realm.
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/HybridUserStore.java
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/HybridUserStoreAdmin.java
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/create_wsas_registry_user_db.sql
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/HybridUserStore.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/HybridUserStore.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/HybridUserStore.java
Tue Dec 18 01:18:47 2007
@@ -21,7 +21,7 @@
public HybridUserStore() {
}
-
+
public static final String GET_ROLE_AUTHORIZED_SQL = "select" +
" um_role_permissions.is_allowed" +
" from um_role_permissions, um_permissions" +
@@ -70,8 +70,27 @@
public static final String DELETE_ROLE_PERMISSION = "delete from
um_role_permissions"+
"where um_role_permissions.user_id=?";
+
+ public static final String GET_ROLE_ATTRIBUTES_SQL = "select *" +
+ " from um_role_attributes" +
+ " where um_role_attributes.role_id=?";
+
+ public static final String GET_USER_ATTRIBUTES_SQL = "select *" +
+ " from um_user_attributes" +
+ " where um_user_attributes.user_id=?";
+
+ public static final String GET_USERS_WITH_PROPERTY_SQL = "select
user_name" +
+ " from um_user_attributes"+
+ " where um_user_attributes.attr_name=? and
um_user_attributes.attr_value=?";
+
+ public static final String GET_USERS_WITH_PROPERTY_VALUE_SQL = "select
user_name" +
+ " from um_user_attributes " +
+ " where um_user_attributes.attr_value=?";
+
+
+
protected String getAccessControlAdminSQL(int sqlID) {
- return super.getAccessControlAdminSQL(sqlID);
+ return super.getAccessControlAdminSQL(sqlID);
}
protected String getAuthenticatorSQL(int sqlID) {
@@ -160,19 +179,19 @@
String sqlString = null;
switch (sqlID) {
case DefaultRealmConstants.GET_ROLE_ATTRIBUTES:
- sqlString = DefaultRealmConstants.GET_ROLE_ATTRIBUTES_SQL;
+ sqlString = GET_ROLE_ATTRIBUTES_SQL;
break;
case DefaultRealmConstants.GET_USER_ATTRIBUTES:
- sqlString = DefaultRealmConstants.GET_USER_ATTRIBUTES_SQL;
+ sqlString = GET_USER_ATTRIBUTES_SQL;
break;
case DefaultRealmConstants.GET_ATTRIBUTE_NAMES:
sqlString = DefaultRealmConstants.GET_ATTRIBUTE_NAMES_SQL;
break;
case DefaultRealmConstants.GET_USERS_WITH_PROPERTY:
- sqlString = DefaultRealmConstants.GET_USERS_WITH_PROPERTY_SQL;
+ sqlString = GET_USERS_WITH_PROPERTY_SQL;
break;
case DefaultRealmConstants.GET_USERS_WITH_PROPERTY_VALUE:
- sqlString =
DefaultRealmConstants.GET_USERS_WITH_PROPERTY_VALUE_SQL;
+ sqlString = GET_USERS_WITH_PROPERTY_VALUE_SQL;
break;
default:
break;
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
Tue Dec 18 01:18:47 2007
@@ -77,15 +77,7 @@
deleteUserStmt.close();
} catch (SQLException e) {
throw new UserManagerException("errorModifyingUserStore", e);
- } finally {
- try {
- if(dbConnection != null){
- dbConnection.close();
- }
- } catch (SQLException e) {
- throw new UserManagerException("errorClosingConnection",e);
- }
- }
+ }
} catch (AxisFault e) {
@@ -119,15 +111,7 @@
deleteUserStmt.close();
} catch (SQLException e) {
throw new UserManagerException("errorModifyingUserStore", e);
- } finally {
- try {
- if(dbConnection != null){
- dbConnection.close();
- }
- } catch (SQLException e) {
- throw new UserManagerException("errorClosingConnection",e);
- }
- }
+ }
} catch (AxisFault e) {
throw new UserManagerException(e.getMessage());
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/create_wsas_registry_user_db.sql
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/create_wsas_registry_user_db.sql
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/create_wsas_registry_user_db.sql
Tue Dec 18 01:18:47 2007
@@ -1,5 +1,5 @@
-CREATE TABLE UM_USER_ATTRIBUTES (ID VARCHAR(255), ATTR_NAME VARCHAR(255) NOT
NULL, ATTR_VALUE VARCHAR(255), USER_ID VARCHAR(255), PRIMARY KEY (ID));
-CREATE TABLE UM_ROLE_ATTRIBUTES (ID VARCHAR(255), ATTR_NAME VARCHAR(255) NOT
NULL, ATTR_VALUE VARCHAR(255), ROLE_ID VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE UM_USER_ATTRIBUTES (ATTR_NAME VARCHAR(255) NOT NULL, ATTR_VALUE
VARCHAR(255), USER_ID VARCHAR(255), PRIMARY KEY (USER_ID));
+CREATE TABLE UM_ROLE_ATTRIBUTES (ATTR_NAME VARCHAR(255) NOT NULL, ATTR_VALUE
VARCHAR(255), ROLE_ID VARCHAR(255), PRIMARY KEY (ROLE_ID));
CREATE TABLE UM_PERMISSIONS (ID VARCHAR(255), RESOURCE_ID VARCHAR(255) NOT
NULL, ACTION VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
CREATE TABLE UM_ROLE_PERMISSIONS (ID VARCHAR(255), PERMISSION_ID VARCHAR(255),
ROLE_ID VARCHAR(255), IS_ALLOWED SMALLINT NOT NULL, FOREIGN KEY (PERMISSION_ID)
REFERENCES UM_PERMISSIONS(ID) ON DELETE CASCADE, PRIMARY KEY (ID));
CREATE TABLE UM_USER_PERMISSIONS (ID VARCHAR(255), IS_ALLOWED SMALLINT NOT
NULL, PERMISSION_ID VARCHAR(255), USER_ID VARCHAR(255), FOREIGN KEY
(PERMISSION_ID) REFERENCES UM_PERMISSIONS(ID) ON DELETE CASCADE, PRIMARY KEY
(ID));
\ No newline at end of file
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
