Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
1f1820b1
Commit
1f1820b1
authored
Jan 27, 2014
by
Dave Syer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Tld scanning exceptions to Tomcat startup
Addresses gh-263 to some extent.
parent
91998d59
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
6 deletions
+22
-6
pom.xml
spring-boot-samples/spring-boot-sample-actuator/pom.xml
+2
-6
TomcatEmbeddedServletContainerFactory.java
...mbedded/tomcat/TomcatEmbeddedServletContainerFactory.java
+20
-0
No files found.
spring-boot-samples/spring-boot-sample-actuator/pom.xml
View file @
1f1820b1
...
...
@@ -90,12 +90,8 @@
</activation>
<dependencies>
<dependency>
<groupId>
org.eclipse.jetty
</groupId>
<artifactId>
jetty-webapp
</artifactId>
</dependency>
<dependency>
<groupId>
javax.servlet
</groupId>
<artifactId>
javax.servlet-api
</artifactId>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-jetty
</artifactId>
</dependency>
</dependencies>
</profile>
...
...
spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
View file @
1f1820b1
...
...
@@ -37,6 +37,7 @@ 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
;
...
...
@@ -89,6 +90,14 @@ 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,"
+
"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
;
/**
* Create a new {@link TomcatEmbeddedServletContainerFactory} instance.
*/
...
...
@@ -137,6 +146,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
);
TomcatEmbeddedContext
context
=
new
TomcatEmbeddedContext
();
context
.
setName
(
getContextPath
());
context
.
setPath
(
getContextPath
());
...
...
@@ -281,6 +291,16 @@ public class TomcatEmbeddedServletContainerFactory extends
this
.
baseDirectory
=
baseDirectory
;
}
/**
* 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
*/
public
void
setNoTldJars
(
String
noTldJars
)
{
this
.
noTldJars
=
noTldJars
;
}
/**
* The Tomcat protocol to use when create the {@link Connector}.
* @see Connector#Connector(String)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment