[mashup-dev] svn commit r17768 - trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/userprofile

[channa at wso2.com]

Author: channa
Date: Mon Jun  2 02:21:43 2008
New Revision: 17768
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=17768

Log:
Ensuring user service deletion works in non-root context.


Modified:
   trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/userprofile/ManageUsers.java

Modified: trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/userprofile/ManageUsers.java
URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/userprofile/ManageUsers.java?rev=17768&r1=17767&r2=17768&view=diff
==============================================================================
--- trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/userprofile/ManageUsers.java	(original)
+++ trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/userprofile/ManageUsers.java	Mon Jun  2 02:21:43 2008
@@ -128,7 +128,7 @@
                 }
 
                 userStoreAdmin.deleteUser(userName);
-                deleteUserResources(userName, request.getSession().getId());
+                deleteUserResources(userName, request.getSession().getId(), request.getContextPath());
                 deletionSuccess = true;
             }
         } catch (UserStoreException e) {
@@ -145,7 +145,8 @@
      * @param userName name of user, who's resources must be deleted.
      * @return true if the purge succeeded.
      */
-    private static boolean deleteUserResources(String userName, String cookieString) throws MashupFault {
+    private static boolean deleteUserResources(String userName, String cookieString, String
+            contextPath) throws MashupFault {
         boolean purgeSuccess;
         try {
             ServerManager serverManager = ServerManager.getInstance();
@@ -154,7 +155,7 @@
             Options options = client.getOptions();
             options.setAction("urn:deleteUserServices");
             options.setTo(new EndpointReference("http://localhost:" + serverManager.getHttpPort() +
-                    context.getContextRoot() + context.getServicePath() +
+                    contextPath + "/" + context.getServicePath() +
                     "/MashupAdminService/deleteUserServices"));
             options.setProperty(HTTPConstants.COOKIE_STRING, "JSESSIONID=" + cookieString);
             options.setManageSession(true);