Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-22 22:32:06 +01:00
Code Issues Releases Wiki Activity

Versioning updates for new release.

Browse source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13761 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
rcollier 2013-10-07 02:42:12 +00:00
parent 3146023dd4
commit e87daff68f
5 changed files with 43 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/build.xml
View file

@ -27,7 +27,7 @@
<!-- Smack Version --> <!-- Smack Version -->
<property name="version.major" value="3" /> <property name="version.major" value="3" />
<property name="version.minor" value="3" /> <property name="version.minor" value="3" />
<property name="version.revision" value="0" /> <property name="version.revision" value="1" />
<property name="version.extra" value="" /> <property name="version.extra" value="" />
<if> <if>

2
build/eclipse/project
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>smack-flow</name> <name>smack-3.3.x</name>
<comment></comment> <comment></comment>
<projects> <projects>
</projects> </projects>

27
build/resources/releasedocs/changelog.html
View file

@ -141,6 +141,33 @@ hr {
<div id="pageBody"> <div id="pageBody">
<h2>3.3.1 -- <span style="font-weight: normal;">Oct 6, 2013</span></h2>
<h2>Bug Fixes</h2>
<ul>
<li>[<a href='http://issues.igniterealtime.org/browse/SMACK-428'>SMACK-428</a>] - RosterEntry overrides equals, but not hashcode.</li>
<li>[<a href='http://issues.igniterealtime.org/browse/SMACK-438'>SMACK-438</a>] - Possible NPE in MultiUserChat.InvitationsMonitor.getInvitationsMonitor()</li>
<li>[<a href='http://issues.igniterealtime.org/browse/SMACK-441'>SMACK-441</a>] - Memory leak in KeepAliveManager</li>
<li>[<a href='http://issues.igniterealtime.org/browse/SMACK-447'>SMACK-447</a>] - Compression is not enabled for Java7ZlibInputOutputStream</li>
<li>[<a href='http://issues.igniterealtime.org/browse/SMACK-448'>SMACK-448</a>] - Java7ZlibInputOutputStream does not work. Deflater.DEFAULT_STRATEGY is used as compression level when it should use Deflater.DEFAULT_COMPRESSION</li>
<li>[<a href='http://issues.igniterealtime.org/browse/SMACK-450'>SMACK-450</a>] - VCard.load() throws null pointer exception if there is no VCard for the user</li>
<li>[<a href='http://issues.igniterealtime.org/browse/SMACK-455'>SMACK-455</a>] - Multiple items doesn`t not parse correctly in a pubsub message</li>
</ul>
<h2>New Feature</h2>
<ul>
<li>[<a href='http://issues.igniterealtime.org/browse/SMACK-425'>SMACK-425</a>] - Collect (parser) Exceptions and unparseable stanzas. Provide a callback method so that the user is notified about them if he wants to</li>
</ul>
<h2>Improvement</h2>
<ul>
<li>[<a href='http://issues.igniterealtime.org/browse/SMACK-369'>SMACK-369</a>] - Exceptions during login should get thrown back up to the caller.</li>
<li>[<a href='http://issues.igniterealtime.org/browse/SMACK-439'>SMACK-439</a>] - Improve documentation for MultiUserChat.InvitationsListener</li>
<li>[<a href='http://issues.igniterealtime.org/browse/SMACK-451'>SMACK-451</a>] - PingManager entry in META-INF/smack.providers is within Ad-Hoc Command section</li>
<li>[<a href='http://issues.igniterealtime.org/browse/SMACK-431'>SMACK-431</a>] - Enable Entity Caps as default for new connections and write extensions documentation html page</li>
<li>[<a href='http://issues.igniterealtime.org/browse/SMACK-405'>SMACK-405</a>] - Cleanup of redundant code in XMPPConnection.shutdown()</li>
</ul>
<h2>3.3.0 -- <span style="font-weight: normal;">May 4, 2013</span></h2> <h2>3.3.0 -- <span style="font-weight: normal;">May 4, 2013</span></h2>
<h2>Bug Fixes</h2> <h2>Bug Fixes</h2>

2
source/org/jivesoftware/smack/SmackConfiguration.java
View file

@ -50,7 +50,7 @@ import org.xmlpull.v1.XmlPullParser;
*/ */
public final class SmackConfiguration { 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 packetReplyTimeout = 5000;
private static int keepAliveInterval = 30000; private static int keepAliveInterval = 30000;

24
test/org/jivesoftware/smackx/pubsub/TestEvents.java
View file

@ -131,8 +131,6 @@ public class TestEvents extends SmackTestCase
LeafNode creatorNode = getPubnode(creatorMgr, nodeId, true, false); LeafNode creatorNode = getPubnode(creatorMgr, nodeId, true, false);
BlockingQueue<ItemEventCoordinator<Item>> queue = new ArrayBlockingQueue<ItemEventCoordinator<Item>>(3); BlockingQueue<ItemEventCoordinator<Item>> queue = new ArrayBlockingQueue<ItemEventCoordinator<Item>>(3);
ItemEventCoordinator<Item> creatorHandler = new ItemEventCoordinator<Item>(queue, "creator");
creatorNode.addItemEventListener(creatorHandler);
// Setup event receiver // Setup event receiver
PubSubManager subMgr = new PubSubManager(getConnection(1), getService()); PubSubManager subMgr = new PubSubManager(getConnection(1), getService());
@ -146,13 +144,10 @@ public class TestEvents extends SmackTestCase
String itemId = String.valueOf(System.currentTimeMillis()); String itemId = String.valueOf(System.currentTimeMillis());
creatorNode.send(new Item(itemId)); creatorNode.send(new Item(itemId));
for(int i=0; i<2; i++) ItemEventCoordinator<Item> coord = queue.poll(5, TimeUnit.SECONDS);
{
ItemEventCoordinator<Item> coord = queue.take();
assertEquals(1, coord.events.getItems().size()); assertEquals(1, coord.events.getItems().size());
assertEquals(itemId, coord.events.getItems().iterator().next().getId()); assertEquals(itemId, coord.events.getItems().iterator().next().getId());
} }
}
public void testPublishAndReceiveNoPayload() throws Exception public void testPublishAndReceiveNoPayload() throws Exception
{ {
@ -175,7 +170,7 @@ public class TestEvents extends SmackTestCase
String itemId = String.valueOf(System.currentTimeMillis()); String itemId = String.valueOf(System.currentTimeMillis());
creatorNode.publish(new Item(itemId)); creatorNode.publish(new Item(itemId));
ItemEventCoordinator<Item> coord = queue.take(); ItemEventCoordinator<Item> coord = queue.poll(5, TimeUnit.SECONDS);
assertEquals(1, coord.events.getItems().size()); assertEquals(1, coord.events.getItems().size());
assertEquals(itemId, coord.events.getItems().get(0).getId()); assertEquals(itemId, coord.events.getItems().get(0).getId());
} }
@ -202,7 +197,7 @@ public class TestEvents extends SmackTestCase
String payloadString = "<book xmlns=\"pubsub:test:book\"><author>Sir Arthur Conan Doyle</author></book>"; String payloadString = "<book xmlns=\"pubsub:test:book\"><author>Sir Arthur Conan Doyle</author></book>";
creatorNode.send(new PayloadItem<SimplePayload>(itemId, new SimplePayload("book", "pubsub:test:book", payloadString))); creatorNode.send(new PayloadItem<SimplePayload>(itemId, new SimplePayload("book", "pubsub:test:book", payloadString)));
ItemEventCoordinator<PayloadItem<SimplePayload>> coord = queue.take(); ItemEventCoordinator<PayloadItem<SimplePayload>> coord = queue.poll(5, TimeUnit.SECONDS);
assertEquals(1, coord.events.getItems().size()); assertEquals(1, coord.events.getItems().size());
PayloadItem<SimplePayload> item = coord.events.getItems().get(0); PayloadItem<SimplePayload> item = coord.events.getItems().get(0);
assertEquals(itemId, item.getId()); assertEquals(itemId, item.getId());
@ -263,8 +258,6 @@ public class TestEvents extends SmackTestCase
LeafNode creatorNode = getPubnode(creatorMgr, nodeId, true, false); LeafNode creatorNode = getPubnode(creatorMgr, nodeId, true, false);
BlockingQueue<ItemEventCoordinator<Item>> queue = new ArrayBlockingQueue<ItemEventCoordinator<Item>>(3); BlockingQueue<ItemEventCoordinator<Item>> queue = new ArrayBlockingQueue<ItemEventCoordinator<Item>>(3);
ItemEventCoordinator<Item> creatorHandler = new ItemEventCoordinator<Item>(queue, "creator");
creatorNode.addItemEventListener(creatorHandler);
// Setup event receiver // Setup event receiver
PubSubManager subMgr = new PubSubManager(getConnection(1), getService()); PubSubManager subMgr = new PubSubManager(getConnection(1), getService());
@ -282,9 +275,12 @@ public class TestEvents extends SmackTestCase
String itemId = String.valueOf(System.currentTimeMillis()); String itemId = String.valueOf(System.currentTimeMillis());
creatorNode.send(new Item(itemId)); creatorNode.send(new Item(itemId));
for(int i=0; i<3; i++) for(int i=0; i<2; i++)
{ {
ItemEventCoordinator<Item> coord = queue.take(); ItemEventCoordinator<Item> coord = queue.poll(10, TimeUnit.SECONDS);
if (coord == null)
fail();
assertEquals(1, coord.events.getItems().size()); assertEquals(1, coord.events.getItems().size());
assertEquals(itemId, coord.events.getItems().iterator().next().getId()); assertEquals(itemId, coord.events.getItems().iterator().next().getId());
@ -377,7 +373,7 @@ public class TestEvents extends SmackTestCase
subNode.addItemEventListener(sub1Handler); subNode.addItemEventListener(sub1Handler);
Subscription sub1 = subNode.subscribe(getConnection(1).getUser()); Subscription sub1 = subNode.subscribe(getConnection(1).getUser());
ItemEventCoordinator<PayloadItem<SimplePayload>> coord = queue.take(); ItemEventCoordinator<PayloadItem<SimplePayload>> coord = queue.poll(5, TimeUnit.SECONDS);
assertTrue(coord.events.isDelayed()); assertTrue(coord.events.isDelayed());
assertNotNull(coord.events.getPublishedDate()); assertNotNull(coord.events.getPublishedDate());
} }
@ -491,7 +487,7 @@ public class TestEvents extends SmackTestCase
for (int i=0; i<2; i++) for (int i=0; i<2; i++)
{ {
ItemEventCoordinator<Item> event = queue.take(); ItemEventCoordinator<Item> event = queue.poll(5, TimeUnit.SECONDS);
if (event.id.equals("sub1")) if (event.id.equals("sub1"))
{ {