vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-29 23:42:06 +01:00
Code Issues Releases Wiki Activity
1629 commits 61 branches 35 tags 39 MiB
Commit graph

1021 commits

Author SHA1 Message Date
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
848d393b73 SMACK-225 Fixed DNS SRV handling, as per RFC 2782. Added support for multiple DNS SRV resolvers namely javax and org.xbill.dns (aka dnsjava). 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13559 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-18 08:42:26 +00:00
Florian Schmaus
9123578ea5 SMACK-361 Added support for Entity Capabilities. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13558 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-18 08:40:35 +00:00
Florian Schmaus
1cdb86989a SMACK-423 Parse unhandled IQ stanzas of type 'request' to dummy IQ class, so that the contents can be examined later on. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13539 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-05 10:35:04 +00:00
Florian Schmaus
1167523c4f SMACK-423 Parse unhandled IQ stanzas of type 'request' to dummy IQ class, so that the contents can be examined later on. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13538 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-05 10:32:23 +00:00
Florian Schmaus
5c6f257027 SMACK-388 
Use ScheduledExecutorService.
Set ping received when pinging another entity.
Refactored PacketListener and ConnectionListeners as anonymous inner-classes

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13531 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-27 22:49:04 +00:00
Florian Schmaus
c6248ec000 SMACK-389 Plugable compression framework 
This commit adds the ability to plug-in different compression handlers
for different compression methods. It is also possible to add more
then one handler for the same method. The order how the handlers are
added determines which handler is tried first for usage. This is used
for the 'zlib' compression method, which now can be either provided by
Java7 or by JZlib (just like it was done before).

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13522 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-26 09:26:41 +00:00
Florian Schmaus
5dea9d3ee1 SMACK-379 Removed mandatory session establishment, since it was dropped from the newer XMPP-IM RFC (a.k.a. RFC 6121) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13521 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-26 08:44:32 +00:00
Florian Schmaus
da1987a98b SMACK-376 Allow supplying a custom SSLContext for encrypted connections. 
The provided TrustManager / SSLContext implementation is very flexible,
but it does not allow to query the user about accepting possibly
invalid SSL certificates. By supplying a custom SSLContext with a
TrustManager implementing such a query mechanism it is possible to
implement this behaviour.

The patch adds ConnectionConfiguration.customSSLContext with appropriate
getter/setter methods and uses the custom context in XMPPConnection.

