# HG changeset patch # User František Kučera # Date 1281903610 -7200 # Node ID d7b5099bf65e8f49c822b3ec4356b010901d040c # Parent 2c9fb7563da6e0ab58ea97746ccd809e64cfe9c2 chat diff -r 2c9fb7563da6 -r d7b5099bf65e java/nekurak.net-ejb/nbproject/build-impl.xml --- a/java/nekurak.net-ejb/nbproject/build-impl.xml Wed Jun 30 00:26:41 2010 +0200 +++ b/java/nekurak.net-ejb/nbproject/build-impl.xml Sun Aug 15 22:20:10 2010 +0200 @@ -650,6 +650,14 @@ + + + + + + + + diff -r 2c9fb7563da6 -r d7b5099bf65e java/nekurak.net-ejb/nbproject/genfiles.properties --- a/java/nekurak.net-ejb/nbproject/genfiles.properties Wed Jun 30 00:26:41 2010 +0200 +++ b/java/nekurak.net-ejb/nbproject/genfiles.properties Sun Aug 15 22:20:10 2010 +0200 @@ -4,5 +4,5 @@ # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. nbproject/build-impl.xml.data.CRC32=70881d3e -nbproject/build-impl.xml.script.CRC32=c3b61fed -nbproject/build-impl.xml.stylesheet.CRC32=986a5256@1.22.1 +nbproject/build-impl.xml.script.CRC32=ad4fc04b +nbproject/build-impl.xml.stylesheet.CRC32=33606734@1.22.2 diff -r 2c9fb7563da6 -r d7b5099bf65e java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/chat/Spojeni.java --- a/java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/chat/Spojeni.java Wed Jun 30 00:26:41 2010 +0200 +++ b/java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/chat/Spojeni.java Sun Aug 15 22:20:10 2010 +0200 @@ -20,7 +20,13 @@ public Spojeni(UcetRobota ucet) throws XMPPException { /** Navážeme spojení */ - ConnectionConfiguration nastaveni = new ConnectionConfiguration(ucet.getAdresaServeru(), ucet.getPort(), ucet.getDomena()); + ConnectionConfiguration nastaveni; + if (ucet.getAdresaServeru() == null || ucet.getPort() == 0) { + nastaveni = new ConnectionConfiguration(ucet.getDomena()); + } else { + nastaveni = new ConnectionConfiguration(ucet.getAdresaServeru(), ucet.getPort(), ucet.getDomena()); + } + spojeni = new XMPPConnection(nastaveni); spojeni.connect(); spojeni.login(ucet.getUzivatelskeJmeno(), ucet.getUzivatelskeHeslo(), ucet.getProstredek()); diff -r 2c9fb7563da6 -r d7b5099bf65e java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/chat/SpravceNastaveni.java --- a/java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/chat/SpravceNastaveni.java Wed Jun 30 00:26:41 2010 +0200 +++ b/java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/chat/SpravceNastaveni.java Sun Aug 15 22:20:10 2010 +0200 @@ -13,7 +13,7 @@ u.setUzivatelskeJmeno("nekurakrobot"); u.setUzivatelskeHeslo("nekurak"); u.setDomena("frantovo.cz"); - u.setAdresaServeru("ipv6.frantovo.cz"); + u.setAdresaServeru("62.177.71.161"); n.getUctyRobota().add(u); diff -r 2c9fb7563da6 -r d7b5099bf65e java/nekurak.net-lib/nbproject/build-impl.xml --- a/java/nekurak.net-lib/nbproject/build-impl.xml Wed Jun 30 00:26:41 2010 +0200 +++ b/java/nekurak.net-lib/nbproject/build-impl.xml Sun Aug 15 22:20:10 2010 +0200 @@ -700,6 +700,14 @@ + + + + + + + + diff -r 2c9fb7563da6 -r d7b5099bf65e java/nekurak.net-lib/nbproject/genfiles.properties --- a/java/nekurak.net-lib/nbproject/genfiles.properties Wed Jun 30 00:26:41 2010 +0200 +++ b/java/nekurak.net-lib/nbproject/genfiles.properties Sun Aug 15 22:20:10 2010 +0200 @@ -4,5 +4,5 @@ # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. nbproject/build-impl.xml.data.CRC32=11ce77af -nbproject/build-impl.xml.script.CRC32=8db4fbcf -nbproject/build-impl.xml.stylesheet.CRC32=78c6a6ee@1.38.1.45 +nbproject/build-impl.xml.script.CRC32=40960ef1 +nbproject/build-impl.xml.stylesheet.CRC32=f33e10ff@1.38.2.45 diff -r 2c9fb7563da6 -r d7b5099bf65e java/nekurak.net-rest/nbproject/build-impl.xml --- a/java/nekurak.net-rest/nbproject/build-impl.xml Wed Jun 30 00:26:41 2010 +0200 +++ b/java/nekurak.net-rest/nbproject/build-impl.xml Sun Aug 15 22:20:10 2010 +0200 @@ -843,6 +843,14 @@ + + + + + + + + diff -r 2c9fb7563da6 -r d7b5099bf65e java/nekurak.net-rest/nbproject/genfiles.properties --- a/java/nekurak.net-rest/nbproject/genfiles.properties Wed Jun 30 00:26:41 2010 +0200 +++ b/java/nekurak.net-rest/nbproject/genfiles.properties Sun Aug 15 22:20:10 2010 +0200 @@ -4,8 +4,8 @@ # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. nbproject/build-impl.xml.data.CRC32=35b9fabc -nbproject/build-impl.xml.script.CRC32=3663fe21 -nbproject/build-impl.xml.stylesheet.CRC32=8335d67d@1.24.1.1 +nbproject/build-impl.xml.script.CRC32=6da89432 +nbproject/build-impl.xml.stylesheet.CRC32=8419264d@1.24.2.1 nbproject/rest-build.xml.data.CRC32=d32e8880 nbproject/rest-build.xml.script.CRC32=23da2c77 nbproject/rest-build.xml.stylesheet.CRC32=ddd64843@1.4.1 diff -r 2c9fb7563da6 -r d7b5099bf65e java/nekurak.net-web/nbproject/build-impl.xml --- a/java/nekurak.net-web/nbproject/build-impl.xml Wed Jun 30 00:26:41 2010 +0200 +++ b/java/nekurak.net-web/nbproject/build-impl.xml Sun Aug 15 22:20:10 2010 +0200 @@ -845,6 +845,14 @@ + + + + + + + + diff -r 2c9fb7563da6 -r d7b5099bf65e java/nekurak.net-web/nbproject/genfiles.properties --- a/java/nekurak.net-web/nbproject/genfiles.properties Wed Jun 30 00:26:41 2010 +0200 +++ b/java/nekurak.net-web/nbproject/genfiles.properties Sun Aug 15 22:20:10 2010 +0200 @@ -4,8 +4,8 @@ # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. nbproject/build-impl.xml.data.CRC32=28fc3c5a -nbproject/build-impl.xml.script.CRC32=e58633c2 -nbproject/build-impl.xml.stylesheet.CRC32=8335d67d@1.24.1.1 +nbproject/build-impl.xml.script.CRC32=b8c3901f +nbproject/build-impl.xml.stylesheet.CRC32=8419264d@1.24.2.1 nbproject/rest-build.xml.data.CRC32=84da1c7b nbproject/rest-build.xml.script.CRC32=3db088b3 nbproject/rest-build.xml.stylesheet.CRC32=ddd64843@1.4.1 diff -r 2c9fb7563da6 -r d7b5099bf65e java/nekurak.net-ws/nbproject/build-impl.xml --- a/java/nekurak.net-ws/nbproject/build-impl.xml Wed Jun 30 00:26:41 2010 +0200 +++ b/java/nekurak.net-ws/nbproject/build-impl.xml Sun Aug 15 22:20:10 2010 +0200 @@ -843,6 +843,14 @@ + + + + + + + + diff -r 2c9fb7563da6 -r d7b5099bf65e java/nekurak.net-ws/nbproject/genfiles.properties --- a/java/nekurak.net-ws/nbproject/genfiles.properties Wed Jun 30 00:26:41 2010 +0200 +++ b/java/nekurak.net-ws/nbproject/genfiles.properties Sun Aug 15 22:20:10 2010 +0200 @@ -4,8 +4,8 @@ # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. nbproject/build-impl.xml.data.CRC32=e6e63e07 -nbproject/build-impl.xml.script.CRC32=0c0ec7a8 -nbproject/build-impl.xml.stylesheet.CRC32=8335d67d@1.24.1.1 +nbproject/build-impl.xml.script.CRC32=9b10bf3f +nbproject/build-impl.xml.stylesheet.CRC32=8419264d@1.24.2.1 nbproject/wsit-deploy.xml.data.CRC32=4cb22909 nbproject/wsit-deploy.xml.script.CRC32=deb039de nbproject/wsit-deploy.xml.stylesheet.CRC32=beb36995@3.9.1