Author: chathura
Date: Wed Dec 5 03:41:51 2007
New Revision: 10549
Log:
Implementing proper error handling in the UI.
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AddTagAction.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AddUserRoleAction.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AuthorizationAction.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/CollectionViewAction.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/CommentAction.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RateAction.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RemoveRoleAction.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RemoveUserAction.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RemoveUserRoleAction.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RoleAuthorizationAction.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/SearchAction.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/SignInAction.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/UserDetailsAction.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/UserManagementAction.java
trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AddTagAction.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AddTagAction.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AddTagAction.java
Wed Dec 5 03:41:51 2007
@@ -26,10 +26,10 @@
private String path;
private String tag;
- public String execute(HttpServletRequest request) throws Exception {
+ public String execute(HttpServletRequest request) throws RegistryException
{
setRequest(request);
-
+
if (path == null || path.length() == 0) {
return ERROR;
}
@@ -40,11 +40,7 @@
Registry reg = getRegistry();
- try {
- reg.applyTag(path, tag);
- } catch (RegistryException e) {
- return ERROR;
- }
+ reg.applyTag(path, tag);
return SUCCESS;
}
@@ -59,7 +55,7 @@
if (path.indexOf("?") > 0) {
path = path.split("\\?")[0];
}
-
+
this.path = path;
}
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AddUserRoleAction.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AddUserRoleAction.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AddUserRoleAction.java
Wed Dec 5 03:41:51 2007
@@ -17,7 +17,9 @@
package org.wso2.registry.web.actions;
import org.wso2.registry.secure.SecureRegistry;
+import org.wso2.registry.RegistryException;
import org.wso2.usermanager.Realm;
+import org.wso2.usermanager.UserManagerException;
import javax.servlet.http.HttpServletRequest;
@@ -26,7 +28,7 @@
private String userName;
private String roleName;
- public String execute(HttpServletRequest request) throws Exception {
+ public String execute(HttpServletRequest request) throws RegistryException
{
setRequest(request);
@@ -37,7 +39,12 @@
SecureRegistry registry = (SecureRegistry) getRegistry();
Realm realm = registry.getUserManager().getRealm();
- realm.getUserStoreAdmin().addUserToRole(userName, roleName);
+ try {
+ realm.getUserStoreAdmin().addUserToRole(userName, roleName);
+ } catch (UserManagerException e) {
+ String msg = "Could not add the user " + userName + " to the role
" + roleName + ". Caused by: " + e.getMessage();
+ throw new RegistryException(msg);
+ }
return SUCCESS;
}
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AuthorizationAction.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AuthorizationAction.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AuthorizationAction.java
Wed Dec 5 03:41:51 2007
@@ -19,6 +19,7 @@
import org.wso2.registry.secure.SecureRegistry;
import org.wso2.registry.secure.RegistryUserManager;
import org.wso2.registry.ActionConstants;
+import org.wso2.registry.RegistryException;
import javax.servlet.http.HttpServletRequest;
@@ -30,7 +31,7 @@
private String actionToAuthorize;
private String permissionType;
- public String execute(HttpServletRequest request) throws Exception {
+ public String execute(HttpServletRequest request) throws RegistryException
{
setRequest(request);
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/CollectionViewAction.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/CollectionViewAction.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/CollectionViewAction.java
Wed Dec 5 03:41:51 2007
@@ -19,6 +19,7 @@
import org.wso2.registry.Registry;
import org.wso2.registry.RegistryConstants;
import org.wso2.registry.Resource;
+import org.wso2.registry.RegistryException;
import org.wso2.registry.secure.AuthorizationFailedException;
import org.wso2.registry.web.actions.utils.ResourceData;
import org.wso2.registry.web.actions.utils.ResourcePath;
@@ -36,7 +37,7 @@
private String errorMessage;
private List navigatablePaths = new ArrayList();
- public String execute(HttpServletRequest request) throws Exception {
+ public String execute(HttpServletRequest request) throws RegistryException
{
setRequest(request);
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/CommentAction.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/CommentAction.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/CommentAction.java
Wed Dec 5 03:41:51 2007
@@ -27,10 +27,10 @@
private String path;
private String commentText;
- public String execute(HttpServletRequest request) throws Exception {
+ public String execute(HttpServletRequest request) throws RegistryException
{
setRequest(request);
-
+
if (path == null || path.length() == 0) {
return ERROR;
}
@@ -41,11 +41,7 @@
Registry registry = getRegistry();
- try {
- registry.addComment(path, new Comment(commentText));
- } catch (RegistryException e) {
- return ERROR;
- }
+ registry.addComment(path, new Comment(commentText));
return SUCCESS;
}
@@ -60,7 +56,7 @@
if (path.indexOf("?") > 0) {
path = path.split("\\?")[0];
}
-
+
this.path = path;
}
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RateAction.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RateAction.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RateAction.java
Wed Dec 5 03:41:51 2007
@@ -24,7 +24,7 @@
private String path;
private String rating;
- public String execute() throws Exception {
+ public String execute() throws RegistryException {
if (path == null || path.length() == 0) {
return ERROR;
@@ -34,20 +34,11 @@
return ERROR;
}
- int ratingValue;
- try {
- ratingValue = Integer.parseInt(rating);
- } catch (NumberFormatException e) {
- return ERROR;
- }
+ int ratingValue = Integer.parseInt(rating);
Registry registry = getRegistry();
- try {
- registry.rateResource(path, ratingValue);
- } catch (RegistryException e) {
- return ERROR;
- }
+ registry.rateResource(path, ratingValue);
return SUCCESS;
}
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RemoveRoleAction.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RemoveRoleAction.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RemoveRoleAction.java
Wed Dec 5 03:41:51 2007
@@ -18,6 +18,7 @@
import org.wso2.registry.secure.SecureRegistry;
import org.wso2.registry.secure.RegistryUserManager;
+import org.wso2.registry.RegistryException;
import javax.servlet.http.HttpServletRequest;
@@ -25,7 +26,7 @@
private String roleName;
- public String execute(HttpServletRequest request) throws Exception {
+ public String execute(HttpServletRequest request) throws RegistryException
{
setRequest(request);
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RemoveUserAction.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RemoveUserAction.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RemoveUserAction.java
Wed Dec 5 03:41:51 2007
@@ -18,6 +18,7 @@
import org.wso2.registry.secure.SecureRegistry;
import org.wso2.registry.secure.RegistryUserManager;
+import org.wso2.registry.RegistryException;
import javax.servlet.http.HttpServletRequest;
@@ -25,7 +26,7 @@
private String userName;
- public String execute(HttpServletRequest request) throws Exception {
+ public String execute(HttpServletRequest request) throws RegistryException
{
setRequest(request);
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RemoveUserRoleAction.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RemoveUserRoleAction.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RemoveUserRoleAction.java
Wed Dec 5 03:41:51 2007
@@ -17,7 +17,9 @@
package org.wso2.registry.web.actions;
import org.wso2.registry.secure.SecureRegistry;
+import org.wso2.registry.RegistryException;
import org.wso2.usermanager.Realm;
+import org.wso2.usermanager.UserManagerException;
import javax.servlet.http.HttpServletRequest;
@@ -26,14 +28,19 @@
private String userName;
private String roleName;
- public String execute(HttpServletRequest request) throws Exception {
+ public String execute(HttpServletRequest request) throws RegistryException
{
setRequest(request);
SecureRegistry registry = (SecureRegistry) getRegistry();
Realm realm = registry.getUserManager().getRealm();
- realm.getUserStoreAdmin().removeUserFromRole(userName, roleName);
+ try {
+ realm.getUserStoreAdmin().removeUserFromRole(userName, roleName);
+ } catch (UserManagerException e) {
+ String msg = "Could not remove the user " + userName + " from the
role " + roleName + ". Caused by: " + e.getMessage();
+ throw new RegistryException(msg);
+ }
return SUCCESS;
}
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java
Wed Dec 5 03:41:51 2007
@@ -22,6 +22,7 @@
import org.wso2.registry.secure.RegistryUserManager;
import org.wso2.registry.secure.SecureRegistry;
import org.wso2.usermanager.Realm;
+import org.wso2.usermanager.UserManagerException;
import javax.servlet.http.HttpServletRequest;
import java.util.*;
@@ -60,7 +61,7 @@
*/
private List roleNames = new ArrayList();
- public String execute(HttpServletRequest request) throws Exception {
+ public String execute(HttpServletRequest request) throws RegistryException
{
setRequest(request);
@@ -160,129 +161,134 @@
Realm realm = userManager.getRealm();
- String[] rolesArray = realm.getUserStoreReader().getAllRoleNames();
- for (int i = 0; i < rolesArray.length; i++) {
- roleNames.add(rolesArray[i]);
- }
-
- if (realm.getAuthorizer().isUserAuthorized(getUserName(), path,
ActionConstants.PUT)) {
- putAllowed = true;
- }
-
- Map userPermissionMap = new HashMap();
-
- String[] raUsers =
realm.getAuthorizer().getAllowedUsersForResource(path, ActionConstants.GET);
- for (int i = 0; i < raUsers.length; i++) {
- if (userPermissionMap.containsKey(raUsers[i])) {
- Permission permission = (Permission)
userPermissionMap.get(raUsers[i]);
- permission.setReadAllow(true);
- } else {
- Permission permission = new Permission();
- permission.setUserName(raUsers[i]);
- permission.setReadAllow(true);
- userPermissionMap.put(raUsers[i], permission);
- }
- }
-
- String[] rdUsers =
realm.getAuthorizer().getDeniedUsersForResource(path, ActionConstants.GET);
- for (int i = 0; i < rdUsers.length; i++) {
- if (userPermissionMap.containsKey(rdUsers[i])) {
- Permission permission = (Permission)
userPermissionMap.get(rdUsers[i]);
- permission.setReadDeny(true);
- } else {
- Permission permission = new Permission();
- permission.setUserName(rdUsers[i]);
- permission.setReadDeny(true);
- userPermissionMap.put(rdUsers[i], permission);
- }
- }
-
- String[] waUsers =
realm.getAuthorizer().getAllowedUsersForResource(path, ActionConstants.PUT);
- for (int i = 0; i < waUsers.length; i++) {
- if (userPermissionMap.containsKey(waUsers[i])) {
- Permission permission = (Permission)
userPermissionMap.get(waUsers[i]);
- permission.setWriteAllow(true);
- } else {
- Permission permission = new Permission();
- permission.setUserName(waUsers[i]);
- permission.setWriteAllow(true);
- userPermissionMap.put(waUsers[i], permission);
- }
- }
-
- String[] wdUsers =
realm.getAuthorizer().getDeniedUsersForResource(path, ActionConstants.PUT);
- for (int i = 0; i < wdUsers.length; i++) {
- if (userPermissionMap.containsKey(wdUsers[i])) {
- Permission permission = (Permission)
userPermissionMap.get(wdUsers[i]);
- permission.setWriteDeny(true);
- } else {
- Permission permission = new Permission();
- permission.setUserName(wdUsers[i]);
- permission.setWriteDeny(true);
- userPermissionMap.put(wdUsers[i], permission);
- }
- }
+ try {
+ String[] rolesArray = realm.getUserStoreReader().getAllRoleNames();
+ for (int i = 0; i < rolesArray.length; i++) {
+ roleNames.add(rolesArray[i]);
+ }
+
+ if (realm.getAuthorizer().isUserAuthorized(getUserName(), path,
ActionConstants.PUT)) {
+ putAllowed = true;
+ }
+
+ Map userPermissionMap = new HashMap();
+
+ String[] raUsers =
realm.getAuthorizer().getAllowedUsersForResource(path, ActionConstants.GET);
+ for (int i = 0; i < raUsers.length; i++) {
+ if (userPermissionMap.containsKey(raUsers[i])) {
+ Permission permission = (Permission)
userPermissionMap.get(raUsers[i]);
+ permission.setReadAllow(true);
+ } else {
+ Permission permission = new Permission();
+ permission.setUserName(raUsers[i]);
+ permission.setReadAllow(true);
+ userPermissionMap.put(raUsers[i], permission);
+ }
+ }
+
+ String[] rdUsers =
realm.getAuthorizer().getDeniedUsersForResource(path, ActionConstants.GET);
+ for (int i = 0; i < rdUsers.length; i++) {
+ if (userPermissionMap.containsKey(rdUsers[i])) {
+ Permission permission = (Permission)
userPermissionMap.get(rdUsers[i]);
+ permission.setReadDeny(true);
+ } else {
+ Permission permission = new Permission();
+ permission.setUserName(rdUsers[i]);
+ permission.setReadDeny(true);
+ userPermissionMap.put(rdUsers[i], permission);
+ }
+ }
+
+ String[] waUsers =
realm.getAuthorizer().getAllowedUsersForResource(path, ActionConstants.PUT);
+ for (int i = 0; i < waUsers.length; i++) {
+ if (userPermissionMap.containsKey(waUsers[i])) {
+ Permission permission = (Permission)
userPermissionMap.get(waUsers[i]);
+ permission.setWriteAllow(true);
+ } else {
+ Permission permission = new Permission();
+ permission.setUserName(waUsers[i]);
+ permission.setWriteAllow(true);
+ userPermissionMap.put(waUsers[i], permission);
+ }
+ }
+
+ String[] wdUsers =
realm.getAuthorizer().getDeniedUsersForResource(path, ActionConstants.PUT);
+ for (int i = 0; i < wdUsers.length; i++) {
+ if (userPermissionMap.containsKey(wdUsers[i])) {
+ Permission permission = (Permission)
userPermissionMap.get(wdUsers[i]);
+ permission.setWriteDeny(true);
+ } else {
+ Permission permission = new Permission();
+ permission.setUserName(wdUsers[i]);
+ permission.setWriteDeny(true);
+ userPermissionMap.put(wdUsers[i], permission);
+ }
+ }
+
+ userPermissions = new ArrayList(userPermissionMap.values());
+
+ Map rolePermissionMap = new HashMap();
+
+ String[] raRoles =
realm.getAuthorizer().getAuthorizedRolesForResource(path, ActionConstants.GET);
+ for (int i = 0; i < raRoles.length; i++) {
+ if (rolePermissionMap.containsKey(raRoles[i])) {
+ Permission permission = (Permission)
rolePermissionMap.get(raRoles[i]);
+ permission.setReadAllow(true);
+ } else {
+ Permission permission = new Permission();
+ permission.setUserName(raRoles[i]);
+ permission.setReadAllow(true);
+ rolePermissionMap.put(raRoles[i], permission);
+ }
+ }
+
+ // todo: uncomment after user manager adds the method
+ //String[] rdRoles =
realm.getAuthorizer().getDeniedRolesForResource(path, ActionConstants.GET);
+ //for (int i = 0; i < rdRoles.length; i++) {
+ // if (rolePermissionMap.containsKey(rdRoles[i])) {
+ // Permission permission = (Permission)
rolePermissionMap.get(rdRoles[i]);
+ // permission.setReadDeny(true);
+ // } else {
+ // Permission permission = new Permission();
+ // permission.setUserName(rdRoles[i]);
+ // permission.setReadDeny(true);
+ // rolePermissionMap.put(rdRoles[i], permission);
+ // }
+ //}
+
+ String[] waRoles =
realm.getAuthorizer().getAuthorizedRolesForResource(path, ActionConstants.PUT);
+ for (int i = 0; i < waRoles.length; i++) {
+ if (rolePermissionMap.containsKey(waRoles[i])) {
+ Permission permission = (Permission)
rolePermissionMap.get(waRoles[i]);
+ permission.setWriteAllow(true);
+ } else {
+ Permission permission = new Permission();
+ permission.setUserName(waRoles[i]);
+ permission.setWriteAllow(true);
+ rolePermissionMap.put(waRoles[i], permission);
+ }
+ }
+
+ // todo: uncomment after user manager adds the method
+ //String[] wdRoles =
realm.getAuthorizer().getDeniedRolesForResource(path, ActionConstants.PUT);
+ //for (int i = 0; i < wdRoles.length; i++) {
+ // if (rolePermissionMap.containsKey(wdRoles[i])) {
+ // Permission permission = (Permission)
rolePermissionMap.get(wdRoles[i]);
+ // permission.setWriteDeny(true);
+ // } else {
+ // Permission permission = new Permission();
+ // permission.setUserName(wdRoles[i]);
+ // permission.setWriteDeny(true);
+ // rolePermissionMap.put(wdRoles[i], permission);
+ // }
+ //}
- userPermissions = new ArrayList(userPermissionMap.values());
-
- Map rolePermissionMap = new HashMap();
-
- String[] raRoles =
realm.getAuthorizer().getAuthorizedRolesForResource(path, ActionConstants.GET);
- for (int i = 0; i < raRoles.length; i++) {
- if (rolePermissionMap.containsKey(raRoles[i])) {
- Permission permission = (Permission)
rolePermissionMap.get(raRoles[i]);
- permission.setReadAllow(true);
- } else {
- Permission permission = new Permission();
- permission.setUserName(raRoles[i]);
- permission.setReadAllow(true);
- rolePermissionMap.put(raRoles[i], permission);
- }
- }
+ rolePermissions = new ArrayList(rolePermissionMap.values());
- // todo: uncomment after user manager adds the method
- //String[] rdRoles =
realm.getAuthorizer().getDeniedRolesForResource(path, ActionConstants.GET);
- //for (int i = 0; i < rdRoles.length; i++) {
- // if (rolePermissionMap.containsKey(rdRoles[i])) {
- // Permission permission = (Permission)
rolePermissionMap.get(rdRoles[i]);
- // permission.setReadDeny(true);
- // } else {
- // Permission permission = new Permission();
- // permission.setUserName(rdRoles[i]);
- // permission.setReadDeny(true);
- // rolePermissionMap.put(rdRoles[i], permission);
- // }
- //}
-
- String[] waRoles =
realm.getAuthorizer().getAuthorizedRolesForResource(path, ActionConstants.PUT);
- for (int i = 0; i < waRoles.length; i++) {
- if (rolePermissionMap.containsKey(waRoles[i])) {
- Permission permission = (Permission)
rolePermissionMap.get(waRoles[i]);
- permission.setWriteAllow(true);
- } else {
- Permission permission = new Permission();
- permission.setUserName(waRoles[i]);
- permission.setWriteAllow(true);
- rolePermissionMap.put(waRoles[i], permission);
- }
+ } catch (UserManagerException e) {
+ String msg = "Could not get user manager details. Caused by: " +
e.getMessage();
}
- // todo: uncomment after user manager adds the method
- //String[] wdRoles =
realm.getAuthorizer().getDeniedRolesForResource(path, ActionConstants.PUT);
- //for (int i = 0; i < wdRoles.length; i++) {
- // if (rolePermissionMap.containsKey(wdRoles[i])) {
- // Permission permission = (Permission)
rolePermissionMap.get(wdRoles[i]);
- // permission.setWriteDeny(true);
- // } else {
- // Permission permission = new Permission();
- // permission.setUserName(wdRoles[i]);
- // permission.setWriteDeny(true);
- // rolePermissionMap.put(wdRoles[i], permission);
- // }
- //}
-
- rolePermissions = new ArrayList(rolePermissionMap.values());
-
return SUCCESS;
}
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RoleAuthorizationAction.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RoleAuthorizationAction.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RoleAuthorizationAction.java
Wed Dec 5 03:41:51 2007
@@ -19,6 +19,7 @@
import org.wso2.registry.secure.SecureRegistry;
import org.wso2.registry.secure.RegistryUserManager;
import org.wso2.registry.ActionConstants;
+import org.wso2.registry.RegistryException;
import javax.servlet.http.HttpServletRequest;
@@ -30,7 +31,7 @@
private String actionToAuthorize;
private String permissionType;
- public String execute(HttpServletRequest request) throws Exception {
+ public String execute(HttpServletRequest request) throws RegistryException
{
setRequest(request);
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/SearchAction.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/SearchAction.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/SearchAction.java
Wed Dec 5 03:41:51 2007
@@ -16,10 +16,7 @@
package org.wso2.registry.web.actions;
-import org.wso2.registry.Registry;
-import org.wso2.registry.RegistryConstants;
-import org.wso2.registry.Resource;
-import org.wso2.registry.TaggedResourcePath;
+import org.wso2.registry.*;
import org.wso2.registry.secure.AuthorizationFailedException;
import org.wso2.registry.web.actions.utils.ResourceData;
@@ -44,7 +41,7 @@
private String status;
private String errorMessage;
- public String execute(HttpServletRequest request) throws Exception {
+ public String execute(HttpServletRequest request) throws RegistryException
{
setRequest(request);
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/SignInAction.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/SignInAction.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/SignInAction.java
Wed Dec 5 03:41:51 2007
@@ -37,10 +37,10 @@
private String password;
private String path = RegistryConstants.ROOT_PATH;
- public String execute(HttpServletRequest request) throws Exception {
+ public String execute(HttpServletRequest request) throws RegistryException
{
setRequest(request);
-
+
ServletContext context =
request.getSession().getServletContext();
JDBCRegistry jdbcRegistry =
@@ -49,16 +49,11 @@
Realm realm = (Realm) request.getSession().getServletContext().
getAttribute(RegistryConstants.REGISTRY_REALM);
- try {
- SecureRegistry secureRegistry =
- new SecureRegistry(userName, password, jdbcRegistry,
realm);
- request.getSession().setAttribute(ConsoleConstants.USER_REGISTRY,
secureRegistry);
-
- this.setUserPath(RegistryConstants.ROOT_PATH);
-
- } catch (RegistryException e) {
- return ERROR;
- }
+ SecureRegistry secureRegistry =
+ new SecureRegistry(userName, password, jdbcRegistry, realm);
+ request.getSession().setAttribute(ConsoleConstants.USER_REGISTRY,
secureRegistry);
+
+ this.setUserPath(RegistryConstants.ROOT_PATH);
return SUCCESS;
}
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/UserDetailsAction.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/UserDetailsAction.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/UserDetailsAction.java
Wed Dec 5 03:41:51 2007
@@ -19,7 +19,9 @@
import org.wso2.registry.secure.SecureRegistry;
import org.wso2.registry.secure.RegistryUserManager;
import org.wso2.registry.LogEntry;
+import org.wso2.registry.RegistryException;
import org.wso2.usermanager.Realm;
+import org.wso2.usermanager.UserManagerException;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
@@ -32,7 +34,7 @@
private List userRoles = new ArrayList();
private List allRoles = new ArrayList();
- public String execute(HttpServletRequest request) throws Exception {
+ public String execute(HttpServletRequest request) throws RegistryException
{
setRequest(request);
@@ -40,9 +42,14 @@
RegistryUserManager userManager = secureRegistry.getUserManager();
Realm realm = userManager.getRealm();
- String[] rolesArray =
realm.getUserStoreReader().getUserRoles(userName);
- for (int i = 0; i < rolesArray.length; i++) {
- userRoles.add(rolesArray[i]);
+ try {
+ String[] rolesArray =
realm.getUserStoreReader().getUserRoles(userName);
+ for (int i = 0; i < rolesArray.length; i++) {
+ userRoles.add(rolesArray[i]);
+ }
+ } catch (UserManagerException e) {
+ String msg = "Could not get the user information. Caused by: " +
e.getMessage();
+ throw new RegistryException(msg);
}
String[] roleNamesArray = userManager.getAllRoles();
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/UserManagementAction.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/UserManagementAction.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/UserManagementAction.java
Wed Dec 5 03:41:51 2007
@@ -18,6 +18,7 @@
import org.wso2.registry.secure.SecureRegistry;
import org.wso2.registry.secure.RegistryUserManager;
+import org.wso2.registry.RegistryException;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
@@ -28,7 +29,7 @@
private List userNames = new ArrayList();
private List roleNames = new ArrayList();
- public String execute(HttpServletRequest request) throws Exception {
+ public String execute(HttpServletRequest request) throws RegistryException
{
setRequest(request);
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
Wed Dec 5 03:41:51 2007
@@ -25,6 +25,11 @@
<%
ResourceDetailsAction details = (ResourceDetailsAction)
request.getSession().getAttribute(UIConstants.RESOURCE_BEAN);
CollectionViewAction collection = (CollectionViewAction)
request.getSession().getAttribute(UIConstants.COLLECTION_BEAN);
+
+ String errorMessage = (String)
request.getSession().getAttribute(UIConstants.ERROR_MESSAGE);
+ if (errorMessage != null) {
+ request.getSession().setAttribute(UIConstants.ERROR_MESSAGE, null);
+ }
%>
<jsp:include page="header.jsp" />
@@ -32,6 +37,9 @@
<! START body content -->
<div class="content">
<h1 class="headding-registryResources">Registry Resources</h1>
+<% if (errorMessage != null) { %>
+<div><%=errorMessage%></div>
+<% } %>
<div class="breadcrumb">
<%
Iterator iNavPaths = collection.getNavigatablePaths().iterator();
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
