Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WAR class path loader configuration and tests for default and EAR loader behavior #29340

Merged
merged 10 commits into from
Sep 11, 2024
Merged

WAR class path loader configuration and tests for default and EAR loader behavior #29340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
442f687
Add getTestMethod to FATServlet to get the running test method name
tjwatson Aug 30, 2024
9752a42
Add enterpriseApplication class loading tests for Class-Path processing
tjwatson Aug 9, 2024
e77dbf0
Implement enterpriseApplication configuration for addWebModuleClassPa…
tjwatson Aug 13, 2024
c4db831
Reuse computed ModuleClassesContainerInfo if possible
tjwatson Aug 13, 2024
a2ee8ec
Rename ModuleClassesInfoProvider to ManifestClassPathProvider
tjwatson Sep 3, 2024
51fa2da
Add CDI visibility tests for earLoader Class-Path config
tjwatson Sep 6, 2024
2e04295
Use manifestClassPathInfos to filter Class-Path elements from modules
tjwatson Sep 6, 2024
bc89ef5
Add doc messages for new configuration metatype
tjwatson Sep 9, 2024
144ced7
Remove commented out test rule for repeating EE versions
tjwatson Sep 9, 2024
6801bdb
Apply suggestions from Doc review
tjwatson Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 97 additions & 24 deletions ....manager.module/src/com/ibm/ws/app/manager/module/internal/SimpleDeployedAppInfoBase.java
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ....springboot/src/com/ibm/ws/app/manager/springboot/internal/SpringBootApplicationImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion dev/com.ibm.ws.app.manager.war/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, \
Expand Down
7 changes: 6 additions & 1 deletion dev/com.ibm.ws.app.manager.war/resources/OSGI-INF/l10n/metatype.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
10 changes: 9 additions & 1 deletion dev/com.ibm.ws.app.manager.war/resources/OSGI-INF/metatype/metatype.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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"/>
Expand Down
150 changes: 125 additions & 25 deletions ...om.ibm.ws.app.manager.war/src/com/ibm/ws/app/manager/ear/internal/EARDeployedAppInfo.java
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions dev/com.ibm.ws.cdi.visibility_fat/fat/src/com/ibm/ws/cdi/visibility/tests/FATSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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;
dazavala marked this conversation as resolved.
Show resolved Hide resolved

@RunWith(Suite.class)
@SuiteClasses({
BasicVisibilityTests.class,
EJBVisibilityTests.class,
SharedLibraryTest.class,
ValidatorInJarTest.class,
VisTest.class
VisTest.class,
VisTestAddWarCPToEar.class
})
public class FATSuite {

Expand Down
Loading