Datasource information should be stored in messenger_home.

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

src/web/setup-datasource-standard.jsp

@@ -106,22 +106,22 @@
             // No errors setting the properties, so test the connection
             DbConnectionManager.setConnectionProvider(conProvider);
             if (testConnection(errors)) {
-                // update the sidebar status
-                session.setAttribute("jive.setup.sidebar.3","done");
-                session.setAttribute("jive.setup.sidebar.4","in_progress");
-                // success, move on
-                response.sendRedirect("setup-admin-settings.jsp");
-                return;
-            }
-            else{
+                // Update with XMPPSettings
                 Map xmppSettings = (Map)session.getAttribute("xmppSettings");
                 Iterator iter = xmppSettings.keySet().iterator();
                 while(iter.hasNext()){
                     String name = (String)iter.next();
                     String value = (String)xmppSettings.get(name);
                     JiveGlobals.setProperty(name, value);
-                     
+
                 }
+
+                // update the sidebar status
+                session.setAttribute("jive.setup.sidebar.3","done");
+                session.setAttribute("jive.setup.sidebar.4","in_progress");
+                // success, move on
+                response.sendRedirect("setup-admin-settings.jsp");
+                return;
             }
         }
     }