geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r517712 - in /geronimo/server/trunk: ./ configs/jasper/ configs/jetty6-deployer/src/plan/ modules/ modules/geronimo-jasper/ modules/geronimo-jasper/src/ modules/geronimo-jasper/src/main/ modules/geronimo-jasper/src/main/java/ modules/geroni...
Date Tue, 13 Mar 2007 14:40:45 GMT
Author: pmcmahan
Date: Tue Mar 13 07:40:43 2007
New Revision: 517712

URL: http://svn.apache.org/viewvc?view=rev&rev=517712
Log:
GERONIMO-2955 enable the Jasper servlet to find TLDs in Geronimo's MultiParentClassLoader

When a JSP contains a URI reference to a tag library Jasper scans the jar files
in the classloader hierarchy looking for a TLD file that defines the tags for that
URI.  The method it uses to navigate the classloader hierarchy is not compatible
with Geronimo's MultiParentClassLoader.

Jasper allows you to override its default JSP options although it's not very
straightforward to do so.  I could not directly extend the default impl
of the Options interface because it is declared final.  Also, most of the
important bits of TldLocationsCache are private so I made a copy of it and
adjusted the appropriate methods.


Added:
    geronimo/server/trunk/modules/geronimo-jasper/
    geronimo/server/trunk/modules/geronimo-jasper/LICENSE.txt   (with props)
    geronimo/server/trunk/modules/geronimo-jasper/NOTICE.txt   (with props)
    geronimo/server/trunk/modules/geronimo-jasper/pom.xml   (with props)
    geronimo/server/trunk/modules/geronimo-jasper/src/
    geronimo/server/trunk/modules/geronimo-jasper/src/main/
    geronimo/server/trunk/modules/geronimo-jasper/src/main/java/
    geronimo/server/trunk/modules/geronimo-jasper/src/main/java/org/
    geronimo/server/trunk/modules/geronimo-jasper/src/main/java/org/apache/
    geronimo/server/trunk/modules/geronimo-jasper/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/modules/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/
    geronimo/server/trunk/modules/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java
  (contents, props changed)
      - copied, changed from r517391, tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
    geronimo/server/trunk/modules/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspServletOptions.java
  (with props)
Modified:
    geronimo/server/trunk/configs/jasper/pom.xml
    geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml
    geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/resources/META-INF/geronimo-tomcat6/var/catalina/conf/web.xml
    geronimo/server/trunk/modules/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/configs/jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jasper/pom.xml?view=diff&rev=517712&r1=517711&r2=517712
==============================================================================
--- geronimo/server/trunk/configs/jasper/pom.xml (original)
+++ geronimo/server/trunk/configs/jasper/pom.xml Tue Mar 13 07:40:43 2007
@@ -58,6 +58,12 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-jasper</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>jasper</artifactId>
         </dependency>
@@ -113,6 +119,12 @@
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>commons-discovery</groupId>
+            <artifactId>commons-discovery</artifactId>
+        </dependency>
+
         <!-- end myfaces dependencies -->
 
     </dependencies>

Modified: geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml?view=diff&rev=517712&r1=517711&r2=517712
==============================================================================
--- geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml Tue Mar 13 07:40:43 2007
@@ -122,6 +122,7 @@
             fork=false
             logVerbosityLevel=DEBUG
             xpoweredBy=false
+            engineOptionsClass=org.apache.geronimo.jasper.JspServletOptions
         </attribute>
         <attribute name="servletMappings">*.jsp,*.jspf,*.jspx,*.xsp</attribute>
     </gbean>

Added: geronimo/server/trunk/modules/geronimo-jasper/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jasper/LICENSE.txt?view=auto&rev=517712
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jasper/LICENSE.txt (added)
+++ geronimo/server/trunk/modules/geronimo-jasper/LICENSE.txt Tue Mar 13 07:40:43 2007
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

Propchange: geronimo/server/trunk/modules/geronimo-jasper/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-jasper/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/modules/geronimo-jasper/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/modules/geronimo-jasper/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jasper/NOTICE.txt?view=auto&rev=517712
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jasper/NOTICE.txt (added)
+++ geronimo/server/trunk/modules/geronimo-jasper/NOTICE.txt Tue Mar 13 07:40:43 2007
@@ -0,0 +1,5 @@
+Apache Geronimo 
+Copyright 2003-2006 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).

