Issue #12124 fix jsp scratchdir location for ee9. #12129
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also ensure the name of war appears in the name of the tmp dir for ee9 webapps.
gregw
previously approved these changes
Aug 2, 2024
| @@ -2852,4 +2864,9 @@ public boolean handle(org.eclipse.jetty.server.Request coreRequest, Response res | |||
| } | |||
| } | |||
| } | |||
|
|
|||
| public Resource getResourceAsBaseName() | |||
There was a problem hiding this comment.
How about calling this:
Suggested change
| public Resource getResourceAsBaseName() | |
| public Resource getNestedResourceForeTempDirName() |
|
Still some test failures. |
|
wrong danged button push! |
olamy
requested changes
Aug 3, 2024
| FS.ensureDirExists(myTempDir); | ||
|
|
||
| // Create war on the fly | ||
| Path testWebappDir = MavenTestingUtils.getProjectDirPath("src/test/webapp"); |
There was a problem hiding this comment.
this may not work with generated ee8 as resources are in target/test-classes.
But depends if the test only need the web.xml or the other resources as the web.xml will not be in this directory)
Suggested change
| Path testWebappDir = MavenTestingUtils.getProjectDirPath("src/test/webapp"); | |
| Path testWebappDir = MavenTestingUtils.getTargetPath("test-classes/webapp"); |
There was a problem hiding this comment.
The new MavenPaths object has several .find* methods that will work as intended on ee8/ee9.
Can we use one of those?
| public void testFreshTempDir(WorkDir workDir) throws Exception | ||
| { | ||
| // Create war on the fly | ||
| Path testWebappDir = MavenTestingUtils.getProjectDirPath("src/test/webapp"); |
There was a problem hiding this comment.
same comment
Suggested change
| Path testWebappDir = MavenTestingUtils.getProjectDirPath("src/test/webapp"); | |
| Path testWebappDir = MavenTestingUtils.getTargetPath("test-classes/webapp"); |
| public void testSameTempDir(WorkDir workDir) throws Exception | ||
| { | ||
| // Create war on the fly | ||
| Path testWebappDir = MavenTestingUtils.getProjectDirPath("src/test/webapp"); |
There was a problem hiding this comment.
same comment
Suggested change
| Path testWebappDir = MavenTestingUtils.getProjectDirPath("src/test/webapp"); | |
| Path testWebappDir = MavenTestingUtils.getTargetPath("test-classes/webapp"); |
There was a problem hiding this comment.
I'm confused, the tests appear to be working on ee8?
…12124-jsp-tmp-dir
…nces to jar:file urls." This reverts commit 7b4cb73.
gregw
approved these changes
Aug 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #12124
After #12044, the jsp scrachdir is showing up in
jetty.baseinstead of under the webapp's tmp dir.Also, the name of the webapp's tmp dir (if created by jetty) is missing the name of the war.