Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-07 16:55:58 +01:00
Code Issues Releases Wiki Activity
1542 commits 8 branches 0 tags 34 MiB
Commit graph

236 commits

Author SHA1 Message Date
Florian Schmaus
4cd53e4419 SMACK-425 Introduced smack.parsing.ParsingExceptionCallback, a callback invoked when a exception is thrown while parsing a stanza. Smack is now able to either rethrow the exception ulitmatly causing a disconnect *or* log/ignore the exception and resume parsing after the faulty stanza. 
Conflicts:
	source/org/jivesoftware/smack/SmackConfiguration.java

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13685 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-06-22 17:00:27 +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
57051abfea Updated version information for 3.3 release. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13638 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-05-04 12:15:17 +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
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
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
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
b2a0a2154b Updated eclipse settings: if else, javadoc line length 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13478 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-14 11:43:24 +00:00
Florian Schmaus
d1893d541e eclipse: removed old junit from classpath. Smack testcases need junit 3.8.2 or higher in order to run correct 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13433 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-04 13:32:57 +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
e3f84cdbe6 Eclipse config: Disable 'save actions' 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13415 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-29 22:49:07 +00:00
Florian Schmaus
054656c771 Add eclipse configuration and Makefile. The eclipse configuration can be activated with the 'eclipse' make target ('make eclipse'). 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13414 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-29 22:04:09 +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
63ba2be8c9 build.xml: Added jar-test-smackx target and let test-unit depend on that, so that clean calls of 'ant test-unit' won't fail. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13403 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-21 11:35:56 +00:00
Florian Schmaus
d88f82f92d build.xml: Fixed accidentially deleted 'junit-' at target test-unit 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13402 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-21 11:35:37 +00:00
Florian Schmaus
5b7b13c43f Whitespace fixes in build.xml 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13401 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-21 10:35:20 +00:00
Florian Schmaus
767d93894e Enabled smackx unit tests for 'test-unit' target 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13400 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-21 10:34:54 +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
012e1252e2 SMACK-392 Updated test targets in ant build. Fix integration tests and added target for unit tests. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13371 b35dd754-fafc-0310-a699-88a17e54d16e
 2012-11-22 02:05:04 +00:00
rcollier
6dc64671e2 Merge of 3.2 stream back into trunk 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12965 b35dd754-fafc-0310-a699-88a17e54d16e
 2012-02-07 04:32:59 +00:00
rcollier
bd60bcbc97 Build fix for release 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12962 b35dd754-fafc-0310-a699-88a17e54d16e
 2012-02-05 01:51:29 +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
c60184f852 SMACK-343 Added bnd wrap task to build to generate OSGi attributes in the manifest files. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12925 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-12-21 14:27:06 +00:00
rcollier
3f89df061d Merged the 3.2 branch back into trunk. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12588 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-09-09 01:26:22 +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
8f1d8b50dd Updated the build to use Java 1.6 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12305 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-04-29 02:37:50 +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
Günther Niess
824fb3ad7d cleanup 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11641 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-18 13:41:01 +00:00
Günther Niess
e5ddf55311 Unit test for handling empty groups (SMACK-294) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11640 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-18 13:38:57 +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
Günther Niess
7d4389c544 SMACK-277: Update XMLUnit for unit tests to the latest stable release 1.2 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11232 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-09-03 07:05:21 +00:00
Michael Will
37a00e98d1 make finalize method protected 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11025 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-06-04 13:09:25 +00:00
Michael Will
634afb2cad add pmd for codecheck 
add generic to the smackx bookmark

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11023 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-06-04 09:56:20 +00:00