Removed port configuration from setup (JM-68).

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

src/web/setup-host-settings.jsp

 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <%--
   -	$RCSfile$
   -	$Revision$
@@ -15,9 +16,7 @@
 
 <%  // Get parameters
     String domain = ParamUtils.getParameter(request,"domain");
-    int port = ParamUtils.getIntParameter(request,"port",-1);
     int embeddedPort = ParamUtils.getIntParameter(request,"embeddedPort",-1);
-    int sslPort = ParamUtils.getIntParameter(request,"sslPort",-1);
     boolean sslEnabled = ParamUtils.getBooleanParameter(request,"sslEnabled",true);
 
     boolean doContinue = request.getParameter("continue") != null;
@@ -29,26 +28,16 @@
         if (domain == null) {
             errors.put("domain","domain");
         }
-        if (port < 0) {
-            errors.put("port","port");
-        }
         if (embeddedPort < 0) {
             errors.put("embeddedPort","embeddedPort");
         }
-        if (sslEnabled) {
-            if (sslPort < 0) {
-                errors.put("sslPort","sslPort");
-            }
-        }
         // Continue if there were no errors
         if (errors.size() == 0) {
             Map xmppSettings = new HashMap();
 
             xmppSettings.put("xmpp.domain",domain);
-            xmppSettings.put("xmpp.socket.plain.port",Integer.toString(port));
             xmppSettings.put("embedded-web.port",Integer.toString(embeddedPort));
             xmppSettings.put("xmpp.socket.ssl.active",""+sslEnabled);
-            xmppSettings.put("xmpp.socket.ssl.port",Integer.toString(sslPort));
             xmppSettings.put("xmpp.auth.anonymous", "true" );
             session.setAttribute("xmppSettings", xmppSettings);
 
@@ -65,9 +54,7 @@
     // Load the current values:
     if (!doContinue) {
         domain = JiveGlobals.getProperty("xmpp.domain");
-        port = JiveGlobals.getIntProperty("xmpp.socket.plain.port", 5222);
         embeddedPort = JiveGlobals.getIntProperty("embedded-web.port", 9090);
-        sslPort = JiveGlobals.getIntProperty("xmpp.socket.ssl.port",5223);
         sslEnabled = JiveGlobals.getBooleanProperty("xmpp.socket.ssl.active", true);
 
         // If the domain is still blank, guess at the value:
@@ -84,7 +71,7 @@ Server Settings
 </p>
 
 <p>
-Below are host and port settings for this server. Note, the suggested value for the
+Below are host settings for this server. Note: the suggested value for the
 domain is based on the network settings of this machine.
 </p>
 
@@ -94,12 +81,6 @@ LABEL { font-weight : normal; }
 
 <form action="setup-host-settings.jsp" name="f" method="post">
 
-<script langauge="JavaScript" type="text/javascript">
-function toggle(form,disabled) {
-    form.sslPort.disabled = disabled;
-}
-</script>
-
 <table cellpadding="3" cellspacing="0" border="0" width="100%">
 <tr valign="top">
     <td width="1%" nowrap>
@@ -117,27 +98,7 @@ function toggle(form,disabled) {
          value="<%= ((domain != null) ? domain : "") %>">
         <span class="jive-description">
         <br>
-        Hostname or IP address of the IM server.
-        </span>
-    </td>
-</tr>
-<tr valign="top">
-    <td width="1%" nowrap>
-        Server Port:
-        <%  if (errors.get("port") != null) { %>
-
-            <span class="jive-error-text"><br>
-            Invalid port number.
-            </span>
-
-        <%  } %>
-    </td>
-    <td width="99%">
-        <input type="text" size="6" maxlength="6" name="port"
-         value="<%= ((port != -1) ? ""+port : "5222") %>">
-        <span class="jive-description">
-        <br>
-        Port number this server listens to. Default XMPP port is 5222.
+        Hostname or IP address of this server.
         </span>
     </td>
 </tr>
@@ -157,46 +118,24 @@ function toggle(form,disabled) {
          value="<%= ((embeddedPort != -1) ? ""+embeddedPort : "9090") %>">
         <span class="jive-description">
         <br>
-        Port number for the web-based admin console. Default port is 9090.
+        Port number for the web-based admin console (default is 9090).
         </span>
     </td>
 </tr>
-<tr valign="top">
+<tr valign="middle">
     <td width="1%" nowrap>
         SSL Connections Enabled:
     </td>
     <td width="99%">
         <input type="radio" name="sslEnabled" value="true" id="rb01"
-            onclick="toggle(this.form,false);"
             <%= ((sslEnabled) ? " checked" : "") %>>
         <label for="rb01">Yes</label>
         &nbsp;
         <input type="radio" name="sslEnabled" value="false" id="rb02"
-            onclick="toggle(this.form,true);"
             <%= ((!sslEnabled) ? " checked" : "") %>>
         <label for="rb02">No</label>
     </td>
 </tr>
-<tr valign="top">
-    <td width="1%" nowrap>
-        SSL Port:
-        <%  if (sslEnabled && errors.get("sslPort") != null) { %>
-
-            <span class="jive-error-text"><br>
-            Invalid port number.
-            </span>
-
-        <%  } %>
-    </td>
-    <td width="99%">
-        <input type="text" size="6" maxlength="6" name="sslPort"
-         value="<%= ((sslPort != -1) ? ""+sslPort : "") %>">
-        <span class="jive-description">
-        <br>
-        Port number this server listens to for SSL connections. Default SSL XMPP port is 5223.
-        </span>
-    </td>
-</tr>
 </table>
 
 <br><br>