Merge branch '4.1'

Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/PacketCollector.java
	smack-core/src/main/java/org/jivesoftware/smack/PacketListener.java
	smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/debugger/SmackDebugger.java
	smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java
	smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java
	smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.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/main/java/org/jivesoftware/smackx/pubsub/packet/PubSub.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/VCardManager.java
	smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
	smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java
	smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java
	smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleProvider.java
	smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java
	smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
	smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
	version.gradle

smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java

@@ -37,7 +37,7 @@ import org.jxmpp.stringprep.XmppStringprepException;
  * unit tests.
  * 
  * Instances store any packets that are delivered to be send using the
- * {@link #sendPacket(Stanza)} method in a blocking queue. The content of this queue
+ * {@link #sendStanza(Stanza)} method in a blocking queue. The content of this queue
  * can be inspected using {@link #getSentPacket()}. Typically these queues are
  * used to retrieve a message that was generated by the client.
  * 
@@ -141,7 +141,7 @@ public class DummyConnection extends AbstractXMPPConnection {
     }
 
     @Override
-    protected void sendPacketInternal(Stanza packet) {
+    protected void sendStanzaInternal(Stanza packet) {
         if (SmackConfiguration.DEBUG) {
             System.out.println("[SEND]: " + packet.toXML());
         }
@@ -149,7 +149,7 @@ public class DummyConnection extends AbstractXMPPConnection {
     }
 
     /**
-     * Returns the number of packets that's sent through {@link #sendPacket(Stanza)} and
+     * Returns the number of packets that's sent through {@link #sendStanza(Stanza)} and
      * that has not been returned by {@link #getSentPacket()}.
      * 
      * @return the number of packets which are in the queue.
@@ -159,7 +159,7 @@ public class DummyConnection extends AbstractXMPPConnection {
     }
 
     /**
-     * Returns the first packet that's sent through {@link #sendPacket(Stanza)}
+     * Returns the first packet that's sent through {@link #sendStanza(Stanza)}
      * and that has not been returned by earlier calls to this method.
      * 
      * @return a sent packet.
@@ -169,7 +169,7 @@ public class DummyConnection extends AbstractXMPPConnection {
     }
 
     /**
-     * Returns the first packet that's sent through {@link #sendPacket(Stanza)}
+     * Returns the first packet that's sent through {@link #sendStanza(Stanza)}
      * and that has not been returned by earlier calls to this method. This
      * method will block for up to the specified number of seconds if no packets
      * have been sent yet.

smack-core/src/test/java/org/jivesoftware/smack/PacketCollectorTest.java

@@ -19,7 +19,7 @@ package org.jivesoftware.smack;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-import org.jivesoftware.smack.filter.PacketFilter;
+import org.jivesoftware.smack.filter.StanzaFilter;
 import org.jivesoftware.smack.packet.Stanza;
 import org.junit.Test;
 
@@ -176,7 +176,7 @@ public class PacketCollectorTest
 		assertNull(collector.pollResult());
 	}
 
-	class OKEverything implements PacketFilter
+	class OKEverything implements StanzaFilter
 	{
 		@Override
 		public boolean accept(Stanza packet)
@@ -188,9 +188,9 @@ public class PacketCollectorTest
 	
 	class TestPacketCollector extends PacketCollector 
 	{
-		protected TestPacketCollector(XMPPConnection conection, PacketFilter packetFilter, int size)
+		protected TestPacketCollector(XMPPConnection conection, StanzaFilter packetFilter, int size)
 		{
-			super(conection, PacketCollector.newConfiguration().setPacketFilter(packetFilter).setSize(size));
+			super(conection, PacketCollector.newConfiguration().setStanzaFilter(packetFilter).setSize(size));
 		}
 	}
 

smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java

@@ -38,8 +38,8 @@ public class ThreadedDummyConnection extends DummyConnection {
     private volatile boolean timeout = false;
 
     @Override
-    public void sendPacket(Stanza packet) throws NotConnectedException, InterruptedException {
-        super.sendPacket(packet);
+    public void sendStanza(Stanza packet) throws NotConnectedException, InterruptedException {
+        super.sendStanza(packet);
 
         if (packet instanceof IQ && !timeout) {
             timeout = false;
@@ -62,7 +62,7 @@ public class ThreadedDummyConnection extends DummyConnection {
     }
 
     /**
-     * Calling this method will cause the next sendPacket call with an IQ packet to timeout.
+     * Calling this method will cause the next sendStanza call with an IQ packet to timeout.
      * This is accomplished by simply stopping the auto creating of the reply packet 
      * or processing one that was entered via {@link #processPacket(Stanza)}.
      */

smack-core/src/test/java/org/jivesoftware/smack/filters/FilterToStringTest.java

@@ -0,0 +1,42 @@
+/**
+ *
+ * Copyright 2015 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack.filters;
+
+import static org.junit.Assert.assertEquals;
+
+import org.jivesoftware.smack.filter.AndFilter;
+import org.jivesoftware.smack.filter.MessageWithBodiesFilter;
+import org.jivesoftware.smack.filter.StanzaIdFilter;
+import org.jivesoftware.smack.filter.ThreadFilter;
+import org.junit.Test;
+
+/**
+ * 
+ */
+public class FilterToStringTest {
+
+    @Test
+    public void abstractListFilterToStringTest() {
+        AndFilter andFilter = new AndFilter();
+        andFilter.addFilter(new StanzaIdFilter("foo"));
+        andFilter.addFilter(new ThreadFilter("42"));
+        andFilter.addFilter(MessageWithBodiesFilter.INSTANCE);
+
+        final String res =andFilter.toString();
+        assertEquals("AndFilter: (StanzaIdFilter: id=foo, ThreadFilter: thread=42, MessageWithBodiesFilter)", res);
+    }
+}

smack-core/src/test/java/org/jivesoftware/smack/packet/StreamErrorTest.java

@@ -99,7 +99,7 @@ public class StreamErrorTest {
         assertNotNull(error);
         assertEquals(Condition.conflict, error.getCondition());
         assertEquals("Replaced by new connection", error.getDescriptiveText());
-        PacketExtension appSpecificElement = error.getExtension("appSpecificElement", "myns");
+        ExtensionElement appSpecificElement = error.getExtension("appSpecificElement", "myns");
         assertNotNull(appSpecificElement);
     }
 

smack-core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java

@@ -20,8 +20,8 @@ import static org.junit.Assert.assertThat;
 import static org.jivesoftware.smack.test.util.CharsequenceEquals.equalsCharSequence;
 
 import org.jivesoftware.smack.SmackException;
-import org.jivesoftware.smack.packet.PacketExtension;
-import org.jivesoftware.smack.provider.PacketExtensionProvider;
+import org.jivesoftware.smack.packet.ExtensionElement;
+import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.provider.ProviderManager;
 import org.jivesoftware.smack.test.util.TestUtils;
 import org.jivesoftware.smack.util.PacketParserUtils;
@@ -72,12 +72,12 @@ public class ParsingExceptionTest {
         assertThat(MESSAGE_EXCEPTION_ELEMENT + EXTENSION2 + "</message>", equalsCharSequence(content));
     }
 
-    static class ThrowException extends PacketExtensionProvider<PacketExtension> {
+    static class ThrowException extends ExtensionElementProvider<ExtensionElement> {
         public static final String ELEMENT = "exception";
         public static final String NAMESPACE = "http://smack.jivesoftware.org/exception";
 
         @Override
-        public PacketExtension parse(XmlPullParser parser, int initialDepth) throws SmackException {
+        public ExtensionElement parse(XmlPullParser parser, int initialDepth) throws SmackException {
             throw new SmackException("Test Exception");
         }
 

smack-core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java

@@ -20,7 +20,10 @@ import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
 
+import org.jivesoftware.smack.SmackException;
+import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.util.ParserUtils;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -40,6 +43,10 @@ final public class TestUtils {
         return getParser(stanza, "presence");
     }
 
+    public static XmlPullParser getParser(String string) {
+        return getParser(string, null);
+    }
+
     public static XmlPullParser getParser(String string, String startTag) {
         return getParser(new StringReader(string), startTag);
     }
@@ -49,6 +56,9 @@ final public class TestUtils {
         try {
             parser = PacketParserUtils.newXmppParser(reader);
             if (startTag == null) {
+                while (parser.getEventType() != XmlPullParser.START_TAG) {
+                    parser.next();
+                }
                 return parser;
             }
             boolean found = false;
@@ -68,4 +78,17 @@ final public class TestUtils {
         return parser;
     }
 
+    public static <EE extends ExtensionElement> EE parseExtensionElement(String elementString)
+                    throws XmlPullParserException, IOException, SmackException {
+        return parseExtensionElement(getParser(elementString));
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <EE extends ExtensionElement> EE parseExtensionElement(XmlPullParser parser)
+                    throws XmlPullParserException, IOException, SmackException {
+        ParserUtils.assertAtStartTag(parser);
+        final String elementName = parser.getName();
+        final String namespace = parser.getNamespace();
+        return (EE) PacketParserUtils.parseExtensionElement(elementName, namespace, parser);
+    }
 }

smack-core/src/test/java/org/jivesoftware/smack/test/util/WaitForPacketListener.java

@@ -19,11 +19,11 @@ package org.jivesoftware.smack.test.util;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.jivesoftware.smack.PacketListener;
+import org.jivesoftware.smack.StanzaListener;
 import org.jivesoftware.smack.SmackException.NotConnectedException;
 import org.jivesoftware.smack.packet.Stanza;
 
-public class WaitForPacketListener implements PacketListener {
+public class WaitForPacketListener implements StanzaListener {
 
     private CountDownLatch latch = new CountDownLatch(1);