You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2010/10/22 15:39:48 UTC
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
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 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-jasper</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
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));