More LDAP setup work.

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

src/i18n/wildfire_i18n_en.properties

@@ -1362,6 +1362,13 @@ setup.ldap.server.admindn_help=The DN of a directory administrator. All director
 setup.ldap.server.password=Password
 setup.ldap.server.password_help=The password for the directory administrator.
 setup.ldap.server.advanced=Advanced Settings
+setup.ldap.server.connection_pool=Use Connection Pool
+setup.ldap.server.connection_pool_help=Connection Pooling. Default is 'Yes'
+setup.ldap.server.ssl=Use SSL
+setup.ldap.server.ssl_help=Enable SSL connections to your LDAP server, default port is usually 636
+setup.ldap.server.debug=Enable Debug
+setup.ldap.server.debug_help=Trace information about buffers written to System.out
+setup.ldap.server.
 
 # Setup finished Page
 

src/web/setup/setup-ldap-server.jsp

 <%@ page import="org.jivesoftware.wildfire.XMPPServer"%>
+<%@ page import="org.jivesoftware.util.ParamUtils"%>
+<%@ page import="org.jivesoftware.util.JiveGlobals"%>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
@@ -13,6 +15,12 @@
 
 <%
     // Get parameters
+    String serverType = ParamUtils.getParameter(request, "serverType");
+    String host = JiveGlobals.getXMLProperty("ldap.host");
+    if (ParamUtils.getParameter(request, "host") != null) {
+        host = ParamUtils.getParameter(request, "host");
+    }
+
 
     boolean next = request.getParameter("continue") != null;
     if (next) {
@@ -110,24 +118,24 @@
 				<tbody>
 				<tr>
 					<td class="jive-advancedLabel" nowrap>
-						Use Connection Pool:
+						<fmt:message key="setup.ldap.server.connection_pool" />:
 					</td>
 					<td class="jive-advancedDesc jive-advancedBorderBottom jive-advancedBorderRight">
-						Connection Pooling. Default is 'Yes'
+					    <fmt:message key="setup.ldap.server.connection_pool_help" />
 					</td>
 					<td class="jive-advancedBorderBottom jive-advancedBorderRight" align="center">
-						<input type="radio" name="connectionpool" value="yes">
+						<input type="radio" name="connectionpool" value="yes" checked>
 					</td>
 					<td class="jive-advancedBorderBottom" align="center">
-						<input type="radio" name="connectionpool" value="no" checked>
+						<input type="radio" name="connectionpool" value="no">
 					</td>
 				</tr>
 				<tr>
 					<td class="jive-advancedLabel" nowrap>
-						Use SSL:
+						<fmt:message key="setup.ldap.server.ssl" />:
 					</td>
 					<td class="jive-advancedDesc jive-advancedBorderBottom jive-advancedBorderRight">
-						Enable SSL connections to your LDAP server, default port is usually 636
+						<fmt:message key="setup.ldap.server.ssl_help" />
 					</td>
 					<td class="jive-advancedBorderBottom jive-advancedBorderRight" align="center">
 						<input type="radio" name="ssl" value="yes">
@@ -138,10 +146,10 @@
 				</tr>
 				<tr>
 					<td class="jive-advancedLabel" nowrap>
-						Enable Debug:
+						<fmt:message key="setup.ldap.server.debug" />:
 					</td>
 					<td class="jive-advancedDesc jive-advancedBorderBottom jive-advancedBorderRight">
-						Trace information about buffers written to System.out
+						<fmt:message key="setup.ldap.server.debug_help" />
 					</td>
 					<td class="jive-advancedBorderBottom jive-advancedBorderRight" align="center">
 						<input type="radio" name="debug" value="yes">
@@ -152,7 +160,7 @@
 				</tr>
 				<tr>
 					<td class="jive-advancedLabel" nowrap>
-						Allow Referrals:
+						Follow Referrals:
 					</td>
 					<td class="jive-advancedDesc jive-advancedBorderBottom jive-advancedBorderRight">
 						Automatically followed LDAP referrals