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
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
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
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
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
rcollier
0fdfd6e75e
SMACK-361 Some general code cleanup added some missing hashcode methods and added back some removed public API methods (marked as deprecated).
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13598 b35dd754-fafc-0310-a699-88a17e54d16e
2013-03-31 14:24:50 +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
7723b9fcfd
ServiceDiscoveryManager: Anounce 'disco#info' and 'disco#items' on service discovery queries in accordance with XEP-0030
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13464 b35dd754-fafc-0310-a699-88a17e54d16e
2013-02-11 17:22:31 +00:00
Florian Schmaus
a75d2d7d0d
SMACK-375 Properly escape Strings in DiscoverInfo and DiscoverItems for XML.
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13417 b35dd754-fafc-0310-a699-88a17e54d16e
2013-01-31 22:30:36 +00:00
rcollier
65d3847670
SMACK-327 Made getFeatures() method public.
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12007 b35dd754-fafc-0310-a699-88a17e54d16e
2010-12-04 16:28:52 +00:00
Matt Tucker
98bf0d8cfb
Copyright update.
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7071 b35dd754-fafc-0310-a699-88a17e54d16e
2007-02-12 00:59:05 +00:00
Alex Wenckus
1f3ab16aad
Small tweaks.
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@6183 b35dd754-fafc-0310-a699-88a17e54d16e
2006-11-20 23:09:11 +00:00
Gaston Dombiak
f57ff10ad9
1. Clean up code
...
2. Refactoring work
3. Optimization work. SMACK-153
4. Fixed roster test cases. SMACK-154
4. Fixed vCard issue. SMACK-152
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4538 b35dd754-fafc-0310-a699-88a17e54d16e
2006-07-18 05:14:33 +00:00
Matt Tucker
e382efa52a
Updated to Apache 2.0 license.
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2407 b35dd754-fafc-0310-a699-88a17e54d16e
2004-11-02 23:37:00 +00:00
Gaston Dombiak
c396be83d1
Allows a disco#info packet to include a dataform. SMACK-153
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2382 b35dd754-fafc-0310-a699-88a17e54d16e
2004-09-19 16:20:10 +00:00
Gaston Dombiak
6793015fe9
Fixed a bug in the XML representation by adding some missing inverted commas
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2308 b35dd754-fafc-0310-a699-88a17e54d16e
2004-05-13 17:33:21 +00:00
Gaston Dombiak
529818b559
Fixed #getChildElementXML to include the node attribute. SMACK-133
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2305 b35dd754-fafc-0310-a699-88a17e54d16e
2004-05-09 18:52:26 +00:00
Matt Tucker
279aabc049
Javdoc fixes.
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2243 b35dd754-fafc-0310-a699-88a17e54d16e
2004-03-11 15:55:44 +00:00
Gaston Dombiak
a136f1066e
Initial check-in
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2140 b35dd754-fafc-0310-a699-88a17e54d16e
2003-10-13 22:57:25 +00:00
