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

Jump to bottom

Draft: Adds lookup in system properties for WAR contextRoot in EAR #24644

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Draft: Adds lookup in system properties for WAR contextRoot in EAR #24644

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion ...eus/deployment/common/src/main/java/org/glassfish/deployment/common/ModuleDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@

import org.glassfish.api.deployment.archive.ArchiveType;
import org.glassfish.deployment.versioning.VersioningUtils;
import org.jvnet.hk2.config.TranslationException;
import org.jvnet.hk2.config.VariableResolver;

/**
* This class describes a module information for an applicaiton module
Expand Down Expand Up @@ -145,7 +147,13 @@ public T getDescriptor() {
* @param contextRoot the contextRoot
*/
public void setContextRoot(String contextRoot) {
this.contextRoot = contextRoot;
VariableResolver resolver = new VariableResolver() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's better to use the existing functionality in TranslatedConfigView.expandValue(). This method is used to expand values in domain.xml and supports references to system properties and password aliases. In the future, we can also add support to MicroProfile Config values (e.g. also env variables).

I suggest creating a new static method in TranslatedConfigView, e.g. expandValueForDescriptor and delegate to the expandValue() method. This is just in case we need to add additional behavior when dealing with deployment descriptors. E.g. disable it with a config property like Payara did in this PR because it broke some TCK tests: payara/Payara#4132.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @OndroMih,
Thanks for the hints ! I'll take a look and come back with some similar implementation.

@Override
protected String getVariableValue(String varName) throws TranslationException {
return System.getProperty(varName, "");
}
};
this.contextRoot = resolver.translate(contextRoot);
}

/**
Expand Down