geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r980334 - /geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java
Date Thu, 29 Jul 2010 06:44:40 GMT
Author: djencks
Date: Thu Jul 29 06:44:40 2010
New Revision: 980334

URL: http://svn.apache.org/viewvc?rev=980334&view=rev
Log:
GERONIMO-5483 give jasper the metadata complete merged web.xml as a servlet context attribute

Modified:
    geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java

Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java?rev=980334&r1=980333&r2=980334&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java
(original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java
Thu Jul 29 06:44:40 2010
@@ -93,6 +93,8 @@ public class WebAppContextWrapper implem
     private final Set<String> servletNames = new HashSet<String>();
 
     private final IntegrationContext integrationContext;
+    //hack to keep jasper happy.  This is from org.apache.tomcat.util.scan.Constants in the
tomcat util jar.
+    private static final String JASPER_WEB_XML_NAME = "org.apache.tomcat.util.scan.MergedWebXml";
 
 
     public WebAppContextWrapper(@ParamSpecial(type = SpecialAttributeType.objectName) String
objectName,
@@ -239,7 +241,8 @@ public class WebAppContextWrapper implem
         if (!distributable) {
             setSessionTimeoutSeconds(sessionTimeoutSeconds);
         }
-
+        //supply web.xml to jasper
+        webAppContext.setAttribute(JASPER_WEB_XML_NAME, originalSpecDD);
     }
 
 



Mime
View raw message