You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/11/09 22:37:10 UTC
tomee git commit: tomee.jsp-development should support all servlets
and not only jsp one
Repository: tomee
Updated Branches:
refs/heads/develop cb72c13b7 -> db1d223fb
tomee.jsp-development should support all servlets and not only jsp one
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/db1d223f
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/db1d223f
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/db1d223f
Branch: refs/heads/develop
Commit: db1d223fb73a73da8627af7b9c17ac00f28353f9
Parents: cb72c13
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Sun Nov 9 21:36:52 2014 +0000
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Sun Nov 9 21:36:52 2014 +0000
----------------------------------------------------------------------
.../org/apache/tomee/catalina/OpenEJBContextConfig.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/db1d223f/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
index c16853b..c459e53 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
@@ -379,9 +379,13 @@ public class OpenEJBContextConfig extends ContextConfig {
}
if ("true".equalsIgnoreCase(SystemInstance.get().getProperty("tomee.jsp-development", "true"))) {
- final Wrapper jsp = Wrapper.class.cast(context.findChild("jsp"));
- if (jsp != null) {
- jsp.addInitParameter("development", "true");
+ for (final Container c : context.findChildren()) {
+ if (Wrapper.class.isInstance(c)) {
+ final Wrapper servlet = Wrapper.class.cast(c);
+ if ("org.apache.jasper.servlet.JspServlet".equals(servlet.getServletClass())) {
+ servlet.addInitParameter("development", "true");
+ }
+ }
}
}