Index: core/src/main/resources/org/glassfish/admingui/core/Helplinks.properties =================================================================== --- core/src/main/resources/org/glassfish/admingui/core/Helplinks.properties (revision 31148) +++ core/src/main/resources/org/glassfish/admingui/core/Helplinks.properties (working copy) @@ -95,13 +95,13 @@ serverInstGeneralPe=ref-generaltab.html serverInstAppsConfig=ref-serverinstappsconfig.html -serverInstLoggingLevels=ref-serverinstlogginglevels.html +serverInstLoggingLevels=ref-eelogginglevels.html serverInstProfiler=ref-serverinstjvmprofiler.html serverInstDomainAttrs=ref-domainattributestab.html serverInstJvmPathSettings=ref-serverinstjvmpathsettings.html serverInstJvmGeneral=ref-serverinstjvmgeneral.html -serverInstLogging=ref-serverinstlogging.html +serverInstLogging=ref-eelogging.html serverJvmOptions=ref-serverinstjvmoptions.html serverInstAdminPassword=ref-setadminpassword.html Index: core/src/main/resources/org/glassfish/admingui/core/Strings.properties =================================================================== --- core/src/main/resources/org/glassfish/admingui/core/Strings.properties (revision 31148) +++ core/src/main/resources/org/glassfish/admingui/core/Strings.properties (working copy) @@ -776,8 +776,8 @@ # # Token Tab # -appServer.tokenTab=Token -appServer.tokenTitle=Token +appServer.tokenTab=System Properties +appServer.tokenTitle=System Properties appServer.tokenTitleHelp=A system property defines a common value for a setting at the server level. You can refer to a system property in a text field by enclosing it in a dollar sign and curly braces. # Index: common/src/main/resources/org/glassfish/common/admingui/Helplinks.properties =================================================================== --- common/src/main/resources/org/glassfish/common/admingui/Helplinks.properties (revision 31148) +++ common/src/main/resources/org/glassfish/common/admingui/Helplinks.properties (working copy) @@ -1,8 +1,8 @@ ############################## # UNDER ADMIN Service is JMX Connector tab and SSL tab ############################## -jmxConnectorEdit=jmxconnectoredit.html -jmxSSLEdit=ssltab.html +jmxConnectorEdit=ref-jmxconnectoredit.html +jmxSSLEdit=ref-jmxconnectorssledit.html ############################## # AUDIT MODULES @@ -33,12 +33,12 @@ ############################## # MESSAGE SECURITY ############################## -msgSecurityConfigs=msgsecurityconfigs.html -msgSecurityConfigEdit=msgsecurityconfigedit.html -msgSecurityConfigNew=msgsecurityconfignew.html -msgProviders=providerconfig.html -msgProviderNew=providerconfignew.html -msgProviderEdit=providerconfigedit.html +msgSecurityConfigs=ref-messagesecurityconfig.html +msgSecurityConfigEdit=ref-messagesecurityconfigedit.html +msgSecurityConfigNew=ref-messagesecurityconfignew.html +msgProviders=ref-messagesecurityproviderconfig.html +msgProviderNew=ref-messagesecurityproviderconfignew.html +msgProviderEdit=ref-messagesecurityproviderconfigedit.html ############################## # JACC PROVIDERS @@ -55,7 +55,7 @@ ############################## # Logging ############################## -loggerLevels= +loggerLevels=ref-eelogginglevels.html @@ -67,19 +67,19 @@ serverInstGeneralPe=ref-generaltab.html serverInstAppsConfig=ref-serverinstappsconfig.html -serverInstLoggingLevels=ref-serverinstlogginglevels.html +serverInstLoggingLevels=ref-eelogginglevels.html serverInstProfiler=ref-serverinstjvmprofiler.html serverInstDomainAttrs=ref-domainattributestab.html serverInstJvmPathSettings=ref-serverinstjvmpathsettings.html serverInstJvmGeneral=ref-serverinstjvmgeneral.html -serverInstLogging=ref-serverinstlogging.html +serverInstLogging=ref-eelogging.html serverJvmOptions=ref-serverinstjvmoptions.html -serverInstAdminPassword=eeadminpasswordedit.html +serverInstAdminPassword=ref-setadminpassword.html ############################## # SYSTEM PROPERTIES ############################## -systemProperties=systemproperties.html +systemProperties=ref-systemproperties.html -configuration=ref-group-configuration.html +configuration=ref-configuration.html Index: common/src/main/resources/org/glassfish/common/admingui/Strings.properties =================================================================== --- common/src/main/resources/org/glassfish/common/admingui/Strings.properties (revision 31148) +++ common/src/main/resources/org/glassfish/common/admingui/Strings.properties (working copy) @@ -40,7 +40,7 @@ msg.JS.confirmDeleteMsgSecurities=Selected Message Security Configuration(s) will be deleted. Continue? msg.JS.confirmDeleteMsgProviders=Selected Provider(s) will be deleted. Continue? msg.JS.confirmDeleteUser=Selected User(s) will be deleted. Continue? -msg.JS.confirmDeleteLifecycle=Delete the selected Lifecycle Module(s)? +msg.JS.confirmDeleteLifecycle=Selected Lifecycle Module(s) will be deleted. Continue? msg.error.noSuchProvider=No Such Provider @@ -134,7 +134,7 @@ manageUsers.GroupListHelp=Separate multiple groups with commas manageUsers.TablePageTitle=File Users manageUsers.TablePageHelp=Manage user accounts for the currently selected security realm. -manageUsers.TableTitle=Users +manageUsers.TableTitle=File Users manageAdminUsers.TableTitle=Admin Users manageUsers.EditPageTitle=Edit File Realm User manageUsers.EditPageTitleHelp=Modify existing user accounts for the currently selected security realm. Index: full/src/main/resources/org/glassfish/full/admingui/Strings.properties =================================================================== --- full/src/main/resources/org/glassfish/full/admingui/Strings.properties (revision 31148) +++ full/src/main/resources/org/glassfish/full/admingui/Strings.properties (working copy) @@ -1,101 +1,101 @@ -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common Development -# and Distribution License("CDDL") (collectively, the "License"). You -# may not use this file except in compliance with the License. You can obtain -# a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html -# or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific -# language governing permissions and limitations under the License. -# -# When distributing the software, include this License Header Notice in each -# file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. -# Sun designates this particular file as subject to the "Classpath" exception -# as provided by Sun in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the License -# Header, with the fields enclosed by brackets [] replaced by your own -# identifying information: "Portions Copyrighted [year] -# [name of copyright owner]" -# -# Contributor(s): -# -# If you wish your version of this file to be governed by only the CDDL or -# only the GPL Version 2, indicate your decision by adding "[Contributor] -# elects to include this software in this distribution under the [CDDL or GPL -# Version 2] license." If you don't indicate a single choice of license, a -# recipient has the option to distribute your version of this file under -# either the CDDL, the GPL Version 2 or to extend the choice of license to -# its licensees as provided above. However, if you add GPL Version 2 code -# and therefore, elected the GPL Version 2 license, then the option applies -# only if the new code is made subject to such option by the copyright -# holder. -# -## Java Mail Sessions -javaMailSessions.pageTitle=JavaMail Sessions -javaMailSessions.pageTitleHelp=A JavaMail session resource represents a mail session in the JavaMail API, which provides a platform-independent and protocol-independent framework to build mail and messaging applications. -javaMail.editPageTitle=Edit JavaMail Session -javaMail.editPageTitleHelp=A JavaMail session resource represents a mail session in the JavaMail API. -javaMail.newPageTitle=New JavaMail Session -javaMail.newPageTitleHelp=A JavaMail session resource represents a mail session in the JavaMail API. -javaMail.targetPageTitle=JavaMail Session Targets -javaMail.jndiHelp=A unique identifier; contain only alphanumeric, underscore, dash, or dot characters -javaMail.mailHost=Mail Host: -javaMail.mailHostHelp=DNS name of the default mail server -javaMail.user=Default User: -javaMail.userHelp=User name to provide when connecting to a mail server; must contain only alphanumeric, underscore, dash, or dot characters -javaMail.returnAddr=Default Return Address: -javaMail.returnAddrHelp=E-mail address of the default user -javaMail.descHelp=Makes it easier to find this session later -javaMail.Session=Session: -javaMail.storeProtocol=Store Protocol: -javaMail.storeProtocolHelp=Either IMAP or POP3; default is IMAP -javaMail.storeClass=Store Protocol Class: -javaMail.storeClassHelp=Default is com.sun.mail.imap.IMAPStore -javaMail.transportProtocol=Transport Protocol: -javaMail.transportProtocolHelp=Default is SMTP -javaMail.transProtocolClass=Transport Protocol Class: -javaMail.transProtocolClassHelp=Default is com.sun.mail.smtp.SMTPTransport -javaMail.Debug=Debug: -javaMail.DebugHelp=Select the Debug checkbox to enable extra debugging output for this mail session, including a protocol trace. Set to FINE or finer to generate the debugging output and include it in the system log file. - - -## Custom and JNDI Resource -customResources.pageTitle=Custom Resources -customResources.pageTitleHelp=Custom resources are nonstandard resources with a defined JNDI subcontext, resource type, and factory class. - -externalResources.pageTitle=External Resources -externalResources.pageTitleHelp=Manage external JNDI resources when you have an application that needs to locate a resource named in an external JNDI repository, such as an LDAP repository. - -jndi.pageTitle=JNDI -jndi.pageTitleHelp= -customResource.editPageTitle=Edit Custom Resource -customResource.editPageTitleHelp=Edit an existing JNDI custom resource. -customResource.newPageTitle=New Custom Resource -customResource.newPageTitleHelp=Ensure that the resource references and EJB references are linked to the configured server-wide resources, as defined by the custom-resource and external resources tags in server-xml. -customResource.targetPageTitle=Custom Resource Targets -resourcesTable.sessions=Sessions - -resourcesTable.colJndiName=JNDI Name -resourcesTable.resources=Resources -resourcesTable.colResType=Resource Type -resourcesTable.colDesc=Description -resourcesTable.resources=Resources -msg.JS.confirmDeleteCR=Selected Resource(s) will be deleted. Continue? -connectors.User=user -connectors.systemAll=system-all -connectors.systemAdmin=system-admin -connectors.systemInstance=system-instance - -jndiResource.editPageTitle=Edit External Resource -jndiResource.editPageTitleHelp=Edit existing external JNDI resources. -jndiResource.newPageTitle=New External Resource -jndiResource.newPageTitleHelp=Create an external JNDI resource so that applications can gain access to resources stored in an external repository. -externalResource.targetPageTitle=External Resource Targets -jndiResource.resTypeHelp=Enter a fully qualified type following the format xxx.xxx (for example, javax.jms.Topic) -jndiResource.factoryClass= Factory Class: -jndiResource.factoryClassHelp=Factory class for resource; implements javax.naming.spi.ObjectFactory -jndiResource.jndiLookup=JNDI Lookup: -jndiResource.jndiLookupHelp=Name used by the application to find the resource +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common Development +# and Distribution License("CDDL") (collectively, the "License"). You +# may not use this file except in compliance with the License. You can obtain +# a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html +# or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific +# language governing permissions and limitations under the License. +# +# When distributing the software, include this License Header Notice in each +# file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. +# Sun designates this particular file as subject to the "Classpath" exception +# as provided by Sun in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the License +# Header, with the fields enclosed by brackets [] replaced by your own +# identifying information: "Portions Copyrighted [year] +# [name of copyright owner]" +# +# Contributor(s): +# +# If you wish your version of this file to be governed by only the CDDL or +# only the GPL Version 2, indicate your decision by adding "[Contributor] +# elects to include this software in this distribution under the [CDDL or GPL +# Version 2] license." If you don't indicate a single choice of license, a +# recipient has the option to distribute your version of this file under +# either the CDDL, the GPL Version 2 or to extend the choice of license to +# its licensees as provided above. However, if you add GPL Version 2 code +# and therefore, elected the GPL Version 2 license, then the option applies +# only if the new code is made subject to such option by the copyright +# holder. +# +## Java Mail Sessions +javaMailSessions.pageTitle=JavaMail Sessions +javaMailSessions.pageTitleHelp=A JavaMail session resource represents a mail session in the JavaMail API, which provides a platform-independent and protocol-independent framework to build mail and messaging applications. +javaMail.editPageTitle=Edit JavaMail Session +javaMail.editPageTitleHelp=A JavaMail session resource represents a mail session in the JavaMail API. +javaMail.newPageTitle=New JavaMail Session +javaMail.newPageTitleHelp=A JavaMail session resource represents a mail session in the JavaMail API. +javaMail.targetPageTitle=JavaMail Session Targets +javaMail.jndiHelp=A unique identifier; must contain only alphanumeric, underscore, dash, or dot characters +javaMail.mailHost=Mail Host: +javaMail.mailHostHelp=DNS name of the default mail server +javaMail.user=Default User: +javaMail.userHelp=User name to provide when connecting to a mail server; must contain only alphanumeric, underscore, dash, or dot characters +javaMail.returnAddr=Default Return Address: +javaMail.returnAddrHelp=E-mail address of the default user +javaMail.descHelp=Makes it easier to find this session later +javaMail.Session=Session: +javaMail.storeProtocol=Store Protocol: +javaMail.storeProtocolHelp=Either IMAP or POP3; default is IMAP +javaMail.storeClass=Store Protocol Class: +javaMail.storeClassHelp=Default is com.sun.mail.imap.IMAPStore +javaMail.transportProtocol=Transport Protocol: +javaMail.transportProtocolHelp=Default is SMTP +javaMail.transProtocolClass=Transport Protocol Class: +javaMail.transProtocolClassHelp=Default is com.sun.mail.smtp.SMTPTransport +javaMail.Debug=Debug: +javaMail.DebugHelp=Select the Debug checkbox to enable extra debugging output for this mail session, including a protocol trace. Set to FINE or finer to generate the debugging output and include it in the system log file. + + +## Custom and JNDI Resource +customResources.pageTitle=Custom Resources +customResources.pageTitleHelp=Custom resources are nonstandard resources with a defined JNDI subcontext, resource type, and factory class. + +externalResources.pageTitle=External Resources +externalResources.pageTitleHelp=Manage external JNDI resources when you have an application that needs to locate a resource named in an external JNDI repository, such as an LDAP repository. + +jndi.pageTitle=JNDI +jndi.pageTitleHelp= +customResource.editPageTitle=Edit Custom Resource +customResource.editPageTitleHelp=Edit an existing JNDI custom resource. +customResource.newPageTitle=New Custom Resource +customResource.newPageTitleHelp=Ensure that the resource references and EJB references are linked to the configured server-wide resources, as defined by the custom-resource and external resources tags in server-xml. +customResource.targetPageTitle=Custom Resource Targets +resourcesTable.sessions=Sessions + +resourcesTable.colJndiName=JNDI Name +resourcesTable.resources=Resources +resourcesTable.colResType=Resource Type +resourcesTable.colDesc=Description +resourcesTable.resources=Resources +msg.JS.confirmDeleteCR=Selected Resource(s) will be deleted. Continue? +connectors.User=user +connectors.systemAll=system-all +connectors.systemAdmin=system-admin +connectors.systemInstance=system-instance + +jndiResource.editPageTitle=Edit External Resource +jndiResource.editPageTitleHelp=Edit existing external JNDI resources. +jndiResource.newPageTitle=New External Resource +jndiResource.newPageTitleHelp=Create an external JNDI resource so that applications can gain access to resources stored in an external repository. +externalResource.targetPageTitle=External Resource Targets +jndiResource.resTypeHelp=Enter a fully qualified type following the format xxx.xxx (for example, javax.jms.Topic) +jndiResource.factoryClass= Factory Class: +jndiResource.factoryClassHelp=Factory class for resource; implements javax.naming.spi.ObjectFactory +jndiResource.jndiLookup=JNDI Lookup: +jndiResource.jndiLookupHelp=Name used by the application to find the resource Index: jca/src/main/resources/org/glassfish/jca/admingui/Helplinks.properties =================================================================== --- jca/src/main/resources/org/glassfish/jca/admingui/Helplinks.properties (revision 31148) +++ jca/src/main/resources/org/glassfish/jca/admingui/Helplinks.properties (working copy) @@ -36,51 +36,51 @@ ############################## # CONNECTORS ############################## -connectors=connectors.html +connectors=ref-connectors.html ############################## # CONNECTOR RESOURCES ############################## -connectorResources=connectorresources.html -connectorResourceNew=connectorresourcenew.html -connectorResourceEdit=connectorresourceedit.html -connectorResourceTargets=connectorresourceedit.html +connectorResources=ref-connectorresources.html +connectorResourceNew=ref-connectorresourcenew.html +connectorResourceEdit=ref-connectorresourceedit.html +connectorResourceTargets=ref-connectorresourceedit.html ############################## # CONNECTOR CONNECTION POOLS ############################## -connectorConnectionPools=connectorconnectionpools.html -connectorConnectionPoolNew1=connectorconnectionpoolnew.html -connectorConnectionPoolNew2=connectorconnectionpoolnew.html -connectorConnectionPoolEdit=connectorconnectionpooledit.html -connectorConnectionPoolAdvance=connectorconnectionpooladvance.html -connectorConnectionPoolProperty=connectorconnectionpoolproperty.html +connectorConnectionPools=ref-connectorconnectionpools.html +connectorConnectionPoolNew1=ref-connectorconnectionpoolnew1.html +connectorConnectionPoolNew2=ref-connectorconnectionpoolnew2.html +connectorConnectionPoolEdit=ref-connectorconnectionpooledit.html +connectorConnectionPoolAdvance=ref-connectorconnectionpooladvance.html +connectorConnectionPoolProperty=ref-connectorconnectionpoolproperty.html ############################## # ADMIN OBJECT RESOURCES ############################## -adminObjectResources=adminobjectresource.html -adminObjectNew1=adminobjectnew.html -adminObjectNew2=adminobjectnew.html -adminObjectEdit=adminobjectedit.html -adminObjectTarget=adminobjectresourceedit.html +adminObjectResources=ref-adminobjectresources.html +adminObjectNew1=ref-adminobjectnew.html +adminObjectNew2=ref-adminobjectnew.html +adminObjectEdit=ref-adminobjectedit.html +adminObjectTarget=ref-adminobjectresourceedit.html ############################## # SECURITY ############################## -connectorSecurityMapNew=connectorsecuritymapnew.html -connectorSecurityMapEdit=connectorsecuritymapedit.html -connectorSecurityMaps=connectorsecuritymaps.html +connectorSecurityMapNew=ref-connectorsecuritymapnew.html +connectorSecurityMapEdit=ref-connectorsecuritymapedit.html +connectorSecurityMaps=ref-connectorsecuritymaps.html ############################## # WORK SECURITY MAP ############################## -workSecurityMapNew= -workSecurityMapEdit= -workSecurityMaps= +workSecurityMapNew=ref-worksecuritymapnew.html +workSecurityMapEdit=ref-worksecuritymapedit.html +workSecurityMaps=ref-worksecuritymaps.html ############################## # Resource Adapter Config ############################## -resouceAdapterConfigs= -resouceAdapterConfigNew= -resouceAdapterConfigEdit= \ No newline at end of file +resourceAdapterConfigs=ref-resourceadapterconfig.html +resourceAdapterConfigNew=ref-resourceadapterconfignew.html +resourceAdapterConfigEdit=ref-resourceadapterconfigedit.html Index: jca/src/main/resources/org/glassfish/jca/admingui/Strings.properties =================================================================== --- jca/src/main/resources/org/glassfish/jca/admingui/Strings.properties (revision 31148) +++ jca/src/main/resources/org/glassfish/jca/admingui/Strings.properties (working copy) @@ -38,17 +38,17 @@ ## Admin Object Resource adminObjectResources.pageTitle=Admin Object Resources -adminObjectResources.pageTitleHelp=Manages administration object resources. +adminObjectResources.pageTitleHelp=An administered object resource provides specialized functionality that is defined by the resource adapter for the deployed connector module. adminObjectResource.editPageTitle=Edit Admin Object Resource -adminObjectResource.editPageHelp=edit existing administration object resources. +adminObjectResource.editPageHelp=Modify an existing administered object resource. adminObject.NewPageTitle=New Admin Object Resource adminObject.step1PageTitle=New Admin Object Resource (Step 1 of 2) -adminObject.step1PageTitleHelp=An administered object provides specialized functionality for an application; for example, access to a parser specific to the resource adapter and its associated EIS -adminObject.step2PageTitle=New Admin Object Resource (Step 2 of 2) -adminObject.step2PageTitleHelp=Add a description for the admin object, enable or disable the object on all resources and define name-value property pairs. +adminObject.step1PageTitleHelp=An administered object provides specialized functionality for an application; for example, access to a parser specific to the resource adapter and its associated EIS. +#adminObject.step2PageTitle=New Admin Object Resource (Step 2 of 2) +#adminObject.step2PageTitleHelp=Add a description for the administered object, enable or disable the object on all resources and define name-value property pairs. adminObjectResource.targetPageTitle=Admin Object Resource Targets -adminObjectResource.resTypeHelp=Enter a fully qualified type following the format xxx.xxx. eg javax.jms.Topic +adminObjectResource.resTypeHelp=Enter a fully qualified type following the format xxx.xxx (for example, javax.jms.Topic) adminObjectResource.resourceAdapterHelp=Choose from the list of deployed resource adapters (connector modules) #Resources @@ -85,7 +85,7 @@ resource.targetPageTitleHelp=Manage the targets (clusters and standalone server instances) on which the resource is available. connectorResource.editPageTitle=Edit Connector Resource -connectorResource.editPageTitleHelp=Edit an existing Connector Resource +connectorResource.editPageTitleHelp=Modify an existing connector resource. connectorResource.targetPageTitle=Connector Resource Targets connectorResource.newPageTitle=New Connector Resource connectorResource.newPageTitleHelp=To create a connector resource, specify the connection pool with which it is associated. Multiple connector resources can use a single connection pool. @@ -94,35 +94,35 @@ connectorConnectionPool.editPageTitle=Edit Connector Connection Pool connectorConnection.editPageHelp=Click Manage Security Maps to create or modify security policies for the pool. connectorConnectionPool.step1PageTitle=New Connector Connection Pool (Step 1 of 2) -connectorConnectionPool.step1PageTitleHelp=Create a Connector Pool, select the associated Resource Adapter and Connection Definition, then click Next. +connectorConnectionPool.step1PageTitleHelp=Specify a pool name, select the associated resource adapter and connection definition, then click Next. connectorConnectionPool.step2PageTitle=New Connector Connection Pool (Step 2 of 2) -connectorConnectionPool.step2PageTitleHelp=Verify the Connection Pool settings, add properties defining the value for each property, and click Finish. +connectorConnectionPool.step2PageTitleHelp=Verify the connection pool settings, add any needed properties, and click Finish. connectorConnectionPool.connectionDefinitionName=Connection Definition: -connectorConnectionPool.connectionDefinitionNameHelp= +connectorConnectionPool.connectionDefinitionNameHelp=Interface of the connection definition connectorConnectionPool.onFail=On Any Failure: connectorConnectionPool.onFailHelp=Close all connections and reconnect on failure, otherwise reconnect only when used connectorConnectionPool.closeAll=Close All Connections connectorConnectionPool.transSupport=Transaction Support: connectorConnectionPool.transSupportHelp=Level of transaction support. Overwrite the transaction support attribute in the Resource Adapter in a downward compatible way. -connectorConnectionPool.conValidationHelp=Validate connection before passing to container. +connectorConnectionPool.conValidationHelp=Validate connection before passing to container connectorConnectionPool.validateAtmostOnce=Validation Interval: -connectorConnectionPool.validateAtmostHelp=Used to set the time-interval within which a connection is validated atmost once. +connectorConnectionPool.validateAtmostHelp=Used to set the time interval within which a connection is validated at most once connectorConnectionPool.advancePageTitle=Edit Advanced Attributes -connectorConnectionPool.advancePageTitleHelp=Modify advance attributes of existing pool. +connectorConnectionPool.advancePageTitleHelp=Modify advanced attributes of an existing connector connection pool. connectorConnectionPool.propertyPageTitle=Edit Connection Pool Properties -connectorConnectionPool.propertyPageTitleHelp=Modify properties of existing pool. +connectorConnectionPool.propertyPageTitleHelp=Modify properties of an existing connector connection pool. connectorSecurityMaps.pageTitle=Security Maps connectorSecurityMaps.pageTitleHelp=Manage security maps. Security maps enable the creation of a mapping between Java EE users and groups and EIS users and groups. connectorSecurityMaps.tableTitle=Security Maps connectorSecurityMaps.tabTitle=Security Maps connectorSecurityMap.newPageTitle=New Security Map -connectorSecurityMap.newPageTitleHelp=Create new security maps. Security maps enable the creation of a mapping between Java EE users and groups and EIS users and groups. You must specify either User Groups or Principals, but not both. +connectorSecurityMap.newPageTitleHelp=Create a new security map. Security maps enable the creation of a mapping between Java EE users and groups and EIS users and groups. You must specify either User Groups or Principals, but not both. connectorSecurityMap.editPageTitle=Edit Security Map -connectorSecurityMap.editPageTitleHelp=Edit existing security maps. Security maps enable the creation of a mapping between Java EE users and groups and EIS users and groups. You must specify either User Groups or Principals, but not both. -connectorSecurityMap.poolName=Connector Pool Name: +connectorSecurityMap.editPageTitleHelp=Modify an existing security map. +connectorSecurityMap.poolName=Connection Pool Name: connectorSecurityMap.securityMapName=Security Map Name: -connectorSecurityMap.userGroups=User Group: +connectorSecurityMap.userGroups=User Groups: connectorSecurityMap.userGroupsHelp=Example: value1,value2,value3 connectorSecurityMap.principals=Principals: connectorSecurityMap.principalsHelp=Example: value1,value2,value3 @@ -131,12 +131,12 @@ connectorSecurityMap.password=Password: workSecurityMaps.pageTitle=Work Security Maps -workSecurityMaps.pageTitleHelp= +workSecurityMaps.pageTitleHelp=A work security map maps a principal associated with an incoming work instance to a principal in the Enterprise Server's security domain. workSecurityMaps.tableTitle=Work Security Maps -workSecurityMap.newPageTitle=Work Security Map -workSecurityMap.newPageTitleHelp= +workSecurityMap.newPageTitle=New Work Security Map +workSecurityMap.newPageTitleHelp=Create a new work security map. A work security map maps a principal associated with an incoming work instance to a principal in the Enterprise Server's security domain. workSecurityMap.editPageTitle=Edit Work Security Map -workSecurityMap.editPageTitleHelp= +workSecurityMap.editPageTitleHelp=Modify an existing work security map. workSecurityMap.Group=Group workSecurityMap.Principal=Principal workSecurityMap.MappedGroup=Mapped Group @@ -148,15 +148,15 @@ workSecurityMap.PrincipalMapping=Principal Mapping workSecurityMap.GroupMapping=Group Mapping -tree.resourceAdapterConfigs=Resource Adapter Config +tree.resourceAdapterConfigs=Resource Adapter Configs resourceAdapterConfig.pageTitle=Resource Adapter Configs -resourceAdapterConfig.pageTitleHelp= +resourceAdapterConfig.pageTitleHelp=A resource adapter config provides the configuration information for a resource adapter. resourceAdapterConfig.tableTitle=Resource Adapter Configs resourceAdapterConfig.tabTitle=Configs resourceAdapterConfig.newPageTitle=New Resource Adapter Config -resourceAdapterConfig.newPageTitleHelp= +resourceAdapterConfig.newPageTitleHelp=Create a new resource adapter config. resourceAdapterConfig.editPageTitle=Edit Resource Adapter Config -resourceAdapterConfig.editPageTitleHelp= +resourceAdapterConfig.editPageTitleHelp=Modify an existing resource adapter config. resourceAdapterConfig.Name=Resource Adapter Name: resourceAdapterConfig.threadPoolId=Thread Pool IDs: resourceAdapterConfig.configs=Configs @@ -176,30 +176,30 @@ jcaPool.conValidation=Connection Validation: jcaPool.conValidationHelp=Validate connections, allow server to reconnect in case of failure jcaPool.connectionSettings=Connection Settings -jcaPool.wrapjcaObjects=Wrap jca Objects: -jcaPool.wrapjcaObjectsHelp=When set to true, application will get wrapped jca objects for Statement, PreparedStatement, CallableStatement, ResultSet, DatabaseMetaData. +jcaPool.wrapjcaObjects=Wrap JCA Objects: +jcaPool.wrapjcaObjectsHelp=When set to true, application will get wrapped JCA objects for Statement, PreparedStatement, CallableStatement, ResultSet, and DatabaseMetaData. jcaPool.statementTimeoutInSeconds=Statement Timeout: jcaPool.statementTimeoutInSecondsHelp=Timeout property of a connection to enable termination of abnormally long running queries. -1 implies that it is not enabled. jcaPool.validateAtmostOnceInSeconds=Validate At Most Once: -jcaPool.validateAtmostOnceInSecondsHelp=Time-interval within which a connection is validated at most once. 0 implies it is not enabled. +jcaPool.validateAtmostOnceInSecondsHelp=Time interval within which a connection is validated at most once. 0 implies validation is not enabled. jcaPool.connectionLeakTimeoutInSeconds=Leak Timeout: -jcaPool.connectionLeakTimeoutInSecondsHelp=0 implies no leak detection. +jcaPool.connectionLeakTimeoutInSecondsHelp=0 implies no leak detection jcaPool.connectionLeakReclaim=Leak Reclaim: jcaPool.connectionLeakReclaimHelp=If enabled, connection will be reusable (put back into pool) after connection leak timeout occurs. jcaPool.connectionCreationRetryAttempts=Creation Retry Attempts: jcaPool.connectionCreationRetryAttemptsHelp=Number of attempts to create a new connection. 0 implies no retries. jcaPool.connectionCreationRetryIntervalInSeconds=Retry Interval: -jcaPool.connectionCreationRetryIntervalInSecondsHelp=Time interval between retries while attempting to create a connection. Effective when Creation Retry Attempts is greater than 0. +jcaPool.connectionCreationRetryIntervalInSecondsHelp=Time interval between retries while attempting to create a connection. Effective when Creation Retry Attempts value is greater than 0. jcaPool.lazyConnectionEnlistment=Lazy Connection Enlistment: jcaPool.lazyConnectionEnlistmentHelp=Enlist a resource to the transaction only when it is actually used in a method jcaPool.lazyConnectionAssociation=Lazy Association: -jcaPool.lazyConnectionAssociationHelp=Connections are lazily associated when an operation is performed on them. +jcaPool.lazyConnectionAssociationHelp=Connections are lazily associated when an operation is performed on them jcaPool.associationWithThread=Associate with Thread: -jcaPool.associationWithThreadHelp=When the same thread is in need of a connection, it can reuse the connection already associated with that thread, +jcaPool.associationWithThreadHelp=When the same thread is in need of a connection, it can reuse the connection already associated with that thread. jcaPool.matchConnections=Match Connections: -jcaPool.matchConnectionsHelp=To switch on/off connection matching for the pool. +jcaPool.matchConnectionsHelp=Turn connection matching for the pool on or off jcaPool.maxConnectionUsageCount=Max Connection Usage : -jcaPool.maxConnectionUsageCountHelp=Connections will be re-used by the pool for the specified number of times after which it will be closed. 0 implies the feature is not enabled. +jcaPool.maxConnectionUsageCountHelp=Connections will be reused by the pool for the specified number of times, after which they will be closed. 0 implies the feature is not enabled. msg.JS.confirmDeleteSM=Selected Security Map(s) will be deleted. Continue? Index: jruby/src/main/resources/org/glassfish/jruby/admingui/Helplinks.properties =================================================================== --- jruby/src/main/resources/org/glassfish/jruby/admingui/Helplinks.properties (revision 31148) +++ jruby/src/main/resources/org/glassfish/jruby/admingui/Helplinks.properties (working copy) @@ -34,5 +34,5 @@ # holder. # -jrubyContainer= +jrubyContainer=ref-configrubycontainer.html Index: jython/src/main/resources/org/glassfish/jython/admingui/Strings.properties =================================================================== --- jython/src/main/resources/org/glassfish/jython/admingui/Strings.properties (revision 31148) +++ jython/src/main/resources/org/glassfish/jython/admingui/Strings.properties (working copy) @@ -1,44 +1,44 @@ -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common Development -# and Distribution License("CDDL") (collectively, the "License"). You -# may not use this file except in compliance with the License. You can obtain -# a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html -# or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific -# language governing permissions and limitations under the License. -# -# When distributing the software, include this License Header Notice in each -# file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. -# Sun designates this particular file as subject to the "Classpath" exception -# as provided by Sun in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the License -# Header, with the fields enclosed by brackets [] replaced by your own -# identifying information: "Portions Copyrighted [year] -# [name of copyright owner]" -# -# Contributor(s): -# -# If you wish your version of this file to be governed by only the CDDL or -# only the GPL Version 2, indicate your decision by adding "[Contributor] -# elects to include this software in this distribution under the [CDDL or GPL -# Version 2] license." If you don't indicate a single choice of license, a -# recipient has the option to distribute your version of this file under -# either the CDDL, the GPL Version 2 or to extend the choice of license to -# its licensees as provided above. However, if you add GPL Version 2 code -# and therefore, elected the GPL Version 2 license, then the option applies -# only if the new code is made subject to such option by the copyright -# holder. -# - -jythonHome=Jython Home: -jythonHomeHelp=Path to Jython installation -mediaRoot=Media Root: -mediaRootHelp=Optional parameter containing the location for GlassFish to serve static files from. If not specified, GlassFish will not attempt to serve static files unless the static files are placed at the GlassFish docroot. -frameworkRoot=Framework Root: -frameworkRootHelp=Optional parameter containing the path to the framework to be used (currently Django). This will be added to the python path during app creation. Default is null. -appType=Application Type: -appTypeHelp=Type of application or module +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common Development +# and Distribution License("CDDL") (collectively, the "License"). You +# may not use this file except in compliance with the License. You can obtain +# a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html +# or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific +# language governing permissions and limitations under the License. +# +# When distributing the software, include this License Header Notice in each +# file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. +# Sun designates this particular file as subject to the "Classpath" exception +# as provided by Sun in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the License +# Header, with the fields enclosed by brackets [] replaced by your own +# identifying information: "Portions Copyrighted [year] +# [name of copyright owner]" +# +# Contributor(s): +# +# If you wish your version of this file to be governed by only the CDDL or +# only the GPL Version 2, indicate your decision by adding "[Contributor] +# elects to include this software in this distribution under the [CDDL or GPL +# Version 2] license." If you don't indicate a single choice of license, a +# recipient has the option to distribute your version of this file under +# either the CDDL, the GPL Version 2 or to extend the choice of license to +# its licensees as provided above. However, if you add GPL Version 2 code +# and therefore, elected the GPL Version 2 license, then the option applies +# only if the new code is made subject to such option by the copyright +# holder. +# + +jythonHome=Jython Home: +jythonHomeHelp=Path to Jython installation +mediaRoot=Media Root: +mediaRootHelp=Optional parameter containing the location for GlassFish to serve static files from. If not specified, GlassFish will not attempt to serve static files unless the static files are placed at the GlassFish docroot. +frameworkRoot=Framework Root: +frameworkRootHelp=Optional parameter containing the path to the framework to be used (currently Django). This will be added to the python path during app creation. Default is null. +appType=Application Type: +appTypeHelp=Type of application or module Index: web/src/main/resources/org/glassfish/web/admingui/Strings.properties =================================================================== --- web/src/main/resources/org/glassfish/web/admingui/Strings.properties (revision 31148) +++ web/src/main/resources/org/glassfish/web/admingui/Strings.properties (working copy) @@ -407,7 +407,7 @@ fileCache.MaxFileCountHelp=Maximum number of files in the file cache ## Web Container -headings.webGeneral=General properties +headings.webGeneral=General Properties webSession.sessionTimeoutLabel=Session Timeout: webSession.sessionTimeoutHelp=Maximum number of seconds that an inactive session remains valid. A value of 0 or less means that sessions never expire. webManager.reapIntervalLabel=Reap Interval: