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

Putting content.jar in a place that EE8 tooling can find.

This commit is contained in:
Joakim Erdfelt 2022-08-09 14:56:26 -05:00
parent f7b8ed4c06
commit 81f80fa365
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/StaticFromJarServerTest.java
View File

@ -17,7 +17,6 @@ import java.io.FileNotFoundException;
import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.api.ContentResponse;
@ -28,6 +27,7 @@ import org.eclipse.jetty.io.ClientConnector;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.DefaultHandler;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.util.URIUtil;
import org.eclipse.jetty.util.component.LifeCycle;
import org.eclipse.jetty.util.resource.Resource;
@ -76,7 +76,8 @@ public class StaticFromJarServerTest
@BeforeEach
public void startServer() throws Exception
{
Path jarFile = Paths.get("src/test/jars/content.jar");
Path testResources = MavenTestingUtils.getTargetPath("test-classes");
Path jarFile = testResources.resolve("jars/content.jar");
if (!Files.exists(jarFile))
throw new FileNotFoundException(jarFile.toString());

0
jetty-ee9/jetty-ee9-servlet/src/test/jars/content.jar → jetty-ee9/jetty-ee9-servlet/src/test/resources/jars/content.jar
View File