Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 73148 invoked from network); 22 Oct 2010 13:40:48 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 22 Oct 2010 13:40:48 -0000 Received: (qmail 66781 invoked by uid 500); 22 Oct 2010 13:40:48 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 66648 invoked by uid 500); 22 Oct 2010 13:40:46 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 66641 invoked by uid 99); 22 Oct 2010 13:40:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Oct 2010 13:40:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Oct 2010 13:40:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 36C4F23888FD; Fri, 22 Oct 2010 13:39:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1026322 - in /geronimo/server/trunk/plugins/jetty8/geronimo-jetty8: pom.xml src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java Date: Fri, 22 Oct 2010 13:39:48 -0000 To: scm@geronimo.apache.org From: xuhaihong@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101022133948.36C4F23888FD@eris.apache.org> Author: xuhaihong Date: Fri Oct 22 13:39:47 2010 New Revision: 1026322 URL: http://svn.apache.org/viewvc?rev=1026322&view=rev Log: Set the default JSPFactory in the test cases Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/pom.xml geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/pom.xml?rev=1026322&r1=1026321&r2=1026322&view=diff ============================================================================== --- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/pom.xml (original) +++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/pom.xml Fri Oct 22 13:39:47 2010 @@ -121,6 +121,13 @@ org.eclipse.jetty jetty-servlet + + + org.apache.geronimo.modules + geronimo-jasper + ${project.version} + test + Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java?rev=1026322&r1=1026321&r2=1026322&view=diff ============================================================================== --- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java (original) +++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java Fri Oct 22 13:39:47 2010 @@ -48,6 +48,7 @@ import org.apache.geronimo.osgi.web.WebA import org.apache.geronimo.osgi.web.WebApplicationUtils; import org.apache.geronimo.security.jacc.ApplicationPolicyConfigurationManager; import org.apache.geronimo.security.jacc.ComponentPermissions; +import org.apache.geronimo.web.WebAttributeName; import org.apache.geronimo.web.assembler.Assembler; import org.apache.geronimo.web.info.WebAppInfo; import org.apache.geronimo.web.security.SpecSecurityBuilder; @@ -96,6 +97,7 @@ public class GeronimoWebAppContext exten setClassLoader(classLoader); this.classLoader = classLoader; setAttribute(WebApplicationConstants.BUNDLE_CONTEXT_ATTRIBUTE, integrationContext.getBundle().getBundleContext()); + setAttribute(WebAttributeName.WEB_APP_INFO.name(), webAppInfo); // now set the module context ValidatorFactory in a context property. try { javax.naming.Context ctx = integrationContext.getComponentContext(); Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java?rev=1026322&r1=1026321&r2=1026322&view=diff ============================================================================== --- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java (original) +++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java Fri Oct 22 13:39:47 2010 @@ -112,7 +112,8 @@ public class AbstractWebModuleTest exten protected WebAppContextWrapper setUpAppContext(String securityRealmName, SecurityHandlerFactory securityHandlerFactory, String policyContextId, RunAsSource runAsSource, String uriString, WebAppInfo webAppInfo) throws Exception { ApplicationPolicyConfigurationManager applicationPolicyConfigurationManager = null; - + //Setup default JSP Factory + Class.forName("org.apache.jasper.compiler.JspRuntimeContext"); if (securityHandlerFactory == null) { Permissions unchecked = new Permissions(); unchecked.add(new WebUserDataPermission("/", null));