1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-27 08:42:07 +01:00
Commit graph

101 commits

Author SHA1 Message Date
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
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
6a4827c846 SMACK-451 Moved providers declaration for ping manager as it was in the middle of the ad-hoc entries
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13744 b35dd754-fafc-0310-a699-88a17e54d16e
2013-09-16 22:50:41 +00:00
rcollier
df022d155a Updated changelog for 3.3 release.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13640 b35dd754-fafc-0310-a699-88a17e54d16e
2013-05-04 13:03:10 +00:00
rcollier
a3faa41696 SMACK-403 Pulling this contribution until the related specs reach a draft status
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13612 b35dd754-fafc-0310-a699-88a17e54d16e
2013-04-16 02:19:38 +00:00
rcollier
3a4b05ac00 SMACK-412 Abstracted the keepalive implementation and set the thread to start and stop on demand.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13610 b35dd754-fafc-0310-a699-88a17e54d16e
2013-04-16 01:39:17 +00:00
rcollier
9da54ecbce SMACK-225 Converted abstract class to interface, added missing hashcode method, fixed typos and some minor name changes and added licensing text
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13600 b35dd754-fafc-0310-a699-88a17e54d16e
2013-04-01 13:40:02 +00:00
rcollier
998245be26 SMACK-412 Fixed merge error.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13591 b35dd754-fafc-0310-a699-88a17e54d16e
2013-03-23 22:23:19 +00:00
rcollier
aab1dcdabe SMACK-412 Split the ping implementation to a server ping to replace keepalive and a simplified ping manager for manual pings of other entities.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13569 b35dd754-fafc-0310-a699-88a17e54d16e
2013-03-19 02:37:36 +00:00
Florian Schmaus
2eb13f48d2 SMACK-225 Fixed DNS SRV handling, as per RFC 2782. Added support for multiple DNS SRV resolvers namely javax and org.xbill.dns (aka dnsjava).
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13561 b35dd754-fafc-0310-a699-88a17e54d16e
2013-03-18 08:53:11 +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
5c6f257027 SMACK-388
Use ScheduledExecutorService.
Set ping received when pinging another entity.
Refactored PacketListener and ConnectionListeners as anonymous inner-classes

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13531 b35dd754-fafc-0310-a699-88a17e54d16e
2013-02-27 22:49:04 +00:00
Florian Schmaus
bfefbdb777 Implement XEP-0184 delivery notifications
This patch provides three components required to implement XEP-0184:

 * DeliveryReceiptRequest is a PacketExtension to request a receipt
 * DeliveryReceipt is a PacketExtension that contains the receipt
 * DeliveryReceiptManager to handle sending/receiving of requests and
   receipts.

Implementation:

For requesting a receipt, just add a new DeliveryReceiptRequest() to
your message or use the helper function:

    DeliveryReceiptManager.addDeliveryReceiptRequest(packet);

