Florian Schmaus 2ea5ee3b26 SMACK-425 fix merge error ... git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13691 b35dd754-fafc-0310-a699-88a17e54d16e		2013-06-24 07:25:20 +00:00
..
compression	SMACK-389 Plugable compression framework	2013-02-26 09:26:41 +00:00
debugger	SMACK-352 Changed or removed copyright notices that should not have been attributed to Jive Software.	2013-04-07 19:15:32 +00:00
filter	SMACK-352 Changed or removed copyright notices that should not have been attributed to Jive Software.	2013-04-07 19:15:32 +00:00
keepalive	SMACK-412 Abstracted the keepalive implementation and set the thread to start and stop on demand.	2013-04-16 01:39:17 +00:00
packet	SMACK-352 Changed or removed copyright notices that should not have been attributed to Jive Software.	2013-04-07 19:15:32 +00:00
parsing	SMACK-425 Introduced smack.parsing.ParsingExceptionCallback, a callback invoked when a exception is thrown while parsing a stanza. Smack is now able to either rethrow the exception ulitmatly causing a disconnect *or* log/ignore the exception and resume parsing after the faulty stanza.	2013-06-22 17:00:27 +00:00
ping	SMACK-412 Abstracted the keepalive implementation and set the thread to start and stop on demand.	2013-04-16 01:39:17 +00:00
provider	SMACK-352 Changed or removed copyright notices that should not have been attributed to Jive Software.	2013-04-07 19:15:32 +00:00
proxy	SMACK-352 Changed or removed copyright notices that should not have been attributed to Jive Software.	2013-04-07 19:15:32 +00:00
sasl	SMACK-344 Patch applied that allows the host and service name to be different for SASL authentication	2013-04-20 22:05:28 +00:00
util	SMACK-425 Introduced smack.parsing.ParsingExceptionCallback, a callback invoked when a exception is thrown while parsing a stanza. Smack is now able to either rethrow the exception ulitmatly causing a disconnect *or* log/ignore the exception and resume parsing after the faulty stanza.	2013-06-22 17:00:27 +00:00
AbstractConnectionListener.java	merged branch improve_bytestreams in trunk	2010-08-15 11:57:11 +00:00
AccountManager.java	SMACK-279: The XMPPConnection extends the new abstract Connection class	2010-02-09 11:55:56 +00:00
Chat.java	SMACK-279: The XMPPConnection extends the new abstract Connection class	2010-02-09 11:55:56 +00:00
ChatManager.java	Merged the 3.2 Beta branch into trunk.	2011-03-14 01:53:42 +00:00
ChatManagerListener.java	Copyright update.	2007-02-12 00:59:05 +00:00
Connection.java	SMACK-412 Split the ping implementation to a server ping to replace keepalive and a simplified ping manager for manual pings of other entities.	2013-03-19 02:37:36 +00:00
ConnectionConfiguration.java	SMACK-225 Fixed DNS SRV handling, as per RFC 2782. Added support for multiple DNS SRV resolvers namely javax and org.xbill.dns (aka dnsjava).	2013-03-18 08:53:11 +00:00
ConnectionCreationListener.java	SMACK-295: Fire reconnectionSuccessful event when session is established	2010-02-24 00:45:40 +00:00
ConnectionListener.java	SMACK-279: The XMPPConnection extends the new abstract Connection class	2010-02-09 11:55:56 +00:00
MessageListener.java	Copyright update.	2007-02-12 00:59:05 +00:00
NonSASLAuthentication.java	SMACK-352 removed duplicated headers, fixed svn keywords	2013-02-07 19:10:22 +00:00
OpenTrustManager.java	SMACK-352 removed duplicated headers, fixed svn keywords	2013-02-07 19:10:22 +00:00
package.html	Javadoc info.	2003-03-09 23:07:58 +00:00
PacketCollector.java	SMACK-341 Updated collectors to use concurrent classes.	2013-02-07 03:42:33 +00:00
PacketInterceptor.java	SMACK-279: The XMPPConnection extends the new abstract Connection class	2010-02-09 11:55:56 +00:00
PacketListener.java	SMACK-279: The XMPPConnection extends the new abstract Connection class	2010-02-09 11:55:56 +00:00
PacketReader.java	SMACK-425 Introduced smack.parsing.ParsingExceptionCallback, a callback invoked when a exception is thrown while parsing a stanza. Smack is now able to either rethrow the exception ulitmatly causing a disconnect *or* log/ignore the exception and resume parsing after the faulty stanza.	2013-06-22 17:00:27 +00:00
PacketWriter.java	SMACK-412 Fixed merge error.	2013-03-23 13:27:55 +00:00
PrivacyList.java	SMACK-352 Changed or removed copyright notices that should not have been attributed to Jive Software.	2013-04-07 19:15:32 +00:00
PrivacyListListener.java	Javadoc fixes, builds now go to target directory.	2007-01-07 23:03:16 +00:00
PrivacyListManager.java	SMACK-279: The XMPPConnection extends the new abstract Connection class	2010-02-09 11:55:56 +00:00
ReconnectionManager.java	SMACK-352 Changed or removed copyright notices that should not have been attributed to Jive Software.	2013-04-07 19:15:32 +00:00
Roster.java	SMACK-312 Fire roster listener also when the group name changed	2011-03-10 11:30:53 +00:00
RosterEntry.java	only fire roster listener if entry changed (SMACK-312)	2010-08-15 16:37:51 +00:00
RosterGroup.java	SMACK-291: RosterGroup modifications should depend on roster push	2010-02-16 09:10:51 +00:00
RosterListener.java	Added a bit of javadoc, explaining when the event is (not) fired.	2010-01-12 11:28:01 +00:00
SASLAuthentication.java	SMACK-344 Patch applied that allows the host and service name to be different for SASL authentication	2013-04-20 22:05:28 +00:00
ServerTrustManager.java	SMACK-352 removed duplicated headers, fixed svn keywords	2013-02-07 19:10:22 +00:00
SmackConfiguration.java	SMACK-425 fix merge error	2013-06-24 07:25:20 +00:00
SmackError.java	SMACK-412 Added the pingMyServer back in, cleaned up unneeded synchronization and removed minimum ping interval.	2013-03-23 11:59:08 +00:00
UserAuthentication.java	SMACK-352 removed duplicated headers, fixed svn keywords	2013-02-07 19:10:22 +00:00
XMPPConnection.java	SMACK-405 Removed redundant code in XMPPConnection.shutdown()	2013-06-22 17:00:53 +00:00
XMPPException.java	SMACK-412 Added the pingMyServer back in, cleaned up unneeded synchronization and removed minimum ping interval.	2013-03-23 11:59:08 +00:00