Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-27 08:42:07 +01:00
Code Issues Releases Wiki Activity
1548 commits 8 branches 0 tags 34 MiB
Commit graph

49 commits

Author SHA1 Message Date
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
Florian Schmaus
c7d468697f SMACK-431 Entity Capabilities are now enabled as default for new connections. Added an extensions documentation html page. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13686 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-06-22 17:00:40 +00:00
Florian Schmaus
4cd53e4419 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. 
Conflicts:
	source/org/jivesoftware/smack/SmackConfiguration.java

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13685 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-06-22 17:00:27 +00:00
rcollier
dac68c64a9 Merge from 3.3 branch 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13663 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-05-18 16:56:52 +00:00
rcollier
57051abfea Updated version information for 3.3 release. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13638 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-05-04 12:15:17 +00:00
rcollier
aab1dcdabe SMACK-412 Split the ping implementation to a server ping to replace keepalive and a simplified ping manager for manual pings of other entities. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13569 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-19 02:37:36 +00:00
Florian Schmaus
21be8c55ee SMACK-361 Added support for Entity Capabilities. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13560 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-18 08:50:48 +00:00
Florian Schmaus
9123578ea5 SMACK-361 Added support for Entity Capabilities. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13558 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-18 08:40:35 +00:00
Florian Schmaus
5c6f257027 SMACK-388 
Use ScheduledExecutorService.
Set ping received when pinging another entity.
Refactored PacketListener and ConnectionListeners as anonymous inner-classes

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13531 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-27 22:49:04 +00:00
Florian Schmaus
8c14f0cb55 Added XEP-199 aka. "XMPP Ping" support to smack. Fixes SMACK-388. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13384 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-04 11:43:35 +00:00
rcollier
e08c8afe44 SMACK-363 Applied code cleanup patches for many generics related issues. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13325 b35dd754-fafc-0310-a699-88a17e54d16e
 2012-10-26 10:47:55 +00:00
rcollier
a92d37a32b SMACK-349 Couple of fixes to test cases based on changes in base64 encoding buffer sizes. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12957 b35dd754-fafc-0310-a699-88a17e54d16e
 2012-01-27 21:30:09 +00:00
rcollier
50bf29b122 Updates for Release of 3.2.1 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12557 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-07-04 19:51:43 +00:00
rcollier
da5434505b SMACK-129 - Added a property in smack-config file for the default packet collector size and set it much lower than the previous default. Also made the max size for packet collectors configurable from the constructor. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12509 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-06-18 18:18:03 +00:00
rcollier
84c43c4fdd Updated all version info for 3.2 release. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12329 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-05-04 23:41:24 +00:00
rcollier
2150d07435 Merged the 3.2 Beta branch into trunk. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12107 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-14 01:53:42 +00:00
Holger Bergunde
5a544a50e3 SMACK-332 Debugger shows the "right" version: Currently: 3.2.0 Beta 2 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12086 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-10 11:24:51 +00:00
Henning Staib
8b54f34153 merged branch improve_bytestreams in trunk 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11821 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-08-15 11:57:11 +00:00
Gaston Dombiak
2da448d2fd Simplified list of #login methods in XMPPConnection. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10846 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-10-24 05:17:50 +00:00
Daniel Henninger
0a455fe195 This hasn't been updated to the proper version in a while. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@9673 b35dd754-fafc-0310-a699-88a17e54d16e
 2007-12-26 01:28:22 +00:00
Jay Kline
13b8d313ba Big change for authentication, which now supports more SASL mechanisms and 
callbacks.  This should address issues SMACK-210 and SMACK-142, as well as 
set the stage for SMACK-234. 



git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@9498 b35dd754-fafc-0310-a699-88a17e54d16e
 2007-11-14 16:27:47 +00:00
Matt Tucker
98bf0d8cfb Copyright update. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7071 b35dd754-fafc-0310-a699-88a17e54d16e
 2007-02-12 00:59:05 +00:00
