Fix Command Logger button in Admin Console

appserver/admingui/commandrecorder/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2024 Contributors to the Eclipse Foundation
+    Copyright (c) 2024,2025 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -63,4 +63,14 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
+
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <copy.modules.to.distribution.skip>false</copy.modules.to.distribution.skip>
+                <copy.modules.to.distribution.destFile>${basedir}/../../distributions/glassfish/target/stage/glassfish7/glassfish/lib/install/applications/__admingui/WEB-INF/lib/${project.artifactId}-${project.version}.jar</copy.modules.to.distribution.destFile>
+            </properties>
+        </profile>
+    </profiles>
 </project>

appserver/admingui/commandrecorder/src/main/java/org/glassfish/commandrecorder/admingui/plugin/CommandRecorderConsolePlugin.java

@@ -15,6 +15,7 @@
  */
 package org.glassfish.commandrecorder.admingui.plugin;
 
+
 import java.net.URL;
 
 import org.glassfish.api.admingui.ConsoleProvider;

appserver/admingui/common/pom.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
+    Copyright (c) 2025 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
@@ -129,4 +130,14 @@
             </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <copy.modules.to.distribution.skip>false</copy.modules.to.distribution.skip>
+            </properties>
+        </profile>
+    </profiles>
+
 </project>

appserver/admingui/core/pom.xml

@@ -70,6 +70,12 @@
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.main.core</groupId>
+            <artifactId>kernel</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <profiles>

appserver/admingui/core/src/main/java/org/glassfish/admingui/cdi/Hk2ServicesProducer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Contributors to the Eclipse Foundation
+ * Copyright (c) 2024,2025 Contributors to the Eclipse Foundation
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -15,27 +15,55 @@
  */
 package org.glassfish.admingui.cdi;
 
+import com.sun.enterprise.v3.admin.AdminCommandJob;
+
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.inject.Produces;
+import jakarta.faces.context.FacesContext;
+import jakarta.servlet.ServletContext;
 
 import org.glassfish.api.ActionReport;
 import org.glassfish.api.admin.CommandRunner;
+import org.glassfish.api.admin.Job;
+import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.internal.api.Globals;
 
+import static org.glassfish.admingui.common.plugin.ConsoleClassLoader.HABITAT_ATTRIBUTE;
+
 @ApplicationScoped
 public class Hk2ServicesProducer {
 
+    @Produces
+    ServiceLocator produceLocator() {
+        ServletContext servletCtx = (ServletContext)
+            (FacesContext.getCurrentInstance().getExternalContext()).getContext();
+
+        ServiceLocator locator = (ServiceLocator) servletCtx.getAttribute(HABITAT_ATTRIBUTE);
+
+        if (locator == null) {
+            return Globals.getDefaultHabitat();
+        }
+        return locator;
+    }
+
     @Produces
     CommandRunner getCommandRunner() {
-        return getGlobalService(CommandRunner.class);
+        return produceLocator().getService(CommandRunner.class);
     }
 
     @Produces
-    ActionReport getActionReport() {
-        return getGlobalService(ActionReport.class);
+    public CommandRunner<AdminCommandJob> produceAdminCommandJobCommandRunner() {
+        return getCommandRunner();
     }
 
-    private static <T> T getGlobalService(Class<T> aClass) {
-        return Globals.getDefaultHabitat().getService(aClass);
+    @Produces
+    public CommandRunner<Job> produceJobCommandRunner() {
+        return getCommandRunner();
     }
+
+    @Produces
+    ActionReport getActionReport() {
+        return produceLocator().getService(ActionReport.class);
+    }
+
 }