Removed VCardManager dependency from the DefaultUserProvider. JM-663

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

src/java/org/jivesoftware/wildfire/XMPPServer.java

@@ -39,6 +39,7 @@ import org.jivesoftware.wildfire.roster.RosterManager;
 import org.jivesoftware.wildfire.spi.*;
 import org.jivesoftware.wildfire.transport.TransportHandler;
 import org.jivesoftware.wildfire.user.UserManager;
+import org.jivesoftware.wildfire.vcard.VCardManager;
 import org.xmpp.packet.JID;
 
 import java.io.File;
@@ -420,6 +421,7 @@ public class XMPPServer {
         loadModule(TransportHandler.class.getName());
         loadModule(OfflineMessageStrategy.class.getName());
         loadModule(OfflineMessageStore.class.getName());
+        loadModule(VCardManager.class.getName());
         // Load standard modules
         loadModule(IQBindHandler.class.getName());
         loadModule(IQSessionEstablishmentHandler.class.getName());

src/java/org/jivesoftware/wildfire/event/UserEventAdapter.java

+/**
+ * $RCSfile  $
+ * $Revision  $
+ * $Date  $
+ *
+ * Copyright (C) 1999-2005 Jive Software. All rights reserved.
+ * This software is the proprietary information of Jive Software. Use is subject to license terms.
+ */
+package org.jivesoftware.wildfire.event;
+
+import org.jivesoftware.wildfire.user.User;
+
+import java.util.Map;
+
+/**
+ * An abstract adapter class for receiving user events. 
+ * The methods in this class are empty. This class exists as convenience for creating listener objects.
+ */
+public class UserEventAdapter implements UserEventListener  {
+    public void userCreated(User user, Map params) {
+    }
+
+    public void userDeleting(User user, Map params) {
+    }
+
+    public void userModified(User user, Map params) {
+    }
+}

src/java/org/jivesoftware/wildfire/user/DefaultUserProvider.java

@@ -13,7 +13,6 @@ package org.jivesoftware.wildfire.user;
 
 import org.jivesoftware.database.DbConnectionManager;
 import org.jivesoftware.util.*;
-import org.jivesoftware.wildfire.vcard.VCardManager;
 
 import java.sql.*;
 import java.util.*;
@@ -203,13 +202,6 @@ public class DefaultUserProvider implements UserProvider {
         PreparedStatement pstmt = null;
         boolean abortTransaction = false;
         try {
-            // Delete all of the users's vcard properties
-            try {
-                VCardManager.getInstance().deleteVCard(username);
-            }
-            catch (UnsupportedOperationException e) {
-                // Ignore.
-            }
             // Delete all of the users's extended properties
             con = DbConnectionManager.getTransactionConnection();
             pstmt = con.prepareStatement(DELETE_USER_PROPS);

src/java/org/jivesoftware/wildfire/vcard/VCardManager.java

@@ -13,34 +13,27 @@ package org.jivesoftware.wildfire.vcard;
 
 import org.dom4j.Element;
 import org.jivesoftware.util.*;
+import org.jivesoftware.wildfire.container.BasicModule;
+import org.jivesoftware.wildfire.XMPPServer;
+import org.jivesoftware.wildfire.user.User;
+import org.jivesoftware.wildfire.event.UserEventDispatcher;
+import org.jivesoftware.wildfire.event.UserEventAdapter;
 
 import java.util.StringTokenizer;
+import java.util.Map;
 
 /**
  * Manages VCard information for users.
  *
  * @author Matt Tucker
  */
-public class VCardManager {
+public class VCardManager extends BasicModule {
 
-    private static VCardProvider provider;
-    private static VCardManager instance = new VCardManager();
+    private VCardProvider provider;
+    private static VCardManager instance;
 
-    private Cache vcardCache;
-
-    static {
-        // Load a VCard provider.
-        String className = JiveGlobals.getXMLProperty("provider.vcard.className",
-                DefaultVCardProvider.class.getName());
-        try {
-            Class c = ClassUtils.forName(className);
-            provider = (VCardProvider)c.newInstance();
-        }
-        catch (Exception e) {
-            Log.error("Error loading vcard provider: " + className, e);
-            provider = new DefaultVCardProvider();
-        }
-    }
+    private Cache<String, Element> vcardCache;
+    private EventHandler eventHandler;
 
     public static VCardManager getInstance() {
         return instance;
@@ -55,13 +48,14 @@ public class VCardManager {
      * @return the current VCardProvider.
      */
     public static VCardProvider getProvider() {
-        return provider;
+        return instance.provider;
     }
 
-    private VCardManager() {
+    public VCardManager() {
+        super("VCard Manager");
         String cacheName = "VCard";
-        CacheManager.initializeCache(cacheName, "vcardCache", 512 * 1024);
-        vcardCache = CacheManager.getCache(cacheName);
+        vcardCache = CacheManager.initializeCache(cacheName, "vcardCache", 512 * 1024);
+        this.eventHandler = new EventHandler();
     }
 
     /**
@@ -70,7 +64,6 @@ public class VCardManager {
      * does not exist then a <tt>null</tt> value will be answered. Advanced user systems can
      * use vCard information to link to user directory information or store other relevant
      * user information.</p>
-     *
      * Note that many elements in the vCard may have the same path so the returned value in that
      * case will be the first found element. For instance, "ADR:STREET" may be present in
      * many addresses of the user. Use {@link #getVCard(String)} to get the whole vCard of
@@ -150,6 +143,8 @@ public class VCardManager {
      * Deletes the user's vCard from the user account.
      *
      * @param username The username of the user to delete his vCard.
+     * @throws UnsupportedOperationException If the provider is read-only and the data cannot be deleted, this exception
+     *                                       is thrown
      */
     public void deleteVCard(String username) {
         if (provider.isReadOnly()) {
@@ -176,7 +171,7 @@ public class VCardManager {
     }
 
     private Element getOrLoadVCard(String username) {
-        Element vCardElement = (Element) vcardCache.get(username);
+        Element vCardElement = vcardCache.get(username);
         if (vCardElement == null) {
             vCardElement = provider.loadVCard(username);
             if (vCardElement != null) {
@@ -185,4 +180,41 @@ public class VCardManager {
         }
         return vCardElement;
     }
+
+    public void initialize(XMPPServer server) {
+        instance = this;
+
+        // Load a VCard provider.
+        String className = JiveGlobals.getXMLProperty("provider.vcard.className",
+                DefaultVCardProvider.class.getName());
+        try {
+            Class c = ClassUtils.forName(className);
+            provider = (VCardProvider) c.newInstance();
+        }
+        catch (Exception e) {
+            Log.error("Error loading vcard provider: " + className, e);
+            provider = new DefaultVCardProvider();
+        }
+    }
+
+    public void start() {
+        // Add this module as a user event listener so we can delete
+        // all user properties when a user is deleted
+        if (!provider.isReadOnly()) {
+            UserEventDispatcher.addListener(eventHandler);
+        }
+    }
+
+    public void stop() {
+        // Remove this module as a user event listener
+        UserEventDispatcher.removeListener(eventHandler);
+    }
+
+    private class EventHandler extends UserEventAdapter {
+        public void userDeleting(User user, Map params) {
+            try {
+                deleteVCard(user.getUsername());
+            } catch (UnsupportedOperationException ue) { /* Do Nothing */ }
+        }
+    }
 }
\ No newline at end of file