Skip to content

Property to tell to Tomcat to map JARs in WEB-INF/lib or WEB-INF/classes #422

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

Merged
alitokmen merged 1 commit into from
Nov 27, 2023
Merged

Property to tell to Tomcat to map JARs in WEB-INF/lib or WEB-INF/classes #422

Show file tree
Hide file tree
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
12 changes: 12 additions & 0 deletions ...c/main/java/org/codehaus/cargo/container/tomcat/Tomcat8xStandaloneLocalConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,16 @@ private void writeDirectoryPostResource(Element postResourceEl, String path)
*/
private void writeJarPostResource(StringBuilder sb, String path)
{
if (Boolean.parseBoolean(getPropertyValue(TomcatPropertySet.CONTEXT_MAPJARSTOWEBINFCLASSES))) {
sb.append("className=\"" + JAR_RESOURCE_SET + "\" base=\"");
sb.append(path.replace("&", "&"));
sb.append("\" webAppMount=\"/WEB-INF/classes/");
} else {
sb.append("className=\"" + FILE_RESOURCE_SET + "\" base=\"");
sb.append(path.replace("&", "&"));
sb.append("\" webAppMount=\"/WEB-INF/lib/");
sb.append(getFileHandler().getName(path).replace("&", "&"));
}
}

/**
Expand All @@ -217,10 +223,16 @@ private void writeJarPostResource(StringBuilder sb, String path)
*/
private void writeJarPostResource(Element postResourceEl, String path)
{
if (Boolean.parseBoolean(getPropertyValue(TomcatPropertySet.CONTEXT_MAPJARSTOWEBINFCLASSES))) {
postResourceEl.setAttribute("className", JAR_RESOURCE_SET);
postResourceEl.setAttribute("base", path.replace("&", "&"));
postResourceEl.setAttribute("webAppMount", "/WEB-INF/classes/");
} else {
postResourceEl.setAttribute("className", FILE_RESOURCE_SET);
postResourceEl.setAttribute("base", path.replace("&", "&"));
postResourceEl.setAttribute("webAppMount", "/WEB-INF/lib/"
+ getFileHandler().getName(path).replace("&", "&"));
}
}

/**
Expand Down
5 changes: 5 additions & 0 deletions ...ontainers/tomcat/src/main/java/org/codehaus/cargo/container/tomcat/TomcatPropertySet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ public interface TomcatPropertySet
*/
String CONTEXT_ALLOWWEBJARS = "cargo.tomcat.context.addWebinfClassesResources";

/**
* Whether the contexts for deployed webapplications should map JARs to WEB-INF/classes
*/
String CONTEXT_MAPJARSTOWEBINFCLASSES = "cargo.tomcat.context.mapJarToWebinfClasses";

/**
* Whether WAR deployables should be copied or referenced.
*/
Expand Down