d06d5b7c69
Merge branch '4.0'
...
Conflicts:
build.gradle
2014-07-20 14:19:59 +02:00
2ca92ef601
Smack 4.0.2-SNAPSHOT
2014-07-20 13:33:50 +02:00
d56252f9fb
Smack 4.0.1
2014-07-20 12:59:01 +02:00
494f7d5b34
Add getDatestamp() to build.gradle
2014-07-20 12:59:01 +02:00
59527d320d
Add SmackAndOsgiInitializer
...
OSGi ServiceComponents need the activate method, make sure it exists for
every SmackInitializer by using this class.
2014-07-20 12:58:50 +02:00
9db5e28fe5
Fix ExperimentalInitializer
2014-07-20 11:08:11 +02:00
97b17e83b4
Move "Message Events (XEP-22)" code to legacy
...
Fixes SMACK-569
2014-07-16 12:01:03 +02:00
49ee058c38
Cleanup carbons, forwarded and a few others API
...
Adopt to common design patterns in Smack:
- getFrom(Packet) in Packetextensions
- INSTANCES.put() in getInstanceFor()
- ELEMENT instead of ELEMENT_NAME
- Use XmlStringBuilder
2014-07-16 11:46:30 +02:00
1ed5c48bcc
Merge branch '4.0'
...
Conflicts:
smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
2014-07-16 10:52:58 +02:00
cea79d1bb8
Use single threaded ExecutorService
...
for PacketListeners. Fixes SMACK-583.
2014-07-16 10:50:35 +02:00
46a54bcd7d
Use jxmpp 0.2.0
...
this also changes jxmpp's group from org.jivesoftware.jxmpp to org.jxmpp
2014-07-15 23:32:19 +02:00
06ab0e32d7
Fix XHTMLText.appendBrTag()
...
It's an empty element and not a closing one.
2014-07-15 23:32:10 +02:00
e6aa2416e4
Improve MUC code
...
Removes a ton of duplicate code, mostly related to MUCItem being
duplicated in MUCOwner and MUCAdmin, but also some other duplicate code.
Make MUC code use XmlStringBuilder.
Add ELEMENT and NAMESPACE constants to the appropriate places. Also add
"static <MUCPacketExtension> getFrom(Packet)" methods.
Make some MUC classes implement Element.
2014-07-14 19:22:02 +02:00
7735a5224c
Merge branch '4.0'
...
Conflicts:
smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java
smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java
smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java
smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java
smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java
2014-07-14 14:31:09 +02:00
bd0ada480b
Improve DeliveryReceipt code, add javadoc
...
Also make Packet.getExtension() use Generics
2014-07-13 11:39:01 +02:00
c063fb1376
Reply correct error code on XEP-65 Stream rejection
...
this was previously erroneously changed with
197548b548
2014-07-12 13:52:54 +02:00
cde6dd65b3
Fix typo: s/no_acceptable/not_acceptable
...
in XMPPError.Condition
2014-07-12 12:39:04 +02:00
fc39ac88bd
Add support for retrieving PubSub Node affiliations
...
This also marks the starting point for extending the PubSub API to allow
additional packet extensions to be added to the request. This is for
example useful if one wants to limit the result with "Result Set
Management (XEP-59)".
Fixes SMACK-580.
2014-07-09 13:28:16 +02:00
b0825f73fd
Fix TLSUtils.AcceptAllTrustManager
...
Should not throw an Exception, but instead return a zero-sized
array. Also add some javadoc.
2014-07-09 09:42:31 +02:00
bdf9a75c4f
Use XmlStringBuilder in RosterPacket and XMPPError
2014-07-07 12:30:36 +02:00
ed7dc1800d
Throw IllegalStateException in StringUtils.hash()
...
instead of Log.
Also create UTF8 and SHA1 constant.
2014-07-07 00:11:00 +02:00
e469601468
Do not hardcode the char[] length in StringUtils
2014-07-07 00:03:11 +02:00
8b16c49a31
Remove Packet.ID_NOT_AVAILABLE
2014-07-06 23:57:06 +02:00
f671b9e781
Use CharSequence instead of String in parseContent()
...
and parseContentDepth(). This also means that the type of some fields
changed from String to CharSequence.
Also add Matcher for CharSequences.
2014-07-06 21:10:40 +02:00
54b18e3575
Make XHMTMLExtensionProvider use parseElement()
...
which makes the whole provider much simpler.
Also use CharSequence as Base for XHTML-IM bodies.
2014-07-05 15:04:35 +02:00
94a16ba41e
Merge branch '4.0'
...
Conflicts:
build.gradle
documentation/connections.html
documentation/gettingstarted.html
smack-core/src/main/java/org/jivesoftware/smack/SmackException.java
smack-core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java
smack-core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java
smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java
smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
smack-tcp/src/main/java/org/jivesoftware/smack/tcp/PacketReader.java
2014-07-05 14:37:22 +02:00
d8d88d9abd
Make XHTMLText use XmlStringBuidler
...
also define all element and attribute names as constants.
2014-07-05 14:19:31 +02:00
4477561d4b
Replace references to 'smack.jar'
...
Also don't mention the required JDK version in the README as such information
tends to become wrong easily.
2014-07-05 12:10:43 +02:00
8526f8ab29
Introduce packet.Element
...
Re-work filetransfer/bytestream stanza toXML() method to use
XmlStringBuilder. Move the ELEMENT and NAMESPACE definitions in the
right place, ie. the stanza class.
2014-07-05 11:59:45 +02:00
f05b208120
Remove some duplicate IQ code
...
and some dead code in Socks5PacketUtils.
2014-07-04 23:51:00 +02:00
afd1f6bc36
Remove some duplicate code from smackx.filetransfer
...
packet.IQ provides all the utility functions we need. An extension should
never (re-)implemented it's own core functionality.
2014-07-04 23:17:15 +02:00
09425609af
Refactor FileTransfer(Manager|Negotiator)
...
to use WeakHashMaps and extend Manager.
SMACK-579
2014-07-02 09:52:40 +02:00
fdaf7940fb
Remove decorators for "Legacy Delayed Delivery"
...
(aka. XEP-91) in favor of Delayed Delivery (XEP-203)
SMACK-578
2014-07-01 23:29:45 +02:00
08a232bff3
Only include the jars of the actual version in distirbutionZip
...
in order to avoid that other artifactss from previous builds slip in
the distribution zip.
2014-06-27 13:38:47 +02:00
1fb8a50b79
Improve documentation
...
remove ambiguous part about smack-core being the only required
library. It's the only required library of *Smack*, but some user could
understand that Smack itself has no other dependencies. In order to
avoid such confusion, simply remove that part.
2014-06-27 12:22:39 +02:00
0f7365bc8a
Use jxmpp 0.1.0 (non-SNAPSHOT)
2014-06-26 22:58:47 +02:00
f39519dbbe
Disable uploadArchives for the root project
2014-06-26 22:44:31 +02:00
73c64dc06a
Record some more useful attributes in manifest
2014-06-25 08:28:26 +02:00
609c225865
Add smack-resolver-minidns
2014-06-25 08:27:20 +02:00
1f6d0fa415
Use BufferedReader to read version
2014-06-22 23:14:11 +02:00
1d21285d24
Update JIRA URL
2014-06-22 22:44:00 +02:00
56222d6ee2
Improve parseContent() and parseContentDepth()
...
The idea is that xml-roundtrip should *never* be expected from a
XmlPullParser. So what we need is a method that parses the content of an
element without relying on getText() returning text if on START_TAG or
END_TAG. This is already done by PubSubs ItemProvider.
Also add PacketParserUtils.parseElement() which will return the current
element as String and use this method in PubSub's ItemProvider.
2014-06-20 12:07:25 +02:00
26b5bc0212
Properly escape Bookmarks and FormField XML
...
by using XmlStringBuilder. Fixes SMACK-577
Also extend LazyStringBuilder with a cache. And extend XmlStringBuilder
with some more convenience methods.
Move the ELEMENT and NAMESPACE definition from Form to DataForm, where
it belongs.
2014-06-19 16:52:19 +02:00
2ce7656180
Fix PrivateDataResult.getChildElementXML()
...
that method never worked correctly since 11 years, ie. the PrivateData
was never added as element text. It's not surprisingly that this was not
discovered in more then a decade, since Smack usually never *sends*
those stanza but only receives them.
But that's no reason to not fix it. :)
2014-06-19 16:52:19 +02:00
298822eaef
Make smack-resolver-javax an OSGi ServiceComponent
...
Fixes SMACK-576
2014-06-17 18:01:36 +02:00
a77adc018b
Enable linkSource, use and JavaSE javadoc for javadocAll
2014-06-17 13:17:20 +02:00
46f4a553e0
Add javadoc to SmackException.ConnectionException
...
and HostAddress
2014-06-17 13:17:15 +02:00
02651c668f
Improve HostAddress, make some members final
...
also
- add getException()
- improve constructor logic
2014-06-17 11:00:46 +02:00
37279eaa06
Add ohloh stats to README.md
...
and move the badges on top.
2014-06-14 18:42:55 +02:00
eec0df386c
s/JEP/XEP/
...
also s;jabber.org/jeps;xmpp.org/extensions;
2014-06-14 11:48:46 +02:00
Florian Schmaus