Updating Tinder to a snapshot of version 1.2. Note that some packages have changed (OF-78)

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

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

 package org.jivesoftware.openfire.plugin;
 
+import gnu.inet.encoding.Stringprep;
+import gnu.inet.encoding.StringprepException;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
 import org.apache.commons.fileupload.FileItem;
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
@@ -19,20 +31,9 @@ import org.jivesoftware.openfire.user.UserAlreadyExistsException;
 import org.jivesoftware.openfire.user.UserManager;
 import org.jivesoftware.openfire.user.UserNotFoundException;
 import org.jivesoftware.openfire.user.UserProvider;
-import org.jivesoftware.stringprep.Stringprep;
-import org.jivesoftware.stringprep.StringprepException;
 import org.jivesoftware.util.Log;
 import org.xmpp.packet.JID;
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
 /**
  * The user import/export plugin provides a way to import and export Openfire
  * user data via the Admin Console. The user data consists of username, 

src/plugins/userservice/src/java/org/jivesoftware/openfire/plugin/userService/UserServiceServlet.java

@@ -20,23 +20,24 @@
 
 package org.jivesoftware.openfire.plugin.userService;
 
-import org.jivesoftware.openfire.XMPPServer;
-import org.jivesoftware.openfire.user.UserNotFoundException;
-import org.jivesoftware.openfire.user.UserAlreadyExistsException;
-import org.jivesoftware.util.Log;
-import org.jivesoftware.openfire.plugin.UserServicePlugin;
-import org.jivesoftware.admin.AuthCheckFilter;
-import org.jivesoftware.stringprep.Stringprep;
+import gnu.inet.encoding.Stringprep;
 
-import org.xmpp.packet.JID;
+import java.io.IOException;
+import java.io.PrintWriter;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
+
+import org.jivesoftware.admin.AuthCheckFilter;
+import org.jivesoftware.openfire.XMPPServer;
+import org.jivesoftware.openfire.plugin.UserServicePlugin;
+import org.jivesoftware.openfire.user.UserAlreadyExistsException;
+import org.jivesoftware.openfire.user.UserNotFoundException;
+import org.jivesoftware.util.Log;
+import org.xmpp.packet.JID;
 
 
 /**