Updated for Wildfire 3.1.0 beta 2.

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

build/build.xml

@@ -64,7 +64,7 @@
     <property name="version.major" value="3"/>
     <property name="version.minor" value="1"/>
     <property name="version.revision" value="0"/>
-    <property name="version.extra" value=""/> <!-- For 'beta' or 'alpha' -->
+    <property name="version.extra" value="beta2"/> <!-- For 'beta' or 'alpha' -->
     <property name="dist.prefix" value="wildfire"/>
 
     <property file="${basedir}/build/build.properties"/>

documentation/dist/changelog.html

@@ -163,6 +163,34 @@ hr {
 
 
 
+<h2>3.1.0 Beta 2 -- <span style="font-weight: normal;">September 18, 2006</span></h2>
+
+<h3>Wildfire New Features</h3>
+<ul>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-820'>JM-820</a>] - Added support for presence event listeners.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-824'>JM-824</a>] - Added #getComponents() to InternalComponentManager.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-827'>JM-827</a>] - Upgraded to hsqldb 1.8.0.5.</li>
+</ul>
+
+<h3>Wildfire Bug Fixes</h3>
+<ul>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-818'>JM-818</a>] - Change in DB upgrade code broke plugin upgrades.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-819'>JM-819</a>] - Upgrades for non-Wildfire schemas was checking against wrong version.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-822'>JM-822</a>] - Users from LDAP now have correct creation date.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-826'>JM-826</a>] - MUC disco name was being hardcoded.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-828'>JM-828</a>] - Rooms was allowing owners, admins and outcasts to be duplicated.</li>
+</ul>
+
+<h3>Wildfire Enterprise</h3>
+<ul>
+    <li>No changes</li>
+</ul>
+
+<h3>Wildfire Connection Manager Module</h3>
+<ul>
+    <li>No changes</li>
+</ul>
+
 <h2>3.1.0 Beta -- <span style="font-weight: normal;">September 1, 2006</span></h2>
 
 <h3>Wildfire New Features</h3>

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

@@ -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, -1);
+        version = new Version(3, 1, 0, Version.ReleaseStatus.Beta, 2);
         if ("true".equals(JiveGlobals.getXMLProperty("setup"))) {
             setupMode = false;
         }