Updated version, work on allowing setup without restart.

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

src/java/org/jivesoftware/messenger/XMPPServer.java

@@ -27,6 +27,7 @@ import org.jivesoftware.messenger.muc.spi.MultiUserChatServerImpl;
 import org.jivesoftware.messenger.spi.*;
 import org.jivesoftware.messenger.container.Module;
 import org.jivesoftware.messenger.container.PluginManager;
+import org.jivesoftware.messenger.container.AdminConsolePlugin;
 import org.jivesoftware.messenger.net.MulticastDNSService;
 import org.jivesoftware.messenger.component.InternalComponentManager;
 import org.jivesoftware.util.Version;
@@ -186,7 +187,7 @@ public class XMPPServer {
             name = "127.0.0.1";
         }
 
-        version = new Version(2, 2, 0, Version.ReleaseStatus.Release, -1);
+        version = new Version(2, 2, 1, Version.ReleaseStatus.Release, -1);
         if ("true".equals(JiveGlobals.getXMLProperty("setup"))) {
             setupMode = false;
         }
@@ -201,6 +202,41 @@ public class XMPPServer {
         initialized = true;
     }
 
+    public void finishSetup() {
+        if (!setupMode) {
+            return;
+        }
+        // Make sure that setup finished correctly.
+        if ("true".equals(JiveGlobals.getXMLProperty("setup"))) {
+            setupMode = false;
+        }
+        if (!setupMode) {
+            try {
+                // Workaround while admin is a plugin.
+                ((AdminConsolePlugin)pluginManager.getPlugin("admin")).restartListeners();
+
+                verifyDataSource();
+                // First load all the modules so that modules may access other modules while
+                // being initialized
+                loadModules();
+                // Initize all the modules
+                initModules();
+                // Start all the modules
+                startModules();
+
+                startDate = new Date();
+                stopDate = null;
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+                Log.error(e);
+                System.out.println(LocaleUtils.getLocalizedString("startup.error"));
+                shutdownServer();
+            }
+        }
+
+    }
+
     public void start() {
         try {
             initialize();