Remove obsoleted support references

Signed-off-by: Alexander Pinčuk <alexander.v.pinchuk@gmail.com>
eclipse-ee4j · Feb 12, 2024 · 48e89d0 · 48e89d0
1 parent 23dc34d
commit 48e89d0
Show file tree

Hide file tree

Showing 6 changed files with 406 additions and 184 deletions.
diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AdminLoggerInfo.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AdminLoggerInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -18,6 +18,7 @@
 package com.sun.enterprise.admin.util;
 
 import java.util.logging.Logger;
+
 import org.glassfish.logging.annotation.LogMessageInfo;
 import org.glassfish.logging.annotation.LogMessagesResourceBundle;
 import org.glassfish.logging.annotation.LoggerInfo;
@@ -29,69 +30,132 @@
  */
 /* Module private */
 public class AdminLoggerInfo {
+
     public static final String LOGMSG_PREFIX = "NCLS-ADMIN";
 
     @LogMessagesResourceBundle
     public static final String SHARED_LOGMESSAGE_RESOURCE = "com.sun.enterprise.admin.util.LogMessages";
 
     @LoggerInfo(subsystem = "ADMIN", description = "Administration Services", publish = true)
     public static final String ADMIN_LOGGER = "jakarta.enterprise.system.tools.admin";
+
     private static final Logger adminLogger = Logger.getLogger(ADMIN_LOGGER, SHARED_LOGMESSAGE_RESOURCE);
 
     public static Logger getLogger() {
         return adminLogger;
     }
 
-    @LogMessageInfo(message = "Could not find state of instance registered in the state service", cause = "unknown", action = "unknown", level = "SEVERE")
+    @LogMessageInfo(
+            message = "Could not find state of instance registered in the state service",
+            cause = "Unknown",
+            action = "Unknown",
+            level = "SEVERE")
     static final String stateNotFound = LOGMSG_PREFIX + "-00001";
 
-    @LogMessageInfo(message = "Error during command replication: {0}", cause = "unknown", action = "unknown", level = "SEVERE")
+    @LogMessageInfo(
+            message = "Error during command replication: {0}",
+            cause = "Unknown",
+            action = "Unknown",
+            level = "SEVERE")
     static final String replicationError = LOGMSG_PREFIX + "-00002";
 
-    @LogMessageInfo(message = "unable to read instance state file {0}, recreating", level = "FINE")
+    @LogMessageInfo(
+            message = "Unable to read instance state file {0}, recreating",
+            level = "FINE")
     final static String mISScannotread = LOGMSG_PREFIX + "-00003";
 
-    @LogMessageInfo(message = "unable to create instance state file: {0}, exception: {1}", cause = "The instance state file is missing and the system is trying to "
-            + "recreated it but and exception was raised.", action = "Check the server logs and contact Oracle support", publish = true, level = "SEVERE")
+    @LogMessageInfo(
+            message = "Unable to create instance state file: {0}, exception: {1}",
+            cause = "The instance state file is missing and the system is trying to recreated it but and exception was raised.",
+            action = "Check the server logs.",
+            level = "SEVERE")
     final static String mISScannotcreate = LOGMSG_PREFIX + "-00004";
 
-    @LogMessageInfo(message = "error while adding new server state to instance state: {0}", cause = "An attempt to add a new server to the instance state file failed.", action = "Check the server logs and contact Oracle support", publish = true, level = "SEVERE")
+    @LogMessageInfo(
+            message = "Error while adding new server state to instance state: {0}",
+            cause = "An attempt to add a new server to the instance state file failed.",
+            action = "Check the server logs.",
+            level = "SEVERE")
     final static String mISSaddstateerror = LOGMSG_PREFIX + "-00005";
 
-    @LogMessageInfo(message = "error while adding failed command to instance state: {0}", cause = "An attempt to add a failed command to the instance state file failed.", action = "Check the server logs and contact Oracle support", publish = true, level = "SEVERE")
+    @LogMessageInfo(
+            message = "Error while adding failed command to instance state: {0}",
+            cause = "An attempt to add a failed command to the instance state file failed.",
+            action = "Check the server logs.",
+            level = "SEVERE")
     final static String mISSaddcmderror = LOGMSG_PREFIX + "-00006";
 
-    @LogMessageInfo(message = "error while removing failed commands from instance state: {0}", cause = "An attempt to remove a failed command from the instance state file failed.", action = "Check the server logs and contact Oracle support", publish = true, level = "SEVERE")
+    @LogMessageInfo(
+            message = "Error while removing failed commands from instance state: {0}",
+            cause = "An attempt to remove a failed command from the instance state file failed.",
+            action = "Check the server logs.",
+            level = "SEVERE")
     final static String mISSremcmderror = LOGMSG_PREFIX + "-00007";
 
-    @LogMessageInfo(message = "error while setting instance state: {0}", cause = "An attempt to set the state of a server in the instance state file failed.", action = "Check the server logs and contact Oracle support", publish = true, level = "SEVERE")
+    @LogMessageInfo(
+            message = "Error while setting instance state: {0}",
+            cause = "An attempt to set the state of a server in the instance state file failed.",
+            action = "Check the server logs.",
+            level = "SEVERE")
     final static String mISSsetstateerror = LOGMSG_PREFIX + "-00008";
 
-    @LogMessageInfo(message = "error while removing instance: {0}", cause = "An attempt to remove a server from the instance state file failed.", action = "Check the server logs and contact Oracle support", publish = true, level = "SEVERE")
+    @LogMessageInfo(
+            message = "Error while removing instance: {0}",
+            cause = "An attempt to remove a server from the instance state file failed.",
+            action = "Check the server logs.",
+            level = "SEVERE")
     final static String mISSremstateerror = LOGMSG_PREFIX + "-00009";
 
-    @LogMessageInfo(message = "It appears that server [{0}:{1}] does not accept secure connections. Retry with --secure=false.", cause = "An attempt to invoke a command on another server failed.", action = "Check that the server is configured to accept secure connections.", publish = true, level = "SEVERE")
+    @LogMessageInfo(
+            message = "It appears that server [{0}:{1}] does not accept secure connections. Retry with --secure=false.",
+            cause = "An attempt to invoke a command on another server failed.",
+            action = "Check that the server is configured to accept secure connections.",
+            level = "SEVERE")
     public final static String mServerIsNotSecure = LOGMSG_PREFIX + "-00010";
 
-    @LogMessageInfo(message = "An unexpected exception occurred.", cause = "An unexpected exception occurred.", action = "Check the server logs and contact Oracle support", publish = true, level = "SEVERE")
+    @LogMessageInfo(
+            message = "An unexpected exception occurred.",
+            cause = "An unexpected exception occurred.",
+            action = "Check the server logs.",
+            level = "SEVERE")
     public final static String mUnexpectedException = LOGMSG_PREFIX + "-00011";
 
-    @LogMessageInfo(message = "The server requires a valid admin password to be set before it can start. Please set a password using the change-admin-password command.", cause = "For security reason, the server requires a valid admin password before it can start.", action = "Set a password using the change-admin-password command.", publish = true, level = "SEVERE")
+    @LogMessageInfo(
+            message = "The server requires a valid admin password to be set before it can start. "
+                    + "Please set a password using the change-admin-password command.",
+            cause = "For security reason, the server requires a valid admin password before it can start.",
+            action = "Set a password using the change-admin-password command.",
+            level = "SEVERE")
     public final static String mSecureAdminEmptyPassword = LOGMSG_PREFIX + "-00012";
 
-    @LogMessageInfo(message = "Can not put data to cache under key {0}", cause = "While invoking a command on another server, this server is unable"
-            + " to cache the meta data related to the command.", action = "Check the server logs and contact Oracle support", publish = true, level = "WARNING")
+    @LogMessageInfo(
+            message = "Can not put data to cache under key {0}",
+            cause = "While invoking a command on another server, this server is unable "
+                    + "to cache the meta data related to the command.",
+            action = "Check the server logs.",
+            level = "WARNING")
     public final static String mCantPutToCache = LOGMSG_PREFIX + "-00013";
 
-    @LogMessageInfo(message = "An admin request arrived from {0} with the domain identifier {1} "
-            + "which does not match the domain identifier {2} configured for this "
-            + "server's domain; rejecting the request", cause = "There is a error in the cluster or network configuration.", action = "Check the server logs and contact Oracle support", publish = true, level = "WARNING")
+    @LogMessageInfo(
+            message = "An admin request arrived from {0} with the domain identifier {1} "
+                    + "which does not match the domain identifier {2} configured for this "
+                    + "server's domain; rejecting the request",
+            cause = "There is a error in the cluster or network configuration.",
+            action = "Check the server logs.",
+            level = "WARNING")
     public final static String mForeignDomainID = LOGMSG_PREFIX + "-00014";
 
-    @LogMessageInfo(message = "Error searching for a default admin user", cause = "An unexpected exception occurred wihle searching for the default admin user.", action = "Check the server logs and contact Oracle support", publish = true, level = "WARNING")
+    @LogMessageInfo(
+            message = "Error searching for a default admin user",
+            cause = "An unexpected exception occurred while searching for the default admin user.",
+            action = "Check the server logs.",
+            level = "WARNING")
     public final static String mAdminUserSearchError = LOGMSG_PREFIX + "-00015";
 
-    @LogMessageInfo(message = "Unexpected exception from command event listener.", cause = "An error occured while calling registered listener.", action = "Check the server logs and contact Oracle support", publish = true, level = "WARNING")
+    @LogMessageInfo(
+            message = "Unexpected exception from command event listener.",
+            cause = "An error occurred while calling registered listener.",
+            action = "Check the server logs.",
+            level = "WARNING")
     public final static String mExceptionFromEventListener = LOGMSG_PREFIX + "-00018";
-
 }
diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/AMXLoggerInfo.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/AMXLoggerInfo.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -17,25 +18,28 @@
 package org.glassfish.admin.amx.util;
 
 import java.util.logging.Logger;
+
 import org.glassfish.logging.annotation.LogMessageInfo;
 import org.glassfish.logging.annotation.LogMessagesResourceBundle;
 import org.glassfish.logging.annotation.LoggerInfo;
 
 /**
  * Logger information for the amx-core module.
+ *
  * @author Tom Mueller
  */
 /* Module private */
 public class AMXLoggerInfo {
+
     public static final String LOGMSG_PREFIX = "NCLS-COM";
 
     @LogMessagesResourceBundle
     public static final String SHARED_LOGMESSAGE_RESOURCE = "org.glassfish.admin.amx.util.LogMessages";
 
     @LoggerInfo(subsystem = "COMMON", description = "AMX Services", publish = true)
     public static final String AMX_LOGGER = "jakarta.enterprise.system.tools.amx";
-    private static final Logger amxLogger = Logger.getLogger(
-                AMX_LOGGER, SHARED_LOGMESSAGE_RESOURCE);
+
+    private static final Logger amxLogger = Logger.getLogger(AMX_LOGGER, SHARED_LOGMESSAGE_RESOURCE);
 
     public static Logger getLogger() {
         return amxLogger;
@@ -94,7 +98,7 @@ public static Logger getLogger() {
     @LogMessageInfo(
             message = "AMX ComplianceMonitor thread has unexpectedly quit {0}",
             cause = "A JMX validation thread has unexpectedly terminated due to an exception.",
-            action = "Check the server logs and contact Oracle support.",
+            action = "Check the server logs.",
             level = "SEVERE")
     public static final String aMXComplianceMonitorThreadquit = LOGMSG_PREFIX + "-00022";
 
@@ -121,14 +125,14 @@ public static Logger getLogger() {
     @LogMessageInfo(
             message = "Attribute {0} not found for object {1}",
             cause = "An attempt to resolve an attribute failed.",
-            action = "Check the server logs and contact Oracle support.",
+            action = "Check the server logs.",
             level = "SEVERE")
     public static final String attributeNotfound = LOGMSG_PREFIX + "-00030";
 
     @LogMessageInfo(
             message = "Can't find child of type {0}",
             cause = "While removing a child, the child was not found.",
-            action = "Check the server logs and contact Oracle support.",
+            action = "Check the server logs.",
             level = "SEVERE")
     public static final String childNotfound = LOGMSG_PREFIX + "-00031";
 
@@ -145,7 +149,7 @@ public static Logger getLogger() {
     @LogMessageInfo(
             message = "Unexpected thread death of AMXConfigLoaderThread",
             cause = "The AMX configuration loader thread received an unexpected exception.",
-            action = "Check the server logs and contact Oracle support.",
+            action = "Check the server logs.",
             level = "SEVERE")
     public static final String unexpectedDeath = LOGMSG_PREFIX + "-00034";
 
@@ -228,6 +232,4 @@ public static Logger getLogger() {
             message = "MBeanInfoSupport: @ManagedAttribute not a getter or setter: {0}.{1}()",
             level = "WARNING")
     public static final String attributeNotGetterSetter = LOGMSG_PREFIX + "-00050";
-
-
 }