OF-564 fixed groups in user export/import plugin

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

src/plugins/userImportExport/changelog.html

@@ -148,6 +148,11 @@ hr {
    </div>
 <div id="pageBody">
 
+<h2>2.3.1 -- <span style="font-weight: normal;">July 7, 2012</span></h2>
+<ul>
+     <li>[<a href='http://issues.igniterealtime.org/browse/OF-564'>OF-564</a>] - User import/export plugin concatenates group names in export</li>
+</ul>
+
 <h2>2.3.0 -- <span style="font-weight: normal;">February 2, 2010</span></h2>
 <ul>
      <li>Now requires Openfire 3.7.0.</li>

src/plugins/userImportExport/classes/wildfire-user-schema.xsd.xml

@@ -37,7 +37,7 @@
    <xs:element name="Item">
       <xs:complexType>
          <xs:sequence>
-            <xs:element ref="Group" maxOccurs="unbounded" />
+            <xs:element ref="Group" minOccurs="0" maxOccurs="unbounded" />
          </xs:sequence>
          <xs:attribute ref="jid" use="required" />
          <xs:attribute name="askstatus" use="required" />

src/plugins/userImportExport/plugin.xml

@@ -6,8 +6,8 @@
    <name>User Import Export</name>
    <description>Enables import and export of user data</description>
    <author>Ryan Graham</author>
-   <version>2.3.0</version>
-   <date>2/19/2010</date>
+   <version>2.3.1</version>
+   <date>7/13/2012</date>
    <minServerVersion>3.7.0</minServerVersion>
 
    <adminconsole>

src/plugins/userImportExport/src/java/org/jivesoftware/openfire/plugin/ImportExportPlugin.java

@@ -194,11 +194,10 @@ public class ImportExportPlugin implements Plugin {
                 itemElement.addAttribute("substatus", String.valueOf(ri.getSubStatus().getValue()));
                 itemElement.addAttribute("name", ri.getNickname());
                 
-                Element groupElement = itemElement.addElement("Group");
                 List<String> groups = ri.getGroups();
                 for (String group : groups) {
                     if (group != null && group.trim().length() > 0) {
-                        groupElement.addText(group);
+                    	itemElement.addElement("Group").addText(group);
                     }
                 }
             }