Signed-Off-By: Georg Lukas <georg@op-co.de>

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13520 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-26 08:44:17 +00:00
Florian Schmaus
4060a97b65 SMACK-345: Improved detection of last activity. Properly synchronized access to lastMessageSent and registerd last activity namespace with ServiceDiscoveryManager. Improved LastActivity Provider 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13475 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-14 00:00:54 +00:00
Florian Schmaus
ddabe436b4 PingManager: Fixed imports 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13474 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-14 00:00:26 +00:00
Florian Schmaus
1a170c1561 ServiceDiscoveryManager: Use 'Set' as data structure for features to prevent reporting duplicate features 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13465 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-11 17:22:42 +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
b907d606d9 SMACK-352 removed duplicated headers, fixed svn keywords 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13459 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-07 19:10:22 +00:00
Florian Schmaus
a686b4c092 Update MultiUserChat to use the correct namespace according to the latest version of XEP-0045. 
Newer versions for XEP-0045 (MUC) use muc#admin for all onwer related operations.
Fixes SMACK-371. Credits and thanks go to Colby White for reporting this.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13458 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-07 19:08:05 +00:00
Florian Schmaus
6bbf425157 SMACK-352 
- fixed wrong header
- replaced old Jive license with Apache 2.0 license
- added license header to files without

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13457 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-07 14:19:47 +00:00
rcollier
14f139f642 Fixed small problem in one field and removed possible NPE on get from any field. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13454 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-07 03:57:38 +00:00
rcollier
d1e9d81769 SMACK-341 Updated collectors to use concurrent classes. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13452 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-07 03:42:33 +00:00
rcollier
e0e92eca76 SMACK-407 Time zones now parse correctly. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13442 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-06 03:38:11 +00:00
Florian Schmaus
04cea9e28c SMACK-395 Forgot to actually add the discovered proxies 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13441 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-04 21:59:07 +00:00
Florian Schmaus
592135c0e9 SMACK-395 Socks5BytestreamManager.establishConnection(): Don't bail out with an Exception uf the local XMPP service does not support Service Discovery (e.g. talk.google.com). Instead remember the Exception and give the local proxy (if enabled) a chance. 
Also compute the digest only if it's really needed, that is when streamHosts is not empty.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13440 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-04 21:36:39 +00:00
Florian Schmaus
0ca8b726bd PubSub SubcribeForm: Use new StringUtils.formatXEP0082Date to get the correct date string. Note that the previous used SimpleDateFormat "yyyy-MM-dd'T'HH:mm:ss.SSSZ" did not produce XEP-0082 conforming strings, since Z is replace with e.g. '+0100' whereas it should be '+01:00'. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13434 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-04 13:33:15 +00:00
Florian Schmaus
ca78c5be49 String.isEmpty() only comes with Android API level 9 (or higher). Switching back to old isEmptyString check, making Smack Android compatible again 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13432 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-04 11:04:00 +00:00
Florian Schmaus
bfefbdb777 Implement XEP-0184 delivery notifications 
This patch provides three components required to implement XEP-0184:

 * DeliveryReceiptRequest is a PacketExtension to request a receipt
 * DeliveryReceipt is a PacketExtension that contains the receipt
 * DeliveryReceiptManager to handle sending/receiving of requests and
   receipts.

Implementation:

For requesting a receipt, just add a new DeliveryReceiptRequest() to
your message or use the helper function:

    DeliveryReceiptManager.addDeliveryReceiptRequest(packet);

