Author: berndf
Date: Sat Jul 4 22:01:15 2009
New Revision: 791182
URL: http://svn.apache.org/viewvc?rev=791182&view=rev
Log:
removed "item-does-not-exist" stanza error condition - it is not defined in the
XMPP standard + is nowhere to be found in my copy of XEP-0060.
Modified:
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/ErrorStanzaGenerator.java
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/stanza/StanzaErrorCondition.java
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishTestCase.java
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeTestCase.java
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeTestCase.java
Modified:
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/ErrorStanzaGenerator.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/ErrorStanzaGenerator.java?rev=791182&r1=791181&r2=791182&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/ErrorStanzaGenerator.java
(original)
+++
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/ErrorStanzaGenerator.java
Sat Jul 4 22:01:15 2009
@@ -108,7 +108,7 @@
* @return the generated stanza.
*/
public Stanza generateNoNodeErrorStanza(Entity sender, Entity receiver,
IQStanza stanza) {
- return
errorResponses.getStanzaError(StanzaErrorCondition.ITEM_DOES_NOT_EXIST, stanza,
StanzaErrorType.CANCEL, null, null, null);
+ return
errorResponses.getStanzaError(StanzaErrorCondition.ITEM_NOT_FOUND, stanza,
StanzaErrorType.CANCEL, null, null, null);
}
/**
Modified:
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/stanza/StanzaErrorCondition.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/stanza/StanzaErrorCondition.java?rev=791182&r1=791181&r2=791182&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/stanza/StanzaErrorCondition.java
(original)
+++
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/stanza/StanzaErrorCondition.java
Sat Jul 4 22:01:15 2009
@@ -37,7 +37,6 @@
GONE ("gone"),
INTERNAL_SERVER_ERROR ("internal-server-error"),
ITEM_NOT_FOUND ("item-not-found"),
- ITEM_DOES_NOT_EXIST ("item-does-not-exist"),
JID_MALFORMED ("jid-malformed"),
NOT_ACCEPTABLE ("not-acceptable"),
NOT_ALLOWED ("not-allowed"),
Modified:
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishTestCase.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishTestCase.java?rev=791182&r1=791181&r2=791182&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishTestCase.java
Sat Jul 4 22:01:15 2009
@@ -138,7 +138,7 @@
List<XMLElement> errorContent = error.getInnerElements();
assertEquals(1, errorContent.size());
- assertEquals("item-does-not-exist", errorContent.get(0).getName());
+ assertEquals("item-not-found", errorContent.get(0).getName());
assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getNamespace());
}
Modified:
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeTestCase.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeTestCase.java?rev=791182&r1=791181&r2=791182&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeTestCase.java
Sat Jul 4 22:01:15 2009
@@ -143,7 +143,7 @@
List<XMLElement> errorContent = error.getInnerElements();
assertEquals(1, errorContent.size());
- assertEquals("item-does-not-exist", errorContent.get(0).getName());
+ assertEquals("item-not-found", errorContent.get(0).getName());
assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getNamespace());
}
Modified:
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeTestCase.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeTestCase.java?rev=791182&r1=791181&r2=791182&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeTestCase.java
Sat Jul 4 22:01:15 2009
@@ -221,7 +221,7 @@
List<XMLElement> errorContent = error.getInnerElements();
assertEquals(1, errorContent.size());
- assertEquals("item-does-not-exist", errorContent.get(0).getName());
+ assertEquals("item-not-found", errorContent.get(0).getName());
assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getNamespace());
}
