Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-09 01:25:59 +01:00
Code Issues Releases Wiki Activity
1605 commits 8 branches 0 tags 34 MiB
Commit graph

116 commits

Author SHA1 Message Date
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
Florian Schmaus
c4014b8ba9 SMACK-441 ServiceDiscoveryManager identities should be non-static and kept in a Set to allow multiple identities as per XEP-0030 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13783 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-22 14:43:23 +00:00
rcollier
e87daff68f Versioning updates for new release. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13761 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-07 02:42:12 +00:00
rcollier
3c975426f6 SMACK-433 Removed unnecessary reset of timeout. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13622 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-04-22 01:07:30 +00:00
rcollier
b4432d7627 SMACK-352 Changed or removed copyright notices that should not have been attributed to Jive Software. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13604 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-04-07 19:15:32 +00:00
rcollier
0a1e72bb5f SMACK-413 Removed some commented out code. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13599 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-31 14:26:30 +00:00
Florian Schmaus
07a0b8f722 SMACK-413 fixed vCard parsing regarding the PHOTO element. Moved vCard test cases to unit-test where appropriate. Added testcases for vCard PHOTO parsing. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13586 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-23 00:30:59 +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
b907d606d9 SMACK-352 removed duplicated headers, fixed svn keywords 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13459 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-07 19:10:22 +00:00
Florian Schmaus
6bbf425157 SMACK-352 
- fixed wrong header
- replaced old Jive license with Apache 2.0 license
- added license header to files without

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13457 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-07 14:19:47 +00:00
rcollier
8c0b062629 Updates to SmackTestCase to properly provide the username and password for each connection. Test cases manually logging in now use these methods instead of wrongly assuming the username/password pattern. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13453 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-07 03:47:49 +00:00
Florian Schmaus
010ab0d07a VCardTest: Use VCard.equal() in order to test equality and not the String representation, since the elements within the vcard could be in a different order 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13435 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-04 13:33:28 +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
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
rcollier
91c2b08d4a Had to remove the special characters in Spanish text due to failures in test cases. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12023 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-02-07 00:36:26 +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
rcollier
ef74695a1b Issue SMACK-308: Fixed multiple bugs in XML generation. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11678 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-04-14 18:24:12 +00:00
Günther Niess
127319a821 SMACK-279: The XMPPConnection extends the new abstract Connection class 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11613 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-09 11:55:56 +00:00
rcollier
11a41e79ca SMACK-289 Added functionality for retrieving items when the user has multiple subscriptions 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11579 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-01-30 00:04:39 +00:00
rcollier
e600fb02f5 SMACK-288 - Parser is now advanced correctly to the end tag when parsing multiple items. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11574 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-01-29 13:50:23 +00:00
rcollier
5718a52133 git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11571 b35dd754-fafc-0310-a699-88a17e54d16e 2010-01-28 19:52:20 +00:00
rcollier
f9399d894e Added some tests to support OpenFire fixes 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11570 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-01-28 19:51:35 +00:00
rcollier
f7a1c750ad SMACK-272 Add support for XEP-0060 (pubsub) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11346 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-10-28 22:38:40 +00:00
root
b840bed4a6 Try to clean up a pair of filenames that differ only by CaPITializATion 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10908 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-11-19 22:26:00 +00:00
Matt Tucker
e6f29ee641 Added ability to register a local command using a factory. Improved ad-hoc command tests. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10905 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-11-18 23:12:10 +00:00
Matt Tucker
ffb8cd914a Fixed test. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10882 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-11-14 00:59:48 +00:00
Matt Tucker
0540d2e38a Cleanup. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10881 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-11-13 21:53:18 +00:00
Matt Tucker
6051940177 Adding test. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10880 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-11-13 21:52:35 +00:00
Gaston Dombiak
5d9d7a7b80 Fixed & improved test cases. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@8790 b35dd754-fafc-0310-a699-88a17e54d16e
 2007-07-23 02:06:30 +00:00
Gaston Dombiak
52958e64f7 1) Forced room to be non-anonymous 
2) Fixed some errors.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@8623 b35dd754-fafc-0310-a699-88a17e54d16e
 2007-06-22 20:29:17 +00:00
Derek DeMoro
1f8cb4452b 1 - Small fix in Roster to return unavailable presence with from. 
2 - Throw exception if parsing of vCard fails.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7217 b35dd754-fafc-0310-a699-88a17e54d16e
 2007-02-20 17:02:39 +00:00
Gaston Dombiak
7ebaba10e2 Fixed test cases to consider that an unavailable presence is now returned for offline users or non-existent users. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7160 b35dd754-fafc-0310-a699-88a17e54d16e
 2007-02-16 00:13:18 +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
Matt Tucker
8e750912a7 Re-worked security settings, clean-up of connection config, fixed concurrency when shutting down the packet writer. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@6666 b35dd754-fafc-0310-a699-88a17e54d16e
 2007-01-11 19:01:24 +00:00
Matt Tucker
92d1de2dce Initial cut of constructor re-factor (SMACK-184). 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@6532 b35dd754-fafc-0310-a699-88a17e54d16e
 2007-01-04 23:00:58 +00:00
Gaston Dombiak
3915eae215 Small fixes and update to latest Chat API. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@6531 b35dd754-fafc-0310-a699-88a17e54d16e
 2007-01-04 22:34:06 +00:00
Alex Wenckus
3269d65591 Initial work on ChatState. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@6215 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-11-23 01:51:00 +00:00
Alex Wenckus
ae6065d7cc Created new chat manager which handles the creation of Chats. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@6213 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-11-22 22:55:37 +00:00
Alex Wenckus
49a07980de First file transfer test 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@5422 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-09-19 16:39:08 +00:00
Gaston Dombiak
3af86fd462 Added reconnection support. SMACK-172 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@5367 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-09-14 19:16:40 +00:00
Gaston Dombiak
87b3c84f04 Initial version. SMACK-94 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@5220 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-09-04 22:03:48 +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
Matt Tucker
bbbfe09c31 Phase 1 of large refactoring. Removing dead code, bug fixes, updates to JDK 1.5. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4511 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-07-17 08:39:08 +00:00
Alex Wenckus
6f832ddb99 Added avatar test. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3829 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-05-03 21:23:18 +00:00
Alex Wenckus
8d3bf139c6 Updated VCard test to test illegal XML characters. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3699 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-04-04 20:38:10 +00:00
Gaston Dombiak
9fcbd64d28 Added support for adding presence interceptors to new presences sent to the MUC service. SMACK-125 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3495 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-02-27 21:59:50 +00:00
Derek DeMoro
4c45715780 Remove getFullName test until VCard is fixed to handle it properly. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3450 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-02-15 19:53:36 +00:00
Gaston Dombiak
9b70d45644 Fixed test to test compression support after login has been made. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3347 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-01-23 20:56:26 +00:00
Gaston Dombiak
9eca04602b Initial version. SMACK-117 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3345 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-01-23 20:09:06 +00:00
Gaston Dombiak
237ab44301 Fixed vCard issues. SMACK-116 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3315 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-01-17 21:29:16 +00:00