Commit cd1f6507 authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gato

Fixed compilation errors due to refactoring.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@6695 b35dd754-fafc-0310-a699-88a17e54d16e
parent ef3a66e8
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
<%@ page import="java.net.SocketAddress" %> <%@ page import="java.net.SocketAddress" %>
<%@ page import="java.net.InetSocketAddress" %> <%@ page import="java.net.InetSocketAddress" %>
<%@ page import="org.jivesoftware.wildfire.ServerPort" %> <%@ page import="org.jivesoftware.wildfire.ServerPort" %>
<%@ page import="org.jivesoftware.wildfire.HttpServerManager" %>
<%@ page import="org.jivesoftware.wildfire.filetransfer.proxy.FileTransferProxy" %> <%@ page import="org.jivesoftware.wildfire.filetransfer.proxy.FileTransferProxy" %>
<%@ page import="org.jivesoftware.wildfire.http.HttpBindManager" %> <%@ page import="org.jivesoftware.wildfire.http.HttpBindManager" %>
<%@ page import="org.jivesoftware.wildfire.mediaproxy.MediaProxyService" %> <%@ page import="org.jivesoftware.wildfire.mediaproxy.MediaProxyService" %>
...@@ -30,6 +29,7 @@ ...@@ -30,6 +29,7 @@
<%@ page import="org.jivesoftware.wildfire.Connection" %> <%@ page import="org.jivesoftware.wildfire.Connection" %>
<%@ page import="org.jivesoftware.wildfire.session.ClientSession" %> <%@ page import="org.jivesoftware.wildfire.session.ClientSession" %>
<%@ page import="org.jivesoftware.util.LocaleUtils" %> <%@ page import="org.jivesoftware.util.LocaleUtils" %>
<%@ page import="org.jivesoftware.wildfire.container.AdminConsolePlugin" %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %> <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
...@@ -61,7 +61,9 @@ ...@@ -61,7 +61,9 @@
SocketAcceptor multiplexerSocketAcceptor = connectionManager.getMultiplexerSocketAcceptor(); SocketAcceptor multiplexerSocketAcceptor = connectionManager.getMultiplexerSocketAcceptor();
ServerPort serverPort = null; ServerPort serverPort = null;
ServerPort componentPort = null; ServerPort componentPort = null;
HttpServerManager httpServerManager = HttpServerManager.getInstance(); AdminConsolePlugin adminConsolePlugin =
(AdminConsolePlugin) XMPPServer.getInstance().getPluginManager().getPlugin("admin");
FileTransferProxy fileTransferProxy = XMPPServer.getInstance().getFileTransferProxy(); FileTransferProxy fileTransferProxy = XMPPServer.getInstance().getFileTransferProxy();
HttpBindManager httpBindManager = HttpBindManager.getInstance(); HttpBindManager httpBindManager = HttpBindManager.getInstance();
MediaProxyService mediaProxyService = XMPPServer.getInstance().getMediaProxyService(); MediaProxyService mediaProxyService = XMPPServer.getInstance().getMediaProxyService();
...@@ -388,14 +390,14 @@ ...@@ -388,14 +390,14 @@
<% } %> <% } %>
<tr> <tr>
<td><%= interfaceName == null ? LocaleUtils.getLocalizedString("ports.all_ports") : interfaceName %></td> <td><%= interfaceName == null ? LocaleUtils.getLocalizedString("ports.all_ports") : interfaceName %></td>
<td><%= httpServerManager.getAdminUnsecurePort() %></td> <td><%= adminConsolePlugin.getAdminUnsecurePort() %></td>
<td><img src="images/blank.gif" width="1" height="1"></td> <td><img src="images/blank.gif" width="1" height="1"></td>
<td><fmt:message key="ports.admin_console" /></td> <td><fmt:message key="ports.admin_console" /></td>
<td><fmt:message key="ports.admin_console.desc_unsecured" /></td> <td><fmt:message key="ports.admin_console.desc_unsecured" /></td>
</tr> </tr>
<tr> <tr>
<td><%= interfaceName == null ? LocaleUtils.getLocalizedString("ports.all_ports") : interfaceName %></td> <td><%= interfaceName == null ? LocaleUtils.getLocalizedString("ports.all_ports") : interfaceName %></td>
<td><%= httpServerManager.getAdminSecurePort() %></td> <td><%= adminConsolePlugin.getAdminSecurePort() %></td>
<td><img src="images/lock.gif" width="16" height="16" border="0"/></td> <td><img src="images/lock.gif" width="16" height="16" border="0"/></td>
<td><fmt:message key="ports.admin_console" /></td> <td><fmt:message key="ports.admin_console" /></td>
<td><fmt:message key="ports.admin_console.desc_secured" /></td> <td><fmt:message key="ports.admin_console.desc_secured" /></td>
......
<%@ page import="org.jivesoftware.util.ParamUtils" <%@ page import="org.jivesoftware.util.ParamUtils"
errorPage="error.jsp"%> errorPage="error.jsp"%>
<%@ page import="org.jivesoftware.wildfire.HttpServerManager" %>
<%@ page import="org.jivesoftware.wildfire.XMPPServer" %> <%@ page import="org.jivesoftware.wildfire.XMPPServer" %>
<%-- <%--
Created by IntelliJ IDEA. Created by IntelliJ IDEA.
......
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