GH #25039 Facelets in Console: Clean up

Moved CDI producers into Admin Core, so that they can be reused by other modules and we avoid conflicts or implicit dependencies if multiple modules define the same producers or rely on beans produced by other modules.

appserver/admingui/commandrecorder/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2010, 2021 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2024 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

appserver/admingui/commandrecorder/src/main/resources/META-INF/admingui/console-config.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2024 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

appserver/admingui/community-theme/src/main/resources/branding/masthead.inc

@@ -65,7 +65,7 @@
                                onFocus="window.status='$resource{i18n.masthead.restartStatusMsg}'; return true"
                                url="#{request.contextPath}/common/appServer/restart.jsf">
                 </sun:hyperlink>
-                "</span>
+            "</span>
             <!afterCreate
                 includeIntegrations(type="org.glassfish.admingui:mastheadStatusArea" root="$this{component}");
             />

appserver/admingui/core/pom.xml

@@ -34,6 +34,16 @@
     <name>Admin Console Core Jar</name>
 
     <dependencies>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.security.enterprise</groupId>
+            <artifactId>jakarta.security.enterprise-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.glassfish.woodstock</groupId>
             <artifactId>woodstock-webui-jsf</artifactId>

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

@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package org.glassfish.commandrecorder.admingui.cdi;
+package org.glassfish.admingui.cdi;
 
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.inject.Produces;

appserver/admingui/commandrecorder/src/main/java/org/glassfish/commandrecorder/admingui/cdi/SecurityProducer.java → appserver/admingui/core/src/main/java/org/glassfish/admingui/cdi/SecurityProducer.java

@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package org.glassfish.commandrecorder.admingui.cdi;
+package org.glassfish.admingui.cdi;
 
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.inject.Produces;

appserver/admingui/war/src/main/java/org/glassfish/admingui/common/AdminGuiApplication.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ * Copyright (c) 2024 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

appserver/admingui/war/src/main/java/org/glassfish/admingui/common/AdminGuiApplicationFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ * Copyright (c) 2024 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

appserver/admingui/war/src/main/java/org/glassfish/admingui/common/AdminGuiViewHandler.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
- * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024 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

appserver/admingui/war/src/main/webapp/WEB-INF/faces-config.xml

@@ -25,6 +25,21 @@
     <name>admingui</name>
     <application>
         <view-handler>org.glassfish.admingui.common.AdminGuiViewHandler</view-handler>
+        <locale-config>
+          <default-locale>en</default-locale>
+          <supported-locale>de</supported-locale>
+          <supported-locale>sv</supported-locale>
+          <supported-locale>en_US</supported-locale>
+          <supported-locale>fr</supported-locale>
+          <supported-locale>ko</supported-locale>
+          <supported-locale>ja</supported-locale>
+          <supported-locale>zh_TW</supported-locale>
+          <supported-locale>zh_CN</supported-locale>
+          <supported-locale>es</supported-locale>
+          <supported-locale>it</supported-locale>
+          <supported-locale>pt_BR</supported-locale>
+        </locale-config>
+        <el-resolver>com.sun.webui.jsf.faces.UIComponentELResolver</el-resolver>
     </application>
     <factory>
         <application-factory>org.glassfish.admingui.common.AdminGuiApplicationFactory</application-factory>

appserver/admingui/war/src/main/webapp/WEB-INF/web.xml

@@ -111,6 +111,10 @@
         <servlet-name>FacesServlet</servlet-name>
         <url-pattern>/html/*</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>FacesServlet</servlet-name>
+        <url-pattern>/faces/*</url-pattern>
+    </servlet-mapping>
     <servlet-mapping>
         <servlet-name>FacesServlet</servlet-name>
         <url-pattern>*.xhtml</url-pattern>