Merge "Issue #2563 fixed default xmpp port" into development

Former-commit-id: 92e1df8856 [formerly 92e1df8856 [formerly 4aa2f1689442ce630c94b73ad6747acd93a9c1ff]]
Former-commit-id: 87876790f8
Former-commit-id: 365c11c9db
This commit is contained in:
Nate Jensen 2014-01-07 12:39:46 -06:00 committed by Gerrit Code Review
commit 3606a4fdcf

View file

@ -48,6 +48,7 @@ import com.raytheon.uf.viz.collaboration.comm.identity.CollaborationException;
* ------------ ---------- ----------- --------------------------
* Dec 18, 2013 2563 bclement Initial creation
* Jan 06, 2014 2563 bclement added removeDescription
* Jan 07, 2014 2563 bclement updated default xmpp port
*
* </pre>
*
@ -61,7 +62,7 @@ public class ServerInput implements Listener {
private final int addItemIndex;
private static final int DEFAULT_XMPP_PORT = 5432;
private static final int DEFAULT_XMPP_PORT = 5222;
private static final int TIMEOUT = 5000; // 5 seconds