Register a ReceiptReceivedListener to find out if your packet arrived:

    DeliveryReceiptManager.getInstanceFor(myConnection)
	.registerReceiptReceivedListener(new ReceiptReceivedListener() {
	    @Override public void onReceiptReceived(String fromJid,
				    String toJid, String receiptId) {
		// receipt received for packet id receiptId
	    }

To answer a receipt request, you can either check incoming packets
manually:

    if (DeliveryReceiptManager.hasDeliveryReceiptRequest(packet)) {
	// send receipt
    }

Or you can enable automatic receipt transmission with:

    DeliveryReceiptManager.getInstanceFor(myConnection)
	    .setAutoReceiptsEnabled(true);

Signed-Off-By: Georg Lukas <georg@op-co.de>

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13431 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-04 09:53:56 +00:00
rcollier
f0cd048635 Added check for missing field type for multi list in data forms. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13430 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-04 03:53:53 +00:00
rcollier
457959bc88 SMACK-391 New enum to define date formats and profiles. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13429 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-04 03:52:08 +00:00
rcollier
1d36ae8db4 SMACK-391 Moved all date parsing into StringUtils and made it much more robust in handling multiple valid and invalid formats. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13428 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-04 03:45:37 +00:00
Florian Schmaus
43619de7aa SMACK-377 Avoid an unnecessary DNS request by using directly the, at this point known IP, instead of using the hostname as argument for the new socket. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13420 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-31 22:31:31 +00:00
Florian Schmaus
c76ed51541 SMACK-385 Reuse the KeyStore in order to reduce memory usage. Extended ServerTrustManager with a 'stores' (Hash)Map that allows the reuse of an existing KeyStore. Before that, every call of KeyStore.getInstance() created a new instance which consumes about 250KiB. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13419 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-31 22:31:04 +00:00
Florian Schmaus
e75f45082b SMACK-270 MultiUserChat relied on finalize() being called in order to remove packet listeners and the association with RoomListenerMultiplexor. The PacketListeners are referenced by Connection, which meant that MultiUserChat is always strongly reachable until the connection dies. 
This patch introduces an new MultiUserChat.cleanup() method that is called when userHashLeft() is triggered.

Thanks to Stuart Chalmers and scgmile for reporting this.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13418 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-31 22:30:49 +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
Florian Schmaus
401c37bd28 SMACK-404 Changed StringUtils.decodeBase64(String) behavior so that the method does not try to detect and decompress a gzip-compressed input. Refactored every use of the Base64.(de|en)code* methods to use the StringUtils (de|en)codeBase64 methods instead. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13416 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-29 22:49:20 +00:00
Florian Schmaus
2a1f4e8376 SMACK-403 add support for 
XEP-0297 Stanza Forwarding and XEP-0280 Message Carbons
and
XEP-0297: Stanza Forwarding implementation

This patch adds Forwarded.java, a class to wrap messages forwarded
from a different entity. A forwarded stanza contains of a Packet and
an optional timestamp.

WARNING: The current implementation only allows to forward Message
packets, as there is no universal way to parse a Packet from SMACK.

XEP-0280 Message Carbons implementation

This patch adds Carbon.java, a class to wrap the packet extension
defined in XEP-0280 to store copies of messages sent to or received
by a user to his other client(s).

The CarbonManager allows to register XEP-0280 support with the SDM,
to enable and disable the feature and to manipulate messages
accordingly.

Signed-Off-By: Georg Lukas <georg@op-co.de>

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13411 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-28 09:38:02 +00:00
Florian Schmaus
b9fe598129 fix typo in PingManager.getInstanceFor() function name 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13410 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-26 09:47:39 +00:00
Florian Schmaus
704ef1f9dc PingManager: Don't register IQProvider since this is done by smack.providers already. This line was actually a leftover from aSmack development. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13406 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-25 00:13:40 +00:00
Florian Schmaus
4018fa3c7b SMACK-388 Moved PingProvider, Ping and Pong under ../smackx/ping package 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13394 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-15 19:56:25 +00:00
Florian Schmaus
6e141eeb68 PingManager: removed debug message that claims to be a error message 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13393 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-11 10:30:52 +00:00
Florian Schmaus
e1bb5a6123 SMACK-278: Call socket.close() in XMPPConnection.shutdown() before 
closing the reader and writer streams. This basically prevents the
deadlock reported in SMACK-278.

Additionally, we need to tell the PacketReader and PacketWriter that
the socket got closed and that subsequent caused Exceptions can be
ignored. This is done via the socketClosed boolean in XMPP Connection,
that is queried by PacketReader and PacketWriter in case an Exception
is encountered.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13390 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-06 14:02:44 +00:00
Florian Schmaus
3c2eaba840 KeepAliveTask: Increased the initial heartbeat dealy in order to 
prevent a heartbeat timeout in high latency situations (mobile
environments)"

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13389 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-06 14:02:35 +00:00
Florian Schmaus
7770511111 Fixed typo 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13388 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-06 14:01:52 +00:00
Florian Schmaus
cd15d7499d Fix erroneous cast from byte to int in IBBInputStream's read() 
method. The casted value needs to be masked with 0xff, because bytes
in java are signed (two's complement)

Fixes SMACK-394

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13387 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-05 12:53:45 +00:00
Florian Schmaus
8c14f0cb55 Added XEP-199 aka. "XMPP Ping" support to smack. Fixes SMACK-388. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13384 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-04 11:43:35 +00:00
rcollier
9cd16fe3dd SMACK-374 Added patch to fix memory leak. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13372 b35dd754-fafc-0310-a699-88a17e54d16e
 2012-11-22 02:51:51 +00:00
rcollier
fc3ec2ab8a SMACK-390 Log exception in parsing extensions of Presence. Valid Presence will still be returned with extensions missing. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13326 b35dd754-fafc-0310-a699-88a17e54d16e
 2012-10-30 01:53:44 +00:00
rcollier
e08c8afe44 SMACK-363 Applied code cleanup patches for many generics related issues. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13325 b35dd754-fafc-0310-a699-88a17e54d16e
 2012-10-26 10:47:55 +00:00
rcollier
6dc64671e2 Merge of 3.2 stream back into trunk 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12965 b35dd754-fafc-0310-a699-88a17e54d16e
 2012-02-07 04:32:59 +00:00
rcollier
a92d37a32b SMACK-349 Couple of fixes to test cases based on changes in base64 encoding buffer sizes. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12957 b35dd754-fafc-0310-a699-88a17e54d16e
 2012-01-27 21:30:09 +00:00
rcollier
62ce8e85dd SMACK-362 Added check for no values on form. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12926 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-12-21 14:58:48 +00:00
rcollier
2115a6b545 Moved the EmbeddedExtensionProvider from smackx to smack, since it is not tied to extensions but is a simple utility for aiding in parsing of custom cabinets. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12922 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-12-19 17:28:57 +00:00
rcollier
298841cf54 Moved the EmbeddedExtensionProvider from smackx to smack, since it is not tied to extensions but is a simple utility for aiding in parsing of custom cabinets. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12921 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-12-19 17:26:47 +00:00
rcollier
be3b4ae9ef Updated url in javadoc. Changed from jabber to xmpp. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12919 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-12-19 15:45:24 +00:00
rcollier
01d444ac78 SMACK-353 Fix thread leak issue. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12918 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-12-19 15:43:52 +00:00
Tim Jentz
e16cb2b4cc SMACK-354 Provide milliseconds in timestamp colum debugwindow 
Applied the smack-354-debug_milliseconds.patch

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12914 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-12-16 13:39:24 +00:00
rcollier
197548b548 SMACK-346 Return correct error code on file transfer refusal 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12860 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-10-09 01:58:56 +00:00
rcollier
55f4eb68be SMACK-349 The correct byte size is now calculated for outgoing ibb streams, taking into account the base64 encoding. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12859 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-10-09 01:38:09 +00:00
rcollier
3b47f94b35 SMACK-263 Applied patch for setting file info for transfer 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12854 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-10-08 03:48:29 +00:00
rcollier
c96be693dc Moved utility class to the core, since it is not extension related and useful for all code. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12598 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-09-21 23:57:34 +00:00
rcollier
3f89df061d Merged the 3.2 branch back into trunk. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12588 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-09-09 01:26:22 +00:00
rcollier
fdd60122d3 SMACK-348 Updated broken links. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12580 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-08-18 03:44:41 +00:00
rcollier
eda09cb3ca SMACK-324 Applied recommended patch to remove improper stanza construction. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12579 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-08-18 03:28:05 +00:00
rcollier
98d03d2d75 Just cleaning up an import used in the javadoc. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12575 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-08-15 01:28:15 +00:00
rcollier
50bf29b122 Updates for Release of 3.2.1 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12557 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-07-04 19:51:43 +00:00
Wolf Posdorfer
87ccd0b1c2 clear all rows button now clears all rows 
patch by lemon

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12548 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-06-29 07:58:13 +00:00
rcollier
402b430291 SMACK-230 Added synchronization since disconnect can be called from multiple threads. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12540 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-06-23 19:55:10 +00:00
rcollier
da5434505b SMACK-129 - Added a property in smack-config file for the default packet collector size and set it much lower than the previous default. Also made the max size for packet collectors configurable from the constructor. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12509 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-06-18 18:18:03 +00:00
Wolf Posdorfer
0c88e19d3b SMACK-273 
if RoomListenerMultiplexor is null also return a new one for this connection

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12441 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-06-01 07:41:17 +00:00
Wolf Posdorfer
a71d8960e8 SMACK-329 
changed <br>-Tag to xhtml compliant <br/>-tag

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12440 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-06-01 07:39:05 +00:00
Wolf Posdorfer
5e8f1c029b adding Generics to Iterators without 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12431 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-05-30 11:31:02 +00:00
Holger Bergunde
a12167ebfc SMACK-338 this should use IBB as fallback protocol if available 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12409 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-05-23 14:11:35 +00:00
Holger Bergunde
3558b1bbcb SMACK-324 removed non base64 char from SASL response packet. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12372 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-05-12 07:32:46 +00:00
rcollier
84c43c4fdd Updated all version info for 3.2 release. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12329 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-05-04 23:41:24 +00:00
rcollier
acd98830b7 Fixed import linked in javadoc 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12306 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-04-29 11:41:12 +00:00
rcollier
1df6aaadf3 SMACK-330 Added missing node attribute in the item element for pubsub. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12303 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-04-29 02:36:16 +00:00
Holger Bergunde
f90b43a87c SMACK-325 patched the diff to ReconnectionManager manually. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12219 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-31 06:35:59 +00:00
rcollier
750cfa64b0 Fixed bug with setting the form value in ConfigureForm.setChildrenAssociationPolicy. It was trying to set a single string value instead of a list. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12213 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-30 02:34:21 +00:00
rcollier
2c55c2ac65 SMACK-334 FileTransferNegotiator now passes the correct type in the stream-method variable. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12212 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-30 00:43:35 +00:00
rcollier
8a8b8ccd79 SMACK-163 Fixed NPE in accessing form field information. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12200 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-29 00:44:38 +00:00
rcollier
0ec7e23666 Updated some javadoc that caused confusion as to the login() behaviour. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12194 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-28 13:13:41 +00:00
Wolf Posdorfer
01a1fb7751 added Button to clear "All Packets" Tab 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12152 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-21 15:08:48 +00:00
rcollier
2150d07435 Merged the 3.2 Beta branch into trunk. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12107 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-14 01:53:42 +00:00
Holger Bergunde
6494edb15a SMACK-317 setOrder() from PrivacyItem is now public. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12100 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-11 11:16:05 +00:00
Holger Bergunde
4ada4978d8 SMACK-312 Fire roster listener also when the group name changed 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12087 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-10 11:30:53 +00:00
Holger Bergunde
5a544a50e3 SMACK-332 Debugger shows the "right" version: Currently: 3.2.0 Beta 2 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12086 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-10 11:24:51 +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
Henning Staib
e3962d15ae only fire roster listener if entry changed (SMACK-312) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11827 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-08-15 16:37:51 +00:00
Henning Staib
a5693609b2 add the ability to register for roster events before logging in (SMACK-156) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11826 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-08-15 16:32:09 +00:00
Henning Staib
7a3818783b add support for localized Message subjects (fixes SMACK-310) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11825 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-08-15 15:45:57 +00:00
Henning Staib
cb5310c984 improve Message parser robustness and I18N for Message bodies (fixes SMACK-207 and SMACK-307) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11824 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-08-15 15:13:05 +00:00
Henning Staib
7e01c66374 improved Delay Information Parser (fixes SMACK-243) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11823 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-08-15 13:20:48 +00:00
Henning Staib
8b54f34153 merged branch improve_bytestreams in trunk 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11821 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-08-15 11:57:11 +00:00
rcollier
ef74695a1b Issue SMACK-308: Fixed multiple bugs in XML generation. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11678 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-04-14 18:24:12 +00:00
Günther Niess
31cd0ab088 SMACK-305: fixed roster reload 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11670 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-03-24 20:31:06 +00:00
Günther Niess
446a601b73 SMACK-304: Extend the IQ API to create IQ responses 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11669 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-03-24 19:44:02 +00:00
guus
bcc1c55894 Adding support for XEP-0224: Attention (SMACK-296) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11655 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-25 08:09:12 +00:00
Günther Niess
5f50f087ac SMACK-295: Fire reconnectionSuccessful event when session is established 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11652 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-24 00:45:40 +00:00
Günther Niess
5cb76891ba small fix (SMACK-294) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11644 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-18 15:37:16 +00:00
Günther Niess
379b119d12 SMACK-294: Improve handling for empty groups 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11643 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-18 14:33:45 +00:00
Günther Niess
a441d856f8 SMACK-293: Support optional roster subscription attribute 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11642 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-18 14:24:52 +00:00
Günther Niess
0d9c25d475 SMACK-291: RosterGroup modifications should depend on roster push 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11634 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-16 09:10:51 +00:00
Günther Niess
691c433b3a SMACK-290: Fix deadlock while initializing roster 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11620 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-11 14:26:28 +00:00
Günther Niess
539f652443 SMACK-282: Support SASL-related error conditions 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11616 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-09 12:40:11 +00:00
Günther Niess
e3efee2e8f SMACK-280: The SASL mechanisms work transparent with packet listeners 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11615 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-09 12:24:24 +00:00
Günther Niess
ad65a76e77 SMACK-281: Move more packet parsing code to PacketParserUtils 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11614 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-09 12:11:39 +00:00
Günther Niess
127319a821 SMACK-279: The XMPPConnection extends the new abstract Connection class 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11613 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-09 11:55:56 +00:00
rcollier
11a41e79ca SMACK-289 Added functionality for retrieving items when the user has multiple subscriptions 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11579 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-01-30 00:04:39 +00:00
rcollier
e600fb02f5 SMACK-288 - Parser is now advanced correctly to the end tag when parsing multiple items. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11574 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-01-29 13:50:23 +00:00
guus
8101b21c71 Added a bit of javadoc, explaining when the event is (not) fired. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11519 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-01-12 11:28:01 +00:00
guus
4218c197f7 Do not fall back to bare JIDs if no threadIDs are available - use the JID as specified in the stanza instead. (SMACK-269). 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11517 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-01-11 23:32:21 +00:00
guus
ce323cb128 Javadoc readability. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11467 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-12-31 22:21:55 +00:00
guus
7c33609adf Fixed spelling. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11456 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-12-09 20:29:48 +00:00
guus
97d2b5a0f2 Improved documentation a little. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11455 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-12-09 20:28:53 +00:00
guus
a86f45a4e6 Adds packetextension for nicknames (SMACK-285) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11454 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-12-09 19:59:52 +00:00
Michael Will
06805b248d add generics 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11422 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-11-26 14:11:19 +00:00
Michael Will
0b7421eae3 implement a simple macro parser 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11418 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-11-25 16:51:29 +00:00
rcollier
f89e762f02 Convenience class for doing synchronous calls to the server 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11351 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-10-28 22:55:57 +00:00
rcollier
8dd8ec02a5 SMACK-272 Add support for XEP-0060 (pubsub) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11350 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-10-28 22:54:49 +00:00
rcollier
c00e7e333d Support for parsing embedded extensions from the server 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11349 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-10-28 22:46:47 +00:00
rcollier
7d50098c1c git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11348 b35dd754-fafc-0310-a699-88a17e54d16e 2009-10-28 22:44:38 +00:00
rcollier
46cebe5e9e Added support for SHIM headers 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11347 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-10-28 22:41:14 +00:00
rcollier
f7a1c750ad SMACK-272 Add support for XEP-0060 (pubsub) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11346 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-10-28 22:38:40 +00:00
Günther Niess
08d7645f2c SMACK-264: Fix typo 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11258 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-09-09 12:02:09 +00:00
Günther Niess
fd8b232017 SMACK-264: Fix SASL Anonymous for updated API. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11257 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-09-09 11:26:44 +00:00
Günther Niess
8dcc226bb5 SMACK-264 Fix NPE in SASLMechanism 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11256 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-09-09 11:10:34 +00:00
Günther Niess
87b3f805c7 SMACK-271: Fix deadlock in XMPPConnection while login and parsing stream features (for Tigase servers) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11227 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-08-29 18:48:56 +00:00
Michael Will
37a00e98d1 make finalize method protected 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11025 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-06-04 13:09:25 +00:00
Michael Will
1edc69780b more work on generic 
add ' quoting
fix IntegerInstantiation is more memory friendly

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11024 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-06-04 11:58:25 +00:00
Michael Will
634afb2cad add pmd for codecheck 
add generic to the smackx bookmark

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11023 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-06-04 09:56:20 +00:00
Jay Kline
0014cff963 Callback handler was not getting set properly 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11018 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-05-27 16:51:39 +00:00
Jeff Williams
fdca9b339d Fix Smack-225 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10961 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-02-24 00:24:06 +00:00
Matt Tucker
ac2c9b09dc A packet reply timeout can be set which applies to all methods (from Sid). 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10950 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-12-29 18:35:35 +00:00
Matt Tucker
afe2b9b584 Timeout should only apply to remote commands. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10947 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-12-16 23:00:45 +00:00
Matt Tucker
1bdacfb65e Added method so that timeout can be specified when executing ad-hoc command. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10946 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-12-16 22:33:57 +00:00
Matt Tucker
41733effe9 Updated handling of offline presence. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10916 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-11-21 04:54:59 +00:00
Matt Tucker
b499581c7e Adding handling of error presence packets (SMACK-260). 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10907 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-11-19 20:54:05 +00:00
Matt Tucker
e6f29ee641 Added ability to register a local command using a factory. Improved ad-hoc command tests. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10905 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-11-18 23:12:10 +00:00
Matt Tucker
0540d2e38a Cleanup. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10881 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-11-13 21:53:18 +00:00
Matt Tucker
18d38845e9 Javadoc cleanup. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10879 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-11-13 18:34:03 +00:00
Matt Tucker
8cd6f3ef1a Javadoc formatting. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10876 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-11-13 18:31:37 +00:00
Matt Tucker
5e559d0ee2 Code cleanup. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10875 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-11-13 18:30:49 +00:00
Matt Tucker
334838d28e HTML and comment cleanup. Small API refactors. Moved use of StringBuffer to StringBuilder. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10865 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-11-03 16:28:57 +00:00
Matt Tucker
b7e2c5b108 Fixed Javadoc warnings. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10858 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-10-31 04:04:15 +00:00
Gaston Dombiak
1a3fb47b5f Fixed parsing of SUCCESS during SASL. SMACK-258 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10856 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-10-31 03:51:12 +00:00
Jeff Williams
4a917320aa Added a first version of Personal Event Publishing. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10853 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-10-30 21:29:17 +00:00
Matt Tucker
d42b40496d Formatting fixes. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10848 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-10-24 05:30:21 +00:00
Matt Tucker
181e5649fc Make the reaper thread a daemon thread; only start it when at least one session is created. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10847 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-10-24 05:22:26 +00:00
Gaston Dombiak
2da448d2fd Simplified list of #login methods in XMPPConnection. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10846 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-10-24 05:17:50 +00:00
Matt Tucker
73a302aef1 Formatting, Javadoc and other minor fixes. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10845 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-10-24 04:49:05 +00:00
Gaston Dombiak
2c93fc9e70 Use XMPP domain (and not hostname) for SASL. Confirm with Jay that we are not breaking other SASL mechanisms (DIGEST-MD5 works now) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10844 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-10-24 03:54:21 +00:00
Matt Tucker
c6d72f8b01 Formatting, Javadoc and other minor fixes. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10843 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-10-24 03:51:21 +00:00
Gaston Dombiak
f94cd2a0d0 Reverted last change about reconnection. To force a reconnection just use XMPPConnection#connect() 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10841 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-10-24 02:12:39 +00:00