Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use System properties for skipping Jars for TLD etc. scans

Browse Source 
I'd prefer a fix that wasn't global for the VM, but the default values shoudl be harmless
at least.

Fixes gh-274
This commit is contained in:
Dave Syer
2014-01-27 14:49:02 +00:00
parent 1f1820b161
commit 258a1115be
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
View File

@@ -37,7 +37,6 @@ import org.apache.catalina.Valve;
import org.apache.catalina.Wrapper;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.loader.WebappLoader;
import org.apache.catalina.startup.TldConfig;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.Tomcat.FixContextListener;
import org.apache.coyote.AbstractProtocol;
@@ -90,13 +89,13 @@ public class TomcatEmbeddedServletContainerFactory extends
private String protocol = DEFAULT_PROTOCOL;
private static String DEFAULT_NO_TLD_JARS = "tomcat-*.jar,tools.jar,commons-beanutils*.jar,commons-codec*.jar,commons-collections*.jar,"
private static String DEFAULT_SKIP_JARS = "tomcat-*.jar,tools.jar,commons-beanutils*.jar,commons-codec*.jar,commons-collections*.jar,"
+ "commons-dbcp*.jar,commons-digester*.jar,commons-fileupload*.jar,commons-httpclient*.jar,commons-io*.jar,commons-lang*.jar,"
+ "commons-logging*.jar,commons-math*.jar,commons-pool*.jar,jstl-*.jar,geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,ant-*.jar,"
+ "aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,jmx-tools-*.jar,jta*.jar,log4j-*.jar,mail*.jar,slf4j*.jar,"
+ "xercesImpl-*.jar,xmlParserAPIs-*.jar,xml-apis-*.jar,junit-*.jar,hamcrest*.jar,org.hamcrest*.jar";
private String noTldJars = DEFAULT_NO_TLD_JARS;
private String skipJars = DEFAULT_SKIP_JARS;
/**
* Create a new {@link TomcatEmbeddedServletContainerFactory} instance.
@@ -146,7 +145,7 @@ public class TomcatEmbeddedServletContainerFactory extends
protected void prepareContext(Host host, ServletContextInitializer[] initializers) {
File docBase = getValidDocumentRoot();
docBase = (docBase != null ? docBase : createTempDir("tomcat-docbase"));
TldConfig.setNoTldJars(this.noTldJars);
applySkipJars();
TomcatEmbeddedContext context = new TomcatEmbeddedContext();
context.setName(getContextPath());
context.setPath(getContextPath());
@@ -173,6 +172,14 @@ public class TomcatEmbeddedServletContainerFactory extends
postProcessContext(context);
}
private void applySkipJars() {
// Tomcat 8.0
System.setProperty("tomcat.util.scan.StandardJarScanFilter.jarsToSkip",
this.skipJars);
// Tomcat 7.0
System.setProperty("tomcat.util.scan.DefaultJarScanner.jarsToSkip", this.skipJars);
}
private void addDefaultServlet(Context context) {
Wrapper defaultServlet = context.createWrapper();
defaultServlet.setName("default");
@@ -295,10 +302,10 @@ public class TomcatEmbeddedServletContainerFactory extends
* A comma-separated list of jars to ignore for TLD scanning. See Tomcat's
* catalina.properties for typical values. Defaults to a list drawn from that source.
*
* @param noTldJars the noTldJars to set
* @param skipJars the jars to skip when scanning for tlds etc
*/
public void setNoTldJars(String noTldJars) {
this.noTldJars = noTldJars;
public void setSkipJars(String skipJars) {
this.skipJars = skipJars;
}
/**