vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-25 21:42:07 +01:00
Code Issues Releases Wiki Activity
1609 commits 61 branches 35 tags 39 MiB
Commit graph

217 commits

Author SHA1 Message Date
Florian Schmaus
b18a43920a Merge branch '3.4.0' into master 
Conflicts:
	source/org/jivesoftware/smack/SmackConfiguration.java
 2014-02-03 12:58:55 +01:00
rcollier
1c5b28cf9f SMACK-530 Moved DNSUtilTest to integration tests 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13872 b35dd754-fafc-0310-a699-88a17e54d16e
 2014-01-22 03:17:34 +00:00
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
ce0cb7d491 SMACK-433 Removed Thread.sleep usage for tests 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13621 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-04-22 01:03:43 +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
rcollier
0fdfd6e75e SMACK-361 Some general code cleanup added some missing hashcode methods and added back some removed public API methods (marked as deprecated). 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13598 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-31 14:24:50 +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
a55b54f20b SMACK-417 If both PacketReader and PacketWriter fail at the same time, connectionClosedonError() is called two times 
Refactored notifyConnectionError() and notifyReconnection() from PacketReader to XMPPConnection. Made PacketReader.done and PacketWriter.done volatile. Prevent duplicate connectionClosedonError() calls by making the method synchronzied and protected them with an enter guard: if (packetReader.done && packetWriter.done) return;

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13568 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-18 19:58:48 +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
c6248ec000 SMACK-389 Plugable compression framework 
This commit adds the ability to plug-in different compression handlers
for different compression methods. It is also possible to add more
then one handler for the same method. The order how the handlers are
added determines which handler is tried first for usage. This is used
for the 'zlib' compression method, which now can be either provided by
Java7 or by JZlib (just like it was done before).

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13522 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-26 09:26:41 +00:00
Florian Schmaus
c57843eeee Aligned integration test config file 'test-case.xml' settings to reflect the defaults in SmackTestCase. Renamed the file to test-case.example.xml and added remark about the usage of the file 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13480 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-14 11:43:53 +00:00
Florian Schmaus
091015aa4b SMACK-358: Support account creation parameters for LoginTest.testLoginWithNoResource() 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13479 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-14 11:43:41 +00:00
Florian Schmaus
c309e27853 Fix NPE in Testcases where 'createOfflineConnections() == true'. The change 13453 created the username and password array, which needs to be initilized even if the connection and the login is done manually 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13460 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-07 19:10:32 +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
1d36ae8db4 SMACK-391 Moved all date parsing into StringUtils and made it much more robust in handling multiple valid and invalid formats. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13428 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-04 03:45:37 +00:00
Florian Schmaus
e4621df621 test-case.xml: Whitespace fixes, changed serverhost to localhost to reflect the settings in source code. This also makes it easier for new Smack developers to run the tests. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13386 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-04 11:47:59 +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
a5693609b2 add the ability to register for roster events before logging in (SMACK-156) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11826 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-08-15 16:32:09 +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
46cebe5e9e Added support for SHIM headers 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11347 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-10-28 22:41:14 +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
Michael Will
1edc69780b more work on generic 
add ' quoting
fix IntegerInstantiation is more memory friendly

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11024 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-06-04 11:58:25 +00:00
Matt Tucker
41733effe9 Updated handling of offline presence. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10916 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-11-21 04:54:59 +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
995f319f1e Simplified list of #login methods in XMPPConnection. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10849 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-10-24 05:31:56 +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
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
Matt Tucker
466b7e2d08 Fix offline presence info, including test case (SMACK-219). 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@8275 b35dd754-fafc-0310-a699-88a17e54d16e
 2007-05-10 22:48:24 +00:00
Gaston Dombiak
c589001cd0 Added new test cases for message delivery with multiple resources. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7961 b35dd754-fafc-0310-a699-88a17e54d16e
 2007-04-10 18:41:23 +00:00
Gaston Dombiak
fc651bbf28 Removed debugger enabled by default. Use sytem property for that. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7956 b35dd754-fafc-0310-a699-88a17e54d16e
 2007-04-10 01:49:32 +00:00