Merge branch '4.0'

Conflicts:
	build.gradle

build.gradle

@@ -37,7 +37,7 @@ allprojects {
 				   // For example 4.0.0-rc1 becomes 4.0.0.rc1, but
 				   // 4.0.0-SNAPSHOT-2014-05-01 becomes 4.0.0.SNAPSHOT-2014-05-01
 				   'Bundle-Version': version.replaceFirst("-", "."),
-				   'Built-Date': new Date(),
+				   'Built-Date': getDatestamp(),
 				   'Built-JDK': System.getProperty('java.version'),
 				   'Built-Gradle': gradle.gradleVersion,
 				   'Built-By': System.getProperty('user.name')
@@ -244,3 +244,11 @@ def getGitCommit() {
 	assert !gitCommit.isEmpty()
 	gitCommit
 }
+
+// Returns only the date in yyyy-MM-dd format, as otherwise, with
+// hh:mm:ss information, the manifest files would change with every
+// build, causing unnecessary rebuilds.
+def getDatestamp() {
+	def date = new Date()
+	return date.format('yyyy-MM-dd')
+}

resources/releasedocs/changelog.html

@@ -141,6 +141,42 @@ hr {
 
 	<div id="pageBody">
 
+<h2>4.0.1 -- <span style="font-weight: normal;">2014-07-20</span></h2>
+
+<h2>        Sub-task
+</h2>
+<ul>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-346'>SMACK-346</a>] -         Bug in return code for rejection handling in FileTransferManager
+</li>
+</ul>
+
+<h2>        Bug
+</h2>
+<ul>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-574'>SMACK-574</a>] -         Documentation still refers at some places to Connection
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-575'>SMACK-575</a>] -         PingManager schedules pings after pingInterval when it should be use nextPingIn instead
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-577'>SMACK-577</a>] -         Bookmarks and FormField toXml() methods do not properly escape XML
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-583'>SMACK-583</a>] -         PacketListeners may not be invoked in delivery order
+</li>
+</ul>
+
+<h2>        Improvement
+</h2>
+<ul>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-576'>SMACK-576</a>] -         smack-resolver-javax should become a OSGi ServiceComponent
+</li>
+</ul>
+
+<h2>        New Feature
+</h2>
+<ul>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-580'>SMACK-580</a>] -         Add support for retrieving a PubSub node&#39;s affiliations
+</li>
+</ul>
+
 <h2>4.0.0 -- <span style="font-weight: normal;">2014-06-08</span></h2>
             
 <h2>        Sub-task

smack-core/src/main/java/org/jivesoftware/smack/initializer/SmackAndOsgiInitializer.java

@@ -0,0 +1,28 @@
+/**
+ *
+ * Copyright 2014 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.initializer;
+
+public abstract class SmackAndOsgiInitializer implements SmackInitializer {
+
+    /**
+     * A simple wrapper around {@link #initialize} for OSGi, as the activate method of a component
+     * must have a void return type.
+     */
+    public final void activate() {
+        initialize();
+    }
+}

smack-core/src/main/java/org/jivesoftware/smack/initializer/UrlInitializer.java

@@ -34,17 +34,9 @@ import org.jivesoftware.smack.util.FileUtils;
  * 
  * @author Florian Schmaus
  */
-public abstract class UrlInitializer implements SmackInitializer {
+public abstract class UrlInitializer extends SmackAndOsgiInitializer {
     private static final Logger LOGGER = Logger.getLogger(UrlInitializer.class.getName());
 
-    /**
-     * A simple wrapper around {@link #initialize} for OSGi, as the activate method of a component
-     * must have a void return type.
-     */
-    public final void activate() {
-        initialize();
-    }
-
     @Override
     public List<Exception> initialize() {
         return initialize(this.getClass().getClassLoader());

smack-experimental/src/main/java/org/jivesoftware/smack/initializer/experimental/ExperimentalInitializer.java

@@ -32,6 +32,6 @@ public class ExperimentalInitializer extends UrlInitializer {
 
     @Override
     protected String getConfigUrl() {
-        return "classpath:org.jivesoftware.smackx/extensions.xml";
+        return "classpath:org.jivesoftware.smackx/experimental.xml";
     }
 }

smack-resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/javax/JavaxResolver.java

@@ -28,7 +28,7 @@ import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.InitialDirContext;
 
-import org.jivesoftware.smack.initializer.SmackInitializer;
+import org.jivesoftware.smack.initializer.SmackAndOsgiInitializer;
 import org.jivesoftware.smack.util.DNSUtil;
 import org.jivesoftware.smack.util.dns.DNSResolver;
 import org.jivesoftware.smack.util.dns.SRVRecord;
@@ -39,7 +39,7 @@ import org.jivesoftware.smack.util.dns.SRVRecord;
  * @author Florian Schmaus
  *
  */
-public class JavaxResolver implements DNSResolver, SmackInitializer {
+public class JavaxResolver extends SmackAndOsgiInitializer implements DNSResolver {
     
     private static JavaxResolver instance;
     private static DirContext dirContext;