Propchange: geronimo/server/trunk/modules/geronimo-jasper/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-jasper/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/modules/geronimo-jasper/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/modules/geronimo-jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jasper/pom.xml?view=auto&rev=517712
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jasper/pom.xml (added)
+++ geronimo/server/trunk/modules/geronimo-jasper/pom.xml Tue Mar 13 07:40:43 2007
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>modules</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>geronimo-jasper</artifactId>
+    <name>Geronimo :: Jasper</name>
+    
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>jasper</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>jasper-jdt</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>jasper-el</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+    </dependencies>
+
+</project>
+

Propchange: geronimo/server/trunk/modules/geronimo-jasper/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-jasper/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/modules/geronimo-jasper/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: geronimo/server/trunk/modules/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java
(from r517391, tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java?view=diff&rev=517712&p1=tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java&r1=517391&p2=geronimo/server/trunk/modules/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java&r2=517712
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java (original)
+++ geronimo/server/trunk/modules/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java
Tue Mar 13 07:40:43 2007
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.jasper.compiler;
+package org.apache.geronimo.jasper;
 
 import java.io.InputStream;
 import java.net.JarURLConnection;
@@ -23,6 +23,7 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.net.URLConnection;
+import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.HashSet;
@@ -35,8 +36,10 @@
 
 import javax.servlet.ServletContext;
 
+import org.apache.geronimo.kernel.config.MultiParentClassLoader;
 import org.apache.jasper.Constants;
 import org.apache.jasper.JasperException;
+import org.apache.jasper.compiler.TldLocationsCache;
 import org.apache.jasper.xmlparser.ParserUtils;
 import org.apache.jasper.xmlparser.TreeNode;
 import org.apache.juli.logging.Log;
@@ -70,15 +73,20 @@
  * If no mapping is found, then the uri specified
  * in the taglib directive is to be interpreted as the location for
  * the TLD of this tag library.
+ * 
+ * This class was copied from tomcat to allow Geronimo
+ * to override Jasper's default TldLocationsCache which does not work
+ * with Geronimo's MultiParentClassLoader.  Copying was necessary because
+ * most of the essential methods and member variables were private.
  *
  * @author Pierre Delisle
  * @author Jan Luehe
  */
 
-public class TldLocationsCache {
+public class GeronimoTldLocationsCache extends TldLocationsCache {
 
     // Logger
-    private Log log = LogFactory.getLog(TldLocationsCache.class);
+    private Log log = LogFactory.getLog(GeronimoTldLocationsCache.class);
 
     /**
      * The types of URI one may specify for a tag library
@@ -93,7 +101,10 @@
 
     // Names of JARs that are known not to contain any TLDs
     private static HashSet<String> noTldJars;
-
+    
+    // Names of JARs that have already been scanned
+    ArrayList<String> scannedJars;
+    
     /**
      * The mapping of the 'global' tag library URI to the location (resource
      * path) of the TLD associated with that tag library. The location is
@@ -101,7 +112,7 @@
      *    [0] The location
      *    [1] If the location is a jar file, this is the location of the tld.
      */
-    private Hashtable mappings;
+    private Hashtable<String,String[]> mappings;
 
     private boolean initialized;
     private ServletContext ctxt;
@@ -115,29 +126,6 @@
      */
     static {
         noTldJars = new HashSet<String>();
-        // Bootstrap JARs
-        noTldJars.add("bootstrap.jar");
-        noTldJars.add("commons-daemon.jar");
-        noTldJars.add("tomcat-juli.jar");
-        // Main JARs
-        noTldJars.add("annotations-api.jar");
-        noTldJars.add("catalina.jar");
-        noTldJars.add("catalina-ant.jar");
-        noTldJars.add("catalina-ha.jar");
-        noTldJars.add("catalina-tribes.jar");
-        noTldJars.add("el-api.jar");
-        noTldJars.add("jasper.jar");
-        noTldJars.add("jasper-el.jar");
-        noTldJars.add("jasper-jdt.jar");
-        noTldJars.add("jsp-api.jar");
-        noTldJars.add("servlet-api.jar");
-        noTldJars.add("tomcat-coyote.jar");
-        noTldJars.add("tomcat-dbcp.jar");
-        // i18n JARs
-        noTldJars.add("tomcat-i18n-en.jar");
-        noTldJars.add("tomcat-i18n-es.jar");
-        noTldJars.add("tomcat-i18n-fr.jar");
-        noTldJars.add("tomcat-i18n-ja.jar");
         // Misc JARs not included with Tomcat
         noTldJars.add("ant.jar");
         noTldJars.add("commons-dbcp.jar");
@@ -161,7 +149,7 @@
         noTldJars.add("sunpkcs11.jar");
     }
     
-    public TldLocationsCache(ServletContext ctxt) {
+    public GeronimoTldLocationsCache(ServletContext ctxt) {
         this(ctxt, true);
     }
 
@@ -175,11 +163,13 @@
      * because of JDK bug 4211817 fixed in this release.
      * If redeployMode is false, a faster but less capable mode will be used.
      */
-    public TldLocationsCache(ServletContext ctxt, boolean redeployMode) {
+    public GeronimoTldLocationsCache(ServletContext ctxt, boolean redeployMode) {
+        super(ctxt,redeployMode);
+        scannedJars = new ArrayList<String>();
         this.ctxt = ctxt;
         this.redeployMode = redeployMode;
-        mappings = new Hashtable();
-        initialized = false;
+        mappings = new Hashtable<String,String[]>();
+        initialized = false;        
     }
 
     /**
@@ -221,32 +211,15 @@
         return (String[]) mappings.get(uri);
     }
 
-    /** 
-     * Returns the type of a URI:
-     *     ABS_URI
-     *     ROOT_REL_URI
-     *     NOROOT_REL_URI
-     */
-    public static int uriType(String uri) {
-        if (uri.indexOf(':') != -1) {
-            return ABS_URI;
-        } else if (uri.startsWith("/")) {
-            return ROOT_REL_URI;
-        } else {
-            return NOROOT_REL_URI;
-        }
-    }
-
     private void init() throws JasperException {
         if (initialized) return;
         try {
             processWebDotXml();
-            scanJars();
+            scanJars(Thread.currentThread().getContextClassLoader());
             processTldsInFileSystem("/WEB-INF/");
             initialized = true;
         } catch (Exception ex) {
-            throw new JasperException(Localizer.getMessage(
-                    "jsp.error.internal.tldinit", ex.getMessage()));
+            throw new JasperException(ex);
         }
     }
 
@@ -267,17 +240,13 @@
                     uri = new URL(FILE_PROTOCOL+altDDName.replace('\\', '/'));
                 } catch (MalformedURLException e) {
                     if (log.isWarnEnabled()) {
-                        log.warn(Localizer.getMessage(
-                                            "jsp.error.internal.filenotfound",
-                                            altDDName));
+                        log.warn("file not found: " + altDDName);
                     }
                 }
             } else {
                 uri = ctxt.getResource(WEB_XML);
                 if (uri == null && log.isWarnEnabled()) {
-                    log.warn(Localizer.getMessage(
-                                            "jsp.error.internal.filenotfound",
-                                            WEB_XML));
+                    log.warn("file not found: " + WEB_XML);
                 }
             }
 
@@ -476,47 +445,41 @@
      * all shared JARs in the classloader delegation chain of the webapp's
      * classloader.
      *
-     * Considering JARs in the classloader delegation chain constitutes a
-     * Tomcat-specific extension to the TLD search
-     * order defined in the JSP spec. It allows tag libraries packaged as JAR
-     * files to be shared by web applications by simply dropping them in a 
-     * location that all web applications have access to (e.g.,
-     * <CATALINA_HOME>/common/lib).
-     *
      * The set of shared JARs to be scanned for TLDs is narrowed down by
      * the <tt>noTldJars</tt> class variable, which contains the names of JARs
      * that are known not to contain any TLDs.
      */
-    private void scanJars() throws Exception {
+    private void scanJars(ClassLoader loader) throws Exception {
+        
+        if (loader instanceof MultiParentClassLoader) {
+            MultiParentClassLoader mutliLoader = (MultiParentClassLoader) loader;
+            for (ClassLoader parent : mutliLoader.getParents()) {
+                scanJars(parent);
+            }
+        }
 
-        ClassLoader webappLoader
-            = Thread.currentThread().getContextClassLoader();
-        ClassLoader loader = webappLoader;
-
-        while (loader != null) {
-            if (loader instanceof URLClassLoader) {
-                URL[] urls = ((URLClassLoader) loader).getURLs();
-                for (int i=0; i<urls.length; i++) {
-                    URLConnection conn = urls[i].openConnection();
-                    if (conn instanceof JarURLConnection) {
-                        if (needScanJar(loader, webappLoader,
-                                        ((JarURLConnection) conn).getJarFile().getName()))
{
-                            scanJar((JarURLConnection) conn, true);
-                        }
-                    } else {
-                        String urlStr = urls[i].toString();
-                        if (urlStr.startsWith(FILE_PROTOCOL)
-                                && urlStr.endsWith(JAR_FILE_SUFFIX)
-                                && needScanJar(loader, webappLoader, urlStr)) {
-                            URL jarURL = new URL("jar:" + urlStr + "!/");
-                            scanJar((JarURLConnection) jarURL.openConnection(),
-                                    true);
-                        }
+        if (loader instanceof URLClassLoader) {
+            URL[] urls = ((URLClassLoader) loader).getURLs();
+            for (int i=0; i<urls.length; i++) {
+                URLConnection conn = urls[i].openConnection();
+                if (conn instanceof JarURLConnection) {
+                    if (needScanJar(loader,
+                                    ((JarURLConnection) conn).getJarFile().getName())) {
+                        scanJar((JarURLConnection) conn, true);
+                        scannedJars.add(((JarURLConnection) conn).getJarFile().getName());
+                    }
+                } else {
+                    String urlStr = urls[i].toString();
+                    if (urlStr.startsWith(FILE_PROTOCOL)
+                            && urlStr.endsWith(JAR_FILE_SUFFIX)
+                            && needScanJar(loader, urlStr)) {
+                        URL jarURL = new URL("jar:" + urlStr + "!/");
+                        scanJar((JarURLConnection) jarURL.openConnection(),
+                                true);
+                        scannedJars.add(urlStr);
                     }
                 }
             }
-
-            loader = loader.getParent();
         }
     }
 
@@ -531,9 +494,12 @@
      * @return TRUE if the JAR file identified by <tt>jarPath</tt> needs to be
      * scanned for TLDs, FALSE otherwise
      */
-    private boolean needScanJar(ClassLoader loader, ClassLoader webappLoader,
+    private boolean needScanJar(ClassLoader loader,
                                 String jarPath) {
-        if (loader == webappLoader) {
+        if (scannedJars.contains(jarPath)) {
+            return false;
+        }
+        else if (loader == Thread.currentThread().getContextClassLoader()) {
             // JARs under WEB-INF/lib must be scanned unconditionally according
             // to the spec.
             return true;

Propchange: geronimo/server/trunk/modules/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/modules/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/modules/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspServletOptions.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspServletOptions.java?view=auto&rev=517712
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspServletOptions.java
(added)
+++ geronimo/server/trunk/modules/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspServletOptions.java
Tue Mar 13 07:40:43 2007
@@ -0,0 +1,160 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+package org.apache.geronimo.jasper;
+
+import java.io.File;
+import java.util.Map;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+
+import org.apache.jasper.EmbeddedServletOptions;
+import org.apache.jasper.Options;
+import org.apache.jasper.compiler.JspConfig;
+import org.apache.jasper.compiler.TagPluginManager;
+import org.apache.jasper.compiler.TldLocationsCache;
+
+public class JspServletOptions implements Options {
+    EmbeddedServletOptions delegate;
+    TldLocationsCache tldLocationsCache;
+
+    /**
+     * Create an EmbeddedServletOptions object using data available from
+     * ServletConfig and ServletContext.  Most calls are delegated to it.
+     */
+    public JspServletOptions(ServletConfig config, ServletContext context) {
+        delegate = new EmbeddedServletOptions(config, context);
+        tldLocationsCache = new GeronimoTldLocationsCache(context);
+    }
+
+    public boolean genStringAsCharArray() {
+        return delegate.genStringAsCharArray();
+    }
+
+    public Map getCache() {
+        return delegate.getCache();
+    }
+
+    public int getCheckInterval() {
+        return delegate.getCheckInterval();
+    }
+
+    public boolean getClassDebugInfo() {
+        return delegate.getClassDebugInfo();
+    }
+
+    public String getClassPath() {
+        return delegate.getClassPath();
+    }
+
+    public String getCompiler() {
+        return delegate.getCompiler();
+    }
+
+    public String getCompilerClassName() {
+        return delegate.getCompilerClassName();
+    }
+
+    public String getCompilerSourceVM() {
+        return delegate.getCompilerSourceVM();
+    }
+
+    public String getCompilerTargetVM() {
+        return delegate.getCompilerTargetVM();
+    }
+
+    public boolean getDevelopment() {
+        return delegate.getDevelopment();
+    }
+
+    public boolean getDisplaySourceFragment() {
+        return delegate.getDisplaySourceFragment();
+    }
+
+    public boolean getErrorOnUseBeanInvalidClassAttribute() {
+        return delegate.getErrorOnUseBeanInvalidClassAttribute();
+    }
+
+    public boolean getFork() {
+        return delegate.getFork();
+    }
+
+    public String getIeClassId() {
+        return delegate.getIeClassId();
+    }
+
+    public String getJavaEncoding() {
+        return delegate.getJavaEncoding();
+    }
+
+    public JspConfig getJspConfig() {
+        return delegate.getJspConfig();
+    }
+
+    public boolean getKeepGenerated() {
+        return delegate.getKeepGenerated();
+    }
+
+    public boolean getMappedFile() {
+        return delegate.getMappedFile();
+    }
+
+    public int getModificationTestInterval() {
+        return delegate.getModificationTestInterval();
+    }
+
+    public File getScratchDir() {
+        return delegate.getScratchDir();
+    }
+
+    public boolean getSendErrorToClient() {
+        return delegate.getSendErrorToClient();
+    }
+
+    public TagPluginManager getTagPluginManager() {
+        return delegate.getTagPluginManager();
+    }
+
+    public TldLocationsCache getTldLocationsCache() {
+        return tldLocationsCache;
+    }
+
+    public boolean getTrimSpaces() {
+        return delegate.getTrimSpaces();
+    }
+
+    public boolean isCaching() {
+        return delegate.isCaching();
+    }
+
+    public boolean isPoolingEnabled() {
+        return delegate.isPoolingEnabled();
+    }
+
+    public boolean isSmapDumped() {
+        return delegate.isSmapDumped();
+    }
+
+    public boolean isSmapSuppressed() {
+        return delegate.isSmapSuppressed();
+    }
+
+    public boolean isXpoweredBy() {
+        return delegate.isXpoweredBy();
+    }
+
+}

Propchange: geronimo/server/trunk/modules/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspServletOptions.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspServletOptions.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/modules/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspServletOptions.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml?view=diff&rev=517712&r1=517711&r2=517712
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml Tue Mar 13 07:40:43 2007
@@ -87,14 +87,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>jasper</artifactId>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>jasper-el</artifactId>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-jasper</artifactId>
+            <version>${version}</version>
             <scope>test</scope>
         </dependency>
 

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/resources/META-INF/geronimo-tomcat6/var/catalina/conf/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/resources/META-INF/geronimo-tomcat6/var/catalina/conf/web.xml?view=diff&rev=517712&r1=517711&r2=517712
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/resources/META-INF/geronimo-tomcat6/var/catalina/conf/web.xml
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/resources/META-INF/geronimo-tomcat6/var/catalina/conf/web.xml
Tue Mar 13 07:40:43 2007
@@ -242,6 +242,10 @@
             <param-name>xpoweredBy</param-name>
             <param-value>false</param-value>
         </init-param>
+        <init-param>
+            <param-name>engineOptionsClass</param-name>
+            <param-value>org.apache.geronimo.jasper.JspServletOptions</param-value>
+        </init-param>
         <load-on-startup>3</load-on-startup>
     </servlet>
 

Modified: geronimo/server/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/pom.xml?view=diff&rev=517712&r1=517711&r2=517712
==============================================================================
--- geronimo/server/trunk/modules/pom.xml (original)
+++ geronimo/server/trunk/modules/pom.xml Tue Mar 13 07:40:43 2007
@@ -73,6 +73,7 @@
         <module>geronimo-j2ee</module>
         <module>geronimo-j2ee-builder</module>
         <module>geronimo-j2ee-schema</module>
+        <module>geronimo-jasper</module>
         <module>geronimo-jmx-remoting</module>
         <module>geronimo-kernel</module>
         <module>geronimo-mail</module>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=517712&r1=517711&r2=517712
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Mar 13 07:40:43 2007
@@ -637,7 +637,7 @@
             <dependency>
                 <groupId>commons-discovery</groupId>
                 <artifactId>commons-discovery</artifactId>
-                <version>0.2</version>
+                <version>0.4</version>
             </dependency>
 
             <dependency>



Mime
View raw message