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

Merge pull request #11874 from jetty/jetty-12.0.x-11873-ServerResources 

Issue #11873 - Server resources are not found if the server is subclassed in a different package
This commit is contained in:
Lachlan 2024-06-04 23:38:12 +10:00 committed by GitHub
parent ba8732ea4e 21f8e58e04
commit dc28714de8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 66 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
View File

@ -793,7 +793,7 @@ public class Server extends Handler.Wrapper implements Attributes
*/
public Resource getDefaultStyleSheet()
{
return newResource("jetty-dir.css");
return newResource("/org/eclipse/jetty/server/jetty-dir.css");
}
/**
@ -803,7 +803,7 @@ public class Server extends Handler.Wrapper implements Attributes
*/
public Resource getDefaultFavicon()
{
return newResource("favicon.ico");
return newResource("/org/eclipse/jetty/server/favicon.ico");
}
/**

64
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/subpackage/ServerDefaultResourcesTest.java Normal file
View File

@ -0,0 +1,64 @@
//
// ========================================================================
// 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.server.subpackage;
import java.util.stream.Stream;
import org.eclipse.jetty.server.Server;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import static org.junit.jupiter.api.Assertions.assertNotNull;
public class ServerDefaultResourcesTest
{
public static Stream<Arguments> arguments()
{
return Stream.of(
new Server(),
new Server(){}
).map(Arguments::of);
}
@ParameterizedTest
@MethodSource("arguments")
public void testDefaultStyleSheet(Server server) throws Exception
{
try
{
server.start();
assertNotNull(server.getDefaultStyleSheet());
}
finally
{
server.stop();
}
}
@ParameterizedTest
@MethodSource("arguments")
public void testDefaultFavicon(Server server) throws Exception
{
try
{
server.start();
assertNotNull(server.getDefaultFavicon());
}
finally
{
server.stop();
}
}
}