OF-205: Update NodeTask hierarchy; remove extraneous logging

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/branches/pubsub_clustering@13279 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/openfire/pubsub/Node.java

@@ -30,6 +30,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.dom4j.Element;
+import org.jivesoftware.openfire.XMPPServer;
 import org.jivesoftware.openfire.cluster.ClusterManager;
 import org.jivesoftware.openfire.pubsub.cluster.CancelSubscriptionTask;
 import org.jivesoftware.openfire.pubsub.cluster.ModifySubscriptionTask;
@@ -55,6 +56,8 @@ import org.xmpp.packet.Message;
  */
 public abstract class Node {
 
+    public static final String PUBSUB_SVC_ID = XMPPServer.getInstance().getPubSubModule().getServiceID();
+
     /**
      * Reference to the publish and subscribe service.
      */

src/java/org/jivesoftware/openfire/pubsub/cluster/FlushTask.java

@@ -6,14 +6,10 @@ import java.io.ObjectOutput;
 
 import org.jivesoftware.openfire.pubsub.PubSubPersistenceManager;
 import org.jivesoftware.util.cache.ClusterTask;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 
 public class FlushTask implements ClusterTask
 {
-	private static final Logger log = LoggerFactory.getLogger(FlushTask.class);
-
 	public FlushTask()
 	{
 	}
@@ -21,7 +17,6 @@ public class FlushTask implements ClusterTask
 	@Override
 	public void run()
 	{
-		log.debug("[TASK] Flush pubsub");
         PubSubPersistenceManager.flushItems(false); // just this member
 	}
 

src/java/org/jivesoftware/openfire/pubsub/cluster/NodeTask.java

@@ -14,7 +14,6 @@ import org.xmpp.packet.JID;
 
 public abstract class NodeTask implements ClusterTask
 {
-	private static final String PUBSUB_SVC_ID = XMPPServer.getInstance().getPubSubModule().getServiceID();
 
 	protected String nodeId;
 	protected String serviceId;
@@ -44,7 +43,7 @@ public abstract class NodeTask implements ClusterTask
 
 	public PubSubService getService()
 	{
-		if (PUBSUB_SVC_ID.equals(serviceId))
+		if (Node.PUBSUB_SVC_ID.equals(serviceId))
 			return XMPPServer.getInstance().getPubSubModule();
 		else
 		{
@@ -53,6 +52,12 @@ public abstract class NodeTask implements ClusterTask
 		}
 	}
 
+	@Override
+	public Object getResult()
+	{
+		return null;
+	}
+
 	@Override
 	public void writeExternal(ObjectOutput out) throws IOException
 	{

src/java/org/jivesoftware/openfire/pubsub/cluster/RefreshNodeTask.java

@@ -26,12 +26,6 @@ public class RefreshNodeTask extends NodeTask
 		super(node);
 	}
 
-	@Override
-	public Object getResult()
-	{
-		return null;
-	}
-
 	@Override
 	public void run()
 	{

src/java/org/jivesoftware/openfire/pubsub/cluster/RemoveNodeTask.java

@@ -23,12 +23,6 @@ public class RemoveNodeTask extends NodeTask
         super(node);
     }
 
-    @Override
-    public Object getResult()
-    {
-        return null;
-    }
-
     @Override
     public void run()
     {

src/java/org/jivesoftware/openfire/pubsub/cluster/SubscriptionTask.java

@@ -79,12 +79,6 @@ public abstract class SubscriptionTask extends NodeTask
 		state = (State) ExternalizableUtil.getInstance().readSerializable(in);
 	}
 
-	@Override
-	public Object getResult()
-	{
-		return null;
-	}
-
 	@Override
 	public String toString()
 	{