Skip to content

O
Openfire
Commit 8262744a authored by Bill Lynch's avatar Bill Lynch Committed by bill
Browse files
Options

UPdates to the properties screens 


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@263 b35dd754-fafc-0310-a699-88a17e54d16e
parent 0ba0701c
Hide whitespace changes
Inline Side-by-side
Showing with 261 additions and 230 deletions
src/web/index.jsp
View file @ 8262744a
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
java.util.*, java.util.*,
java.text.*, java.text.*,
org.jivesoftware.admin.AdminPageBean" org.jivesoftware.admin.AdminPageBean"
errorPage="error.jsp"
%> %>
<%@ taglib uri="core" prefix="c" %> <%@ taglib uri="core" prefix="c" %>
...@@ -31,45 +32,198 @@ ...@@ -31,45 +32,198 @@
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
<% admin.init(request, response, session, application, out); %> <% admin.init(request, response, session, application, out); %>
<% // Get parameters //
boolean serverOn = (admin.getXMPPServer() != null);
%>
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Jive Messenger Admin"; String title = "Server Properties";
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.setPageID("server-main"); pageinfo.setPageID("server-props");
%> %>
<jsp:include page="top.jsp" flush="true" /> <jsp:include page="top.jsp" flush="true" />
<jsp:include page="title.jsp" flush="true" /> <jsp:include page="title.jsp" flush="true" />
<p>Welcome to the Jive Messenger Admin tool.</p> <p>
Below are properties for this server. Click the "Edit Properties" button below to change
<table class="box" cellpadding="3" cellspacing="1" border="0" width="100%"> some of the server settings. Some settings can not be changed.
<tr class="tableHeaderBlue"><td colspan="2" align="center"><fmt:message key="title" bundle="${lang}" /> Information</td></tr> </p>
<tr><td colspan="2">
<tr> <% if ("true".equals(request.getParameter("success"))) { %>
<td class="jive-label">
Version: <div class="jive-success">
</td> <table cellpadding="0" cellspacing="0" border="0">
<td> <tbody>
<fmt:message key="title" bundle="${lang}" /> <%= admin.getXMPPServer().getServerInfo().getVersion().getVersionString() %> <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
</td> <td class="jive-icon-label">
</tr> Server properties updated successfully. You'll need to restart the server to see
<tr> the changes.
<td class="jive-label"> </td></tr>
JVM Version and Vendor: </tbody>
</td> </table>
<td> </div><br>
<%= System.getProperty("java.version") %> <%= System.getProperty("java.vendor") %>
</td> <% } %>
</tr>
<tr> <div class="jive-table">
<td class="jive-label"> <table cellpadding="0" cellspacing="0" border="0" width="100%">
Appserver: <thead>
</td> <tr>
<td> <th colspan="2">Server Properties</th>
<%= application.getServerInfo() %> </tr>
</td> </thead>
</tr> <tbody>
<% if (serverOn) { %>
<tr>
<td class="c1">Server Uptime:</td>
<td>
<% DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM);
long now = System.currentTimeMillis();
long lastStarted = admin.getXMPPServer().getServerInfo().getLastStarted().getTime();
long uptime = (now - lastStarted) / 1000L;
String uptimeDisplay = null;
if (uptime < 60) {
uptimeDisplay = "Less than 1 minute";
}
else if (uptime < 60*60) {
long mins = uptime / (60);
uptimeDisplay = "Approx " + mins + ((mins==1) ? " minute" : " minutes");
}
else if (uptime < 60*60*24) {
long days = uptime / (60*60);
uptimeDisplay = "Approx " + days + ((days==1) ? " hour" : " hours");
}
%>
<% if (uptimeDisplay != null) { %>
<%= uptimeDisplay %> --
<% } %>
started <%= formatter.format(admin.getXMPPServer().getServerInfo().getLastStarted()) %>
</td>
</tr>
<% } %>
<tr>
<td class="c1">Version:</td>
<td class="c2">
<fmt:message key="title" bundle="${lang}" />
<%= admin.getXMPPServer().getServerInfo().getVersion().getVersionString() %>
</td>
</tr>
<tr>
<td class="c1">Messenger Home:</td>
<td class="c2">
<%= JiveGlobals.getMessengerHome() %>
</td>
</tr>
<tr>
<td class="c1">
Server Name:
</td>
<td class="c2">
<c:out value="${admin.serverInfo.name}" />
</td>
</tr>
<c:if test="${!empty admin.multiUserChatServer}">
<tr>
<td class="c1">
Group Chat Service Name:
</td>
<td class="c2">
<c:out value="${admin.multiUserChatServer.serviceName}" />
</td>
</tr>
</c:if>
<c:forEach var="port" items="${admin.serverInfo.serverPorts}">
<tr>
<td class="c1">
IP and Port:
</td>
<td class="c2">
<c:out value="${port.IPAddress}" />:<c:out value="${port.port}" />
</td>
</tr>
<tr valign="top">
<td class="c1">
Domain Name(s):
</td>
<td class="c2">
<c:set var="sep" value="" />
<c:forEach var="name" items="${port.domainNames}">
<c:out value="${sep}" /><c:out value="${name}" />
<c:set var="set" value=", " />
</c:forEach>
</td>
</tr>
<tr>
<td class="c1">
Security Type:
</td>
<td>
<c:choose>
<c:when test="${empty port.securityType}">
NORMAL
</c:when>
<c:otherwise>
<c:choose>
<c:when test="${port.securityType == 'TLS'}">
TLS (SSL)
</c:when>
<c:otherwise>
<c:out value="${port.securityType}" />
</c:otherwise>
</c:choose>
</c:otherwise>
</c:choose>
</td>
</tr>
</c:forEach>
</tbody>
<thead>
<tr>
<th colspan="2">Environment</th>
</tr>
</thead>
<tbody>
<tr>
<td class="c1">JVM Version and Vendor:</td>
<td class="c2">
<%= System.getProperty("java.version") %> <%= System.getProperty("java.vendor") %>
</td>
</tr>
<tr>
<td class="c1">Appserver:</td>
<td class="c2">
<%= application.getServerInfo() %>
</td>
</tr>
<tr>
<td class="c1">OS / Hardware:</td>
<td class="c2">
<%= System.getProperty("os.name") %> / <%= System.getProperty("os.arch") %>
</td>
</tr>
<tr>
<td class="c1">Locale / Timezone:</td>
<td class="c2">
<%= JiveGlobals.getLocale() %> / <%= JiveGlobals.getTimeZone().getDisplayName(JiveGlobals.getLocale()) %>
(<%= (JiveGlobals.getTimeZone().getRawOffset()/1000/60/60) %> GMT)
</td>
</tr>
</tbody>
</table> </table>
</div> </div>
<br>
<form action="server-props.jsp">
<input type="submit" name="edit" value="Edit Properties">
</form>
<jsp:include page="bottom.jsp" flush="true" /> <jsp:include page="bottom.jsp" flush="true" />
\ No newline at end of file
src/web/server-props.jsp
View file @ 8262744a
...@@ -11,9 +11,10 @@ ...@@ -11,9 +11,10 @@
<%@ page import="org.jivesoftware.util.*, <%@ page import="org.jivesoftware.util.*,
org.jivesoftware.messenger.XMPPServerInfo, org.jivesoftware.messenger.XMPPServerInfo,
java.util.Iterator,
org.jivesoftware.messenger.ServerPort, org.jivesoftware.messenger.ServerPort,
org.jivesoftware.admin.AdminPageBean" org.jivesoftware.admin.AdminPageBean,
java.util.*,
org.jivesoftware.messenger.XMPPServer"
%> %>
<%@ taglib uri="core" prefix="c" %> <%@ taglib uri="core" prefix="c" %>
...@@ -26,125 +27,98 @@ ...@@ -26,125 +27,98 @@
<% admin.init(request, response, session, application, out ); %> <% admin.init(request, response, session, application, out ); %>
<c:set var="admin" value="${admin.manager}" /> <c:set var="admin" value="${admin.manager}" />
<%
// Get parameters
String serverName = ParamUtils.getParameter(request,"serverName");
String groupChatName = ParamUtils.getParameter(request,"groupChatName");
boolean save = request.getParameter("save") != null;
boolean cancel = request.getParameter("cancel") != null;
if (cancel) {
response.sendRedirect("index.jsp");
return;
}
XMPPServer server = admin.getXMPPServer();
Map errors = new HashMap();
if (save) {
if (serverName == null) {
errors.put("serverName","");
}
if (groupChatName == null) {
errors.put("groupChatName","");
}
if (errors.size() == 0) {
server.getServerInfo().setName(serverName);
admin.getMultiUserChatServer().setServiceName(groupChatName);
response.sendRedirect("index.jsp?success=true");
return;
}
}
if (errors.size() == 0) {
serverName = server.getServerInfo().getName();
groupChatName = admin.getMultiUserChatServer().getServiceName();
}
%>
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Server Properties"; String title = "Edit Server Properties";
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "server-props.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Server Properties", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Edit", "server-props.jsp"));
pageinfo.setPageID("server-props"); pageinfo.setPageID("server-props");
%> %>
<jsp:include page="top.jsp" flush="true" /> <jsp:include page="top.jsp" flush="true" />
<jsp:include page="title.jsp" flush="true" /> <jsp:include page="title.jsp" flush="true" />
<p> <p>
Below is a list of information for this <fmt:message key="short.title" bundle="${lang}" /> server. Use the form below to edit server properties.
</p> </p>
<form action="server-props.jsp">
<table class="box" cellpadding="3" cellspacing="1" border="0" width="600"> <div class="jive-table">
<tr class="tableHeaderBlue"><td colspan="3" align="center">General Information</td></tr> <table cellpadding="0" cellspacing="0" border="0" width="100%">
<tr> <thead>
<td class="jive-label"> <tr>
Server Version: <th colspan="2">
</td> Server Properties
<td colspan="2"> </th>
<fmt:message key="short.title" bundle="${lang}" /> Server <c:out value="${admin.serverInfo.version.versionString}" /> </tr>
</td> </thead>
</tr> <tbody>
<tr> <tr>
<td class="jive-label"> <td class="c1">
JVM Version and Vendor: Server Name:
</td>
<td colspan="2">
<%= System.getProperty("java.version") %> <%= System.getProperty("java.vendor") %>
</td>
</tr>
<tr>
<td class="jive-label">
Appserver (Admin Tool):
</td>
<td colspan="2">
<%= application.getServerInfo() %>
</td>
</tr>
<tr>
<td class="jive-label">
Server Name:
</td>
<td>
<c:out value="${admin.serverInfo.name}" />
</td><td align=right nowrap>
<a href="server-props-edit-form.jsp"
title="Click to edit..."
>Edit <img src="images/edit-16x16.gif" width="17" height="17" border="0"></a>
</td>
</tr>
<c:if test="${!empty admin.multiUserChatServer}">
<tr>
<td class="jive-label">
Multi User Chat Server Name:
</td>
<td>
<c:out value="${admin.multiUserChatServer.serviceName}" />
</td><td align=right nowrap>
<a href="muc-server-props-edit-form.jsp"
title="Click to edit..."
>Edit <img src="images/edit-16x16.gif" width="17" height="17" border="0"></a>
</td>
</tr>
</c:if>
</table>
<c:forEach var="port" items="${admin.serverInfo.serverPorts}">
<br>
<table class="box" cellpadding="3" cellspacing="1" border="0" width="600">
<tr class="tableHeaderBlue"><td colspan="3" align="center">Open Server Ports</td></tr>
<tr valign="top">
<td class="jive-label">
IP and Port:
</td> </td>
<td> <td class="c2">
<b><c:out value="${port.IPAddress}" />:<c:out value="${port.port}" /></b> <input type="text" name="serverName" value="<%= (serverName != null) ? serverName : "" %>"
size="30" maxlength="40">
</td> </td>
</tr> </tr>
<tr valign="top"> <tr>
<td class="jive-label"> <td class="c1">
Domain Name(s): Group Chat Service Name:
</td> </td>
<td> <td class="c2">
<c:set var="sep" value="" /> <input type="text" name="groupChatName" value="<%= (groupChatName != null) ? groupChatName : "" %>"
<c:forEach var="name" items="${port.domainNames}"> size="30" maxlength="40">
<c:out value="${sep}" /><c:out value="${name}" />
<c:set var="set" value=", " />
</c:forEach>
</td> </td>
</tr> </tr>
<tr valign="top"> </tbody>
<td class="jive-label"> <tfoot>
Security Type: <tr>
</td> <td colspan="2">
<td> <input type="submit" name="save" value="Save">
<c:choose> <input type="submit" name="cancel" value="Cancel">
<c:when test="${empty port.securityType}">
NORMAL
</c:when>
<c:otherwise>
<c:choose>
<c:when test="${port.securityType == 'TLS'}">
TLS (SSL)
</c:when>
<c:otherwise>
<c:out value="${port.securityType}" />
</c:otherwise>
</c:choose>
</c:otherwise>
</c:choose>
</td> </td>
</tr> </tr>
</table> </tfoot>
</div> </table>
</c:forEach> </div>
</form>
<jsp:include page="bottom.jsp" flush="true" /> <jsp:include page="bottom.jsp" flush="true" />
src/web/server-status.jsp
View file @ 8262744a
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<%-- Define Administration Bean --%>
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
<% admin.init(request, response, session, application, out ); %> <% admin.init(request, response, session, application, out ); %>
...@@ -38,108 +37,12 @@ ...@@ -38,108 +37,12 @@
<jsp:include page="top.jsp" flush="true" /> <jsp:include page="top.jsp" flush="true" />
<jsp:include page="title.jsp" flush="true" /> <jsp:include page="title.jsp" flush="true" />
<% // Get parameters //
boolean stop = request.getParameter("stop") != null;
boolean restart = request.getParameter("restart") != null;
boolean serverOn = (admin.getXMPPServer() != null);
// Handle starts, stops & restarts
if (stop) {
admin.stop(admin.getContainer());
response.sendRedirect("server-status.jsp");
return;
}
else if (restart) {
admin.restart(admin.getContainer());
response.sendRedirect("server-status.jsp");
return;
}
%>
<p> <p>
Below is the status of your <fmt:message key="short.title" bundle="${lang}" /> server. Below is the status of your <fmt:message key="short.title" bundle="${lang}" /> server.
</p> </p>
<table class="box" cellpadding="3" cellspacing="1" border="0" width="600">
<tr class="tableHeaderBlue"><td colspan="2" align="center">Current Status</td></tr>
<tr>
<td class="jive-label">Server Status</td>
<% if (serverOn) { %>
<td>
<img src="images/greenlight-24x24.gif" width="24" height="24" border="0" />
</td>
<% } else { %>
<td>
<img src="images/redlight-24x24.gif" width="24" height="24" border="0" />
</td>
<% } %>
</tr>
<% if (serverOn) { %>
<tr><td class="jive-label">Server Uptime</td>
<td>
<% DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM);
long now = System.currentTimeMillis();
long lastStarted = admin.getXMPPServer().getServerInfo().getLastStarted().getTime();
long uptime = (now - lastStarted) / 1000L;
String uptimeDisplay = null;
if (uptime < 60) {
uptimeDisplay = "Less than 1 minute";
}
else if (uptime < 60*60) {
long mins = uptime / (60);
uptimeDisplay = "Approx " + mins + ((mins==1) ? " minute" : " minutes");
}
else if (uptime < 60*60*24) {
long days = uptime / (60*60);
uptimeDisplay = "Approx " + days + ((days==1) ? " hour" : " hours");
}
%>
<% if (uptimeDisplay != null) { %>
<%= uptimeDisplay %> -
<% } %>
<%= formatter.format(admin.getXMPPServer().getServerInfo().getLastStarted()) %>
</td>
</tr>
<% } %>
</table>
</div>
<br>
<script lang="JavaScript" type="text/javascript">
var checked = false;
function checkClick() {
if (checked) { return false; }
else { checked = true; return true; }
}
</script>
<% if (admin.getContainer().isStandAlone()){ %>
<form action="server-status.jsp" onsubmit="return checkClick();">
<input type="submit" value="Stop" name="stop" <%= ((serverOn) ? "" : "disabled") %>>
<% if (admin.getContainer().isRestartable()){ %>
<input type="submit" value="Restart" name="restart" <%= ((serverOn) ? "" : "disabled") %>>
<% } %>
</form>
<% } else { %>
<table width=600>
<tr><td>
<span class="highlight">Note: </span><fmt:message key="short.title" bundle="${lang}" /> is running in an application server. You must stop and restart <fmt:message key="short.title" bundle="${lang}" />
by stopping or restarting your application server.</td></tr></table>
<% } %>
<p> <p>
<a href="server-props.jsp">View Server Properties</a> <a href="server-props.jsp">View Server Properties</a>
</p> </p>
......
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

Technounit-GROUP 2023