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-9.3.x'

This commit is contained in:
Greg Wilkins 2015-10-26 13:04:10 +11:00
parent 4e9b3a2066 9a66395f0c
commit 39768f841a
3 changed files with 152 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
jetty-rewrite/src/main/config/etc/jetty-rewrite.xml
View File

@ -19,31 +19,29 @@
<Set name="rewriteRequestURI"><Property name="jetty.rewrite.rewriteRequestURI" deprecated="rewrite.rewriteRequestURI" default="true"/></Set>
<Set name="rewritePathInfo"><Property name="jetty.rewrite.rewritePathInfo" deprecated="rewrite.rewritePathInfo" default="false"/></Set>
<Set name="originalPathAttribute"><Property name="jetty.rewrite.originalPathAttribute" deprecated="rewrite.originalPathAttribute" default="requestedPath"/></Set>
</New>
<!-- Set DispatcherTypes -->
<Set name="dispatcherTypes">
<Array type="javax.servlet.DispatcherType">
<Item><Call class="javax.servlet.DispatcherType" name="valueOf"><Arg>REQUEST</Arg></Call></Item>
<Item><Call class="javax.servlet.DispatcherType" name="valueOf"><Arg>ASYNC</Arg></Call></Item>
</Array>
</Set>
<!-- Set DispatcherTypes -->
<Set name="dispatcherTypes">
<Array type="javax.servlet.DispatcherType">
<Item><Call class="javax.servlet.DispatcherType" name="valueOf"><Arg>REQUEST</Arg></Call></Item>
<Item><Call class="javax.servlet.DispatcherType" name="valueOf"><Arg>ASYNC</Arg></Call></Item>
</Array>
</Set>
<!-- example rule -->
<!--
<Call name="addRule">
<Arg>
<New class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule">
<Set name="pattern">/favicon.ico</Set>
<Set name="name">Cache-Control</Set>
<Set name="value">Max-Age=3600,public</Set>
<Set name="terminating">true</Set>
</New>
</Arg>
</Call>
-->
</New>
</Set>
<!-- example rule -->
<!--
<Call name="addRule">
<Arg>
<New class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule">
<Set name="pattern">/favicon.ico</Set>
<Set name="name">Cache-Control</Set>
<Set name="value">Max-Age=3600,public</Set>
<Set name="terminating">true</Set>
</New>
</Arg>
</Call>
-->
</Configure>

121
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/CachingWebAppClassLoader.java Normal file
View File

@ -0,0 +1,121 @@
//
// ========================================================================
// Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
package org.eclipse.jetty.webapp;
import java.io.IOException;
import java.net.URL;
import java.util.concurrent.ConcurrentHashMap;
import org.eclipse.jetty.util.ConcurrentHashSet;
import org.eclipse.jetty.util.annotation.ManagedObject;
import org.eclipse.jetty.util.annotation.ManagedOperation;
/**
* A WebAppClassLoader that caches {@link #getResource(String)} results.
* Specifically this ClassLoader caches not found classes and resources,
* which can greatly increase performance for applications that search
* for resources.
*/
@ManagedObject
public class CachingWebAppClassLoader extends WebAppClassLoader
{
private final ConcurrentHashSet<String> _notFound = new ConcurrentHashSet<>();
private final ConcurrentHashMap<String,URL> _cache = new ConcurrentHashMap<>();
public CachingWebAppClassLoader(ClassLoader parent, Context context) throws IOException
{
super(parent,context);
}
public CachingWebAppClassLoader(Context context) throws IOException
{
super(context);
}
@Override
public URL getResource(String name)
{
if (_notFound.contains(name))
return null;
URL url = _cache.get(name);
if (name==null)
{
url = super.getResource(name);
if (url==null)
{
_notFound.add(name);
}
else
{
_cache.putIfAbsent(name,url);
}
}
return url;
}
@Override
protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException
{
if (_notFound.contains(name))
throw new ClassNotFoundException(name+": in notfound cache");
try
{
return super.loadClass(name,resolve);
}
catch (ClassNotFoundException nfe)
{
_notFound.add(name);
throw nfe;
}
}
@Override
protected Class<?> findClass(String name) throws ClassNotFoundException
{
if (_notFound.contains(name))
throw new ClassNotFoundException(name+": in notfound cache");
try
{
return super.findClass(name);
}
catch (ClassNotFoundException nfe)
{
_notFound.add(name);
throw nfe;
}
}
@ManagedOperation
public void clearCache()
{
_cache.clear();
_notFound.clear();
}
@Override
public String toString()
{
return "Caching["+super.toString()+"]";
}
}

9
tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml
View File

@ -11,7 +11,7 @@ directory, additional configuration may be specified and hot deployments
detected.
===================================================================== -->
<Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Configure id="testWebapp" class="org.eclipse.jetty.webapp.WebAppContext">
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- Required minimal context configuration : -->
@ -41,6 +41,13 @@ detected.
</New>
</Set>
<!-- Set Caching Classloader that improves performance on resource searching webapps -->
<Set name="classLoader">
<New class="org.eclipse.jetty.webapp.CachingWebAppClassLoader">
<Arg><Ref refid="testWebapp"/></Arg>
</New>
</Set>
<!-- Enable symlinks
<Call name="addAliasCheck">
<Arg><New class="org.eclipse.jetty.server.handler.AllowSymLinkAliasChecker"/></Arg>