You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2010/05/16 22:39:31 UTC
svn commit: r944906 [2/2] - in /mina/vysper/trunk:
nbxml/src/main/java/org/apache/vysper/xml/fragment/
server/core/src/main/java/org/apache/vysper/xmpp/authorization/
server/core/src/main/java/org/apache/vysper/xmpp/modules/core/bind/handler/
server/co...
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=944906&r1=944905&r2=944906&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 Sun May 16 20:39:29 2010
@@ -134,10 +134,10 @@ public class PubSubPublishHandler extend
* @param id the id of the published message.
*/
private void buildSuccessStanza(StanzaBuilder sb, String node, String id) {
- sb.startInnerElement("publish");
+ sb.startInnerElement("publish", NamespaceURIs.XEP0060_PUBSUB);
sb.addAttribute("node", node);
- sb.startInnerElement("item");
+ sb.startInnerElement("item", NamespaceURIs.XEP0060_PUBSUB);
sb.addAttribute("id", id);
sb.endInnerElement();
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=944906&r1=944905&r2=944906&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 Sun May 16 20:39:29 2010
@@ -103,10 +103,10 @@ public class PubSubRetrieveAffiliationsH
* This method adds the "affiliations" and eventual "affiliation" elements to the given StanzaBuilder.
*/
private void buildSuccessStanza(StanzaBuilder sb, List<AffiliationItem> affiliations) {
- sb.startInnerElement("affiliations");
+ sb.startInnerElement("affiliations", NamespaceURIs.XEP0060_PUBSUB);
for(AffiliationItem s : affiliations) {
- sb.startInnerElement("affiliation");
+ sb.startInnerElement("affiliation", NamespaceURIs.XEP0060_PUBSUB);
sb.addAttribute("node", s.getNodeName());
sb.addAttribute("affiliation", s.getAffiliation().toString());
sb.endInnerElement();
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=944906&r1=944905&r2=944906&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 Sun May 16 20:39:29 2010
@@ -119,10 +119,10 @@ public class PubSubRetrieveSubscriptions
* This method adds the default "success" elements to the given StanzaBuilder.
*/
private void buildSuccessStanza(StanzaBuilder sb, String nodeName, List<SubscriptionItem> subscriptions) {
- sb.startInnerElement("subscriptions");
+ sb.startInnerElement("subscriptions", NamespaceURIs.XEP0060_PUBSUB);
for(SubscriptionItem s : subscriptions) {
- sb.startInnerElement("subscription");
+ sb.startInnerElement("subscription", NamespaceURIs.XEP0060_PUBSUB);
sb.addAttribute("node", s.getNodeName());
sb.addAttribute("jid", s.getSubscriberJID().getFullQualifiedName());
sb.addAttribute("subscription", s.getSubscriptionState());
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=944906&r1=944905&r2=944906&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 Sun May 16 20:39:29 2010
@@ -134,7 +134,7 @@ public class PubSubSubscribeHandler exte
* @param subid the subscription id for the given JID.
*/
private void buildSuccessStanza(StanzaBuilder sb, String nodeName, String jid, String subid) {
- sb.startInnerElement("subscription");
+ sb.startInnerElement("subscription", NamespaceURIs.XEP0060_PUBSUB);
sb.addAttribute("node", nodeName);
sb.addAttribute("jid", jid);
sb.addAttribute("subid", subid);
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=944906&r1=944905&r2=944906&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 Sun May 16 20:39:29 2010
@@ -173,11 +173,11 @@ public class PubSubOwnerManageAffiliatio
* Creates the stanza to be sent for successful requests.
*/
private void buildSuccessStanza(StanzaBuilder sb, LeafNode node, List<AffiliationItem> affiliations) {
- sb.startInnerElement("affiliations");
+ sb.startInnerElement("affiliations", NamespaceURIs.XEP0060_PUBSUB);
sb.addAttribute("node", node.getName());
for(AffiliationItem i : affiliations) {
- sb.startInnerElement("affiliation");
+ sb.startInnerElement("affiliation", NamespaceURIs.XEP0060_PUBSUB);
sb.addAttribute("jid", i.getJID().getFullQualifiedName());
sb.addAttribute("affiliation", i.getAffiliation().toString());
sb.endInnerElement();
Modified: mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubCreateNodeTestCase.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/handler/PubSubCreateNodeTestCase.java?rev=944906&r1=944905&r2=944906&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubCreateNodeTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubCreateNodeTestCase.java Sun May 16 20:39:29 2010
@@ -39,7 +39,7 @@ public class PubSubCreateNodeTestCase ex
class DefaultCreateNodeStanzaGenerator extends AbstractStanzaGenerator {
@Override
protected StanzaBuilder buildInnerElement(Entity client, Entity pubsub, StanzaBuilder sb, String node) {
- sb.startInnerElement("create");
+ sb.startInnerElement("create", NamespaceURIs.XEP0060_PUBSUB);
sb.addAttribute("node", node);
sb.endInnerElement();
return sb;
Modified: mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishTestCase.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/handler/PubSubPublishTestCase.java?rev=944906&r1=944905&r2=944906&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishTestCase.java Sun May 16 20:39:29 2010
@@ -176,9 +176,9 @@ public class PubSubPublishTestCase exten
class DefaultPublishStanzaGenerator extends AbstractStanzaGenerator {
@Override
protected StanzaBuilder buildInnerElement(Entity client, Entity pubsub, StanzaBuilder sb, String node) {
- sb.startInnerElement("publish");
+ sb.startInnerElement("publish", NamespaceURIs.XEP0060_PUBSUB);
sb.addAttribute("node", node);
- sb.startInnerElement("item");
+ sb.startInnerElement("item", NamespaceURIs.XEP0060_PUBSUB);
sb.addText("this is a test");
sb.endInnerElement();
sb.endInnerElement();
Modified: mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveAffiliationsTestCase.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/handler/PubSubRetrieveAffiliationsTestCase.java?rev=944906&r1=944905&r2=944906&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveAffiliationsTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveAffiliationsTestCase.java Sun May 16 20:39:29 2010
@@ -102,7 +102,7 @@ public class PubSubRetrieveAffiliationsT
class DefaultRetrieveAffiliationsStanzaGenerator extends AbstractStanzaGenerator {
@Override
protected StanzaBuilder buildInnerElement(Entity client, Entity pubsub, StanzaBuilder sb, String node) {
- sb.startInnerElement("affiliations");
+ sb.startInnerElement("affiliations", NamespaceURIs.XEP0060_PUBSUB);
sb.endInnerElement();
return sb;
}
Modified: mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveSubscriptionsTestCase.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/handler/PubSubRetrieveSubscriptionsTestCase.java?rev=944906&r1=944905&r2=944906&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveSubscriptionsTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveSubscriptionsTestCase.java Sun May 16 20:39:29 2010
@@ -119,7 +119,7 @@ public class PubSubRetrieveSubscriptions
class DefaultSubscribeStanzaGenerator extends AbstractStanzaGenerator {
@Override
protected StanzaBuilder buildInnerElement(Entity client, Entity pubsub, StanzaBuilder sb, String node) {
- sb.startInnerElement("subscriptions");
+ sb.startInnerElement("subscriptions", NamespaceURIs.XEP0060_PUBSUB);
if(node!=null) {
sb.addAttribute("node", node);
}
Modified: mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeTestCase.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/handler/PubSubSubscribeTestCase.java?rev=944906&r1=944905&r2=944906&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeTestCase.java Sun May 16 20:39:29 2010
@@ -191,7 +191,7 @@ public class PubSubSubscribeTestCase ext
@Override
protected StanzaBuilder buildInnerElement(Entity client, Entity pubsub, StanzaBuilder sb, String node) {
- sb.startInnerElement("subscribe");
+ sb.startInnerElement("subscribe", NamespaceURIs.XEP0060_PUBSUB);
sb.addAttribute("node", node);
sb.addAttribute("jid", getSubscriberJID(client));
sb.endInnerElement();
Modified: mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeTestCase.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/handler/PubSubUnsubscribeTestCase.java?rev=944906&r1=944905&r2=944906&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeTestCase.java Sun May 16 20:39:29 2010
@@ -71,7 +71,7 @@ public class PubSubUnsubscribeTestCase e
@Override
protected StanzaBuilder buildInnerElement(Entity client, Entity pubsub, StanzaBuilder sb, String node) {
- sb.startInnerElement("unsubscribe");
+ sb.startInnerElement("unsubscribe", NamespaceURIs.XEP0060_PUBSUB);
sb.addAttribute("node", node);
sb.addAttribute("jid", getSubscriberJID(client));
Modified: mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubConfigureNodeTestCase.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/handler/owner/PubSubConfigureNodeTestCase.java?rev=944906&r1=944905&r2=944906&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubConfigureNodeTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubConfigureNodeTestCase.java Sun May 16 20:39:29 2010
@@ -35,7 +35,7 @@ public class PubSubConfigureNodeTestCase
class DefaultConfigureNodeStanzaGenerator extends AbstractStanzaGenerator {
@Override
protected StanzaBuilder buildInnerElement(Entity client, Entity pubsub, StanzaBuilder sb, String node) {
- sb.startInnerElement("configure");
+ sb.startInnerElement("configure", NamespaceURIs.XEP0060_PUBSUB);
sb.addAttribute("node", node);
sb.endInnerElement();
return sb;
Modified: mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubDeleteNodeTestCase.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/handler/owner/PubSubDeleteNodeTestCase.java?rev=944906&r1=944905&r2=944906&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubDeleteNodeTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubDeleteNodeTestCase.java Sun May 16 20:39:29 2010
@@ -43,7 +43,7 @@ public class PubSubDeleteNodeTestCase ex
class DefaultDeleteNodeStanzaGenerator extends AbstractStanzaGenerator {
@Override
protected StanzaBuilder buildInnerElement(Entity client, Entity pubsub, StanzaBuilder sb, String node) {
- sb.startInnerElement("delete");
+ sb.startInnerElement("delete", NamespaceURIs.XEP0060_PUBSUB);
sb.addAttribute("node", node);
sb.endInnerElement();
return sb;
Modified: mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerModifyAffiliationsTestCase.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/handler/owner/PubSubOwnerModifyAffiliationsTestCase.java?rev=944906&r1=944905&r2=944906&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerModifyAffiliationsTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerModifyAffiliationsTestCase.java Sun May 16 20:39:29 2010
@@ -195,9 +195,9 @@ public class PubSubOwnerModifyAffiliatio
@Override
protected StanzaBuilder buildInnerElement(Entity client, Entity pubsub, StanzaBuilder sb, String node) {
- sb.startInnerElement("affiliations");
+ sb.startInnerElement("affiliations", NamespaceURIs.XEP0060_PUBSUB);
sb.addAttribute("node", this.node);
- sb.startInnerElement("affiliation");
+ sb.startInnerElement("affiliation", NamespaceURIs.XEP0060_PUBSUB);
sb.addAttribute("jid", this.jid.getFullQualifiedName());
sb.addAttribute("affiliation", this.affiliation.toString());
sb.endInnerElement();
Modified: mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerRetrieveAffiliationsTestCase.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/handler/owner/PubSubOwnerRetrieveAffiliationsTestCase.java?rev=944906&r1=944905&r2=944906&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerRetrieveAffiliationsTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerRetrieveAffiliationsTestCase.java Sun May 16 20:39:29 2010
@@ -140,7 +140,7 @@ public class PubSubOwnerRetrieveAffiliat
@Override
protected StanzaBuilder buildInnerElement(Entity client, Entity pubsub, StanzaBuilder sb, String node) {
- sb.startInnerElement("affiliations");
+ sb.startInnerElement("affiliations", NamespaceURIs.XEP0060_PUBSUB);
sb.addAttribute("node", this.node);
sb.endInnerElement();
return sb;