svn commit: r897614 - in /tomcat/trunk/java/org/apache/jasper/compiler: AttributeParser.java Parser.java
Author: markt
Date: Sun Jan 10 11:10:36 2010
New Revision: 897614
URL: http://svn.apache.org/viewvc?rev=897614&view=rev
Log:
Re-work EL attribute parsing. The underlying issue was complete independence of
attribute and EL parsing. The attribute parser would generate the same result -
${1+1} - after parsing ${1+1} and \${+1} and the EL had no way to differentiate
between the first (that should be treated as an expression) and the second
(that should be treated as a literal). The attribute parser has been modified
to output any literals that would be mi-interpreted by the EL parser as EL
literals. ie \ is output as ${'\\'} or #{'\\'}, $ as ${'$'} or #{'$'} and # as
${'#'} or #{'#'}.
Added:
tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java (with
props)
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
Added: tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java?rev=897614&view=auto
==
--- tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java (added)
+++ tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java Sun Jan
10 11:10:36 2010
@@ -0,0 +1,333 @@
+/*
+ * 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.jasper.compiler;
+
+/**
+ * Converts a JSP attribute value into the unquoted equivalent. The attribute
+ * may contain EL expressions, in which case care needs to be taken to avoid
any
+ * ambiguities. For example, consider the attribute values "${1+1}" and
+ * "\${1+1}". After unquoting, both appear as "${1+1}" but the first should
+ * evaluate to "2" and the second to "${1+1}". Literal \, $ and # need special
+ * treatment to ensure there is no ambiguity. The JSP attribute unquoting
+ * covers \\, \", \', \$, \#, %\>, <\%, ' and "
+ */
+public class AttributeParser {
+
+/* System property that controls if the strict quoting rules are applied.
*/
+private static final boolean STRICT_QUOTE_ESCAPING = Boolean.valueOf(
+System.getProperty(
+"org.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING",
+"true")).booleanValue();
+
+/**
+ * Parses the provided input String as a JSP attribute and returns an
+ * unquoted value.
+ *
+ * @param input The input.
+ * @param quote The quote character for the attribute or 0 for
+ * scripting expressions.
+ * @param isELIgnored Is expression language being ignored on the page
+ * where the JSP attribute is defined.
+ * @return An unquoted JSP attribute that, if it contains
+ * expression language can be safely passed to the EL
+ * processor without fear of ambiguity.
+ */
+public static String getUnquoted(String input, char quote,
+boolean isELIgnored) {
+return (new AttributeParser(input, quote, isELIgnored,
+STRICT_QUOTE_ESCAPING)).getUnquoted();
+}
+
+/**
+ * Provided solely for unit test purposes and allows per call overriding of
+ * the STRICT_QUOTE_ESCAPING system property.
+ *
+ * @param input The input.
+ * @param quote The quote character for the attribute or 0 for
+ * scripting expressions.
+ * @param isELIgnored Is expression language being ignored on the page
+ * where the JSP attribute is defined.
+ * @param strictThe value to use for STRICT_QUOTE_ESCAPING.
+ * @return An unquoted JSP attribute that, if it contains
+ * expression language can be safely passed to the EL
+ * processor without fear of ambiguity.
+ */
+protected static String getUnquoted(String input, char quote,
+boolean isELIgnored, boolean strict) {
+return (new AttributeParser(input, quote, isELIgnored,
+strict)).getUnquoted();
+}
+
+/* The quoted input string. */
+pr
svn commit: r897615 - in /tomcat/trunk/test: org/apache/el/TestELEvaluation.java org/apache/el/TestELInJsp.java org/apache/jasper/compiler/TestAttributeParser.java webapp/el-misc.jsp webapp/script-exp
Author: markt
Date: Sun Jan 10 11:12:42 2010
New Revision: 897615
URL: http://svn.apache.org/viewvc?rev=897615&view=rev
Log:
Better coverage for JSP attribute parsing
Added:
tomcat/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java
(with props)
tomcat/trunk/test/webapp/script-expr.jsp (with props)
Modified:
tomcat/trunk/test/org/apache/el/TestELEvaluation.java
tomcat/trunk/test/org/apache/el/TestELInJsp.java
tomcat/trunk/test/webapp/el-misc.jsp
Modified: tomcat/trunk/test/org/apache/el/TestELEvaluation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELEvaluation.java?rev=897615&r1=897614&r2=897615&view=diff
==
--- tomcat/trunk/test/org/apache/el/TestELEvaluation.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELEvaluation.java Sun Jan 10 11:12:42
2010
@@ -26,15 +26,54 @@
import org.apache.el.ExpressionFactoryImpl;
import org.apache.el.lang.ELSupport;
+import org.apache.jasper.compiler.TestAttributeParser;
import org.apache.jasper.el.ELContextImpl;
import junit.framework.TestCase;
/**
- * Tests for EL parsing and evaluation.
+ * Tests the EL engine directly. Similar tests may be found in
+ * {...@link TestAttributeParser} and {...@link TestELInJsp}.
*/
public class TestELEvaluation extends TestCase {
+/**
+ * Test use of spaces in ternary expressions. This was primarily an EL
+ * parser bug.
+ */
+public void testBug42565() {
+assertEquals("false", evaluateExpression("${false?true:false}"));
+assertEquals("false", evaluateExpression("${false?true: false}"));
+assertEquals("false", evaluateExpression("${false?true :false}"));
+assertEquals("false", evaluateExpression("${false?true : false}"));
+assertEquals("false", evaluateExpression("${false? true:false}"));
+assertEquals("false", evaluateExpression("${false? true: false}"));
+assertEquals("false", evaluateExpression("${false? true :false}"));
+assertEquals("false", evaluateExpression("${false? true : false}"));
+assertEquals("false", evaluateExpression("${false ?true:false}"));
+assertEquals("false", evaluateExpression("${false ?true: false}"));
+assertEquals("false", evaluateExpression("${false ?true :false}"));
+assertEquals("false", evaluateExpression("${false ?true : false}"));
+assertEquals("false", evaluateExpression("${false ? true:false}"));
+assertEquals("false", evaluateExpression("${false ? true: false}"));
+assertEquals("false", evaluateExpression("${false ? true :false}"));
+assertEquals("false", evaluateExpression("${false ? true : false}"));
+}
+
+
+/**
+ * Test use nested ternary expressions. This was primarily an EL parser
bug.
+ */
+public void testBug44994() {
+assertEquals("none", evaluateExpression(
+"${0 lt 0 ? 1 lt 0 ? 'many': 'one': 'none'}"));
+assertEquals("one", evaluateExpression(
+"${0 lt 1 ? 1 lt 1 ? 'many': 'one': 'none'}"));
+assertEquals("many", evaluateExpression(
+"${0 lt 2 ? 1 lt 2 ? 'many': 'one': 'none'}"));
+}
+
+
public void testParserBug45511() {
// Test cases provided by OP
assertEquals("true", evaluateExpression("${empty ('')}"));
@@ -43,11 +82,6 @@
assertEquals("false", evaluateExpression("${(true)and(false)}"));
}
-public void testParserBug42565() {
-// Test cases provided by OP
-assertEquals("false", evaluateExpression("${false?true:false}"));
-}
-
public void testParserLiteralExpression() {
// Inspired by work on bug 45451, comments from kkolinko on the dev
// list and looking at the spec to find some edge cases
Modified: tomcat/trunk/test/org/apache/el/TestELInJsp.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELInJsp.java?rev=897615&r1=897614&r2=897615&view=diff
==
--- tomcat/trunk/test/org/apache/el/TestELInJsp.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELInJsp.java Sun Jan 10 11:12:42 2010
@@ -21,15 +21,19 @@
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.jasper.compiler.TestAttributeParser;
import org.apache.tomcat.util.buf.ByteChunk;
+/**
+ * Tests EL with an without JSP attributes using a test web application.
Similar
+ * tests may be found in {...@link TestELEvaluation} and {...@link
TestAttributeParser}.
+ */
public class TestELInJsp extends TomcatBaseTest {
public void testBug42565() throws Exception {
Tomcat tomcat = getTomcatInstance();
-File appDir =
-new File("test/webapp");
+File appDir = new File("test/webapp");
// app dir is relative to server
svn commit: r897616 - /tomcat/trunk/test/org/apache/TestAll.java
Author: markt
Date: Sun Jan 10 11:13:10 2010
New Revision: 897616
URL: http://svn.apache.org/viewvc?rev=897616&view=rev
Log:
Add mising tests.
Modified:
tomcat/trunk/test/org/apache/TestAll.java
Modified: tomcat/trunk/test/org/apache/TestAll.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/TestAll.java?rev=897616&r1=897615&r2=897616&view=diff
==
--- tomcat/trunk/test/org/apache/TestAll.java (original)
+++ tomcat/trunk/test/org/apache/TestAll.java Sun Jan 10 11:13:10 2010
@@ -22,10 +22,17 @@
import org.apache.catalina.connector.TestKeepAliveCount;
import org.apache.catalina.connector.TestRequest;
+import org.apache.catalina.core.TestStandardContext;
import org.apache.catalina.ha.session.TestSerializablePrincipal;
import org.apache.catalina.startup.TestTomcat;
+import org.apache.catalina.startup.TestTomcatSSL;
+import org.apache.catalina.startup.TestWebXml;
import org.apache.el.TestELEvaluation;
+import org.apache.el.TestELInJsp;
import org.apache.el.lang.TestELSupport;
+import org.apache.jasper.compiler.TestAttributeParser;
+import org.apache.jasper.compiler.TestGenerator;
+import org.apache.jasper.compiler.TestValidator;
import org.apache.tomcat.util.http.TestCookies;
import org.apache.tomcat.util.res.TestStringManager;
@@ -35,18 +42,28 @@
TestSuite suite = new TestSuite("Test for org.apache");
// o.a.catalina
// connector
-suite.addTestSuite(TestRequest.class);
suite.addTestSuite(TestKeepAliveCount.class);
+suite.addTestSuite(TestRequest.class);
+// core
+suite.addTestSuite(TestStandardContext.class);
// ha.session
suite.addTestSuite(TestSerializablePrincipal.class);
// startup
suite.addTestSuite(TestTomcat.class);
+suite.addTestSuite(TestTomcatSSL.class);
+suite.addTestSuite(TestWebXml.class);
// tribes
// suite.addTest(TribesTestSuite.suite());
// o.a.el
suite.addTestSuite(TestELSupport.class);
suite.addTestSuite(TestELEvaluation.class);
+suite.addTestSuite(TestELInJsp.class);
+
+// o.a.jasper
+suite.addTestSuite(TestAttributeParser.class);
+suite.addTestSuite(TestGenerator.class);
+suite.addTestSuite(TestValidator.class);
// o.a.tomcat.util
// http
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48112] Closing curly brace in literal string incorrectly treated as expression terminator.
https://issues.apache.org/bugzilla/show_bug.cgi?id=48112 --- Comment #1 from Mark Thomas 2010-01-10 03:14:49 GMT --- This has been fixed in trunk and will be proposed for 6.0.x after further testing. -- 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
Re: svn commit: r897614 - in /tomcat/trunk/java/org/apache/jasper/compiler: AttributeParser.java Parser.java
On 10/01/2010 11:10, ma...@apache.org wrote: > Author: markt > Date: Sun Jan 10 11:10:36 2010 > New Revision: 897614 > > URL: http://svn.apache.org/viewvc?rev=897614&view=rev > Log: > Re-work EL attribute parsing. The TCK and new unit tests all pass with these changes. The unit tests should cover all the various EL parsing bugs we have seen in recent times although I will be double checking. If you see any gaps in the unit tests, please feel free to add additional tests. Non-committers can open a bugzilla (against Tomcat 7 please) and add a patch. My next task is to finish reviewing the EL Parser configuration against the spec. Once that is complete, I will create a patch for Tomcat 6 and, if it isn't too invasive, I will propose it as the fix for 48112 and 47413#c8. The final task will be to finish off the JSP 2.2 EL implementation. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r897619 - in /tomcat/trunk/test: org/apache/el/TestELInJsp.java webapp/bug36923.jsp
Author: markt
Date: Sun Jan 10 11:37:16 2010
New Revision: 897619
URL: http://svn.apache.org/viewvc?rev=897619&view=rev
Log:
Add a test case for bug36923
Added:
tomcat/trunk/test/webapp/bug36923.jsp (with props)
Modified:
tomcat/trunk/test/org/apache/el/TestELInJsp.java
Modified: tomcat/trunk/test/org/apache/el/TestELInJsp.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELInJsp.java?rev=897619&r1=897618&r2=897619&view=diff
==
--- tomcat/trunk/test/org/apache/el/TestELInJsp.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELInJsp.java Sun Jan 10 11:37:16 2010
@@ -30,6 +30,22 @@
*/
public class TestELInJsp extends TomcatBaseTest {
+public void testBug36923() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File("test/webapp");
+// app dir is relative to server home
+tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+tomcat.start();
+
+ByteChunk res = getUrl("http://localhost:"; + getPort() +
+"/test/bug36923.jsp");
+
+String result = res.toString();
+assertTrue(result.indexOf("00-${hello world}") > 0);
+}
+
public void testBug42565() throws Exception {
Tomcat tomcat = getTomcatInstance();
Added: tomcat/trunk/test/webapp/bug36923.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/bug36923.jsp?rev=897619&view=auto
==
--- tomcat/trunk/test/webapp/bug36923.jsp (added)
+++ tomcat/trunk/test/webapp/bug36923.jsp Sun Jan 10 11:37:16 2010
@@ -0,0 +1,24 @@
+<%--
+ 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.
+--%>
+<%@ page isELIgnored="true" %>
+
+ Bug 44994 test case
+
+00-${<%= "hello world" %>}
+
+
+
Propchange: tomcat/trunk/test/webapp/bug36923.jsp
--
svn:eol-style = native
Propchange: tomcat/trunk/test/webapp/bug36923.jsp
--
svn:keywords = Date Author Id Revision
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r897620 - /tomcat/trunk/java/org/apache/el/parser/AstEmpty.java
Author: markt
Date: Sun Jan 10 11:47:48 2010
New Revision: 897620
URL: http://svn.apache.org/viewvc?rev=897620&view=rev
Log:
Fix generics warnings
Modified:
tomcat/trunk/java/org/apache/el/parser/AstEmpty.java
Modified: tomcat/trunk/java/org/apache/el/parser/AstEmpty.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstEmpty.java?rev=897620&r1=897619&r2=897620&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstEmpty.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstEmpty.java Sun Jan 10 11:47:48
2010
@@ -51,10 +51,10 @@
return Boolean.valueOf(((String) obj).length() == 0);
} else if (obj instanceof Object[]) {
return Boolean.valueOf(((Object[]) obj).length == 0);
-} else if (obj instanceof Collection) {
-return Boolean.valueOf(((Collection) obj).isEmpty());
-} else if (obj instanceof Map) {
-return Boolean.valueOf(((Map) obj).isEmpty());
+} else if (obj instanceof Collection) {
+return Boolean.valueOf(((Collection) obj).isEmpty());
+} else if (obj instanceof Map) {
+return Boolean.valueOf(((Map) obj).isEmpty());
}
return Boolean.FALSE;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r897621 - /tomcat/trunk/test/org/apache/el/TestELEvaluation.java
Author: markt
Date: Sun Jan 10 11:54:34 2010
New Revision: 897621
URL: http://svn.apache.org/viewvc?rev=897621&view=rev
Log:
Rename
Modified:
tomcat/trunk/test/org/apache/el/TestELEvaluation.java
Modified: tomcat/trunk/test/org/apache/el/TestELEvaluation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELEvaluation.java?rev=897621&r1=897620&r2=897621&view=diff
==
--- tomcat/trunk/test/org/apache/el/TestELEvaluation.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELEvaluation.java Sun Jan 10 11:54:34
2010
@@ -82,6 +82,11 @@
assertEquals("false", evaluateExpression("${(true)and(false)}"));
}
+public void testBug48112() {
+// bug 48112
+assertEquals("{world}", evaluateExpression("${fn:trim('{world}')}"));
+}
+
public void testParserLiteralExpression() {
// Inspired by work on bug 45451, comments from kkolinko on the dev
// list and looking at the spec to find some edge cases
@@ -126,11 +131,6 @@
assertEquals("\"\\", evaluateExpression("${\"\\\"\"}"));
}
-public void testParserFunction() {
-// bug 48112
-assertEquals("{world}", evaluateExpression("${fn:trim('{world}')}"));
-}
-
private void compareBoth(String msg, int expected, Object o1, Object o2){
int i1 = ELSupport.compare(o1, o2);
int i2 = ELSupport.compare(o2, o1);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r897627 - /tomcat/trunk/test/org/apache/el/TestELEvaluation.java
Author: markt
Date: Sun Jan 10 12:44:31 2010
New Revision: 897627
URL: http://svn.apache.org/viewvc?rev=897627&view=rev
Log:
Add tests for a bug found whilst reviewing the ELParser
Modified:
tomcat/trunk/test/org/apache/el/TestELEvaluation.java
Modified: tomcat/trunk/test/org/apache/el/TestELEvaluation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELEvaluation.java?rev=897627&r1=897626&r2=897627&view=diff
==
--- tomcat/trunk/test/org/apache/el/TestELEvaluation.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELEvaluation.java Sun Jan 10 12:44:31
2010
@@ -21,6 +21,7 @@
import java.lang.reflect.Method;
import java.util.Date;
+import javax.el.ELException;
import javax.el.ValueExpression;
import javax.el.FunctionMapper;
@@ -115,10 +116,27 @@
// Inspired by work on bug 45451, comments from kkolinko on the dev
// list and looking at the spec to find some edge cases
-// '\' is only an escape character inside a StringLiteral
+// The only characters that can be escaped inside a String literal
+// are \ " and '. # and $ are not escaped inside a String literal.
assertEquals("\\", evaluateExpression("${''}"));
assertEquals("\\", evaluateExpression("${\"\"}"));
+assertEquals("\\\"'$#", evaluateExpression("${'\\\"\\'$#'}"));
+assertEquals("\\\"'$#", evaluateExpression("${\"\\\"\\'$#\"}"));
+
+// Trying to quote # or $ should throw an error
+Exception e = null;
+try {
+evaluateExpression("${'\\$'}");
+} catch (ELException el) {
+e = el;
+}
+assertNotNull(e);
+assertEquals("\\$", evaluateExpression("${'$'}"));
+assertEquals("$", evaluateExpression("${'$'}"));
+
+
+
// Can use ''' inside '"' when quoting with '"' and vice versa without
// escaping
assertEquals("\\\"", evaluateExpression("${'\"'}"));
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r897629 - /tomcat/trunk/java/org/apache/el/parser/ELParser.jjt
Author: markt
Date: Sun Jan 10 12:47:49 2010
New Revision: 897629
URL: http://svn.apache.org/viewvc?rev=897629&view=rev
Log:
Fix a bug found during review.
Whilst the old version is what is defined in the spec, the definition in the
spec does not agree with the description and associatedcomments in the spec. I
have raised this as https://uel.dev.java.net/issues/show_bug.cgi?id=10
Modify the parser on the basis that the textual description and comments in the
spec are correct and the production for StringLiteral is wrong
Modified:
tomcat/trunk/java/org/apache/el/parser/ELParser.jjt
Modified: tomcat/trunk/java/org/apache/el/parser/ELParser.jjt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParser.jjt?rev=897629&r1=897628&r2=897629&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/ELParser.jjt (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParser.jjt Sun Jan 10 12:47:49 2010
@@ -383,9 +383,9 @@
>
|< #EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+ >
|< STRING_LITERAL: ("\"" ((~["\"","\\"])
-| ("\\" ( ["\\","\""] )))* "\"")
+| ("\\" ( ["\\","\"","\'"] )))* "\"")
| ("\'" ((~["\'","\\"])
-| ("\\" ( ["\\","\'"] )))* "\'")
+| ("\\" ( ["\\","\"","\'"] )))* "\'")
>
|< BADLY_ESCAPED_STRING_LITERAL: ("\"" (~["\"","\\"])* ("\\" (
~["\\","\""] )))
| ("\'" (~["\'","\\"])* ("\\" ( ~["\\","\'"] )))
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r897631 - /tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java
Author: markt Date: Sun Jan 10 12:51:13 2010 New Revision: 897631 URL: http://svn.apache.org/viewvc?rev=897631&view=rev Log: Update generated code after r897629 Modified: tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java Modified: tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java?rev=897631&r1=897630&r2=897631&view=diff == --- tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java (original) +++ tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java Sun Jan 10 12:51:13 2010 @@ -832,7 +832,7 @@ jjCheckNAddStates(33, 35); break; case 20: - if (curChar == 34) + if ((0x84L & l) != 0L) jjCheckNAddStates(33, 35); break; case 21: @@ -856,7 +856,7 @@ jjCheckNAddStates(36, 38); break; case 28: - if (curChar == 39) + if ((0x84L & l) != 0L) jjCheckNAddStates(36, 38); break; case 29: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r897632 - /tomcat/trunk/java/org/apache/el/parser/AstString.java
Author: markt
Date: Sun Jan 10 12:52:20 2010
New Revision: 897632
URL: http://svn.apache.org/viewvc?rev=897632&view=rev
Log:
\$ and \# are not valid escapes. The Parser will throw an error before this
code is ever called but remove them anyway for clarity.
Modified:
tomcat/trunk/java/org/apache/el/parser/AstString.java
Modified: tomcat/trunk/java/org/apache/el/parser/AstString.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstString.java?rev=897632&r1=897631&r2=897632&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstString.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstString.java Sun Jan 10 12:52:20
2010
@@ -65,8 +65,7 @@
char c = image.charAt(i);
if (c == '\\' && i + 1 < size) {
char c1 = image.charAt(i + 1);
-if (c1 == '\\' || c1 == '"' || c1 == '\'' || c1 == '#'
-|| c1 == '$') {
+if (c1 == '\\' || c1 == '"' || c1 == '\'') {
c = c1;
i++;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r897635 - in /tomcat/trunk/java/org/apache/el/parser: AstIdentifier.java AstValue.java SimpleNode.java
Author: markt
Date: Sun Jan 10 13:11:52 2010
New Revision: 897635
URL: http://svn.apache.org/viewvc?rev=897635&view=rev
Log:
Fix the remaining Eclipse warnings in the non-generated classes
Modified:
tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java
tomcat/trunk/java/org/apache/el/parser/AstValue.java
tomcat/trunk/java/org/apache/el/parser/SimpleNode.java
Modified: tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java?rev=897635&r1=897634&r2=897635&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java Sun Jan 10
13:11:52 2010
@@ -91,6 +91,7 @@
ctx.getELResolver().setValue(ctx, null, this.image, value);
}
+@SuppressWarnings("unchecked")
@Override
public Object invoke(EvaluationContext ctx, Class[] paramTypes,
Object[] paramValues) throws ELException {
@@ -98,6 +99,7 @@
}
+@SuppressWarnings("unchecked")
@Override
public MethodInfo getMethodInfo(EvaluationContext ctx, Class[] paramTypes)
throws ELException {
Modified: tomcat/trunk/java/org/apache/el/parser/AstValue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstValue.java?rev=897635&r1=897634&r2=897635&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstValue.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstValue.java Sun Jan 10 13:11:52
2010
@@ -142,9 +142,11 @@
Class targetClass = resolver.getType(ctx, t.base, t.property);
if (COERCE_TO_ZERO == true
|| !isAssignable(value, targetClass)) {
-value = ELSupport.coerceToType(value, targetClass);
+resolver.setValue(ctx, t.base, t.property,
+ELSupport.coerceToType(value, targetClass));
+} else {
+resolver.setValue(ctx, t.base, t.property, value);
}
-resolver.setValue(ctx, t.base, t.property, value);
}
private boolean isAssignable(Object value, Class targetClass) {
@@ -159,6 +161,7 @@
}
+@SuppressWarnings("unchecked")
@Override
public MethodInfo getMethodInfo(EvaluationContext ctx, Class[] paramTypes)
throws ELException {
@@ -168,6 +171,7 @@
.getParameterTypes());
}
+@SuppressWarnings("unchecked")
@Override
public Object invoke(EvaluationContext ctx, Class[] paramTypes,
Object[] paramValues) throws ELException {
Modified: tomcat/trunk/java/org/apache/el/parser/SimpleNode.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/SimpleNode.java?rev=897635&r1=897634&r2=897635&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/SimpleNode.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/SimpleNode.java Sun Jan 10 13:11:52
2010
@@ -45,9 +45,11 @@
}
public void jjtOpen() {
+// NOOP by default
}
public void jjtClose() {
+// NOOP by default
}
public void jjtSetParent(Node n) {
@@ -151,11 +153,13 @@
}
}
+@SuppressWarnings("unchecked")
public Object invoke(EvaluationContext ctx, Class[] paramTypes,
Object[] paramValues) throws ELException {
throw new UnsupportedOperationException();
}
+@SuppressWarnings("unchecked")
public MethodInfo getMethodInfo(EvaluationContext ctx,
Class[] paramTypes) throws ELException {
throw new UnsupportedOperationException();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat-Lite update
On 08.01.2010 23:10, Yoav Shapira wrote: On Thu, Jan 7, 2010 at 8:29 AM, Konstantin Kolinko wrote: 2010/1/6 Mark Thomas: On 06/01/2010 00:27, Costin Manolache wrote: Also, I would like to know if other comitters are OK with (temporarily - i.e. until the 7.0 release vote) including lite in the tomcat7 builds, so people can try it out. How about adding it to the extras build? It could be included in the release then as well. Mark +1 for extras +1 for extras as well. Love the ideas. +1 Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r897635 - in /tomcat/trunk/java/org/apache/el/parser: AstIdentifier.java AstValue.java SimpleNode.java
On 10/01/2010, ma...@apache.org wrote:
> Author: markt
> Date: Sun Jan 10 13:11:52 2010
> New Revision: 897635
>
> URL: http://svn.apache.org/viewvc?rev=897635&view=rev
> Log:
> Fix the remaining Eclipse warnings in the non-generated classes
>
> Modified:
> tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java
> tomcat/trunk/java/org/apache/el/parser/AstValue.java
> tomcat/trunk/java/org/apache/el/parser/SimpleNode.java
>
> Modified: tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java?rev=897635&r1=897634&r2=897635&view=diff
>
> ==
> --- tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java (original)
> +++ tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java Sun Jan 10
> 13:11:52 2010
> @@ -91,6 +91,7 @@
> ctx.getELResolver().setValue(ctx, null, this.image, value);
> }
>
> +@SuppressWarnings("unchecked")
> @Override
> public Object invoke(EvaluationContext ctx, Class[] paramTypes,
> Object[] paramValues) throws ELException {
> @@ -98,6 +99,7 @@
> }
>
May I suggest that the annotation is applied to the parameter only,
and a comment added as to why it was used?
For example:
@Override
public Object invoke(EvaluationContext ctx,
@SuppressWarnings("unchecked") // Interface uses a raw type
Class[] paramTypes,
Object[] paramValues) throws ELException {
return this.getMethodExpression(ctx).invoke(ctx.getELContext(),
paramValues);
}
I can provide patches if you prefer.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r897728 - /tomcat/trunk/java/org/apache/el/parser/ELParser.jjt
Author: markt
Date: Sun Jan 10 23:03:13 2010
New Revision: 897728
URL: http://svn.apache.org/viewvc?rev=897728&view=rev
Log:
Remove the BADLY_ESCAPED_STRING_LITERAL - it could cause mistakes to be
silently swallowed
Modified:
tomcat/trunk/java/org/apache/el/parser/ELParser.jjt
Modified: tomcat/trunk/java/org/apache/el/parser/ELParser.jjt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParser.jjt?rev=897728&r1=897727&r2=897728&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/ELParser.jjt (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParser.jjt Sun Jan 10 23:03:13 2010
@@ -387,9 +387,6 @@
| ("\'" ((~["\'","\\"])
| ("\\" ( ["\\","\"","\'"] )))* "\'")
>
-|< BADLY_ESCAPED_STRING_LITERAL: ("\"" (~["\"","\\"])* ("\\" (
~["\\","\""] )))
-| ("\'" (~["\'","\\"])* ("\\" ( ~["\\","\'"] )))
->
|< TRUE : "true" >
|< FALSE : "false" >
|< NULL : "null" >
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r897729 - in /tomcat/trunk/java/org/apache/el/parser: ELParser.java ELParserConstants.java ELParserTokenManager.java
Author: markt
Date: Sun Jan 10 23:04:41 2010
New Revision: 897729
URL: http://svn.apache.org/viewvc?rev=897729&view=rev
Log:
Update generated code after r897728
Modified:
tomcat/trunk/java/org/apache/el/parser/ELParser.java
tomcat/trunk/java/org/apache/el/parser/ELParserConstants.java
tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java
Modified: tomcat/trunk/java/org/apache/el/parser/ELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParser.java?rev=897729&r1=897728&r2=897729&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/ELParser.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParser.java Sun Jan 10 23:04:41
2010
@@ -1486,9 +1486,9 @@
private boolean jj_3R_29() {
Token xsp;
xsp = jj_scanpos;
-if (jj_scan_token(28)) {
+if (jj_scan_token(27)) {
jj_scanpos = xsp;
-if (jj_scan_token(29)) return true;
+if (jj_scan_token(28)) return true;
}
return false;
}
@@ -1501,9 +1501,9 @@
private boolean jj_3R_28() {
Token xsp;
xsp = jj_scanpos;
-if (jj_scan_token(30)) {
+if (jj_scan_token(29)) {
jj_scanpos = xsp;
-if (jj_scan_token(31)) return true;
+if (jj_scan_token(30)) return true;
}
return false;
}
@@ -1511,9 +1511,9 @@
private boolean jj_3R_27() {
Token xsp;
xsp = jj_scanpos;
-if (jj_scan_token(24)) {
+if (jj_scan_token(23)) {
jj_scanpos = xsp;
-if (jj_scan_token(25)) return true;
+if (jj_scan_token(24)) return true;
}
return false;
}
@@ -1537,9 +1537,9 @@
private boolean jj_3R_26() {
Token xsp;
xsp = jj_scanpos;
-if (jj_scan_token(26)) {
+if (jj_scan_token(25)) {
jj_scanpos = xsp;
-if (jj_scan_token(27)) return true;
+if (jj_scan_token(26)) return true;
}
return false;
}
@@ -1577,9 +1577,9 @@
private boolean jj_3R_23() {
Token xsp;
xsp = jj_scanpos;
-if (jj_scan_token(34)) {
+if (jj_scan_token(33)) {
jj_scanpos = xsp;
-if (jj_scan_token(35)) return true;
+if (jj_scan_token(34)) return true;
}
return false;
}
@@ -1592,9 +1592,9 @@
private boolean jj_3R_22() {
Token xsp;
xsp = jj_scanpos;
-if (jj_scan_token(32)) {
+if (jj_scan_token(31)) {
jj_scanpos = xsp;
-if (jj_scan_token(33)) return true;
+if (jj_scan_token(32)) return true;
}
return false;
}
@@ -1612,9 +1612,9 @@
private boolean jj_3R_17() {
Token xsp;
xsp = jj_scanpos;
-if (jj_scan_token(38)) {
+if (jj_scan_token(37)) {
jj_scanpos = xsp;
-if (jj_scan_token(39)) return true;
+if (jj_scan_token(38)) return true;
}
return false;
}
@@ -1692,9 +1692,9 @@
private boolean jj_3R_15() {
Token xsp;
xsp = jj_scanpos;
-if (jj_scan_token(40)) {
+if (jj_scan_token(39)) {
jj_scanpos = xsp;
-if (jj_scan_token(41)) return true;
+if (jj_scan_token(40)) return true;
}
return false;
}
@@ -1809,9 +1809,9 @@
private boolean jj_3R_35() {
Token xsp;
xsp = jj_scanpos;
-if (jj_scan_token(36)) {
+if (jj_scan_token(35)) {
jj_scanpos = xsp;
-if (jj_scan_token(37)) return true;
+if (jj_scan_token(36)) return true;
}
if (jj_3R_30()) return true;
return false;
@@ -1847,9 +1847,9 @@
private boolean jj_3R_40() {
Token xsp;
xsp = jj_scanpos;
-if (jj_scan_token(50)) {
+if (jj_scan_token(49)) {
jj_scanpos = xsp;
-if (jj_scan_token(51)) return true;
+if (jj_scan_token(50)) return true;
}
return false;
}
@@ -1857,9 +1857,9 @@
private boolean jj_3R_39() {
Token xsp;
xsp = jj_scanpos;
-if (jj_scan_token(48)) {
+if (jj_scan_token(47)) {
jj_scanpos = xsp;
-if (jj_scan_token(49)) return true;
+if (jj_scan_token(48)) return true;
}
return false;
}
@@ -1916,10 +1916,10 @@
jj_la1_init_1();
}
private static void jj_la1_init_0() {
- jj_la1_0 = new int[]
{0xe,0xe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xff00,0xc00,0x300,0xc000,0x3000,0xff00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4eb00,0x12,0x4eb00,0x12,0x4,0x0,0x80,0x4eb00,0xeb00,0x6000,};
+ jj_la1_0 = new int[]
{0xe,0xe,0x0,0x0,0x0,0x0,0x8000,0x8000,0x0,0x8000,0x7f80,0x600,0x180,0x6000,0x1800,0x7f80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x27b00,0x9,0x27b00,0x9,0x2,0x0,0x40,0x27b00,0x7b00,0x3000,};
}
private static void jj_la1_init_1() {
- jj_la1_1 = new int[]
{0x0,0x0,0x300,0x300,0xc0,0xc0,0xf,0x3,0xc,0xf,0x0,0x0,0x0,0x0,0x0,0x0,0x6000,0x6000,0xf1000,0x3,0xc,0xf1000,0x30,0x104430,0x0,0x10,0x0,0x0,0x10,0x0,0x104430,0x0,0x0,};
+ jj_la1_1 = new int[]
{0x0,0x0,0x180,0x180,0x60,0x60,0x7,0x1,0x6,0x7,0x0,0x0,0x0,0x0,0x0,0x0,0x3000,0x3000,0x78800,0x18000,0x6,0x78
Bug report for Taglibs [2010/01/10]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |27717|New|Maj|2004-03-16| very slow in JSTL 1.1 | |33934|New|Cri|2005-03-09|[standard] memory leak in jstl c:set tag | |38193|Ass|Enh|2006-01-09|[RDC] BuiltIn Grammar support for Field | |38600|Ass|Enh|2006-02-10|[RDC] Enable RDCs to be used in X+V markup (X+RDC)| |42413|New|Nor|2007-05-14|[PATCH] Log Taglib enhancements | |43640|New|Nor|2007-10-16|Move the tests package to JUnit | |45197|Ass|Nor|2008-06-12|Need to support the JSTL 1.2 specification| |46052|New|Nor|2008-10-21|SetLocaleSupport is slow to initialize when many l| |48333|New|Nor|2009-12-02|TLD generator | +-+---+---+--+--+ | Total9 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat Connectors [2010/01/10]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |34526|Opn|Nor|2005-04-19|Truncated content in decompressed requests from mo| |35959|Opn|Enh|2005-08-01|mod_jk not independant of UseCanonicalName| |36155|Opn|Nor|2005-08-12|tomcat chooses wrong host if using mod_jk | |36169|New|Enh|2005-08-12|[PATCH] Enable chunked encoding for requests in II| |38895|New|Nor|2006-03-08|Http headers with an underscore "_" change into hy| |39967|Inf|Nor|2006-07-05|mod_jk gives segmentation fault when apache is sta| |40208|Inf|Nor|2006-08-08|Request-Dump when ErrorDocument in httpd.conf is a| |41170|Inf|Nor|2006-12-13|single crlf in header termination crashes app.| |41923|Opn|Nor|2007-03-21|Tomcat doesnt recognized client abort | |42366|Inf|Nor|2007-05-09|Memory leak in newer mod_jk version when connectio| |42554|Opn|Nor|2007-05-31|mod_ssl + mod_jk with status_worker does not work | |43303|New|Enh|2007-09-04|Versioning under Windows not reported by many conn| |43968|New|Enh|2007-11-26|[patch] support ipv6 with mod_jk | |44290|New|Nor|2008-01-24|mod_jk/1.2.26: retry is not useful for an importan| |44349|New|Maj|2008-02-04|mod_jk/1.2.26 module does not read worker.status.s| |44379|New|Enh|2008-02-07|convert the output of strftime into UTF-8 | |44454|New|Nor|2008-02-19|busy count reported in mod_jk inflated, causes inc| |44571|New|Enh|2008-03-10|Limits busy per worker to a threshold | |45063|New|Nor|2008-05-22|JK-1.2.26 IIS ISAPI filter issue when running diff| |45313|New|Nor|2008-06-30|mod_jk 1.2.26 & apache 2.2.9 static compiled on so| |45395|New|Min|2008-07-14|MsgAjp dump method does not dump packet when being| |46337|New|Nor|2008-12-04|real worker name is wrong | |46406|New|Enh|2008-12-16|Supporting relative paths in isapi_redirect.proper| |46503|New|Nor|2009-01-09|Garbage characters in cluster domain field| |46632|New|Nor|2009-01-29|mod_jk's sockets close prematurely when the server| |46676|New|Enh|2009-02-09|Configurable test request for Watchdog thread | |46767|New|Enh|2009-02-25|mod_jk to send DECLINED in case no fail-over tomca| |47038|New|Enh|2009-04-15|USE_FLOCK_LK redefined compiler warning when using| |47327|New|Enh|2009-06-07|remote_user not logged in apache logfile | |47617|New|Enh|2009-07-31|include time spent doing ajp_get_endpoint() in err| |47678|New|Nor|2009-08-11|Unable to allocate shared memory when using isapi_| |47679|New|Nor|2009-08-11|Not all headers get passed to Tomcat server from i| |47692|New|Blk|2009-08-12|Can not compile mod_jk with apache2.0.63 and tomca| |47714|New|Cri|2009-08-20|Reponse mixed between users | |47750|New|Maj|2009-08-27|Loss of worker settings when changing via jkstatus| |47795|New|Maj|2009-09-07|service sticky_session not being set correctly wit| |47840|New|Min|2009-09-14|A broken worker name is written in the log file. | |48169|New|Nor|2009-11-10|two second delay for cgi scripts mixed with mod_jk| |48191|New|Maj|2009-11-13|Problem with mod_jk 1.2.28 - Can not render up the| |48223|New|Nor|2009-11-18|IIS Logs HTTP status code 200 instead of error cod| |48490|New|Nor|2010-01-05|Changing a node to stopped in uriworkermap.propert| |48501|New|Enh|2010-01-07|Log rotation for ISAPI Redirector | |48513|New|Enh|2010-01-09|IIS Quick setup instructions | +-+---+---+--+--+ | Total 43 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat 7 [2010/01/10]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |48222|New|Enh|2009-11-18|Source JARs empty in maven central| |48240|New|Nor|2009-11-19|Tomcat-Lite missing @Override markers | |48268|New|Nor|2009-11-23|Patch to fix generics in tomcat-lite | |48297|New|Nor|2009-11-28|webservices.ServiceRefFactory.initHandlerChain add| |48358|New|Enh|2009-12-09|JSP-unloading reloaded| |48392|New|Cri|2009-12-15|jdbc-pool is not returning the proxied connection | |48414|New|Nor|2009-12-19|Use of Class.forName may not work well in osgi env| +-+---+---+--+--+ | Total7 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat 6 [2010/01/10]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |39661|Opn|Enh|2006-05-25|Please document JULI FileHandler configuration pro| |41128|Inf|Enh|2006-12-07|Reference to java Thread name from RequestProcesso| |41679|New|Enh|2007-02-22|SemaphoreValve should be able to filter on url pat| |41791|New|Enh|2007-03-07|Tomcat behaves inconsistently concerning flush-pac| |41883|Ass|Enh|2007-03-18|use abstract wrapper instead of plain X509Certific| |41944|New|Enh|2007-03-25|Start running the RAT tool to see where we're miss| |41992|New|Enh|2007-03-30|Need ability to set OS process title | |42463|New|Enh|2007-05-20|"crossContext" and classloader issues - pls amend | |43001|New|Enh|2007-07-30|JspC lacks setMappedFile and setDie for use in Ant| |43003|New|Enh|2007-07-30|Separate dependent component download and build ta| |43400|New|Enh|2007-09-14|enum support for tag libs | |43497|New|Enh|2007-09-26|Add ability to escape rendered output of JSP expre| |43548|Opn|Enh|2007-10-04|xml schema for tomcat-users.xml | |43642|New|Enh|2007-10-17|Add prestartminSpareThreads attribute for Executor| |43682|New|Enh|2007-10-23|JULI: web-inf/classes/logging.properties to suppor| |43742|New|Enh|2007-10-30|.tag compiles performed one at a time -- extremel| |43790|Ass|Enh|2007-11-03|concurrent access issue on TagHandlerPool | |43979|New|Enh|2007-11-27|Add abstraction for Java and Classfile output | |44047|New|Enh|2007-12-10|Provide a way for Tomcat to serve up error pages w| |44106|New|Enh|2007-12-19|autodeploy configures directories which do not con| |44199|New|Enh|2008-01-10|expose current backlog queue size | |44225|New|Enh|2008-01-14|SSL connector tries to load the private keystore f| |44264|New|Enh|2008-01-18|Clustering - Support for disabling multicasting an| |44265|New|Enh|2008-01-18|Improve JspWriterImpl performance with "inline" su| |44284|New|Enh|2008-01-23|Support java.lang.Iterable in c:forEach tag | |44294|New|Enh|2008-01-25|Support for EL functions with varargs | |44299|New|Enh|2008-01-26|Provider manager app with a log out button| |44312|New|Enh|2008-01-28|Warn when overwritting docBase of the default Host| |44598|New|Enh|2008-03-13|JAASRealm is suppressing Exceptions | |44645|New|Enh|2008-03-20|[Patch] JNDIRealm - Doesn't support JNDI "java.nam| |44787|New|Enh|2008-04-09|provide more error context on "java.lang.IllegalSt| |44818|New|Enh|2008-04-13|tomcat hangs with GET when content-length is defin| |45014|New|Enh|2008-05-15|Request and Response classes should have wrappers | |45282|New|Enh|2008-06-25|NioReceiver doesn't close cleanly, leaving sockets| |45283|Opn|Enh|2008-06-25|Allow multiple authenticators to be added to pipel| |45428|New|Enh|2008-07-18|warn if the tomcat stop doesn't complete | |45654|New|Enh|2008-08-19|use static methods and attributes in a direct way!| |45731|New|Enh|2008-09-02|Enhancement request : pluggable httpsession cache | |45794|New|Enh|2008-09-12|Patch causes JNDIRealm to bind with user entered c| |45832|New|Enh|2008-09-18|add DIGEST authentication support to Ant tasks| |45871|New|Enh|2008-09-23|Support for salted and digested patches in DataSou| |45878|New|Enh|2008-09-24|Generated jars do not contain proper manifests or | |45879|Opn|Enh|2008-09-24|Windows installer fails to install NOTICE and RELE| |45931|Opn|Enh|2008-10-01|trimSpaces incorrectly modifies output| |45995|New|Enh|2008-10-13|RFE - MIME type extension not case sensitive | |46173|New|Enh|2008-11-09|Small patch for manager app: Setting an optional c| |46263|New|Enh|2008-11-21|Tomcat reloading of context does not update contex| |46264|New|Enh|2008-11-21|Shutting down tomcat with large number of contexts| |46284|New|Enh|2008-11-24|Add flag to DeltaManager that blocks processing cl| |46323|New|Enh|2008-12-02|NTLM Authentication for Microsoft Active Directory| |46350|New|Enh|2008-12-05|Maven repository should contain source bundles| |46451|
Bug report for Tomcat 5 [2010/01/10]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |27122|Opn|Enh|2004-02-20|IE plugins cannot access components through Tomcat| |28039|Opn|Enh|2004-03-30|Cluster Support for SingleSignOn | |29494|Inf|Enh|2004-06-10|No way to set PATH when running as a service on Wi| |33262|Inf|Enh|2005-01-27|Service Manager autostart should check for adminis| |33453|Opn|Enh|2005-02-08|Jasper should recompile JSP files whose datestamps| |33671|Opn|Enh|2005-02-21|Manual Windows service installation with custom na| |34801|New|Enh|2005-05-08|PATCH: CGIServlet does not terminate child after a| |34805|Ass|Enh|2005-05-08|warn about invalid security constraint url pattern| |34868|Ass|Enh|2005-05-11|allow to register a trust store for a session that| |35054|Inf|Enh|2005-05-25|warn if appBase is not existing as a File or direc| |36133|Inf|Enh|2005-08-10|Support JSS SSL implementation| |36362|New|Enh|2005-08-25|missing check for Java reserved keywords in tag fi| |36569|Inf|Enh|2005-09-09|Redirects produce illegal URL's | |36837|Inf|Enh|2005-09-28|Looking for ProxyHandler implementation of Http re| |36922|Inf|Enh|2005-10-04|setup.sh file mis-advertised and missing | |37018|Ass|Enh|2005-10-11|Document how to use tomcat-SSL with a pkcs11 token| |37334|Inf|Enh|2005-11-02|Realm digest property not aligned with the adminis| |37449|Opn|Enh|2005-11-10|Two UserDatabaseRealm break manager user | |37485|Inf|Enh|2005-11-14|I'd like to run init SQL after JDBC Connection cre| |37847|Ass|Enh|2005-12-09|Allow User To Optionally Specify Catalina Output F| |38216|Inf|Enh|2006-01-10|Extend Jmxproxy to allow call of MBean Operations | |38268|Inf|Enh|2006-01-13|User friendly: Need submit button on adding/deleti| |38360|Inf|Enh|2006-01-24|Domain for session cookies| |38546|Inf|Enh|2006-02-07|Google bot sends invalid If-Modifed-Since Header, | |38577|Inf|Enh|2006-02-08|Enhance logging of security failures | |38743|New|Min|2006-02-21|when using APR, JKS options are silently ignored | |38916|Inf|Enh|2006-03-10|HttpServletRequest cannot handle multipart request| |39053|Inf|Enh|2006-03-21|include Tomcat embedded sample| |39309|Opn|Enh|2006-04-14|tomcat can't compile big jsp, hitting a compiler l| |39740|New|Enh|2006-06-07|semi-colon ; isn't allowed as a query argument sep| |39862|Inf|Enh|2006-06-22|provide support for protocol-independent GenericSe| |40211|Inf|Enh|2006-08-08|Compiled JSP don't indent HTML code | |40218|New|Enh|2006-08-08|JNDI realm - recursive group/role matching| |40222|Inf|Enh|2006-08-09|Default Tomcat configuration alows easy session hi| |40402|New|Enh|2006-09-03|Manager should display Exceptions | |40510|New|Enh|2006-09-14|installer does not create shortcuts for all users | |40712|New|Enh|2006-10-10|Realm admin error.| |40728|Inf|Enh|2006-10-11|Catalina MBeans use non-serializable classes | |40766|New|Enh|2006-10-16|Using an unsecure jsessionid with mod_proxy_ajp ov| |40881|Opn|Enh|2006-11-02|Unable to receive message through TCP channel -> | |41007|Opn|Enh|2006-11-20|Can't define customized 503 error page| |41179|New|Enh|2006-12-15|400 Bad Request response during auto re-deployment| |41227|Opn|Enh|2006-12-21|When the jasper compiler fails to compile a JSP, i| |41337|Opn|Enh|2007-01-10|Display an error page if no cert is available on C| |41496|New|Enh|2007-01-30|set a security provider for jsse in a connector co| |41498|New|Enh|2007-01-30|allRolesMode Realm configuration option not docume| |41539|Inf|Enh|2007-02-05|NullPointerException during Embedded tomcat restar| |41673|New|Enh|2007-02-21|Jasper output the message of compiling error using| |41697|Ver|Enh|2007-02-25|make visible in debug output if charset from brows| |41709|Inf|Enh|2007-02-26|When calling the API that relates to the buffer af| |41718|New|Enh|2007-02-27|Status 302 response to GET request has no body whe| |42390|
Bug report for Tomcat Native [2010/01/10]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |38372|Inf|Cri|2006-01-25|tcnative-1.dll response overflow corruption, parti| |41361|New|Nor|2007-01-14|Content lost when read by a slow client. | |42090|New|Cri|2007-04-11|tcnative badly handles some OpenSSL disconnections| |45392|New|Nor|2008-07-14|No OCSP support for client SSL verification | |46041|New|Cri|2008-10-20|Tomcat service is terminated unexpectedly (tcnativ| |46179|New|Maj|2008-11-10|apr ssl client authentication | |46571|New|Nor|2009-01-21|tcnative blocks in APR poll on Solaris| |47319|New|Nor|2009-06-05|With APR, getRemoteHost() returns NULL for unknown| |47851|New|Nor|2009-09-16|thread-safety issues in the TC native Java code | |48253|New|Min|2009-11-20|Tomcat Native patch - adding dynamic locking callb| +-+---+---+--+--+ | Total 10 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "HowTo" by mohamed omar sheriff
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "HowTo" page has been changed by mohamed omar sheriff.
http://wiki.apache.org/tomcat/HowTo?action=diff&rev1=82&rev2=83
--
* Use a `ResourceBundle`. See the Java docs for the specifics of how the
`ResourceBundle` class works. Using this method, the properties file must go
into the `WEB-INF/classes` directory or in a jar file contained in the
`WEB-INF/lib` directory.
- * Another way is to use the method `getResourceAsStream()` from the
`ServletContext` class. This allows you update the file without having to
reload the webapp as required by the first method. Here is an example code
snippet, without any error trapping:
+ * Another way is to use the method `getResourceAsStream()` from the
`ServletContext` class. This allows you update the file without having to
reload the webapp as required by the first method. Here is an example code
snippet, without any error trapping: {{{ // Assuming you are in a Servlet
extending HttpServlet
- {{{ // Assuming you are in a Servlet extending HttpServlet
. // This will look for a file called "/more/cowbell.properties" relative
// to your servlet Root Context
InputStream is =
getServletContext().getResourceAsStream("/more/cowbell.properties"); Properties
p = new Properties(); p.load(is); is.close(); }}}
@@ -861, +860 @@
Edit your service to add the "//MS//" option to the command line. This
enabled the "Monitor Service" which puts an icon in the system tray while
Tomcat is running. Right-clicking the Tomcat monitor in the system tray allows
you to produce a thread dump in stdout.
=== If you have Tomcat running in a console ===
- *NIX: Press CRTL-\ Microsoft Windows: press CRTL-BREAK
+ *NIX: Press CRTL-\
Microsoft Windows: press CRTL-BREAK
- This will produce a thread dump on standard output, but may not be possible
to capture to a file.
+ This will produce a
thread dump on standard output, but may not be possible to capture to a file.
- '''HOW to load the
jars in order'''
+ . '''How to load my jars in
order'''
-
+ .
- '''How to load my
jars with tomcat classpath without adding in tomcat classpath.sh '''
+ . ''' How to load my jars with
tomcat classpath without adding in tomcat classpath.sh '''
-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r897772 - /tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
Author: mturk Date: Mon Jan 11 07:04:06 2010 New Revision: 897772 URL: http://svn.apache.org/viewvc?rev=897772&view=rev Log: Add note about windows .rc files fix Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=897772&r1=897771&r2=897772&view=diff == --- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Mon Jan 11 07:04:06 2010 @@ -39,6 +39,9 @@ + Update windows resource files to correct version. (mturk) + + 48129: Fix build with OpenSSL 1.0.0-beta3. Patch provided by Tomas Mraz. (mturk, rjung) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r897773 - /tomcat/site/trunk/xdocs/download-native.xml
Author: mturk Date: Mon Jan 11 07:07:54 2010 New Revision: 897773 URL: http://svn.apache.org/viewvc?rev=897773&view=rev Log: Update to released 1.1.19 Modified: tomcat/site/trunk/xdocs/download-native.xml Modified: tomcat/site/trunk/xdocs/download-native.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-native.xml?rev=897773&r1=897772&r2=897773&view=diff == --- tomcat/site/trunk/xdocs/download-native.xml (original) +++ tomcat/site/trunk/xdocs/download-native.xml Mon Jan 11 07:07:54 2010 @@ -49,28 +49,28 @@ Source (please choose the correct format for your platform) - -Native 1.1.18 Source Release tar.gz + +Native 1.1.19 Source Release tar.gz (e.g. Unix, Linux, Mac OS) -[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.18/source/tomcat-native-1.1.18-src.tar.gz.asc";>PGP] +[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.19/source/tomcat-native-1.1.19-src.tar.gz.asc";>PGP] -[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.18/source/tomcat-native-1.1.18-src.tar.gz.md5";>MD5] +[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.19/source/tomcat-native-1.1.19-src.tar.gz.md5";>MD5] - -Native 1.1.18 Source Release zip + +Native 1.1.19 Source Release zip (e.g. Windows) -[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.18/source/tomcat-native-1.1.18-win32-src.zip.asc";>PGP] +[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.19/source/tomcat-native-1.1.19-win32-src.zip.asc";>PGP] -[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.18/source/tomcat-native-1.1.18-win32-src.zip.md5";>MD5] +[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.19/source/tomcat-native-1.1.19-win32-src.zip.md5";>MD5] @@ -79,7 +79,7 @@ You can find binaries release too You may download them from - HERE + HERE @@ -98,17 +98,17 @@ % pgpk -a KEYS -% pgpv tomcat-native-1.1.18-src.tar.gz.asc +% pgpv tomcat-native-1.1.19-src.tar.gz.asc or % pgp -ka KEYS -% pgp tomcat-native-1.1.18-src.tar.gz.asc +% pgp tomcat-native-1.1.19-src.tar.gz.asc or % gpg --import KEYS -% gpg --verify tomcat-native-1.1.18-src.tar.gz.asc +% gpg --verify tomcat-native-1.1.19-src.tar.gz.asc Alternatively, you can verify the MD5 signature (hash value) on the files. @@ -131,3 +131,4 @@ + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r897776 - /tomcat/trunk/build.properties.default
Author: mturk
Date: Mon Jan 11 07:14:16 2010
New Revision: 897776
URL: http://svn.apache.org/viewvc?rev=897776&view=rev
Log:
By default use released 1.1.19
Modified:
tomcat/trunk/build.properties.default
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=897776&r1=897775&r2=897776&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Jan 11 07:14:16 2010
@@ -65,7 +65,7 @@
jdt.loc=http://archive.eclipse.org/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
# - Tomcat native library -
-tomcat-native.version=1.1.18
+tomcat-native.version=1.1.19
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] New committer: Tim Whittington
On behalf of the Tomcat committers I am pleased to announce that Tim Whittington has been voted in as a new Tomcat committer. Please join me in welcoming him. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
