diff --git a/appserver/web/war-util/src/main/java/org/glassfish/web/loader/LogFacade.java b/appserver/web/war-util/src/main/java/org/glassfish/web/loader/LogFacade.java
index 3b6f9276107..0cfd3227474 100644
--- a/appserver/web/war-util/src/main/java/org/glassfish/web/loader/LogFacade.java
+++ b/appserver/web/war-util/src/main/java/org/glassfish/web/loader/LogFacade.java
@@ -90,7 +90,7 @@ public static Logger getLogger() {
     private static final String prefix = "AS-WEB-UTIL-";
 
     @LogMessageInfo(
-            message = "Resource '{0}' is missing",
+            message = "Resource ''{0}'' is missing",
             level = "SEVERE",
             cause = "A naming exception is encountered",
             action = "Check the list of resources")
diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/LogFacade.java b/appserver/web/web-core/src/main/java/org/apache/catalina/LogFacade.java
index a1ec5978860..03cc0cef8ba 100644
--- a/appserver/web/web-core/src/main/java/org/apache/catalina/LogFacade.java
+++ b/appserver/web/web-core/src/main/java/org/apache/catalina/LogFacade.java
@@ -133,7 +133,7 @@ public static Logger getLogger() {
     public static final String PROCESS_SESSION_DESTROYED_INFO = prefix + "00007";
 
     @LogMessageInfo(
-            message = "Process request for '{0}'",
+            message = "Process request for ''{0}''",
             level = "INFO"
     )
     public static final String PROCESS_REQUEST_INFO = prefix + "00008";
diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/LogFacade.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/LogFacade.java
index a338e5b2b79..686957418ea 100644
--- a/appserver/web/web-glue/src/main/java/org/glassfish/web/LogFacade.java
+++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/LogFacade.java
@@ -222,12 +222,12 @@ public static Logger getLogger() {
     public static final String SESSION_DESTROYED = prefix + "00030";
 
     @LogMessageInfo(
-            message = "Process request for '{0}'",
+            message = "Process request for ''{0}''",
             level = "FINE")
     public static final String REQUEST_PROCESSED = prefix + "00031";
 
     @LogMessageInfo(
-            message = "Principal '{0}' has already been authenticated",
+            message = "Principal ''{0}'' has already been authenticated",
             level = "FINE")
     public static final String PRINCIPAL_ALREADY_AUTHENTICATED = prefix + "00032";
 
@@ -247,7 +247,7 @@ public static Logger getLogger() {
     public static final String NO_REALM_CONFIGURED = prefix + "00035";
 
     @LogMessageInfo(
-            message = "This application uses realm '{0}'",
+            message = "This application uses realm ''{0}''",
             level = "FINE")
     public static final String APP_REALM = prefix + "00036";
 
@@ -257,12 +257,12 @@ public static Logger getLogger() {
     public static final String CHECKING_CACHED_PRINCIPAL = prefix + "00037";
 
     @LogMessageInfo(
-            message = "Found cached principal '{0}' with auth type '{1}' in realm '{2}'",
+            message = "Found cached principal ''{0}'' with auth type ''{1}'' in realm ''{2}''",
             level = "FINE")
     public static final String FOUND_CACHED_PRINCIPAL = prefix + "00038";
 
     @LogMessageInfo(
-            message = "Ignoring SSO entry which does not match application realm '{0}'",
+            message = "Ignoring SSO entry which does not match application realm ''{0}''",
             level = "FINE")
     public static final String IGNORING_SSO = prefix + "00039";
 
@@ -272,7 +272,7 @@ public static Logger getLogger() {
     public static final String NO_CACHED_PRINCIPAL_FOUND = prefix + "00040";
 
     @LogMessageInfo(
-            message = "Deregistering sso id '{0}'",
+            message = "Deregistering sso id ''{0}''",
             level = "FINE")
     public static final String DEREGISTER_SSO = prefix + "00041";
 
@@ -586,7 +586,7 @@ public static Logger getLogger() {
     public static final String ACCESS_LOG_UNABLE_TO_WRITE = prefix + "00098";
 
     @LogMessageInfo(
-            message = "Setting accesslog directory for virtual server '{0}' to {1}",
+            message = "Setting accesslog directory for virtual server ''{0}'' to {1}",
             level = "FINE")
     public static final String ACCESS_LOG_DIRECTORY_SET = prefix + "00099";