Fixed to include a childElement in the replies.

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@693 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/messenger/disco/IQDiscoInfoHandler.java

@@ -93,6 +93,7 @@ public class IQDiscoInfoHandler extends IQHandler {
             
             // Check if we have information about the requested name and node
             if (infoProvider.hasInfo(name, node, packet.getFrom())) {
+                reply.setChildElement(iq.createCopy());
                 Element queryElement = reply.getChildElement();
 
                 // Add to the reply all the identities provided by the DiscoInfoProvider

src/java/org/jivesoftware/messenger/disco/IQDiscoItemsHandler.java

@@ -98,11 +98,11 @@ public class IQDiscoItemsHandler extends IQHandler implements ServerFeaturesProv
             // Get the requested node
             Element iq = packet.getChildElement();
             String node = iq.attributeValue("node");
-            //String node = metaData.getProperty("query:node");
 
             // Check if we have items associated with the requested name and node
             Iterator<Element> itemsItr = itemsProvider.getItems(name, node, packet.getFrom());
             if (itemsItr != null) {
+                reply.setChildElement(iq.createCopy());
                 Element queryElement = reply.getChildElement();
 
                 // Add to the reply all the items provided by the DiscoItemsProvider

src/java/org/jivesoftware/messenger/muc/spi/IQMUCRegisterHandler.java

@@ -67,10 +67,8 @@ public class IQMUCRegisterHandler extends IQHandler {
 
     public void initialize() {
         if (probeResult == null) {
-            // Create the basic element of the probeResult which contains the basic registration
-            // information for the room (e.g. first name, last name, nickname, etc.)
-            Element element = DocumentHelper.createElement(QName.get("query", "jabber:iq:register"));
-
+            // Create the registration form of the room which contains information
+            // such as: first name, last name and  nickname.
             XDataFormImpl registrationForm = new XDataFormImpl(DataForm.TYPE_FORM);
             registrationForm.setTitle(LocaleUtils.getLocalizedString("muc.form.reg.title"));
             registrationForm.addInstruction(LocaleUtils
@@ -114,8 +112,8 @@ public class IQMUCRegisterHandler extends IQHandler {
             field.setLabel(LocaleUtils.getLocalizedString("muc.form.reg.faqentry"));
             registrationForm.addField(field);
 
-            // Create the probeResult and add the basic info together with the registration form
-            probeResult = element;
+            // Create the probeResult and add the registration form
+            probeResult = DocumentHelper.createElement(QName.get("query", "jabber:iq:register"));
             probeResult.add(registrationForm.asXMLElement());
         }
     }
@@ -139,14 +137,20 @@ public class IQMUCRegisterHandler extends IQHandler {
             if (nickname != null) {
                 // The user is already registered with the room so answer a completed form
                 ElementUtil.setProperty(currentRegistration, "query.registered", null);
-                XDataFormImpl form = new XDataFormImpl();
-                form.parse(currentRegistration);
-                form.getField("muc#register_roomnick").addValue(nickname);
-                reply.getElement().add(currentRegistration);
+                Element form = currentRegistration.element(QName.get("x", "jabber:x:data"));
+                Iterator fields = form.elementIterator("field");
+                Element field;
+                while (fields.hasNext()) {
+                    field = (Element) fields.next();
+                    if ("muc#register_roomnick".equals(field.attributeValue("var"))) {
+                        field.addElement("value").addText(nickname);
+                    }
+                }
+                reply.setChildElement(currentRegistration);
             }
             else {
                 // The user is not registered with the room so answer an empty form
-                reply.getElement().add(currentRegistration);
+                reply.setChildElement(currentRegistration);
             }
         }
         else if (IQ.Type.set ==  packet.getType()) {