r2424 - in trunk/tomcat5/debian: . patches

[Arnaud Vandyck]

Author: avdyk
Date: 2006-09-14 11:55:49 +0000 (Thu, 14 Sep 2006)
New Revision: 2424

Added:
   trunk/tomcat5/debian/patches/31_recursive_tag.patch
Modified:
   trunk/tomcat5/debian/changelog
Log:
applied a patch for the tag file recursive problem

Modified: trunk/tomcat5/debian/changelog
===================================================================
--- trunk/tomcat5/debian/changelog	2006-09-14 10:32:27 UTC (rev 2423)
+++ trunk/tomcat5/debian/changelog	2006-09-14 11:55:49 UTC (rev 2424)
@@ -1,15 +1,14 @@
-tomcat5 (5.0.30-11) UNRELEASED; urgency=low
+tomcat5 (5.0.30-11) unstable; urgency=low
 
-  * Arnaud Vandyck <avdyk at debian.org>:
-
-    + debian/control: removed apache-utils version and added alternative
+  * debian/control: removed apache-utils version and added alternative
     apache2-utils (that provide the virtual apache-utils package) (closes:
-    #361277)
-    + debian/tomcat5.init: added Sun's jdk path as provided by
-    sun-java5-bin package (closes: #386394). I also added IBM's
-    packages.
+    #361277).
+  * debian/tomcat5.init: added Sun's jdk path as provided by sun-java5-bin
+    package (closes: #386394). I also added IBM's packages.
+  * added a patch for the recursive tag files modification (closes:
+    #355240).
 
- --
+ -- Arnaud Vandyck <avdyk at debian.org>  Thu, 14 Sep 2006 13:49:19 +0200
 
 tomcat5 (5.0.30-10) unstable; urgency=low
 

Added: trunk/tomcat5/debian/patches/31_recursive_tag.patch
===================================================================
--- trunk/tomcat5/debian/patches/31_recursive_tag.patch	                        (rev 0)
+++ trunk/tomcat5/debian/patches/31_recursive_tag.patch	2006-09-14 11:55:49 UTC (rev 2424)
@@ -0,0 +1,49 @@
+diff -ru jakarta-tomcat-jasper/jasper2.old/src/share/org/apache/jasper/compiler/Compiler.java jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java
+--- jakarta-tomcat-jasper/jasper2.old/src/share/org/apache/jasper/compiler/Compiler.java	2006-09-14 11:42:52.000000000 +0000
++++ jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java	2006-09-14 11:42:56.000000000 +0000
+@@ -154,7 +154,8 @@
+ 
+         // Setup page info area
+         pageInfo = new PageInfo(new BeanRepository(ctxt.getClassLoader(),
+-                                                   errDispatcher));
++                                                   errDispatcher),
++                                ctxt.getJspFile());
+ 
+         JspConfig jspConfig = options.getJspConfig();
+         JspConfig.JspProperty jspProperty =
+diff -ru jakarta-tomcat-jasper/jasper2.old/src/share/org/apache/jasper/compiler/PageInfo.java jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageInfo.java
+--- jakarta-tomcat-jasper/jasper2.old/src/share/org/apache/jasper/compiler/PageInfo.java	2006-09-14 11:42:52.000000000 +0000
++++ jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageInfo.java	2006-09-14 11:42:56.000000000 +0000
+@@ -37,6 +37,7 @@
+     private HashMap jspPrefixMapper;
+     private HashMap xmlPrefixMapper;
+     private HashMap nonCustomTagPrefixMap;
++    private String jspFile;
+     private String defaultLanguage = "java";
+     private String language;
+     private String defaultExtends = Constants.JSP_SERVLET_BASE;
+@@ -76,7 +77,9 @@
+     private Vector pluginDcls;		// Id's for tagplugin declarations
+ 
+ 
+-    PageInfo(BeanRepository beanRepository) {
++    PageInfo(BeanRepository beanRepository, String jspFile) {
++
++        this.jspFile = jspFile;
+ 	this.beanRepository = beanRepository;
+ 	this.taglibsMap = new HashMap();
+ 	this.jspPrefixMapper = new HashMap();
+@@ -118,8 +121,12 @@
+ 	return imports;
+     }
+ 
++    public String getJspFile() {
++        return jspFile;
++    }
++
+     public void addDependant(String d) {
+-	if (!dependants.contains(d))
++	if (!dependants.contains(d) && !jspFile.equals(d))
+             dependants.add(d);
+     }
+