DO NOT REPLY [Bug 50250] Split package issue in impl and jstlel bundles
https://issues.apache.org/bugzilla/show_bug.cgi?id=50250 --- Comment #2 from Henri Yandell 2010-11-13 00:52:28 EST --- Thanks Rex. I've performed the svn mv, though I'm not sure what the deployment process is so will wait on Jeremy for that. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1034664 - in /tomcat/taglibs/standard/trunk: impl/src/main/resources/org/apache/taglibs/standard/lang/jstl/ jstlel/src/main/resources/org/ jstlel/src/main/resources/org/apache/ jstlel/src
Author: bayard Date: Sat Nov 13 05:50:30 2010 New Revision: 1034664 URL: http://svn.apache.org/viewvc?rev=1034664&view=rev Log: Moving the JSTL EL Resources from impl to jstlel per #50250 Added: tomcat/taglibs/standard/trunk/jstlel/src/main/resources/org/ tomcat/taglibs/standard/trunk/jstlel/src/main/resources/org/apache/ tomcat/taglibs/standard/trunk/jstlel/src/main/resources/org/apache/taglibs/ tomcat/taglibs/standard/trunk/jstlel/src/main/resources/org/apache/taglibs/standard/ tomcat/taglibs/standard/trunk/jstlel/src/main/resources/org/apache/taglibs/standard/lang/ tomcat/taglibs/standard/trunk/jstlel/src/main/resources/org/apache/taglibs/standard/lang/jstl/ - copied from r1034663, tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/lang/jstl/ Removed: tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/lang/jstl/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50197] Provide *.sh scripts with jsvc
https://issues.apache.org/bugzilla/show_bug.cgi?id=50197 Mark Thomas changed: What|Removed |Added Status|NEW |NEEDINFO Severity|normal |enhancement --- Comment #1 from Mark Thomas 2010-11-12 13:57:38 EST --- It isn't at all clear what you are looking for here. An example for what catalina.jsvc.sh should look like or a diff against catalina.sh would help. I would also point out that jsvc is a product of Apache Commons Daemon and already includes scripts for running with Tomcat. If you are referring to these then you;'ll need to open a JIRA for the Commons Daemon project. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50194] ELParsing fails when an expression with function contains a dash (minus) on 6.0.2.20 and up
https://issues.apache.org/bugzilla/show_bug.cgi?id=50194 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #2 from Mark Thomas 2010-11-12 13:53:18 EST --- There are a handful of different specifications involved here. First of all there is the JSP 2.1 specification. It states in Table JSP.1-9 that: A prefix must follow the naming convention specified in the XML namespaces specification. So far so good, '-' is permitted by the XML namespaces specification. Then we move to the EL 2.1 specification. Unfortunately, it is more restrictive. 1.15 defines the syntax as: [ns:]f([a1[,a2[,...[,an) where ns is a namespace. Again, so far so good. However in the collected syntax there is the following: FunctionInvocation::=(Identifier ‘:’)? Identifier ‘(‘ ( Expression ( ‘,’ Expression )* )? ‘)’ and Identifier ::= Java language identifier So the namespace also has to comply with the rules for Java Language Identifiers which do not permit the use of '-'. Tomcat's EL processing has been made gradually more specification compliant as bugs have been raised that highlight various issues caused by a relaxed interpretation of the specification. I suspect the change between 6.0.18 and 6.0.29 was as a result of one of these. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50192] performance issue after revision 746425
https://issues.apache.org/bugzilla/show_bug.cgi?id=50192 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #4 from Mark Thomas 2010-11-12 13:30:36 EST --- Thanks for the analysis and the patch. I applied a slightly different version to 7.0.x that will be include din 7.0.5 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1034500 - in /tomcat/trunk: java/org/apache/jasper/el/ELContextImpl.java java/org/apache/jasper/el/ELResolverImpl.java webapps/docs/changelog.xml
Author: markt Date: Fri Nov 12 18:29:12 2010 New Revision: 1034500 URL: http://svn.apache.org/viewvc?rev=1034500&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50192 Improve performance for EL when running under a security manager. Based on a patch by Robert Goff. Modified: tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java?rev=1034500&r1=1034499&r2=1034500&view=diff == --- tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java (original) +++ tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java Fri Nov 12 18:29:12 2010 @@ -26,8 +26,6 @@ import javax.el.FunctionMapper; import javax.el.ValueExpression; import javax.el.VariableMapper; -import org.apache.jasper.Constants; - /** * Implementation of ELContext * @@ -66,22 +64,12 @@ public final class ELContextImpl extends private final ELResolver resolver; -private FunctionMapper functionMapper; +private FunctionMapper functionMapper = NullFunctionMapper; private VariableMapper variableMapper; public ELContextImpl() { this(ELResolverImpl.getDefaultResolver()); -if (Constants.IS_SECURITY_ENABLED) { -functionMapper = new FunctionMapper() { -@Override -public Method resolveFunction(String prefix, String localName) { -return null; -} -}; -} else { -functionMapper = NullFunctionMapper; -} } public ELContextImpl(ELResolver resolver) { Modified: tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java?rev=1034500&r1=1034499&r2=1034500&view=diff == --- tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java (original) +++ tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java Fri Nov 12 18:29:12 2010 @@ -35,20 +35,27 @@ import javax.servlet.jsp.el.VariableReso import org.apache.jasper.Constants; public final class ELResolverImpl extends ELResolver { -private final static ELResolver DefaultResolver = new CompositeELResolver(); +private final static ELResolver DefaultResolver; static { -((CompositeELResolver) DefaultResolver).add(new MapELResolver()); -((CompositeELResolver) DefaultResolver).add(new ResourceBundleELResolver()); -((CompositeELResolver) DefaultResolver).add(new ListELResolver()); -((CompositeELResolver) DefaultResolver).add(new ArrayELResolver()); -((CompositeELResolver) DefaultResolver).add(new BeanELResolver()); +if (Constants.IS_SECURITY_ENABLED) { +DefaultResolver = null; +} else { +DefaultResolver = new CompositeELResolver(); +((CompositeELResolver) DefaultResolver).add(new MapELResolver()); +((CompositeELResolver) DefaultResolver).add(new ResourceBundleELResolver()); +((CompositeELResolver) DefaultResolver).add(new ListELResolver()); +((CompositeELResolver) DefaultResolver).add(new ArrayELResolver()); +((CompositeELResolver) DefaultResolver).add(new BeanELResolver()); +} } private final VariableResolver variableResolver; +private final ELResolver elResolver; public ELResolverImpl(VariableResolver variableResolver) { this.variableResolver = variableResolver; +this.elResolver = getDefaultResolver(); } @Override @@ -71,7 +78,7 @@ public final class ELResolverImpl extend } if (!context.isPropertyResolved()) { -return getDefaultResolver().getValue(context, base, property); +return elResolver.getValue(context, base, property); } return null; } @@ -97,7 +104,7 @@ public final class ELResolverImpl extend } if (!context.isPropertyResolved()) { -return getDefaultResolver().getType(context, base, property); +return elResolver.getType(context, base, property); } return null; } @@ -118,7 +125,7 @@ public final class ELResolverImpl extend } if (!context.isPropertyResolved()) { -getDefaultResolver().setValue(context, base, property, value); +elResolver.setValue(context, base, property, value); } } @@ -134,12 +141,12 @@ public final class ELResolverImpl extend return true; } -return getDefaultResolver().isReadOnly(context, base, property); +return elResolver.isReadOnly(conte
DO NOT REPLY [Bug 49297] Whitespace absence is allowed before attribute name in a custom tag
https://issues.apache.org/bugzilla/show_bug.cgi?id=49297 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #9 from Mark Thomas 2010-11-12 11:53:09 EST --- Thanks for the patch. I didn't use it exactly but I did base the final fix on your patch. The fix is in 7.0.x and will be included in 7.0.5 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1034468 - in /tomcat/trunk: java/org/apache/jasper/compiler/ java/org/apache/jasper/util/ test/org/apache/jasper/compiler/ test/webapp-3.0/bug49nnn/ webapps/docs/
Author: markt Date: Fri Nov 12 16:52:02 2010 New Revision: 1034468 URL: http://svn.apache.org/viewvc?rev=1034468&view=rev Log: Additional tests and fixes for https://issues.apache.org/bugzilla/show_bug.cgi?id=49297 Duplicate attribute rules for the page directive are slightly different. Based on a patch by genspring Added: tomcat/trunk/test/webapp-3.0/bug49nnn/bug49297MultipleImport1.jsp (with props) tomcat/trunk/test/webapp-3.0/bug49nnn/bug49297MultipleImport2.jsp (with props) tomcat/trunk/test/webapp-3.0/bug49nnn/bug49297MultiplePageEncoding1.jsp (with props) tomcat/trunk/test/webapp-3.0/bug49nnn/bug49297MultiplePageEncoding2.jsp (with props) tomcat/trunk/test/webapp-3.0/bug49nnn/bug49297MultiplePageEncoding3.jsp (with props) tomcat/trunk/test/webapp-3.0/bug49nnn/bug49297MultiplePageEncoding4.jsp (with props) Modified: tomcat/trunk/java/org/apache/jasper/compiler/Parser.java tomcat/trunk/java/org/apache/jasper/util/UniqueAttributesImpl.java tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/jasper/compiler/Parser.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Parser.java?rev=1034468&r1=1034467&r2=1034468&view=diff == --- tomcat/trunk/java/org/apache/jasper/compiler/Parser.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/Parser.java Fri Nov 12 16:52:02 2010 @@ -150,7 +150,10 @@ class Parser implements TagConstants { * Attributes ::= (S Attribute)* S? */ Attributes parseAttributes() throws JasperException { -UniqueAttributesImpl attrs = new UniqueAttributesImpl(); +return parseAttributes(false); +} +Attributes parseAttributes(boolean pageDirective) throws JasperException { +UniqueAttributesImpl attrs = new UniqueAttributesImpl(pageDirective); reader.skipSpaces(); int ws = 1; @@ -177,7 +180,7 @@ class Parser implements TagConstants { public static Attributes parseAttributes(ParserController pc, JspReader reader) throws JasperException { Parser tmpParser = new Parser(pc, reader, false, false, null); -return tmpParser.parseAttributes(); +return tmpParser.parseAttributes(true); } /** @@ -327,7 +330,7 @@ class Parser implements TagConstants { * Attribute)* */ private void parsePageDirective(Node parent) throws JasperException { -Attributes attrs = parseAttributes(); +Attributes attrs = parseAttributes(true); Node.PageDirective n = new Node.PageDirective(attrs, start, parent); /* Modified: tomcat/trunk/java/org/apache/jasper/util/UniqueAttributesImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/util/UniqueAttributesImpl.java?rev=1034468&r1=1034467&r2=1034468&view=diff == --- tomcat/trunk/java/org/apache/jasper/util/UniqueAttributesImpl.java (original) +++ tomcat/trunk/java/org/apache/jasper/util/UniqueAttributesImpl.java Fri Nov 12 16:52:02 2010 @@ -29,7 +29,19 @@ import org.xml.sax.helpers.AttributesImp */ public class UniqueAttributesImpl extends AttributesImpl { -private Set qNames = new HashSet(); +private static final String IMPORT = "import"; +private static final String PAGE_ENCODING = "pageEncoding"; + +private final boolean pageDirective; +private final Set qNames = new HashSet(); + +public UniqueAttributesImpl() { +this.pageDirective = false; +} + +public UniqueAttributesImpl(boolean pageDirective) { +this.pageDirective = pageDirective; +} @Override public void clear() { @@ -41,7 +53,7 @@ public class UniqueAttributesImpl extend public void setAttributes(Attributes atts) { for (int i = 0; i < atts.getLength(); i++) { if (!qNames.add(atts.getQName(i))) { -handleDuplicate(atts.getQName(i)); +handleDuplicate(atts.getQName(i), atts.getValue(i)); } } super.setAttributes(atts); @@ -53,7 +65,7 @@ public class UniqueAttributesImpl extend if (qNames.add(qName)) { super.addAttribute(uri, localName, qName, type, value); } else { -handleDuplicate(qName); +handleDuplicate(qName, value); } } @@ -64,7 +76,7 @@ public class UniqueAttributesImpl extend if (qNames.add(qName)) { super.setAttribute(index, uri, localName, qName, type, value); } else { -handleDuplicate(qName); +handleDuplicate(qName, value); } } @@ -80,8 +92,29 @@ public class UniqueAttributesImpl extend super.setQName(index, qName); } -private void handleDuplicate(String qName) {
svn commit: r1034416 - in /tomcat/trunk/test: javax/servlet/jsp/ org/apache/el/ org/apache/jasper/compiler/ webapp-3.0/ webapp-3.0/WEB-INF/ webapp-3.0/bug49nnn/
Author: markt Date: Fri Nov 12 15:11:25 2010 New Revision: 1034416 URL: http://svn.apache.org/viewvc?rev=1034416&view=rev Log: Re-organise tests for bugs 49nnn Added: tomcat/trunk/test/webapp-3.0/bug49nnn/bug49196.jsp - copied unchanged from r1033904, tomcat/trunk/test/webapp-3.0/bug49196.jsp tomcat/trunk/test/webapp-3.0/bug49nnn/bug49297DuplicateAttr.jsp - copied unchanged from r1033904, tomcat/trunk/test/webapp-3.0/bug49297DuplicateAttr.jsp tomcat/trunk/test/webapp-3.0/bug49nnn/bug49297NoSpace.jsp - copied unchanged from r1033904, tomcat/trunk/test/webapp-3.0/bug49297NoSpace.jsp tomcat/trunk/test/webapp-3.0/bug49nnn/bug49555.jsp - copied unchanged from r1033904, tomcat/trunk/test/webapp-3.0/bug49555.jsp tomcat/trunk/test/webapp-3.0/bug49nnn/bug49726a.jsp - copied unchanged from r1033904, tomcat/trunk/test/webapp-3.0/bug49726a.jsp tomcat/trunk/test/webapp-3.0/bug49nnn/bug49726b.jsp - copied unchanged from r1033904, tomcat/trunk/test/webapp-3.0/bug49726b.jsp tomcat/trunk/test/webapp-3.0/bug49nnn/bug49799.jsp - copied unchanged from r1033904, tomcat/trunk/test/webapp-3.0/bug49799.jsp Removed: tomcat/trunk/test/webapp-3.0/bug49196.jsp tomcat/trunk/test/webapp-3.0/bug49297DuplicateAttr.jsp tomcat/trunk/test/webapp-3.0/bug49297NoSpace.jsp tomcat/trunk/test/webapp-3.0/bug49555.jsp tomcat/trunk/test/webapp-3.0/bug49726a.jsp tomcat/trunk/test/webapp-3.0/bug49726b.jsp tomcat/trunk/test/webapp-3.0/bug49799.jsp Modified: tomcat/trunk/test/javax/servlet/jsp/TestPageContext.java tomcat/trunk/test/org/apache/el/TestELInJsp.java tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java tomcat/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml Modified: tomcat/trunk/test/javax/servlet/jsp/TestPageContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/javax/servlet/jsp/TestPageContext.java?rev=1034416&r1=1034415&r2=1034416&view=diff == --- tomcat/trunk/test/javax/servlet/jsp/TestPageContext.java (original) +++ tomcat/trunk/test/javax/servlet/jsp/TestPageContext.java Fri Nov 12 15:11:25 2010 @@ -35,7 +35,7 @@ public class TestPageContext extends Tom tomcat.start(); ByteChunk res = getUrl("http://localhost:"; + getPort() + -"/test/bug49196.jsp"); +"/test/bug49nnn/bug49196.jsp"); String result = res.toString(); assertTrue(result.contains("OK")); Modified: tomcat/trunk/test/org/apache/el/TestELInJsp.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELInJsp.java?rev=1034416&r1=1034415&r2=1034416&view=diff == --- tomcat/trunk/test/org/apache/el/TestELInJsp.java (original) +++ tomcat/trunk/test/org/apache/el/TestELInJsp.java Fri Nov 12 15:11:25 2010 @@ -319,7 +319,7 @@ public class TestELInJsp extends TomcatB tomcat.start(); ByteChunk res = getUrl("http://localhost:"; + getPort() + -"/test/bug49555.jsp"); +"/test/bug49nnn/bug49555.jsp"); String result = res.toString(); assertEcho(result, "00-" + TesterFunctions.Inner$Class.RETVAL); Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java?rev=1034416&r1=1034415&r2=1034416&view=diff == --- tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java (original) +++ tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java Fri Nov 12 15:11:25 2010 @@ -38,8 +38,8 @@ public class TestCompiler extends Tomcat ByteChunk res = new ByteChunk(); Map> headers = new HashMap>(); -getUrl("http://localhost:"; + getPort() + "/test/bug49726a.jsp", res, -headers); +getUrl("http://localhost:"; + getPort() + "/test/bug49nnn/bug49726a.jsp", +res, headers); // Check request completed String result = res.toString(); @@ -59,8 +59,8 @@ public class TestCompiler extends Tomcat ByteChunk res = new ByteChunk(); Map> headers = new HashMap>(); -getUrl("http://localhost:"; + getPort() + "/test/bug49726b.jsp", res, -headers); +getUrl("http://localhost:"; + getPort() + "/test/bug49nnn/bug49726b.jsp", +res, headers); // Check request completed String result = res.toString(); Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java URL: htt
svn commit: r1034408 - /tomcat/trunk/test/webapp-3.0/bug49nnn/
Author: markt Date: Fri Nov 12 14:39:11 2010 New Revision: 1034408 URL: http://svn.apache.org/viewvc?rev=1034408&view=rev Log: Organise Added: tomcat/trunk/test/webapp-3.0/bug49nnn/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49297] Whitespace absence is allowed before attribute name in a custom tag
https://issues.apache.org/bugzilla/show_bug.cgi?id=49297 --- Comment #8 from Mark Thomas 2010-11-12 08:45:02 EST --- The quote above along with some comments in the patch suggests an ambiguity in the spec. The JSP 2.2 language is quite clear: There shall be only one occurrence of any attribute/value pair defined by this directive in a given translation unit, unless the values for the duplicate attributes are identical for all occurrences. The import and pageEncoding attributes are exempt from this rule and can appear multiple times. Multiple uses of the import attribute are cumulative (with ordered set union semantics). The pageEncoding attribute can occur at most once per file (or a translation error will result), and applies only to the file in which it appears. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1034338 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Fri Nov 12 10:24:56 2010 New Revision: 1034338 URL: http://svn.apache.org/viewvc?rev=1034338&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=1034338&r1=1034337&r2=1034338&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 12 10:24:56 2010 @@ -119,7 +119,7 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1004415&view=rev http://svn.apache.org/viewvc?rev=1004912&view=rev (fix for includes) +1: timw - +1: markt if http://svn.apache.org/viewvc?rev=1033897&view=rev + +1: markt, kkolinko if http://svn.apache.org/viewvc?rev=1033897&view=rev is also applied -1: kkolinko: See Re:r1004393 on dev@ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org