vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-14 16:22:07 +01:00
Code Issues Releases Wiki Activity
1857 commits 61 branches 35 tags 39 MiB
Commit graph

1857 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Florian Schmaus
b132dfa744 Add .gitignore 2014-02-03 17:12:46 +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
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
1b651d4939 SMACK-534 Refactored all System.out/err and printStackTrace calls with appropriate Java util logging calls. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13887 b35dd754-fafc-0310-a699-88a17e54d16e
 2014-02-02 22:39:07 +00:00
rcollier
9bb940da4b SMACK-526 Classes marked as deprecated to discourage their usage. Pubsub should be used instead. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13886 b35dd754-fafc-0310-a699-88a17e54d16e
 2014-02-01 22:40:30 +00:00
rcollier
5bbf6cf224 SMACK-387 Added some configuration to the ChatManager to allow for different matching modes on incoming messages with no thread id. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13885 b35dd754-fafc-0310-a699-88a17e54d16e
 2014-02-01 22:22:30 +00:00
rcollier
782448b3ec SMACK-403 New constructor added with no DelayInfo. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13884 b35dd754-fafc-0310-a699-88a17e54d16e
 2014-01-31 03:52:13 +00:00
rcollier
faa0f21906 SMACK-434 Added missing javadoc and some test code cleanup 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13883 b35dd754-fafc-0310-a699-88a17e54d16e
 2014-01-31 03:49:47 +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
1c5b28cf9f SMACK-530 Moved DNSUtilTest to integration tests 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13872 b35dd754-fafc-0310-a699-88a17e54d16e
 2014-01-22 03:17:34 +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
86df178654 SMACK-464 Updated javadoc to make method usage more clear. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13869 b35dd754-fafc-0310-a699-88a17e54d16e
 2014-01-20 02:52:44 +00:00
rcollier
722ec5a48a SMACK-461 Reverting last changes as the original deprecation marker was correct. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13868 b35dd754-fafc-0310-a699-88a17e54d16e
 2014-01-20 02:45:12 +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
Florian Schmaus
962bd277f1 SMACK-524 Use correct block-size definition for IBB transfers 
Revert IBB related changes introduced by SMACK-349 to use the correct
block size for IBB transfers.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13863 b35dd754-fafc-0310-a699-88a17e54d16e
 2014-01-17 11:24:07 +00:00
Florian Schmaus
c143f0de25 SMACK-525 fix NPE when initConnection() fails 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13862 b35dd754-fafc-0310-a699-88a17e54d16e
 2014-01-17 10:40:10 +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
7e3d4186bb git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13860 b35dd754-fafc-0310-a699-88a17e54d16e 2014-01-15 18:54:00 +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
3ecb723a0d SMACK-463 Catch and log exceptions in packet listeners 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13803 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-11-05 19:55:16 +00:00
Florian Schmaus
717d39c8fc Fix caps support (SMACK-361, SMACK-459). 
SMACK-459 splitted the SDM identities over two member variables which
are joined by getIdentities(), therefore this method must be used to
calculated the hash for entity caps.

Also recalculate the hash if an identity is added/remvoed/changed.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13801 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-11-04 20:58:36 +00:00
Florian Schmaus
49573866ab SMACK-462 Use getInstace() ConnectionCreationListener 
Prevent duplicate instances of a manager by using it's getInstance()
method instead of the manager's constructor.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13800 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-11-03 21:49:58 +00: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
84e1f32284 SMACK-339 Allow ConnectionListeners to be added before Connection is connected 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13798 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-11-02 11:46:21 +00:00
Florian Schmaus
385cfac9fa SMACK-459 Make it user proof by returning an unmodifiable set again 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13797 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-31 20:28:40 +00:00
Florian Schmaus
6fa2cbee68 SMACK-459 actually add the defaultIdentity to the result of getIdentities() 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13796 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-31 20:24:02 +00:00
Florian Schmaus
418dd24392 SMACK-373 Don't remove listeners after a disconnect() , keep state of Connection between disconnect() and connect()/login() 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13793 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-27 17:40:06 +00:00
Florian Schmaus
44c3214539 SMACK-460 ServiceDiscoveryManager constructor usage in 
connectionCreated()

ServiceDiscoveryManager should not use the constructor in
connectionCreated(), it may cause duplicate SDMs for the same connection
and prevents the interaction with SDM before the connection is
established. Instead getInstanceFor() is now used.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13792 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-26 23:53:04 +00:00
Florian Schmaus
1ea6159ce4 SMACK-461 Remove incorrect deprecated marker for DiscoverInfo.Identity.setType() 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13791 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-26 23:52:57 +00:00
Florian Schmaus
addf9ea6cd SMACK-459 Add option to configure the default identity in ServiceDiscoveryManager 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13790 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-26 23:50:59 +00:00
Florian Schmaus
62bc862015 SMACK-443 remove duplicate notifyReconnection() 
notifyReconnection() was called in initConnection() and in connect()

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13789 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-26 11:26:19 +00:00
Florian Schmaus
b16f34f61e SMACK-458 Managers should be kept on disconnects 
Smack's Managers should not remove itself when the connection is closed
or should re-add themselves if the connection get reconnected.

This should also fix some NPE's.

We are currently going with two different designs of Manager: 1. The one
with WeakReferences/WeakHashMaps (SDM, EntityCapsManager) and 2. the one
where the managers remove their listeners on connectionClosed() *and*
connectionClosedOnError(), and later add their listeners on
reconnectionSuccessful(). The first design has the Connection instance
only weak referenced. The other design does reference Connection
strongly (e.g. the 'managers' map in IBBManager/S5BManager), but removes
this references when connectionClosed(onError)() is called.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13788 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-26 11:17:16 +00:00
Florian Schmaus
032fc8626e SMACK-442 Manager should also handle connectionClosedOnError() 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13784 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-22 14:43:48 +00:00
Florian Schmaus
c4014b8ba9 SMACK-441 ServiceDiscoveryManager identities should be non-static and kept in a Set to allow multiple identities as per XEP-0030 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13783 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-22 14:43:23 +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
aa5906f1f1 SMACK-457 Remove unnecessary printStackTrace() in XMPPConnection 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13773 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-17 17:38:19 +00:00
Florian Schmaus
bd709dc323 SMACK-452 Correctly parse stream error packets 
Modified PacketParserUtils.parseStreamError() to take into account that
there may be an optional text element and an optional application
specific element.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13767 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-09 17:02:34 +00:00
Florian Schmaus
b253203cfb SMACK-444 Allow 'null' for options in ServerTrustManager 
Allow 'null' for TruststorePath and TruststorePassword in ServerTrustManager

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13766 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-09 12:31:17 +00:00
Florian Schmaus
9a7bf4a4c3 SMACK-456 Added the causing exception 
XMPPConnection.connectUsingConfiguraiton() does now add the causing
exception to the throwed exception.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13765 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-09 11:54:03 +00:00
Florian Schmaus
7543c896c2 Created 3.3.2 branch 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13764 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-09 10:47:36 +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
3146023dd4 SMACK-455 Fixed improper advance of parser when parsing multiple items in a pubsub message. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13760 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-07 01:38:09 +00:00
rcollier
25012a6744 SMACK-425 Few changes based on review http://fisheye.igniterealtime.org/cru/SMACK-4 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13759 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-05 23:14:24 +00:00