Author: markt Date: Thu Aug 6 18:19:02 2015 New Revision: 1694549 URL: http://svn.apache.org/r1694549 Log: Fix the second part of this bug - El and imports for tag files.
Added: tomcat/tc8.0.x/trunk/test/webapp/WEB-INF/tags/bug58178b.tag - copied unchanged from r1694548, tomcat/trunk/test/webapp/WEB-INF/tags/bug58178b.tag tomcat/tc8.0.x/trunk/test/webapp/bug5nnnn/bug58178b.jsp - copied unchanged from r1694548, tomcat/trunk/test/webapp/bug5nnnn/bug58178b.jsp Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Generator.java tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java tomcat/tc8.0.x/trunk/test/org/apache/jasper/runtime/TestJspContextWrapper.java tomcat/tc8.0.x/trunk/test/webapp/WEB-INF/tags/bug58178.tag tomcat/tc8.0.x/trunk/test/webapp/bug5nnnn/bug58178.jsp tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 6 18:19:02 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1666637,1666649,1 666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685739,1685744,1685772,1685816,1685826,1685891,168724 2,1687261,1687268,1687340,1688563,1688841,1688878,1688885,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1666637,1666649,1 666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685739,1685744,1685772,1685816,1685826,1685891,168724 2,1687261,1687268,1687340,1688563,1688841,1688878,1688885,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548 Modified: tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Generator.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1694549&r1=1694548&r2=1694549&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Generator.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Thu Aug 6 18:19:02 2015 @@ -3631,13 +3631,14 @@ class Generator { out.printin("public final class "); out.println(className); out.printil(" extends javax.servlet.jsp.tagext.SimpleTagSupport"); - out.printin(" implements org.apache.jasper.runtime.JspSourceDependent"); + out.printin(" implements org.apache.jasper.runtime.JspSourceDependent,"); + out.println(); + out.printin(" org.apache.jasper.runtime.JspSourceImports"); if (tagInfo.hasDynamicAttributes()) { out.println(","); out.printin(" javax.servlet.jsp.tagext.DynamicAttributes"); } out.println(" {"); - out.println(); out.pushIndent(); /* @@ -3906,9 +3907,9 @@ class Generator { out.println(");"); } if (aliasSeen) { - out.printil("this.jspContext = new org.apache.jasper.runtime.JspContextWrapper(ctx, _jspx_nested, _jspx_at_begin, _jspx_at_end, aliasMap);"); + out.printil("this.jspContext = new org.apache.jasper.runtime.JspContextWrapper(this, ctx, _jspx_nested, _jspx_at_begin, _jspx_at_end, aliasMap);"); } else { - out.printil("this.jspContext = new org.apache.jasper.runtime.JspContextWrapper(ctx, _jspx_nested, _jspx_at_begin, _jspx_at_end, null);"); + out.printil("this.jspContext = new org.apache.jasper.runtime.JspContextWrapper(this, ctx, _jspx_nested, _jspx_at_begin, _jspx_at_end, null);"); } out.popIndent(); out.printil("}"); Modified: tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java?rev=1694549&r1=1694548&r2=1694549&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java Thu Aug 6 18:19:02 2015 @@ -26,6 +26,7 @@ import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Set; import javax.el.ELContext; import javax.el.ELResolver; @@ -47,6 +48,7 @@ import javax.servlet.jsp.el.ELException; import javax.servlet.jsp.el.ExpressionEvaluator; import javax.servlet.jsp.el.VariableResolver; import javax.servlet.jsp.tagext.BodyContent; +import javax.servlet.jsp.tagext.JspTag; import javax.servlet.jsp.tagext.VariableInfo; import org.apache.jasper.compiler.Localizer; @@ -66,6 +68,8 @@ import org.apache.jasper.compiler.Locali @SuppressWarnings("deprecation") // Have to support old JSP EL API public class JspContextWrapper extends PageContext implements VariableResolver { + private final JspTag jspTag; + // Invoking JSP context private final PageContext invokingJspCtxt; @@ -90,9 +94,10 @@ public class JspContextWrapper extends P private final PageContext rootJspCtxt; - public JspContextWrapper(JspContext jspContext, + public JspContextWrapper(JspTag jspTag, JspContext jspContext, ArrayList<String> nestedVars, ArrayList<String> atBeginVars, ArrayList<String> atEndVars, Map<String,String> aliases) { + this.jspTag = jspTag; this.invokingJspCtxt = (PageContext) jspContext; if (jspContext instanceof JspContextWrapper) { rootJspCtxt = ((JspContextWrapper)jspContext).rootJspCtxt; @@ -502,7 +507,7 @@ public class JspContextWrapper extends P @Override public ELContext getELContext() { if (elContext == null) { - elContext = new ELContextWrapper(rootJspCtxt.getELContext(), this); + elContext = new ELContextWrapper(rootJspCtxt.getELContext(), jspTag, this); } return elContext; } @@ -511,10 +516,13 @@ public class JspContextWrapper extends P static class ELContextWrapper extends ELContext { private final ELContext wrapped; + private final JspTag jspTag; private final PageContext pageContext; + private ImportHandler importHandler; - private ELContextWrapper(ELContext wrapped, PageContext pageContext) { + private ELContextWrapper(ELContext wrapped, JspTag jspTag, PageContext pageContext) { this.wrapped = wrapped; + this.jspTag = jspTag; this.pageContext = pageContext; } @@ -552,7 +560,25 @@ public class JspContextWrapper extends P @Override public ImportHandler getImportHandler() { - return wrapped.getImportHandler(); + if (importHandler == null) { + importHandler = new ImportHandler(); + if (jspTag instanceof JspSourceImports) { + Set<String> packageImports = ((JspSourceImports) jspTag).getPackageImports(); + if (packageImports != null) { + for (String packageImport : packageImports) { + importHandler.importPackage(packageImport); + } + } + Set<String> classImports = ((JspSourceImports) jspTag).getClassImports(); + if (classImports != null) { + for (String classImport : classImports) { + importHandler.importClass(classImport); + } + } + } + + } + return importHandler; } @Override Modified: tomcat/tc8.0.x/trunk/test/org/apache/jasper/runtime/TestJspContextWrapper.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/jasper/runtime/TestJspContextWrapper.java?rev=1694549&r1=1694548&r2=1694549&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/jasper/runtime/TestJspContextWrapper.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/jasper/runtime/TestJspContextWrapper.java Thu Aug 6 18:19:02 2015 @@ -1,12 +1,33 @@ +/* + * 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.runtime; +import java.math.BigDecimal; +import java.util.Collections; + +import javax.servlet.DispatcherType; import javax.servlet.http.HttpServletResponse; -import org.apache.catalina.startup.TomcatBaseTest; -import org.apache.tomcat.util.buf.ByteChunk; import org.junit.Assert; import org.junit.Test; +import org.apache.catalina.startup.TomcatBaseTest; +import org.apache.tomcat.util.buf.ByteChunk; + public class TestJspContextWrapper extends TomcatBaseTest { @Test @@ -24,7 +45,25 @@ public class TestJspContextWrapper exten Assert.assertTrue(result, result.contains("PASS")); } - public void testELTagFileImports() { + @Test + public void testELTagFileImports() throws Exception { + getTomcatInstanceTestWebapp(false, true); + + ByteChunk out = new ByteChunk(); + + int rc = getUrl("http://localhost:" + getPort() + "/test/bug5nnnn/bug58178b.jsp", out, null); + + Assert.assertEquals(HttpServletResponse.SC_OK, rc); + + String result = out.toString(); + Assert.assertTrue(result, result.contains("00-" + DispatcherType.ASYNC)); + // No obvious status fields for javax.servlet.http + // Could hack something with HttpUtils... + // No obvious status fields for javax.servlet.jsp + // Wild card (package) import + Assert.assertTrue(result, result.contains("01-" + BigDecimal.ROUND_UP)); + // Class import + Assert.assertTrue(result, result.contains("02-" + Collections.EMPTY_LIST.size())); } } Modified: tomcat/tc8.0.x/trunk/test/webapp/WEB-INF/tags/bug58178.tag URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/webapp/WEB-INF/tags/bug58178.tag?rev=1694549&r1=1694548&r2=1694549&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/webapp/WEB-INF/tags/bug58178.tag (original) +++ tomcat/tc8.0.x/trunk/test/webapp/WEB-INF/tags/bug58178.tag Thu Aug 6 18:19:02 2015 @@ -1,9 +1,25 @@ +<%-- + 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. +--%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <c:catch var="error"> <jsp:doBody/> </c:catch> - + <c:if test="${error != null}"> <p>PASS<br/> Error detected<br/> Modified: tomcat/tc8.0.x/trunk/test/webapp/bug5nnnn/bug58178.jsp URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/webapp/bug5nnnn/bug58178.jsp?rev=1694549&r1=1694548&r2=1694549&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/webapp/bug5nnnn/bug58178.jsp (original) +++ tomcat/tc8.0.x/trunk/test/webapp/bug5nnnn/bug58178.jsp Thu Aug 6 18:19:02 2015 @@ -1,3 +1,19 @@ +<%-- + 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. +--%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1694549&r1=1694548&r2=1694549&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Aug 6 18:19:02 2015 @@ -152,6 +152,11 @@ file's <code>PageContext</code> rather than that of the containing page. (markt) </fix> + <fix> + Following on from the fix for <bug>58178</bug>, expressions in a tag + file should use the tag file's improts rather than those of the + containing page. (markt) + </fix> </changelog> </subsection> <subsection name="WebSocket"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org