OF-349: Handle empty group elements like no group at all

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

src/plugins/userImportExport/changelog.html

@@ -148,15 +148,16 @@ hr {
    </div>
 <div id="pageBody">
 
-<p><b>2.3.0</b> -- December 2, 2009</p>
+<h2>2.3.0 -- <span style="font-weight: normal;">February 2, 2010</span></h2>
 <ul>
      <li>Now requires Openfire 3.7.0.</li>
      <li>Applied Java generics.</li>
      <li>[<a href='http://www.igniterealtime.org/issues/browse/OF-53'>OF-53</a>] - Replace custom logging implementation with a third party library.</li>
      <li>[<a href='http://www.igniterealtime.org/issues/browse/OF-78'>OF-78</a>] - Replaced custom Stringprep with LibIDN.</li>
+     <li>[<a href='http://www.igniterealtime.org/issues/browse/OF-349'>OF-349</a>] - Ignore empty groups.</li>
 </ul>
 
-<p><b>2.2.0</b> -- April 12, 2007</p>
+<h2>2.2.0 -- <span style="font-weight: normal;">April 12, 2007</span></h2>
 <ul>
     <li>Now requires Openfire 3.3.0.</li>
 </ul>

src/plugins/userImportExport/plugin.xml

@@ -7,7 +7,7 @@
    <description>Enables import and export of user data</description>
    <author>Ryan Graham</author>
    <version>2.3.0</version>
-   <date>12/2/2009</date>
+   <date>2/19/2010</date>
    <minServerVersion>3.7.0</minServerVersion>
 
    <adminconsole>

src/plugins/userImportExport/readme.html

@@ -230,10 +230,9 @@ whose roster looks like:
 &nbsp;&nbsp;&lt;ModifiedDate&gt;1125442154664&lt;/ModifiedDate&gt;<br>
 &nbsp;&nbsp;&lt;Roster&gt;<br>
 &nbsp;&nbsp;&nbsp;&nbsp;&lt;Item jid=&quot;jane@im.olddomain.net&quot; askstatus=&quot;-1&quot; recvstatus=&quot;-1&quot; substatus=&quot;3&quot; name=&quot;Jane&quot;&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;Group&gt;&lt;/Group&gt;<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;Group&gt;Friends&lt;/Group&gt;<br>
 &nbsp;&nbsp;&nbsp;&nbsp;&lt;/Item&gt;<br>
 &nbsp;&nbsp;&nbsp;&nbsp;&lt;Item jid=&quot;paul@xyz.net&quot; askstatus=&quot;-1&quot; recvstatus=&quot;-1&quot; substatus=&quot;3&quot; name=&quot;Paul&quot;&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;Group&gt;&lt;/Group&gt;<br>
 &nbsp;&nbsp;&nbsp;&nbsp;&lt;/Item&gt;<br>
 &nbsp;&nbsp;&lt;/Roster&gt;<br>
 &lt;/User&gt;<br>
@@ -266,11 +265,9 @@ effect, the import file would be transformed to look like:
 &nbsp;&nbsp;&lt;ModifiedDate&gt;1125442154664&lt;/ModifiedDate&gt;<br>
 &nbsp;&nbsp;&lt;Roster&gt;<br>
 &nbsp;&nbsp;&nbsp;&nbsp;&lt;Item jid=&quot;jane@im.newdomain.net&quot; askstatus=&quot;-1&quot; recvstatus=&quot;-1&quot; substatus=&quot;3&quot; name=&quot;Jane&quot;&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;Group&gt;&lt;/Group&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&lt;/Item&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&lt;Item jid=&quot;paul@xyz.net&quot; askstatus=&quot;-1&quot; recvstatus=&quot;-1&quot; substatus=&quot;3&quot; name=&quot;Paul&quot;&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;Group&gt;&lt;/Group&gt;<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;Group&gt;Friends&lt;/Group&gt;<br>
 &nbsp;&nbsp;&nbsp;&nbsp;&lt;/Item&gt;<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&lt;Item jid=&quot;paul@xyz.net&quot; askstatus=&quot;-1&quot; recvstatus=&quot;-1&quot; substatus=&quot;3&quot; name=&quot;Paul&quot;/&gt;<br>
 &nbsp;&nbsp;&lt;/Roster&gt;<br>
 &lt;/User&gt;<br>
 </td>
@@ -301,7 +298,7 @@ have added each other to their respective rosters.
 &nbsp;&nbsp;&nbsp;&nbsp;&lt;ModifiedDate&gt;1125601449177&lt;/ModifiedDate&gt;<br>
 &nbsp;&nbsp;&nbsp;&nbsp;&lt;Roster&gt;<br>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;Item jid=&quot;sally@localhost&quot; askstatus=&quot;-1&quot; recvstatus=&quot;-1&quot; substatus=&quot;3&quot; name=&quot;Sally&quot;&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;Group/&gt;<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;Group&gt;Friends&lt;/Group&gt;<br>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;/Item&gt;<br>
 &nbsp;&nbsp;&nbsp;&nbsp;&lt;/Roster&gt;<br>
 &nbsp;&nbsp;&lt;/User&gt;<br>
@@ -313,9 +310,7 @@ have added each other to their respective rosters.
 &nbsp;&nbsp;&nbsp;&nbsp;&lt;CreationDate&gt;1125601471848&lt;/CreationDate&gt;<br>
 &nbsp;&nbsp;&nbsp;&nbsp;&lt;ModifiedDate&gt;1125601471848&lt;/ModifiedDate&gt;<br>
 &nbsp;&nbsp;&nbsp;&nbsp;&lt;Roster&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;Item jid=&quot;joe@localhost&quot; askstatus=&quot;-1&quot; recvstatus=&quot;-1&quot; substatus=&quot;3&quot;&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;Group/&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;/Item&gt;<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;Item jid=&quot;joe@localhost&quot; askstatus=&quot;-1&quot; recvstatus=&quot;-1&quot; substatus=&quot;3&quot;/&gt;<br>
 &nbsp;&nbsp;&nbsp;&nbsp;&lt;/Roster&gt;<br>
 &nbsp;&nbsp;&lt;/User&gt;<br>
 &lt;/Openfire&gt;<br>

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

@@ -197,7 +197,9 @@ public class ImportExportPlugin implements Plugin {
                 Element groupElement = itemElement.addElement("Group");
                 List<String> groups = ri.getGroups();
                 for (String group : groups) {
-                    groupElement.addText(group);
+                    if (group != null && group.trim().length() > 0) {
+                        groupElement.addText(group);
+                    }
                 }
             }
         }
@@ -256,7 +258,10 @@ public class ImportExportPlugin implements Plugin {
                         Iterator<Element> groupIter = rosterElement.elementIterator("Group");
                         while (groupIter.hasNext()) {
                             Element group = groupIter.next();
-                            groups.add(group.getText());
+                            String groupName = group.getText();
+                            if (groupName != null && groupName.trim().length() > 0) {
+                                groups.add(groupName);
+                            }
                         }
                         
                         //used for migration