Merged in Cousjath/payara/PAYARA-3094-maint-5183 (pull request payara…

…#460) PAYARA-3094 Add helptext for MaxSessions in the admin console
MeroRai · Sep 12, 2018 · bd0d913 · bd0d913
2 parents 4b83aba + 1cdb39b
commit bd0d913
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/appserver/admingui/web/src/main/resources/configuration/webContainerManager.jsf b/appserver/admingui/web/src/main/resources/configuration/webContainerManager.jsf
@@ -39,6 +39,7 @@
     holder.
 
 -->
+<!-- Portions Copyright [2018] Payara Foundation and/or affiliates -->
 
 <!-- configuration/webContainerManager.jsf -->
 
@@ -84,7 +85,7 @@
             <sun:textField id="ReapInterval" styleClass="integer" columns="$int{20}" maxLength="#{sessionScope.fieldLengths['maxLength.webManager.reapInterval']}" text="#{pageSession.valueMap['reapIntervalInSeconds']}" />
             <sun:staticText id="sec" style="padding: 8pt" text="$resource{i18n.common.Seconds}"/>
         </sun:property>
-        <sun:property id="MaxSessionsProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n_web.webManager.maxSessionsLabel}" >
+        <sun:property id="MaxSessionsProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n_web.webManager.maxSessionsLabel}" helpText="$resource{i18n_web.webManager.maxSessionsHelp}>
             <sun:textField id="MaxSessions" styleClass="intAllowMinusOne" columns="$int{20}" maxLength="#{sessionScope.fieldLengths['maxLength.webManager.maxSessions']}" text="#{pageSession.valueMap['maxSessions']}" />
         </sun:property>
         <sun:property id="SessFileNameProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n_web.webManager.sessFileNameLabel}" helpText="$resource{i18n_web.webManager.sessFileNameHelp}" >

diff --git a/appserver/admingui/web/src/main/resources/org/glassfish/web/admingui/Strings.properties b/appserver/admingui/web/src/main/resources/org/glassfish/web/admingui/Strings.properties
@@ -409,7 +409,7 @@ webSession.sessionTimeoutHelp=Maximum number of seconds that an inactive session
 webManager.reapIntervalLabel=Reap Interval:
 webManager.reapIntervalHelp=Number of seconds until inactive session data is deleted.
 webManager.maxSessionsLabel=Max Sessions:
-webManager.maxSessionsHelp=Maximum number of sessions that can be in cache.
+webManager.maxSessionsHelp=Maximum number of active sessions. A setting of -1 is for an infinite amount.
 webManager.sessFileNameLabel=Session File Name:
 webManager.sessFileNameHelp=The file containing session data.
 webManager.sessionIdGenLabel=Session ID Generator Class Name:
@@ -497,4 +497,4 @@ httpListenerNewPageTitle=New HTTP Listener
 httpListenerNewPageTitleHelp=Use the <a href="#{request.contextPath}/web/grizzly/networkListenerNew.jsf?configName=#{pageSession.encodedConfigName}">New Network Listener </a> page for more <a href="#{request.contextPath}/web/grizzly/networkListenerNew.jsf?configName=#{pageSession.encodedConfigName}">Advanced</a> configuration, including specifying Protocol and Transport for creating a new listener.
 httpListener.protocol.alreadyExist=Protocol named {0} already exists. Cannot add duplicate protocol.
 configuration.httpListenerEditPageTitle=Edit HTTP Listener
-configuration.httpListenerEditPageTitleHelp=Use the <a href="#{request.contextPath}/web/grizzly/networkListenerEdit.jsf?configName=#{pageSession.encodedConfigName}&name=#{pageSession.encodedName}">Edit Network Listener </a> page for more <a href="#{request.contextPath}/web/grizzly/networkListenerEdit.jsf?configName=#{pageSession.encodedConfigName}&name=#{pageSession.encodedName}">Advanced</a> configuration changes.
+configuration.httpListenerEditPageTitleHelp=Use the <a href="#{request.contextPath}/web/grizzly/networkListenerEdit.jsf?configName=#{pageSession.encodedConfigName}&name=#{pageSession.encodedName}">Edit Network Listener </a> page for more <a href="#{request.contextPath}/web/grizzly/networkListenerEdit.jsf?configName=#{pageSession.encodedConfigName}&name=#{pageSession.encodedName}">Advanced</a> configuration changes.