Author: chathura
Date: Tue Dec  4 23:05:57 2007
New Revision: 10514

Log:


Changed the UI controller to provide meaningful URLs after performing actions.



Modified:
   
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
   
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/UIConstants.java

Modified: 
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
==============================================================================
--- 
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
   (original)
+++ 
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
   Tue Dec  4 23:05:57 2007
@@ -80,7 +80,9 @@
                     e.printStackTrace();
                 }
 
-                forwardToResources(request, response, path);
+                response.sendRedirect("/wso2registry/web" + path);
+
+                //forwardToResources(request, response, path);
 
             } else if (command.equals("/signout")) {
 
@@ -94,7 +96,8 @@
                     e.printStackTrace();
                 }
 
-                forwardToResources(request, response, path);
+                response.sendRedirect("/wso2registry/web" + path);
+                //forwardToResources(request, response, path);
 
             } else if (command.equals("/addUser")) {
 
@@ -110,7 +113,8 @@
                     e.printStackTrace();
                 }
 
-                forwardToUserManagement(request, response);
+                response.sendRedirect("/wso2registry/system/people");
+                //forwardToUserManagement(request, response);
 
             } else if (command.equals("/addRole")) {
 
@@ -122,7 +126,8 @@
                     e.printStackTrace();
                 }
 
-                forwardToUserManagement(request, response);
+                response.sendRedirect("/wso2registry/system/people");
+                //forwardToUserManagement(request, response);
 
             } else if (command.equals("/tag")) {
 
@@ -136,7 +141,8 @@
                     e.printStackTrace();
                 }
 
-                forwardToResources(request, response, path);
+                response.sendRedirect("/wso2registry/web" + path);
+                //forwardToResources(request, response, path);
 
             } else if (command.equals("/authorize")) {
 
@@ -152,7 +158,8 @@
                     e.printStackTrace();
                 }
 
-                forwardToResources(request, response, path);
+                response.sendRedirect("/wso2registry/web" + path);
+                //forwardToResources(request, response, path);
 
             } else if (command.equals("/authorize/mass")) {
 
@@ -166,7 +173,8 @@
                     e.printStackTrace();
                 }
 
-                forwardToResources(request, response, path);
+                response.sendRedirect("/wso2registry/web" + path);
+                //forwardToResources(request, response, path);
 
             } else if (command.equals("/authorizeRole")) {
 
@@ -182,7 +190,8 @@
                     e.printStackTrace();
                 }
 
-                forwardToResources(request, response, path);
+                response.sendRedirect("/wso2registry/web" + path);
+                //forwardToResources(request, response, path);
 
             } else if (command.equals("/authorizeRoles")) {
 
@@ -196,7 +205,8 @@
                     e.printStackTrace();
                 }
 
-                forwardToResources(request, response, path);
+                response.sendRedirect("/wso2registry/web" + path);
+                //forwardToResources(request, response, path);
 
             } else if (command.equals("/addComment")) {
 
@@ -210,12 +220,14 @@
                     e.printStackTrace();
                 }
 
-                forwardToResources(request, response, path);
+                response.sendRedirect("/wso2registry/web" + path);
+                //forwardToResources(request, response, path);
 
             } else if (command.equals("/addUserToRole")) {
 
+                String userName = (String) request.getParameter("userName");
                 AddUserRoleAction addUserRoleAction = new AddUserRoleAction();
-                
addUserRoleAction.setUserName(request.getParameter("userName"));
+                addUserRoleAction.setUserName(userName);
                 
addUserRoleAction.setRoleName(request.getParameter("roleToAdd"));
 
                 try {
@@ -224,7 +236,8 @@
                     e.printStackTrace();
                 }
 
-                forwardToUserPage(request, response, 
request.getParameter("userName"));
+                response.sendRedirect("/wso2registry/system/people/" + 
userName);
+                //forwardToUserPage(request, response, 
request.getParameter("userName"));
 
             } else if (command.equals("/addCollection")) {
 
@@ -240,7 +253,8 @@
                     e.printStackTrace();
                 }
 
-                forwardToResources(request, response, path);
+                response.sendRedirect("/wso2registry/web" + path);
+                //forwardToResources(request, response, path);
 
             } else if (command.equals("/addResource")) {
 
@@ -361,7 +375,8 @@
                     e.printStackTrace();
                 }
 
-                forwardToResources(request, response, path);
+                response.sendRedirect("/wso2registry/web" + path);
+                //forwardToResources(request, response, path);
 
             } else if (command.equals("/activity")) {
 
@@ -397,7 +412,8 @@
                     e.printStackTrace();
                 }
 
-                forwardToUserPage(request, response, 
request.getParameter("user"));
+                response.sendRedirect("/wso2registry/system/people/" + 
request.getParameter("user"));
+                //forwardToUserPage(request, response, 
request.getParameter("user"));
 
             } else if (command.equals("/removeUser")) {
 
@@ -410,7 +426,8 @@
                     e.printStackTrace();
                 }
 
-                forwardToUserManagement(request, response);
+                response.sendRedirect("/wso2registry/system/people");
+                //forwardToUserManagement(request, response);
 
             } else if (command.equals("/removeRole")) {
 
@@ -423,7 +440,8 @@
                     e.printStackTrace();
                 }
 
-                forwardToUserManagement(request, response);
+                response.sendRedirect("/wso2registry/system/people");
+                //forwardToUserManagement(request, response);
 
             } else if (command.equals("/search")) {
 

Modified: 
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/UIConstants.java
==============================================================================
--- 
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/UIConstants.java
 (original)
+++ 
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/UIConstants.java
 Tue Dec  4 23:05:57 2007
@@ -18,6 +18,8 @@
 
 public class UIConstants {
 
+    public static final String ERROR_MESSAGE = "regErrorMessage";
+
     public static final String RESOURCE_BEAN = "resource";
     public static final String COLLECTION_BEAN = "collection";
     public static final String USER_MANAGEMENT_BEAN = "user_management";

_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev

Reply via email to