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 24039)
+++ web/war-util/src/main/resources/com/sun/logging/enterprise/system/container/web/LogStrings.properties	(working copy)
@@ -241,7 +241,6 @@
 grizzlyHttpProtocol.proto.socketexception.info=WEB0708: SocketException reading request, ignored
 grizzlyHttpProtocol.getattribute=WEB0709: Attribute [{0}]
 grizzlyHttpProtocol.setattribute=WEB0710: Attribute [{0}]: [{1}]
-grizzlyHttpProtocol.socketfactory.initerror=WEB07011: Error initializing socket factory
 grizzlyHttpProtocol.start=WEB0712: Starting Sun-Java-System/Application-Server HTTP/1.1 on {0}
 grizzlyHttpProtocol.stop=WEB0713: Stopping Sun-Java-System/Application-Server HTTP/1.1 on {0}
 grizzlyHttpProtocol.pause=WEB0714: Pausing Sun-Java-System/Application-Server HTTP/1.1 on {0}
@@ -324,9 +323,9 @@
 #
 # com.sun.enterprise.web.TomcatDeploymentConfig messages
 #
-tomcatDeploymentConfig.role.auth=WEB 7000: Security role name {0} used in an <auth-constraint> without being defined in a <security-role>
-tomcatDeploymentConfig.role.link=WEB 7001: Security role name {0} used in a <role-link> without being defined in a <security-role>
-tomcatDeploymentConfig.role.runas=WEB 7002: Security role name {0} used in a <run-as> without being defined in a <security-role>
+tomcatDeploymentConfig.role.auth=WEB7000: Security role name {0} used in an <auth-constraint> without being defined in a <security-role>
+tomcatDeploymentConfig.role.link=WEB7001: Security role name {0} used in a <role-link> without being defined in a <security-role>
+tomcatDeploymentConfig.role.runas=WEB7002: Security role name {0} used in a <run-as> without being defined in a <security-role>
 
 # com.sun.appserv.web.cache messages
 cache.manager.excep_createCache = WEB8001: Exception in creating cache
@@ -434,11 +433,11 @@
 httpservice.stopping.done=WEB3047 : Stopping HttpService ... done
 httpservice.stopping.failed=WEB3048 : HttpService: Received exception while stoping HttpService
 httpservice.nss.skipping=WEB3049 : HttpService: Configured to skip NSS initialization
-httpservice.access_log_format.missing_percentage=WEB03050 : HttpService access log format is missing a percentage (%)
+httpservice.access_log_format.missing_percentage=WEB3050 : HttpService access log format is missing a percentage (%)
 WEB3050.diag.check.1=Please correct the format
 httpservice.http_listener.invalid.external.port=WEB3051 : Unable to parse port number [{0}] of http-listener [{1}]
 httpservice.security_enabled.ssl_disabled=WEB3052 : Security-enabled on http-listener does not take effect without setting ssl-enabled on http-protocol
-httpservice.acceptor_thread.is_zero=WEHB3053: The acceptor-threads value (0) will be implicitly interpreted as (1)
+httpservice.acceptor_thread.is_zero=WEB3053: The acceptor-threads value (0) will be implicitly interpreted as (1)
 httpservice.acceptor_threads.too_high=WEB3054 : The acceptor-thread value [{0}] is too high for system resources, using value (10)
 httpservice.acceptor_threads.negative=WEB3055 : The acceptor-thread value [{0}]  is being interpreted as [{1}]
 httpservice.cert_nickname.not_set=WEB3056 : Required attribute cert-nickname not set. Using default (s1as) cert-nickname