From e87daff68f1d2c0d70288ad74cf57bd29b85ffec Mon Sep 17 00:00:00 2001 From: rcollier Date: Mon, 7 Oct 2013 02:42:12 +0000 Subject: [PATCH] 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 --- build/build.xml | 2 +- build/eclipse/project | 2 +- build/resources/releasedocs/changelog.html | 27 +++++++++++++++++ .../smack/SmackConfiguration.java | 2 +- .../smackx/pubsub/TestEvents.java | 30 ++++++++----------- 5 files changed, 43 insertions(+), 20 deletions(-) diff --git a/build/build.xml b/build/build.xml index 1737c4b54..a93e74c18 100644 --- a/build/build.xml +++ b/build/build.xml @@ -27,7 +27,7 @@ - + diff --git a/build/eclipse/project b/build/eclipse/project index 5e4acff02..3b685ff03 100644 --- a/build/eclipse/project +++ b/build/eclipse/project @@ -1,6 +1,6 @@ - smack-flow + smack-3.3.x diff --git a/build/resources/releasedocs/changelog.html b/build/resources/releasedocs/changelog.html index c4f969394..8540a94dd 100644 --- a/build/resources/releasedocs/changelog.html +++ b/build/resources/releasedocs/changelog.html @@ -141,6 +141,33 @@ hr {
+

3.3.1 -- Oct 6, 2013

+ +

Bug Fixes

+
    +
  • [SMACK-428] - RosterEntry overrides equals, but not hashcode.
    • +
  • [SMACK-438] - Possible NPE in MultiUserChat.InvitationsMonitor.getInvitationsMonitor()
    • +
  • [SMACK-441] - Memory leak in KeepAliveManager
    • +
  • [SMACK-447] - Compression is not enabled for Java7ZlibInputOutputStream
    • +
  • [SMACK-448] - Java7ZlibInputOutputStream does not work. Deflater.DEFAULT_STRATEGY is used as compression level when it should use Deflater.DEFAULT_COMPRESSION
    • +
  • [SMACK-450] - VCard.load() throws null pointer exception if there is no VCard for the user
    • +
  • [SMACK-455] - Multiple items doesn`t not parse correctly in a pubsub message
    • +
+ +

New Feature

+
    +
  • [SMACK-425] - Collect (parser) Exceptions and unparseable stanzas. Provide a callback method so that the user is notified about them if he wants to
    • +
+ +

Improvement

+
    +
  • [SMACK-369] - Exceptions during login should get thrown back up to the caller.
    • +
  • [SMACK-439] - Improve documentation for MultiUserChat.InvitationsListener
    • +
  • [SMACK-451] - PingManager entry in META-INF/smack.providers is within Ad-Hoc Command section
    • +
  • [SMACK-431] - Enable Entity Caps as default for new connections and write extensions documentation html page
    • +
  • [SMACK-405] - Cleanup of redundant code in XMPPConnection.shutdown()
    • +
+

3.3.0 -- May 4, 2013

Bug Fixes

diff --git a/source/org/jivesoftware/smack/SmackConfiguration.java b/source/org/jivesoftware/smack/SmackConfiguration.java index f22046e46..02f1d2115 100644 --- a/source/org/jivesoftware/smack/SmackConfiguration.java +++ b/source/org/jivesoftware/smack/SmackConfiguration.java @@ -50,7 +50,7 @@ import org.xmlpull.v1.XmlPullParser; */ public final class SmackConfiguration { - private static final String SMACK_VERSION = "3.3.0"; + private static final String SMACK_VERSION = "3.3.1"; private static int packetReplyTimeout = 5000; private static int keepAliveInterval = 30000; diff --git a/test/org/jivesoftware/smackx/pubsub/TestEvents.java b/test/org/jivesoftware/smackx/pubsub/TestEvents.java index 9e07a93cc..a8db5b6e0 100644 --- a/test/org/jivesoftware/smackx/pubsub/TestEvents.java +++ b/test/org/jivesoftware/smackx/pubsub/TestEvents.java @@ -131,8 +131,6 @@ public class TestEvents extends SmackTestCase LeafNode creatorNode = getPubnode(creatorMgr, nodeId, true, false); BlockingQueue> queue = new ArrayBlockingQueue>(3); - ItemEventCoordinator creatorHandler = new ItemEventCoordinator(queue, "creator"); - creatorNode.addItemEventListener(creatorHandler); // Setup event receiver PubSubManager subMgr = new PubSubManager(getConnection(1), getService()); @@ -146,12 +144,9 @@ public class TestEvents extends SmackTestCase String itemId = String.valueOf(System.currentTimeMillis()); creatorNode.send(new Item(itemId)); - for(int i=0; i<2; i++) - { - ItemEventCoordinator coord = queue.take(); - assertEquals(1, coord.events.getItems().size()); - assertEquals(itemId, coord.events.getItems().iterator().next().getId()); - } + ItemEventCoordinator coord = queue.poll(5, TimeUnit.SECONDS); + assertEquals(1, coord.events.getItems().size()); + assertEquals(itemId, coord.events.getItems().iterator().next().getId()); } public void testPublishAndReceiveNoPayload() throws Exception @@ -175,7 +170,7 @@ public class TestEvents extends SmackTestCase String itemId = String.valueOf(System.currentTimeMillis()); creatorNode.publish(new Item(itemId)); - ItemEventCoordinator coord = queue.take(); + ItemEventCoordinator coord = queue.poll(5, TimeUnit.SECONDS); assertEquals(1, coord.events.getItems().size()); assertEquals(itemId, coord.events.getItems().get(0).getId()); } @@ -202,7 +197,7 @@ public class TestEvents extends SmackTestCase String payloadString = "Sir Arthur Conan Doyle"; creatorNode.send(new PayloadItem(itemId, new SimplePayload("book", "pubsub:test:book", payloadString))); - ItemEventCoordinator> coord = queue.take(); + ItemEventCoordinator> coord = queue.poll(5, TimeUnit.SECONDS); assertEquals(1, coord.events.getItems().size()); PayloadItem item = coord.events.getItems().get(0); assertEquals(itemId, item.getId()); @@ -263,8 +258,6 @@ public class TestEvents extends SmackTestCase LeafNode creatorNode = getPubnode(creatorMgr, nodeId, true, false); BlockingQueue> queue = new ArrayBlockingQueue>(3); - ItemEventCoordinator creatorHandler = new ItemEventCoordinator(queue, "creator"); - creatorNode.addItemEventListener(creatorHandler); // Setup event receiver PubSubManager subMgr = new PubSubManager(getConnection(1), getService()); @@ -282,9 +275,12 @@ public class TestEvents extends SmackTestCase String itemId = String.valueOf(System.currentTimeMillis()); creatorNode.send(new Item(itemId)); - for(int i=0; i<3; i++) + for(int i=0; i<2; i++) { - ItemEventCoordinator coord = queue.take(); + ItemEventCoordinator coord = queue.poll(10, TimeUnit.SECONDS); + + if (coord == null) + fail(); assertEquals(1, coord.events.getItems().size()); assertEquals(itemId, coord.events.getItems().iterator().next().getId()); @@ -377,7 +373,7 @@ public class TestEvents extends SmackTestCase subNode.addItemEventListener(sub1Handler); Subscription sub1 = subNode.subscribe(getConnection(1).getUser()); - ItemEventCoordinator> coord = queue.take(); + ItemEventCoordinator> coord = queue.poll(5, TimeUnit.SECONDS); assertTrue(coord.events.isDelayed()); assertNotNull(coord.events.getPublishedDate()); } @@ -491,7 +487,7 @@ public class TestEvents extends SmackTestCase for (int i=0; i<2; i++) { - ItemEventCoordinator event = queue.take(); + ItemEventCoordinator event = queue.poll(5, TimeUnit.SECONDS); if (event.id.equals("sub1")) { @@ -521,7 +517,7 @@ public class TestEvents extends SmackTestCase } public void handlePublishedItems(ItemPublishEvent items) - { + { events = items; theQueue.add(this); }