Index: corba/src/main/resources/org/glassfish/corba/admingui/Strings.properties =================================================================== --- corba/src/main/resources/org/glassfish/corba/admingui/Strings.properties (revision 31239) +++ corba/src/main/resources/org/glassfish/corba/admingui/Strings.properties (working copy) @@ -39,7 +39,7 @@ ## ORB headings.Orb=ORB -orb.OrbInfo=The Object Request Broker (ORB) is the central component of CORBA. The ORB provides the required infrastructure to identify and locate objects, handle connection management, deliver data, and request communication. Remote clients of enterprise beans (EJB modules) communicate with the Application Server using the ORB. +orb.OrbInfo=The Object Request Broker (ORB) is the central component of CORBA. The ORB provides the required infrastructure to identify and locate objects, handle connection management, deliver data, and request communication. Remote clients of enterprise beans (EJB modules) communicate with the Enterprise Server using the ORB. orb.maxMsgSizeLabel=Max Message Fragment Size: orb.maxMsgSizeHelp=IIOP 1.2 message body size orb.totalConnsLabel=Total Connections: Index: common/src/main/resources/org/glassfish/common/admingui/Strings.properties =================================================================== --- common/src/main/resources/org/glassfish/common/admingui/Strings.properties (revision 31239) +++ common/src/main/resources/org/glassfish/common/admingui/Strings.properties (working copy) @@ -188,7 +188,7 @@ msgSecProvider.responsePolicyLabel=Response Policy msgSecProvider.authSourceResponseHelp=Type of authentication to be applied to response messages msgSecProvider.NewPageTitle=New Provider Configuration -msgSecProvider.NewPageTitleHelp=Specify the configuration of a security provider and add it to the SOAP message layer (currently the only layer at which the Application Server containers invoke providers). +msgSecProvider.NewPageTitleHelp=Specify the configuration of a security provider and add it to the SOAP message layer (currently the only layer at which the Enterprise Server containers invoke providers). msgSecProvider.defaultProviderLabel=Default Provider: msgSecProvider.ProviderIdHelp=Name to use when referencing the provider @@ -317,7 +317,7 @@ jvmReport.ThDump=Thread Dump lifecycleModules.title=Lifecycle Modules -lifecycleModules.titleHelp=A lifecycle module performs tasks when it is triggered by one or more events in the server's lifecycle. Possible trigger server events are: initialization, startup, ready to service requests, and shutdown. Lifecycle modules are not part of the Java specification, but are an enhancement to the Application Server. +lifecycleModules.titleHelp=A lifecycle module performs tasks when it is triggered by one or more events in the server's lifecycle. Possible trigger server events are: initialization, startup, ready to service requests, and shutdown. Lifecycle modules are not part of the Java specification, but are an enhancement to the Enterprise Server. lifecycleModule.editPageTitle=Edit Lifecycle Module lifecycleModule.editPageTitleHelp=Modify an existing lifecycle module. lifecycleModule.newPageTitle=New Lifecycle Module @@ -450,7 +450,7 @@ support.entTechTips=Enterprise Java Tech Tips support.gfIssues=GlassFish Issues support.bugList=List of bugs fixed in the past week -support.supportAndService=Application Server Support and Services +support.supportAndService=Enterprise Server Support and Services support.s1=Gain flexibility and support on a global scale 24/7. Count on Sun's full enterprise support whenever you need it. support.training=Training and Certification support.t1=Find out about training and various Sun certification courses for programmers and enterprise architects, preparation methods, and savings programs. Index: core/src/main/resources/org/glassfish/admingui/core/Strings.properties =================================================================== --- core/src/main/resources/org/glassfish/admingui/core/Strings.properties (revision 31239) +++ core/src/main/resources/org/glassfish/admingui/core/Strings.properties (working copy) @@ -68,7 +68,7 @@ tree.clusters=Clusters tree.standaloneInstances=Stand-Alone Instances tree.nodeAgents=Node Agents -tree.appServer=Application Server +tree.appServer=Enterprise Server tree.loadBalancers=HTTP Load Balancers tree.applications=Applications tree.enterpriseApps=Enterprise Applications @@ -182,13 +182,13 @@ display.Navigation=Display Navigation Tree display.contentArea=Content Area -loginButtonTooltip=Log In to Sun GlassFish Application Server +loginButtonTooltip=Log In to Sun GlassFish Enterprise Server loginPageTitle=Login masthead.Home=Home masthead.Version=Version masthead.Help=Help masthead.Logout=Logout -logoutTooltip=Logout from Admin Console +logoutTooltip=Logout from Administration Console helpWindowTitle=Help Window homeLinkTooltip=Return to Application Home Page versionTooltip=Display Product Version. (Opens a new window) @@ -200,17 +200,17 @@ masthead.serverInfoLabel=Server: masthead.domainInfoLabel=Domain: -msg.JS.confirmStopInstance=Stop the Application Server Instance ? -msg.JS.confirmRestartInstance=Restart the Application Server Instance ? -msg.JS.confirmStopInstances=Stop the selected Application Server Instance(s)? -msg.JS.confirmStartInstances=Start the selected Application Server Instance(s)? +msg.JS.confirmStopInstance=Stop the Enterprise Server Instance ? +msg.JS.confirmRestartInstance=Restart the Enterprise Server Instance ? +msg.JS.confirmStopInstances=Stop the selected Enterprise Server Instance(s)? +msg.JS.confirmStartInstances=Start the selected Enterprise Server Instance(s)? msg.JS.confirmStartCluster=Start the Cluster ? msg.JS.confirmStartClusters=Start the selected Cluster(s) ? msg.JS.confirmStopCluster=Stop the Cluster? msg.JS.confirmStopClusters=Stop the selected Cluster(s)? -msg.JS.confirmLogout=Log Out of Application Server Admin Console +msg.JS.confirmLogout=Log Out of Sun GlassFish Administration Console msg.JS.selectValue=Select a value for msg.JS.enterValue=Enter a value for msg.JS.enterNumericValue=Enter a numeric value for @@ -238,7 +238,7 @@ msg.JS.deploy.confirmType=Selected file does not match Application type. Continue deployment? msg.JS.redeploy.typeUnmatch=Selected file does not match Application type. Select again. msg.JS.redeploy.fileReqd=Please select a file to (re)deploy. -msg.JS.confirmStop=Stop the Application Server Instance? +msg.JS.confirmStop=Stop the Enterprise Server Instance? msg.JS.clearDataConfirm=Resets all statistics for selected server? msg.JS.improperEmail=Email Address is improperly formatted msg.EmptyOverrideValue=Override value cannot be empty. Please enter a valid number. @@ -297,7 +297,7 @@ # begin Common Tasks keys commonTasks.title=Common Tasks -commonTasks.welcome=Welcome to the Sun GlassFish Application Server +commonTasks.welcome=Welcome to the Sun GlassFish Enterprise Server commonTasks.help= commonTasks.group.tasks=Common Tasks commonTasks.group.docs=Documentation @@ -409,27 +409,27 @@ commonTasks.task.regAndSupport=GlassFish News commonTasks.task.subscriptions=Subscriptions -commonTasks.task.subscriptions.infoText=Get the latest predictable, scalable and simple subscription-based pricing for Sun Java System Application Server 9.1 +commonTasks.task.subscriptions.infoText=Get the latest predictable, scalable and simple subscription-based pricing for Sun GlassFish Enterprise Server commonTasks.task.subscriptions.infoTitle=Subscriptions commonTasks.task.subscriptions.infoLinkText=More on Subscriptions commonTasks.task.subscriptions.toolTip=GlassFish Subscriptions commonTasks.task.qstart=Quick Start Guide -commonTasks.task.qstart.infoText=Basic steps for starting the application server, and for packaging and deploying applications. It also provides information about the Admin Console and command-line tools. +commonTasks.task.qstart.infoText=Basic steps for starting the application server, and for packaging and deploying applications. It also provides information about the Administration Console and command-line tools. commonTasks.task.qstart.infoTitle=Quick Start Guide commonTasks.task.qstart.infoLinkText=More on Quick Start Guide commonTasks.task.qstart.toolTip=Quick Start Guide commonTasks.task.adminGuide=Administration Guide -commonTasks.task.adminGuide.infoText=How to configure, administer, and monitor the Application Server. +commonTasks.task.adminGuide.infoText=How to configure, administer, and monitor the Enterprise Server. commonTasks.task.adminGuide.infoTitle=Administration Guide commonTasks.task.adminGuide.infoLinkText=More on Administration Guide commonTasks.task.adminGuide.toolTip=Administration Guide commonTasks.task.devGuide=Developer's Guide -commonTasks.task.devGuide.infoText=How to create and run Java EE applications in the Application Server environment. Topics include developer tools, security, debugging, and creating lifecycle modules. +commonTasks.task.devGuide.infoText=How to create and run Java EE applications in the Enterprise Server environment. Topics include developer tools, security, debugging, and creating lifecycle modules. commonTasks.task.devGuide.infoTitle=Developer's Guide commonTasks.task.devGuide.infoLinkText=More on Developer's Guide commonTasks.task.devGuide.toolTip=Developer's Guide commonTasks.task.deployGuide=Application Deployment Guide -commonTasks.task.deployGuide.infoText=How to deploy applications and application components to the Application Server. Includes information about deployment descriptors. +commonTasks.task.deployGuide.infoText=How to deploy applications and application components to the Enterprise Server. Includes information about deployment descriptors. commonTasks.task.deployGuide.infoTitle=Application Deployment Guide commonTasks.task.deployGuide.infoLinkText=More on Application Deployment Guide commonTasks.task.deployGuide.toolTip=Application Deployment Guide @@ -451,7 +451,7 @@ #common common.true=true common.false=false -common.AdminConsole=Admin Console +common.AdminConsole=Administration Console common.Enabled=Enabled common.LbEnabled=Load Balancer Enabled common.Ignore=Ignore @@ -650,7 +650,7 @@ log.LogLevels=Log Levels log.Log=Log log.LoggingSettings=Logger Settings -log.LoggingSettingsHelp=Application Server logging messages are recorded in the server log. +log.LoggingSettingsHelp=Enterprise Server logging messages are recorded in the server log. log.LogFile=Log File: log.LogFileHelp=Rename or relocate the server log file using absolute path log.Alarms=Alarms @@ -828,7 +828,7 @@ appclients.title=Application Client Modules applicents.titleHelp=An application client module, also called a Java application client JAR, contains the server-side routines for the client. appsPageTitle=Applications -appsPageTitleHelp=Define or manage applications deployed on the Application Server. +appsPageTitleHelp=Define or manage applications deployed on the Enterprise Server. connectorModules.title=Connector Modules connectorModules.titleHelp=A connector module is used to connect to an Enterprise Information System (EIS) and is packaged in a RAR (Resource Adapter Archive) file or directory. ejbModules.title=EJB Modules @@ -892,7 +892,7 @@ resourcesPageTitle=Resources -resourcesPageTitleHelp=Define or manage resources available on the Application Server. +resourcesPageTitleHelp=Define or manage resources available on the Enterprise Server. configuration.pageTitle=Configuration configuration.pageTitleHelp= @@ -966,7 +966,7 @@ # Monitoring # monitoring.Title=Monitoring Service -monitoring.PageHelp=Enable or disable monitoring for individual server components or services. To enable monitoring for a component or service, select either LOW or HIGH for that component or service. To view monitoring information, click Application Server in the tree, then click the Monitor tab. +monitoring.PageHelp=Enable or disable monitoring for individual server components or services. To enable monitoring for a component or service, select either LOW or HIGH for that component or service. To view monitoring information, click Enterprise Server in the tree, then click the Monitor tab. monitoring.Jvm=JVM: monitoring.Http=HTTP Service: monitoring.TransactionService=Transaction Service: @@ -1021,7 +1021,7 @@ deploy.threadpoolidHelp= deploy.type=Application Type: -deploy.chooseLocal=Local Packaged File or Directory That Is Accessible from the Application Server +deploy.chooseLocal=Local Packaged File or Directory That Is Accessible from the Enterprise Server deploy.warning=Deployment has succeeded with following warning, please look at the log file for details deploy.descHelp= redeploy.pageTitle=Redeploy Applications or Modules @@ -1148,7 +1148,7 @@ transactionId.Id=Id updateCenter.pageTitle=Update Center -updateCenter.pageTitleHelp=Use the Update Center to install and update additional technologies and frameworks such as Open ESB,jMaki, and JRuby. The Update Center is a local application that requires the Application Server. To start the Update Center, type the command that is listed in the Update Center Command field of this page. Refer to the Getting Started Guide for more information. +updateCenter.pageTitleHelp=Use the Update Center to install and update additional technologies and frameworks such as Open ESB,jMaki, and JRuby. The Update Center is a local application that requires the Enterprise Server. To start the Update Center, type the command that is listed in the Update Center Command field of this page. Refer to the Getting Started Guide for more information. updateCenter.newUpdates=Number of New Updates: updateCenter.newSoftware=Number of New Software Modules: updateCenter.toolsLocation=Update Center Command: @@ -1240,11 +1240,11 @@ ############ the following is not used in v3 or moved to other module. #reged.PageTitle=Product Registration -#reged.PageTitleHelp=This Application Server has been registered. +#reged.PageTitleHelp=This Enterprise Server has been registered. #reged.serviceTag=Service Tag: #reged.regDate=Registration Date: #reged.by=Registered by: -#reged.docTip=Documentation for Application Server +#reged.docTip=Documentation for Enterprise Server #reged.forum=Get Community Support #reged.deploymentStory=Learn about GlassFish Deployment @@ -1279,10 +1279,10 @@ #resourcesMonitoring.PageTitle=Monitoring Resources #moduleLogLevelPageHelp=Specify log levels for individual server modules. Corresponding loggers are shown in parenthesis. Use the Add Property button to set log levels for application loggers. The default log level in all cases is INFO. The available settings are: #monitoringApplicationsPageHelp=View monitorable attributes for applications and components. Before monitoring data can be viewed, monitoring must be turned on for that application or component. Click Configure Monitoring to set monitoring options. -#MonitoringPageHelp=Observe the runtime state of Application Server components for which monitoring is enabled. To enable monitoring for a component, click Configure Monitoring. +#MonitoringPageHelp=Observe the runtime state of Enterprise Server components for which monitoring is enabled. To enable monitoring for a component, click Configure Monitoring. #monitoringResourcesPageHelp=View monitorable attributes for pools such as the JDBC connection pool or a connector connection pool. Before monitoring data can be viewed, monitoring must be turned on. To turn on monitoring, select the Configure Monitoring link on this page. #monitoringServicePageHelp=Enable or disable monitoring for individual server components or services. To enable monitoring for a component or service, select either LOW or HIGH for that component or service. -#monitoringServicePEPageHelp=To view monitoring information click on Application Server in the tree and then click the Monitor tab. +#monitoringServicePEPageHelp=To view monitoring information, click Enterprise Server in the tree, then click the Monitor tab. #monitoringServiceEEPageHelp=To view monitoring information expand Stand-Alone Instances in the tree, select an instance, and then click the Monitor tab. #monitoringServicePageHelpLink=Monitor tab. #monitor.configureLink=Configure Monitoring @@ -1477,12 +1477,12 @@ #customMBeans.colMBeanName=MBean Name #customMBeans.colImplClassName=Implementation Class Name #customMBeans.step1PageTitle=Deploy Custom MBean (Step 1 of 2) -#customMBeans.step1PageHelp=Specify the location of the jar that contains the mbean implementation class. If the mbean class is already in the Application Server's classpath, you can select Skip without entering the jar location. +#customMBeans.step1PageHelp=Specify the location of the jar that contains the mbean implementation class. If the mbean class is already in the Enterprise Server's classpath, you can select Skip without entering the jar location. #customMBeans.step2PageTitle=Create Custom MBean (Step 2 of 2) #customMBeans.step2PageHelp=Define addtional attributes for the Custom MBean. #customMBeans.skipLabel=Skip. MBean class has been uploaded -#customMBeans.chooseJarLabel=Jar file to be uploaded to the Application Server -#customMBeans.chooseLocalJarLabel=Local Jar file that is accessible from the Application Server +#customMBeans.chooseJarLabel=Jar file to be uploaded to the Enterprise Server +#customMBeans.chooseLocalJarLabel=Local Jar file that is accessible from the Enterprise Server #customMBeans.ImplClassNameLabel=Implementation Class Name: #customMBeans.ImplClassNameHelp=Fully qualified name of the Java class implementing mbean interface; must contain only alphanumeric, underscore, dash, or dot characters #customMBeans.fileNameLabel=File Name: @@ -1571,7 +1571,7 @@ #edmgmtRules.edNotificationPageTitle=Edit Notification Event #edmgmtRules.edNotificationPageHelp=Edit an existing notification trigger event. #edmgmtRules.edLifeCyclePageTitle=Edit LifeCycle Event -#edmgmtRules.edLifeCyclePageHelp=Define rules for Application Server states (Start/Shutdown/Ready). +#edmgmtRules.edLifeCyclePageHelp=Define rules for Enterprise Server states (Start/Shutdown/Ready). #edmgmtRules.edTracePageTitle=Edit Trace Event #edmgmtRules.edTracePageHelp=Edit an existing Trace Event rule. #edmgmtRules.edLogPageTitle=Edit Log Event @@ -1649,7 +1649,7 @@ #mgmtRules.ruleNameHelp=Name must contain only alphanumeric, underscore, hyphen, or dot characters #mgmtRules.statusHelp=Enable this management rule #mgmtRules.step2PageHelp_trace=Define a new Trace Event rule. -#mgmtRules.step2PageHelp_lifecycle=Specify Application Server states (Start/Shutdown/Ready). +#mgmtRules.step2PageHelp_lifecycle=Specify Enterprise Server states (Start/Shutdown/Ready). #mgmtRules.step2PageHelp_cluster=Define the cluster to which the management rules will apply. # # Index: jca/src/main/resources/org/glassfish/jca/admingui/Strings.properties =================================================================== --- jca/src/main/resources/org/glassfish/jca/admingui/Strings.properties (revision 31239) +++ jca/src/main/resources/org/glassfish/jca/admingui/Strings.properties (working copy) @@ -44,7 +44,6 @@ 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 administered object, enable or disable the object on all resources and define name-value property pairs. adminObjectResource.targetPageTitle=Admin Object Resource Targets Index: jts/src/main/resources/org/glassfish/jts/admingui/Strings.properties =================================================================== --- jts/src/main/resources/org/glassfish/jts/admingui/Strings.properties (revision 31239) +++ jts/src/main/resources/org/glassfish/jts/admingui/Strings.properties (working copy) @@ -45,7 +45,7 @@ ts.Timeout=Transaction Timeout: ts.TimeoutHelp=Roll back transaction if no response; set to 0 to disable timeout setting ts.Retry=Retry Timeout: -ts.RetryHelp=Time in seconds Application Server tries to connect to an unreachable server; default is 600 seconds +ts.RetryHelp=Time in seconds Enterprise Server tries to connect to an unreachable server; default is 600 seconds ts.LogLocation=Transaction Log Location: ts.HeuristicDesc=Heuristic Decision: ts.HeuristicDescHelp=Action if transaction status is indeterminate during recovery; default is Rollback Index: web/src/main/resources/org/glassfish/web/admingui/Strings.properties =================================================================== --- web/src/main/resources/org/glassfish/web/admingui/Strings.properties (revision 31239) +++ web/src/main/resources/org/glassfish/web/admingui/Strings.properties (working copy) @@ -121,7 +121,7 @@ tree.httpService.tooltip=HTTP Service monitoring.Title=Monitoring Service -monitoring.PageHelp=Enable or disable monitoring for individual server components or services. To enable monitoring for a component or service, select either LOW or HIGH for that component or service. To view monitoring information, click Application Server in the tree, then click the Monitor tab. +monitoring.PageHelp=Enable or disable monitoring for individual server components or services. To enable monitoring for a component or service, select either LOW or HIGH for that component or service. To view monitoring information, click Enterprise Server in the tree, then click the Monitor tab. monitoring.Http=HTTP Service: monitoring.Web=Web Container: monitoring.Jvm=JVM: @@ -249,7 +249,7 @@ grizzly.transport.classnameCol=classname grizzly.networkConfigPageTitle=Network Config -grizzly.networkConfigPageTitleHelp=Define or manage network configuration settings for the Application Server. +grizzly.networkConfigPageTitleHelp=Define or manage network configuration settings for the Enterprise Server. grizzly.fileCachePageTitle=File Cache grizzly.fileCachePageTitleHelp=Modify file cache settings for the protocol.