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

Updated for loss of dump.war

This commit is contained in:
gregw 2024-03-26 20:12:06 +01:00
parent 0ddab409eb
commit 5bfc74f816
3 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jetty-core/jetty-ee/src/main/java/org/eclipse/jetty/ee/WebappClassLoading.java
View File

@ -1,3 +1,16 @@
//
// ========================================================================
// Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others.
//
// This program and the accompanying materials are made available under the
// terms of the Eclipse Public License v. 2.0 which is available at
// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
// which is available at https://www.apache.org/licenses/LICENSE-2.0.
//
// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
// ========================================================================
//
package org.eclipse.jetty.ee;
import org.eclipse.jetty.server.Server;

13
jetty-ee10/jetty-ee10-webapp/src/test/java/org/eclipse/jetty/ee10/webapp/WebAppContextTest.java
View File

@ -130,7 +130,7 @@ public class WebAppContextTest
* @param name the name of the war
* @return the Path of the generated war
*
* @throws Exception
* @throws Exception if the war could not be created
*/
private Path createWar(Path tempDir, String name) throws Exception
{
@ -950,7 +950,11 @@ public class WebAppContextTest
WebAppContext context = new WebAppContext();
context.setContextPath("/");
Path warPath = MavenPaths.findTestResourceFile("wars/dump.war");
Path testPath = MavenPaths.targetTestDir("testAddServerClasses");
FS.ensureDirExists(testPath);
FS.ensureEmpty(testPath);
Path warPath = createWar(testPath, "test.war");
context.setBaseResource(context.getResourceFactory().newResource(warPath));
server.setHandler(context);
@ -974,7 +978,10 @@ public class WebAppContextTest
WebAppContext context = new WebAppContext();
context.setContextPath("/");
Path warPath = MavenPaths.findTestResourceFile("wars/dump.war");
Path testPath = MavenPaths.targetTestDir("testAddServerClasses");
FS.ensureDirExists(testPath);
FS.ensureEmpty(testPath);
Path warPath = createWar(testPath, "test.war");
context.setBaseResource(context.getResourceFactory().newResource(warPath));
server.setHandler(context);

10
jetty-ee9/jetty-ee9-webapp/src/test/java/org/eclipse/jetty/ee9/webapp/WebAppContextTest.java
View File

@ -860,7 +860,10 @@ public class WebAppContextTest
WebAppContext context = new WebAppContext();
context.setContextPath("/");
Path warPath = MavenPaths.findTestResourceFile("wars/dump.war");
Path testPath = MavenPaths.targetTestDir("testAddServerClasses");
FS.ensureDirExists(testPath);
FS.ensureEmpty(testPath);
Path warPath = createWar(testPath, "test.war");
context.setBaseResource(context.getResourceFactory().newResource(warPath));
server.setHandler(context);
@ -884,7 +887,10 @@ public class WebAppContextTest
WebAppContext context = new WebAppContext();
context.setContextPath("/");
Path warPath = MavenPaths.findTestResourceFile("wars/dump.war");
Path testPath = MavenPaths.targetTestDir("testAddServerClasses");
FS.ensureDirExists(testPath);
FS.ensureEmpty(testPath);
Path warPath = createWar(testPath, "test.war");
context.setBaseResource(context.getResourceFactory().newResource(warPath));
server.setHandler(context);