Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Payara-2074 Handle log messages in MessageFormat by escaping double single quote #1968

Merged
merged 2 commits into from
Sep 16, 2017
Merged

Payara-2074 Handle log messages in MessageFormat by escaping double single quote #1968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89a482b
PAYARA-2074 Handle log messages in MessageFormat by escaping double s…
jGauravGupta Sep 12, 2017
97c3e7d
PAYARA-2074 typo-fix
jGauravGupta Sep 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appserver/web/war-util/src/main/java/org/glassfish/web/loader/LogFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion appserver/web/web-core/src/main/java/org/apache/catalina/LogFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
14 changes: 7 additions & 7 deletions appserver/web/web-glue/src/main/java/org/glassfish/web/LogFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand All @@ -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";

Expand All @@ -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";

Expand All @@ -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";

Expand Down Expand Up @@ -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";

Expand Down