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

49 commits

Author SHA1 Message Date
Florian Schmaus
397eb88468 Merge branch '4.0' 
Conflicts:
	build.gradle
	documentation/connections.html
	documentation/debugging.html
	documentation/extensions/filetransfer.html
	documentation/extensions/rosterexchange.html
	documentation/gettingstarted.html
	documentation/index.html
	documentation/legacy/messageevents.html
	smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java
 2014-08-16 00:30:28 +02:00
Florian Schmaus
344148eaed Convert html documentation to markdown 2014-08-16 00:11:14 +02:00
Florian Schmaus
3c88c2f705 Fix extensions/intro.html filetransfer link 2014-08-11 12:09:37 +02:00
Florian Schmaus
97b17e83b4 Move "Message Events (XEP-22)" code to legacy 
Fixes SMACK-569
 2014-07-16 12:01:03 +02:00
Florian Schmaus
94a16ba41e Merge branch '4.0' 
Conflicts:
	build.gradle
	documentation/connections.html
	documentation/gettingstarted.html
	smack-core/src/main/java/org/jivesoftware/smack/SmackException.java
	smack-core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java
	smack-core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java
	smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
	smack-tcp/src/main/java/org/jivesoftware/smack/tcp/PacketReader.java
 2014-07-05 14:37:22 +02:00
Florian Schmaus
09425609af Refactor FileTransfer(Manager|Negotiator) 
to use WeakHashMaps and extend Manager.

SMACK-579
 2014-07-02 09:52:40 +02:00
Florian Schmaus
eec0df386c s/JEP/XEP/ 
also s;jabber.org/jeps;xmpp.org/extensions;
 2014-06-14 11:48:46 +02:00
Florian Schmaus
beecb8a675 Make XMPPConnection an interface 
create AbstractXMPPConnection.
 2014-05-28 08:18:41 +02:00
Florian Schmaus
08cec251c7 Add missing HOXT entry in toc.html 2014-04-26 19:19:29 +02:00
Florian Schmaus
6e08a10186 Move Packet 'properties' from core to extensions 
Code for Jive's packet properties should not be in 'core'. Also
de-serializing input from network causes some security implications, it
is therefore disabled as default.
 2014-04-26 19:13:27 +02:00
Florian Schmaus
4cff008708 Return Collections (or sublcasses) instead of Iterators 
This allows us to exploid Java 8 streams and Java 5 for-each
loops. The returned Collections are usually unmodifiable. We decided
against returning Iterable because this would mean determining the
size in O(n) compared to Collection.size() which is often faster
(e.g. O(1)).
 2014-04-09 20:03:10 +02:00
atsykholyas
236ea71cee Added support for HOXT (XEP-0332) 
This is initial impementation of XEP-0332 (SMACK-552) -
HTTP over XMPP transport.
Created extensions, providers and unit tests.
Two features are missing: jingle and sipub.
 2014-03-20 12:36:04 +02:00
Florian Schmaus
6110872062 Cleanup of PrivacyList API 
Use Type enum instead of String for PrivacyItem's constructor. Add
getName() to PrivacyList. Remove PrivacyRule, as it just adds unnecessary
complexity spliting PrivacyItem and PrivacyRule, they belong
together. Don't mix camel-case and c-style method names. Some minor
improvements. Add parser test.
 2014-03-10 15:32:17 +01:00
Florian Schmaus
489816c61f Renamed Connection to XMPPConnection 2014-03-10 09:45:50 +01:00
Florian Schmaus
3da34da5e7 Fix copy&paste error in intro.html 2014-02-15 22:36:52 +01:00
Florian Schmaus
38a3531ec6 Move privacy lists from core to extensions 2014-02-15 22:35:38 +01: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
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
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
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
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
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
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
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
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
Gaston Dombiak
59ca4ec717 Initial check-in of XHTML support. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2098 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-09-20 13:21:12 +00:00
Gaston Dombiak
2f1c0794cd Initial check-in of XHTML support. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2097 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-09-20 13:20:39 +00:00
Gaston Dombiak
6d220913db Added XHTML support. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2096 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-09-20 13:20:10 +00:00
bruce
7ab40eadd5 Minor fix. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2077 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-08-30 14:14:45 +00:00
Matt Tucker
de84ef5d36 UI updates. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2073 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-08-29 18:47:39 +00:00
Gaston Dombiak
ca37ceb2f1 changed "local entry" solution to "wrapper class" solution 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2065 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-08-24 16:05:45 +00:00
Gaston Dombiak
2693d7f5b4 fix spell check error 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2055 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-08-22 01:48:20 +00:00
Matt Tucker
cb97e13b90 Adding extensions documentation that was written by Gato. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2037 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-08-19 13:20:42 +00:00