Author: berndf
Date: Thu Sep 2 08:01:41 2010
New Revision: 991843
URL: http://svn.apache.org/viewvc?rev=991843&view=rev
Log:
VYSPER-247: correctly propagate the pubsub domain.
Modified:
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/PubSubServiceConfiguration.java
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/PublishSubscribeModule.java
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/ServiceDiscoItemsVisitor.java
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubCreateNodeHandler.java
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishHandler.java
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveAffiliationsHandler.java
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveSubscriptionsHandler.java
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeHandler.java
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeHandler.java
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerDeleteNodeHandler.java
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerManageAffiliationsHandler.java
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/model/LeafNode.java
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoItemsTestCase.java
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/model/CollectionNodeTestCase.java
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/model/LeafNodeTestCase.java
Modified:
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/PubSubServiceConfiguration.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/PubSubServiceConfiguration.java?rev=991843&r1=991842&r2=991843&view=diff
==============================================================================
---
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/PubSubServiceConfiguration.java
(original)
+++
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/PubSubServiceConfiguration.java
Thu Sep 2 08:01:41 2010
@@ -53,18 +53,20 @@ public class PubSubServiceConfiguration
}
/**
- * Sets the JID of the server.
+ * Sets the JID of the pubsub service.
+ * this can either be the server's own domain, or - more common - a
subdomain of the server like
+ * "pubsub.server.tld"
*
* @param serverJID
*/
- public void setServerJID(Entity serverJID) {
+ public void setDomainJID(Entity serverJID) {
this.serverJID = serverJID;
}
/**
- * @return the JID of the server.
+ * @return the domain of the pubsub component.
*/
- public Entity getServerJID() {
+ public Entity getDomainJID() {
return serverJID;
}
Modified:
mina/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/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/PublishSubscribeModule.java?rev=991843&r1=991842&r2=991843&view=diff
==============================================================================
---
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/PublishSubscribeModule.java
(original)
+++
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/PublishSubscribeModule.java
Thu Sep 2 08:01:41 2010
@@ -24,8 +24,6 @@ import java.util.List;
import org.apache.vysper.compliance.SpecCompliant;
import org.apache.vysper.xmpp.addressing.Entity;
-import org.apache.vysper.xmpp.addressing.EntityFormatException;
-import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.addressing.EntityUtils;
import org.apache.vysper.xmpp.modules.DefaultDiscoAwareModule;
import org.apache.vysper.xmpp.modules.core.base.handler.MessageHandler;
@@ -138,7 +136,7 @@ public class PublishSubscribeModule exte
.addDictionary(new
NamespaceHandlerDictionary(NamespaceURIs.XEP0060_PUBSUB_EVENT, new
MessageHandler()));
stanzaProcessor = processor;
-
this.serviceConfiguration.setServerJID(serverRuntimeContext.getServerEnitity());
+ this.serviceConfiguration.setDomainJID(fullDomain);
this.serviceConfiguration.initialize();
}
Modified:
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/ServiceDiscoItemsVisitor.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/ServiceDiscoItemsVisitor.java?rev=991843&r1=991842&r2=991843&view=diff
==============================================================================
---
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/ServiceDiscoItemsVisitor.java
(original)
+++
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/ServiceDiscoItemsVisitor.java
Thu Sep 2 08:01:41 2010
@@ -45,7 +45,7 @@ public class ServiceDiscoItemsVisitor im
* @see
org.apache.vysper.xmpp.modules.extension.xep0060_pubsub.NodeVisitor#visit(org.apache.vysper.xmpp.addressing.Entity,
org.apache.vysper.xmpp.modules.extension.xep0060_pubsub.model.LeafNode)
*/
public void visit(LeafNode ln) {
- this.itemList.add(new Item(serviceConfiguration.getServerJID(),
ln.getTitle(), ln.getName()));
+ this.itemList.add(new Item(serviceConfiguration.getDomainJID(),
ln.getTitle(), ln.getName()));
}
/**
Modified:
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubCreateNodeHandler.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubCreateNodeHandler.java?rev=991843&r1=991842&r2=991843&view=diff
==============================================================================
---
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubCreateNodeHandler.java
(original)
+++
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubCreateNodeHandler.java
Thu Sep 2 08:01:41 2010
@@ -69,7 +69,7 @@ public class PubSubCreateNodeHandler ext
@SpecCompliant(spec = "xep-0060", section = "8.1.2", status =
SpecCompliant.ComplianceStatus.NOT_STARTED, coverage =
SpecCompliant.ComplianceCoverage.UNSUPPORTED),
@SpecCompliant(spec = "xep-0060", section = "8.1.3", status =
SpecCompliant.ComplianceStatus.NOT_STARTED, coverage =
SpecCompliant.ComplianceCoverage.UNSUPPORTED) })
protected Stanza handleSet(IQStanza stanza, ServerRuntimeContext
serverRuntimeContext, SessionContext sessionContext) {
- Entity serverJID = serviceConfiguration.getServerJID();
+ Entity serverJID = serviceConfiguration.getDomainJID();
CollectionNode root = serviceConfiguration.getRootNode();
Entity sender = extractSenderJID(stanza, sessionContext);
Modified:
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishHandler.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishHandler.java?rev=991843&r1=991842&r2=991843&view=diff
==============================================================================
---
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishHandler.java
(original)
+++
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishHandler.java
Thu Sep 2 08:01:41 2010
@@ -81,7 +81,7 @@ public class PubSubPublishHandler extend
@SpecCompliant(spec = "xep-0060", section = "7.1.3.5", status =
SpecCompliant.ComplianceStatus.NOT_STARTED, coverage =
SpecCompliant.ComplianceCoverage.UNSUPPORTED),
@SpecCompliant(spec = "xep-0060", section = "7.1.3.6", status =
SpecCompliant.ComplianceStatus.NOT_STARTED, coverage =
SpecCompliant.ComplianceCoverage.UNSUPPORTED) })
protected Stanza handleSet(IQStanza stanza, ServerRuntimeContext
serverRuntimeContext, SessionContext sessionContext) {
- Entity serverJID = serviceConfiguration.getServerJID();
+ Entity serverJID = serviceConfiguration.getDomainJID();
CollectionNode root = serviceConfiguration.getRootNode();
Entity sender = extractSenderJID(stanza, sessionContext);
Modified:
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveAffiliationsHandler.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveAffiliationsHandler.java?rev=991843&r1=991842&r2=991843&view=diff
==============================================================================
---
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveAffiliationsHandler.java
(original)
+++
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveAffiliationsHandler.java
Thu Sep 2 08:01:41 2010
@@ -67,7 +67,7 @@ public class PubSubRetrieveAffiliationsH
*/
@Override
protected Stanza handleGet(IQStanza stanza, ServerRuntimeContext
serverRuntimeContext, SessionContext sessionContext) {
- Entity serverJID = serviceConfiguration.getServerJID();
+ Entity serverJID = serviceConfiguration.getDomainJID();
CollectionNode root = serviceConfiguration.getRootNode();
Entity sender = extractSenderJID(stanza, sessionContext);
Modified:
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveSubscriptionsHandler.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveSubscriptionsHandler.java?rev=991843&r1=991842&r2=991843&view=diff
==============================================================================
---
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveSubscriptionsHandler.java
(original)
+++
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveSubscriptionsHandler.java
Thu Sep 2 08:01:41 2010
@@ -69,7 +69,7 @@ public class PubSubRetrieveSubscriptions
*/
@Override
protected Stanza handleGet(IQStanza stanza, ServerRuntimeContext
serverRuntimeContext, SessionContext sessionContext) {
- Entity serverJID = serviceConfiguration.getServerJID();
+ Entity serverJID = serviceConfiguration.getDomainJID();
CollectionNode root = serviceConfiguration.getRootNode();
Entity sender = extractSenderJID(stanza, sessionContext);
Modified:
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeHandler.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeHandler.java?rev=991843&r1=991842&r2=991843&view=diff
==============================================================================
---
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeHandler.java
(original)
+++
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeHandler.java
Thu Sep 2 08:01:41 2010
@@ -81,7 +81,7 @@ public class PubSubSubscribeHandler exte
@SpecCompliant(spec = "xep-0060", section = "6.1.3.10", status =
SpecCompliant.ComplianceStatus.NOT_STARTED, coverage =
SpecCompliant.ComplianceCoverage.UNSUPPORTED),
@SpecCompliant(spec = "xep-0060", section = "6.1.3.11", status =
SpecCompliant.ComplianceStatus.FINISHED, coverage =
SpecCompliant.ComplianceCoverage.COMPLETE) })
protected Stanza handleSet(IQStanza stanza, ServerRuntimeContext
serverRuntimeContext, SessionContext sessionContext) {
- Entity serverJID = serviceConfiguration.getServerJID();
+ Entity serverJID = serviceConfiguration.getDomainJID();
CollectionNode root = serviceConfiguration.getRootNode();
Entity sender = extractSenderJID(stanza, sessionContext);
Modified:
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeHandler.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeHandler.java?rev=991843&r1=991842&r2=991843&view=diff
==============================================================================
---
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeHandler.java
(original)
+++
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeHandler.java
Thu Sep 2 08:01:41 2010
@@ -76,7 +76,7 @@ public class PubSubUnsubscribeHandler ex
@SpecCompliant(spec = "xep-0060", section = "6.2.3.4", status =
SpecCompliant.ComplianceStatus.FINISHED, coverage =
SpecCompliant.ComplianceCoverage.COMPLETE),
@SpecCompliant(spec = "xep-0060", section = "6.2.3.5", status =
SpecCompliant.ComplianceStatus.FINISHED, coverage =
SpecCompliant.ComplianceCoverage.COMPLETE) })
protected Stanza handleSet(IQStanza stanza, ServerRuntimeContext
serverRuntimeContext, SessionContext sessionContext) {
- Entity serverJID = serviceConfiguration.getServerJID();
+ Entity serverJID = serviceConfiguration.getDomainJID();
CollectionNode root = serviceConfiguration.getRootNode();
Entity sender = extractSenderJID(stanza, sessionContext);
Modified:
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerDeleteNodeHandler.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerDeleteNodeHandler.java?rev=991843&r1=991842&r2=991843&view=diff
==============================================================================
---
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerDeleteNodeHandler.java
(original)
+++
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerDeleteNodeHandler.java
Thu Sep 2 08:01:41 2010
@@ -71,7 +71,7 @@ public class PubSubOwnerDeleteNodeHandle
@SpecCompliant(spec = "xep-0060", section = "8.4.3.1", status =
SpecCompliant.ComplianceStatus.FINISHED, coverage =
SpecCompliant.ComplianceCoverage.COMPLETE),
@SpecCompliant(spec = "xep-0060", section = "8.4.3.2", status =
SpecCompliant.ComplianceStatus.FINISHED, coverage =
SpecCompliant.ComplianceCoverage.COMPLETE) })
protected Stanza handleSet(IQStanza stanza, ServerRuntimeContext
serverRuntimeContext, SessionContext sessionContext) {
- Entity serverJID = serviceConfiguration.getServerJID();
+ Entity serverJID = serviceConfiguration.getDomainJID();
CollectionNode root = serviceConfiguration.getRootNode();
Entity sender = extractSenderJID(stanza, sessionContext);
Modified:
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerManageAffiliationsHandler.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerManageAffiliationsHandler.java?rev=991843&r1=991842&r2=991843&view=diff
==============================================================================
---
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerManageAffiliationsHandler.java
(original)
+++
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerManageAffiliationsHandler.java
Thu Sep 2 08:01:41 2010
@@ -82,7 +82,7 @@ public class PubSubOwnerManageAffiliatio
@SpecCompliant(spec = "xep-0060", section = "8.9.2.3.3", status =
SpecCompliant.ComplianceStatus.NOT_STARTED, coverage =
SpecCompliant.ComplianceCoverage.UNSUPPORTED),
@SpecCompliant(spec = "xep-0060", section = "8.9.2.3.4", status =
SpecCompliant.ComplianceStatus.NOT_STARTED, coverage =
SpecCompliant.ComplianceCoverage.UNSUPPORTED) })
protected Stanza handleGet(IQStanza stanza, ServerRuntimeContext
serverRuntimeContext, SessionContext sessionContext) {
- Entity serverJID = serviceConfiguration.getServerJID();
+ Entity serverJID = serviceConfiguration.getDomainJID();
CollectionNode root = serviceConfiguration.getRootNode();
Entity sender = extractSenderJID(stanza, sessionContext);
@@ -119,7 +119,7 @@ public class PubSubOwnerManageAffiliatio
@SpecCompliant(spec = "xep-0060", section = "8.9.2.3.3", status =
SpecCompliant.ComplianceStatus.FINISHED, coverage =
SpecCompliant.ComplianceCoverage.COMPLETE),
@SpecCompliant(spec = "xep-0060", section = "8.9.2.3.4", status =
SpecCompliant.ComplianceStatus.FINISHED, coverage =
SpecCompliant.ComplianceCoverage.COMPLETE) })
protected Stanza handleSet(IQStanza stanza, ServerRuntimeContext
serverRuntimeContext, SessionContext sessionContext) {
- Entity serverJID = serviceConfiguration.getServerJID();
+ Entity serverJID = serviceConfiguration.getDomainJID();
CollectionNode root = serviceConfiguration.getRootNode();
Entity sender = extractSenderJID(stanza, sessionContext);
Modified:
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/model/LeafNode.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/model/LeafNode.java?rev=991843&r1=991842&r2=991843&view=diff
==============================================================================
---
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/model/LeafNode.java
(original)
+++
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/model/LeafNode.java
Thu Sep 2 08:01:41 2010
@@ -197,7 +197,7 @@ public class LeafNode {
*/
protected void sendMessageToSubscriber(StanzaRelay stanzaRelay, XMLElement
item) {
storage.acceptForEachSubscriber(name, new
SubscriberPayloadNotificationVisitor(serviceConfiguration
- .getServerJID(), stanzaRelay, item));
+ .getDomainJID(), stanzaRelay, item));
}
/**
Modified:
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoItemsTestCase.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoItemsTestCase.java?rev=991843&r1=991842&r2=991843&view=diff
==============================================================================
---
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoItemsTestCase.java
(original)
+++
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoItemsTestCase.java
Thu Sep 2 08:01:41 2010
@@ -99,11 +99,11 @@ public class PubSubDiscoItemsTestCase ex
XMLElement news = null;
XMLElement blogs = null;
for (XMLElement el : inner) {
- if (el.getName().equals("item") /* &&
el.getNamespace().equals(NamespaceURIs.XEP0030_SERVICE_DISCOVERY_ITEMS) */) {
//TODO enable after fixing the namespace bug
- if
(el.getAttributeValue("jid").equals(serverEntity.getFullQualifiedName())
+ if (el.getName().equals("item") &&
el.getNamespaceURI().equals(NamespaceURIs.XEP0030_SERVICE_DISCOVERY_ITEMS) ) {
+ if
(el.getAttributeValue("jid").equals(serviceConfiguration.getDomainJID().getFullQualifiedName())
&& el.getAttributeValue("node").equals("news") &&
el.getAttributeValue("name").equals("News")) {
news = el;
- } else if
(el.getAttributeValue("jid").equals(serverEntity.getFullQualifiedName())
+ } else if
(el.getAttributeValue("jid").equals(serviceConfiguration.getDomainJID().getFullQualifiedName())
&& el.getAttributeValue("node").equals("blogs") &&
el.getAttributeValue("name").equals("Blogs")) {
blogs = el;
}
Modified:
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/model/CollectionNodeTestCase.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/model/CollectionNodeTestCase.java?rev=991843&r1=991842&r2=991843&view=diff
==============================================================================
---
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/model/CollectionNodeTestCase.java
(original)
+++
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/model/CollectionNodeTestCase.java
Thu Sep 2 08:01:41 2010
@@ -46,7 +46,7 @@ public class CollectionNodeTestCase exte
owner = new EntityImpl("owner", "vysper.org", null);
Entity jid = new EntityImpl(null, "pubsub.vysper.org", null);
- serviceConfig.setServerJID(jid);
+ serviceConfig.setDomainJID(jid);
}
public void testCreateNode() throws Exception {
Modified:
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/model/LeafNodeTestCase.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/model/LeafNodeTestCase.java?rev=991843&r1=991842&r2=991843&view=diff
==============================================================================
---
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/model/LeafNodeTestCase.java
(original)
+++
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/model/LeafNodeTestCase.java
Thu Sep 2 08:01:41 2010
@@ -38,7 +38,7 @@ public class LeafNodeTestCase extends Te
super.setUp();
Entity nodeJID = new EntityImpl(null, "pubsub.vysper.org", null);
PubSubServiceConfiguration serviceConfig = new
PubSubServiceConfiguration(new CollectionNode());
- serviceConfig.setServerJID(nodeJID);
+ serviceConfig.setDomainJID(nodeJID);
Entity creatorJID = new EntityImpl("creator", "vysper.org", null);
node = new LeafNode(serviceConfig, "node", "Some test node",
creatorJID);