Register a ReceiptReceivedListener to find out if your packet arrived:

    DeliveryReceiptManager.getInstanceFor(myConnection)
	.registerReceiptReceivedListener(new ReceiptReceivedListener() {
	    @Override public void onReceiptReceived(String fromJid,
				    String toJid, String receiptId) {
		// receipt received for packet id receiptId
	    }

To answer a receipt request, you can either check incoming packets
manually:

    if (DeliveryReceiptManager.hasDeliveryReceiptRequest(packet)) {
	// send receipt
    }

Or you can enable automatic receipt transmission with:

    DeliveryReceiptManager.getInstanceFor(myConnection)
	    .setAutoReceiptsEnabled(true);

Signed-Off-By: Georg Lukas <georg@op-co.de>

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13431 b35dd754-fafc-0310-a699-88a17e54d16e
2013-02-04 09:53:56 +00:00
Florian Schmaus
d8f11a0b71 SMACK-388 register PingProvider with smack.providers. The static register code was removed with 13406 (http://fisheye.igniterealtime.org/changelog/smack?cs=13406)
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13413 b35dd754-fafc-0310-a699-88a17e54d16e
2013-01-28 09:57:09 +00:00
Florian Schmaus
7fa65f74ed SMACK-403 Correct location of the Forwarded Provider
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13412 b35dd754-fafc-0310-a699-88a17e54d16e
2013-01-28 09:49:13 +00:00
Florian Schmaus
2a1f4e8376 SMACK-403 add support for
XEP-0297 Stanza Forwarding and XEP-0280 Message Carbons
and
XEP-0297: Stanza Forwarding implementation

This patch adds Forwarded.java, a class to wrap messages forwarded
from a different entity. A forwarded stanza contains of a Packet and
an optional timestamp.

WARNING: The current implementation only allows to forward Message
packets, as there is no universal way to parse a Packet from SMACK.

XEP-0280 Message Carbons implementation

This patch adds Carbon.java, a class to wrap the packet extension
defined in XEP-0280 to store copies of messages sent to or received
by a user to his other client(s).

The CarbonManager allows to register XEP-0280 support with the SDM,
to enable and disable the feature and to manipulate messages
accordingly.

Signed-Off-By: Georg Lukas <georg@op-co.de>

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13411 b35dd754-fafc-0310-a699-88a17e54d16e
2013-01-28 09:38:02 +00:00
Florian Schmaus
4018fa3c7b SMACK-388 Moved PingProvider, Ping and Pong under ../smackx/ping package
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13394 b35dd754-fafc-0310-a699-88a17e54d16e
2013-01-15 19:56:25 +00:00
Florian Schmaus
8c14f0cb55 Added XEP-199 aka. "XMPP Ping" support to smack. Fixes SMACK-388.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13384 b35dd754-fafc-0310-a699-88a17e54d16e
2013-01-04 11:43:35 +00:00
rcollier
a92d37a32b SMACK-349 Couple of fixes to test cases based on changes in base64 encoding buffer sizes.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12957 b35dd754-fafc-0310-a699-88a17e54d16e
2012-01-27 21:30:09 +00:00
rcollier
50bf29b122 Updates for Release of 3.2.1
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12557 b35dd754-fafc-0310-a699-88a17e54d16e
2011-07-04 19:51:43 +00:00
rcollier
da5434505b SMACK-129 - Added a property in smack-config file for the default packet collector size and set it much lower than the previous default. Also made the max size for packet collectors configurable from the constructor.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12509 b35dd754-fafc-0310-a699-88a17e54d16e
2011-06-18 18:18:03 +00:00
rcollier
84c43c4fdd Updated all version info for 3.2 release.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12329 b35dd754-fafc-0310-a699-88a17e54d16e
2011-05-04 23:41:24 +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
158e02fb40 Updated versioning info for 3.2 beta release.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12021 b35dd754-fafc-0310-a699-88a17e54d16e
2011-02-04 00:09:21 +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
guus
bcc1c55894 Adding support for XEP-0224: Attention (SMACK-296)
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11655 b35dd754-fafc-0310-a699-88a17e54d16e
2010-02-25 08:09:12 +00:00
guus
a86f45a4e6 Adds packetextension for nicknames (SMACK-285)
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11454 b35dd754-fafc-0310-a699-88a17e54d16e
2009-12-09 19:59:52 +00:00
rcollier
8dd8ec02a5 SMACK-272 Add support for XEP-0060 (pubsub)
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11350 b35dd754-fafc-0310-a699-88a17e54d16e
2009-10-28 22:54:49 +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
a1e791172c disable the missing org.jivesoftware.smackx.workgroup.site package
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11331 b35dd754-fafc-0310-a699-88a17e54d16e
2009-10-26 15:04:18 +00:00
Michael Will
f943d27a3b SMACK-266 - Add provider for fastpath to smackx
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11022 b35dd754-fafc-0310-a699-88a17e54d16e
2009-06-04 08:48:06 +00:00
Matt Tucker
6b375b2e9f Updated changelog.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10923 b35dd754-fafc-0310-a699-88a17e54d16e
2008-11-21 05:27:00 +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
Matt Tucker
b927475caa HTML fixes.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10863 b35dd754-fafc-0310-a699-88a17e54d16e
2008-10-31 05:15:55 +00:00
Gaston Dombiak
ecf96a25dd Updated for 3.1.0 Beta1.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10859 b35dd754-fafc-0310-a699-88a17e54d16e
2008-10-31 04:20:03 +00:00
Gaston Dombiak
8d07e07379 Initial implementation of ad-hoc commands. SMACK-242
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10453 b35dd754-fafc-0310-a699-88a17e54d16e
2008-05-28 18:59:52 +00:00
Matt Tucker
9b798f5c48 Updating for beta release.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@8279 b35dd754-fafc-0310-a699-88a17e54d16e
2007-05-10 23:30:00 +00:00
Matt Tucker
c76776f24b Updates for 2.5.2 beta.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@8088 b35dd754-fafc-0310-a699-88a17e54d16e
2007-04-21 20:19:13 +00:00
Matt Tucker
bb9e138321 Changelog for 3.0.1.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7925 b35dd754-fafc-0310-a699-88a17e54d16e
2007-04-07 21:43:09 +00:00
Matt Tucker
0e9c3e6412 Updated for 3.0 release.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7850 b35dd754-fafc-0310-a699-88a17e54d16e
2007-03-31 18:02:48 +00:00
Matt Tucker
879eab6e9d Date fix.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7498 b35dd754-fafc-0310-a699-88a17e54d16e
2007-03-13 16:48:30 +00:00
Matt Tucker
9f3842bb8c Updated for 3.0.0 beta 3.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7480 b35dd754-fafc-0310-a699-88a17e54d16e
2007-03-13 00:23:01 +00:00
Matt Tucker
11141e1110 Updated changelog.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7188 b35dd754-fafc-0310-a699-88a17e54d16e
2007-02-19 08:59:58 +00:00
Matt Tucker
4668399c30 Updated date.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@6998 b35dd754-fafc-0310-a699-88a17e54d16e
2007-02-06 17:51:49 +00:00
Matt Tucker
06a61c54dc Updates for release.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@6949 b35dd754-fafc-0310-a699-88a17e54d16e
2007-02-04 21:24:51 +00:00
Gaston Dombiak
0b4006d394 Fixed way an inner class is being referenced.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@6304 b35dd754-fafc-0310-a699-88a17e54d16e
2006-12-05 00:11:44 +00:00
Alex Wenckus
5658fb705a Code complete chat state manager
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@6283 b35dd754-fafc-0310-a699-88a17e54d16e
2006-12-01 18:42:33 +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
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
cd0370ac14 Added LastActivityManager. SMACK-94
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@5221 b35dd754-fafc-0310-a699-88a17e54d16e
2006-09-04 22:04:15 +00:00