Florian Schmaus
7eb57d3896
build.xml: Use metainf instead of copy
2014-02-03 18:46:51 +01:00
Florian Schmaus
b5cac9c68a
SMACK-286 fix unit test for newer ant versions
...
Some unit tests depend on SmackConfiguration being loaded, so that the
initializer was run and the providers where configured. We create this
condition now by setting "reloading=false" to the junit task and hope
that there was a unit test before us that loaded SmackConfiguration.
But we keep in mind that this is only a ugly workaround, as unit test
should work on their own and have no inter-dependencies,
2014-02-03 18:25:40 +01:00
rcollier
ab189706ed
Updated version for post release
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13893 b35dd754-fafc-0310-a699-88a17e54d16e
2014-02-03 02:03:54 +00:00
rcollier
9a2993e661
Updated versioning for release (3.4.0)
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13891 b35dd754-fafc-0310-a699-88a17e54d16e
2014-02-03 01:55:16 +00:00
rcollier
719f44dfdf
SMACK-534 Removed the setting of JUL properties form the default config, they now have to be enabled explicitly so as to not mess up any existing config a user might have.
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13888 b35dd754-fafc-0310-a699-88a17e54d16e
2014-02-02 22:40:22 +00:00
rcollier
33e2094fe4
SMACK-434 (and 529) Added support for experimental code, that is XEP's that have not yet made it to the draft state.
...
This new souce directory and artifact initially contains message carbons (XEP-0280) code provided by George Lukas.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13882 b35dd754-fafc-0310-a699-88a17e54d16e
2014-01-31 03:41:25 +00:00
rcollier
e4ae5565f0
SMACK-343 Made all non core jars set the smack jar as the fragment host.
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13877 b35dd754-fafc-0310-a699-88a17e54d16e
2014-01-26 14:49:45 +00:00
rcollier
3a0b1b6197
Added some versioning to the jar files to match the versioning on the release build.
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13876 b35dd754-fafc-0310-a699-88a17e54d16e
2014-01-25 22:48:44 +00:00
rcollier
fb6dbda30f
SMACK-286 Fixed ant test-unit target to work with configuration changes
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13873 b35dd754-fafc-0310-a699-88a17e54d16e
2014-01-22 04:00:03 +00:00
rcollier
2789591a5b
SMACK-403 Added support for Stanza forwarding.
...
Code submitted by George Lukas...no, not that one.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13871 b35dd754-fafc-0310-a699-88a17e54d16e
2014-01-22 02:25:32 +00:00
rcollier
e49c500ac3
SMACK-436 Moved workgroups to its own source location and jar since it is not (and never will be) part of the specification.
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13867 b35dd754-fafc-0310-a699-88a17e54d16e
2014-01-20 02:25:35 +00:00
rcollier
9c9eb3efe2
Added version info to the release build zip/tar file
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13865 b35dd754-fafc-0310-a699-88a17e54d16e
2014-01-19 17:24:41 +00: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
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
Florian Schmaus
30bc5afa2b
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.
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13688 b35dd754-fafc-0310-a699-88a17e54d16e
2013-06-22 17:01:40 +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