Set setup as completed after CS settings were completed.

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

src/web/setup/clearspace-integration.jspf

@@ -84,7 +84,10 @@
                     xmppSettings.put("clearspace.sharedSecret", sharedSecret);
                     session.setAttribute("xmppSettings", xmppSettings);
                 }
-
+                if (initialSetup) {
+                    // Set that the setup has been completed
+                    JiveGlobals.setXMLProperty("setup","true");
+                }
                 // Redirect to next step.
                 response.sendRedirect(nextPage);
                 return;

src/web/setup/setup-clearspace-integration.jsp

@@ -14,6 +14,5 @@
     String nextPage = "setup-finished.jsp";
     Map<String, String> meta = new HashMap<String, String>();
     meta.put("currentStep", "3");
-    JiveGlobals.setXMLProperty("setup","true");
 %>
 <%@ include file="clearspace-integration.jspf" %>