Fixes #21983 : Escaped single quote with double single quote (#21987)

jayasheelankumar · yaminikb · commit ee19eafd509f · 2017-07-07T10:44:52.000+05:30
diff --git a/appserver/admingui/devtests/src/test/java/org/glassfish/admingui/devtests/BaseSeleniumTestClass.java b/appserver/admingui/devtests/src/test/java/org/glassfish/admingui/devtests/BaseSeleniumTestClass.java
@@ -1221,7 +1221,7 @@ public T get() {
                     value = operation();
                     success = true;
                 } catch (Exception e) {
-                    logger.log(Level.FINE, "Exception caught ('{0}'). Sleeping...", e.getMessage());
+                    logger.log(Level.FINE, "Exception caught (''{0}''). Sleeping...", e.getMessage());
                     count++;
                 }
             }
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/AdministeredObjectDefinitionsHandler.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/AdministeredObjectDefinitionsHandler.java
@@ -86,7 +86,7 @@ protected HandlerProcessingResult processAnnotation(AnnotationInfo ainfo,  Resou
                     // where is the local-string file?
                     String localString = localStrings.getLocalString(
                             "enterprise.deployment.annotation.handlers.administeredobjectdefinitionsduplicates",
-                            "@AdministeredObjectDefinitions cannot have multiple definitions with same name : '{0}'",
+                            "@AdministeredObjectDefinitions cannot have multiple definitions with same name : ''{0}''",
                             defnName);
                     throw new IllegalStateException(localString);
                 }else{
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/ConnectionFactoryDefinitionsHandler.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/ConnectionFactoryDefinitionsHandler.java
@@ -87,7 +87,7 @@ protected HandlerProcessingResult processAnnotation(AnnotationInfo ainfo,  Resou
                     // where is the local-string file?
                     String localString = localStrings.getLocalString(
                             "enterprise.deployment.annotation.handlers.connectionfactorydefinitionsduplicates",
-                            "@ConnectionFactoryDefinitions cannot have multiple definitions with same name : '{0}'",
+                            "@ConnectionFactoryDefinitions cannot have multiple definitions with same name : ''{0}''",
                             defnName);
                     throw new IllegalStateException(localString);
                     /*
diff --git a/appserver/grizzly/glassfish-grizzly-extra-all/src/main/java/org/glassfish/grizzly/extras/addons/AjpAddOnProvider.java b/appserver/grizzly/glassfish-grizzly-extra-all/src/main/java/org/glassfish/grizzly/extras/addons/AjpAddOnProvider.java
@@ -106,7 +106,7 @@ public void configure(final ServiceLocator habitat,
             if (!propertiesFile.exists()) {
                 if (_logger.isLoggable(Level.FINEST)) {
                     _logger.log(Level.FINEST,
-                            "jk properties configuration file '{0}' doesn't exist",
+                            "jk properties configuration file ''{0}'' doesn't exist",
                             propertiesFile.getAbsoluteFile());
                 }
                 return;
diff --git a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/deployment/annotation/handlers/DataSourceDefinitionsHandler.java b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/deployment/annotation/handlers/DataSourceDefinitionsHandler.java
@@ -83,7 +83,7 @@ protected HandlerProcessingResult processAnnotation(AnnotationInfo ainfo, Resour
                 if(duplicates.contains(defnName)){
                 String localString = localStrings.getLocalString(
                         "enterprise.deployment.annotation.handlers.datasourcedefinitionsduplicates",
-                        "@DataSourceDefinitions cannot have multiple definitions with same name : '{0}'",
+                        "@DataSourceDefinitions cannot have multiple definitions with same name : ''{0}''",
                         defnName);
                     throw new IllegalStateException(localString);
                     /*
diff --git a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSConnectionFactoryDefinitionsHandler.java b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSConnectionFactoryDefinitionsHandler.java
@@ -82,7 +82,7 @@ protected HandlerProcessingResult processAnnotation(AnnotationInfo ainfo,  Resou
                 if (duplicates.contains(defnName)) {
                     String localString = localStrings.getLocalString(
                             "enterprise.deployment.annotation.handlers.jmsconnectionfactorydefinitionsduplicates",
-                            "@JMSConnectionFactoryDefinition cannot have multiple definitions with same name : '{0}'",
+                            "@JMSConnectionFactoryDefinition cannot have multiple definitions with same name : ''{0}''",
                             defnName);
                     throw new IllegalStateException(localString);
                 } else {
diff --git a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSDestinationDefinitionsHandler.java b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSDestinationDefinitionsHandler.java
@@ -82,7 +82,7 @@ protected HandlerProcessingResult processAnnotation(AnnotationInfo ainfo,  Resou
                 if (duplicates.contains(defnName)) {
                     String localString = localStrings.getLocalString(
                             "enterprise.deployment.annotation.handlers.jmsdestinationdefinitionsduplicates",
-                            "@JMSDestinationDefinition cannot have multiple definitions with same name : '{0}'",
+                            "@JMSDestinationDefinition cannot have multiple definitions with same name : ''{0}''",
                             defnName);
                     throw new IllegalStateException(localString);
                 } else {
diff --git a/appserver/resources/javamail/javamail-runtime/src/main/java/org/glassfish/resources/javamail/annotation/handler/MailSessionDefinitionsHandler.java b/appserver/resources/javamail/javamail-runtime/src/main/java/org/glassfish/resources/javamail/annotation/handler/MailSessionDefinitionsHandler.java
@@ -88,7 +88,7 @@ protected HandlerProcessingResult processAnnotation(AnnotationInfo ainfo, Resour
                 if (duplicates.contains(defnName)) {
                     String localString = localStrings.getLocalString(
                             "enterprise.deployment.annotation.handlers.mailsessiondefinitionsduplicates",
-                            "@MailSessionDefinitions cannot have multiple definitions with same name : '{0}'",
+                            "@MailSessionDefinitions cannot have multiple definitions with same name : ''{0}''",
                             defnName);
                     throw new IllegalStateException(localString);
                 } else {
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
@@ -90,14 +90,14 @@ 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")
     public static final String MISSING_RESOURCE = prefix + "00001";
 
     @LogMessageInfo(
-            message = "Failed tracking modifications of '{0} : {1}",
+            message = "Failed tracking modifications of ''{0}'' : {1}",
             level = "SEVERE",
             cause = "A ClassCastException is encountered",
             action = "Check if the object is an instance of the class")
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
@@ -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";
@@ -3631,7 +3631,7 @@ public static Logger getLogger() {
     public static final String EMPTY_PUSH_METHOD_EXCEPTION = prefix + "00547";
 
     @LogMessageInfo(
-            message = "The push method '{0}' is not cacheable or safe",
+            message = "The push method ''{0}'' is not cacheable or safe",
             level = "WARNING"
     )
     public static final String NONCACHEABLE_UNSAFE_PUSH_METHOD_EXCEPTION = prefix + "00548";
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
@@ -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";
 
@@ -547,7 +547,7 @@ public static Logger getLogger() {
     public static final String UNABLE_TO_INSTANTIATE_CONTAINER_LISTENER = prefix + "00091";
 
     @LogMessageInfo(
-            message = "Creating connector for address='{0}' port='{1}' protocol='{2}'",
+            message = "Creating connector for address=''{0}'' port=''{1}'' protocol=''{2}''",
             level = "FINE")
     public static final String CREATE_CONNECTOR = prefix + "00092";
 
@@ -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";
 
diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/WebFilterHandler.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/WebFilterHandler.java
@@ -136,7 +136,7 @@ private HandlerProcessingResult processAnnotation(
                 log(Level.SEVERE, ainfo,
                     localStrings.getLocalString(
                     "web.deployment.annotation.handlers.filternamedontmatch",
-                    "The filter '{0}' has implementation '{1}' in xml. It does not match with '{2}' from annotation @{3}.",
+                    "The filter ''{0}'' has implementation ''{1}'' in xml. It does not match with ''{2}'' from annotation @{3}.",
                     new Object[] { filterName, filterImpl, filterClass.getName(),
                     WebFilter.class.getName() }));
                 return getDefaultFailedResult();
diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/WebServletHandler.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/WebServletHandler.java
@@ -170,10 +170,10 @@ private HandlerProcessingResult processAnnotation(
 
             if (webCompDesc.isServlet()) {
                 messageKey = "web.deployment.annotation.handlers.servletimpldontmatch";
-                defaultMessage = "The servlet '{0}' has implementation '{1}' in xml. It does not match with '{2}' from annotation @{3}.";
+                defaultMessage = "The servlet ''{0}'' has implementation ''{1}'' in xml. It does not match with ''{2}'' from annotation @{3}.";
             } else {
                 messageKey = "web.deployment.annotation.handlers.servletimpljspdontmatch";
-                defaultMessage = "The servlet '{0}' is a jsp '{1}' in xml. It does not match with '{2}' from annotation @{3}.";
+                defaultMessage = "The servlet ''{0}'' is a jsp ''{1}'' in xml. It does not match with ''{2}'' from annotation @{3}.";
             }
             
             log(Level.SEVERE, ainfo,
diff --git a/appserver/web/web-glue/src/main/resources/org/glassfish/web/deployment/annotation/handlers/LocalStrings.properties b/appserver/web/web-glue/src/main/resources/org/glassfish/web/deployment/annotation/handlers/LocalStrings.properties
@@ -42,7 +42,7 @@ web.deployment.annotation.handlers.needtoextend=The Class {0} having annotation
 web.deployment.annotation.handlers.needtoimpl=The Class {0} having annotation {1} need to implement the interface {2}.
 web.deployment.annotation.handlers.needtoimpllistenerinterface=The Class {0} having annotation javax.servlet.annotation.WebListener need to implement one of the following interfaces: javax.servlet.ServletContextLisener, javax.servlet.ServletContextAttributeListener, javax.servlet.ServletRequestListener, javax.servletServletRequestAttributeListener, javax.servlet.http.HttpSessionListener, javax.servlet.http.HttpSessionAttributeListener, javax.servlet.http.HttpSessionIdListener.
 web.deployment.annotation.handlers.invalidUrlPatterns=Invalid url Patterns for {0}: {1}.
-web.deployment.annotation.handlers.servletimpldontmatch=The servlet '{0}' has implementation '{1}' in xml. It does not match with '{2}' from annotation @{3}.
-web.deployment.annotation.handlers.servletimpljspdontmatch=The servlet '{0}' is a jsp '{1}' in xml. It does not match with '{2}' from annotation @{3}.
-web.deployment.annotation.handlers.filternamedontmatch=The filter '{0}' has implementation '{1}' in xml. It does not match with '{2}' from annotation @{3}.
+web.deployment.annotation.handlers.servletimpldontmatch=The servlet ''{0}'' has implementation ''{1}'' in xml. It does not match with ''{2}'' from annotation @{3}.
+web.deployment.annotation.handlers.servletimpljspdontmatch=The servlet ''{0}'' is a jsp ''{1}'' in xml. It does not match with ''{2}'' from annotation @{3}.
+web.deployment.annotation.handlers.filternamedontmatch=The filter ''{0}'' has implementation ''{1}'' in xml. It does not match with ''{2}'' from annotation @{3}.
 web.deployment.annotation.handlers.denyWithRolesAllowed=One cannot specify DENY with an non-empty array of rolesAllowed in @ServletSecurity / ServletSecurityElement
diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/LogUtils.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/LogUtils.java
@@ -286,7 +286,7 @@ public static Logger getLogger() {
     public static final String NULL_MESSAGE = LOGMSG_PREFIX + "-00075";
 
     @LogMessageInfo(
-            message = "Invalid request scheme for Endpoint {0}. Expected '{1}', received '{2}'.",
+            message = "Invalid request scheme for Endpoint {0}. Expected ''{1}'', received ''{2}''.",
             comment = "{0} - endpoint name, {1} - URL scheme, {2} - URL scheme",
             level = "WARNING")
     public static final String INVALID_REQUEST_SCHEME = LOGMSG_PREFIX + "-00076";
@@ -298,7 +298,7 @@ public static Logger getLogger() {
     public static final String AUTH_FAILED = LOGMSG_PREFIX + "-00077";
 
     @LogMessageInfo(
-            message = "Servlet web service endpoint '{0}' failure",
+            message = "Servlet web service endpoint ''{0}'' failure",
             comment = "{0} - endpoint name",
             level = "WARNING")
     public static final String SERVLET_ENDPOINT_FAILURE = LOGMSG_PREFIX + "-00078";
@@ -316,7 +316,7 @@ public static Logger getLogger() {
     public static final String ERROR_INVOKING_SERVLETIMPL = LOGMSG_PREFIX + "-00080";
 
     @LogMessageInfo(
-            message = "Servlet web service endpoint '{0}' HTTP GET error",
+            message = "Servlet web service endpoint ''{0}'' HTTP GET error",
             comment = "{0} - endpoint name",
             level = "WARNING")
     public static final String SERVLET_ENDPOINT_GET_ERROR = LOGMSG_PREFIX + "-00081";
@@ -521,7 +521,7 @@ public static Logger getLogger() {
     public static final String WSIMPORT_FAILED = LOGMSG_PREFIX + "-00113";
 
     @LogMessageInfo(
-            message = "authentication succeeded for endpoint '{0}' in {1} {2}",
+            message = "authentication succeeded for endpoint ''{0}'' in {1} {2}",
             level = "FINER")
     public static final String AUTHENTICATION_SUCCESS = LOGMSG_PREFIX + "-00114";
 
@@ -553,7 +553,7 @@ public static Logger getLogger() {
     public static final String DESTORY_ON_HANDLER_FAILED = LOGMSG_PREFIX + "-00120";
 
     @LogMessageInfo(
-            message = "Module type '{0}' is not supported.",
+            message = "Module type ''{0}'' is not supported.",
             comment = "{0} - module type name",
             level = "SEVERE",
             cause = "Deployed module is not a web application nor ejb module.",
diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/ConfigApiLoggerInfo.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/ConfigApiLoggerInfo.java
@@ -877,7 +877,7 @@ public static String getString(String message, Object[] parameters) {
     public final static String glassFishDocumentXmlException = LOGMSG_PREFIX + "-00100";
 
     @LogMessageInfo(
-            message = "config.getHttpService() null for config '{0}'",
+            message = "config.getHttpService() null for config ''{0}''",
             cause = "unknown",
             action = "unknown",
             publish = true,
diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/LogStrings.properties b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/LogStrings.properties
@@ -41,5 +41,5 @@
 GlassFishDocument.IOException=Exception {0} while persisting domain.xml, changes will not be available on server restart
 GlassFishDocument.XMLException=Exception {0} while persisting domain.xml, file a bug at glassfish.dev.java.net
 
-GrizzlyConfigSchemaMigrator.nullHttpService=ADMCNF001: config.getHttpService() null for config '{0}'
+GrizzlyConfigSchemaMigrator.nullHttpService=ADMCNF001: config.getHttpService() null for config ''{0}''
 GrizzlyConfigSchemaMigrator.failUpgradeDomain=ADMCNF002: Failure while upgrading domain.xml
diff --git a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/KernelLoggerInfo.java b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/KernelLoggerInfo.java
@@ -131,7 +131,7 @@ public static Logger getLogger() {
     public static final String consoleCannotInitialize = LOGMSG_PREFIX + "-00011";
     
     @LogMessageInfo(
-            message = "Cannot write property '{0} = {1}' for AdminService in domain.xml, exception: {2}",
+            message = "Cannot write property ''{0} = {1}'' for AdminService in domain.xml, exception: {2}",
             level = "INFO")
     public static final String consoleCannotWriteProperty = LOGMSG_PREFIX + "-00012";
     

Original file line number	Diff line number	Diff line change
`@@ -1221,7 +1221,7 @@ public T get() {`
`1221`	`1221`	`value = operation();`
`1222`	`1222`	`success = true;`
`1223`	`1223`	`} catch (Exception e) {`
`1224`		`- logger.log(Level.FINE, "Exception caught ('{0}'). Sleeping...", e.getMessage());`
	`1224`	`+ logger.log(Level.FINE, "Exception caught (''{0}''). Sleeping...", e.getMessage());`
`1225`	`1225`	`count++;`
`1226`	`1226`	`}`
`1227`	`1227`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public void configure(final ServiceLocator habitat,`
`106`	`106`	`if (!propertiesFile.exists()) {`
`107`	`107`	`if (_logger.isLoggable(Level.FINEST)) {`
`108`	`108`	`_logger.log(Level.FINEST,`
`109`		`- "jk properties configuration file '{0}' doesn't exist",`
	`109`	`+ "jk properties configuration file ''{0}'' doesn't exist",`
`110`	`110`	`propertiesFile.getAbsoluteFile());`
`111`	`111`	`}`
`112`	`112`	`return;`