svn commit: r941337 - in /mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management: Feature.java Identity.java Item.java

[ngn]

Author: ngn
Date: Wed May  5 15:13:22 2010
New Revision: 941337

URL: http://svn.apache.org/viewvc?rev=941337&view=rev
Log:
Correct namespace handling of disco elements

Modified:
    
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Feature.java
    
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Identity.java
    
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Item.java

Modified: 
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Feature.java
URL: 
http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Feature.java?rev=941337&r1=941336&r2=941337&view=diff
==============================================================================
--- 
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Feature.java
 (original)
+++ 
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Feature.java
 Wed May  5 15:13:22 2010
@@ -19,6 +19,7 @@
  */
 package org.apache.vysper.xmpp.modules.servicediscovery.management;
 
+import org.apache.vysper.xmpp.protocol.NamespaceURIs;
 import org.apache.vysper.xmpp.stanza.StanzaBuilder;
 
 /**
@@ -45,6 +46,6 @@ public class Feature implements InfoElem
     }
 
     public void insertElement(StanzaBuilder stanzaBuilder) {
-        stanzaBuilder.startInnerElement("feature").addAttribute("var", 
var).endInnerElement();
+        stanzaBuilder.startInnerElement("feature", 
NamespaceURIs.XEP0030_SERVICE_DISCOVERY_INFO).addAttribute("var", 
var).endInnerElement();
     }
 }

Modified: 
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Identity.java
URL: 
http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Identity.java?rev=941337&r1=941336&r2=941337&view=diff
==============================================================================
--- 
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Identity.java
 (original)
+++ 
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Identity.java
 Wed May  5 15:13:22 2010
@@ -19,6 +19,7 @@
  */
 package org.apache.vysper.xmpp.modules.servicediscovery.management;
 
+import org.apache.vysper.xmpp.protocol.NamespaceURIs;
 import org.apache.vysper.xmpp.stanza.StanzaBuilder;
 
 /**
@@ -62,7 +63,7 @@ public class Identity implements InfoEle
     }
 
     public void insertElement(StanzaBuilder stanzaBuilder) {
-        stanzaBuilder.startInnerElement("identity").
+        stanzaBuilder.startInnerElement("identity", 
NamespaceURIs.XEP0030_SERVICE_DISCOVERY_INFO).
                 addAttribute("category", category).
                 addAttribute("type", type);
                 if (name != null) {

Modified: 
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Item.java
URL: 
http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Item.java?rev=941337&r1=941336&r2=941337&view=diff
==============================================================================
--- 
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Item.java
 (original)
+++ 
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Item.java
 Wed May  5 15:13:22 2010
@@ -20,6 +20,7 @@
 package org.apache.vysper.xmpp.modules.servicediscovery.management;
 
 import org.apache.vysper.xmpp.addressing.Entity;
+import org.apache.vysper.xmpp.protocol.NamespaceURIs;
 import org.apache.vysper.xmpp.stanza.StanzaBuilder;
 
 /**
@@ -60,7 +61,7 @@ public class Item {
     }
 
     public void insertElement(StanzaBuilder stanzaBuilder) {
-        stanzaBuilder.startInnerElement("item");
+        stanzaBuilder.startInnerElement("item", 
NamespaceURIs.XEP0030_SERVICE_DISCOVERY_ITEMS);
             if (jid != null) stanzaBuilder.addAttribute("jid", 
jid.getFullQualifiedName());
             if (name != null) stanzaBuilder.addAttribute("name", name);
             if (node != null) stanzaBuilder.addAttribute("node", node);