Merge pull request #24814 from avpinchuk/admin-console-lifecycle

Improve the Admin Console loading options

nucleus/core/kernel/pom.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
+    Copyright (c) 2024 Contributors to the Eclipse Foundation.
     Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -208,9 +209,9 @@
                 <includes>
                     <include>com/sun/enterprise/deployment/backend/*.properties</include>
                     <include>com/sun/enterprise/v3/**/*.properties</include>
-                    <include>com/sun/enterprise/v3/**/downloadgui.html</include>
                     <include>com/sun/enterprise/v3/**/status.html</include>
                     <include>com/sun/enterprise/v3/**/statusNotDAS.html</include>
+                    <include>com/sun/enterprise/v3/**/statusDisabled.html</include>
                     <include>com/sun/enterprise/v3/**/asynch-1F.gif</include>
                     <include>com/sun/enterprise/v3/**/backimage.jpg</include>
                 </includes>

nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/adapter/AdapterState.java

@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -16,15 +17,20 @@
 
 package com.sun.enterprise.v3.admin.adapter;
 
-/** A package-private class that holds the state of the admin adapter.
- *  It also acts as a lock that needs to be synchronized externally.
- *  Note that this class is not thread-safe on its own.
+/**
+ * A package-private class that holds the state of the admin adapter.
+ *
+ * <p>It also acts as a lock that needs to be synchronized externally.
+ *
+ * <p>Note that this class is not thread-safe on its own.
+ *
  * @author &#2325;&#2375;&#2342;&#2366;&#2352 (km@dev.java.net)
+ *
  * @since GlassFish V3
  */
 enum AdapterState {
 
-    UNINITIAZED("state.uninitialized", "The Admin Console Adapter is not yet initialized."),
+    UNINITIALIZED("state.uninitialized", "The Admin Console Adapter is not yet initialized."),
     AUTHENTICATING("state.authenticating", "Authentication required before the Admin Console can be installed."),
     PERMISSION_NEEDED("state.permissionNeeded", "The Admin Console requires your permission before it can be downloaded or installed."),
     PERMISSION_GRANTED("state.permissionGranted", "The Admin Console has your permission to downloaded and install."),
@@ -39,14 +45,13 @@ enum AdapterState {
     APPLICATION_LOADED("state.loaded", "The Admin Console application is loaded."),
     APPLICATION_NOT_INSTALLED("state.notInstalled", "The Admin Console Application is not yet installed."),
     APPLICATION_PREPARE_UPGRADE("state.prepareRedeploy", "Preparing to upgrade Admin Console Application..."),
-    APPLICATION_BACKUP_FALED("state.backupFailed", "Cannot backup previous version of __admingui"),
-    APPLICATION_CLEANUP_FALED("state.cleanupFailed", "Exception while cleaning previous instance of admin GUI"),
+    APPLICATION_BACKUP_FAILED("state.backupFailed", "Cannot backup previous version of __admingui"),
+    APPLICATION_CLEANUP_FAILED("state.cleanupFailed", "Exception while cleaning previous instance of admin GUI"),
     APPLICATION_BACKUP_CLEANING("state.cleaningBackup", "Cleaning up temporary backup file..."),
-    APPLICATION_BACKUP_CLEANED("state.cleanupFailed", "Temporary backup file removed"),
+    APPLICATION_BACKUP_CLEANED("state.backupCleaned", "Temporary backup file removed"),
     APPLICATION_RESTORE("state.restore", "Restoring previously deployed Admin Console..."),
-    APPLICATION_UPGRADE_FALED("state.upgradeFailed", "Cannot upgrade Admin Console."),
-    WELCOME_TO("status.welcometo", "Welcome to ");
-
+    APPLICATION_UPGRADE_FAILED("state.upgradeFailed", "Cannot upgrade Admin Console."),
+    WELCOME_TO("state.welcometo", "Welcome to ");
 
     private final String desc;
     private final String i18nKey;
@@ -56,7 +61,6 @@ private AdapterState(String i18nKey, String desc) {
         this.desc = desc;
     }
 
-
     /**
      * This is the key that should be used to retrieve the localized message from a properties file.
      */
@@ -66,6 +70,6 @@ public String getI18NKey() {
 
     @Override
     public String toString() {
-        return (desc);
+        return desc;
     }
 }