Commit b70a5b4c authored by Guus der Kinderen's avatar Guus der Kinderen

Admin Console: External Component Settings

The page on which a user can manage the settings for External Components should offer
all features that are available now that the new ConnectionManager has been implemented.
parent 2b95af59
...@@ -69,6 +69,10 @@ public class ExternalComponentManager { ...@@ -69,6 +69,10 @@ public class ExternalComponentManager {
private static List<ExternalComponentManagerListener> listeners = private static List<ExternalComponentManagerListener> listeners =
new CopyOnWriteArrayList<>(); new CopyOnWriteArrayList<>();
/**
* @deprecated Obtain and use the corresponding {@link org.jivesoftware.openfire.spi.ConnectionListener} instead.
*/
@Deprecated
public static void setServiceEnabled(boolean enabled) throws ModificationNotAllowedException { public static void setServiceEnabled(boolean enabled) throws ModificationNotAllowedException {
// Alert listeners about this event // Alert listeners about this event
for (ExternalComponentManagerListener listener : listeners) { for (ExternalComponentManagerListener listener : listeners) {
...@@ -78,11 +82,19 @@ public class ExternalComponentManager { ...@@ -78,11 +82,19 @@ public class ExternalComponentManager {
connectionManager.enableComponentListener(enabled); connectionManager.enableComponentListener(enabled);
} }
/**
* @deprecated Obtain and use the corresponding {@link org.jivesoftware.openfire.spi.ConnectionListener} instead.
*/
@Deprecated
public static boolean isServiceEnabled() { public static boolean isServiceEnabled() {
ConnectionManager connectionManager = XMPPServer.getInstance().getConnectionManager(); ConnectionManager connectionManager = XMPPServer.getInstance().getConnectionManager();
return connectionManager.isComponentListenerEnabled(); 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 { public static void setServicePort(int port) throws ModificationNotAllowedException {
// Alert listeners about this event // Alert listeners about this event
for (ExternalComponentManagerListener listener : listeners) { for (ExternalComponentManagerListener listener : listeners) {
...@@ -92,6 +104,10 @@ public class ExternalComponentManager { ...@@ -92,6 +104,10 @@ public class ExternalComponentManager {
connectionManager.setComponentListenerPort(port); connectionManager.setComponentListenerPort(port);
} }
/**
* @deprecated Obtain and use the corresponding {@link org.jivesoftware.openfire.spi.ConnectionListener} instead.
*/
@Deprecated
public static int getServicePort() { public static int getServicePort() {
ConnectionManager connectionManager = XMPPServer.getInstance().getConnectionManager(); ConnectionManager connectionManager = XMPPServer.getInstance().getConnectionManager();
return connectionManager.getComponentListenerPort(); return connectionManager.getComponentListenerPort();
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<!-- External components --> <!-- External components -->
<item id="external-components-settings" name="${sidebar.external-components-settings}" <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}"/> description="${sidebar.external-components-settings.descr}"/>
<!-- Connection Managers --> <!-- Connection Managers -->
......
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
<p> <p>
<fmt:message key="component.session.summary.info"> <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:param value="</a>" />
</fmt:message> </fmt:message>
</p> </p>
......
This diff is collapsed.
This diff is collapsed.
...@@ -520,14 +520,14 @@ ...@@ -520,14 +520,14 @@
<c:when test="${connectionListener.type eq 'COMPONENT' and connectionListener.TLSPolicy ne 'legacyMode'}"> <c:when test="${connectionListener.type eq 'COMPONENT' and connectionListener.TLSPolicy ne 'legacyMode'}">
<fmt:message key="ports.external_components.desc"/> <fmt:message key="ports.external_components.desc"/>
<fmt:message key="ports.plaintext.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:param></a></fmt:param>
</fmt:message> </fmt:message>
</c:when> </c:when>
<c:when test="${connectionListener.type eq 'COMPONENT' and connectionListener.TLSPolicy eq 'legacyMode'}"> <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.external_components.desc_old_ssl"/>
<fmt:message key="ports.legacymode.desc"> <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:param></a></fmt:param>
</fmt:message> </fmt:message>
</c:when> </c:when>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment