1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-12-28 21:48:00 +01:00
Commit graph

89 commits

Author SHA1 Message Date
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
4477561d4b Replace references to 'smack.jar'
Also don't mention the required JDK version in the README as such information
tends to become wrong easily.
2014-07-05 12:10:43 +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
1fb8a50b79 Improve documentation
remove ambiguous part about smack-core being the only required
library. It's the only required library of *Smack*, but some user could
understand that Smack itself has no other dependencies. In order to
avoid such confusion, simply remove that part.
2014-06-27 12:22:39 +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
3d926a034c Fix documentation to use correct XMPPConnection names
Some parts of the documentation still refer to

Connection connection = new XMPPConnection(…)

when it should be

XMPPConnection connection = new XMPPTCPConnection(…)

SMACK-574
2014-06-12 18:43:51 +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
3093333533 Reworked Smack initialization
Move extension relevant configuration options from SmackConfiguration to
the extension. Introduced disabledSmackClasses that can be configured
via a system property or configuration file.
2014-02-23 17:48:07 +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
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