Hide admin ports when not running in standalone mode. JM-71

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

src/web/server-props.jsp

@@ -81,22 +81,28 @@
         if (serverPort < 1) {
             errors.put("serverPort","");
         }
-        if (embeddedPort < 1) {
-            errors.put("embeddedPort","");
+        if (XMPPServer.getInstance().isStandAlone()) {
+            if (embeddedPort < 1) {
+                errors.put("embeddedPort","");
+            }
+            if (embeddedSecurePort < 1) {
+                errors.put("embeddedSecurePort","");
+            }
+            if (embeddedPort > 0 && embeddedSecurePort > 0) {
+                if (embeddedPort == embeddedSecurePort) {
+                    errors.put("embeddedPortsEqual","");
+                }
+            }
         }
-        if (embeddedSecurePort < 1) {
-            errors.put("embeddedSecurePort","");
+        else {
+            embeddedPort = -1;
+            embeddedSecurePort = -1;
         }
         if (port > 0 && sslPort > 0) {
             if (port == sslPort) {
                 errors.put("portsEqual","");
             }
         }
-        if (embeddedPort > 0 && embeddedSecurePort > 0) {
-            if (embeddedPort == embeddedSecurePort) {
-                errors.put("embeddedPortsEqual","");
-            }
-        }
         if (errors.size() == 0) {
             boolean needRestart = false;
             if (!serverName.equals(server.getServerInfo().getName())) {
@@ -304,6 +310,7 @@
             <%  } %>
         </td>
     </tr>
+<% if (XMPPServer.getInstance().isStandAlone()){ %>
     <tr>
         <td class="c1">
             <fmt:message key="server.props.admin_port" />
@@ -343,6 +350,7 @@
             <%  } %>
         </td>
     </tr>
+<% } %>
 </tbody>
 <tfoot>
     <tr>

src/web/setup-host-settings.jsp

@@ -8,7 +8,8 @@
                  org.jivesoftware.util.JiveGlobals,
                  java.util.Map,
                  java.util.HashMap,
-                 java.net.InetAddress"
+                 java.net.InetAddress,
+                 org.jivesoftware.messenger.XMPPServer"
 %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
@@ -31,8 +32,14 @@
         if (domain == null) {
             errors.put("domain","domain");
         }
-        if (embeddedPort < 0) {
-            errors.put("embeddedPort","embeddedPort");
+        if (XMPPServer.getInstance().isStandAlone()) {
+            if (embeddedPort < 0) {
+                errors.put("embeddedPort","embeddedPort");
+            }
+        }
+        else {
+            embeddedPort = -1;
+            securePort = -1;
         }
         // Continue if there were no errors
         if (errors.size() == 0) {
@@ -109,6 +116,7 @@ LABEL { font-weight : normal; }
         </span>
     </td>
 </tr>
+<% if (XMPPServer.getInstance().isStandAlone()){ %>
 <tr valign="top">
     <td width="1%" nowrap>
         <fmt:message key="setup.host.settings.port" />
@@ -149,6 +157,7 @@ LABEL { font-weight : normal; }
         </span>
     </td>
 </tr>
+<% } %>
 <tr valign="middle">
     <td width="1%" nowrap>
         <fmt:message key="setup.host.settings.ssl" />