Fix OF-719

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@13848 b35dd754-fafc-0310-a699-88a17e54d16e

src/plugins/userservice/changelog.html

@@ -44,6 +44,11 @@
 User Service Plugin Changelog
 </h1>
 
+<p><b>1.4.2</b> -- December 15th, 2013</p>
+<ul>
+    <li>Fixed OF-0719: Remove all roster items as well when deleting a user</li>
+</ul>
+
 <p><b>1.4.1</b> -- October 2nd, 2013</p>
 <ul>
     <li>Added ability to create new shared groups from list of groups when adding or updating users to roster</li>

src/plugins/userservice/plugin.xml

@@ -5,7 +5,7 @@
     <name>User Service</name>
     <description>Allows administration of users via HTTP requests.</description>
     <author>Justin Hunt</author>
-    <version>1.4.1</version>
+    <version>1.4.2</version>
     <date>09/13/2013</date>
     <minServerVersion>3.9.0</minServerVersion>
     

src/plugins/userservice/readme.html

@@ -159,7 +159,7 @@ http://example.com:9090/plugins/userService/userservice?type=add&secret=bigsecre
 </form>
 </ul>
 
-The following example deletes a user
+The following example deletes a user and all roster items of the user.
 
 <ul>
 <form>
@@ -230,7 +230,7 @@ http://example.com:9090/plugins/userService/userservice?type=update_roster&secre
 </form>
 </ul>
 
-The following example deletes roster item 'franz@kafka.com' for user 'kafka'
+The following example deletes a specific roster item 'franz@kafka.com' for user 'kafka'
 
 <ul>
 <form>

src/plugins/userservice/src/java/org/jivesoftware/openfire/plugin/UserServicePlugin.java

@@ -125,9 +125,12 @@ public class UserServicePlugin implements Plugin, PropertyEventListener {
         }
     }
 
-    public void deleteUser(String username) throws UserNotFoundException{
+    public void deleteUser(String username) throws UserNotFoundException, SharedGroupException
+    {
         User user = getUser(username);
         userManager.deleteUser(user);
+
+		rosterManager.deleteRoster(server.createJID(username, null));
     }
 
     /**