Tomcat Servlet Container development

markt | 1 Feb 01:01

Picon

svn commit: r905143 - /tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java

Author: markt
Date: Mon Feb  1 00:01:45 2010
New Revision: 905143

URL: http://svn.apache.org/viewvc?rev=905143&view=rev
Log:
Restore the current 6.0.x implementation so patch to fix 48616 will apply cleanly to 6.0.x

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

Modified: tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java?rev=905143&r1=905142&r2=905143&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java Mon Feb  1 00:01:45 2010
@@ -70,7 +70,7 @@
         public void visit(Node.CustomTag n) throws JasperException {
             setScriptingVars(n, VariableInfo.AT_BEGIN);
             setScriptingVars(n, VariableInfo.NESTED);
-            visitBody(n);
+            new ScriptingVariableVisitor(err).visitBody(n);
             setScriptingVars(n, VariableInfo.AT_END);
         }

markt | 1 Feb 01:04

Picon

svn commit: r905145 - in /tomcat/trunk/java/org/apache/jasper/compiler: Generator.java ScriptingVariabler.java

Author: markt
Date: Mon Feb  1 00:04:40 2010
New Revision: 905145

URL: http://svn.apache.org/viewvc?rev=905145&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48616, a regression caused by the fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=42390
The requirement for variable declaration also depends on whether or not a fragment helper has been used for
the parent tag (if any). Where such a helper has been used, the variables must be redefined.
Test cases for both bugs and the JSP TCK pass with this patch applied.

Modified:
    tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
    tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.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=905145&r1=905144&r2=905145&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Mon Feb  1 00:04:40 2010
@@ -167,6 +167,26 @@
         return b.toString();
     }

+    /**
+     * Finds the <jsp:body> subelement of the given parent node. If not
+     * found, null is returned.
+     */
+    protected static Node.JspBody findJspBody(Node parent) {
+        Node.JspBody result = null;

(Continue reading)

markt | 1 Feb 01:06

Picon

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

Author: markt
Date: Mon Feb  1 00:06:36 2010
New Revision: 905146

URL: http://svn.apache.org/viewvc?rev=905146&view=rev
Log:
Proposal

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=905146&r1=905145&r2=905146&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Feb  1 00:06:36 2010
@@ -227,3 +227,14 @@
   http://svn.apache.org/viewvc?rev=905020&view=rev
   +1: markt
   -1: 
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48616
+  This is a regression caused by the fix for
+  https://issues.apache.org/bugzilla/show_bug.cgi?id=42390
+  The requirement for variable declaration also depends on whether or not a
+  fragment helper has been used for the parent tag (if any). Where such a helper
+  has been used, the variables must be redefined.
+  Test cases for both bugs and the JSP TCK pass with this patch applied.
+  http://svn.apache.org/viewvc?rev=905145&view=rev
+  +1: markt

(Continue reading)

markt | 1 Feb 01:08

Picon

svn commit: r905147 - /tomcat/tc5.5.x/trunk/STATUS.txt

Author: markt
Date: Mon Feb  1 00:08:07 2010
New Revision: 905147

URL: http://svn.apache.org/viewvc?rev=905147&view=rev
Log:
Update proposal with fix.
Remove Konstantin's vote as this is a very different patch

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

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=905147&r1=905146&r2=905147&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Mon Feb  1 00:08:07 2010
@@ -46,9 +46,10 @@
   Concerns were raised regarding possible regressions. I have tested tag files,
   simple tags and tags and can't find any regression issues. The TCK also
   passes.
-  http://svn.apache.org/viewvc?rev=804734&view=rev
-  +1: kkolinko
-  -1: markt - The concerns were valid. The patch caused bug 48616.
+  http://svn.apache.org/viewvc?rev=804734&view=rev (original fix)
+  http://svn.apache.org/viewvc?rev=905145&view=rev (correction to original fix)
+  +1: markt
+  -1: 

 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44041

(Continue reading)

bugzilla | 1 Feb 01:09

Picon

DO NOT REPLY [Bug 48616] Struts 1.2 and bean:define tag throws jsp 1.1 regression exception

https://issues.apache.org/bugzilla/show_bug.cgi?id=48616

--- Comment #13 from Mark Thomas <markt <at> apache.org> 2010-01-31 16:09:06 GMT ---
Thanks for the test case. It speed up the process of fixing this considerably.

The regression has been fixed in trunk and proposed for 6.0.x.

--

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

bugzilla | 1 Feb 01:09

Picon

DO NOT REPLY [Bug 42390] JSP compilation error with nested tagfile tags with variables with "AT_BEGIN" scope

https://issues.apache.org/bugzilla/show_bug.cgi?id=42390

--- Comment #9 from Mark Thomas <markt <at> apache.org> 2010-01-31 16:09:41 GMT ---
The proposed patch for 5.5.x has been updated with a fix for the regession.

--

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

markt | 1 Feb 01:17

Picon

svn commit: r905151 - in /tomcat/trunk/res: welcome.bin.html welcome.main.html

Author: markt
Date: Mon Feb  1 00:17:55 2010
New Revision: 905151

URL: http://svn.apache.org/viewvc?rev=905151&view=rev
Log:
Update info on zip distributions

Modified:
    tomcat/trunk/res/welcome.bin.html
    tomcat/trunk/res/welcome.main.html

Modified: tomcat/trunk/res/welcome.bin.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/welcome.bin.html?rev=905151&r1=905150&r2=905151&view=diff
==============================================================================
--- tomcat/trunk/res/welcome.bin.html (original)
+++ tomcat/trunk/res/welcome.bin.html Mon Feb  1 00:17:55 2010
@@ -41,9 +41,11 @@

 <p>Packaging Details (or "What Should I Download?")
   <ul>
-    <li>apache-tomcat-[version].zip or .tar.gz: base distribution.</li>
+    <li>apache-tomcat-[version].zip or .tar.gz: base distribution.  These distributions do not include
the Windows service wrapper nor the compiled APR/native for Windows.</li>
     <li>apache-tomcat-[version].exe: Windows installer for Tomcat.  Please note that while this
distribution includes the vast majority of the base distribution, some of the command-line scripts for
launching Tomcat are not included.  This distribution is intended for those users planning to launch
Tomcat through the Windows shortcuts or services.</li>
-    <!--<li>apache-tomcat-[version]-admin.zip or .tar.gz: the Tomcat Administration webapp only.</li>-->
+    <li>apache-tomcat-[version]-windows-x86.zip: 32-bit Windows specific distribution that includes

(Continue reading)

markt | 1 Feb 01:20

Picon

svn commit: r905152 - in /tomcat/tc6.0.x/trunk: ./ res/welcome.bin.html res/welcome.main.html

Author: markt
Date: Mon Feb  1 00:20:19 2010
New Revision: 905152

URL: http://svn.apache.org/viewvc?rev=905152&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=48615
Update info on zip distributions

Modified:
    tomcat/tc6.0.x/trunk/   (props changed)
    tomcat/tc6.0.x/trunk/res/welcome.bin.html
    tomcat/tc6.0.x/trunk/res/welcome.main.html

Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  1 00:20:19 2010
@@ -1,2 +1,3 @@
 /tomcat:883362
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,7
 58664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77
 0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833
 545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,8902
 65,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,899284,899348,899420
+/tomcat/tc6.0.x/trunk:904949
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,7
 58664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77
 0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833
 545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,8902

(Continue reading)

markt | 1 Feb 01:24

Picon

svn commit: r905154 - /tomcat/trunk/res/welcome.bin.html

Author: markt
Date: Mon Feb  1 00:24:00 2010
New Revision: 905154

URL: http://svn.apache.org/viewvc?rev=905154&view=rev
Log:
Typo

Modified:
    tomcat/trunk/res/welcome.bin.html

Modified: tomcat/trunk/res/welcome.bin.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/welcome.bin.html?rev=905154&r1=905153&r2=905154&view=diff
==============================================================================
--- tomcat/trunk/res/welcome.bin.html (original)
+++ tomcat/trunk/res/welcome.bin.html Mon Feb  1 00:24:00 2010
@@ -44,8 +44,8 @@
     <li>apache-tomcat-[version].zip or .tar.gz: base distribution.  These distributions do not include
the Windows service wrapper nor the compiled APR/native for Windows.</li>
     <li>apache-tomcat-[version].exe: Windows installer for Tomcat.  Please note that while this
distribution includes the vast majority of the base distribution, some of the command-line scripts for
launching Tomcat are not included.  This distribution is intended for those users planning to launch
Tomcat through the Windows shortcuts or services.</li>
     <li>apache-tomcat-[version]-windows-x86.zip: 32-bit Windows specific distribution that includes
the Windows service wrapper and the compiled APR/native for Windows for use with 32-bit JVMs on both 32 and
64 bit Windows platforms.</li>
-    <li>apache-tomcat-[version]-windows-x64.zip: 64-bit Windows specific distribution that includes
the Windows service wrapper and the compiled APR/native for Windows for use with 64-bit JVMs x64 Windows platforms.</li>
-    <li>apache-tomcat-[version]-windows-i64.zip: 64-bit Windows specific distribution that includes
the Windows service wrapper and the compiled APR/native for Windows for use with 64-bit JVMs i64 Windows platforms.</li>

(Continue reading)

markt | 1 Feb 01:24

Picon

svn commit: r905155 - /tomcat/tc6.0.x/trunk/res/welcome.bin.html

Author: markt
Date: Mon Feb  1 00:24:26 2010
New Revision: 905155

URL: http://svn.apache.org/viewvc?rev=905155&view=rev
Log:
Typo

Modified:
    tomcat/tc6.0.x/trunk/res/welcome.bin.html

Modified: tomcat/tc6.0.x/trunk/res/welcome.bin.html
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/welcome.bin.html?rev=905155&r1=905154&r2=905155&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/welcome.bin.html (original)
+++ tomcat/tc6.0.x/trunk/res/welcome.bin.html Mon Feb  1 00:24:26 2010
@@ -44,8 +44,8 @@
     <li>apache-tomcat-[version].zip or .tar.gz: base distribution.  These distributions do not include
the Windows service wrapper nor the compiled APR/native for Windows.</li>
     <li>apache-tomcat-[version].exe: Windows installer for Tomcat.  Please note that while this
distribution includes the vast majority of the base distribution, some of the command-line scripts for
launching Tomcat are not included.  This distribution is intended for those users planning to launch
Tomcat through the Windows shortcuts or services.</li>
     <li>apache-tomcat-[version]-windows-x86.zip: 32-bit Windows specific distribution that includes
the Windows service wrapper and the compiled APR/native for Windows for use with 32-bit JVMs on both 32 and
64 bit Windows platforms.</li>
-    <li>apache-tomcat-[version]-windows-x64.zip: 64-bit Windows specific distribution that includes
the Windows service wrapper and the compiled APR/native for Windows for use with 64-bit JVMs x64 Windows platforms.</li>
-    <li>apache-tomcat-[version]-windows-i64.zip: 64-bit Windows specific distribution that includes
the Windows service wrapper and the compiled APR/native for Windows for use with 64-bit JVMs i64 Windows platforms.</li>

(Continue reading)

Group

gmane.comp.jakarta.tomcat.devel.

Search Archive

Page

1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 126

Articles in period: 1256

February 2010

Language

Change language

Options

Current view: Threads only / Showing only 20 lines / Not hiding cited text.
Change to All messages, whole messages, or hide cited text.

Post a message
NNTP Newsgroup
Classic Gmane web interface
XML

XML

RSS Feed
List Information

About Gmane

Recent entries

DO NOT REPLY [Bug 52637] New: Broken link (10 Feb 11:42)
DO NOT REPLY [Bug 52636] New: JNDIRealm fails with CommunicationExcept (10 Feb 10:48)
svn commit: r1242676 - /tomcat/taglibs/rdc/trunk/src/site/xdoc/index.x (10 Feb 06:06)
svn commit: r1242674 - /tomcat/taglibs/standard/trunk/src/site/xdoc/in (10 Feb 06:00)
svn commit: r1242673 - /tomcat/taglibs/rdc/trunk/src/site/xdoc/index.x (10 Feb 05:59)
svn commit: r1242671 - /tomcat/taglibs/site/src/site/xdoc/site/news.xm (10 Feb 05:56)
svn commit: r1242669 - /tomcat/taglibs/site/src/site/xdoc/site/using.x (10 Feb 05:51)
svn commit: r1242584 - in /tomcat/trunk: java/org/apache/coyote/http11 (9 Feb 23:50)
Misconfigured Git-SVN once again (9 Feb 22:36)
svn commit: r1242499 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/chang (9 Feb 21:01)
svn commit: r1242495 - in /tomcat/trunk/webapps/examples/jsp: jsp2/el/ (9 Feb 20:56)
DO NOT REPLY [Bug 52634] New: Typos in Examples (9 Feb 20:08)
svn commit: r1242437 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/ju (9 Feb 19:21)
svn commit: r1242434 - /tomcat/trunk/java/org/apache/juli/logging/Dire (9 Feb 19:16)
Timing for 7.0.26 (9 Feb 17:20)
svn commit: r1242374 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/ju (9 Feb 17:16)
svn commit: r1242371 - in /tomcat/trunk: ./ java/org/apache/juli/loggi (9 Feb 17:08)
svn commit: r1242370 - /tomcat/trunk/java/org/apache/catalina/startup/ (9 Feb 17:07)
DO NOT REPLY [Bug 52629] New: minIdle property behaviour is not the de (9 Feb 15:20)
svn commit: r1242254 - in /tomcat/trunk/java/org/apache: catalina/conn (9 Feb 10:41)
[Tomcat Wiki] Update of "jeremiahlevinson" by jeremiahlevinson (9 Feb 04:18)

Archives

364	February 2012
967	January 2012
841	December 2011
979	November 2011
1220	October 2011
887	September 2011
807	August 2011
997	July 2011
1013	June 2011
654	May 2011
478	April 2011
743	March 2011
780	February 2011
1168	January 2011
740	December 2010
956	November 2010
1158	October 2010
980	September 2010
702	August 2010
862	July 2010
746	June 2010
733	May 2010
955	April 2010
1246	March 2010
1081	February 2010
1007	January 2010
895	December 2009
1174	November 2009
449	October 2009
572	September 2009
539	August 2009
854	July 2009
1000	June 2009
464	May 2009
653	April 2009
632	March 2009
319	February 2009
463	January 2009
429	December 2008
625	November 2008
758	October 2008
669	September 2008
508	August 2008
523	July 2008
437	June 2008
538	May 2008
646	April 2008
756	March 2008
627	February 2008
989	January 2008
545	December 2007
620	November 2007
820	October 2007
645	September 2007
668	August 2007
451	July 2007
583	June 2007
792	May 2007
854	April 2007
1036	March 2007
612	February 2007
606	January 2007
781	December 2006
863	November 2006
879	October 2006
842	September 2006
696	August 2006
3487	July 2006
797	June 2006
701	May 2006
878	April 2006
966	March 2006
754	February 2006
677	January 2006
617	December 2005
726	November 2005
589	October 2005
957	September 2005
611	August 2005
988	July 2005
820	June 2005
818	May 2005
1083	April 2005
1167	March 2005
1111	February 2005
922	January 2005
1118	December 2004
1061	November 2004
1220	October 2004
1142	September 2004
1328	August 2004
1683	July 2004
946	June 2004
1122	May 2004
1196	April 2004
2254	March 2004
1597	February 2004
1437	January 2004
1006	December 2003
983	November 2003
1131	October 2003
1276	September 2003
1211	August 2003
1138	July 2003
938	June 2003
1051	May 2003
1547	April 2003
1524	March 2003
1117	February 2003
1415	January 2003
1205	December 2002
1393	November 2002
1852	October 2002
1917	September 2002
1650	August 2002
1434	July 2002
2092	June 2002
1975	May 2002
2047	April 2002
926	March 2002
1	November 2001
1	May 2000
1	October 1998

Design

Zawodny | Right Menu | Left Menu

Your Own Design

Paste the URL of your CSS below. Download CSS template