Updated for 3.1.1.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@5857 b35dd754-fafc-0310-a699-88a17e54d16e

documentation/dist/changelog.html

@@ -163,6 +163,40 @@ hr {
 
 
 
+<h2>3.1.1 -- <span style="font-weight: normal;">October 26, 2006</span></h2>
+
+<h3>Wildfire New Features</h3>
+<ul>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-870'>JM-870</a>] - Added support for testing administrator accounts during LDAP setup.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-875'>JM-875</a>] - Added support for testing user mapping settings during LDAP setup.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-876'>JM-876</a>] - Added support for testing group mapping settings during LDAP setup.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-877'>JM-877</a>] - Added support for changing existing LDAP settings from admin console.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-722'>JM-722</a>] - Added alternate base DN support for user data. <b>(3 votes)</b></li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-595'>JM-595</a>] - Admin console now shows last time a user logged out from the server. <b>(5 votes)</b></li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-866'>JM-866</a>] - Increased max size of LDAP filters to 250 characters.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-864'>JM-864</a>] - Updated LDAP guide with new setup procedure.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-871'>JM-871</a>] - Updated Java mail library to latest version.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-879'>JM-879</a>] - Streamlined build process.</li>
+</ul>
+
+<h3>Wildfire Bug Fixes</h3>
+<ul>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-859'>JM-859</a>] - Conflict policy is now applied after successful login when using iq:auth.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-878'>JM-878</a>] - Some settings were not being saved when configuring LDAP from the admin console.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-880'>JM-880</a>] - Logging into the admin console could not work after initial setup when using LDAP.</li>
+</ul>
+
+<h3>Wildfire Enterprise</h3>
+<ul>
+    <li>No changes</li>
+</ul>
+
+<h3>Wildfire Connection Manager Module</h3>
+<ul>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-867'>JM-867</a>] - Socket connections were closed under high load.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-881'>JM-881</a>] - Fixed NPE when closing connection manager session.</li>
+</ul>
+
 <h2>3.1.0 -- <span style="font-weight: normal;">October 9, 2006</span></h2>
 
 <h3>Wildfire New Features</h3>

src/java/org/jivesoftware/wildfire/XMPPServer.java

@@ -29,9 +29,9 @@ import org.jivesoftware.wildfire.disco.IQDiscoInfoHandler;
 import org.jivesoftware.wildfire.disco.IQDiscoItemsHandler;
 import org.jivesoftware.wildfire.disco.ServerFeaturesProvider;
 import org.jivesoftware.wildfire.disco.ServerItemsProvider;
-import org.jivesoftware.wildfire.filetransfer.proxy.FileTransferProxy;
-import org.jivesoftware.wildfire.filetransfer.FileTransferManager;
 import org.jivesoftware.wildfire.filetransfer.DefaultFileTransferManager;
+import org.jivesoftware.wildfire.filetransfer.FileTransferManager;
+import org.jivesoftware.wildfire.filetransfer.proxy.FileTransferProxy;
 import org.jivesoftware.wildfire.handler.*;
 import org.jivesoftware.wildfire.muc.MultiUserChatServer;
 import org.jivesoftware.wildfire.muc.spi.MultiUserChatServerImpl;
@@ -286,7 +286,7 @@ public class XMPPServer {
 
         name = JiveGlobals.getProperty("xmpp.domain", "127.0.0.1").toLowerCase();
 
-        version = new Version(3, 1, 0, Version.ReleaseStatus.Release, 0);
+        version = new Version(3, 1, 1, Version.ReleaseStatus.Release, 0);
         if ("true".equals(JiveGlobals.getXMLProperty("setup"))) {
             setupMode = false;
         }