Commit a7e74f9c authored by guus's avatar guus

Revert: OF-588: Making more of pubsub Serializable. As with the previous...

Revert: OF-588: Making more of pubsub Serializable. As with the previous commit, I'm not to sure this is the right way to go, but I'd like to see if this provides a band-aid for the issue.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@13353 b35dd754-fafc-0310-a699-88a17e54d16e
parent 7f521de3
...@@ -26,8 +26,6 @@ import org.jivesoftware.openfire.pubsub.models.PublisherModel; ...@@ -26,8 +26,6 @@ import org.jivesoftware.openfire.pubsub.models.PublisherModel;
import org.xmpp.forms.DataForm; import org.xmpp.forms.DataForm;
import org.xmpp.forms.FormField; import org.xmpp.forms.FormField;
import java.io.Serializable;
/** /**
* A DefaultNodeConfiguration keeps the default configuration values for leaf or collection * A DefaultNodeConfiguration keeps the default configuration values for leaf or collection
* nodes of a particular publish-subscribe service. New nodes created for the service * nodes of a particular publish-subscribe service. New nodes created for the service
...@@ -35,7 +33,7 @@ import java.io.Serializable; ...@@ -35,7 +33,7 @@ import java.io.Serializable;
* *
* @author Matt Tucker * @author Matt Tucker
*/ */
public class DefaultNodeConfiguration implements Serializable { public class DefaultNodeConfiguration {
/** /**
* Flag indicating whether this default configutation belongs to a leaf node or not. * Flag indicating whether this default configutation belongs to a leaf node or not.
......
...@@ -25,14 +25,12 @@ import org.jivesoftware.openfire.pubsub.Node; ...@@ -25,14 +25,12 @@ import org.jivesoftware.openfire.pubsub.Node;
import org.xmpp.packet.JID; import org.xmpp.packet.JID;
import org.xmpp.packet.PacketError; import org.xmpp.packet.PacketError;
import java.io.Serializable;
/** /**
* Policy that defines who is allowed to subscribe and retrieve items. * Policy that defines who is allowed to subscribe and retrieve items.
* *
* @author Matt Tucker * @author Matt Tucker
*/ */
public abstract class AccessModel implements Serializable { public abstract class AccessModel {
public final static AccessModel whitelist = new WhitelistAccess(); public final static AccessModel whitelist = new WhitelistAccess();
public final static AccessModel open = new OpenAccess(); public final static AccessModel open = new OpenAccess();
......
...@@ -23,14 +23,12 @@ package org.jivesoftware.openfire.pubsub.models; ...@@ -23,14 +23,12 @@ package org.jivesoftware.openfire.pubsub.models;
import org.jivesoftware.openfire.pubsub.Node; import org.jivesoftware.openfire.pubsub.Node;
import org.xmpp.packet.JID; import org.xmpp.packet.JID;
import java.io.Serializable;
/** /**
* Policy that defines who is allowed to publish items to the node. * Policy that defines who is allowed to publish items to the node.
* *
* @author Matt Tucker * @author Matt Tucker
*/ */
public abstract class PublisherModel implements Serializable { public abstract class PublisherModel {
public final static PublisherModel open = new OpenPublisher(); public final static PublisherModel open = new OpenPublisher();
public final static PublisherModel publishers = new OnlyPublishers(); public final static PublisherModel publishers = new OnlyPublishers();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment