Commit 4f4a8556 authored by Thiago Camargo's avatar Thiago Camargo Committed by thiago

Resources Usage

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@6809 b35dd754-fafc-0310-a699-88a17e54d16e
parent ccecf102
...@@ -81,9 +81,7 @@ ...@@ -81,9 +81,7 @@
<body> <body>
<p> <p>
The media proxy enables clients to make rich media (including VoIP) connections to one another <fmt:message key="mediaproxy.desc" /><br>
when peer to peer connections fail, such as when one or both clients are behind a
strict firewall.<br>
</p> </p>
<% if (success) { %> <% if (success) { %>
...@@ -94,7 +92,7 @@ ...@@ -94,7 +92,7 @@
<tr> <tr>
<td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" alt="Success" <td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" alt="Success"
border="0"></td> border="0"></td>
<td class="jive-icon-label">Settings updated successfully.</td> <td class="jive-icon-label"><fmt:message key="mediaproxy.settings.success" /></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -105,7 +103,7 @@ ...@@ -105,7 +103,7 @@
<form action="media-proxy.jsp" method="post"> <form action="media-proxy.jsp" method="post">
<div class="jive-contentBoxHeader"> <div class="jive-contentBoxHeader">
Media Proxy Settings <fmt:message key="mediaproxy.form.label" />
</div> </div>
<div class="jive-contentBox"> <div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0"> <table cellpadding="3" cellspacing="0" border="0">
...@@ -117,34 +115,33 @@ ...@@ -117,34 +115,33 @@
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb02"> <label for="rb02">
<b>Enabled</b> <b><fmt:message key="mediaproxy.form.enabled" /></b>
- This server will act as a media proxy. - <fmt:message key="mediaproxy.form.enabled.desc" />
</label> </label>
<br> <br>
<table> <table>
<tr> <tr>
<td>Session Idle Timeout (in seconds):&nbsp; <td><fmt:message key="mediaproxy.form.idletimeout" />:&nbsp;
</td> </td>
<td> <td>
<input type="text" size="5" maxlength="8" <input type="text" size="5" maxlength="8"
name="idleTimeout" name="idleTimeout"
value="<%=mediaProxyService.getIdleTime()/1000%>" value="<%=mediaProxyService.getIdleTime()/1000%>"
align="left"> &nbsp;<i>This value is usually bigger than 15 seconds.</i> align="left"> &nbsp;<i><fmt:message key="mediaproxy.form.idletimeout.tip" /></i>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Session Life Time (in seconds):&nbsp; <td><fmt:message key="mediaproxy.form.lifetime" />:&nbsp;
</td> </td>
<td> <td>
<input type="text" size="5" maxlength="8" <input type="text" size="5" maxlength="8"
name="lifetime" name="lifetime"
value="<%=mediaProxyService.getLifetime()%>" value="<%=mediaProxyService.getLifetime()%>"
align="left"> &nbsp;<i>Life Time is the maximum time that a Session can align="left"> &nbsp;<i><fmt:message key="mediaproxy.form.lifetime.tip" /></i>
lives. After this time it is destroyed, even if it stills active.</i>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Port Range Min:&nbsp; <td><fmt:message key="mediaproxy.form.minport" />:&nbsp;
</td> </td>
<td> <td>
<input type="text" size="7" maxlength="20" name="minport" <input type="text" size="7" maxlength="20" name="minport"
...@@ -152,7 +149,7 @@ ...@@ -152,7 +149,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> Port Range Max:&nbsp; <td><fmt:message key="mediaproxy.form.maxport" />:&nbsp;
</td> </td>
<td> <td>
<input type="text" size="7" maxlength="20" name="maxport" <input type="text" size="7" maxlength="20" name="maxport"
...@@ -173,8 +170,8 @@ ...@@ -173,8 +170,8 @@
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb01"> <label for="rb01">
<b>Disabled</b> <b><fmt:message key="mediaproxy.form.disabled" /></b>
- This server will not act as a media proxy. - <fmt:message key="mediaproxy.form.disabled.desc" />
</label> </label>
</td> </td>
</tr> </tr>
...@@ -187,9 +184,8 @@ ...@@ -187,9 +184,8 @@
<% if (mediaProxyService.isEnabled()) { %> <% if (mediaProxyService.isEnabled()) { %>
<p> <p>
<b>Active Sessions Summary</b><br> <b><fmt:message key="mediaproxy.summary.label" /></b><br>
Sessions are Media Proxy Channels that controls packet relaying. <fmt:message key="mediaproxy.summary.desc" />
The list below shows current sessions running and which user created the channel.
</p> </p>
<div class="jive-table"> <div class="jive-table">
...@@ -197,12 +193,12 @@ ...@@ -197,12 +193,12 @@
<thead> <thead>
<tr> <tr>
<th>&nbsp;</th> <th>&nbsp;</th>
<th nowrap align="left" valign="middle">Creator</th> <th nowrap align="left" valign="middle"><fmt:message key="mediaproxy.summary.session.creator" /></th>
<th nowrap align="left" valign="middle">Port A</th> <th nowrap align="left" valign="middle"><fmt:message key="mediaproxy.summary.session.port" /> A</th>
<th nowrap align="left" valign="middle">Port B</th> <th nowrap align="left" valign="middle"><fmt:message key="mediaproxy.summary.session.port" /> B</th>
<th nowrap align="left" valign="middle">Server</th> <th nowrap align="left" valign="middle"><fmt:message key="mediaproxy.summary.session.server" /></th>
<th nowrap align="left" valign="middle">Inactivity(secs)</th> <th nowrap align="left" valign="middle"><fmt:message key="mediaproxy.summary.session.inactivity" /></th>
<th nowrap align="left" valign="middle">Type</th> <th nowrap align="left" valign="middle"><fmt:message key="mediaproxy.summary.session.type" /></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -213,7 +209,7 @@ ...@@ -213,7 +209,7 @@
%> %>
<tr> <tr>
<td align="center" colspan="7"> <td align="center" colspan="7">
No active Agents <fmt:message key="mediaproxy.summary.session.noactive" />
</td> </td>
</tr> </tr>
...@@ -257,7 +253,7 @@ ...@@ -257,7 +253,7 @@
</tbody> </tbody>
</table> </table>
<form action=""> <form action="">
<input type="submit" name="stop" value="Stop Active Sessions"/> <input type="submit" name="stop" value="<fmt:message key="mediaproxy.summary.stopbutton" />"/>
</form> </form>
</div> </div>
......
...@@ -14,6 +14,9 @@ ...@@ -14,6 +14,9 @@
<%@ page import="java.net.InetAddress" %> <%@ page import="java.net.InetAddress" %>
<%@ page import="java.util.List" %> <%@ page import="java.util.List" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<script type="text/javascript"> <script type="text/javascript">
function checkAndSubmit() { function checkAndSubmit() {
...@@ -26,11 +29,11 @@ ...@@ -26,11 +29,11 @@
var msg = ""; var msg = "";
if (ip1 == ip2) { if (ip1 == ip2) {
msg += "* The selected IP values are not valid. Please select different IPs."; msg += "<fmt:message key="stun.settings.alert.notvalidip" />";
} }
if (port1 == port2) { if (port1 == port2) {
if (msg != "") msg += "\n"; if (msg != "") msg += "\n";
msg += "* The selected port numbers are not valid. Please select different port numbers." msg += "<fmt:message key="stun.settings.alert.notvalidip" />";
} }
if (msg == "") { if (msg == "") {
...@@ -83,14 +86,13 @@ ...@@ -83,14 +86,13 @@
%> %>
<html> <html>
<head> <head>
<title>STUN Server Settings</title> <title><fmt:message key="stun.settings.title" /></title>
<meta name="pageID" content="stun-settings"/> <meta name="pageID" content="stun-settings"/>
</head> </head>
<body> <body>
<p> <p>
Use the form below to manage STUN Server settings.<br> <fmt:message key="stun.settings.desc" />
A STUN need at least two different IPs in the same machine to run and two different port numbers on each IP.
</p> </p>
<% if (success) { %> <% if (success) { %>
...@@ -101,7 +103,7 @@ ...@@ -101,7 +103,7 @@
<tr> <tr>
<td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" <td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16"
border="0" alt="Success"></td> border="0" alt="Success"></td>
<td class="jive-icon-label">Settings updated successfully.</td> <td class="jive-icon-label"><fmt:message key="stun.settings.success" /></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -116,8 +118,7 @@ ...@@ -116,8 +118,7 @@
<tr> <tr>
<td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" <td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16"
border="0"></td> border="0"></td>
<td class="jive-icon-label">Server cannot started. Check your port <td class="jive-icon-label"><fmt:message key="stun.settings.error" />
numbers and Primary and Secondary addresses.
</td> </td>
</tr> </tr>
</tbody> </tbody>
...@@ -129,17 +130,17 @@ ...@@ -129,17 +130,17 @@
<form action="" method="post" name="settings"> <form action="" method="post" name="settings">
<div class="jive-contentBoxHeader"> <div class="jive-contentBoxHeader">
STUN Server Settings <fmt:message key="stun.settings.title" />
</div> </div>
<div class="jive-contentBox"> <div class="jive-contentBox">
<p> <p>
The settings will just take effects after savings settings. <fmt:message key="stun.settings.comment" />
</p> </p>
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0" width="100%">
<tbody> <tbody>
<tr> <tr>
<td align="left">Primary Address:&nbsp<select size="1" <td align="left"><fmt:message key="stun.settings.primaryaddress" />:&nbsp<select size="1"
maxlength="100" maxlength="100"
name="primaryAddress" name="primaryAddress"
align="left"> align="left">
...@@ -161,8 +162,7 @@ ...@@ -161,8 +162,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td align="left"> Secondary <td align="left"> <fmt:message key="stun.settings.secondaryaddress" />:&nbsp<select size="1"
Address:&nbsp<select size="1"
maxlength="100" maxlength="100"
name="secondaryAddress" name="secondaryAddress"
align="left"> align="left">
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td align="left">Primary Port Value:&nbsp<input type="text" size="20" <td align="left"> <fmt:message key="stun.settings.primaryport" />:&nbsp<input type="text" size="20"
maxlength="100" maxlength="100"
name="primaryPort" name="primaryPort"
value="<%=stunService.getPrimaryPort()%>" value="<%=stunService.getPrimaryPort()%>"
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td align="left">Secondary Port Value:&nbsp<input type="text" size="20" <td align="left"><fmt:message key="stun.settings.secondaryport" />:&nbsp<input type="text" size="20"
maxlength="100" maxlength="100"
name="secondaryPort" name="secondaryPort"
value="<%=stunService.getSecondaryPort()%>" value="<%=stunService.getSecondaryPort()%>"
...@@ -197,7 +197,7 @@ ...@@ -197,7 +197,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td align="left">Enabled:&nbsp<input type="checkbox" <td align="left"><fmt:message key="stun.settings.enabled" />:&nbsp<input type="checkbox"
name="enabled" name="enabled"
<%=stunService.isEnabled()?"checked":""%> <%=stunService.isEnabled()?"checked":""%>
align="left"> align="left">
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
</table> </table>
</div> </div>
<input type="hidden" name="save"> <input type="hidden" name="save">
<input type="button" name="set" value="Change" onclick="checkAndSubmit()"> <input type="button" name="set" value="<fmt:message key="stun.settings.change" />" onclick="checkAndSubmit()">
</form> </form>
</body> </body>
</html> </html>
\ No newline at end of file
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