Index: web/war-util/src/main/resources/com/sun/logging/enterprise/system/container/web/LogStrings.properties =================================================================== --- web/war-util/src/main/resources/com/sun/logging/enterprise/system/container/web/LogStrings.properties (revision 34026) +++ web/war-util/src/main/resources/com/sun/logging/enterprise/system/container/web/LogStrings.properties (working copy) @@ -178,7 +178,7 @@ accessLogValve.notStarted=WEB0345: Access log valve cannot be stopped because it has not been started pewebcontainer.accesslog.reconfigure=WEB0346: Unable to reconfigure access log valve pewebcontainer.httpListener.mustNotDisable=WEB0347: Must not disable network-listener [{0}], because it is associated with admin virtual server [{1}] -peaccesslogvalve.invalidAccessLogPattern=WEB0348: Illegal access log pattern [{0}], is not a valid nickname and does not contain any '%' +peaccesslogvalve.invalidAccessLogPattern=WEB0348: Illegal access log pattern [{0}], is not a valid nickname and does not contain any ''%'' pewebcontainer.defaultVsMissing=WEB0349: Virtual server [{0}] referenced by network-listener [{1}] as its default-virtual-server does not exist peaccesslogvalve.alreadyStarted=WEB0350: Access logger has already been started peaccesslogvalve.notStarted=WEB0351: Access logger has not yet been started @@ -279,14 +279,14 @@ cache.manager.excep_initCacheHelper = WEB8002: Exception initializing cache-helper [{0}]; please check your helper class implementation. cache.mapping.incorrectScope = WEB8020: Incorrect scope value [{0}] for web application cache field name [{1}] -cache.mapping.greaterExpRequiresNumeric = WEB8021: 'greater' expression requires a numeric value; please check your value {0} -cache.mapping.lesserExpRequiresNumeric = WEB8022: 'lesser' expression requires a numeric value; please check your value [{0}] +cache.mapping.greaterExpRequiresNumeric = WEB8021: ''greater'' expression requires a numeric value; please check your value {0} +cache.mapping.lesserExpRequiresNumeric = WEB8022: ''lesser'' expression requires a numeric value; please check your value [{0}] cache.mapping.illegalValueExpr = WEB8023: illegal value [{0}] expr [{1}] cache.mapping.illegalValueRange = WEB8024: illegal in-range constraint; specify a valid range (xxx-yyy) value [{0}] -cache.mapping.missingRangeSep = WEB8025: missing separator in the 'in-range' constraint; [{0}] -cache.mapping.lowerRangeRequiresNumber = WEB8026: 'in-range' constraint requires numeric values for the lower bound [{0}] -cache.mapping.rangeRequiresUpperBound = WEB8027: 'in-range' constraint requires a value for the upper bound of the range; check your value [{0}] -cache.mapping.upperRangeRequiresNumber = WEB8028: 'in-range' constraint requires numeric values for the upper bound [{0}] +cache.mapping.missingRangeSep = WEB8025: missing separator in the ''in-range'' constraint; [{0}] +cache.mapping.lowerRangeRequiresNumber = WEB8026: ''in-range'' constraint requires numeric values for the lower bound [{0}] +cache.mapping.rangeRequiresUpperBound = WEB8027: ''in-range'' constraint requires a value for the upper bound of the range; check your value [{0}] +cache.mapping.upperRangeRequiresNumber = WEB8028: ''in-range'' constraint requires numeric values for the upper bound [{0}] # # com.sun.web.security.RealmAdapter messages Index: common/common-util/src/main/java/com/sun/logging/enterprise/system/tools/launcher/LogStrings.properties =================================================================== --- common/common-util/src/main/java/com/sun/logging/enterprise/system/tools/launcher/LogStrings.properties (revision 34026) +++ common/common-util/src/main/java/com/sun/logging/enterprise/system/tools/launcher/LogStrings.properties (working copy) @@ -1,7 +1,7 @@ launcher.startup_exception=LAUNCHER001:The laucher wasn't able to execute due to the following Exception. launcher.security_script_exception=LAUNCHER002:The launcher wasn't able to launcher.config_exception=LAUNCHER003:The Launcher encountered a problem with the configuration data from either domain.xml or processLauncher.xml. The launcher could not continue processing the request. -launcher.logWriteFailure=LAUNCHER004:The log file {0} can't be created and/or written to. -launcher.spacesInPath=LAUNCHER005:Spaces in your PATH have been detected: {0} The PATH must be consistently formated (e.g. C\:\\Program Files\\Java\\jdk1.5.0\\bin; ) or the Appserver may not be able to start and/or stop. Mixed quoted spaces in your PATH can cause problems, so the launcher will remove all double quotes before invoking the process. The most reliable solution would be to remove all spaces from your path before starting the Appserver's components. Here are the items in the PATH with spaces +launcher.logWriteFailure=LAUNCHER004:The log file {0} can''t be created and/or written to. +launcher.spacesInPath=LAUNCHER005:Spaces in your PATH have been detected: {0} The PATH must be consistently formated (e.g. C\:\\Program Files\\Java\\jdk1.5.0\\bin; ) or the Appserver may not be able to start and/or stop. Mixed quoted spaces in your PATH can cause problems, so the launcher will remove all double quotes before invoking the process. The most reliable solution would be to remove all spaces from your path before starting the Appserver''s components. Here are the items in the PATH with spaces launcher.missMatchQuotesInArg=LAUNHCER006\:Matching quotes not found, jvm property |{0}| will not be added to java command. launcher.native_launcher_delimiter_error=LAUNCHER030\:The native launcher will not be able to start because all the delimiters used to divide the java command are used IN the command. The list of delimiters are '|','+','^','@','!','?','*','%','$','#','(',')','~','`','{','}','[',']','_',',','' (char 127). Index: common/common-util/src/main/java/com/sun/logging/enterprise/system/tools/admin/LogStrings.properties =================================================================== --- common/common-util/src/main/java/com/sun/logging/enterprise/system/tools/admin/LogStrings.properties (revision 34026) +++ common/common-util/src/main/java/com/sun/logging/enterprise/system/tools/admin/LogStrings.properties (working copy) @@ -45,7 +45,7 @@ core.html_adaptor_port=ADM027:Using HtmlAdaptorServer for viewing MBeans, its port is: [{0}]. Connect the Browser to this port core.create_and_register=ADM028:The MBean with ObjectName[{0}] was created anew and registered with the MBeanServer core.mbean_exists=ADM029:The MBean with ObjectName[{0}] already exists, accessing its management interface -core.not_in_config=ADM030:The ObjectName [{0}] can't be registered as the configuration does not have it +core.not_in_config=ADM030:The ObjectName [{0}] can''t be registered as the configuration does not have it core.stop_html_adaptor=ADM031:Html Adaptor Server stopped core.release_mbs=ADM032:The System MBeanServer released core.admin_service_default_config=ADM0033:Admin Service configuration could not be read and Admin Service type is being defaulted to [{0}] @@ -84,7 +84,7 @@ mbean.begin_upload=ADM1006:Uploading the file to:[{0}] mbean.upload_done=ADM1007:Uploaded the remote file at: [{0}] mbean.upload_failed=ADM1008:Upload failed for file at: [{0}] -mbean.mbeaninfo_failed=ADM1009:Can't get MBeanInfo for: [{0}] +mbean.mbeaninfo_failed=ADM1009:Can''t get MBeanInfo for: [{0}] mbean.prep_download=ADM1010:Preparing to download the file:[{0}] mbean.begin_download=ADM1011:Starting the download ... mbean.download_failed=ADM1012:Downloading the file to client failed @@ -410,20 +410,20 @@ cmb.unsuccessfulRegistration=ADM1601: Received a request for registration of MBean, {0}, but it is already registered in the MBeanServer. ADM1601.diag.cause.1=Registration of the MBean was unsuccessful because it is already registered. -ADM1601.diag.check.1=Run ''asadmin list-mbeans'' to see a list of registered MBeans +ADM1601.diag.check.1=Run 'asadmin list-mbeans' to see a list of registered MBeans cmb.successfulRegistration=ADM1602: The MBean, {0}, was successfully registered in the MBeanServer. cmb.unsuccessfulUnRegistration=ADM1603: Unable to unregister the MBean, {0}. This MBean was never registered in the MBeanServer. In general, this should not be a problem. ADM1603.diag.cause.1=Unregistration of the MBean failed because it is not registered. -ADM1603.diag.check.1=Run ''asadmin list-mbeans'' to see a list of registered MBeans +ADM1603.diag.check.1=Run 'asadmin list-mbeans' to see a list of registered MBeans cmb.successfulUnRegistration=ADM1604: The MBean, {0}, was successfully unregistered from the MBeanServer. cmb.gotConfigChange=ADM1605: Received a ConfigChange event for: [{0}] cmb.illegalHandleUpdate=ADM1606: Can''t handle updating an MBean element itself ({0}). The MBean is updated in terms of its xml-attributes, none of which are dynamically reconfigurable. -ADM1606.diag.cause.1=Can''t handle updating an MBean element -ADM1606.diag.check.1=Note that none of the attributes of "mbean" element except ''enabled'' and ''object-name'' are modifiable dynamically. Only the properties in this element that are actually the attributes of the runtime mbean are modifiable dynamically. +ADM1606.diag.cause.1=Can't handle updating an MBean element +ADM1606.diag.check.1=Note that none of the attributes of "mbean" element except 'enabled' and 'object-name' are modifiable dynamically. Only the properties in this element that are actually the attributes of the runtime mbean are modifiable dynamically. cmb.mbeanIsDisabled=ADM1607: Received an MBean change event, but the MBean, {0}, is disabled. Disabled MBeans can''t have their state changed. ADM1607.diag.cause.1=Disabled MBeans are not allowed to have their state changed Index: common/common-util/src/main/java/com/sun/logging/enterprise/system/core/selfmanagement/LogStrings.properties =================================================================== --- common/common-util/src/main/java/com/sun/logging/enterprise/system/core/selfmanagement/LogStrings.properties (revision 34026) +++ common/common-util/src/main/java/com/sun/logging/enterprise/system/core/selfmanagement/LogStrings.properties (working copy) @@ -51,8 +51,8 @@ sgmt.threadhangaction_deftimeout=SGMT0222: {0}- Due ThresholdWaitInMillis:{1} being less than load balancer default timeout value of:{2}; resetting it to load balancer default. sgmt.threadhangaction_lbtimeout=SGMT0223: {0}- Due ThresholdWaitInMillis:{1} being less than load balancer response timeout:{2}, resetting it to load balancer response timeout. sgmt.instancehang_listener_notresponding=SGMT0224: Instance hang check - Listener: {1} of server :{0} is not responding to the for instance hang check request. The request timeout occured for the timeout value of={2}. -sgmt.instancehang_listenernotmaxd=SGMT0225: Instance hang check - Listener: {1} of server: {0} has not responded to the ping request for instance hang check. However it still has scope to receive further http requests, as it has not max'd out on threads. No. of busy http threads={2}. -sgmt.instancehang_listenermaxd=SGMT0226: Instance hang check - Listener: {1} of server: {0} has not responded to instance hang check request. The listener has max'd out on threads. No. of busy http threads={2}. +sgmt.instancehang_listenernotmaxd=SGMT0225: Instance hang check - Listener: {1} of server: {0} has not responded to the ping request for instance hang check. However it still has scope to receive further http requests, as it has not max''d out on threads. No. of busy http threads={2}. +sgmt.instancehang_listenermaxd=SGMT0226: Instance hang check - Listener: {1} of server: {0} has not responded to instance hang check request. The listener has max''d out on threads. No. of busy http threads={2}. sgmt.instancehang_listenerresp=SGMT0227: Instance hang check - Listener: {1} of server: {0} is healthy for the instance hang check carried out. sgmt.instancehang_serverhealthy=SGMT0228: Instance hang check - Server {0} is healthy. sgmt.instancehang_serverunhealthy=SGMT0229: Instance hang check - Server: {0} is not responding; is unhealthy. Index: admin/monitor/src/main/java/org/glassfish/admin/monitor/LogStrings.properties =================================================================== --- admin/monitor/src/main/java/org/glassfish/admin/monitor/LogStrings.properties (revision 34026) +++ admin/monitor/src/main/java/org/glassfish/admin/monitor/LogStrings.properties (working copy) @@ -1,6 +1,6 @@ discoveringProbeProviders=Discovering the ProbeProviders discoveringXmlProbeProviders=Discovering the XML ProbeProviders from lib/monitor -missingModuleFromXmlProbeProviders=Couldn't find the module, when loading the monitoring providers from XML directory : {0} +missingModuleFromXmlProbeProviders=Couldn''t find the module, when loading the monitoring providers from XML directory : {0} levelChangeEventReceived=Level change event received, {0} New Level = {1}, Old Level = {2} enableStatsMonitoring=Enabling the monitoring for all the stats with level = {0} disableStatsMonitoring=Disabling the monitoring for all the stats Index: security/core/src/main/resources/com/sun/logging/enterprise/system/core/security/LogStrings.properties =================================================================== --- security/core/src/main/resources/com/sun/logging/enterprise/system/core/security/LogStrings.properties (revision 34026) +++ security/core/src/main/resources/com/sun/logging/enterprise/system/core/security/LogStrings.properties (working copy) @@ -124,7 +124,7 @@ # EE specific: start at 8001 nss.init_SunPKCS11_failed=SEC8001: Exception in initializing SunPKCS11. nss.rename_alias=SEC8002: Alias {0} in slot {1} has been renamed to {2}. -nss.cantloadcert=SEC8003: Can't load cert: {0}. +nss.cantloadcert=SEC8003: Can''t load cert: {0}. #ACC specific: acc.secmgron=ACC: Security Manager is ON