[Bug 60461] SIGSEGV in SSLSocket.getInfos
https://bz.apache.org/bugzilla/show_bug.cgi?id=60461 --- Comment #25 from Thomas --- I can try to compile my own version of the tcnative library. -- 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: r1797516 - in /tomcat/trunk: java/org/apache/tomcat/websocket/LocalStrings.properties webapps/docs/changelog.xml
Author: rjung
Date: Sat Jun 3 16:04:14 2017
New Revision: 1797516
URL: http://svn.apache.org/viewvc?rev=1797516&view=rev
Log:
Correct the log message when a MessageHandler for
PongMessage does not implement MessageHandler.Whole.
Changing MessageHandler.Basic to MessageHandler.Whole
in the log message.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1797516&r1=1797515&r2=1797516&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties Sat
Jun 3 16:04:14 2017
@@ -105,7 +105,7 @@ wsSession.doClose=Closing WebSocket sess
wsSession.duplicateHandlerBinary=A binary message handler has already been
configured
wsSession.duplicateHandlerPong=A pong message handler has already been
configured
wsSession.duplicateHandlerText=A text message handler has already been
configured
-wsSession.invalidHandlerTypePong=A pong message handler must implement
MessageHandler.Basic
+wsSession.invalidHandlerTypePong=A pong message handler must implement
MessageHandler.Whole
wsSession.flushFailOnClose=Failed to flush batched messages on session close
wsSession.messageFailed=Unable to write the complete message as the WebSocket
connection has been closed
wsSession.sendCloseFail=Failed to send close message for session [{0}] to
remote endpoint
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1797516&r1=1797515&r2=1797516&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sat Jun 3 16:04:14 2017
@@ -110,6 +110,15 @@
+
+
+
+Correct the log message when a MessageHandler for
+PongMessage does not implement
+MessageHandler.Whole. (rjung)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1797521 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/websocket/LocalStrings.properties webapps/docs/changelog.xml
Author: rjung Date: Sat Jun 3 17:03:56 2017 New Revision: 1797521 URL: http://svn.apache.org/viewvc?rev=1797521&view=rev Log: Correct the log message when a MessageHandler for PongMessage does not implement MessageHandler.Whole. Changing MessageHandler.Basic to MessageHandler.Whole in the log message. Backport of r1797516 from trunk. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jun 3 17:03:56 2017 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747 536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1 756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,176216 8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763
svn commit: r1797523 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/websocket/LocalStrings.properties webapps/docs/changelog.xml
Author: rjung Date: Sat Jun 3 17:07:03 2017 New Revision: 1797523 URL: http://svn.apache.org/viewvc?rev=1797523&view=rev Log: Correct the log message when a MessageHandler for PongMessage does not implement MessageHandler.Whole. Changing MessageHandler.Basic to MessageHandler.Whole in the log message. Backport of r1797516 from trunk resp r1797521 from tc8.5.x. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jun 3 17:07:03 2017 @@ -1,2 +1,2 @@ -/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,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,1649973,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,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,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,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,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-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,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,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1
svn commit: r1797525 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/LocalStrings.properties webapps/docs/changelog.xml
Author: rjung Date: Sat Jun 3 17:17:03 2017 New Revision: 1797525 URL: http://svn.apache.org/viewvc?rev=1797525&view=rev Log: Correct the log message when a MessageHandler for PongMessage does not implement MessageHandler.Whole. Changing MessageHandler.Basic to MessageHandler.Whole in the log message. Backport of r1797516 from trunk resp r1797521 from tc8.5.x resp. r1797523 from tc8.0.x. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jun 3 17:17:03 2017 @@ -1,3 +1,3 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702 742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1 726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906 -/tomcat/tc8.5.x/trunk:1735579,1736839,1737199,1737966,1738042,1738044,1738162,1738165,1738178,1739157,1739173,1739177,1739476,1740132,1740521,1740536,1740804,1740811,1740981,1741165,1741174,1741182,1741191,1741203,1741209,1741226,1741233,1741410,1742277,1743118,1743126,1743139-1743140,1743718,1743722,1743724,17440
svn commit: r1797527 - /tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
Author: markt
Date: Sat Jun 3 19:38:21 2017
New Revision: 1797527
URL: http://svn.apache.org/viewvc?rev=1797527&view=rev
Log:
Remove commented out code. Tomcat doesn't support something to JSP.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java?rev=1797527&r1=1797526&r2=1797527&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java Sat Jun 3
19:38:21 2017
@@ -79,22 +79,6 @@ public class SmapUtil {
// set up our SMAP generator
SmapGenerator g = new SmapGenerator();
-/** Disable reading of input SMAP because:
-1. There is a bug here: getRealPath() is null if .jsp is in a jar
- Bugzilla 14660.
-2. Mappings from other sources into .jsp files are not supported.
-TODO: fix 1. if 2. is not true.
-// determine if we have an input SMAP
-String smapPath = inputSmapPath(ctxt.getRealPath(ctxt.getJspFile()));
-File inputSmap = new File(smapPath);
-if (inputSmap.exists()) {
-byte[] embeddedSmap = null;
-byte[] subSmap = SDEInstaller.readWhole(inputSmap);
-String subSmapString = new String(subSmap, SMAP_ENCODING);
-g.addSmap(subSmapString, "JSP");
-}
-**/
-
// now, assemble info about our own stratum (JSP) using JspLineMap
SmapStratum s = new SmapStratum("JSP");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1797528 - /tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
Author: markt
Date: Sat Jun 3 19:43:29 2017
New Revision: 1797528
URL: http://svn.apache.org/viewvc?rev=1797528&view=rev
Log:
Deprecated unused code.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java?rev=1797528&r1=1797527&r2=1797528&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java Sat Jun 3
19:43:29 2017
@@ -100,7 +100,10 @@ public class SmapGenerator {
* SMAPs or not. Intended for situations without an SMAP resolver.
*
* @param status If false, ignore any embedded SMAPs.
+ *
+ * @deprecated Unused. Will be removed in Tomcat 9.0.x
*/
+@Deprecated
public void setDoEmbedded(boolean status) {
doEmbedded = status;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1797529 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/jasper/compiler/SmapGenerator.java
Author: markt Date: Sat Jun 3 19:44:34 2017 New Revision: 1797529 URL: http://svn.apache.org/viewvc?rev=1797529&view=rev Log: Deprecate unused code Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/SmapGenerator.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jun 3 19:44:34 2017 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747 536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1 756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,176216 8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1763810,1763813,17638
svn commit: r1797530 - /tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
Author: markt
Date: Sat Jun 3 19:45:25 2017
New Revision: 1797530
URL: http://svn.apache.org/viewvc?rev=1797530&view=rev
Log:
Remove unused code
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java?rev=1797530&r1=1797529&r2=1797530&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java Sat Jun 3
19:45:25 2017
@@ -49,7 +49,6 @@ public class SmapGenerator {
private String defaultStratum = "Java";
private final List strata = new ArrayList<>();
private final List embedded = new ArrayList<>();
-private boolean doEmbedded = true;
//*
// Methods for adding mapping data
@@ -95,18 +94,6 @@ public class SmapGenerator {
+ "*C " + stratumName + "\n");
}
-/**
- * Instructs the SmapGenerator whether to actually print any embedded
- * SMAPs or not. Intended for situations without an SMAP resolver.
- *
- * @param status If false, ignore any embedded SMAPs.
- *
- * @deprecated Unused. Will be removed in Tomcat 9.0.x
- */
-@Deprecated
-public void setDoEmbedded(boolean status) {
-doEmbedded = status;
-}
//*
// Methods for serializing the logical SMAP
@@ -123,11 +110,9 @@ public class SmapGenerator {
out.append(defaultStratum + '\n');
// include embedded SMAPs
-if (doEmbedded) {
-int nEmbedded = embedded.size();
-for (int i = 0; i < nEmbedded; i++) {
-out.append(embedded.get(i));
-}
+int nEmbedded = embedded.size();
+for (int i = 0; i < nEmbedded; i++) {
+out.append(embedded.get(i));
}
// print our StratumSections, FileSections, and LineSections
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1797531 - in /tomcat/trunk: java/org/apache/jasper/compiler/SmapGenerator.java test/org/apache/jasper/compiler/TestSmapGenerator.java
Author: markt
Date: Sat Jun 3 20:07:09 2017
New Revision: 1797531
URL: http://svn.apache.org/viewvc?rev=1797531&view=rev
Log:
Move test code to Unit test
Remove testing of embedded SMAPs since only the test code uses this (so I want
to remove it in 9.0.x)
Added:
tomcat/trunk/test/org/apache/jasper/compiler/TestSmapGenerator.java (with
props)
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java?rev=1797531&r1=1797530&r2=1797531&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java Sat Jun 3
20:07:09 2017
@@ -130,32 +130,4 @@ public class SmapGenerator {
@Override
public String toString() { return getString(); }
-
-//*
-// For testing (and as an example of use)...
-
-public static void main(String args[]) {
-SmapGenerator g = new SmapGenerator();
-g.setOutputFileName("foo.java");
-SmapStratum s = new SmapStratum("JSP");
-s.addFile("foo.jsp");
-s.addFile("bar.jsp", "/foo/foo/bar.jsp");
-s.addLineData(1, "foo.jsp", 1, 1, 1);
-s.addLineData(2, "foo.jsp", 1, 6, 1);
-s.addLineData(3, "foo.jsp", 2, 10, 5);
-s.addLineData(20, "bar.jsp", 1, 30, 1);
-g.addStratum(s, true);
-System.out.print(g);
-
-System.out.println("---");
-
-SmapGenerator embedded = new SmapGenerator();
-embedded.setOutputFileName("blargh.tier2");
-s = new SmapStratum("Tier2");
-s.addFile("1.tier2");
-s.addLineData(1, "1.tier2", 1, 1, 1);
-embedded.addStratum(s, true);
-g.addSmap(embedded.toString(), "JSP");
-System.out.println(g);
-}
}
Added: tomcat/trunk/test/org/apache/jasper/compiler/TestSmapGenerator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestSmapGenerator.java?rev=1797531&view=auto
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestSmapGenerator.java (added)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestSmapGenerator.java Sat Jun
3 20:07:09 2017
@@ -0,0 +1,57 @@
+/*
+ * 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;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestSmapGenerator {
+
+@Test
+public void test01() {
+// Formerly part of the main() method in SmapGenerator
+
+SmapGenerator g = new SmapGenerator();
+g.setOutputFileName("foo.java");
+SmapStratum s = new SmapStratum("JSP");
+s.addFile("foo.jsp");
+s.addFile("bar.jsp", "/foo/foo/bar.jsp");
+s.addLineData(1, "foo.jsp", 1, 1, 1);
+s.addLineData(2, "foo.jsp", 1, 6, 1);
+s.addLineData(3, "foo.jsp", 2, 10, 5);
+s.addLineData(20, "/foo/foo/bar.jsp", 1, 30, 1);
+g.addStratum(s, true);
+
+Assert.assertEquals(
+"SMAP\n" +
+"foo.java\n" +
+"JSP\n" +
+"*S JSP\n" +
+"*F\n" +
+"+ 0 foo.jsp\n" +
+"foo.jsp\n" +
+"+ 1 bar.jsp\n" +
+"foo/foo/bar.jsp\n" +
+"*L\n" +
+"1:1\n" +
+"2:6\n" +
+"3,2:10,5\n" +
+"20#1:30\n" +
+"*E\n",
+g.getString());
+}
+}
Propchange: tomcat/trunk/test/org/apache/jasper/compiler/TestSmapGenerator.java
--
svn:eol-style = native
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1797532 - /tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
Author: markt
Date: Sat Jun 3 20:09:37 2017
New Revision: 1797532
URL: http://svn.apache.org/viewvc?rev=1797532&view=rev
Log:
Deprecate unused method
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java?rev=1797532&r1=1797531&r2=1797532&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java Sat Jun 3
20:09:37 2017
@@ -87,7 +87,10 @@ public class SmapGenerator {
* @param smap the SMAP to embed
* @param stratumName the name of the stratum output by the compilation
*that produced the smap to be embedded
+ *
+ * @deprecated Unused. This will be removed in Tomcat 9.0.x
*/
+@Deprecated
public synchronized void addSmap(String smap, String stratumName) {
embedded.add("*O " + stratumName + "\n"
+ smap
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1797534 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/jasper/compiler/SmapGenerator.java
Author: markt Date: Sat Jun 3 20:10:03 2017 New Revision: 1797534 URL: http://svn.apache.org/viewvc?rev=1797534&view=rev Log: Deprecate unused code Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/SmapGenerator.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jun 3 20:10:03 2017 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747 536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1 756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,176216 8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1763810,1763813,17638
SMAP plans for 9.0.x
All, I wanted to provide a little more context to the SMAP changes I have started working on. The primary driver for all of this is this bug: https://bz.apache.org/bugzilla/show_bug.cgi?id=49176 Particularly comment #4. Currently, the SMAP implementation is more generic than it needs to be for Jasper. I am currently working on removing those elements Jasper will never need. The SMAP is produced in String format as required for insertion into a .class file. My expectation is that the API will need modification to expose the SMAP in object form (details TBD). The SMAP will then be retained for each class and used in preference to the page nodes for constructing error pages. The final solution is far from fixed. I need to do some performance testing with the current page nodes solution so I can compare the SMAP approach. There are various design decisions still to be made: - cache SMAP vs read it from the .class file as required - cache all, some (LRU), none - cache SMAP with the compiler (like page nodes) or some new web application wide cache? - no access to page nodes means we'd also need to parse the source JSP/tag to display the source extract I hope this provides some useful context to my current commits. Thoughts / comments / suggestions welcome. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1797535 - /tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
Author: markt
Date: Sat Jun 3 20:29:35 2017
New Revision: 1797535
URL: http://svn.apache.org/viewvc?rev=1797535&view=rev
Log:
Remove unused code
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java?rev=1797535&r1=1797534&r2=1797535&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java Sat Jun 3
20:29:35 2017
@@ -39,6 +39,10 @@ public class SmapGenerator {
*a logical SMAP
* - to serialize this logical SMAP for eventual inclusion directly
*into a .class file.
+ *
+ * There are aspects of the SMAP syntax that this class does not support.
+ * It provides all the features required for JSP and associated files but
no
+ * more.
*/
@@ -48,7 +52,6 @@ public class SmapGenerator {
private String outputFileName;
private String defaultStratum = "Java";
private final List strata = new ArrayList<>();
-private final List embedded = new ArrayList<>();
//*
// Methods for adding mapping data
@@ -81,22 +84,6 @@ public class SmapGenerator {
this.defaultStratum = stratum.getStratumName();
}
-/**
- * Adds the given string as an embedded SMAP with the given stratum name.
- *
- * @param smap the SMAP to embed
- * @param stratumName the name of the stratum output by the compilation
- *that produced the smap to be embedded
- *
- * @deprecated Unused. This will be removed in Tomcat 9.0.x
- */
-@Deprecated
-public synchronized void addSmap(String smap, String stratumName) {
-embedded.add("*O " + stratumName + "\n"
- + smap
- + "*C " + stratumName + "\n");
-}
-
//*
// Methods for serializing the logical SMAP
@@ -112,12 +99,6 @@ public class SmapGenerator {
out.append(outputFileName + '\n');
out.append(defaultStratum + '\n');
-// include embedded SMAPs
-int nEmbedded = embedded.size();
-for (int i = 0; i < nEmbedded; i++) {
-out.append(embedded.get(i));
-}
-
// print our StratumSections, FileSections, and LineSections
int nStrata = strata.size();
for (int i = 0; i < nStrata; i++) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1797536 - in /tomcat/trunk: java/org/apache/jasper/compiler/SmapStratum.java java/org/apache/jasper/compiler/SmapUtil.java test/org/apache/jasper/compiler/TestSmapGenerator.java
Author: markt
Date: Sat Jun 3 20:39:17 2017
New Revision: 1797536
URL: http://svn.apache.org/viewvc?rev=1797536&view=rev
Log:
JSP is the only startum used by Jasper. Hard code the name and deprecated the
constructor that allows any name.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java
tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
tomcat/trunk/test/org/apache/jasper/compiler/TestSmapGenerator.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java?rev=1797536&r1=1797535&r2=1797536&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java Sat Jun 3
20:39:17 2017
@@ -123,11 +123,21 @@ public class SmapStratum {
// Constructor
/**
+ * Constructs a new SmapStratum object with the stratum name JSP.
+ */
+public SmapStratum() {
+this("JSP");
+}
+
+/**
* Constructs a new SmapStratum object for the given stratum name
* (e.g., JSP).
*
* @param stratumName the name of the stratum (e.g., JSP)
+ *
+ * @deprecated Use the no-arg constructor
*/
+@Deprecated
public SmapStratum(String stratumName) {
this.stratumName = stratumName;
fileNameList = new ArrayList<>();
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java?rev=1797536&r1=1797535&r2=1797536&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java Sat Jun 3
20:39:17 2017
@@ -80,7 +80,7 @@ public class SmapUtil {
SmapGenerator g = new SmapGenerator();
// now, assemble info about our own stratum (JSP) using JspLineMap
-SmapStratum s = new SmapStratum("JSP");
+SmapStratum s = new SmapStratum();
g.setOutputFileName(unqualify(ctxt.getServletJavaFileName()));
@@ -683,7 +683,7 @@ public class SmapUtil {
public void doVisit(Node n) {
String inner = n.getInnerClassName();
if (inner != null && !map.containsKey(inner)) {
-map.put(inner, new SmapStratum("JSP"));
+map.put(inner, new SmapStratum());
}
}
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestSmapGenerator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestSmapGenerator.java?rev=1797536&r1=1797535&r2=1797536&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestSmapGenerator.java
(original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestSmapGenerator.java Sat Jun
3 20:39:17 2017
@@ -27,7 +27,7 @@ public class TestSmapGenerator {
SmapGenerator g = new SmapGenerator();
g.setOutputFileName("foo.java");
-SmapStratum s = new SmapStratum("JSP");
+SmapStratum s = new SmapStratum();
s.addFile("foo.jsp");
s.addFile("bar.jsp", "/foo/foo/bar.jsp");
s.addLineData(1, "foo.jsp", 1, 1, 1);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1797537 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/jasper/compiler/SmapGenerator.java java/org/apache/jasper/compiler/SmapStratum.java java/org/apache/jasper/compiler/SmapUtil.java
Author: markt Date: Sat Jun 3 20:41:23 2017 New Revision: 1797537 URL: http://svn.apache.org/viewvc?rev=1797537&view=rev Log: JSP is the only startum used by Jasper. Hard code the name and deprecated the constructor that allows any name. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/SmapGenerator.java tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/SmapStratum.java tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/SmapUtil.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jun 3 20:41:23 2017 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747 536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1 756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,176216 8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1
svn commit: r1797538 - /tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java
Author: markt
Date: Sat Jun 3 20:44:12 2017
New Revision: 1797538
URL: http://svn.apache.org/viewvc?rev=1797538&view=rev
Log:
Remove dprecated code
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java?rev=1797538&r1=1797537&r2=1797538&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java Sat Jun 3
20:44:12 2017
@@ -113,7 +113,6 @@ public class SmapStratum {
//*
// Private state
-private final String stratumName;
private final List fileNameList;
private final List filePathList;
private final List lineData;
@@ -126,20 +125,6 @@ public class SmapStratum {
* Constructs a new SmapStratum object with the stratum name JSP.
*/
public SmapStratum() {
-this("JSP");
-}
-
-/**
- * Constructs a new SmapStratum object for the given stratum name
- * (e.g., JSP).
- *
- * @param stratumName the name of the stratum (e.g., JSP)
- *
- * @deprecated Use the no-arg constructor
- */
-@Deprecated
-public SmapStratum(String stratumName) {
-this.stratumName = stratumName;
fileNameList = new ArrayList<>();
filePathList = new ArrayList<>();
lineData = new ArrayList<>();
@@ -292,7 +277,7 @@ public class SmapStratum {
* @return the name of the stratum.
*/
public String getStratumName() {
-return stratumName;
+return "JSP";
}
/**
@@ -307,7 +292,7 @@ public class SmapStratum {
StringBuilder out = new StringBuilder();
// print StratumSection
-out.append("*S " + stratumName + "\n");
+out.append("*S JSP\n");
// print FileSection
out.append("*F\n");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1797540 - in /tomcat/trunk: java/org/apache/jasper/compiler/SmapGenerator.java java/org/apache/jasper/compiler/SmapUtil.java test/org/apache/jasper/compiler/TestSmapGenerator.java
Author: markt
Date: Sat Jun 3 20:53:45 2017
New Revision: 1797540
URL: http://svn.apache.org/viewvc?rev=1797540&view=rev
Log:
Jasper only sets a default stratum.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
tomcat/trunk/test/org/apache/jasper/compiler/TestSmapGenerator.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java?rev=1797540&r1=1797539&r2=1797540&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java Sat Jun 3
20:53:45 2017
@@ -65,6 +65,17 @@ public class SmapGenerator {
outputFileName = x;
}
+
+/**
+ * Sets the default and only stratum for the smap.
+ *
+ * @param stratum the SmapStratum object to add
+ */
+public synchronized void setStratum(SmapStratum stratum) {
+addStratum(stratum, true);
+}
+
+
/**
* Adds the given SmapStratum object, representing a Stratum with
* logically associated FileSection and LineSection blocks, to
@@ -76,7 +87,10 @@ public class SmapGenerator {
* @param defaultStratum if true, this SmapStratum is considered
*to represent the default SMAP stratum unless
*overwritten
+ *
+ * @deprecated Use {@link #setStratum(SmapStratum)}
*/
+@Deprecated
public synchronized void addStratum(SmapStratum stratum,
boolean defaultStratum) {
strata.add(stratum);
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java?rev=1797540&r1=1797539&r2=1797540&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java Sat Jun 3
20:53:45 2017
@@ -87,7 +87,7 @@ public class SmapUtil {
// Map out Node.Nodes
evaluateNodes(pageNodes, s, map, ctxt.getOptions().getMappedFile());
s.optimizeLineSection();
-g.addStratum(s, true);
+g.setStratum(s);
if (ctxt.getOptions().isSmapDumped()) {
File outSmap = new File(ctxt.getClassFileName() + ".smap");
@@ -113,7 +113,7 @@ public class SmapUtil {
s.optimizeLineSection();
g = new SmapGenerator();
g.setOutputFileName(unqualify(ctxt.getServletJavaFileName()));
-g.addStratum(s, true);
+g.setStratum(s);
String innerClassFileName =
classFileName.substring(0, classFileName.indexOf(".class")) +
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestSmapGenerator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestSmapGenerator.java?rev=1797540&r1=1797539&r2=1797540&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestSmapGenerator.java
(original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestSmapGenerator.java Sat Jun
3 20:53:45 2017
@@ -34,7 +34,7 @@ public class TestSmapGenerator {
s.addLineData(2, "foo.jsp", 1, 6, 1);
s.addLineData(3, "foo.jsp", 2, 10, 5);
s.addLineData(20, "/foo/foo/bar.jsp", 1, 30, 1);
-g.addStratum(s, true);
+g.setStratum(s);
Assert.assertEquals(
"SMAP\n" +
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1797541 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/jasper/compiler/SmapGenerator.java java/org/apache/jasper/compiler/SmapUtil.java
Author: markt Date: Sat Jun 3 20:54:26 2017 New Revision: 1797541 URL: http://svn.apache.org/viewvc?rev=1797541&view=rev Log: Jasper only sets a default stratum. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/SmapGenerator.java tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/SmapUtil.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jun 3 20:54:26 2017 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747 536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1 756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,176216 8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,
svn commit: r1797542 - /tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
Author: markt
Date: Sat Jun 3 20:58:05 2017
New Revision: 1797542
URL: http://svn.apache.org/viewvc?rev=1797542&view=rev
Log:
Remove unused code
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java?rev=1797542&r1=1797541&r2=1797542&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java Sat Jun 3
20:58:05 2017
@@ -17,9 +17,6 @@
package org.apache.jasper.compiler;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* Represents a source map (SMAP), which serves to associate lines
* of the input JSP file(s) to lines in the generated servlet in the
@@ -50,8 +47,7 @@ public class SmapGenerator {
// Private state
private String outputFileName;
-private String defaultStratum = "Java";
-private final List strata = new ArrayList<>();
+private SmapStratum stratum;
//*
// Methods for adding mapping data
@@ -72,30 +68,7 @@ public class SmapGenerator {
* @param stratum the SmapStratum object to add
*/
public synchronized void setStratum(SmapStratum stratum) {
-addStratum(stratum, true);
-}
-
-
-/**
- * Adds the given SmapStratum object, representing a Stratum with
- * logically associated FileSection and LineSection blocks, to
- * the current SmapGenerator. If default is true, this
- * stratum is made the default stratum, overriding any previously
- * set default.
- *
- * @param stratum the SmapStratum object to add
- * @param defaultStratum if true, this SmapStratum is considered
- *to represent the default SMAP stratum unless
- *overwritten
- *
- * @deprecated Use {@link #setStratum(SmapStratum)}
- */
-@Deprecated
-public synchronized void addStratum(SmapStratum stratum,
-boolean defaultStratum) {
-strata.add(stratum);
-if (defaultStratum)
-this.defaultStratum = stratum.getStratumName();
+this.stratum = stratum;
}
@@ -104,21 +77,19 @@ public class SmapGenerator {
public synchronized String getString() {
// check state and initialize buffer
-if (outputFileName == null)
+if (outputFileName == null) {
throw new IllegalStateException();
+}
+
StringBuilder out = new StringBuilder();
// start the SMAP
out.append("SMAP\n");
out.append(outputFileName + '\n');
-out.append(defaultStratum + '\n');
+out.append("JSP\n");
-// print our StratumSections, FileSections, and LineSections
-int nStrata = strata.size();
-for (int i = 0; i < nStrata; i++) {
-SmapStratum s = strata.get(i);
-out.append(s.getString());
-}
+// print our StratumSection, FileSection, and LineSections
+out.append(stratum.getString());
// end the SMAP
out.append("*E\n");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1797543 - /tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java
Author: markt
Date: Sat Jun 3 20:59:39 2017
New Revision: 1797543
URL: http://svn.apache.org/viewvc?rev=1797543&view=rev
Log:
Deprecate unused code
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java?rev=1797543&r1=1797542&r2=1797543&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java Sat Jun 3
20:59:39 2017
@@ -275,7 +275,10 @@ public class SmapStratum {
/**
* @return the name of the stratum.
+ *
+ * @deprecated Unused. This will be removed in Tomcat 9.0.x
*/
+@Deprecated
public String getStratumName() {
return "JSP";
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1797544 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/jasper/compiler/SmapStratum.java
Author: markt Date: Sat Jun 3 21:00:38 2017 New Revision: 1797544 URL: http://svn.apache.org/viewvc?rev=1797544&view=rev Log: Deprecate unused code Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/SmapStratum.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jun 3 21:00:38 2017 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747 536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1 756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,176216 8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1763810,1763813,1763815
svn commit: r1797545 - /tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java
Author: markt
Date: Sat Jun 3 21:01:42 2017
New Revision: 1797545
URL: http://svn.apache.org/viewvc?rev=1797545&view=rev
Log:
Remove deprecated code
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java?rev=1797545&r1=1797544&r2=1797545&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java Sat Jun 3
21:01:42 2017
@@ -274,16 +274,6 @@ public class SmapStratum {
// Methods to retrieve information
/**
- * @return the name of the stratum.
- *
- * @deprecated Unused. This will be removed in Tomcat 9.0.x
- */
-@Deprecated
-public String getStratumName() {
-return "JSP";
-}
-
-/**
* @return the given stratum as a String: a StratumSection,
* followed by at least one FileSection and at least one LineSection.
*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
