vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-12-21 01:57:57 +01:00
Code Issues Releases Wiki Activity
3978 commits 61 branches 35 tags 39 MiB
Commit graph

3978 commits

This branch
This branch
All branches
Author SHA1 Message Date
Florian Schmaus
93030c218c Remove ServerTrustManager 
The implementation of ServerTrustManger contains a security
vulnerability, which could lead to unauthorized certificates being
erroneously trusted. SMACK-410
 2014-02-10 12:07:39 +01:00
Florian Schmaus
5f5805cd1c Merge branch '3.4' 
Conflicts:
	build/build.xml
 2014-02-10 09:09:02 +01:00
Florian Schmaus
0cec5713d1 Smack 3.4.1 2014-02-09 14:11:22 +01:00
Florian Schmaus
fc26b83efd Use '-' as separator for $version.extra in build.xml 2014-02-08 13:21:55 +01:00
Florian Schmaus
9c61c6c945 Convert Connection references to weak references 
If a Manager is strong referenced from a gc root, usually the instances
map, it should not hold itself a strong reference the connection in
order to avoid a cycle that prevents the Connection instance from being
gc'ed.

SMACK-383
 2014-02-07 13:17:36 +01:00
Florian Schmaus
666f555733 Update eclipse project name 2014-02-07 12:40:48 +01:00
Florian Schmaus
4c8af8c17f Don't use manager's constructor in connectionCreated 
This could cause duplicate managers. Use getInstanceFor()
instead. SMACK-403.
 2014-02-07 12:15:04 +01:00
Florian Schmaus
89838f5843 Format build.xml's checkcode target 
Whitespace fix only. No semantic changes
 2014-02-06 18:19:27 +01:00
Florian Schmaus
f9d125127b Fix javadoc Java API link 2014-02-06 18:18:27 +01:00
Florian Schmaus
f021d7efb1 Cleanup of build.xml's release target 
no.test wasn't used in that path anyways, so remove it. And
release-exists will always return true since the release.xml Ant script
is part of the repository.
 2014-02-06 18:10:15 +01:00
rcollier
05ccada195 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-06 17:45:48 +01:00
Florian Schmaus
52a8a835ee Generate unit test reports 
So that these can be parsed by Bamboo
 2014-02-06 17:39:52 +01:00
Florian Schmaus
f125077f34 Add file local variables to build.xml 2014-02-06 10:18:27 +01:00
Florian Schmaus
8ff5807586 Add git revision in build.xml output files 2014-02-06 10:17:40 +01:00
Florian Schmaus
c4edd1f27c Untabify build.xml 
Only non-semantic whitespace fixes
 2014-02-06 09:45:26 +01:00
Florian Schmaus
68a570b4fe Use WeakReference in MUC NodeInformationProvider 
MultiUserChat's NodeInformationProvider must not hold a strong reference
to the Connection instance. Fixes SMACK-540.
 2014-02-05 23:12:03 +01:00
Florian Schmaus
1df3841a41 Eclipse: Add build/resources to classpath 
So that SmackConfiguration is able to load files from META-INF
 2014-02-05 23:11:39 +01:00
Florian Schmaus
2cb3d5a0d4 Move 'new MXParser()' in try/catch block 
aSmack replaces 'new MXParser()' with
'XmlPullParserFactory.newInstance().newPullParser()' which can throw a
XmlPullParserException. In order to build aSmack, we need to move the
'new MXParser()' within a try/catch block.
 2014-02-04 09:57:01 +01:00
Lars Noschinski
c06b0a7720 Implement support for roster versioning 
Roster versioning is defined in RFC 6121, section 2.2.6; the protocol
was originally described in XEP-0237.

Fixes SMACK-399
 2014-02-04 09:57:01 +01:00
Florian Schmaus
e7a2cad401 Add hidden default constructor to ConnectionConfiguration 
aSmack subclasses ConnectionConfiguration and needs a constructor that
does no network I/O.
 2014-02-04 09:56:28 +01:00
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
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