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 2009/12/06 23:15:26 UTC
svn commit: r887783 - in /mina/sandbox/vysper/trunk/server/core/src:
main/java/org/apache/vysper/xmpp/modules/core/base/handler/
main/java/org/apache/vysper/xmpp/stanza/
test/java/org/apache/vysper/mina/codec/
Author: ngn
Date: Sun Dec 6 22:15:25 2009
New Revision: 887783
URL: http://svn.apache.org/viewvc?rev=887783&view=rev
Log:
Adding namespaces on stanzas (right now these gets rendered on each stanza, will be removed when we get a stateful resolver)
Cleaning up some invalid use of getNamespacePrefix()
Modified:
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/StreamStartHandler.java
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanza.java
mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/mina/codec/XMLStreamTokenizerTestCase.java
Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/StreamStartHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/StreamStartHandler.java?rev=887783&r1=887782&r2=887783&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/StreamStartHandler.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/StreamStartHandler.java Sun Dec 6 22:15:25 2009
@@ -49,7 +49,7 @@
public boolean verify(Stanza stanza) {
if (stanza == null) return false;
if (!getName().equals(stanza.getName())) return false;
- String namespaceURI = stanza.getNamespacePrefix();
+ String namespaceURI = stanza.getNamespaceURI();
if (namespaceURI == null) return false;
return namespaceURI.equals(NamespaceURIs.JABBER_CLIENT) || namespaceURI.equals(NamespaceURIs.JABBER_SERVER);
}
Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java?rev=887783&r1=887782&r2=887783&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java Sun Dec 6 22:15:25 2009
@@ -39,7 +39,7 @@
public class StanzaBuilder extends AbstractXMLElementBuilder<StanzaBuilder, Stanza> {
public static StanzaBuilder createIQStanza(Entity from, Entity to, IQStanzaType type, String id) {
- StanzaBuilder stanzaBuilder = new StanzaBuilder("iq");
+ StanzaBuilder stanzaBuilder = new StanzaBuilder("iq", NamespaceURIs.JABBER_CLIENT);
if (from != null) stanzaBuilder.addAttribute("from", from.getFullQualifiedName());
if (to != null) stanzaBuilder.addAttribute("to", to.getFullQualifiedName());
stanzaBuilder.addAttribute("type", type.value());
@@ -48,7 +48,7 @@
}
public static StanzaBuilder createMessageStanza(Entity from, Entity to, String lang, String body) {
- StanzaBuilder stanzaBuilder = new StanzaBuilder("message");
+ StanzaBuilder stanzaBuilder = new StanzaBuilder("message", NamespaceURIs.JABBER_CLIENT);
stanzaBuilder.addAttribute("from", from.getFullQualifiedName());
stanzaBuilder.addAttribute("to", to.getFullQualifiedName());
if(lang != null) stanzaBuilder.addAttribute(NamespaceURIs.XML, "lang", lang);
@@ -63,7 +63,7 @@
}
public static StanzaBuilder createPresenceStanza(Entity from, Entity to, String lang, PresenceStanzaType type, String show, String status) {
- StanzaBuilder stanzaBuilder = new StanzaBuilder("presence");
+ StanzaBuilder stanzaBuilder = new StanzaBuilder("presence", NamespaceURIs.JABBER_CLIENT);
if (from != null) stanzaBuilder.addAttribute("from", from.getFullQualifiedName());
if (to != null) stanzaBuilder.addAttribute("to", to.getFullQualifiedName());
if (lang != null) stanzaBuilder.addAttribute(NamespaceURIs.XML, "lang", lang);
@@ -108,7 +108,7 @@
* @return
*/
public static StanzaBuilder createClone(XMLElement original, boolean deep, List<Attribute> replacingAttributes) {
- StanzaBuilder stanzaBuilder = new StanzaBuilder(original.getName(), original.getNamespacePrefix());
+ StanzaBuilder stanzaBuilder = new StanzaBuilder(original.getName(), original.getNamespaceURI(), original.getNamespacePrefix());
List<Attribute> replacingAttributesCopy = new ArrayList<Attribute>();
if (replacingAttributes != null) replacingAttributesCopy.addAll(replacingAttributes);
Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanza.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanza.java?rev=887783&r1=887782&r2=887783&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanza.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanza.java Sun Dec 6 22:15:25 2009
@@ -73,7 +73,7 @@
}
public boolean isServerCall() {
- return getNamespacePrefix().equals(NamespaceURIs.JABBER_SERVER);
+ return getNamespaceURI().equals(NamespaceURIs.JABBER_SERVER);
}
Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/mina/codec/XMLStreamTokenizerTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/mina/codec/XMLStreamTokenizerTestCase.java?rev=887783&r1=887782&r2=887783&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/mina/codec/XMLStreamTokenizerTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/mina/codec/XMLStreamTokenizerTestCase.java Sun Dec 6 22:15:25 2009
@@ -126,8 +126,8 @@
XMLElement stanzaParsed = (XMLElement) protocolDecoderOutput.get(0);
String stanzaName = stanzaParsed.getName();
assertEquals("stream", stanzaName);
- String stanzaNS = stanzaParsed.getNamespacePrefix();
- assertEquals("stream", stanzaNS);
+ String stanzaNSPrefix = stanzaParsed.getNamespacePrefix();
+ assertEquals("stream", stanzaNSPrefix);
}
private ByteBuffer createByteBuffer() {