Author: channa
Date: Thu Jan 24 12:13:40 2008
New Revision: 12846

Log:

Deleting all comments entered by user on service delete.

Modified:
   
trunk/mashup/java/modules/admin/service/src/org/wso2/mashup/admin/service/MashupAdminService.java
   trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java
   
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java

Modified: 
trunk/mashup/java/modules/admin/service/src/org/wso2/mashup/admin/service/MashupAdminService.java
==============================================================================
--- 
trunk/mashup/java/modules/admin/service/src/org/wso2/mashup/admin/service/MashupAdminService.java
   (original)
+++ 
trunk/mashup/java/modules/admin/service/src/org/wso2/mashup/admin/service/MashupAdminService.java
   Thu Jan 24 12:13:40 2008
@@ -376,6 +376,17 @@
             HashMap newMap = (HashMap) map.clone();
             newMap.remove("scripts/" + username);
             deploymentEngine.setDirectoryToExtensionMappingMap(newMap);
+
+            // Locate a given user's comments.
+            Resource commentCollection = registry.executeQuery(MashupConstants.
+                    USERS_COMMENTS_QUERY_PATH, paramsMap);
+            String[] commentPaths = (String[]) commentCollection.getContent();
+
+            // Delete all comments found by query.
+            for (int commentNumber = 0; commentNumber < commentPaths.length; 
commentNumber++) {
+                String commentPath = commentPaths[commentNumber];
+                registry.delete(commentPath);
+            }
             success = true;
         } catch (RegistryException e) {
             throw new MashupFault("Exception occured while deleting services 
of user " + username + ". Reason :  " +

Modified: 
trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java
==============================================================================
--- trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java     
(original)
+++ trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java     
Thu Jan 24 12:13:40 2008
@@ -72,6 +72,7 @@
     public static final String ACTIVITY_QUERY_PATH = QUERYSTORE_QUERY_PATH + 
"/activity";
     public static final String COMMENTS_QUERY_PATH = QUERYSTORE_QUERY_PATH + 
"/comments";
     public static final String MY_COMMENTS_QUERY_PATH = QUERYSTORE_QUERY_PATH 
+ "/mycomments";
+    public static final String USERS_COMMENTS_QUERY_PATH = 
QUERYSTORE_QUERY_PATH + "/userscomments";
 
     public static final String FULL_NAME = "fullName";
     public static final String FIRST_NAME = "firstname";

Modified: 
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java
==============================================================================
--- 
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java
   (original)
+++ 
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java
   Thu Jan 24 12:13:40 2008
@@ -854,6 +854,15 @@
                         RegistryConstants.COMMENTS_RESULT_TYPE
                 );
 
+                // Query for all comments by a particular user
+                addQuery(
+                        registry,
+                        MashupConstants.USERS_COMMENTS_QUERY_PATH,
+                        "SELECT C.CM_ID FROM COMMENTS C, ARTIFACTS A WHERE 
C.USER_ID=? AND C.AID=A.AID AND A.STATE=100 AND A.MEDIA_TYPE='" +
+                                MashupConstants.MASHUP_MEDIA_TYPE + "'",
+                        RegistryConstants.COMMENTS_RESULT_TYPE
+                );
+
                 // add profile for the anonymous user.
                 AccessControlAdmin ac = realm.getAccessControlAdmin();
 

_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev

Reply via email to