Gaston Dombiak
84cc5fb1c6 Fixed casting error. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4796 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-08-03 17:03:19 +00:00
Gaston Dombiak
8879234bbc Fixed potential error when #getClassLoader returns null. SMACK-162 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4774 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-08-02 22:31:23 +00:00
Matt Tucker
9895123ff3 Additional refactoring work. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4539 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-07-18 06:47:38 +00:00
Gaston Dombiak
f57ff10ad9 1. Clean up code 
2. Refactoring work
3. Optimization work. SMACK-153
4. Fixed roster test cases. SMACK-154
4. Fixed vCard issue. SMACK-152

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4538 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-07-18 05:14:33 +00:00
Gaston Dombiak
7bef86a2ae Updated for 2.2.1. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3973 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-06-12 19:10:46 +00:00
Gaston Dombiak
b7030403e2 Updated for 2.2.0. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3541 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-03-09 02:34:27 +00:00
Gaston Dombiak
bc6f3a0776 Updated for Smack 2.1.0. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3099 b35dd754-fafc-0310-a699-88a17e54d16e
 2005-11-17 18:47:22 +00:00
Gaston Dombiak
c74d96359a Preparing for Smack 2.2.0. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2737 b35dd754-fafc-0310-a699-88a17e54d16e
 2005-08-27 04:38:29 +00:00
Gaston Dombiak
5a912c0158 Preparing for 1.5.1 release. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2633 b35dd754-fafc-0310-a699-88a17e54d16e
 2005-08-12 19:23:23 +00:00
Gaston Dombiak
19941dc809 Updated version 1.5.0. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2474 b35dd754-fafc-0310-a699-88a17e54d16e
 2005-03-31 04:14:23 +00:00
Gaston Dombiak
3f83402148 Modified to be compatible with latest minimal version of XPP. SMACK-49 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2466 b35dd754-fafc-0310-a699-88a17e54d16e
 2005-03-23 02:36:19 +00:00
Gaston Dombiak
1e36bdd143 Removed system classloader for finding resources. SMACK-32 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2423 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-11-27 02:04:43 +00:00
Matt Tucker
fdb4b017ff Updated to Apache 2.0 license. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2408 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-11-02 23:53:30 +00:00
Gaston Dombiak
af03dfb7c9 Updated for 1.4.1 release. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2405 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-10-31 14:23:27 +00:00
Derek DeMoro
f206a82119 Removed enum variable. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2398 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-10-29 15:09:04 +00:00
Gaston Dombiak
aaf6cf0ca9 Adds security checks to ensure that PacketReplyTime is always greater than 0. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2384 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-09-24 02:12:47 +00:00
Gaston Dombiak
3c80abdf45 Moved identityName and identityType from SmackConfiguration to ServiceDiscoveryManager. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2359 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-08-09 22:09:20 +00:00
Matt Tucker
0553ef7e65 Updated version number, fixed Javadoc issue. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2354 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-08-09 21:13:36 +00:00
Gaston Dombiak
e45c4a6805 Adds ability to set the identity name and type of a Smack client. SMACK-149 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2347 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-08-04 19:52:11 +00:00
Matt Tucker
a958b245e6 Fixed logic bug where setting values via the API in SmackConfiguration could be overridden by the config file. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2297 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-04-18 18:11:26 +00:00
Gaston Dombiak
ad3b8a23d9 Prints an exception to the console in case an error occurs while parsing the document 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2296 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-04-18 14:27:20 +00:00
Matt Tucker
167d40ac20 Work on keep-alive interval. Fixes SMACK-123 and SMACK-121. Also general work on SmackConfiguration class. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2253 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-03-15 18:59:41 +00:00
Gaston Dombiak
d25d36448e Stops printing exceptions to the console when a class to load at start-up is not found 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2206 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-01-13 18:20:18 +00:00
Gaston Dombiak
b6f3741854 Answers a default timeout value if timeout value has not been initialized yet 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2194 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-01-02 00:29:41 +00:00
Gaston Dombiak
36cb521334 Packet-reply-timeout is unique in the environment and the configuration filename was renamed to smack-config.xml 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2190 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-01-01 23:19:37 +00:00
Gaston Dombiak
41dad8658a Allows reply timeout to be set 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2189 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-12-20 12:20:30 +00:00
Gaston Dombiak
f462850768 Initial check-in 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2184 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-12-19 18:17:36 +00:00