Merge pull request #5491 from eclipse/jetty-9.4.x-5488-jetty-dir.css
Fixes #5488 - jetty-dir.css not found when using JPMS.
This commit is contained in:
commit
a1b3d3319d
|
@ -226,12 +226,17 @@ public class ResourceHandler extends HandlerWrapper implements ResourceFactory,
|
||||||
{
|
{
|
||||||
if (_defaultStylesheet == null)
|
if (_defaultStylesheet == null)
|
||||||
{
|
{
|
||||||
_defaultStylesheet = Resource.newResource(this.getClass().getResource("/jetty-dir.css"));
|
_defaultStylesheet = getDefaultStylesheet();
|
||||||
}
|
}
|
||||||
return _defaultStylesheet;
|
return _defaultStylesheet;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static Resource getDefaultStylesheet()
|
||||||
|
{
|
||||||
|
return Resource.newResource(ResourceHandler.class.getResource("/jetty-dir.css"));
|
||||||
|
}
|
||||||
|
|
||||||
public String[] getWelcomeFiles()
|
public String[] getWelcomeFiles()
|
||||||
{
|
{
|
||||||
return _welcomes;
|
return _welcomes;
|
||||||
|
|
|
@ -41,6 +41,7 @@ import org.eclipse.jetty.server.ResourceContentFactory;
|
||||||
import org.eclipse.jetty.server.ResourceService;
|
import org.eclipse.jetty.server.ResourceService;
|
||||||
import org.eclipse.jetty.server.ResourceService.WelcomeFactory;
|
import org.eclipse.jetty.server.ResourceService.WelcomeFactory;
|
||||||
import org.eclipse.jetty.server.handler.ContextHandler;
|
import org.eclipse.jetty.server.handler.ContextHandler;
|
||||||
|
import org.eclipse.jetty.server.handler.ResourceHandler;
|
||||||
import org.eclipse.jetty.util.URIUtil;
|
import org.eclipse.jetty.util.URIUtil;
|
||||||
import org.eclipse.jetty.util.log.Log;
|
import org.eclipse.jetty.util.log.Log;
|
||||||
import org.eclipse.jetty.util.log.Logger;
|
import org.eclipse.jetty.util.log.Logger;
|
||||||
|
@ -222,7 +223,7 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory, Welc
|
||||||
}
|
}
|
||||||
if (_stylesheet == null)
|
if (_stylesheet == null)
|
||||||
{
|
{
|
||||||
_stylesheet = Resource.newResource(this.getClass().getResource("/jetty-dir.css"));
|
_stylesheet = ResourceHandler.getDefaultStylesheet();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
|
|
|
@ -202,8 +202,11 @@ public class DemoBaseTests extends AbstractDistributionTest
|
||||||
assertTrue(run.awaitConsoleLogsFor("Started @", 10, TimeUnit.SECONDS));
|
assertTrue(run.awaitConsoleLogsFor("Started @", 10, TimeUnit.SECONDS));
|
||||||
|
|
||||||
startHttpClient();
|
startHttpClient();
|
||||||
ContentResponse response = client.GET("http://localhost:" + httpPort + "/test/hello");
|
ContentResponse helloResponse = client.GET("http://localhost:" + httpPort + "/test/hello");
|
||||||
assertEquals(HttpStatus.OK_200, response.getStatus());
|
assertEquals(HttpStatus.OK_200, helloResponse.getStatus());
|
||||||
|
|
||||||
|
ContentResponse cssResponse = client.GET("http://localhost:" + httpPort + "/jetty-dir.css");
|
||||||
|
assertEquals(HttpStatus.OK_200, cssResponse.getStatus());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue