Fixed problem that prevented to server to start up from a jar file.

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

src/java/org/jivesoftware/messenger/InternalComponentManager.java

@@ -42,7 +42,7 @@ public class InternalComponentManager implements ComponentManager, RoutableChann
     private Map<String, Component> components = new ConcurrentHashMap<String, Component>();
     private Map<JID, JID> presenceMap = new ConcurrentHashMap<JID, JID>();
 
-    private static InternalComponentManager instance;
+    private static InternalComponentManager instance = new InternalComponentManager();
     /**
      * XMPP address of this internal service. The address is of the form: component.[domain]
      */
@@ -53,23 +53,23 @@ public class InternalComponentManager implements ComponentManager, RoutableChann
      */
     private String serverDomain;
 
-    static {
-        instance = new InternalComponentManager();
-        ComponentManagerFactory.setComponentManager(instance);
-    }
-
     public static InternalComponentManager getInstance() {
         return instance;
     }
 
-    private InternalComponentManager() {
+    public void start() {
+        // Set this ComponentManager as the current component manager
+        ComponentManagerFactory.setComponentManager(instance);
+
         XMPPServer server = XMPPServer.getInstance();
         serverDomain = server.getServerInfo().getName();
         // Set the address of this internal service. component.[domain]
         serviceAddress = new JID(null, "component." + serverDomain, null);
+        if (!server.isSetupMode()) {
             // Add a route to this service
             server.getRoutingTable().addRoute(getAddress(), this);
         }
+    }
 
     public void addComponent(String subdomain, Component component) {
         components.put(subdomain, component);

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

@@ -198,7 +198,7 @@ public class XMPPServer {
                 startModules();
             }
             // Load plugins. First, initialize component manager.
-            InternalComponentManager.getInstance();
+            InternalComponentManager.getInstance().start();
             File pluginDir = new File(messengerHome, "plugins");
             pluginManager = new PluginManager(pluginDir);
             pluginManager.start();