Commit efa15d1c authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gato

Updated for 3.2.0 Beta.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@6720 b35dd754-fafc-0310-a699-88a17e54d16e
parent 133fba9d
...@@ -60,8 +60,7 @@ ...@@ -60,8 +60,7 @@
<property name="version.major" value="3"/> <property name="version.major" value="3"/>
<property name="version.minor" value="2"/> <property name="version.minor" value="2"/>
<property name="version.revision" value="0"/> <property name="version.revision" value="0"/>
<property name="version.extra" value=""/> <property name="version.extra" value="beta"/> <!-- For 'beta' or 'alpha' -->
<!-- For 'beta' or 'alpha' -->
<property name="dist.prefix" value="wildfire"/> <property name="dist.prefix" value="wildfire"/>
<property file="${basedir}/build/build.properties"/> <property file="${basedir}/build/build.properties"/>
......
...@@ -19,7 +19,9 @@ import org.jivesoftware.wildfire.audit.AuditManager; ...@@ -19,7 +19,9 @@ import org.jivesoftware.wildfire.audit.AuditManager;
import org.jivesoftware.wildfire.audit.spi.AuditManagerImpl; import org.jivesoftware.wildfire.audit.spi.AuditManagerImpl;
import org.jivesoftware.wildfire.commands.AdHocCommandHandler; import org.jivesoftware.wildfire.commands.AdHocCommandHandler;
import org.jivesoftware.wildfire.component.InternalComponentManager; import org.jivesoftware.wildfire.component.InternalComponentManager;
import org.jivesoftware.wildfire.container.*; import org.jivesoftware.wildfire.container.AdminConsolePlugin;
import org.jivesoftware.wildfire.container.Module;
import org.jivesoftware.wildfire.container.PluginManager;
import org.jivesoftware.wildfire.disco.IQDiscoInfoHandler; import org.jivesoftware.wildfire.disco.IQDiscoInfoHandler;
import org.jivesoftware.wildfire.disco.IQDiscoItemsHandler; import org.jivesoftware.wildfire.disco.IQDiscoItemsHandler;
import org.jivesoftware.wildfire.disco.ServerFeaturesProvider; import org.jivesoftware.wildfire.disco.ServerFeaturesProvider;
...@@ -28,6 +30,7 @@ import org.jivesoftware.wildfire.filetransfer.DefaultFileTransferManager; ...@@ -28,6 +30,7 @@ import org.jivesoftware.wildfire.filetransfer.DefaultFileTransferManager;
import org.jivesoftware.wildfire.filetransfer.FileTransferManager; import org.jivesoftware.wildfire.filetransfer.FileTransferManager;
import org.jivesoftware.wildfire.filetransfer.proxy.FileTransferProxy; import org.jivesoftware.wildfire.filetransfer.proxy.FileTransferProxy;
import org.jivesoftware.wildfire.handler.*; import org.jivesoftware.wildfire.handler.*;
import org.jivesoftware.wildfire.mediaproxy.MediaProxyService;
import org.jivesoftware.wildfire.muc.MultiUserChatServer; import org.jivesoftware.wildfire.muc.MultiUserChatServer;
import org.jivesoftware.wildfire.muc.spi.MultiUserChatServerImpl; import org.jivesoftware.wildfire.muc.spi.MultiUserChatServerImpl;
import org.jivesoftware.wildfire.net.MulticastDNSService; import org.jivesoftware.wildfire.net.MulticastDNSService;
...@@ -36,12 +39,11 @@ import org.jivesoftware.wildfire.net.ServerTrafficCounter; ...@@ -36,12 +39,11 @@ import org.jivesoftware.wildfire.net.ServerTrafficCounter;
import org.jivesoftware.wildfire.pubsub.PubSubModule; import org.jivesoftware.wildfire.pubsub.PubSubModule;
import org.jivesoftware.wildfire.roster.RosterManager; import org.jivesoftware.wildfire.roster.RosterManager;
import org.jivesoftware.wildfire.spi.*; import org.jivesoftware.wildfire.spi.*;
import org.jivesoftware.wildfire.stun.STUNService;
import org.jivesoftware.wildfire.transport.TransportHandler; import org.jivesoftware.wildfire.transport.TransportHandler;
import org.jivesoftware.wildfire.update.UpdateManager; import org.jivesoftware.wildfire.update.UpdateManager;
import org.jivesoftware.wildfire.user.UserManager; import org.jivesoftware.wildfire.user.UserManager;
import org.jivesoftware.wildfire.vcard.VCardManager; import org.jivesoftware.wildfire.vcard.VCardManager;
import org.jivesoftware.wildfire.mediaproxy.MediaProxyService;
import org.jivesoftware.wildfire.stun.STUNService;
import org.xmpp.packet.JID; import org.xmpp.packet.JID;
import java.io.File; import java.io.File;
...@@ -283,7 +285,7 @@ public class XMPPServer { ...@@ -283,7 +285,7 @@ public class XMPPServer {
name = JiveGlobals.getProperty("xmpp.domain", "127.0.0.1").toLowerCase(); name = JiveGlobals.getProperty("xmpp.domain", "127.0.0.1").toLowerCase();
version = new Version(3, 2, 0, Version.ReleaseStatus.Alpha, 0); version = new Version(3, 2, 0, Version.ReleaseStatus.Beta, 0);
if ("true".equals(JiveGlobals.getXMLProperty("setup"))) { if ("true".equals(JiveGlobals.getXMLProperty("setup"))) {
setupMode = false; setupMode = false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment