DO NOT REPLY [Bug 43878] - Tag-file classes get loaded for each JSP -> perm gen space problem

2007-11-16 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43878


[EMAIL PROTECTED] changed:

   What|Removed |Added

 CC||[EMAIL PROTECTED]




-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r595552 - /tomcat/current/tc5.5.x/STATUS

2007-11-16 Thread pero 
Author: pero
Date: Thu Nov 15 21:04:35 2007
New Revision: 595552

URL: http://svn.apache.org/viewvc?rev=595552&view=rev
Log:
Fix &&

Modified:
tomcat/current/tc5.5.x/STATUS

Modified: tomcat/current/tc5.5.x/STATUS
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS?rev=595552&r1=595551&r2=595552&view=diff
==
--- tomcat/current/tc5.5.x/STATUS (original)
+++ tomcat/current/tc5.5.x/STATUS Thu Nov 15 21:04:35 2007
@@ -62,4 +62,7 @@
   +1: pero
   -1:
 
-
+* Fix wrong && 
+  
http://people.apache.org/~pero/patches/tc55/2007-11-16-1-ReplicationValve-tc55.patch
+  +1: pero
+  -1:



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 43878] New: - Tag-file classes get loaded for each JSP -> perm gen space problem

2007-11-16 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43878

   Summary: Tag-file classes get loaded for each JSP -> perm gen
space problem
   Product: Tomcat 6
   Version: 6.0.10
  Platform: All
OS/Version: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


If you use the same tag (defined in a JSP 2.0 tag file) on two different JSPs,
the tag-class will get loaded from two different classloaders resulting in two
loaded classes in the perm gen space. You can trace this behaviour when starting
the VM with the arguments "-XX:+TraceClassLoading -XX:+TraceClassUnloading". The
classes get loaded multiple times even when development/reloading is disabled.

This behaviour gets a problem if you have a huge number of JSPs (in our case
>10.000) and a few tags used on every single JSP.

I traced down the problem in the source code:

For each JSP to compile, a new instance of a JspCompilationContext is used. The
JspCompilationContext holds a reference to a JasperLoader (a ClassLoader), which
initially is null (a new JasperLoader will be created when it is first used).
The JspCompilationContext will not only load the JSP class, but also compiles
and loads tag-files referenced within the JSP. As the JasperLoader loads all
classes starting with "org.apache.jsp" by itself and does not delegate to it's
parent, the tag class (which lies underneath this package) will get loaded via
multiple JasperLoader instances.

I perfectly understand that loading each JSP via a different classloader may be
necessary, when reloading is enabled, but if reloading/development is disabled,
the same JasperLoader instance could be used. This would prevent the tag class
to get loaded multiple times. (I.e. a previously used JasperLoader instance
could be passed to the JspCompilationContext, if running in production mode).

By the way I think that loading the tag file via the same classloader as the JSP
in a reloading-enviornmane may result in some strange behaviour: If two JSPs use
the same tag and you change the tag as well as one JSP, you'll see the new
version of the tag on the reloaded JSP, but the previous version of the same tag
(but loaded via a different class-instance) on the unchanged JSP. But to solve
this issue, some greater refactoring would be necessary, I think

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: [VOTE] Release build 6.0.15

2007-11-16 Thread Remy Maucherat 
On Sat, 2007-11-10 at 19:41 +0100, Remy Maucherat wrote:
> On Fri, 2007-11-09 at 22:23 +, Mark Thomas wrote:
> > > These sources can be found in the specification documents.
> > That doesn't mean we can just copy them.
> > 
> > > Geronimo
> > > should also have the same files somewhere.
> > 
> > I believe they use the CDDL ones but I'll check. I'll prepare a patch for
> > 6.0.16 that uses whatever they use.
> 
> There's also the option of not shipping those files, it would only
> remove (until the user adds an official jar somewhere) validation
> capabilities for the newest webapps.
> 
> So, the possibilities are:
> 1) Add a CDDL xsd
> 2) Remove xsd
> 3) Use some binary from somewhere

Since this issue is now resolved (along with the cookie issue), I would like to 
tag a new Tomcat build shortly (preferably not including tons of new patches, 
otherwise there could be new regressions).

Rémy



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: svn commit: r595376 - /tomcat/current/tc5.5.x/STATUS

2007-11-16 Thread Peter Rossbach 
I review the tomcat 6 JDTCompiler class that only some formattings  
und error handlings has change.

What is bad to use a newer JDT compiler version?

regards,
Peter


Am 16.11.2007 um 14:09 schrieb jean-frederic clere:


Peter Rossbach wrote:

Strange,

but with Revision 586865 I have test with the link and check in  
the JDT

3.3.1 change at 27.10.07


Ok then. But I still think that the version change is a bit useless.

Cheers

Jean-Frederic




Peter



Am 15.11.2007 um 20:04 schrieb Filip Hanik - Dev Lists:


jean-frederic clere wrote:

[EMAIL PROTECTED] wrote:


Author: pero
Date: Thu Nov 15 09:58:26 2007
New Revision: 595376

URL: http://svn.apache.org/viewvc?rev=595376&view=rev
Log:
Add JDT Location change

Modified:
tomcat/current/tc5.5.x/STATUS

Modified: tomcat/current/tc5.5.x/STATUS
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS? 
rev=595376&r1=595375&r2=595376&view=diff


== 



--- tomcat/current/tc5.5.x/STATUS (original)
+++ tomcat/current/tc5.5.x/STATUS Thu Nov 15 09:58:26 2007
@@ -50,3 +50,10 @@
   http://people.apache.org/~markt/patches/2007-10-28-cookies- 
tc5.patch

   +1: markt
   -1:
+
+* JDT location return 404
+  http://people.apache.org/~fhanik/patches/jdt-loc.patch
+  Backport from Tomcat 6
+  +1: pero
+  -1: +



Well I don't see the need to change it there. The location is
http://archive.eclipse.org/eclipse/downloads/drops/ 
R-3.1.2-200601181600/eclipse-JDT-3.1.2.zip


and it is still valid.


the question with TC 5.5 is simply whether we want to upgrade to a
later version of the JDT compiler for the next release

Filip

Cheers

Jean-Frederic




-- 
---

To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]






--- 
--

To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]







 
-

To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]








-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r595745 - in /tomcat/tc6.0.x/trunk: STATUS build.properties.default

2007-11-16 Thread fhanik 
Author: fhanik
Date: Fri Nov 16 09:10:53 2007
New Revision: 595745

URL: http://svn.apache.org/viewvc?rev=595745&view=rev
Log:
Update JDT location so that it has a valid jar location

Modified:
tomcat/tc6.0.x/trunk/STATUS
tomcat/tc6.0.x/trunk/build.properties.default

Modified: tomcat/tc6.0.x/trunk/STATUS
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=595745&r1=595744&r2=595745&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS (original)
+++ tomcat/tc6.0.x/trunk/STATUS Fri Nov 16 09:10:53 2007
@@ -67,9 +67,3 @@
   http://people.apache.org/~fhanik/patches/comet-begin-event-close.patch
   +1: fhanik
   -1: 
-  
-* JDT location return 404
-  http://people.apache.org/~fhanik/patches/jdt-loc.patch
-  +1: fhanik, jfclere, pero
-  -1: 
-  

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=595745&r1=595744&r2=595745&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Fri Nov 16 09:10:53 2007
@@ -57,7 +57,7 @@
 jdt.home=${base.path}/eclipse/plugins
 jdt.lib=${jdt.home}
 jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.3.1.v_780_R33x.jar
-jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
+jdt.loc=http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
 
 # - Tomcat native library -
 tomcat-native.home=${base.path}/tomcat-native-1.1.10



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: svn commit: r595376 - /tomcat/current/tc5.5.x/STATUS

2007-11-16 Thread jean-frederic clere 
Peter Rossbach wrote:
> Strange,
> 
> but with Revision 586865 I have test with the link and check in the JDT
> 3.3.1 change at 27.10.07

Ok then. But I still think that the version change is a bit useless.

Cheers

Jean-Frederic


> 
> Peter
> 
> 
> 
> Am 15.11.2007 um 20:04 schrieb Filip Hanik - Dev Lists:
> 
>> jean-frederic clere wrote:
>>> [EMAIL PROTECTED] wrote:
>>>
 Author: pero
 Date: Thu Nov 15 09:58:26 2007
 New Revision: 595376

 URL: http://svn.apache.org/viewvc?rev=595376&view=rev
 Log:
 Add JDT Location change

 Modified:
 tomcat/current/tc5.5.x/STATUS

 Modified: tomcat/current/tc5.5.x/STATUS
 URL:
 http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS?rev=595376&r1=595375&r2=595376&view=diff

 ==

 --- tomcat/current/tc5.5.x/STATUS (original)
 +++ tomcat/current/tc5.5.x/STATUS Thu Nov 15 09:58:26 2007
 @@ -50,3 +50,10 @@
http://people.apache.org/~markt/patches/2007-10-28-cookies-tc5.patch
+1: markt
-1:
 +
 +* JDT location return 404
 +  http://people.apache.org/~fhanik/patches/jdt-loc.patch
 +  Backport from Tomcat 6
 +  +1: pero
 +  -1: +

>>>
>>> Well I don't see the need to change it there. The location is
>>> http://archive.eclipse.org/eclipse/downloads/drops/R-3.1.2-200601181600/eclipse-JDT-3.1.2.zip
>>>
>>> and it is still valid.
>>>
>> the question with TC 5.5 is simply whether we want to upgrade to a
>> later version of the JDT compiler for the next release
>>
>> Filip
>>> Cheers
>>>
>>> Jean-Frederic
>>>
>>>

 -
 To unsubscribe, e-mail: [EMAIL PROTECTED]
 For additional commands, e-mail: [EMAIL PROTECTED]



>>>
>>>
>>> -
>>> To unsubscribe, e-mail: [EMAIL PROTECTED]
>>> For additional commands, e-mail: [EMAIL PROTECTED]
>>>
>>>
>>>
>>>
>>
>>
>> -
>> To unsubscribe, e-mail: [EMAIL PROTECTED]
>> For additional commands, e-mail: [EMAIL PROTECTED]
>>
>>
> 
> 


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: svn commit: r595376 - /tomcat/current/tc5.5.x/STATUS

2007-11-16 Thread jean-frederic clere 
Peter Rossbach wrote:
> I review the tomcat 6 JDTCompiler class that only some formattings und
> error handlings has change.
> What is bad to use a newer JDT compiler version?

That is ok for me ;-)

Cheers

Jean-Frederic

> 
> regards,
> Peter
> 
> 
> Am 16.11.2007 um 14:09 schrieb jean-frederic clere:
> 
>> Peter Rossbach wrote:
>>> Strange,
>>>
>>> but with Revision 586865 I have test with the link and check in the JDT
>>> 3.3.1 change at 27.10.07
>>
>> Ok then. But I still think that the version change is a bit useless.
>>
>> Cheers
>>
>> Jean-Frederic
>>
>>
>>>
>>> Peter
>>>
>>>
>>>
>>> Am 15.11.2007 um 20:04 schrieb Filip Hanik - Dev Lists:
>>>
 jean-frederic clere wrote:
> [EMAIL PROTECTED] wrote:
>
>> Author: pero
>> Date: Thu Nov 15 09:58:26 2007
>> New Revision: 595376
>>
>> URL: http://svn.apache.org/viewvc?rev=595376&view=rev
>> Log:
>> Add JDT Location change
>>
>> Modified:
>> tomcat/current/tc5.5.x/STATUS
>>
>> Modified: tomcat/current/tc5.5.x/STATUS
>> URL:
>> http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS?rev=595376&r1=595375&r2=595376&view=diff
>>
>>
>> ==
>>
>>
>> --- tomcat/current/tc5.5.x/STATUS (original)
>> +++ tomcat/current/tc5.5.x/STATUS Thu Nov 15 09:58:26 2007
>> @@ -50,3 +50,10 @@
>>   
>> http://people.apache.org/~markt/patches/2007-10-28-cookies-tc5.patch
>>+1: markt
>>-1:
>> +
>> +* JDT location return 404
>> +  http://people.apache.org/~fhanik/patches/jdt-loc.patch
>> +  Backport from Tomcat 6
>> +  +1: pero
>> +  -1: +
>>
>
> Well I don't see the need to change it there. The location is
> http://archive.eclipse.org/eclipse/downloads/drops/R-3.1.2-200601181600/eclipse-JDT-3.1.2.zip
>
>
> and it is still valid.
>
 the question with TC 5.5 is simply whether we want to upgrade to a
 later version of the JDT compiler for the next release

 Filip
> Cheers
>
> Jean-Frederic
>
>
>>
>> -
>> To unsubscribe, e-mail: [EMAIL PROTECTED]
>> For additional commands, e-mail: [EMAIL PROTECTED]
>>
>>
>>
>
>
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
>
>
>
>


 -
 To unsubscribe, e-mail: [EMAIL PROTECTED]
 For additional commands, e-mail: [EMAIL PROTECTED]


>>>
>>>
>>
>>
>> -
>> To unsubscribe, e-mail: [EMAIL PROTECTED]
>> For additional commands, e-mail: [EMAIL PROTECTED]
>>
>>
> 
> 


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r595786 - in /tomcat/tc6.0.x/trunk: STATUS STATUS.txt

2007-11-16 Thread markt 
Author: markt
Date: Fri Nov 16 11:31:04 2007
New Revision: 595786

URL: http://svn.apache.org/viewvc?rev=595786&view=rev
Log:
Rename as proposed

Added:
tomcat/tc6.0.x/trunk/STATUS.txt
  - copied unchanged from r595785, tomcat/tc6.0.x/trunk/STATUS
Removed:
tomcat/tc6.0.x/trunk/STATUS


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r595787 - in /tomcat/current/tc5.5.x: STATUS STATUS.txt

2007-11-16 Thread markt 
Author: markt
Date: Fri Nov 16 11:31:26 2007
New Revision: 595787

URL: http://svn.apache.org/viewvc?rev=595787&view=rev
Log:
Rename as proposed

Added:
tomcat/current/tc5.5.x/STATUS.txt
  - copied unchanged from r595785, tomcat/current/tc5.5.x/STATUS
Removed:
tomcat/current/tc5.5.x/STATUS


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r595788 - in /tomcat/current/tc4.1.x: STATUS STATUS.txt

2007-11-16 Thread markt 
Author: markt
Date: Fri Nov 16 11:31:51 2007
New Revision: 595788

URL: http://svn.apache.org/viewvc?rev=595788&view=rev
Log:
Rename as proposed

Added:
tomcat/current/tc4.1.x/STATUS.txt
  - copied unchanged from r595785, tomcat/current/tc4.1.x/STATUS
Removed:
tomcat/current/tc4.1.x/STATUS


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r595789 - /tomcat/current/tc5.5.x/STATUS.txt

2007-11-16 Thread markt 
Author: markt
Date: Fri Nov 16 11:34:17 2007
New Revision: 595789

URL: http://svn.apache.org/viewvc?rev=595789&view=rev
Log:
Pull this proposed patch as the Cookie code has changed in TC6. A new proposal 
will follow.

Modified:
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=595789&r1=595788&r2=595789&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Fri Nov 16 11:34:17 2007
@@ -46,11 +46,6 @@
   +1: markt
   -1:
 
-* Port Cookie hadling improvements from TC6
-  http://people.apache.org/~markt/patches/2007-10-28-cookies-tc5.patch
-  +1: markt, pero
-  -1:
-
 * JDT location return 404
   http://people.apache.org/~fhanik/patches/jdt-loc.patch
   Backport from Tomcat 6



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r595804 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml

2007-11-16 Thread markt 
Author: markt
Date: Fri Nov 16 12:11:12 2007
New Revision: 595804

URL: http://svn.apache.org/viewvc?rev=595804&view=rev
Log:
Fix bug 43702. Inner class files have unnecessarily long names.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=595804&r1=595803&r2=595804&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 16 12:11:12 2007
@@ -32,11 +32,6 @@
   -1: funkman InetAddress.getLocalHost() != localhost - it should be
 InetAddress.getByName("localhost").getHostAddress()
 
