Author: mjakl
Date: Fri Jul 3 21:30:36 2009
New Revision: 791022
URL: http://svn.apache.org/viewvc?rev=791022&view=rev
Log:
Store publisher of an item.
Modified:
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/model/LeafNode.java
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/model/PayloadItem.java
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/storageprovider/LeafNodeInMemoryStorageProvider.java
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/storageprovider/LeafNodeStorageProvider.java
Modified:
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/model/LeafNode.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/model/LeafNode.java?rev=791022&r1=791021&r2=791022&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/model/LeafNode.java
(original)
+++
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/model/LeafNode.java
Fri Jul 3 21:30:36 2009
@@ -157,7 +157,7 @@
* @param item the payload of the message.
*/
public void publish(Entity sender, StanzaRelay relay, String itemID,
XMLElement item) {
- storage.addMessage(name, itemID, item);
+ storage.addMessage(sender, name, itemID, item);
sendMessageToSubscriber(relay, item);
}
Modified:
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/model/PayloadItem.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/model/PayloadItem.java?rev=791022&r1=791021&r2=791022&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/model/PayloadItem.java
(original)
+++
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/model/PayloadItem.java
Fri Jul 3 21:30:36 2009
@@ -21,6 +21,7 @@
import java.util.Date;
+import org.apache.vysper.xmpp.addressing.Entity;
import org.apache.vysper.xmpp.xmlfragment.XMLElement;
/**
@@ -31,6 +32,8 @@
*/
public class PayloadItem implements Comparable<PayloadItem> {
+ // publisher of the item
+ protected Entity publisher;
// the id of the item
protected String itemID;
// tha payload
@@ -40,10 +43,12 @@
/**
* Create new PayloadItem with the XML encoded payload and its itemID.
+ * @param publisher
* @param payload
* @param itemID
*/
- public PayloadItem(XMLElement payload, String itemID) {
+ public PayloadItem(Entity publisher, XMLElement payload, String itemID) {
+ this.publisher = publisher;
this.payload = payload;
this.itemID = itemID;
this.publishedDate = new Date(); // initialized with the current
date/time
Modified:
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/storageprovider/LeafNodeInMemoryStorageProvider.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/storageprovider/LeafNodeInMemoryStorageProvider.java?rev=791022&r1=791021&r2=791022&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/storageprovider/LeafNodeInMemoryStorageProvider.java
(original)
+++
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/storageprovider/LeafNodeInMemoryStorageProvider.java
Fri Jul 3 21:30:36 2009
@@ -114,8 +114,8 @@
/**
* Add a message to the storage.
*/
- public void addMessage(String nodeName, String itemID, XMLElement payload)
{
- messages.put(itemID, new PayloadItem(payload, itemID));
+ public void addMessage(Entity publisher, String nodeName, String itemID,
XMLElement payload) {
+ messages.put(itemID, new PayloadItem(publisher, payload, itemID));
}
/**
Modified:
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/storageprovider/LeafNodeStorageProvider.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/storageprovider/LeafNodeStorageProvider.java?rev=791022&r1=791021&r2=791022&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/storageprovider/LeafNodeStorageProvider.java
(original)
+++
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/storageprovider/LeafNodeStorageProvider.java
Fri Jul 3 21:30:36 2009
@@ -100,11 +100,12 @@
/**
* Store a published message to a node.
+ * @param publisher who sent the message
* @param nodeName the node to which we want to store the message.
* @param messageID the message ID for later retrieval.
* @param item the payload of the message.
*/
- public void addMessage(String nodeName, String messageID, XMLElement item);
+ public void addMessage(Entity publisher, String nodeName, String
messageID, XMLElement item);
/**
* Call the SubscriberVisitor for each subscription of the given node.
