Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix JasperInitializerLifecycleListener

Browse Source 
Update JasperInitializerLifecycleListener to call JasperInitializer as
a ServletContainerInitializer (not a ServletContextInitializer).

Fixes gh-962
See gh-919
This commit is contained in:
Phillip Webb 2014-05-28 10:21:10 +01:00
parent 769ffe2834
commit 819b3b9761
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-docs/src/main/asciidoc/howto.adoc
View File

@ -574,7 +574,7 @@ Tomcat 8 for it to work. For example, using the starter poms in Maven:
[source,xml,indent=0,subs="verbatim,quotes,attributes"] [source,xml,indent=0,subs="verbatim,quotes,attributes"]
---- ----
<properties> <properties>
<tomcat.version>8.0.3</tomcat.version> <tomcat.version>8.0.8</tomcat.version>
</properties> </properties>
<dependencies> <dependencies>
... ...

37
spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/JasperInitializerLifecycleListener.java
View File

@ -1,8 +1,13 @@
package org.springframework.boot.context.embedded.tomcat; package org.springframework.boot.context.embedded.tomcat;
import javax.servlet.ServletContainerInitializer;
import javax.servlet.ServletException;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener; import org.apache.catalina.LifecycleListener;
import org.springframework.boot.context.embedded.ServletContextInitializer; import org.apache.catalina.core.StandardContext;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
/** /**
@ -15,29 +20,35 @@ class JasperInitializerLifecycleListener implements LifecycleListener {
private static final String JASPER_INITIALIZER_CLASS = "org.apache.jasper.servlet.JasperInitializer"; private static final String JASPER_INITIALIZER_CLASS = "org.apache.jasper.servlet.JasperInitializer";
private final ServletContextInitializerLifecycleListener delegate; private ServletContainerInitializer initializer;
public JasperInitializerLifecycleListener() { public JasperInitializerLifecycleListener() {
ServletContextInitializer initializer = getJasperInitializer(); this.initializer = getJasperInitializer();
if (initializer != null) {
this.delegate = new ServletContextInitializerLifecycleListener(initializer);
}
else {
this.delegate = null;
}
} }
@Override @Override
public void lifecycleEvent(LifecycleEvent event) { public void lifecycleEvent(LifecycleEvent event) {
if (this.delegate != null) { if (this.initializer != null
this.delegate.lifecycleEvent(event); && Lifecycle.CONFIGURE_START_EVENT.equals(event.getType())) {
onStartup(event);
} }
} }
private ServletContextInitializer getJasperInitializer() { private void onStartup(LifecycleEvent event) {
Assert.isInstanceOf(StandardContext.class, event.getSource());
StandardContext standardContext = (StandardContext) event.getSource();
try {
this.initializer.onStartup(null, standardContext.getServletContext());
}
catch (ServletException ex) {
throw new IllegalStateException(ex);
}
}
private ServletContainerInitializer getJasperInitializer() {
try { try {
Class<?> jasperClass = ClassUtils.forName(JASPER_INITIALIZER_CLASS, null); Class<?> jasperClass = ClassUtils.forName(JASPER_INITIALIZER_CLASS, null);
return (ServletContextInitializer) jasperClass.newInstance(); return (ServletContainerInitializer) jasperClass.newInstance();
} }
catch (Exception ex) { catch (Exception ex) {
return null; return null;