Author: mjakl
Date: Wed Aug 5 20:11:51 2009
New Revision: 801395
URL: http://svn.apache.org/viewvc?rev=801395&view=rev
Log:
Added missing visibility keywords and removed too specific methods from the
interfaces.
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/ItemVisitor.java
mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/NodeVisitor.java
mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/PublishSubscribeModule.java
mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/SubscriberVisitor.java
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/ItemVisitor.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/ItemVisitor.java?rev=801395&r1=801394&r2=801395&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/ItemVisitor.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/ItemVisitor.java
Wed Aug 5 20:11:51 2009
@@ -19,10 +19,7 @@
*/
package org.apache.vysper.xmpp.modules.extension.xep0060_pubsub;
-import java.util.List;
-
import
org.apache.vysper.xmpp.modules.extension.xep0060_pubsub.model.PayloadItem;
-import org.apache.vysper.xmpp.modules.servicediscovery.management.Item;
/**
* The SubscriberVisitor is used to visit all subscriptions of a node.
@@ -38,12 +35,6 @@
* @param itemID the id of the message
* @param payload the payload of the message
*/
- void visit(String itemID, PayloadItem payload);
-
- /**
- * @return the ordered list of items. The items should be reversed
chronologically
- * ordered.
- */
- public List<Item> getItemList();
+ public void visit(String itemID, PayloadItem payload);
}
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/NodeVisitor.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/NodeVisitor.java?rev=801395&r1=801394&r2=801395&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/NodeVisitor.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/NodeVisitor.java
Wed Aug 5 20:11:51 2009
@@ -19,13 +19,10 @@
*/
package org.apache.vysper.xmpp.modules.extension.xep0060_pubsub;
-import java.util.List;
-
import org.apache.vysper.xmpp.modules.extension.xep0060_pubsub.model.LeafNode;
-import org.apache.vysper.xmpp.modules.servicediscovery.management.Item;
/**
- * The NodeVisitor is used to visit all subscriptions of a collection node.
+ * The NodeVisitor is used to visit all nodes of a collection node.
*
* @author The Apache MINA Project (http://mina.apache.org)
*/
@@ -37,11 +34,7 @@
*
* @param ln the node (for more detailed data)
*/
- void visit(LeafNode ln);
+ public void visit(LeafNode ln);
- /**
- * @return the ordered list of items.
- */
- List<Item> getNodeItemList();
}
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/PublishSubscribeModule.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/PublishSubscribeModule.java?rev=801395&r1=801394&r2=801395&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/PublishSubscribeModule.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/PublishSubscribeModule.java
Wed Aug 5 20:11:51 2009
@@ -26,6 +26,7 @@
import org.apache.vysper.xmpp.modules.DefaultDiscoAwareModule;
import
org.apache.vysper.xmpp.modules.extension.xep0060_pubsub.handler.PubSubCreateNodeHandler;
import
org.apache.vysper.xmpp.modules.extension.xep0060_pubsub.handler.PubSubPublishHandler;
+import
org.apache.vysper.xmpp.modules.extension.xep0060_pubsub.handler.PubSubRetrieveSubscriptionsHandler;
import
org.apache.vysper.xmpp.modules.extension.xep0060_pubsub.handler.PubSubSubscribeHandler;
import
org.apache.vysper.xmpp.modules.extension.xep0060_pubsub.handler.PubSubUnsubscribeHandler;
import
org.apache.vysper.xmpp.modules.extension.xep0060_pubsub.handler.owner.PubSubOwnerConfigureNodeHandler;
@@ -165,12 +166,12 @@
List<Item> items = null;
if(request.getNode() == null || request.getNode().length() == 0) {
- NodeVisitor nv = new
ServiceDiscoItemsVisitor(serviceConfiguration);
+ ServiceDiscoItemsVisitor nv = new
ServiceDiscoItemsVisitor(serviceConfiguration);
root.acceptNodes(nv);
items = nv.getNodeItemList();
} else {
LeafNode node = root.find(request.getNode());
- ItemVisitor iv = new NodeDiscoItemsVisitor(request.getTo());
+ NodeDiscoItemsVisitor iv = new
NodeDiscoItemsVisitor(request.getTo());
node.acceptItems(iv);
items = iv.getItemList();
}
@@ -210,6 +211,7 @@
pubsubHandlers.add(new PubSubUnsubscribeHandler(serviceConfiguration));
pubsubHandlers.add(new PubSubPublishHandler(serviceConfiguration));
pubsubHandlers.add(new PubSubCreateNodeHandler(serviceConfiguration));
+ pubsubHandlers.add(new
PubSubRetrieveSubscriptionsHandler(serviceConfiguration));
dictionary.add(new
NamespaceHandlerDictionary(NamespaceURIs.XEP0060_PUBSUB, pubsubHandlers));
}
}
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/SubscriberVisitor.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/SubscriberVisitor.java?rev=801395&r1=801394&r2=801395&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/SubscriberVisitor.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/SubscriberVisitor.java
Wed Aug 5 20:11:51 2009
@@ -35,6 +35,6 @@
* @param nodeName the name of the node
* @param sub the subscriber JID
*/
- void visit(String nodeName, Entity sub);
+ public void visit(String nodeName, Entity sub);
}
