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

73 commits

Author SHA1 Message Date
Florian Schmaus
38a3531ec6 Move privacy lists from core to extensions 2014-02-15 22:35:38 +01:00
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
f155cb4d07 SMACK-286 Made ProviderManager much more configurable. 
Separated the reading of provider files from the ProviderManager.  Manager now only manages.  Added ability to add collections of providers to the manager via a ProviderLoader, of which there is one default implementation which loads from the default file format.  Now provider files can be programmatically added at any time.  Also updated the configuration abilities so that a provider file can also be set via VM arg, as well as the smack configuration itself. Introduced Java Util Logging as well.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13861 b35dd754-fafc-0310-a699-88a17e54d16e
 2014-01-16 05:14:39 +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
0e6817dc4f SMACK-361 Minor EntityCapsManager fixes 
Don't use the constructor in ConnectionCreationListener to prevent
duplicate instances for the same connection. Fixed EntityCaps
documentation.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13799 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-11-03 21:49:39 +00:00
Florian Schmaus
5f793d4f44 SMACK-431 Reworded Entity Caps documentation, added missing frame link 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13782 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-22 14:43:13 +00:00
Florian Schmaus
c2d057f4b2 SMACK-431 Reworded Entity Caps documentation, added missing frame link 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13692 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-06-24 21:27:43 +00:00
Florian Schmaus
cb5e1dc94b 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/branches/smack_3_3_1@13689 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-06-22 17:01:58 +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
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
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
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
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
rcollier
92ba2d7f33 SMACK-272 Add support for XEP-0060 (pubsub) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11345 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-10-28 22:36:54 +00:00
Matt Tucker
334838d28e HTML and comment cleanup. Small API refactors. Moved use of StringBuffer to StringBuilder. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10865 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-11-03 16:28:57 +00:00
Gaston Dombiak
85c5f18a09 Added section about connection, disconnection and reconnection. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10842 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-10-24 02:31:41 +00:00
Matt Tucker
c5ab2829d4 Doc fixes (SMACK-277) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@8428 b35dd754-fafc-0310-a699-88a17e54d16e
 2007-06-01 21:42:38 +00:00
Matt Tucker
f418341e2b Documentation work. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7330 b35dd754-fafc-0310-a699-88a17e54d16e
 2007-03-01 01:51:12 +00:00
Matt Tucker
85dcb0a5c4 Updated for new API. Thanks to Michael Hunter. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7042 b35dd754-fafc-0310-a699-88a17e54d16e
 2007-02-08 06:12:01 +00:00
Matt Tucker
e1b93839d7 Doc updates. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@6950 b35dd754-fafc-0310-a699-88a17e54d16e
 2007-02-04 22:53:16 +00:00
Matt Tucker
2407d9e30f Fixing documentation (SMACK-183). 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@6947 b35dd754-fafc-0310-a699-88a17e54d16e
 2007-02-04 18:50:38 +00:00
Matt Tucker
47abf627b7 Added privacy list support and improved error handling from Francisco (SMACK-121, SMACK-31). 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4603 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-07-19 19:24:00 +00:00
Alex Wenckus
d807155a29 HTML Fixes 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3405 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-02-08 00:29:52 +00:00
Alex Wenckus
8d0db1a339 File Transfer. (SMACK-72) (SMACK-122) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3395 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-02-03 18:44:22 +00:00
Matt Tucker
e3c264c689 Small fixes. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3382 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-01-27 22:04:36 +00:00
Matt Tucker
aac5c80a10 Updates for 1.5.0 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2473 b35dd754-fafc-0310-a699-88a17e54d16e
 2005-03-31 00:02:35 +00:00
Gaston Dombiak
1277b9d425 Updated documentation when joining a room specifying the amount of history to receive. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2461 b35dd754-fafc-0310-a699-88a17e54d16e
 2005-02-21 14:44:28 +00:00
Gaston Dombiak
5982f5e2bd Added documentation for discovering room information. SMACK-11 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2427 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-12-15 01:53:24 +00:00
Gaston Dombiak
7bb63a5d8d Updated example of "creation of reserved rooms". 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2404 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-10-31 03:49:15 +00:00
Gaston Dombiak
a71b6c92d6 Modified form's variable names according to the new spec version. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2399 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-10-30 17:14:15 +00:00
Gaston Dombiak
aeaa06c5e5 Extension was renamed to lowercase. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2376 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-08-19 17:17:40 +00:00
Matt Tucker
3ffa47f756 Removed bad link. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2353 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-08-09 20:58:00 +00:00
Gaston Dombiak
a4c49d5e04 Initial version. SMACK-99 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2326 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-06-12 22:32:38 +00:00
Gaston Dombiak
ee44e762ec Initial version. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2325 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-06-07 01:37:55 +00:00
Gaston Dombiak
5e612ae222 Adds documentation about "Provide node information" 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2324 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-06-07 01:37:41 +00:00
Gaston Dombiak
68e5d882fc Initial version 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2294 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-04-11 19:01:20 +00:00
Gaston Dombiak
a8a0d66755 Adds MUC and DataForms 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2293 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-04-11 19:00:04 +00:00
Gaston Dombiak
bdd57b90f7 Removes text that said "IQ packets cannot have packet extensions" 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2258 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-03-29 21:26:45 +00:00
Matt Tucker
8711721777 Fixed copyright date. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2250 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-03-12 14:23:26 +00:00
Matt Tucker
81b154428d Updated formatting and text. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2249 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-03-12 14:23:12 +00:00
Gaston Dombiak
bbcc5358e9 Updates the document with information about the new debugger 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2248 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-03-12 03:46:16 +00:00
Gaston Dombiak
9f0f4aeae6 Initial check-in 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2247 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-03-12 03:42:39 +00:00
Gaston Dombiak
ef8d1f794d Added disco support 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2150 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-10-18 21:05:23 +00:00
Gaston Dombiak
ad7c383943 Initial check-in 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2149 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-10-18 21:04:39 +00:00
Matt Tucker
e5f76b3e40 Improved document. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2138 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-10-13 17:34:45 +00:00
Matt Tucker
0f960f99a6 Added group chat invitation docs. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2137 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-10-13 15:39:11 +00:00
Matt Tucker
6b9fd9ba4e Initial version of real roster documentation. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2125 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-09-28 23:08:33 +00:00
Matt Tucker
f91846102b Added logo. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2124 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-09-28 23:08:14 +00:00
Matt Tucker
4f404b25bf Initial check-in. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2123 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-09-28 23:07:45 +00:00
Matt Tucker
46d6647772 Doc improvements. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2100 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-09-23 21:15:51 +00:00