Return-Path: X-Original-To: apmail-tomee-commits-archive@www.apache.org Delivered-To: apmail-tomee-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 598AC17415 for ; Sun, 9 Nov 2014 21:37:11 +0000 (UTC) Received: (qmail 49145 invoked by uid 500); 9 Nov 2014 21:37:11 -0000 Delivered-To: apmail-tomee-commits-archive@tomee.apache.org Received: (qmail 49052 invoked by uid 500); 9 Nov 2014 21:37:11 -0000 Mailing-List: contact commits-help@tomee.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tomee.apache.org Delivered-To: mailing list commits@tomee.apache.org Received: (qmail 49041 invoked by uid 99); 9 Nov 2014 21:37:11 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Nov 2014 21:37:11 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0156E8BE857; Sun, 9 Nov 2014 21:37:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rmannibucau@apache.org To: commits@tomee.apache.org Message-Id: <71d7beb6dbbe489abd47e9105544f629@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: tomee git commit: tomee.jsp-development should support all servlets and not only jsp one Date: Sun, 9 Nov 2014 21:37:10 +0000 (UTC) Repository: tomee Updated Branches: refs/heads/tomee-1.7.x dfd13e80e -> c4944e187 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/c4944e18 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c4944e18 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c4944e18 Branch: refs/heads/tomee-1.7.x Commit: c4944e187ccc733f7cd9797c99f8acc865941618 Parents: dfd13e8 Author: Romain Manni-Bucau Authored: Sun Nov 9 21:36:43 2014 +0000 Committer: Romain Manni-Bucau Committed: Sun Nov 9 21:36:43 2014 +0000 ---------------------------------------------------------------------- .../org/apache/tomee/catalina/OpenEJBContextConfig.java | 11 +++++++++++ 1 file changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/c4944e18/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 394eba0..cf617b0 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 @@ -369,6 +369,17 @@ public class OpenEJBContextConfig extends ContextConfig { return; } + if ("true".equalsIgnoreCase(SystemInstance.get().getProperty("tomee.jsp-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"); + } + } + } + } + final ClassLoader classLoader = context.getLoader().getClassLoader(); // add myfaces auto-initializer if mojarra is not present