1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-27 08:42:07 +01:00
Smack/source/org/jivesoftware/smack
Florian Schmaus f8274dda53 Merge branch smack_3_3_2 and trunk
as the state of the both branches of Smack's SVN repository
http://fisheye.igniterealtime.org/browse/smack on 2013-12-30.

Conflicts:
	documentation/extensions/caps.html
	source/org/jivesoftware/smack/PacketReader.java
	source/org/jivesoftware/smack/SmackConfiguration.java
	source/org/jivesoftware/smack/parsing/ParsingExceptionCallback.java
	source/org/jivesoftware/smackx/ServiceDiscoveryManager.java
2013-12-30 01:29:55 +01:00
..
compression SMACK-448 Java7ZlibInputOutputStream: Use correct Deflater compression level 2013-06-25 06:40:30 +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-462 Use getInstace() ConnectionCreationListener 2013-11-03 21:49:58 +00:00
packet SMACK-452 Correctly parse stream error packets 2013-10-09 17:02:34 +00:00
parsing SMACK-425 Few changes based on review http://fisheye.igniterealtime.org/cru/SMACK-4 2013-10-05 23:14:24 +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-452 Correctly parse stream error packets 2013-10-09 17:02:34 +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-339 Allow ConnectionListeners to be added before Connection is connected 2013-11-02 11:46:21 +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-463 Catch and log exceptions in packet listeners 2013-11-05 19:55:16 +00:00
PacketWriter.java SMACK-373 Don't remove listeners after a disconnect() , keep state of Connection between disconnect() and connect()/login() 2013-10-27 17:40:06 +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-462 Use getInstace() ConnectionCreationListener 2013-11-03 21:49:58 +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-373 Don't remove listeners after a disconnect() , keep state of Connection between disconnect() and connect()/login() 2013-10-27 17:40:06 +00:00
RosterEntry.java SMACK-428 add 'public int RosterEntry.hashCode()' 2013-05-17 22:05:57 +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-444 Allow 'null' for options in ServerTrustManager 2013-10-09 12:31:17 +00:00
SmackConfiguration.java Merge branch smack_3_3_2 and trunk 2013-12-30 01:29:55 +01: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-373 Don't remove listeners after a disconnect() , keep state of Connection between disconnect() and connect()/login() 2013-10-27 17:40:06 +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