Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 

# Conflicts:
#	jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/InstructionFlusher.java
#	jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ArrayByteBufferPool.java
#	jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/content/BufferedContentSink.java
#	jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ContextScopeListenerTest.java
#	jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpOutput.java
This commit is contained in:
gregw 2024-07-08 17:01:50 +10:00
parent 56a4a58b7c
commit ac6c49b34f
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jetty-ee11/jetty-ee11-maven-plugin/src/it/jetty-combinedresource-it/pom.xml
View File

@ -53,8 +53,8 @@
<systemPropertyVariables> <systemPropertyVariables>
<jetty.port.file>${jetty.port.file}</jetty.port.file> <jetty.port.file>${jetty.port.file}</jetty.port.file>
<maven.it.name>${project.groupId}:${project.artifactId}</maven.it.name> <maven.it.name>${project.groupId}:${project.artifactId}</maven.it.name>
<contentCheck>BLAH</contentCheck> <contentCheck>SPACY</contentCheck>
<pathToCheck>/blah.html</pathToCheck> <pathToCheck>/spacy.html</pathToCheck>
</systemPropertyVariables> </systemPropertyVariables>
<dependenciesToScan> <dependenciesToScan>
<dependency>org.eclipse.jetty.ee11:jetty-ee11-maven-plugin</dependency> <dependency>org.eclipse.jetty.ee11:jetty-ee11-maven-plugin</dependency>
@ -95,6 +95,7 @@
<webApp> <webApp>
<resourceBases> <resourceBases>
<resourceBase>${project.basedir}/public</resourceBase> <resourceBase>${project.basedir}/public</resourceBase>
<resourceBase>${project.basedir}/with space</resourceBase>
<resourceBase>${project.basedir}/src/main/webapp</resourceBase> <resourceBase>${project.basedir}/src/main/webapp</resourceBase>
</resourceBases> </resourceBases>
</webApp> </webApp>

1
jetty-ee11/jetty-ee11-maven-plugin/src/it/jetty-combinedresource-it/with space/spacy.html Normal file
View File

@ -0,0 +1 @@
SPACY

7
jetty-ee11/jetty-ee11-maven-plugin/src/main/java/org/eclipse/jetty/ee11/maven/plugin/MavenWebAppContext.java
View File

@ -42,6 +42,7 @@ import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.URIUtil; import org.eclipse.jetty.util.URIUtil;
import org.eclipse.jetty.util.resource.CombinedResource; import org.eclipse.jetty.util.resource.CombinedResource;
import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.resource.Resource;
import org.eclipse.jetty.util.resource.ResourceFactory;
import org.eclipse.jetty.util.resource.Resources; import org.eclipse.jetty.util.resource.Resources;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -230,11 +231,11 @@ public class MavenWebAppContext extends WebAppContext
// This is a user provided list of configurations. // This is a user provided list of configurations.
// We have to assume that mounting can happen. // We have to assume that mounting can happen.
List<URI> uris = Stream.of(resourceBases) List<Resource> resources = Stream.of(resourceBases)
.map(URI::create) .map(s -> ResourceFactory.of(this).newResource(s))
.toList(); .toList();
setBaseResource(this.getResourceFactory().newResource(uris)); setBaseResource(ResourceFactory.combine(resources));
} }
catch (Throwable t) catch (Throwable t)
{ {