Author: dimuthul
Date: Sat Mar 8 06:24:45 2008
New Revision: 14601
Log:
Fixing the password update issue
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASUserStoreAdmin.java
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASUserStoreAdmin.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASUserStoreAdmin.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASUserStoreAdmin.java
Sat Mar 8 06:24:45 2008
@@ -28,7 +28,7 @@
extends WSASUserStoreReader implements UserStoreAdmin {
private static Log log = LogFactory.getLog(WSASUserStoreReader.class);
-
+
public WSASUserStoreAdmin(DataSource dSource, DefaultDataSupplier strategy)
throws UserStoreException {
super(dSource, strategy);
@@ -44,20 +44,17 @@
}
- public void addUser(String userName, Object credential)
- throws UserStoreException {
+ public void addUser(String userName, Object credential) throws
UserStoreException {
try {
UserAdmin admin = new UserAdmin();
- admin.addUser(userName, (String) credential,
- MashupConstants.MASHUP_USER_ROLE, "");
+ admin.addUser(userName, (String) credential,
MashupConstants.MASHUP_USER_ROLE, "");
} catch (AxisFault e) {
throw new UserStoreException(e.getMessage());
}
}
- public void addUserToRole(String userName, String roleName)
- throws UserStoreException {
+ public void addUserToRole(String userName, String roleName) throws
UserStoreException {
try {
UserAdmin admin = new UserAdmin();
admin.assignRoleToUser(userName, roleName);
@@ -106,9 +103,8 @@
}
}
- public void setRoleProperties(String roleName, Map properties)
- throws UserStoreException {
-
+ public void setRoleProperties(String roleName, Map properties) throws
UserStoreException {
+
Connection dbConnection = null;
try {
dbConnection = dataSource.getConnection();
@@ -116,15 +112,13 @@
throw new UserStoreException("null_connection");
}
dbConnection.setAutoCommit(false);
- PreparedStatement deleteRolePropsStmt = dbConnection
- .prepareStatement(data
-
.getUserStoreAdminSQL(DefaultRealmConstants.DELETE_ROLE_ATTRIBUTE));
+ PreparedStatement deleteRolePropsStmt =
dbConnection.prepareStatement(data
+
.getUserStoreAdminSQL(DefaultRealmConstants.DELETE_ROLE_ATTRIBUTE));
deleteRolePropsStmt.setString(1, roleName);
deleteRolePropsStmt.executeUpdate();
- PreparedStatement setRolePropertiesStmt = dbConnection
- .prepareStatement(data
-
.getUserStoreAdminSQL(DefaultRealmConstants.ADD_ROLE_ATTRIBUTE));
+ PreparedStatement setRolePropertiesStmt =
dbConnection.prepareStatement(data
+
.getUserStoreAdminSQL(DefaultRealmConstants.ADD_ROLE_ATTRIBUTE));
Iterator ite = properties.entrySet().iterator();
while (ite.hasNext()) {
@@ -158,11 +152,8 @@
}
}
}
-
-
- public void setUserProperties(String userName, Map properties)
- throws UserStoreException {
-
+
+ public void setUserProperties(String userName, Map properties) throws
UserStoreException {
Connection dbConnection = null;
try {
@@ -171,15 +162,13 @@
throw new UserStoreException("null_connection");
}
dbConnection.setAutoCommit(false);
- PreparedStatement deleteUserPropsStmt = dbConnection
- .prepareStatement(data
-
.getUserStoreAdminSQL(DefaultRealmConstants.DELETE_USER_ATTRIBUTE));
+ PreparedStatement deleteUserPropsStmt =
dbConnection.prepareStatement(data
+
.getUserStoreAdminSQL(DefaultRealmConstants.DELETE_USER_ATTRIBUTE));
deleteUserPropsStmt.setString(1, userName);
deleteUserPropsStmt.executeUpdate();
- PreparedStatement setUserPropertiesStmt = dbConnection
- .prepareStatement(data
-
.getUserStoreAdminSQL(DefaultRealmConstants.ADD_USER_ATTRIBUTE));
+ PreparedStatement setUserPropertiesStmt =
dbConnection.prepareStatement(data
+
.getUserStoreAdminSQL(DefaultRealmConstants.ADD_USER_ATTRIBUTE));
if (properties != null) {
Iterator ite = properties.entrySet().iterator();
@@ -211,28 +200,31 @@
throw new UserStoreException("errorClosingConnection", e);
}
}
-
- }
- public void updateUser(String userName, Object newCredential)
- throws UserStoreException {
- throw new UserStoreException("this method not supported");
}
- public void updateUser(String userName, Object newCredential,
- Object oldCredential) throws UserStoreException {
+ public void updateUser(String userName, Object newCredential) throws
UserStoreException {
try {
UserAdmin admin = new UserAdmin();
- admin.editUserPassword((String) oldCredential, userName,
- (String) newCredential);
+ admin.changeUserPassword(userName, (String) newCredential);
} catch (Exception e) {
throw new UserStoreException(e.getMessage());
}
}
- public void removeUserFromRole(String userName, String roleName)
+ public void updateUser(String userName, Object newCredential, Object
oldCredential)
throws UserStoreException {
+ try {
+ UserAdmin admin = new UserAdmin();
+ admin.editUserPassword((String) oldCredential, userName, (String)
newCredential);
+ } catch (Exception e) {
+ throw new UserStoreException(e.getMessage());
+ }
+
+ }
+
+ public void removeUserFromRole(String userName, String roleName) throws
UserStoreException {
try {
UserAdmin admin = new UserAdmin();
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
