Merge pull request #440 from guusdk/admin-console

Admin Console: External Component Settings

src/java/org/jivesoftware/openfire/component/ExternalComponentManager.java

@@ -69,6 +69,10 @@ public class ExternalComponentManager {
     private static List<ExternalComponentManagerListener> listeners =
             new CopyOnWriteArrayList<>();
 
+    /**
+     * @deprecated Obtain and use the corresponding {@link org.jivesoftware.openfire.spi.ConnectionListener} instead.
+     */
+    @Deprecated
     public static void setServiceEnabled(boolean enabled) throws ModificationNotAllowedException {
         // Alert listeners about this event
         for (ExternalComponentManagerListener listener : listeners) {
@@ -78,11 +82,19 @@ public class ExternalComponentManager {
         connectionManager.enableComponentListener(enabled);
     }
 
+    /**
+     * @deprecated Obtain and use the corresponding {@link org.jivesoftware.openfire.spi.ConnectionListener} instead.
+     */
+    @Deprecated
     public static boolean isServiceEnabled() {
         ConnectionManager connectionManager = XMPPServer.getInstance().getConnectionManager();
         return connectionManager.isComponentListenerEnabled();
     }
 
+    /**
+     * @deprecated Obtain and use the corresponding {@link org.jivesoftware.openfire.spi.ConnectionListener} instead.
+     */
+    @Deprecated
     public static void setServicePort(int port) throws ModificationNotAllowedException {
         // Alert listeners about this event
         for (ExternalComponentManagerListener listener : listeners) {
@@ -92,6 +104,10 @@ public class ExternalComponentManager {
         connectionManager.setComponentListenerPort(port);
     }
 
+    /**
+     * @deprecated Obtain and use the corresponding {@link org.jivesoftware.openfire.spi.ConnectionListener} instead.
+     */
+    @Deprecated
     public static int getServicePort() {
         ConnectionManager connectionManager = XMPPServer.getInstance().getConnectionManager();
         return connectionManager.getComponentListenerPort();

src/resources/jar/admin-sidebar.xml

@@ -79,7 +79,7 @@
 
             <!-- External components -->
             <item id="external-components-settings" name="${sidebar.external-components-settings}"
-                  url="external-components-settings.jsp"
+                  url="connection-settings-external-components.jsp"
                   description="${sidebar.external-components-settings.descr}"/>
 
             <!-- Connection Managers -->

src/web/component-session-summary.jsp

@@ -144,7 +144,7 @@
 
 <p>
 <fmt:message key="component.session.summary.info">
-    <fmt:param value="<a href=\"external-components-settings.jsp\">" />
+    <fmt:param value="<a href=\"connection-settings-external-components.jsp\">" />
     <fmt:param value="</a>" />
 </fmt:message>
 </p>

src/web/index.jsp

@@ -520,14 +520,14 @@
                 <c:when test="${connectionListener.type eq 'COMPONENT' and connectionListener.TLSPolicy ne 'legacyMode'}">
                     <fmt:message key="ports.external_components.desc"/>
                     <fmt:message key="ports.plaintext.desc">
-                        <fmt:param><a href='external-components-settings.jsp'></fmt:param>
+                        <fmt:param><a href='connection-settings-external-components.jsp'></fmt:param>
                         <fmt:param></a></fmt:param>
                     </fmt:message>
                 </c:when>
                 <c:when test="${connectionListener.type eq 'COMPONENT' and connectionListener.TLSPolicy eq 'legacyMode'}">
                     <fmt:message key="ports.external_components.desc_old_ssl"/>
                     <fmt:message key="ports.legacymode.desc">
-                        <fmt:param><a href='external-components-settings.jsp'></fmt:param>
+                        <fmt:param><a href='connection-settings-external-components.jsp'></fmt:param>
                         <fmt:param></a></fmt:param>
                     </fmt:message>
                 </c:when>