Admin console ports are now saved to the XML config file. JM-219

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

src/web/setup-finished.jsp

@@ -25,6 +25,13 @@
         String value = (String)xmppSettings.get(name);
         JiveGlobals.setProperty(name, value);
     }
+    Map xmlSettings = (Map)session.getAttribute("xmlSettings");
+    iter = xmlSettings.keySet().iterator();
+    while(iter.hasNext()){
+        String name = (String)iter.next();
+        String value = (String)xmlSettings.get(name);
+        JiveGlobals.setXMLProperty(name, value);
+    }
     // Shut down connection provider. Some connection providers (such as the
     // embedded provider) require a clean shut-down.
     DbConnectionManager.getConnectionProvider().destroy();    
@@ -49,7 +56,7 @@
     <li>
         <%
             String server = request.getServerName();
-            String port = JiveGlobals.getProperty("adminConsole.port");
+            String port = JiveGlobals.getXMLProperty("adminConsole.port");
         %>
         <a href="http://<%= server %>:<%= port %>/login.jsp?username=admin"><fmt:message key="setup.finished.login" /></a>.
     </li>

src/web/setup-host-settings.jsp

@@ -39,12 +39,15 @@
             Map xmppSettings = new HashMap();
 
             xmppSettings.put("xmpp.domain",domain);
-            xmppSettings.put("adminConsole.port",Integer.toString(embeddedPort));
-            xmppSettings.put("adminConsole.securePort",Integer.toString(securePort));
             xmppSettings.put("xmpp.socket.ssl.active",""+sslEnabled);
             xmppSettings.put("xmpp.auth.anonymous", "true" );
             session.setAttribute("xmppSettings", xmppSettings);
 
+            Map xmlSettings = new HashMap();
+            xmlSettings.put("adminConsole.port",Integer.toString(embeddedPort));
+            xmlSettings.put("adminConsole.securePort",Integer.toString(securePort));
+            session.setAttribute("xmlSettings", xmlSettings);
+
             // update the sidebar status
             session.setAttribute("jive.setup.sidebar.2","done");
             session.setAttribute("jive.setup.sidebar.3","in_progress");