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

1570 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
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
4d1eaf522a SMACK-450 Make VCard.doLoad() return if the received packet was not an error and also not an VCard. Avoid calling VCard.load() with 'null' as argument. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13713 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-07-12 22:54:03 +00:00
rcollier
d237e06dab SMACK-441 Create packet collector only when necessary 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13703 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-06-30 20:00:50 +00:00
Florian Schmaus
9f2446c78e SMACK-448 Java7ZlibInputOutputStream: Use correct Deflater compression level 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13693 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-06-24 22:42:37 +00:00
Florian Schmaus
c2d057f4b2 SMACK-431 Reworded Entity Caps documentation, added missing frame link 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13692 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-06-24 21:27:43 +00:00
Florian Schmaus
0f247cf30e SMACK-405 Removed redundant code in XMPPConnection.shutdown() 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13690 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-06-22 17:02:09 +00:00
Florian Schmaus
cb5e1dc94b SMACK-431 Entity Capabilities are now enabled as default for new connections. Added an extensions documentation html page. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13689 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-06-22 17:01:58 +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
Florian Schmaus
18a603d932 SMACK-428 add 'public int RosterEntry.hashCode()' 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13662 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-05-17 22:05:57 +00:00
Florian Schmaus
6eb4b39716 Spelling fixes 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13661 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-05-17 22:05:40 +00:00
Florian Schmaus
8e10e5f374 SMACK-369 remove try/catch block in XMPPConnection.connect() 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13660 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-05-17 22:05:24 +00:00
Florian Schmaus
0951420d9c SMACK-439 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13659 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-05-17 22:04:31 +00:00
Florian Schmaus
a934624787 SMACK-438 Avoid NPE when the weak reference is null. Add InvitationsMonitor as strong reference within getInvitationsMonitor and return it within the block so it can't get gc'ed between put() and get(). 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13658 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-05-17 22:04:04 +00:00
Florian Schmaus
10a317f570 Created 3.3.1 branch 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13657 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-05-17 21:48:30 +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
Florian Schmaus
6b70974269 SMACK-437 Replaced 'String.isEmpty()' with 'String.length() > 0' 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13631 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-05-03 09:48:41 +00:00
rcollier
238ce7aac3 SMACK-415 Added code that was mistakenly removed to handle optional node attribute 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13625 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-04-29 11:40:49 +00:00