Merge pull request #29340 from tjwatson/earClassPathTest

WAR class path loader configuration and tests for default and EAR loader behavior
OpenLiberty · Sep 11, 2024 · 16635fd · 16635fd
2 parents a25468e + 6801bdb
commit 16635fd
Show file tree

Hide file tree

Showing 136 changed files with 5,200 additions and 803 deletions.
diff --git a/....manager.module/src/com/ibm/ws/app/manager/module/internal/SimpleDeployedAppInfoBase.java b/....manager.module/src/com/ibm/ws/app/manager/module/internal/SimpleDeployedAppInfoBase.java
diff --git a/....springboot/src/com/ibm/ws/app/manager/springboot/internal/SpringBootApplicationImpl.java b/....springboot/src/com/ibm/ws/app/manager/springboot/internal/SpringBootApplicationImpl.java
@@ -139,7 +139,7 @@ public SpringModuleContainerInfo(List<Container> springBootSupport, ModuleHandle
                                          Container moduleContainer, Entry altDDEntry,
                                          String moduleURI,
                                          ModuleClassLoaderFactory moduleClassLoaderFactory,
-                                         ModuleClassesInfoProvider moduleClassesInfo,
+                                         ManifestClassPathProvider moduleClassesInfo,
                                          List<ContainerInfo> containerInfos) throws UnableToAdaptException {
             super(moduleHandler, moduleMetaDataExtenders, nestedModuleMetaDataFactories, moduleContainer, altDDEntry, moduleURI, ContainerInfo.Type.WEB_MODULE, moduleClassLoaderFactory, moduleClassesInfo, WebApp.class);
             this.classesContainerInfo.addAll(containerInfos);

diff --git a/dev/com.ibm.ws.app.manager.war/bnd.bnd b/dev/com.ibm.ws.app.manager.war/bnd.bnd
@@ -57,7 +57,8 @@ instrument.classesExcludes: com/ibm/ws/app/manager/war/internal/resources/*.clas
 	com.ibm.ws.container.service;version=latest,\
 	com.ibm.ws.classloading;version=latest,\
 	com.ibm.ws.javaee.ddmodel;version=latest,\
-	com.ibm.ws.javaee.dd.common;version=latest
+	com.ibm.ws.javaee.dd.common;version=latest,\
+	com.ibm.ws.kernel.boot.core
 
 -testpath: \
 	../build.sharedResources/lib/junit/old/junit.jar;version=file, \

diff --git a/dev/com.ibm.ws.app.manager.war/resources/OSGI-INF/l10n/metatype.properties b/dev/com.ibm.ws.app.manager.war/resources/OSGI-INF/l10n/metatype.properties
@@ -31,4 +31,9 @@ classloader.desc=Defines the settings for the application classloader.
 
 appBnd.name=Application Bindings
 appBnd.name$Ref=Application bindings reference
-appBnd.desc=Binds general deployment information included in the application to specific resources.
+appBnd.desc=Binds general deployment information included in the application to specific resources.
+
+earapp.addWebModuleClassPathTo.name=The class loader that is used for web application class paths
+earapp.addWebModuleClassPathTo.desc=This attribute defines the class loader that is used for JARs that are referenced by web application Class-Path headers.
+earapp.addWebModuleClassPathTo.warLoader=Use the web application class loader for the JARs that are referenced by a web application Class-Path header.
+earapp.addWebModuleClassPathTo.earLoader=Use the parent enterprise application class loader for the JARs that are referenced by a web application Class-Path header.
diff --git a/dev/com.ibm.ws.app.manager.war/resources/OSGI-INF/metatype/metatype.xml b/dev/com.ibm.ws.app.manager.war/resources/OSGI-INF/metatype/metatype.xml
@@ -1,5 +1,5 @@
 <!--
-    Copyright (c) 2017 IBM Corporation and others.
+    Copyright (c) 2017, 2024 IBM Corporation and others.
     All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License 2.0
     which accompanies this distribution, and is available at
@@ -30,6 +30,14 @@
         <AD id="defaultClientModule" name="%earapp.defaultClientModule.name" description="%earapp.defaultClientModule.desc" type="String" required="false"/>
 <!--        <AD id="classloader" type="String" ibm:type="pid" ibm:reference="com.ibm.ws.classloading.classloader" required="false" name="%classloader.name" description="%classloader.desc" />
         <AD id="application-bnd" type="String" ibm:type="pid" ibm:reference="com.ibm.ws.javaee.dd.appbnd" required="false" name="%appBnd.name" description="%appBnd.desc" />-->
+        <AD name="%earapp.addWebModuleClassPathTo.name" description="%earapp.addWebModuleClassPathTo.desc"
+            id="addWebModuleClassPathTo"
+            required="false" 
+            type="String" 
+            ibm:beta="true" >
+            <Option label="%earapp.addWebModuleClassPathTo.warLoader" value="warLoader"/>
+            <Option label="%earapp.addWebModuleClassPathTo.earLoader" value="earLoader"/>
+        </AD>
       </OCD>  
     <Designate factoryPid="com.ibm.ws.app.manager.earappcfg">
         <Object ocdref="com.ibm.ws.app.manager.earappcfg"/>

diff --git a/...om.ibm.ws.app.manager.war/src/com/ibm/ws/app/manager/ear/internal/EARDeployedAppInfo.java b/...om.ibm.ws.app.manager.war/src/com/ibm/ws/app/manager/ear/internal/EARDeployedAppInfo.java
diff --git a/dev/com.ibm.ws.cdi.visibility_fat/fat/src/com/ibm/ws/cdi/visibility/tests/FATSuite.java b/dev/com.ibm.ws.cdi.visibility_fat/fat/src/com/ibm/ws/cdi/visibility/tests/FATSuite.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-2.0/
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
@@ -21,14 +21,16 @@
 import com.ibm.ws.cdi.visibility.tests.sharedlib.SharedLibraryTest;
 import com.ibm.ws.cdi.visibility.tests.validatorInJar.ValidatorInJarTest;
 import com.ibm.ws.cdi.visibility.tests.vistest.VisTest;
+import com.ibm.ws.cdi.visibility.tests.vistest.VisTestAddWarCPToEar;
 
 @RunWith(Suite.class)
 @SuiteClasses({
                 BasicVisibilityTests.class,
                 EJBVisibilityTests.class,
                 SharedLibraryTest.class,
                 ValidatorInJarTest.class,
-                VisTest.class
+                VisTest.class,
+                VisTestAddWarCPToEar.class
 })
 public class FATSuite {