Refactoring work.

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

src/java/org/jivesoftware/messenger/Connection.java

@@ -18,6 +18,7 @@ import org.xmlpull.v1.XmlPullParserException;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.io.Writer;
 
 /**
  * <p>Represents a connection on the server.</p>
@@ -64,6 +65,8 @@ public interface Connection {
      */
     XMLWriter getSerializer() throws UnauthorizedException;
 
+    Writer getWriter() throws UnauthorizedException;
+
     /**
      * Close this session including associated socket connection.
      * <p/>

src/java/org/jivesoftware/messenger/ServerSession.java

@@ -24,6 +24,7 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Date;
 import java.io.IOException;
+import java.io.Writer;
 
 public class ServerSession implements Session {
 
@@ -145,6 +146,10 @@ public class ServerSession implements Session {
             return null;
         }
 
+        public Writer getWriter() throws UnauthorizedException {
+            return null;
+        }
+
         public void close() throws UnauthorizedException {
         }
 

src/java/org/jivesoftware/messenger/net/SocketReadThread.java

@@ -14,11 +14,10 @@ package org.jivesoftware.messenger.net;
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.Writer;
 import java.net.Socket;
 import org.dom4j.Document;
-import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
-import org.dom4j.io.XMLWriter;
 import org.dom4j.io.XPPPacketReader;
 import org.jivesoftware.messenger.Connection;
 import org.jivesoftware.messenger.PacketRouter;
@@ -237,21 +236,10 @@ public class SocketReadThread extends Thread {
             throw new XmlPullParserException(LocaleUtils.getLocalizedString("admin.error.bad-namespace"));
         }
 
-        // Flush this to the Connection to start up.
-        XMLWriter xser = connection.getSerializer();
-        String s = "<stream:stream to=\"jivesoftware.com\" xmlns=\"jabber:client\" xmlns:stream=\"http://etherx.jabber.org/streams\" version=\"1.0\" >";
-        Element streamElement = null;
-        try {
-            streamElement = DocumentHelper.createElement(s);
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-        streamElement.addAttribute("from", serverName);
-        streamElement.addAttribute("id", session.getStreamID().toString());
-        xser.write(streamElement);
-        xser.flush();
-
+        Writer writer = connection.getWriter();
+        String startPacket = "<?xml version='1.0' encoding='"+charset+"'?><stream:stream xmlns:stream=\"http://etherx.jabber.org/streams\" xmlns=\"jabber:client\" from=\""+serverName+"\" id=\""+session.getStreamID().toString()+"\">";
+        writer.write(startPacket);
+        writer.flush();
         // TODO: check for SASL support in opening stream tag
     }
 

src/java/org/jivesoftware/messenger/user/spi/IQRosterItemImpl.java

@@ -11,18 +11,14 @@
 
 package org.jivesoftware.messenger.user.spi;
 
-import org.jivesoftware.util.ConcurrentHashSet;
-import org.jivesoftware.messenger.user.BasicRosterItem;
-import org.jivesoftware.messenger.user.IQRosterItem;
-import org.jivesoftware.messenger.user.RosterItem;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
+import org.jivesoftware.messenger.user.BasicRosterItem;
+import org.jivesoftware.messenger.user.IQRosterItem;
+import org.jivesoftware.messenger.user.RosterItem;
+import org.jivesoftware.util.ConcurrentHashSet;
 import org.xmpp.packet.JID;
 
 public class IQRosterItemImpl extends BasicRosterItem implements IQRosterItem {
@@ -84,48 +80,6 @@ public class IQRosterItemImpl extends BasicRosterItem implements IQRosterItem {
         // do nothing
     }
 
-    public void send(XMLStreamWriter xmlSerializer, int version) throws XMLStreamException {
-        xmlSerializer.writeStartElement("jabber:iq:roster", "item");
-        xmlSerializer.writeAttribute("jid", jid.toBareJID());
-        xmlSerializer.writeAttribute("subscription", subStatus.getName());
-        if (askStatus != ASK_NONE) {
-            xmlSerializer.writeAttribute("ask", askStatus.getName());
-        }
-        if (nickname != null) {
-            if (nickname.trim().length() > 0) {
-                xmlSerializer.writeAttribute("name", nickname.trim());
-            }
-        }
-        if (groups != null) {
-            Iterator groupsItr = groups.iterator();
-            while (groupsItr.hasNext()) {
-                xmlSerializer.writeStartElement("jabber:iq:roster", "group");
-                xmlSerializer.writeCharacters((String)groupsItr.next());
-                xmlSerializer.writeEndElement();
-            }
-        }
-        Iterator frags = fragments.iterator();
-        while (frags.hasNext()) {
-            Element frag = (Element)frags.next();
-            frag.send(xmlSerializer, version);
-        }
-        xmlSerializer.writeEndElement();
-    }
-
-    public IQRosterItem createDeepCopy() {
-        IQRosterItemImpl item = new IQRosterItemImpl(new JID(jid.getNode(), jid.getDomain(), jid.getResource()));
-        item.subStatus = subStatus;
-        item.askStatus = askStatus;
-        item.recvStatus = recvStatus;
-        item.nickname = nickname;
-        if (groups != null) {
-            item.groups = new ArrayList(groups.size());
-            Collections.copy(item.groups, groups);
-        }
-        item.fragments = (ConcurrentHashSet)fragments.clone();
-        return item;
-    }
-
     private ConcurrentHashSet fragments = new ConcurrentHashSet();
 
     public void addFragment(Element fragment) {