1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-06-28 22:34:49 +02:00
Commit graph

218 commits

Author SHA1 Message Date
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
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 b0614707bd Updating version number.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10906 b35dd754-fafc-0310-a699-88a17e54d16e
2008-11-19 20:19:20 +00:00
Matt Tucker a631b163e8 Intellij 8 settings?
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10878 b35dd754-fafc-0310-a699-88a17e54d16e
2008-11-13 18:33:07 +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 b01fc35f91 Renamed jar to NOT contain the version number. Versions of libraries are kepts in versions.txt.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10861 b35dd754-fafc-0310-a699-88a17e54d16e
2008-10-31 04:30:17 +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 bc82d8326f Updated XPP to 1.1.4c. SMACK-259
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10857 b35dd754-fafc-0310-a699-88a17e54d16e
2008-10-31 04:03:15 +00:00
Matt Tucker f73c015eeb Updated version number.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10855 b35dd754-fafc-0310-a699-88a17e54d16e
2008-10-31 03:48:37 +00:00
Jeff Williams 84fcf53512 Significant improvement to Jingle logging messages, and a new SmackLogger that allows for use of java.commons.logging. Improvements to Jingle processing to keep up with recent changes in the XEPs as we approach approval of the standard. (There will be more changes as the standard changes.) Fixes to the way STUN gets used, and a new JSTUN library (including performance and reliability changes we added to it).
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10852 b35dd754-fafc-0310-a699-88a17e54d16e
2008-10-30 21:20:29 +00:00
Jeff Williams 91c2b27cbf Add lib info for jstun
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10741 b35dd754-fafc-0310-a699-88a17e54d16e
2008-08-06 22:15:04 +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 c46b6f2d08 Updating.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@8334 b35dd754-fafc-0310-a699-88a17e54d16e
2007-05-17 15:01:53 +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 a3e9b99638 Fixing dependencies.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@8276 b35dd754-fafc-0310-a699-88a17e54d16e
2007-05-10 22:55:21 +00:00
Alex Wenckus 8e08a8ba4a Added support for multiple message bodies and language on the message. SMACK-99
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@8113 b35dd754-fafc-0310-a699-88a17e54d16e
2007-04-26 06:22:55 +00:00
Alex Wenckus 985bc79aca Added xmlunit
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@8098 b35dd754-fafc-0310-a699-88a17e54d16e
2007-04-24 01:46:52 +00:00