reorganize project

10 files changed, 0 insertions, 1789 deletions

diff --git a/src/main/java/com/juick/xmpp/extensions/JuickMessage.java b/src/main/java/com/juick/xmpp/extensions/JuickMessage.java
deleted file mode 100644
index 885b2375..00000000
--- a/src/main/java/com/juick/xmpp/extensions/JuickMessage.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, Ugnich Anton
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.xmpp.extensions;
-
-import com.juick.xmpp.utils.XmlUtils;
-import com.juick.xmpp.*;
-import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.TimeZone;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-/**
- *
- * @author Ugnich Anton
- */
-public class JuickMessage extends com.juick.Message implements StanzaChild {
-
-    public final static String XMLNS = "http://juick.com/message";
-    public final static String TagName = "juick";
-    private SimpleDateFormat df;
-
-    public JuickMessage() {
-        df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        df.setTimeZone(TimeZone.getTimeZone("UTC"));
-    }
-
-    public JuickMessage(com.juick.Message msg) {
-        super(msg);
-        df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        df.setTimeZone(TimeZone.getTimeZone("UTC"));
-    }
-
-    @Override
-    public String getXMLNS() {
-        return XMLNS;
-    }
-
-    @Override
-    public JuickMessage parse(XmlPullParser parser) throws XmlPullParserException, IOException, ParseException {
-        JuickMessage jmsg = new JuickMessage();
-
-        final String sMID = parser.getAttributeValue(null, "mid");
-        if (sMID != null) {
-            jmsg.setMID(Integer.parseInt(sMID));
-        }
-        final String sRID = parser.getAttributeValue(null, "rid");
-        if (sRID != null) {
-            jmsg.setRID(Integer.parseInt(sRID));
-        }
-        final String sReplyTo = parser.getAttributeValue(null, "replyto");
-        if (sReplyTo != null) {
-            jmsg.ReplyTo = Integer.parseInt(sReplyTo);
-        }
-        final String sPrivacy = parser.getAttributeValue(null, "privacy");
-        if (sPrivacy != null) {
-            jmsg.Privacy = Integer.parseInt(sPrivacy);
-        }
-        final String sFriendsOnly = parser.getAttributeValue(null, "friendsonly");
-        if (sFriendsOnly != null) {
-            jmsg.FriendsOnly = true;
-        }
-        final String sReadOnly = parser.getAttributeValue(null, "readonly");
-        if (sReadOnly != null) {
-            jmsg.ReadOnly = true;
-        }
-        String ts = parser.getAttributeValue(null, "timestamp");
-        if (ts != null) {
-            jmsg.setDate(df.parse(ts));
-        }
-        jmsg.AttachmentType = parser.getAttributeValue(null, "attach");
-
-        while (parser.next() == XmlPullParser.START_TAG) {
-            final String tag = parser.getName();
-            final String xmlns = parser.getNamespace();
-            if (tag.equals("body")) {
-                jmsg.setText(XmlUtils.getTagText(parser));
-            } else if (tag.equals(JuickUser.TagName) && xmlns != null && xmlns.equals(JuickUser.XMLNS)) {
-                jmsg.setUser(new JuickUser().parse(parser));
-            } else if (tag.equals("tag")) {
-                jmsg.Tags.add(XmlUtils.getTagText(parser));
-            } else {
-                XmlUtils.skip(parser);
-            }
-        }
-        return jmsg;
-    }
-
-    @Override
-    public String toString() {
-        String ret = "";
-
-        ret = "<" + TagName + " xmlns=\"" + XMLNS + "\"";
-        if (getMID() > 0) {
-            ret += " mid=\"" + getMID() + "\"";
-        }
-        if (getRID() > 0) {
-            ret += " rid=\"" + getRID() + "\"";
-        }
-        if (ReplyTo > 0) {
-            ret += " replyto=\"" + ReplyTo + "\"";
-        }
-        ret += " privacy=\"" + Privacy + "\"";
-        if (FriendsOnly) {
-            ret += " friendsonly=\"1\"";
-        }
-        if (ReadOnly) {
-            ret += " readonly=\"1\"";
-        }
-        if (getDate() != null) {
-            ret += " ts=\"" + df.format(getDate()) + "\"";
-        }
-        if (AttachmentType != null) {
-            ret += " attach=\"" + AttachmentType + "\"";
-        }
-        ret += ">";
-        if (getUser() != null) {
-            ret += JuickUser.toString(getUser());
-        }
-        if (getText() != null) {
-            ret += "<body>" + XmlUtils.escape(getText()) + "</body>";
-        }
-        if (!Tags.isEmpty()) {
-            for (int i = 0; i < Tags.size(); i++) {
-                ret += "<tag>" + XmlUtils.escape(Tags.get(i)) + "</tag>";
-            }
-        }
-        ret += "</" + TagName + ">";
-
-        return ret;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (!(obj instanceof JuickMessage)) {
-            return false;
-        }
-        JuickMessage jmsg = (JuickMessage) obj;
-        return (this.getMID() == jmsg.getMID() && this.getRID() == jmsg.getRID());
-    }
-
-    @Override
-    public int compareTo(Object obj) throws ClassCastException {
-        if (!(obj instanceof JuickMessage)) {
-            throw new ClassCastException();
-        }
-        JuickMessage jmsg = (JuickMessage) obj;
-
-        if (this.getMID() != jmsg.getMID()) {
-            if (this.getMID() > jmsg.getMID()) {
-                return -1;
-            } else {
-                return 1;
-            }
-        }
-
-        if (this.getRID() != jmsg.getRID()) {
-            if (this.getRID() < jmsg.getRID()) {
-                return -1;
-            } else {
-                return 1;
-            }
-        }
-
-        return 0;
-    }
-}
diff --git a/src/main/java/com/juick/xmpp/extensions/JuickUser.java b/src/main/java/com/juick/xmpp/extensions/JuickUser.java
deleted file mode 100644
index edc6749a..00000000
--- a/src/main/java/com/juick/xmpp/extensions/JuickUser.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, Ugnich Anton
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.xmpp.extensions;
-
-import com.juick.xmpp.utils.XmlUtils;
-import com.juick.xmpp.*;
-import java.io.IOException;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-/**
- *
- * @author Ugnich Anton
- */
-public class JuickUser extends com.juick.User implements StanzaChild {
-
-    public final static String XMLNS = "http://juick.com/user";
-    public final static String TagName = "user";
-
-    public JuickUser() {
-    }
-
-    public JuickUser(com.juick.User user) {
-        super(user);
-    }
-
-    @Override
-    public String getXMLNS() {
-        return XMLNS;
-    }
-
-    @Override
-    public JuickUser parse(final XmlPullParser parser) throws XmlPullParserException, IOException {
-        JuickUser juser = new JuickUser();
-        String strUID = parser.getAttributeValue(null, "uid");
-        if (strUID != null) {
-            juser.setUID(Integer.parseInt(strUID));
-        }
-        juser.setUName(parser.getAttributeValue(null, "uname"));
-        XmlUtils.skip(parser);
-        return juser;
-    }
-
-    public static String toString(com.juick.User user) {
-        String str = "<" + TagName + " xmlns='" + XMLNS + "'";
-        if (user.getUID() > 0) {
-            str += " uid='" + user.getUID() + "'";
-        }
-        if (user.getUName() != null && user.getUName().length() > 0) {
-            str += " uname='" + XmlUtils.escape(user.getUName()) + "'";
-        }
-        str += "/>";
-        return str;
-    }
-
-    @Override
-    public String toString() {
-        return toString(this);
-    }
-}
diff --git a/src/main/java/com/juick/xmpp/s2s/CacheEntry.java b/src/main/java/com/juick/xmpp/s2s/CacheEntry.java
deleted file mode 100644
index 7cdb18ab..00000000
--- a/src/main/java/com/juick/xmpp/s2s/CacheEntry.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.juick.xmpp.s2s;
-
-/**
- *
- * @author ugnich
- */
-public class CacheEntry {
-
-    public String hostname;
-    public long tsCreated;
-    public long tsUpdated;
-    public String xml;
-
-    public CacheEntry(String hostname, String xml) {
-        this.hostname = hostname;
-        this.tsCreated = this.tsUpdated = System.currentTimeMillis();
-        this.xml = xml;
-    }
-}
diff --git a/src/main/java/com/juick/xmpp/s2s/CleaningUp.java b/src/main/java/com/juick/xmpp/s2s/CleaningUp.java
deleted file mode 100644
index 14d97ed8..00000000
--- a/src/main/java/com/juick/xmpp/s2s/CleaningUp.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.juick.xmpp.s2s;
-
-import java.io.FileNotFoundException;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.util.Iterator;
-
-/**
- *
- * @author ugnich
- */
-public class CleaningUp implements Runnable {
-    XMPPComponent xmpp;
-    
-    public CleaningUp(XMPPComponent xmpp) {
-        this.xmpp = xmpp;
-    }
-
-    @Override
-    public void run() {
-        while (true) {
-            try {
-                PrintWriter statsFile = new PrintWriter(xmpp.STATSFILE, "UTF-8");
-                statsFile.write("<html><body><h2>Threads: " + Thread.activeCount() + "</h2>");
-                statsFile.write("<h2>Out (" + xmpp.outConnections.size() + ")</h2><table border=1><tr><th>to</th><th>sid</th><th>inactive</th><th>out packets</th><th>out bytes</th></tr>");
-
-                long now = System.currentTimeMillis();
-
-                synchronized (xmpp.outConnections) {
-                    for (Iterator<ConnectionOut> i = xmpp.outConnections.iterator(); i.hasNext();) {
-                        ConnectionOut c = i.next();
-                        int inactive = (int) ((double) (now - c.tsLocalData) / 1000.0);
-                        if (inactive > 900) {
-                            c.closeConnection();
-                            i.remove();
-                        } else {
-                            statsFile.write("  <tr>");
-                            statsFile.write("    <td>" + c.to + "</td>\n");
-                            statsFile.write("    <td>" + c.streamID + "</td>\n");
-                            statsFile.write("    <td>" + inactive + "</td>\n");
-                            statsFile.write("    <td>" + c.packetsLocal + "</td>\n");
-                            statsFile.write("    <td>" + c.bytesLocal + "</td>\n");
-                            statsFile.write("  <tr>");
-                        }
-                    }
-                }
-
-                statsFile.write("</table><h2>In (" + xmpp.inConnections.size() + ")</h2><table border=1><tr><th>from</th><th>sid</th><th>inactive</th><th>in packets</th></tr>");
-
-                synchronized (xmpp.inConnections) {
-                    for (Iterator<ConnectionIn> i = xmpp.inConnections.iterator(); i.hasNext();) {
-                        ConnectionIn c = i.next();
-                        int inactive = (int) ((double) (now - c.tsRemoteData) / 1000.0);
-                        if (inactive > 900) {
-                            c.closeConnection();
-                            i.remove();
-                        } else {
-                            statsFile.write("  <tr>");
-                            if (c.from.isEmpty()) {
-                                statsFile.write("    <td>&nbsp;</td>\n");
-                            } else if (c.from.size() == 1) {
-                                statsFile.write("    <td>" + c.from.get(0) + "</td>\n");
-                            } else {
-                                String out = "    <td>";
-                                for (int n = 0; n < c.from.size(); n++) {
-                                    if (n > 0) {
-                                        out += "<br/>";
-                                    }
-                                    out += c.from.get(n);
-                                }
-                                statsFile.write(out + "</td>\n");
-                            }
-                            statsFile.write("    <td>" + c.streamID + "</td>\n");
-                            statsFile.write("    <td>" + inactive + "</td>\n");
-                            statsFile.write("    <td>" + c.packetsRemote + "</td>\n");
-                            statsFile.write("  <tr>");
-                        }
-                    }
-                }
-
-                statsFile.write("</table><h2>Cache (" + xmpp.outCache.size() + ")</h2><table border=1><tr><th>host</th><th>live</th><th>size</th></tr>");
-
-                synchronized (xmpp.outCache) {
-                    for (Iterator<CacheEntry> i = xmpp.outCache.iterator(); i.hasNext();) {
-                        CacheEntry c = i.next();
-                        int inactive = (int) ((double) (now - c.tsCreated) / 1000.0);
-                        if (inactive > 600) {
-                            i.remove();
-                        } else {
-                            statsFile.write("<tr><td>" + c.hostname + "</td><td>" + inactive + "</td><td>" + c.xml.length() + "</td></tr>");
-                        }
-                    }
-                }
-
-                statsFile.write("</table></body></html>");
-                statsFile.close();
-
-                try {
-                    Thread.sleep(10000);
-                } catch (InterruptedException e) {
-                }
-            } catch (FileNotFoundException e) {
-            } catch (UnsupportedEncodingException e) {
-            }
-        }
-    }
-}
diff --git a/src/main/java/com/juick/xmpp/s2s/Connection.java b/src/main/java/com/juick/xmpp/s2s/Connection.java
deleted file mode 100644
index eae6efaa..00000000
--- a/src/main/java/com/juick/xmpp/s2s/Connection.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.juick.xmpp.s2s;
-
-import org.xmlpull.mxp1.MXParser;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-import java.io.*;
-import java.net.Socket;
-import java.security.*;
-import java.security.cert.CertificateException;
-import java.util.UUID;
-import java.util.logging.Logger;
-
-/**
- *
- * @author ugnich
- */
-public class Connection {
-
-    protected static final Logger LOGGER = Logger.getLogger(Connection.class.getName());
-
-    public String streamID;
-    public long tsCreated = 0;
-    public long tsLocalData = 0;
-    public long bytesLocal = 0;
-    public long packetsLocal = 0;
-    XMPPComponent xmpp;
-    Socket socket;
-    public static final String NS_DB = "jabber:server:dialback";
-    public static final String NS_TLS = "urn:ietf:params:xml:ns:xmpp-tls";
-    public static final String NS_STREAM = "http://etherx.jabber.org/streams";
-    XmlPullParser parser = new MXParser();
-    OutputStreamWriter writer;
-    private boolean secured = false;
-    SSLContext sc;
-    private TrustManager[] trustAllCerts = new TrustManager[]{
-            new X509TrustManager() {
-                public void checkClientTrusted(java.security.cert.X509Certificate[] certs, String authType) {
-                }
-
-                public void checkServerTrusted(java.security.cert.X509Certificate[] certs, String authType) {
-                }
-                public java.security.cert.X509Certificate[] getAcceptedIssuers() {
-                    return null;
-                }
-            }
-    };
-
-
-    public Connection(XMPPComponent xmpp) throws XmlPullParserException, KeyStoreException, CertificateException, NoSuchAlgorithmException, IOException, UnrecoverableKeyException, KeyManagementException {
-        this.xmpp = xmpp;
-        tsCreated = System.currentTimeMillis();
-        parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
-        KeyStore ks = KeyStore.getInstance("JKS");
-        try (InputStream ksIs = new FileInputStream(xmpp.keystore)) {
-            ks.load(ksIs, xmpp.keystorePassword.toCharArray());
-        }
-
-        KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory
-                .getDefaultAlgorithm());
-        kmf.init(ks, xmpp.keystorePassword.toCharArray());
-        sc = SSLContext.getInstance("TLSv1.2");
-
-        sc.init(kmf.getKeyManagers(), trustAllCerts, new SecureRandom());
-
-    }
-
-    public void logParser() {
-        if (streamID == null) {
-            return;
-        }
-        String tag = "IN: <" + parser.getName();
-        for (int i = 0; i < parser.getAttributeCount(); i++) {
-            tag += " " + parser.getAttributeName(i) + "=\"" + parser.getAttributeValue(i) + "\"";
-        }
-        tag += ">...</" + parser.getName() + ">\n";
-        LOGGER.fine(tag);
-    }
-
-    public void sendStanza(String xml) throws IOException {
-        if (streamID != null) {
-            LOGGER.fine("OUT: " + xml + "\n");
-        }
-        writer.write(xml);
-        writer.flush();
-        tsLocalData = System.currentTimeMillis();
-        bytesLocal += xml.length();
-        packetsLocal++;
-    }
-
-    void closeConnection() {
-        if (streamID != null) {
-            LOGGER.info(String.format("CLOSING STREAM %s", streamID));
-        }
-
-        try {
-            writer.write("</stream:stream>");
-        } catch (Exception e) {
-        }
-
-        try {
-            writer.close();
-        } catch (Exception e) {
-        }
-
-        try {
-            socket.close();
-        } catch (Exception e) {
-        }
-    }
-
-    static String generateDialbackKey(String to, String from, String id) throws Exception {
-        Mac hmacSha256 = Mac.getInstance("hmacSHA256");
-
-        SecretKeySpec secret_key = new SecretKeySpec("$UppPerSeCCret4".getBytes(), "SHA-256");
-        hmacSha256.init(secret_key);
-        byte key[] = hmacSha256.doFinal((to + " " + from + " " + id).getBytes());
-
-        StringBuilder hexkey = new StringBuilder();
-        for (int i = 0; i < key.length; i++) {
-            hexkey.append(Integer.toHexString(0xFF & key[i]));
-        }
-
-        return hexkey.toString();
-    }
-
-    public boolean isSecured() {
-        return secured;
-    }
-
-    public void setSecured(boolean secured) {
-        this.secured = secured;
-    }
-
-    public void restartParser() throws XmlPullParserException, IOException {
-        parser = new MXParser();
-        parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
-        parser.setInput(new InputStreamReader(socket.getInputStream()));
-        writer = new OutputStreamWriter(socket.getOutputStream());
-        streamID = UUID.randomUUID().toString();
-    }
-}
diff --git a/src/main/java/com/juick/xmpp/s2s/ConnectionIn.java b/src/main/java/com/juick/xmpp/s2s/ConnectionIn.java
deleted file mode 100644
index 345caea9..00000000
--- a/src/main/java/com/juick/xmpp/s2s/ConnectionIn.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package com.juick.xmpp.s2s;
-
-import com.juick.xmpp.Iq;
-import com.juick.xmpp.JID;
-import com.juick.xmpp.Message;
-import com.juick.xmpp.Presence;
-import com.juick.xmpp.utils.XmlUtils;
-import org.xmlpull.v1.XmlPullParser;
-
-import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLSocket;
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.net.Socket;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- *
- * @author ugnich
- */
-public class ConnectionIn extends Connection implements Runnable {
-
-    private static final Logger LOGGER = Logger.getLogger(ConnectionIn.class.getName());
-
-    final public List<String> from = new ArrayList<>();
-    public long tsRemoteData = 0;
-    public long packetsRemote = 0;
-    JuickBot bot;
-
-    public ConnectionIn(XMPPComponent xmpp, JuickBot bot, Socket socket) throws Exception {
-        super(xmpp);
-        this.bot = bot;
-        this.socket = socket;
-        streamID = UUID.randomUUID().toString();
-        restartParser();
-    }
-
-    @Override
-    public void run() {
-        LOGGER.info("STREAM FROM ? " + streamID + " START");
-        try {
-            parser.next(); // stream:stream
-            updateTsRemoteData();
-            if (!parser.getName().equals("stream")
-                    || !parser.getNamespace("stream").equals(NS_STREAM)) {
-//                    || !parser.getAttributeValue(null, "version").equals("1.0")
-//                    || !parser.getAttributeValue(null, "to").equals(Main.HOSTNAME)) {
-                throw new Exception("STREAM FROM ? " + streamID + " INVALID FIRST PACKET");
-            }
-            boolean xmppversionnew = parser.getAttributeValue(null, "version") != null;
-
-            sendOpenStream(parser.getAttributeValue(null, "from"), xmppversionnew);
-
-            while (parser.next() != XmlPullParser.END_DOCUMENT) {
-                updateTsRemoteData();
-                if (parser.getEventType() != XmlPullParser.START_TAG) {
-                    continue;
-                }
-                logParser();
-
-                packetsRemote++;
-
-                String tag = parser.getName();
-                if (tag.equals("result") && parser.getNamespace().equals(NS_DB)) {
-                    String dfrom = parser.getAttributeValue(null, "from");
-                    String to = parser.getAttributeValue(null, "to");
-                    LOGGER.info("STREAM FROM " + dfrom + " TO " + to + " " + streamID + " ASKING FOR DIALBACK");
-                    if (dfrom.endsWith(xmpp.HOSTNAME) && (dfrom.equals(xmpp.HOSTNAME) || dfrom.endsWith("." + xmpp.HOSTNAME))) {
-                        break;
-                    }
-                    if (to != null && to.equals(xmpp.HOSTNAME)) {
-                        String dbKey = XmlUtils.getTagText(parser);
-                        updateTsRemoteData();
-
-                        ConnectionOut c = xmpp.getConnectionOut(dfrom, false);
-                        if (c != null) {
-                            c.sendDialbackVerify(streamID, dbKey);
-                        } else {
-                            c = new ConnectionOut(xmpp, dfrom, streamID, dbKey);
-                            xmpp.executorService.submit(c);
-                        }
-                    } else {
-                        throw new HostUnknownException("STREAM FROM " + dfrom + " " + streamID + " INVALID TO " + to);
-                    }
-                } else if (tag.equals("verify") && parser.getNamespace().equals(NS_DB)) {
-                    String vfrom = parser.getAttributeValue(null, "from");
-                    String vto = parser.getAttributeValue(null, "to");
-                    String vid = parser.getAttributeValue(null, "id");
-                    String vkey = XmlUtils.getTagText(parser);
-                    updateTsRemoteData();
-                    boolean valid = false;
-                    if (vfrom != null && vto != null && vid != null && vkey != null) {
-                        String vkey2 = generateDialbackKey(vfrom, vto, vid);
-                        valid = vkey.equals(vkey2);
-                    }
-                    if (valid) {
-                        sendStanza("<db:verify from='" + vto + "' to='" + vfrom + "' id='" + vid + "' type='valid'/>");
-                        LOGGER.info("STREAM FROM " + vfrom + " " + streamID + " DIALBACK VERIFY VALID");
-                    } else {
-                        sendStanza("<db:verify from='" + vto + "' to='" + vfrom + "' id='" + vid + "' type='invalid'/>");
-                        LOGGER.warning("STREAM FROM " + vfrom + " " + streamID + " DIALBACK VERIFY INVALID");
-                    }
-                } else if (tag.equals("presence") && checkFromTo(parser)) {
-                    Presence p = Presence.parse(parser, null);
-                    if (p != null && (p.type == null || !p.type.equals(Presence.Type.error))) {
-                        bot.incomingPresence(p);
-                    }
-                } else if (tag.equals("message") && checkFromTo(parser)) {
-                    updateTsRemoteData();
-                    Message msg = Message.parse(parser, xmpp.childParsers);
-                    if (msg != null && (msg.type == null || !msg.type.equals(Message.Type.error))) {
-                        LOGGER.info("STREAM " + streamID + ": " + msg.toString());
-                        if (!bot.incomingMessage(msg)) {
-                            xmpp.router.send(msg.toString());
-                        }
-                    }
-                } else if (tag.equals("iq") && checkFromTo(parser)) {
-                    updateTsRemoteData();
-                    String type = parser.getAttributeValue(null, "type");
-                    String xml = XmlUtils.parseToString(parser, true);
-                    if (type == null || !type.equals(Iq.Type.error)) {
-                        LOGGER.info("STREAM " + streamID + ": " + xml);
-                        xmpp.router.send(xml);
-                    }
-                } else if (!isSecured() && tag.equals("starttls")) {
-                    LOGGER.info("STREAM " + streamID + " SECURING");
-                    sendStanza("<proceed xmlns=\"" + NS_TLS + "\" />");
-                    try {
-                        socket = sc.getSocketFactory().createSocket(socket, socket.getInetAddress().getHostAddress(),
-                                socket.getPort(), true);
-                        ((SSLSocket) socket).setUseClientMode(false);
-                        ((SSLSocket) socket).startHandshake();
-                        setSecured(true);
-                        LOGGER.info("STREAM " + streamID + " SECURED");
-                        restartParser();
-                    } catch (SSLException sex) {
-                        LOGGER.warning("STREAM " + streamID + " SSL ERROR");
-                        sendStanza("<failed xmlns\"" + NS_TLS + "\" />");
-                        xmpp.removeConnectionIn(this);
-                        closeConnection();
-                    }
-                } else if (isSecured() && tag.equals("stream") && parser.getNamespace().equals(NS_STREAM)) {
-                    sendOpenStream(null, true);
-                } else {
-                    LOGGER.info("STREAM " + streamID + ": " + XmlUtils.parseToString(parser, true));
-                }
-            }
-            LOGGER.warning("STREAM " + streamID + " FINISHED");
-            xmpp.removeConnectionIn(this);
-            closeConnection();
-        } catch (EOFException ex) {
-            LOGGER.info(String.format("STREAM %s CLOSED (dirty)", streamID));
-            xmpp.removeConnectionIn(this);
-            closeConnection();
-        } catch (HostUnknownException e) {
-            LOGGER.warning(e.getMessage());
-        } catch (Exception e) {
-            LOGGER.log(Level.WARNING, "STREAM " + streamID + " ERROR", e);
-            xmpp.removeConnectionIn(this);
-            closeConnection();
-        }
-    }
-
-    void updateTsRemoteData() {
-        tsRemoteData = System.currentTimeMillis();
-    }
-
-    void sendOpenStream(String from, boolean xmppversionnew) throws IOException {
-        String openStream = "<?xml version='1.0'?><stream:stream xmlns='jabber:server' " +
-                "xmlns:stream='http://etherx.jabber.org/streams' xmlns:db='jabber:server:dialback' from='" +
-                xmpp.HOSTNAME + "' id='" + streamID + "' version='1.0'>";
-        if (xmppversionnew) {
-            openStream += "<stream:features>";
-            if (!isSecured() && !xmpp.brokenSSLhosts.contains(from)) {
-                openStream += "<starttls xmlns=\"" + NS_TLS + "\"><optional/></starttls>";
-            }
-            openStream += "</stream:features>";
-        }
-        sendStanza(openStream);
-    }
-
-    public void sendDialbackResult(String sfrom, String type) {
-        try {
-            sendStanza("<db:result from='" + xmpp.HOSTNAME + "' to='" + sfrom + "' type='" + type + "'/>");
-            if (type.equals("valid")) {
-                from.add(sfrom);
-                LOGGER.info("STREAM FROM " + sfrom + " " + streamID + " READY");
-            }
-        } catch (IOException e) {
-            LOGGER.warning("STREAM FROM " + sfrom + " " + streamID + " ERROR: " + e.toString());
-        }
-    }
-
-    boolean checkFromTo(XmlPullParser parser) throws Exception {
-        String cfrom = parser.getAttributeValue(null, "from");
-        String cto = parser.getAttributeValue(null, "to");
-        if (cfrom != null && cto != null && !cfrom.isEmpty() && !cto.isEmpty()) {
-            JID jidto = new JID(cto);
-            if (jidto.Host != null && jidto.Username != null && jidto.Host.equals(xmpp.HOSTNAME) && jidto.Username.matches("^[a-zA-Z0-9\\-]{2,16}$")) {
-                JID jidfrom = new JID(cfrom);
-                int size = from.size();
-                for (int i = 0; i < size; i++) {
-                    if (from.get(i).equals(jidfrom.Host)) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-    class HostUnknownException extends Exception {
-        public HostUnknownException(String message) {
-            super(message);
-        }
-    }
-}
diff --git a/src/main/java/com/juick/xmpp/s2s/ConnectionOut.java b/src/main/java/com/juick/xmpp/s2s/ConnectionOut.java
deleted file mode 100644
index e604a5b4..00000000
--- a/src/main/java/com/juick/xmpp/s2s/ConnectionOut.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package com.juick.xmpp.s2s;
-
-import com.juick.xmpp.extensions.StreamFeatures;
-import com.juick.xmpp.utils.XmlUtils;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLSocket;
-import java.io.EOFException;
-import java.io.IOException;
-import java.net.Socket;
-import java.security.KeyManagementException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.CertificateException;
-import java.util.UUID;
-import java.util.logging.Level;
-
-/**
- * @author ugnich
- */
-public class ConnectionOut extends Connection implements Runnable {
-
-    public boolean streamReady = false;
-    public String to;
-    String checkSID = null;
-    String dbKey = null;
-
-    public ConnectionOut(XMPPComponent xmpp, String hostname) throws CertificateException, UnrecoverableKeyException, NoSuchAlgorithmException, XmlPullParserException, KeyManagementException, KeyStoreException, IOException {
-        super(xmpp);
-        to = hostname;
-    }
-
-    public ConnectionOut(XMPPComponent xmpp, String hostname, String checkSID, String dbKey) throws Exception {
-        super(xmpp);
-        to = hostname;
-        this.checkSID = checkSID;
-        this.dbKey = dbKey;
-        streamID = UUID.randomUUID().toString();
-    }
-
-    void sendOpenStream() throws IOException {
-        sendStanza("<?xml version='1.0'?><stream:stream xmlns='jabber:server' id='" + streamID +
-                "' xmlns:stream='http://etherx.jabber.org/streams' xmlns:db='jabber:server:dialback' from='" +
-                xmpp.HOSTNAME + "' to='" + to + "' version='1.0'>");
-    }
-
-    void processDialback() throws Exception {
-        if (checkSID != null) {
-            sendDialbackVerify(checkSID, dbKey);
-        }
-        sendStanza("<db:result from='" + xmpp.HOSTNAME + "' to='" + to + "'>" +
-                generateDialbackKey(to, xmpp.HOSTNAME, streamID) + "</db:result>");
-    }
-
-    @Override
-    public void run() {
-        LOGGER.info("STREAM TO " + to + " START");
-        try {
-            socket = new Socket();
-            socket.connect(DNSQueries.getServerAddress(to));
-            restartParser();
-
-            sendOpenStream();
-
-            parser.next(); // stream:stream
-            streamID = parser.getAttributeValue(null, "id");
-            if (streamID == null || streamID.isEmpty()) {
-                throw new Exception("STREAM TO " + to + " INVALID FIRST PACKET");
-            }
-
-            LOGGER.info("STREAM TO " + to + " " + streamID + " OPEN");
-            xmpp.addConnectionOut(ConnectionOut.this);
-            boolean xmppversionnew = parser.getAttributeValue(null, "version") != null;
-            if (!xmppversionnew) {
-                processDialback();
-            }
-
-            while (parser.next() != XmlPullParser.END_DOCUMENT) {
-                if (parser.getEventType() != XmlPullParser.START_TAG) {
-                    continue;
-                }
-                logParser();
-
-                String tag = parser.getName();
-                if (tag.equals("result") && parser.getNamespace().equals(NS_DB)) {
-                    String type = parser.getAttributeValue(null, "type");
-                    if (type != null && type.equals("valid")) {
-                        streamReady = true;
-                        LOGGER.info("STREAM TO " + to + " " + streamID + " READY");
-
-                        String cache = xmpp.getFromCache(to);
-                        if (cache != null) {
-                            LOGGER.info("STREAM TO " + to + " " + streamID + " SENDING CACHE");
-                            sendStanza(cache);
-                        }
-
-                    } else {
-                        LOGGER.info("STREAM TO " + to + " " + streamID + " DIALBACK FAIL");
-                    }
-                    XmlUtils.skip(parser);
-                } else if (tag.equals("verify") && parser.getNamespace().equals(NS_DB)) {
-                    String from = parser.getAttributeValue(null, "from");
-                    String type = parser.getAttributeValue(null, "type");
-                    String sid = parser.getAttributeValue(null, "id");
-                    if (from != null && from.equals(to) && sid != null && !sid.isEmpty() && type != null) {
-                        ConnectionIn c = xmpp.getConnectionIn(sid);
-                        if (c != null) {
-                            c.sendDialbackResult(from, type);
-                        }
-                    }
-                    XmlUtils.skip(parser);
-                } else if (tag.equals("features") && parser.getNamespace().equals(NS_STREAM)) {
-                    StreamFeatures features = StreamFeatures.parse(parser);
-                    if (!isSecured() && features.STARTTLS >= 0 && !xmpp.brokenSSLhosts.contains(to)) {
-                        System.out.println("STREAM TO " + to + " " + streamID + " SECURING");
-                        sendStanza("<starttls xmlns=\"" + NS_TLS + "\" />");
-                    } else {
-                        processDialback();
-                    }
-                } else if (tag.equals("proceed") && parser.getNamespace().equals(NS_TLS)) {
-                    try {
-                        socket = sc.getSocketFactory().createSocket(socket, socket.getInetAddress().getHostAddress(),
-                                socket.getPort(), true);
-                        ((SSLSocket) socket).startHandshake();
-                        setSecured(true);
-                        System.out.println("STREAM " + streamID + " SECURED");
-                        restartParser();
-                        sendOpenStream();
-                    } catch (SSLException sex) {
-                        LOGGER.log(Level.SEVERE, String.format("s2s ssl error: %s %s", to, streamID), sex);
-                        sendStanza("<failed xmlns\"" + NS_TLS + "\" />");
-                        xmpp.removeConnectionOut(this);
-                        closeConnection();
-                    }
-                } else if (isSecured() && tag.equals("stream") && parser.getNamespace().equals(NS_STREAM)) {
-                    streamID = parser.getAttributeValue(null, "id");
-                } else {
-                    LOGGER.info("STREAM TO " + to + " " + streamID + ": " + XmlUtils.parseToString(parser, true));
-                }
-            }
-
-            LOGGER.warning("STREAM TO " + to + " " + streamID + " FINISHED");
-            xmpp.removeConnectionOut(ConnectionOut.this);
-            closeConnection();
-        } catch (EOFException eofex) {
-            LOGGER.info(String.format("STREAM %s %s CLOSED (dirty)", to, streamID));
-            xmpp.removeConnectionOut(ConnectionOut.this);
-            closeConnection();
-        } catch (Exception e) {
-            LOGGER.log(Level.SEVERE, String.format("s2s out exception: %s %s", to, streamID), e);
-            xmpp.removeConnectionOut(ConnectionOut.this);
-            closeConnection();
-        }
-    }
-
-    public void sendDialbackVerify(String sid, String key) {
-        try {
-            sendStanza("<db:verify from='" + xmpp.HOSTNAME + "' to='" + to + "' id='" + sid + "'>" + key + "</db:verify>");
-        } catch (IOException e) {
-            LOGGER.log(Level.WARNING, "STREAM TO " + to + " " + streamID + " ERROR", e);
-        }
-    }
-}
diff --git a/src/main/java/com/juick/xmpp/s2s/DNSQueries.java b/src/main/java/com/juick/xmpp/s2s/DNSQueries.java
deleted file mode 100644
index e4c5f085..00000000
--- a/src/main/java/com/juick/xmpp/s2s/DNSQueries.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.juick.xmpp.s2s;
-
-import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
-import java.util.Hashtable;
-import java.util.Random;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.InitialDirContext;
-
-/**
- *
- * @author ugnich
- */
-public class DNSQueries {
-
-    private static Random rand = new Random();
-
-    public static InetSocketAddress getServerAddress(String hostname) throws UnknownHostException {
-
-        String host = hostname;
-        int port = 5269;
-
-        try {
-            Hashtable<String, String> env = new Hashtable<String, String>(5);
-            env.put("java.naming.factory.initial", "com.sun.jndi.dns.DnsContextFactory");
-            DirContext ctx = new InitialDirContext(env);
-            Attribute att = ctx.getAttributes("_xmpp-server._tcp." + hostname, new String[]{"SRV"}).get("SRV");
-
-            if (att != null && att.size() > 0) {
-                int i = rand.nextInt(att.size());
-                try {
-                    String srv[] = att.get(i).toString().split(" ");
-                    port = Integer.parseInt(srv[2]);
-                    host = srv[3];
-                } catch (Exception e) {
-                }
-            }
-
-            ctx.close();
-        } catch (NamingException e) {
-        }
-
-        return new InetSocketAddress(host, port);
-    }
-}
diff --git a/src/main/java/com/juick/xmpp/s2s/JuickBot.java b/src/main/java/com/juick/xmpp/s2s/JuickBot.java
deleted file mode 100644
index f0b71689..00000000
--- a/src/main/java/com/juick/xmpp/s2s/JuickBot.java
+++ /dev/null
@@ -1,378 +0,0 @@
-package com.juick.xmpp.s2s;
-
-import com.juick.User;
-import com.juick.server.PMQueries;
-import com.juick.server.TagQueries;
-import com.juick.server.UserQueries;
-import com.juick.xmpp.JID;
-import com.juick.xmpp.Message;
-import com.juick.xmpp.Presence;
-import com.juick.xmpp.extensions.Error;
-import com.juick.xmpp.extensions.JuickMessage;
-
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- *
- * @author ugnich
- */
-public class JuickBot {
-    XMPPComponent xmpp;
-    public JuickBot(XMPPComponent xmpp, JID JuickJID) {
-        this.xmpp = xmpp;
-        this.JuickJID = JuickJID;
-    }
-
-    public final JID JuickJID;
-    private static final String HELPTEXT =
-            "@username text - Send private message\n"
-            + "*tagname Blah-blah-blah - Post a message with tag 'tagname'\n"
-            + "#1234 Blah-blah-blah - Answer to message #1234\n"
-            + "#1234/5 Blah - Answer to reply #1234/5\n"
-            + "! #1234 - Recommend post\n"
-            + "\n"
-            + "# - Show last messages from your feed (## - second page, ...)\n"
-            + "@ - Show recomendations and popular personal blogs\n"
-            + "* - Show your tags\n"
-            + "#1234 - Show message\n"
-            + "#1234+ - Show message with replies\n"
-            + "@username - Show user's info\n"
-            + "@username+ - Show user's info and last 10 messages\n"
-            + "@username *tag - User's messages with this tag\n"
-            + "*tag - Show last 10 messages with this tag\n"
-            + "? blah - Search posts for 'blah'\n"
-            + "? @username blah - Searching among user\'s posts for 'blah'\n"
-            + "D #123 - Delete message\n"
-            + "D #123/45 - Delete reply\n"
-            + "DL - Delete last message/reply\n"
-            + "S - Show your subscriptions\n"
-            + "S #123 - Subscribe to message replies\n"
-            + "S @username - Subscribe to user's blog\n"
-            + "U #123 - Unsubscribe from comments\n"
-            + "U @username - Unsubscribe from user's blog\n"
-            + "BL - Show your blacklist\n"
-            + "BL @username - Add/delete user to/from your blacklist\n"
-            + "BL *tag - Add/delete tag to/from your blacklist\n"
-            + "ON / OFF - Enable/disable subscriptions delivery\n"
-            + "PING - Pong\n"
-            + "\n"
-            + "Read more: http://juick.com/help/";
-
-    public boolean incomingPresence(Presence p) throws Exception {
-        final String username = p.to.Username.toLowerCase();
-        final boolean toJuick = username.equals("juick");
-
-        if (p.type == null) {
-            Presence reply = new Presence();
-            reply.from = new JID(p.to.Username, p.to.Host, null);
-            reply.to = new JID(p.from.Username, p.from.Host, null);
-            reply.type = Presence.Type.unsubscribe;
-            xmpp.sendOut(reply);
-            return true;
-        } else if (p.type.equals(Presence.Type.probe)) {
-            int uid_to = 0;
-            if (!toJuick) {
-                uid_to = UserQueries.getUIDbyName(xmpp.sql, username);
-            }
-
-            if (toJuick || uid_to > 0) {
-                Presence reply = new Presence();
-                reply.from = p.to;
-                reply.from.Resource = "Juick";
-                reply.to = p.from;
-                reply.priority = 10;
-                xmpp.sendOut(reply);
-            } else {
-                Presence reply = new Presence(p.to, p.from, Presence.Type.error);
-                reply.id = p.id;
-                reply.addChild(new Error(Error.Type.cancel, "item-not-found"));
-                xmpp.sendOut(reply);
-                return true;
-            }
-            return true;
-        } else if (p.type.equals(Presence.Type.subscribe)) {
-            boolean canSubscribe = false;
-            if (toJuick) {
-                canSubscribe = true;
-            } else {
-                int uid_to = UserQueries.getUIDbyName(xmpp.sql, username);
-                if (uid_to > 0) {
-                    PMQueries.addPMinRoster(xmpp.sql, uid_to, p.from.Bare());
-                    canSubscribe = true;
-                }
-            }
-
-            if (canSubscribe) {
-                Presence reply = new Presence(p.to, p.from, Presence.Type.subscribed);
-                xmpp.sendOut(reply);
-
-                reply.from.Resource = "Juick";
-                reply.priority = 10;
-                reply.type = null;
-                xmpp.sendOut(reply);
-
-                return true;
-            } else {
-                Presence reply = new Presence(p.to, p.from, Presence.Type.error);
-                reply.id = p.id;
-                reply.addChild(new Error(Error.Type.cancel, "item-not-found"));
-                xmpp.sendOut(reply);
-                return true;
-            }
-        } else if (p.type.equals(Presence.Type.unsubscribe)) {
-            if (!toJuick) {
-                int uid_to = UserQueries.getUIDbyName(xmpp.sql, username);
-                if (uid_to > 0) {
-                    PMQueries.removePMinRoster(xmpp.sql, uid_to, p.from.Bare());
-                }
-            }
-
-            Presence reply = new Presence(p.to, p.from, Presence.Type.unsubscribed);
-            xmpp.sendOut(reply);
-        }
-
-        return false;
-    }
-
-    public boolean incomingMessage(Message msg) throws Exception {
-        if (msg.body == null || msg.body.isEmpty()) {
-            return true;
-        }
-
-        String username = msg.to.Username.toLowerCase();
-
-        User user_from = null;
-        String signuphash = "";
-        user_from = UserQueries.getUserByJID(xmpp.sql, msg.from.Bare());
-        if (user_from == null) {
-            signuphash = UserQueries.getSignUpHashByJID(xmpp.sql, msg.from.Bare());
-        }
-
-        if (user_from == null) {
-            Message reply = new Message(msg.to, msg.from, Message.Type.chat);
-            if (username.equals("juick")) {
-                reply.body = "Для того, чтобы начать пользоваться сервисом, пожалуйста пройдите быструю регистрацию: http://juick.com/signup?type=xmpp&hash=" + signuphash + "\nЕсли у вас уже есть учетная запись на Juick, вы сможете присоединить этот JabberID к ней.\n\nTo start using Juick, please sign up: http://juick.com/signup?type=xmpp&hash=" + signuphash + "\nIf you already have an account on Juick, you will be proposed to attach this JabberID to your existing account.";
-            } else {
-                reply.body = "Внимание, системное сообщение!\nВаш JabberID не обнаружен в списке доверенных. Для того, чтобы отправить сообщение пользователю " + username + "@juick.com, пожалуйста зарегистрируйте свой JabberID в системе: http://juick.com/signup?type=xmpp&hash=" + signuphash + "\nЕсли у вас уже есть учетная запись на Juick, вы сможете присоединить этот JabberID к ней.\n\nWarning, system message!\nYour JabberID is not found in our server's white list. To send a message to " + username + "@juick.com, please sign up: http://juick.com/signup?type=xmpp&hash=" + signuphash + "\nIf you already have an account on Juick, you will be proposed to attach this JabberID to your existing account.";
-            }
-            xmpp.sendOut(reply);
-            return true;
-        }
-
-        if (username.equals("juick")) {
-            return incomingMessageJuick(user_from, msg);
-        }
-
-        int uid_to = UserQueries.getUIDbyName(xmpp.sql, username);
-
-        if (uid_to == 0) {
-            Message reply = new Message(msg.to, msg.from, Message.Type.error);
-            reply.id = msg.id;
-            reply.addChild(new Error(Error.Type.cancel, "item-not-found"));
-            xmpp.sendOut(reply);
-            return true;
-        }
-
-        boolean success = false;
-        if (!UserQueries.isInBLAny(xmpp.sql, uid_to, user_from.getUID())) {
-            success = PMQueries.createPM(xmpp.sql, user_from.getUID(), uid_to, msg.body);
-        }
-
-        if (success) {
-            Message m = new Message();
-            m.from = new JID("juick", "juick.com", null);
-            m.to = new JID(Integer.toString(uid_to), "push.juick.com", null);
-            JuickMessage jmsg = new JuickMessage();
-            jmsg.setUser(user_from);
-            jmsg.setText(msg.body);
-            m.childs.add(jmsg);
-            xmpp.router.send(m.toString());
-
-            m.to.Host = "ws.juick.com";
-            xmpp.router.send(m.toString());
-
-            List<String> jids;
-            boolean inroster = false;
-            jids = UserQueries.getJIDsbyUID(xmpp.sql, uid_to);
-            for (String jid : jids) {
-                Message mm = new Message();
-                mm.to = new JID(jid);
-                mm.type = Message.Type.chat;
-                inroster = PMQueries.havePMinRoster(xmpp.sql, user_from.getUID(), jid);
-                if (inroster) {
-                    mm.from = new JID(jmsg.getUser().getUName(), "juick.com", "Juick");
-                    mm.body = msg.body;
-                } else {
-                    mm.from = new JID("juick", "juick.com", "Juick");
-                    mm.body = "Private message from @" + jmsg.getUser().getUName() + ":\n" + msg.body;
-                }
-                xmpp.sendOut(mm);
-            }
-        } else {
-            Message reply = new Message(msg.to, msg.from, Message.Type.error);
-            reply.id = msg.id;
-            reply.addChild(new Error(Error.Type.cancel, "not-allowed"));
-            xmpp.sendOut(reply);
-        }
-
-        return true;
-    }
-    private static Pattern regexPM = Pattern.compile("^\\@(\\S+)\\s+([\\s\\S]+)$");
-
-    public boolean incomingMessageJuick(User user_from, Message msg) throws Exception {
-        String command = msg.body.trim();
-        int commandlen = command.length();
-
-        // COMPATIBILITY
-        if (commandlen > 7 && command.substring(0, 3).equalsIgnoreCase("PM ")) {
-            command = command.substring(3).trim();
-            commandlen = command.length();
-        }
-
-        if (commandlen == 4) {
-            if (command.equalsIgnoreCase("PING")) {
-                commandPing(msg);
-                return true;
-            } else if (command.equalsIgnoreCase("HELP")) {
-                commandHelp(msg);
-                return true;
-            }
-        } else if (commandlen == 5 && command.equalsIgnoreCase("LOGIN")) {
-            commandLogin(msg, user_from);
-            return true;
-        } else if (command.charAt(0) == '@') {
-            Matcher matchPM = regexPM.matcher(command);
-            if (matchPM.find()) {
-                String user_to = matchPM.group(1);
-                String msgtxt = matchPM.group(2);
-                commandPM(msg, user_from, user_to, msgtxt);
-                return true;
-            }
-        } else if (commandlen == 2 && command.equalsIgnoreCase("BL")) {
-            commandBLShow(msg, user_from);
-            return true;
-        }
-
-        return false;
-    }
-
-    private void commandPing(Message m) throws Exception {
-        Presence p = new Presence(JuickJID, m.from);
-        p.priority = 10;
-        xmpp.sendOut(p);
-
-        Message reply = new Message(JuickJID, m.from, Message.Type.chat);
-        reply.body = "PONG";
-        xmpp.sendOut(reply);
-    }
-
-    private void commandHelp(Message m) throws Exception {
-        Message reply = new Message(JuickJID, m.from, Message.Type.chat);
-        reply.body = HELPTEXT;
-        xmpp.sendOut(reply);
-    }
-
-    private void commandLogin(Message m, User user_from) throws Exception {
-        Message reply = new Message(JuickJID, m.from, Message.Type.chat);
-        reply.body = "http://juick.com/login?" + UserQueries.getHashByUID(xmpp.sql, user_from.getUID());
-        xmpp.sendOut(reply);
-    }
-
-    private void commandPM(Message m, User user_from, String user_to, String body) throws Exception {
-        int ret = 0;
-
-        int uid_to = 0;
-        List<String> jids_to = null;
-        boolean haveInRoster = false;
-
-        if (user_to.indexOf('@') > 0) {
-            uid_to = UserQueries.getUIDbyJID(xmpp.sql, user_to);
-        } else {
-            uid_to = UserQueries.getUIDbyName(xmpp.sql, user_to);
-        }
-
-        if (uid_to > 0) {
-            if (!UserQueries.isInBLAny(xmpp.sql, uid_to, user_from.getUID())) {
-                if (PMQueries.createPM(xmpp.sql, user_from.getUID(), uid_to, body)) {
-                    jids_to = UserQueries.getJIDsbyUID(xmpp.sql, uid_to);
-                    ret = 200;
-                } else {
-                    ret = 500;
-                }
-            } else {
-                ret = 403;
-            }
-        } else {
-            ret = 404;
-        }
-
-        if (ret == 200) {
-            Message msg = new Message();
-            msg.from = new JID("juick", "juick.com", null);
-            msg.to = new JID(Integer.toString(uid_to), "push.juick.com", null);
-            JuickMessage jmsg = new JuickMessage();
-            jmsg.setUser(user_from);
-            jmsg.setText(body);
-            msg.childs.add(jmsg);
-            xmpp.router.send(msg.toString());
-
-            msg.to.Host = "ws.juick.com";
-            xmpp.router.send(msg.toString());
-
-            for (String jid : jids_to) {
-                Message mm = new Message();
-                mm.to = new JID(jid);
-                mm.type = Message.Type.chat;
-                haveInRoster = PMQueries.havePMinRoster(xmpp.sql, user_from.getUID(), jid);
-                if (haveInRoster) {
-                    mm.from = new JID(user_from.getUName(), "juick.com", "Juick");
-                    mm.body = body;
-                } else {
-                    mm.from = new JID("juick", "juick.com", "Juick");
-                    mm.body = "Private message from @" + user_from.getUName() + ":\n" + body;
-                }
-                xmpp.sendOut(mm);
-            }
-        }
-
-        Message reply = new Message(m.to, m.from);
-        if (ret == 200) {
-            reply.type = m.type;
-            reply.body = "Private message sent";
-        } else {
-            reply.type = Message.Type.error;
-            reply.body = "Error " + ret;
-        }
-        xmpp.sendOut(reply);
-    }
-
-    private void commandBLShow(Message m, User user_from) throws Exception {
-        List<User> blusers = UserQueries.getUserBLUsers(xmpp.sql, user_from.getUID());
-        List<String> bltags = TagQueries.getUserBLTags(xmpp.sql, user_from.getUID());
-
-        String txt = "";
-        if (bltags.size() > 0) {
-            for (String bltag : bltags) {
-                txt += "*" + bltag + "\n";
-            }
-
-            if (blusers.size() > 0) {
-                txt += "\n";
-            }
-        }
-        if (blusers.size() > 0) {
-            for (User bluser : blusers) {
-                txt += "@" + bluser.getUName() + "\n";
-            }
-        }
-        if (txt.isEmpty()) {
-            txt = "You don't have any users or tags in your blacklist.";
-        }
-
-        Message reply = new Message(JuickJID, m.from, Message.Type.chat);
-        reply.body = txt;
-        xmpp.sendOut(reply);
-    }
-}
diff --git a/src/main/java/com/juick/xmpp/s2s/XMPPComponent.java b/src/main/java/com/juick/xmpp/s2s/XMPPComponent.java
deleted file mode 100644
index d0b231e2..00000000
--- a/src/main/java/com/juick/xmpp/s2s/XMPPComponent.java
+++ /dev/null
@@ -1,443 +0,0 @@
-package com.juick.xmpp.s2s;
-
-import com.juick.User;
-import com.juick.server.MessagesQueries;
-import com.juick.server.SubscriptionsQueries;
-import com.juick.server.UserQueries;
-import com.juick.xmpp.*;
-import com.juick.xmpp.extensions.JuickMessage;
-import com.juick.xmpp.extensions.Nickname;
-import com.juick.xmpp.extensions.XOOB;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
-import org.xmlpull.v1.XmlPullParserException;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.security.KeyManagementException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.CertificateException;
-import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- *
- * @author ugnich
- */
-public class XMPPComponent implements ServletContextListener, Stream.StreamListener,
-        Message.MessageListener, Iq.IqListener, Presence.PresenceListener {
-
-    private static final Logger logger = Logger.getLogger(XMPPComponent.class.getName());
-
-    public final ExecutorService executorService = Executors.newCachedThreadPool();
-    StreamComponent router;
-    JuickBot bot;
-
-    public String HOSTNAME, componentName;
-    public String STATSFILE = null;
-    public String keystore;
-    public String keystorePassword;
-    public List<String> brokenSSLhosts;
-    final List<ConnectionIn> inConnections = Collections.synchronizedList(new ArrayList<>());
-    final List<ConnectionOut> outConnections = Collections.synchronizedList(new ArrayList<>());
-    final List<CacheEntry> outCache = Collections.synchronizedList(new ArrayList<>());
-    JdbcTemplate sql;
-    final public HashMap<String, StanzaChild> childParsers = new HashMap<>();
-
-    public void addConnectionIn(ConnectionIn c) {
-        synchronized (inConnections) {
-            inConnections.add(c);
-        }
-    }
-
-    public void addConnectionOut(ConnectionOut c) {
-        synchronized (outConnections) {
-            outConnections.add(c);
-        }
-    }
-
-    public void removeConnectionIn(ConnectionIn c) {
-        synchronized (inConnections) {
-            inConnections.remove(c);
-        }
-    }
-
-    public void removeConnectionOut(ConnectionOut c) {
-        synchronized (outConnections) {
-            outConnections.remove(c);
-        }
-    }
-
-    public String getFromCache(String hostname) {
-        CacheEntry ret = null;
-        synchronized (outCache) {
-            for (Iterator<CacheEntry> i = outCache.iterator(); i.hasNext();) {
-                CacheEntry c = i.next();
-                if (c.hostname != null && c.hostname.equals(hostname)) {
-                    ret = c;
-                    i.remove();
-                    break;
-                }
-            }
-        }
-        return (ret != null) ? ret.xml : null;
-    }
-
-    public ConnectionOut getConnectionOut(String hostname, boolean needReady) {
-        synchronized (outConnections) {
-            for (ConnectionOut c : outConnections) {
-                if (c.to != null && c.to.equals(hostname) && (!needReady || c.streamReady)) {
-                    return c;
-                }
-            }
-        }
-        return null;
-    }
-
-    public ConnectionIn getConnectionIn(String streamID) {
-        synchronized (inConnections) {
-            for (ConnectionIn c : inConnections) {
-                if (c.streamID != null && c.streamID.equals(streamID)) {
-                    return c;
-                }
-            }
-        }
-        return null;
-    }
-
-    public void sendOut(Stanza s) {
-        sendOut(s.to.Host, s.toString());
-    }
-
-    public void sendOut(String hostname, String xml) {
-        boolean haveAnyConn = false;
-
-        ConnectionOut connOut = null;
-        synchronized (outConnections) {
-            for (ConnectionOut c : outConnections) {
-                if (c.to != null && c.to.equals(hostname)) {
-                    if (c.streamReady) {
-                        connOut = c;
-                        break;
-                    } else {
-                        haveAnyConn = true;
-                        break;
-                    }
-                }
-            }
-        }
-        if (connOut != null) {
-            try {
-                connOut.sendStanza(xml);
-            } catch (IOException e) {
-                logger.warning("STREAM TO " + connOut.to + " " + connOut.streamID + " ERROR: " + e.toString());
-            }
-            return;
-        }
-
-        boolean haveCache = false;
-        synchronized (outCache) {
-            for (CacheEntry c : outCache) {
-                if (c.hostname != null && c.hostname.equals(hostname)) {
-                    c.xml += xml;
-                    c.tsUpdated = System.currentTimeMillis();
-                    haveCache = true;
-                    break;
-                }
-            }
-            if (!haveCache) {
-                outCache.add(new CacheEntry(hostname, xml));
-            }
-        }
-
-        if (!haveAnyConn) {
-            try {
-                ConnectionOut connectionOut = new ConnectionOut(this, hostname);
-                executorService.submit(connectionOut);
-            } catch (CertificateException | UnrecoverableKeyException | NoSuchAlgorithmException | XmlPullParserException | KeyStoreException | KeyManagementException | IOException e) {
-                logger.log(Level.SEVERE, "s2s out error", e);
-            }
-        }
-    }
-
-    @Override
-    public void contextInitialized(ServletContextEvent sce) {
-
-        logger.info("component initialized");
-        Properties conf = new Properties();
-        try {
-            conf.load(sce.getServletContext().getResourceAsStream("/WEB-INF/juick.conf"));
-            HOSTNAME = conf.getProperty("hostname");
-            componentName = conf.getProperty("componentname");
-            JID Jid = new JID(conf.getProperty("xmppbot_jid"));
-            STATSFILE = conf.getProperty("statsfile");
-            keystore = conf.getProperty("keystore");
-            keystorePassword = conf.getProperty("keystore_password");
-            brokenSSLhosts = Arrays.asList(conf.getProperty("broken_ssl_hosts", "").split(","));
-            DriverManagerDataSource dataSource = new DriverManagerDataSource();
-            dataSource.setDriverClassName(conf.getProperty("datasource_driver", "com.mysql.jdbc.Driver"));
-            dataSource.setUrl(conf.getProperty("datasource_url"));
-            sql = new JdbcTemplate(dataSource);
-            bot = new JuickBot(this, Jid);
-
-            childParsers.put(JuickMessage.XMLNS, new JuickMessage());
-
-            executorService.submit(() -> {
-                Socket routerSocket = null;
-                try {
-                    routerSocket = new Socket("localhost", 5347);
-                    router = new StreamComponent(new JID("s2s"), routerSocket.getInputStream(), routerSocket.getOutputStream(), conf.getProperty("xmpp_password"));
-                    router.addChildParser(new JuickMessage());
-                    router.addListener((Stream.StreamListener) this);
-                    router.addListener((Message.MessageListener) this);
-                    router.addListener((Iq.IqListener) this);
-                    router.startParsing();
-                } catch (IOException e) {
-                    logger.log(Level.SEVERE, "router error", e);
-                }
-            });
-            executorService.submit(() -> {
-                final ServerSocket listener = new ServerSocket(5269);
-                logger.info("s2s listener ready");
-                while (true) {
-                    try {
-                        Socket socket = listener.accept();
-                        ConnectionIn client = new ConnectionIn(this, bot, socket);
-                        addConnectionIn(client);
-                        executorService.submit(client);
-                    } catch (Exception e) {
-                        logger.log(Level.SEVERE, "s2s error", e);
-                    }
-                }
-            });
-            executorService.submit(new CleaningUp(this));
-
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "XMPPComponent error", e);
-        }
-    }
-
-
-
-    @Override
-    public void contextDestroyed(ServletContextEvent sce) {
-        synchronized (outConnections) {
-            for (Iterator<ConnectionOut> i = outConnections.iterator(); i.hasNext();) {
-                ConnectionOut c = i.next();
-                c.closeConnection();
-                i.remove();
-            }
-        }
-
-        synchronized (inConnections) {
-            for (Iterator<ConnectionIn> i = inConnections.iterator(); i.hasNext();) {
-                ConnectionIn c = i.next();
-                c.closeConnection();
-                i.remove();
-            }
-        }
-
-        try {
-            closeRouterConnection();
-        } catch (IOException e) {
-            logger.log(Level.WARNING, "router warning", e);
-        }
-        executorService.shutdown();
-        logger.info("component destroyed");
-    }
-    public void closeRouterConnection() throws IOException {
-        router.logoff();
-    }
-
-    public void sendJuickMessage(JuickMessage jmsg) {
-        List<String> jids = new ArrayList<>();
-
-        if (jmsg.FriendsOnly) {
-            jids = SubscriptionsQueries.getJIDSubscribedToUser(sql, jmsg.getUser().getUID(), jmsg.FriendsOnly);
-        } else {
-            List<User> users = SubscriptionsQueries.getSubscribedUsers(sql, jmsg.getUser().getUID(), jmsg.getMID());
-            for (User user : users) {
-                for (String jid : UserQueries.getJIDsbyUID(sql, user.getUID())) {
-                    jids.add(jid);
-                }
-            }
-        }
-
-        String txt = "@" + jmsg.getUser().getUName() + ":" + jmsg.getTagsString() + "\n";
-        String attachment = jmsg.getAttachmentURL();
-        if (attachment != null) {
-            txt += attachment + "\n";
-        }
-        txt += jmsg.getText() + "\n\n";
-        txt += "#" + jmsg.getMID() + " http://juick.com/" + jmsg.getMID();
-
-        Nickname nick = new Nickname();
-        nick.Nickname = "@" + jmsg.getUser().getUName();
-
-        com.juick.xmpp.Message msg = new com.juick.xmpp.Message();
-        msg.from = bot.JuickJID;
-        msg.body = txt;
-        msg.type = Message.Type.chat;
-        msg.thread = "juick-" + jmsg.getMID();
-        msg.addChild(jmsg);
-        msg.addChild(nick);
-        if (attachment != null) {
-            XOOB oob = new XOOB();
-            oob.URL = attachment;
-            msg.addChild(oob);
-        }
-
-        for (String jid : jids) {
-            msg.to = new JID(jid);
-            sendOut(msg);
-        }
-    }
-
-    public void sendJuickComment(JuickMessage jmsg) {
-        List<User> users;
-        String replyQuote;
-        String replyTo;
-
-        users = SubscriptionsQueries.getUsersSubscribedToComments(sql, jmsg.getMID(), jmsg.getUser().getUID());
-        com.juick.Message replyMessage = jmsg.ReplyTo > 0 ? MessagesQueries.getReply(sql, jmsg.getMID(), jmsg.ReplyTo)
-                : MessagesQueries.getMessage(sql, jmsg.getMID());
-        replyTo = replyMessage.getUser().getUName();
-        replyQuote = getReplyQuote(replyMessage);
-
-        String txt = "Reply by @" + jmsg.getUser().getUName() + ":\n" + replyQuote + "\n@" + replyTo + " ";
-        String attachment = jmsg.getAttachmentURL();
-        if (attachment != null) {
-            txt += attachment + "\n";
-        }
-        txt += jmsg.getText() + "\n\n" + "#" + jmsg.getMID() + "/" + jmsg.getRID() + " http://juick.com/" + jmsg.getMID() + "#" + jmsg.getRID();
-
-        com.juick.xmpp.Message msg = new com.juick.xmpp.Message();
-        msg.from = bot.JuickJID;
-        msg.body = txt;
-        msg.type = Message.Type.chat;
-        msg.addChild(jmsg);
-        for (User user : users) {
-            for (String jid : UserQueries.getJIDsbyUID(sql, user.getUID())) {
-                msg.to = new JID(jid);
-                sendOut(msg);
-            }
-        }
-    }
-
-    private String getReplyQuote(com.juick.Message q) {
-        String quote = q.getText();
-        if (quote.length() > 50) {
-            quote = ">" + quote.substring(0, 47).replace('\n', ' ') + "...\n";
-        } else if (quote.length() > 0) {
-            quote = ">" + quote.replace('\n', ' ') + "\n";
-        }
-        return quote;
-    }
-
-    public void sendJuickRecommendation(JuickMessage recomm) {
-        List<User> users;
-        JuickMessage jmsg;
-        jmsg = new JuickMessage(MessagesQueries.getMessage(sql, recomm.getMID()));
-        users = SubscriptionsQueries.getUsersSubscribedToUserRecommendations(sql,
-                recomm.getUser().getUID(), recomm.getMID(), jmsg.getUser().getUID());
-
-        String txt = "Recommended by @" + recomm.getUser().getUName() + ":\n";
-        txt += "@" + jmsg.getUser().getUName() + ":" + jmsg.getTagsString() + "\n";
-        String attachment = jmsg.getAttachmentURL();
-        if (attachment != null) {
-            txt += attachment + "\n";
-        }
-        txt += jmsg.getText() + "\n\n";
-        txt += "#" + jmsg.getMID();
-        if (jmsg.Replies > 0) {
-            if (jmsg.Replies % 10 == 1 && jmsg.Replies % 100 != 11) {
-                txt += " (" + jmsg.Replies + " reply)";
-            } else {
-                txt += " (" + jmsg.Replies + " replies)";
-            }
-        }
-        txt += " http://juick.com/" + jmsg.getMID();
-
-        Nickname nick = new Nickname();
-        nick.Nickname = "@" + jmsg.getUser().getUName();
-
-        com.juick.xmpp.Message msg = new com.juick.xmpp.Message();
-        msg.from = bot.JuickJID;
-        msg.body = txt;
-        msg.type = Message.Type.chat;
-        msg.thread = "juick-" + jmsg.getMID();
-        msg.addChild(jmsg);
-        msg.addChild(nick);
-        if (attachment != null) {
-            XOOB oob = new XOOB();
-            oob.URL = attachment;
-            msg.addChild(oob);
-        }
-
-        for (User user : users) {
-            for (String jid : UserQueries.getJIDsbyUID(sql, user.getUID())) {
-                msg.to = new JID(jid);
-                sendOut(msg);
-            }
-        }
-    }
-
-    @Override
-    public boolean onIq(Iq iq) {
-        JID jid = iq.to;
-        if (!jid.Host.equals(componentName)) {
-            logger.info("STREAM ROUTER (IQ): " + iq.toString());
-            sendOut(iq);
-        }
-        return false;
-    }
-
-    @Override
-    public void onMessage(Message xmsg) {
-        logger.info("STREAM ROUTER (PROCESS): " + xmsg.toString());
-        JuickMessage jmsg = (JuickMessage) xmsg.getChild(JuickMessage.XMLNS);
-        JID jid = xmsg.to;
-        if (jid.Host.equals(componentName)) {
-            if (jmsg != null) {
-                if (jid.Username != null && jid.Username.equals("recomm")) {
-                    sendJuickRecommendation(jmsg);
-                } else {
-                    if (jmsg.getRID() > 0) {
-                        sendJuickComment(jmsg);
-                    } else if (jmsg.getMID() > 0) {
-                        sendJuickMessage(jmsg);
-                    }
-                }
-            }
-        } else {
-            sendOut(xmsg);
-        }
-    }
-
-    @Override
-    public void onPresence(Presence presence) {
-        JID jid = presence.to;
-        if (!jid.Host.equals(componentName)) {
-            logger.info("STREAM ROUTER (PRESENCE): " + presence.toString());
-            sendOut(presence);
-        }
-    }
-
-    @Override
-    public void onStreamReady() {
-        logger.info("STREAM ROUTER (READY)");
-    }
-
-    @Override
-    public void onStreamFail(Exception ex) {
-        logger.log(Level.SEVERE, "STREAM ROUTER (FAIL)", ex);
-    }
-}