-* Fix BZ 43702 - Inner class files have unnecessarily long names
-  http://people.apache.org/~markt/patches/2007-10-30-Bug43702.patch
-  +1: markt, remm, fhanik, pero
-  -1:
-
 * Add tests for the cookie parsing.
   http://people.apache.org/~jfclere/patches/test_cookies.patch
   +1: jfclere

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?rev=595804&r1=595803&r2=595804&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Fri Nov 
16 12:11:12 2007
@@ -3309,9 +3309,7 @@
 charArrayBuffer = null;
 err = compiler.getErrorDispatcher();
 ctxt = compiler.getCompilationContext();
-fragmentHelperClass = new FragmentHelperClass(ctxt
-.getServletClassName()
-+ "Helper");
+fragmentHelperClass = new FragmentHelperClass("Helper");
 pageInfo = compiler.getPageInfo();
 
 /*

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=595804&r1=595803&r2=595804&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Nov 16 12:11:12 2007
@@ -62,6 +62,9 @@
   
 43675: Fix a possible logging related classloader leak. 
(markt)
   
+  
+43702: Inner class files have unnecessarily long names. 
(markt)
+  
 
   
 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r595805 - /tomcat/trunk/java/org/apache/jasper/compiler/Generator.java

2007-11-16 Thread markt 
Author: markt
Date: Fri Nov 16 12:11:45 2007
New Revision: 595805

URL: http://svn.apache.org/viewvc?rev=595805&view=rev
Log:
Include Fix for bug 43702 in trunk. Inner class files have unnecessarily long 
names.

Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=595805&r1=595804&r2=595805&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Fri Nov 16 
12:11:45 2007
@@ -3309,9 +3309,7 @@
 charArrayBuffer = null;
 err = compiler.getErrorDispatcher();
 ctxt = compiler.getCompilationContext();
-fragmentHelperClass = new FragmentHelperClass(ctxt
-.getServletClassName()
-+ "Helper");
+fragmentHelperClass = new FragmentHelperClass("Helper");
 pageInfo = compiler.getPageInfo();
 
 /*



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r595801 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/servlets/CGIServlet.java webapps/docs/changelog.xml

2007-11-16 Thread markt 
Author: markt
Date: Fri Nov 16 12:07:07 2007
New Revision: 595801

URL: http://svn.apache.org/viewvc?rev=595801&view=rev
Log:
Fix CGI failed when included

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=595801&r1=595800&r2=595801&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 16 12:07:07 2007
@@ -32,11 +32,6 @@
   -1: funkman InetAddress.getLocalHost() != localhost - it should be
 InetAddress.getByName("localhost").getHostAddress()
 
-* Fix bug in CGI servlet that causes it to fail when included
-  http://people.apache.org/~markt/patches/2007-10-28-cgi-include.patch
-  +1: markt, remm, fhanik
-  -1:
-
 * Fix BZ 43702 - Inner class files have unnecessarily long names
   http://people.apache.org/~markt/patches/2007-10-30-Bug43702.patch
   +1: markt, remm, fhanik, pero

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=595801&r1=595800&r2=595801&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java Fri 
Nov 16 12:07:07 2007
@@ -784,16 +784,31 @@
  */
 protected void setupFromRequest(HttpServletRequest req)
 throws UnsupportedEncodingException {
-
-this.contextPath = req.getContextPath();
-this.servletPath = req.getServletPath();
-this.pathInfo = req.getPathInfo();
+
+boolean isIncluded = false;
+
+// Look to see if this request is an include
+if (req.getAttribute(Globals.INCLUDE_REQUEST_URI_ATTR) != null) {
+isIncluded = true;
+}
+if (isIncluded) {
+this.contextPath = (String) req.getAttribute(
+Globals.INCLUDE_CONTEXT_PATH_ATTR);
+this.servletPath = (String) req.getAttribute(
+Globals.INCLUDE_SERVLET_PATH_ATTR);
+this.pathInfo = (String) req.getAttribute(
+Globals.INCLUDE_PATH_INFO_ATTR);
+} else {
+this.contextPath = req.getContextPath();
+this.servletPath = req.getServletPath();
+this.pathInfo = req.getPathInfo();
+}
 // If getPathInfo() returns null, must be using extension mapping
 // In this case, pathInfo should be same as servletPath
 if (this.pathInfo == null) {
 this.pathInfo = this.servletPath;
 }
-
+
 // If the request method is GET, POST or HEAD and the query string
 // does not contain an unencoded "=" this is an indexed query.
 // The parsed query string becomes the command line parameters
@@ -801,7 +816,13 @@
 if (req.getMethod().equals("GET")
 || req.getMethod().equals("POST")
 || req.getMethod().equals("HEAD")) {
-String qs = req.getQueryString();
+String qs;
+if (isIncluded) {
+qs = (String) req.getAttribute(
+Globals.INCLUDE_QUERY_STRING_ATTR);
+} else {
+qs = req.getQueryString();
+}
 if (qs != null && qs.indexOf("=") == -1) {
 StringTokenizer qsTokens = new StringTokenizer(qs, "+");
 while ( qsTokens.hasMoreTokens() ) {

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=595801&r1=595800&r2=595801&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Nov 16 12:07:07 2007
@@ -50,14 +50,17 @@
   
 
   
-43675: Fix a possible logging related classloader leak 
(markt).
+43675: Fix a possible logging related classloader leak. 
(markt)
+  
+  
+Fix a bug that causes CGI Servlet to fail when it is included. (markt)
   
 
   
   
 
   
-43675: Fix a possible logging related classloader leak 
(markt).
+43675: Fix a possible logging related classloader leak. 
(markt)
   
 
   



-
To unsubscribe, e-mail:

svn commit: r595802 - /tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java

2007-11-16 Thread markt 
Author: markt
Date: Fri Nov 16 12:07:21 2007
New Revision: 595802

URL: http://svn.apache.org/viewvc?rev=595802&view=rev
Log:
Include CGI include fix in trunk

Modified:
tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java

Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=595802&r1=595801&r2=595802&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Fri Nov 16 
12:07:21 2007
@@ -784,16 +784,31 @@
  */
 protected void setupFromRequest(HttpServletRequest req)
 throws UnsupportedEncodingException {
-
-this.contextPath = req.getContextPath();
-this.servletPath = req.getServletPath();
-this.pathInfo = req.getPathInfo();
+
+boolean isIncluded = false;
+
+// Look to see if this request is an include
+if (req.getAttribute(Globals.INCLUDE_REQUEST_URI_ATTR) != null) {
+isIncluded = true;
+}
+if (isIncluded) {
+this.contextPath = (String) req.getAttribute(
+Globals.INCLUDE_CONTEXT_PATH_ATTR);
+this.servletPath = (String) req.getAttribute(
+Globals.INCLUDE_SERVLET_PATH_ATTR);
+this.pathInfo = (String) req.getAttribute(
+Globals.INCLUDE_PATH_INFO_ATTR);
+} else {
+this.contextPath = req.getContextPath();
+this.servletPath = req.getServletPath();
+this.pathInfo = req.getPathInfo();
+}
 // If getPathInfo() returns null, must be using extension mapping
 // In this case, pathInfo should be same as servletPath
 if (this.pathInfo == null) {
 this.pathInfo = this.servletPath;
 }
-
+
 // If the request method is GET, POST or HEAD and the query string
 // does not contain an unencoded "=" this is an indexed query.
 // The parsed query string becomes the command line parameters
@@ -801,7 +816,13 @@
 if (req.getMethod().equals("GET")
 || req.getMethod().equals("POST")
 || req.getMethod().equals("HEAD")) {
-String qs = req.getQueryString();
+String qs;
+if (isIncluded) {
+qs = (String) req.getAttribute(
+Globals.INCLUDE_QUERY_STRING_ATTR);
+} else {
+qs = req.getQueryString();
+}
 if (qs != null && qs.indexOf("=") == -1) {
 StringTokenizer qsTokens = new StringTokenizer(qs, "+");
 while ( qsTokens.hasMoreTokens() ) {



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r595799 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/xmlparser/ParserUtils.java java/org/apache/tomcat/util/http/ServerCookie.java webapps/docs/changelog.xml

2007-11-16 Thread markt 
Author: markt
Date: Fri Nov 16 12:02:12 2007
New Revision: 595799

URL: http://svn.apache.org/viewvc?rev=595799&view=rev
Log:
Fix possible logging related classloader leak.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=595799&r1=595798&r2=595799&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 16 12:02:12 2007
@@ -47,13 +47,6 @@
   +1: jfclere
   -1: fhanik - Can we add the 'package' directive to make the package match 
the dir structure
 
-* Fix BZ 43675 - Possible logging related classloader leak
-  Better patch that removes ServerCookie.log(String) entirely as per
-  Remy's -1 comment on previous patch
-  http://svn.apache.org/viewvc?view=rev&revision=594700
-  +1: markt, remm, fhanik, pero
-  -1:
-
 * Fix BZ 43846
   Fix output of data on simulated blocking IO
   Improve speed of writing and reading

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java?rev=595799&r1=595798&r2=595799&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java Fri 
Nov 16 12:02:12 2007
@@ -191,9 +191,6 @@
 
 class MyEntityResolver implements EntityResolver {
 
-// Logger
-private Log log = LogFactory.getLog(MyEntityResolver.class);
-
 public InputSource resolveEntity(String publicId, String systemId)
 throws SAXException {
 for (int i = 0; i < Constants.CACHED_DTD_PUBLIC_IDS.length; i++) {
@@ -210,6 +207,7 @@
 return isrc;
 }
 }
+Log log = LogFactory.getLog(MyEntityResolver.class);
 if (log.isDebugEnabled())
 log.debug("Resolve entity failed" + publicId + " " + systemId);
 log.error(Localizer.getMessage("jsp.error.parse.xml.invalidPublicId",
@@ -220,10 +218,8 @@
 
 class MyErrorHandler implements ErrorHandler {
 
-// Logger
-private Log log = LogFactory.getLog(MyErrorHandler.class);
-
 public void warning(SAXParseException ex) throws SAXException {
+Log log = LogFactory.getLog(MyErrorHandler.class);
 if (log.isDebugEnabled())
 log.debug("ParserUtils: warning ", ex);
 // We ignore warnings

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java?rev=595799&r1=595798&r2=595799&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java Fri 
Nov 16 12:02:12 2007
@@ -38,9 +38,6 @@
 public class ServerCookie implements Serializable {
 
 
-private static org.apache.juli.logging.Log log =
-org.apache.juli.logging.LogFactory.getLog(ServerCookie.class);
-
 // Version 0 (Netscape) attributes
 private MessageBytes name=MessageBytes.newInstance();
 private MessageBytes value=MessageBytes.newInstance();
@@ -123,11 +120,6 @@
 
 
 //  utils 
-
-public static void log(String s ) {
-if (log.isDebugEnabled())
-log.debug("ServerCookie: " + s);
-}
 
 public String toString() {
 return "Cookie " + getName() + "=" + getValue() + " ; "

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=595799&r1=595798&r2=595799&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Nov 16 12:02:12 2007
@@ -47,6 +47,20 @@
   
 
   
+  
+
+  
+43675: Fix a possible logging related classloader leak 
(markt).
+  
+
+  
+  
+
+  
+43675: Fix a possible logging related classloader leak 
(markt).
+  
+
+  
 
 
   



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r595827 - /tomcat/current/tc5.5.x/STATUS.txt

2007-11-16 Thread markt 
Author: markt
Date: Fri Nov 16 13:17:28 2007
New Revision: 595827

URL: http://svn.apache.org/viewvc?rev=595827&view=rev
Log:
Add a few more fixes to backport

Modified:
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=595827&r1=595826&r2=595827&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Fri Nov 16 13:17:28 2007
@@ -42,7 +42,7 @@
   -1:
 
 * Fix bug in CGI servlet that causes it to fail when included
-  http://people.apache.org/~markt/patches/2007-10-28-cgi-include.patch
+  http://svn.apache.org/viewvc?view=rev&revision=595802
   +1: markt
   -1:
 
@@ -67,3 +67,24 @@
   +1: pero
   -1:
 
+* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43675 Possible logging
+  releated class loader leak
+  http://svn.apache.org/viewvc?rev=594700&view=rev
+  +1: markt
+  -1:
+
+* Update TC5 with the new Cookie handling code from TC6
+  http://svn.apache.org/viewvc?view=rev&revision=553218
+  http://svn.apache.org/viewvc?view=rev&revision=553410
+  http://svn.apache.org/viewvc?view=rev&revision=553700
+  http://svn.apache.org/viewvc?view=rev&revision=557467
+  http://svn.apache.org/viewvc?view=rev&revision=580754
+  http://svn.apache.org/viewvc?view=rev&revision=586818
+  http://svn.apache.org/viewvc?view=rev&revision=594968
+  +1: markt
+  -1:
+
+* Fix bug 43702. Inner classes have long names
+  http://svn.apache.org/viewvc?rev=595805&view=rev
+  +1: markt
+  -1:



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r595830 - /tomcat/tc6.0.x/trunk/STATUS.txt

2007-11-16 Thread markt 
Author: markt
Date: Fri Nov 16 13:21:24 2007
New Revision: 595830

URL: http://svn.apache.org/viewvc?rev=595830&view=rev
Log:
Vote

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=595830&r1=595829&r2=595830&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 16 13:21:24 2007
@@ -48,5 +48,5 @@
   
 * Fix Comet bug, if servlet calls cometEvent.close() on the BEGIN event, the 
request still is marked as comet and ends up in a funky state
   http://people.apache.org/~fhanik/patches/comet-begin-event-close.patch
-  +1: fhanik
+  +1: fhanik, markt
   -1: 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r595828 - /tomcat/current/tc4.1.x/STATUS.txt

2007-11-16 Thread markt 
Author: markt
Date: Fri Nov 16 13:17:42 2007
New Revision: 595828

URL: http://svn.apache.org/viewvc?rev=595828&view=rev
Log:
Add backport

Modified:
tomcat/current/tc4.1.x/STATUS.txt

Modified: tomcat/current/tc4.1.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc4.1.x/STATUS.txt?rev=595828&r1=595827&r2=595828&view=diff
==
--- tomcat/current/tc4.1.x/STATUS.txt (original)
+++ tomcat/current/tc4.1.x/STATUS.txt Fri Nov 16 13:17:42 2007
@@ -42,3 +42,9 @@
   
http://people.apache.org/~rjung/patches/replace_system_properties_20071018a.patch
   +1: rjung
   -1:
+
+* Update TC4 with the new Cookie handling code from TC6. Request/Response
+  only. Requires TC5 port first.
+  http://svn.apache.org/viewvc?view=rev&revision=594968
+  +1: markt
+  -1:
\ No newline at end of file



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 43887] New: - StandardWrapper.registerJMX() doesn't log exceptions correctly

2007-11-16 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43887

   Summary: StandardWrapper.registerJMX() doesn't log exceptions
correctly
   Product: Tomcat 5
   Version: 5.5.23
  Platform: Other
OS/Version: other
Status: NEW
  Severity: minor
  Priority: P2
 Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


I was getting some rather unhelpful error messages when trying to deploy a
web.xml that included illegal servlet names. I tracked them down to this part of
/org/apache/catalina/core/StandardWrapper.java:

} catch( Exception ex ) {
log.info("Error registering servlet with jmx " + this);
}

This should probably be changed to:

log.info("Error registering servlet with jmx " + ex);

Same thing for the catch block ten lines below this one.


I first noticed this in 5.5.23, but this code is still present in 6.0 trunk.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r595909 - /tomcat/tc6.0.x/trunk/STATUS.txt

2007-11-16 Thread pero 
Author: pero
Date: Fri Nov 16 21:09:12 2007
New Revision: 595909

URL: http://svn.apache.org/viewvc?rev=595909&view=rev
Log:
Add my vote

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=595909&r1=595908&r2=595909&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 16 21:09:12 2007
@@ -48,5 +48,5 @@
   
 * Fix Comet bug, if servlet calls cometEvent.close() on the BEGIN event, the 
request still is marked as comet and ends up in a funky state
   http://people.apache.org/~fhanik/patches/comet-begin-event-close.patch
-  +1: fhanik, markt
+  +1: fhanik, markt, pero
   -1: 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]