From 8c7ec512f878c12428d87728708328aec9a764b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Pin=C4=8Duk?= Date: Tue, 10 Sep 2024 21:33:13 +0300 Subject: [PATCH 1/2] Initialize default resources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexander Pinčuk --- .../config/modularity/GetSetModularityHelper.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/GetSetModularityHelper.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/GetSetModularityHelper.java index 4973fd6395f..9621a0a7c3d 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/GetSetModularityHelper.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/GetSetModularityHelper.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 @@ -19,11 +20,14 @@ import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; +import jakarta.annotation.PostConstruct; import jakarta.inject.Inject; import java.util.StringTokenizer; +import org.glassfish.api.naming.DefaultResourceProxy; import org.glassfish.config.support.Singleton; +import org.glassfish.hk2.api.ServiceLocator; import org.jvnet.hk2.annotations.Service; /** @@ -41,6 +45,14 @@ public class GetSetModularityHelper { @Inject private Domain domain; + @Inject + private ServiceLocator serviceLocator; + + @PostConstruct + public void initDefaultResources() { + serviceLocator.getAllServices(DefaultResourceProxy.class); + } + /** * @param prefix the entire . separated string * @param position starts with one From d932ebb2d82c2210fb69495a32e9ef5308db87e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Pin=C4=8Duk?= Date: Tue, 10 Sep 2024 21:37:51 +0300 Subject: [PATCH 2/2] Fixes recognition of the 'ejb-container' config extension MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexander Pinčuk --- .../enterprise/config/modularity/GetSetModularityHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/GetSetModularityHelper.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/GetSetModularityHelper.java index 9621a0a7c3d..ad812d6b9a3 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/GetSetModularityHelper.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/GetSetModularityHelper.java @@ -102,7 +102,7 @@ public void getLocationForDottedName(String dottedName) { // TODO temporary hard coded service names till all elements are supported, being tracked as part of FPP-121 if (dottedName.contains("monitor")) return; - if (dottedName.contains("mdb-container") || dottedName.contains("ejb-container.") || dottedName.contains("web-container.") + if (dottedName.contains("mdb-container") || dottedName.contains("ejb-container.") || dottedName.endsWith("ejb-container") || dottedName.contains("web-container.") || dottedName.contains("cdi-service") || dottedName.contains("batch-runtime-configuration") || dottedName.contains("managed-job-config")) { //TODO improve performance to improve command execution time