Author: markt
Date: Thu Apr 20 19:11:23 2017
New Revision: 1792130

URL: http://svn.apache.org/viewvc?rev=1792130&view=rev
Log:
Add [...] delimiters to values in messages that don't currently have them for 
org.apache.jasper packages

Modified:
    tomcat/tc8.5.x/trunk/   (props changed)
    
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
    
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
    
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
    
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties

Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 20 19:11: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,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,1747536,1747
 
924,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-1756410,1
 
756778,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,1762168,176217
 
2,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,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1766834,1766840,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,1768283,1768520,1768569,1768651,176
 
8762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-1778139,1778141-1778150,1778154,
 
1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778582,1778600,1779641,1779654,1779708,1779718,1779897,1779899,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784911,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,1788543-1788544,1788548,1788550,1788554,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,17887
 
64,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789447,1789453,1789456,1789458,1789461-1789463,1789465-1789467,1789470,1789472,1789474,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790376,1790614,1790983,1790991,1791050,1791090,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093
+/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,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,1747536,1747
 
924,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-1756410,1
 
756778,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,1762168,176217
 
2,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,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1766834,1766840,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,1768283,1768520,1768569,1768651,176
 
8762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-1778139,1778141-1778150,1778154,
 
1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778582,1778600,1779641,1779654,1779708,1779718,1779897,1779899,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784911,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,1788543-1788544,1788548,1788550,1788554,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,17887
 
64,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789447,1789453,1789456,1789458,1789461-1789463,1789465-1789467,1789470,1789472,1789474,1789476,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790376,1790614,1790983,1790991,1791050,1791090,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1792130&r1=1792129&r2=1792130&view=diff
==============================================================================
--- 
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
(original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
Thu Apr 20 19:11:23 2017
@@ -20,65 +20,65 @@ jsp.error.compiler=No Java compiler avai
 jsp.error.no.scratch.dir=The JSP engine is not configured with a scratch dir.\
 \n Please add "jsp.initparams=scratchdir=<dir-name>" \
 \n in the servlets.properties file for this context.
-jsp.error.bad.scratch.dir=The scratchDir you specified: {0} is unusable.
-jsp.message.scratch.dir.is=Scratch dir for the JSP engine is: {0}
-jsp.message.parent_class_loader_is=Parent class loader is: {0}
+jsp.error.bad.scratch.dir=The scratchDir you specified: [{0}] is unusable.
+jsp.message.scratch.dir.is=Scratch dir for the JSP engine is: [{0}]
+jsp.message.parent_class_loader_is=Parent class loader is: [{0}]
 jsp.message.dont.modify.servlets=IMPORTANT: Do not modify the generated 
servlets
 jsp.error.unavailable=JSP has been marked unavailable
-jsp.error.usebean.duplicate=useBean: Duplicate bean name: {0}
-jsp.error.invalid.scope=Illegal value of ''scope'' attribute: {0} (must be one 
of "page", "request", "session", or "application")
+jsp.error.usebean.duplicate=useBean: Duplicate bean name: [{0}]
+jsp.error.invalid.scope=Illegal value of ''scope'' attribute: [{0}] (must be 
one of "page", "request", "session", or "application")
 jsp.error.classname=Can't determine classname from .class file
 jsp.error.outputfolder=No output folder
 jsp.error.data.file.write=Error while writing data file
-jsp.error.page.conflict.contenttype=Page directive: illegal to have multiple 
occurrences of ''contentType'' with different values (old: {0}, new: {1})
-jsp.error.page.conflict.session=Page directive: illegal to have multiple 
occurrences of ''session'' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.contenttype=Page directive: illegal to have multiple 
occurrences of ''contentType'' with different values (old: [{0}], new: [{1}])
+jsp.error.page.conflict.session=Page directive: illegal to have multiple 
occurrences of ''session'' with different values (old: [{0}], new: [{1}])
 jsp.error.page.invalid.session=Page directive: invalid value for session
-jsp.error.page.conflict.buffer=Page directive: illegal to have multiple 
occurrences of ''buffer'' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.buffer=Page directive: illegal to have multiple 
occurrences of ''buffer'' with different values (old: [{0}], new: [{1}])
 jsp.error.page.invalid.buffer=Page directive: invalid value for buffer
-jsp.error.page.conflict.autoflush=Page directive: illegal to have multiple 
occurrences of ''autoFlush'' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.autoflush=Page directive: illegal to have multiple 
occurrences of ''autoFlush'' with different values (old: [{0}], new: [{1}])
 jsp.error.page.invalid.import=Page directive: invalid value for import
-jsp.error.page.conflict.isthreadsafe=Page directive: illegal to have multiple 
occurrences of ''isThreadSafe'' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.isthreadsafe=Page directive: illegal to have multiple 
occurrences of ''isThreadSafe'' with different values (old: [{0}], new: [{1}])
 jsp.error.page.invalid.isthreadsafe=Page directive: invalid value for 
isThreadSafe
-jsp.error.page.conflict.info=Page directive: illegal to have multiple 
occurrences of ''info'' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.info=Page directive: illegal to have multiple 
occurrences of ''info'' with different values (old: [{0}], new: [{1}])
 jsp.error.page.invalid.info=Page directive: invalid value for info
-jsp.error.page.conflict.iserrorpage=Page directive: illegal to have multiple 
occurrences of ''isErrorPage'' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.iserrorpage=Page directive: illegal to have multiple 
occurrences of ''isErrorPage'' with different values (old: [{0}], new: [{1}])
 jsp.error.page.invalid.iserrorpage=Page directive: invalid value for 
isErrorPage
-jsp.error.page.conflict.errorpage=Page directive: illegal to have multiple 
occurrences of ''errorPage'' with different values (old: {0}, new: {1})
-jsp.error.page.conflict.language=Page directive: illegal to have multiple 
occurrences of ''language'' with different values (old: {0}, new: {1})
-jsp.error.tag.conflict.language=Tag directive: illegal to have multiple 
occurrences of ''language'' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.errorpage=Page directive: illegal to have multiple 
occurrences of ''errorPage'' with different values (old: [{0}], new: [{1}])
+jsp.error.page.conflict.language=Page directive: illegal to have multiple 
occurrences of ''language'' with different values (old: [{0}], new: [{1}])
+jsp.error.tag.conflict.language=Tag directive: illegal to have multiple 
occurrences of ''language'' with different values (old: [{0}], new: [{1}])
 jsp.error.page.language.nonjava=Page directive: invalid language attribute
 jsp.error.tag.language.nonjava=Tag directive: invalid language attribute
-jsp.error.page.conflict.extends=Page directive: illegal to have multiple 
occurrences of ''extends'' with different values (old: {0}, new: {1})
-jsp.error.page.conflict.iselignored=Page directive: illegal to have multiple 
occurrences of ''isELIgnored'' with different values (old: {0}, new: {1})
-jsp.error.tag.conflict.iselignored=Tag directive: illegal to have multiple 
occurrences of ''isELIgnored'' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.extends=Page directive: illegal to have multiple 
occurrences of ''extends'' with different values (old: [{0}], new: [{1}])
+jsp.error.page.conflict.iselignored=Page directive: illegal to have multiple 
occurrences of ''isELIgnored'' with different values (old: [{0}], new: [{1}])
+jsp.error.tag.conflict.iselignored=Tag directive: illegal to have multiple 
occurrences of ''isELIgnored'' with different values (old: [{0}], new: [{1}])
 jsp.error.page.invalid.iselignored=Page directive: invalid value for 
isELIgnored
 jsp.error.tag.invalid.iselignored=Tag directive: invalid value for isELIgnored
 jsp.error.page.multi.pageencoding=Page directive must not have multiple 
occurrences of pageencoding
-jsp.error.tag.conflict.attr=Tag directive: illegal to have multiple 
occurrences of the attribute [{0}] with different values (old: {1}, new: {2})
+jsp.error.tag.conflict.attr=Tag directive: illegal to have multiple 
occurrences of the attribute [{0}] with different values (old: [{1}], new: 
[{2}])
 jsp.error.tag.multi.pageencoding=Tag directive must not have multiple 
occurrences of pageencoding
-jsp.error.include.exception=Unable to include {0}
+jsp.error.include.exception=Unable to include [{0}]
 jsp.error.stream.close.failed=Failed to close stream
 jsp.error.stream.closed=Stream closed
 jsp.error.invalid.directive=Invalid directive
-jsp.error.invalid.implicit=Invalid implicit TLD for tag file at {0}
-jsp.error.invalid.implicit.version=Invalid JSP version defined in implicit TLD 
for tag file at {0}
-jsp.error.invalid.version=Invalid JSP version defined for tag file at {0}
-jsp.error.directive.istagfile={0} directive cannot be used in a tag file
-jsp.error.directive.isnottagfile={0} directive can only be used in a tag file
-jsp.error.action.istagfile={0} action cannot be used in a tag file
-jsp.error.action.isnottagfile={0} action can be used in tag files only
-jsp.error.unterminated=Unterminated {0} tag
+jsp.error.invalid.implicit=Invalid implicit TLD for tag file at [{0}]
+jsp.error.invalid.implicit.version=Invalid JSP version defined in implicit TLD 
for tag file at [{0}]
+jsp.error.invalid.version=Invalid JSP version defined for tag file at [{0}]
+jsp.error.directive.istagfile=[{0}] directive cannot be used in a tag file
+jsp.error.directive.isnottagfile=[{0}] directive can only be used in a tag file
+jsp.error.action.istagfile=[{0}] action cannot be used in a tag file
+jsp.error.action.isnottagfile=[{0}] action can be used in tag files only
+jsp.error.unterminated=Unterminated [{0}] tag
 jsp.error.loadclass.taghandler=Unable to load tag handler class [{0}] for tag 
[{1}]
 jsp.error.unable.compile=Unable to compile class for JSP
 jsp.error.unable.load=Unable to load class for JSP
-jsp.error.mandatory.attribute={0}: Mandatory attribute {1} missing
+jsp.error.mandatory.attribute=[{0}]: Mandatory attribute [{1}] missing
 jsp.error.flush=Exception occurred when flushing data
 jsp.engine.info=Jasper JSP 2.3 Engine
-jsp.error.invalid.expression=[{0}] contains invalid expression(s): {1}
-jsp.error.invalid.attribute={0} has invalid attribute: {1}
-jsp.error.file.cannot.read=Cannot read file: {0}
-jsp.error.file.already.registered=Recursive include of file {0}
-jsp.error.file.not.registered=file {0} not seen in include
+jsp.error.invalid.expression=[{0}] contains invalid expression(s): [{1}]
+jsp.error.invalid.attribute=[{0}] has invalid attribute: [{1}]
+jsp.error.file.cannot.read=Cannot read file: [{0}]
+jsp.error.file.already.registered=Recursive include of file [{0}]
+jsp.error.file.not.registered=file [{0}] not seen in include
 jsp.error.quotes.unterminated=Unterminated quotes
 jsp.error.attr.quoted=Attribute value should be quoted
 jsp.error.beans.nullbean=Attempted a bean operation on a null object.
@@ -86,7 +86,7 @@ jsp.error.beans.nobeaninfo=No BeanInfo f
 jsp.error.beans.nomethod=Cannot find a method to read property [{0}] in a bean 
of type [{1}]
 jsp.error.beans.nomethod.setproperty=Can''t find a method to write property 
[{0}] of type [{1}] in a bean of type [{2}]
 jsp.error.beans.noproperty=Cannot find any information on property [{0}] in a 
bean of type [{1}]
-jsp.error.beans.property.conversion=Unable to convert string [{0}] to class 
[{1}] for attribute [{2}]: {3}
+jsp.error.beans.property.conversion=Unable to convert string [{0}] to class 
[{1}] for attribute [{2}]: [{3}]
 jsp.error.beans.propertyeditor.notregistered=Property Editor not registered 
with the PropertyEditorManager
 jsp.error.beans.setproperty.noindexset=Cannot set indexed property
 jsp.error.include.tag=Invalid jsp:include tag
@@ -105,7 +105,7 @@ jsp.error.plugin.nocode=code not declare
 jsp.error.ise_on_clear=Illegal to clear() when buffer size == 0
 jsp.error.javac=Javac exception
 jsp.error.javac.env=Environment:
-jsp.error.compilation=Error compiling file: {0} {1}
+jsp.error.compilation=Error compiling file: [{0}] [{1}]
 jsp.error.undeclared_namespace=A custom tag was encountered with an undeclared 
namespace [{0}]
 jsp.warning.keepgen=Warning: Invalid value for the initParam keepgenerated. 
Will use the default value of "false"
 jsp.warning.xpoweredBy=Warning: Invalid value for the initParam xpoweredBy. 
Will use the default value of "false"
@@ -133,17 +133,17 @@ jsp.warning.unknown.element.in.variable=
 jsp.warning.unknown.element.in.validator=Unknown element [{0}] in validator
 jsp.warning.unknown.element.in.initParam=Unknown element [{0}] in validator''s 
init-param
 jsp.warning.unknown.element.in.function=Unknown element [{0}] in function
-jsp.error.teiclass.instantiation=Failed to load or instantiate TagExtraInfo 
class: {0}
-jsp.error.non_null_tei_and_var_subelems=Tag {0} has one or more variable 
subelements and a TagExtraInfo class that returns one or more VariableInfo
-jsp.error.parse.error.in.TLD=Parse Error in the tag library descriptor: {0}
+jsp.error.teiclass.instantiation=Failed to load or instantiate TagExtraInfo 
class: [{0}]
+jsp.error.non_null_tei_and_var_subelems=Tag [{0}] has one or more variable 
subelements and a TagExtraInfo class that returns one or more VariableInfo
+jsp.error.parse.error.in.TLD=Parse Error in the tag library descriptor: [{0}]
 jsp.error.file.not.found=File [{0}] not found
-jsp.error.missing_attribute=According to the TLD or the tag file, attribute 
{0} is mandatory for tag {1}
-jsp.error.bad_attribute=Attribute {0} invalid for tag {1} according to TLD
-jsp.error.tld.unable_to_get_jar=Unable to get JAR resource [{0}] containing 
TLD: {1}
-jsp.error.tld.missing=Unable to find taglib [{0}] for URI: {1}
+jsp.error.missing_attribute=According to the TLD or the tag file, attribute 
[{0}] is mandatory for tag [{1}]
+jsp.error.bad_attribute=Attribute [{0}] invalid for tag [{1}] according to TLD
+jsp.error.tld.unable_to_get_jar=Unable to get JAR resource [{0}] containing 
TLD: [{1}]
+jsp.error.tld.missing=Unable to find taglib [{0}] for URI: [{1}]
 jsp.error.tld.missing_jar=Missing JAR resource [{0}] containing TLD
 jsp.error.tld.invalid_tld_file=Invalid tld file: [{0}], see JSP specification 
section 7.3.1 for more details
-jsp.error.unable.to_find_method=Unable to find setter method for attribute: {0}
+jsp.error.unable.to_find_method=Unable to find setter method for attribute: 
[{0}]
 jsp.error.bad_tag=No tag [{0}] defined in tag library imported with prefix 
[{1}]
 jsp.error.xml.bad_tag=No tag [{0}] defined in tag library associated with uri 
[{1}]
 jsp.warning.compiler.classfile.delete.fail=Failed to delete generated class 
file [{0}]
@@ -219,75 +219,75 @@ jspc.error.fileDoesNotExist=The file arg
 jspc.delete.fail=Failed to delete file [{0}]
 jspc.error.invalidWebXml=Aborting pre-compilation due to errors in web.xml
 jspc.error.invalidFragment=Aborting pre-compilation due to errors in web 
fragments
-jsp.error.library.invalid=JSP page is invalid according to library {0}: {1}
-jsp.error.tlvclass.instantiation=Failed to load or instantiate 
TagLibraryValidator class: {0}
-jsp.error.tlv.invalid.page=Validation error messages from TagLibraryValidator 
for {0} in {1}
-jsp.error.tei.invalid.attributes=Validation error messages from TagExtraInfo 
for {0}
+jsp.error.library.invalid=JSP page is invalid according to library [{0}]: [{1}]
+jsp.error.tlvclass.instantiation=Failed to load or instantiate 
TagLibraryValidator class: [{0}]
+jsp.error.tlv.invalid.page=Validation error messages from TagLibraryValidator 
for [{0}] in [{1}]
+jsp.error.tei.invalid.attributes=Validation error messages from TagExtraInfo 
for [{0}]
 jsp.error.no.more.content=End of content reached while more parsing required: 
tag nesting error?
-jsp.error.parse.xml=XML parsing error on file {0}
-jsp.error.parse.xml.line=XML parsing error on file {0}: (line {1}, col {2})
-jsp.error.parse.xml.scripting.invalid.body=Body of {0} element must not 
contain any XML elements
-jsp.error.internal.tldinit=Unable to initialize TldLocationsCache: {0}
-jsp.error.internal.filenotfound=Internal Error: File {0} not found
-jsp.error.parse.xml.invalidPublicId=Invalid PUBLIC ID: {0}
-jsp.error.unsupported.encoding=Unsupported encoding: {0}
-jsp.error.taglibDirective.absUriCannotBeResolved=The absolute uri: {0} cannot 
be resolved in either web.xml or the jar files deployed with this application
+jsp.error.parse.xml=XML parsing error on file [{0}]
+jsp.error.parse.xml.line=XML parsing error on file [{0}]: (line [{1}], col 
[{2}])
+jsp.error.parse.xml.scripting.invalid.body=Body of [{0}] element must not 
contain any XML elements
+jsp.error.internal.tldinit=Unable to initialize TldLocationsCache: [{0}]
+jsp.error.internal.filenotfound=Internal Error: File [{0}] not found
+jsp.error.parse.xml.invalidPublicId=Invalid PUBLIC ID: [{0}]
+jsp.error.unsupported.encoding=Unsupported encoding: [{0}]
+jsp.error.taglibDirective.absUriCannotBeResolved=The absolute uri: [{0}] 
cannot be resolved in either web.xml or the jar files deployed with this 
application
 jsp.error.taglibDirective.uriInvalid=The URI provided for a tag library [{0}] 
is not a valid URI
 jsp.error.taglibDirective.missing.location=Neither 'uri' nor 'tagdir' 
attribute specified
 jsp.error.taglibDirective.both_uri_and_tagdir=Both 'uri' and 'tagdir' 
attributes specified
-jsp.error.invalid.tagdir=Tag file directory {0} does not start with 
"/WEB-INF/tags"
-#jspx.error.templateDataNotInJspCdata=Validation Error: Element &lt;{0}&gt; 
cannot have template data. Template data must be encapsulated within a 
&lt;jsp:cdata&gt; element. [JSP1.2 PFD section 5.1.9]\nTemplate data in error: 
{1}
-#Error while processing taglib jar file {0}: {1}
-jsp.error.needAlternateJavaEncoding=Default java encoding {0} is invalid on 
your java platform. An alternate can be specified via the ''javaEncoding'' 
parameter of JspServlet.
+jsp.error.invalid.tagdir=Tag file directory [{0}] does not start with 
"/WEB-INF/tags"
+#jspx.error.templateDataNotInJspCdata=Validation Error: Element &lt;{0}&gt; 
cannot have template data. Template data must be encapsulated within a 
&lt;jsp:cdata&gt; element. [JSP1.2 PFD section 5.1.9]\nTemplate data in error: 
[{1}]
+#Error while processing taglib jar file [{0}]: [{1}]
+jsp.error.needAlternateJavaEncoding=Default java encoding [{0}] is invalid on 
your java platform. An alternate can be specified via the ''javaEncoding'' 
parameter of JspServlet.
 #Error when compiling, used for jsp line number error messages
-jsp.error.single.line.number=An error occurred at line: {0} in the jsp file: 
{1}
+jsp.error.single.line.number=An error occurred at line: [{0}] in the jsp file: 
[{1}]
 jsp.error.java.line.number=An error occurred at line: [{0}] in the generated 
java file: [{1}]
-jsp.error.location=line: {0}, column: {1}
+jsp.error.location=line: [{0}], column: [{1}]
 jsp.error.corresponding.servlet=Generated servlet error:\n
-jsp.error.jspbody.required=Must use jsp:body to specify tag body for {0} if 
jsp:attribute is used.
-jsp.error.jspbody.emptybody.only=The {0} tag can only have jsp:attribute in 
its body.
+jsp.error.jspbody.required=Must use jsp:body to specify tag body for [{0}] if 
jsp:attribute is used.
+jsp.error.jspbody.emptybody.only=The [{0}] tag can only have jsp:attribute in 
its body.
 jsp.error.no.scriptlets=Scripting elements ( &lt;%!, &lt;jsp:declaration, 
&lt;%=, &lt;jsp:expression, &lt;%, &lt;jsp:scriptlet ) are disallowed here.
-jsp.error.tld.fn.invalid.signature=Invalid syntax for function signature in 
TLD.  Tag Library: {0}, Function: {1}
-jsp.error.tld.fn.duplicate.name=Duplicate function name {0} in tag library {1}
-jsp.error.tld.fn.invalid.signature.parenexpected=Invalid syntax for function 
signature in TLD.  Parenthesis ''('' expected.  Tag Library: {0}, Function: {1}.
-jsp.error.tld.mandatory.element.missing=Mandatory TLD element {0} missing or 
empty in TLD {1}
-jsp.error.dynamic.attributes.not.implemented=The {0} tag declares that it 
accepts dynamic attributes but does not implement the required interface
+jsp.error.tld.fn.invalid.signature=Invalid syntax for function signature in 
TLD.  Tag Library: [{0}], Function: [{1}]
+jsp.error.tld.fn.duplicate.name=Duplicate function name [{0}] in tag library 
[{1}]
+jsp.error.tld.fn.invalid.signature.parenexpected=Invalid syntax for function 
signature in TLD.  Parenthesis ''('' expected.  Tag Library: [{0}], Function: 
[{1}].
+jsp.error.tld.mandatory.element.missing=Mandatory TLD element [{0}] missing or 
empty in TLD [{1}]
+jsp.error.dynamic.attributes.not.implemented=The [{0}] tag declares that it 
accepts dynamic attributes but does not implement the required interface
 jsp.error.attribute.noequal=equal symbol expected
 jsp.error.attribute.noquote=quote symbol expected
 jsp.error.attribute.unterminated=attribute value for [{0}] is not properly 
terminated
-jsp.error.attribute.noescape=Attribute value {0} is quoted with {1} which must 
be escaped when used within the value
+jsp.error.attribute.noescape=Attribute value [{0}] is quoted with [{1}] which 
must be escaped when used within the value
 jsp.error.attribute.nowhitespace=The JSP specification requires that an 
attribute name is preceded by whitespace
 jsp.error.attribute.duplicate=Attribute qualified names must be unique within 
an element
-jsp.error.missing.tagInfo=TagInfo object for {0} is missing from TLD
+jsp.error.missing.tagInfo=TagInfo object for [{0}] is missing from TLD
 jsp.error.deferredmethodsignaturewithoutdeferredmethod=Cannot specify a method 
signature if 'deferredMethod' is not 'true'
 jsp.error.deferredvaluetypewithoutdeferredvalue=Cannot specify a value type if 
'deferredValue' is not 'true'
 jsp.error.deferredmethodandvalue='deferredValue' and 'deferredMethod' cannot 
be both 'true'
 jsp.error.fragmentwithtype=Cannot specify both 'fragment' and 'type' 
attributes.  If 'fragment' is present, 'type' is fixed as 
'javax.servlet.jsp.tagext.JspFragment'
 jsp.error.var_and_varReader=Only one of 'var' or 'varReader' may be specified
 jsp.error.missing_var_or_varReader=Missing 'var' or 'varReader' attribute
-jsp.warning.bad.urlpattern.propertygroup=Bad value {0} in the url-pattern 
subelement in web.xml
-jsp.error.literal_with_void=A literal value was specified for attribute {0} 
that is defined as a deferred method with a return type of void. JSP.2.3.4 does 
not permit literal values in this case
-jsp.error.unknown_attribute_type=Unknown attribute type [{1}] for attribute 
{0}.
-jsp.error.coerce_to_type=Cannot coerce value [{2}] to type [{1}] for attribute 
{0}.
+jsp.warning.bad.urlpattern.propertygroup=Bad value [{0}] in the url-pattern 
subelement in web.xml
+jsp.error.literal_with_void=A literal value was specified for attribute [{0}] 
that is defined as a deferred method with a return type of void. JSP.2.3.4 does 
not permit literal values in this case
+jsp.error.unknown_attribute_type=Unknown attribute type [{1}] for attribute 
[{0}].
+jsp.error.coerce_to_type=Cannot coerce value [{2}] to type [{1}] for attribute 
[{0}].
 jsp.error.jspelement.missing.name=Mandatory XML-style 'name' attribute missing
 jsp.error.could.not.add.taglibraries=Could not add one or more tag libraries.
-jsp.error.duplicate.name.jspattribute=The attribute {0} specified in the 
standard or custom action also appears as the value of the name attribute in 
the enclosed jsp:attribute
-jsp.error.not.in.template={0} not allowed in a template text body.
+jsp.error.duplicate.name.jspattribute=The attribute [{0}] specified in the 
standard or custom action also appears as the value of the name attribute in 
the enclosed jsp:attribute
+jsp.error.not.in.template=[{0}] not allowed in a template text body.
 jsp.error.badStandardAction=Invalid standard action
-jsp.error.xml.badStandardAction=Invalid standard action: {0}
+jsp.error.xml.badStandardAction=Invalid standard action: [{0}]
 jsp.error.tagdirective.badbodycontent=Invalid body-content [{0}] in tag 
directive
-jsp.error.simpletag.badbodycontent=The TLD for the class {0} specifies an 
invalid body-content (JSP) for a SimpleTag.
+jsp.error.simpletag.badbodycontent=The TLD for the class [{0}] specifies an 
invalid body-content (JSP) for a SimpleTag.
 jsp.error.config_pagedir_encoding_mismatch=Page-encoding specified in 
jsp-property-group [{0}] is different from that specified in page directive 
[{1}]
 jsp.error.prolog_pagedir_encoding_mismatch=Page-encoding specified in XML 
prolog [{0}] is different from that specified in page directive [{1}]
 jsp.error.prolog_config_encoding_mismatch=Page-encoding specified in XML 
prolog [{0}] is different from that specified in jsp-property-group [{1}]
-jsp.error.attribute.custom.non_rt_with_expr=According to TLD or attribute 
directive in tag file, attribute {0} does not accept any expressions
-jsp.error.attribute.standard.non_rt_with_expr=The {0} attribute of the {1} 
standard action does not accept any expressions
+jsp.error.attribute.custom.non_rt_with_expr=According to TLD or attribute 
directive in tag file, attribute [{0}] does not accept any expressions
+jsp.error.attribute.standard.non_rt_with_expr=The [{0}] attribute of the [{1}] 
standard action does not accept any expressions
 jsp.error.attribute.deferredmix=Cannot use both ${} and #{} EL expressions in 
the same attribute value
-jsp.error.scripting.variable.missing_name=Unable to determine scripting 
variable name from attribute {0}
-jasper.error.emptybodycontent.nonempty=According to TLD, tag {0} must be 
empty, but is not
-jsp.error.tagfile.nameNotUnique=The value of {0} and the value of {1} in line 
{2} are the same.
+jsp.error.scripting.variable.missing_name=Unable to determine scripting 
variable name from attribute [{0}]
+jasper.error.emptybodycontent.nonempty=According to TLD, tag [{0}] must be 
empty, but is not
+jsp.error.tagfile.nameNotUnique=The value of [{0}] and the value of [{1}] in 
line [{2}] are the same.
 jsp.error.tagfile.nameFrom.noAttribute=Cannot find an attribute directive with 
a name attribute with a value [{0}], the value of this name-from-attribute 
attribute.
-jsp.error.tagfile.nameFrom.badAttribute=The attribute directive (declared in 
line {1} and whose name attribute is [{0}], the value of this 
name-from-attribute attribute) must be of type java.lang.String, is "required" 
and not a "rtexprvalue".
+jsp.error.tagfile.nameFrom.badAttribute=The attribute directive (declared in 
line [{1}] and whose name attribute is [{0}], the value of this 
name-from-attribute attribute) must be of type java.lang.String, is "required" 
and not a "rtexprvalue".
 jsp.error.page.noSession=Cannot access session scope in page that does not 
participate in any session
 jsp.error.usebean.noSession=Illegal for useBean to use session scope when JSP 
page declares (via page directive) that it does not participate in sessions
 jsp.error.xml.encodingByteOrderUnsupported = Given byte order for encoding 
[{0}] is not supported.
@@ -299,16 +299,16 @@ jsp.error.xml.versionInfoRequired = The
 jsp.error.xml.xmlDeclUnterminated = The XML declaration must end with "?>".
 jsp.error.xml.reservedPITarget = The processing instruction target matching 
"[xX][mM][lL]" is not allowed.
 jsp.error.xml.spaceRequiredInPI = White space is required between the 
processing instruction target and data.
-jsp.error.xml.invalidCharInContent = An invalid XML character (Unicode: 0x{0}) 
was found in the element content of the document.
+jsp.error.xml.invalidCharInContent = An invalid XML character (Unicode: 
0x[{0}]) was found in the element content of the document.
 jsp.error.xml.spaceRequiredBeforeStandalone = White space is required before 
the encoding pseudo attribute in the XML declaration.
 jsp.error.xml.sdDeclInvalid = The standalone document declaration value must 
be "yes" or "no", not [{0}].
-jsp.error.xml.invalidCharInPI = An invalid XML character (Unicode: 0x{0}) was 
found in the processing instruction.
+jsp.error.xml.invalidCharInPI = An invalid XML character (Unicode: 0x[{0}]) 
was found in the processing instruction.
 jsp.error.xml.versionNotSupported = XML version [{0}] is not supported, only 
XML 1.0 is supported.
 jsp.error.xml.pseudoAttrNameExpected = a pseudo attribute name is expected.
-jsp.error.xml.expectedByte = Expected byte {0} of {1}-byte UTF-8 sequence.
-jsp.error.xml.invalidByte = Invalid byte {0} of {1}-byte UTF-8 sequence.
-jsp.error.xml.operationNotSupported = Operation [{0}] not supported by {1} 
reader.
-jsp.error.xml.invalidHighSurrogate = High surrogate bits in UTF-8 sequence 
must not exceed 0x10 but found 0x{0}.
+jsp.error.xml.expectedByte = Expected byte [{0}] of [{1}]-byte UTF-8 sequence.
+jsp.error.xml.invalidByte = Invalid byte [{0}] of [{1}]-byte UTF-8 sequence.
+jsp.error.xml.operationNotSupported = Operation [{0}] not supported by [{1}] 
reader.
+jsp.error.xml.invalidHighSurrogate = High surrogate bits in UTF-8 sequence 
must not exceed 0x10 but found 0x[{0}].
 jsp.error.xml.invalidASCII = Byte [{0}] not 7-bit ASCII.
 jsp.error.xml.spaceRequiredBeforeEncodingInXMLDecl = White space is required 
before the encoding pseudo attribute in the XML declaration.
 jsp.error.xml.spaceRequiredBeforeEncodingInTextDecl = White space is required 
before the encoding pseudo attribute in the text declaration.
@@ -318,21 +318,21 @@ jsp.error.xml.eqRequiredInXMLDecl = The
 jsp.error.xml.eqRequiredInTextDecl = The '' = '' character must follow [{0}] 
in the text declaration.
 jsp.error.xml.quoteRequiredInTextDecl = The value following [{0}] in the text 
declaration must be a quoted string.
 jsp.error.xml.quoteRequiredInXMLDecl = The value following [{0}] in the XML 
declaration must be a quoted string.
-jsp.error.xml.invalidCharInTextDecl = An invalid XML character (Unicode: 
0x{0}) was found in the text declaration.
-jsp.error.xml.invalidCharInXMLDecl = An invalid XML character (Unicode: 0x{0}) 
was found in the XML declaration.
+jsp.error.xml.invalidCharInTextDecl = An invalid XML character (Unicode: 
0x[{0}]) was found in the text declaration.
+jsp.error.xml.invalidCharInXMLDecl = An invalid XML character (Unicode: 
0x[{0}]) was found in the XML declaration.
 jsp.error.xml.closeQuoteMissingInTextDecl = closing quote in the value 
following [{0}] in the text declaration is missing.
 jsp.error.xml.closeQuoteMissingInXMLDecl = closing quote in the value 
following [{0}] in the XML declaration is missing.
 jsp.error.multiple.jsp = Cannot have multiple specifications of
-jsp.error.jspoutput.conflict=&lt;jsp:output&gt;: illegal to have multiple 
occurrences of [{0}] with different values (old: {1}, new: {2})
+jsp.error.jspoutput.conflict=&lt;jsp:output&gt;: illegal to have multiple 
occurrences of [{0}] with different values (old: [{1}], new: [{2}])
 jsp.error.jspoutput.doctypenamesystem=&lt;jsp:output&gt;: 
'doctype-root-element' and 'doctype-system' attributes must appear together
 jsp.error.jspoutput.doctypepublicsystem=&lt;jsp:output&gt;: 'doctype-system' 
attribute must appear if 'doctype-public' attribute appears
 jsp.error.jspoutput.nonemptybody=&lt;jsp:output&gt; must not have a body
 jsp.error.jspoutput.invalidUse=&lt;jsp:output&gt; must not be used in standard 
syntax
-jsp.error.attributes.not.allowed = {0} must not have any attributes
-jsp.error.tagfile.badSuffix=Missing ".tag" suffix in tag file path {0}
-jsp.error.tagfile.illegalPath=Illegal tag file path: {0}, must start with 
"/WEB-INF/tags" or "/META-INF/tags"
+jsp.error.attributes.not.allowed = [{0}] must not have any attributes
+jsp.error.tagfile.badSuffix=Missing ".tag" suffix in tag file path [{0}]
+jsp.error.tagfile.illegalPath=Illegal tag file path: [{0}], must start with 
"/WEB-INF/tags" or "/META-INF/tags"
 jsp.error.tagfile.missingPath=Path not specified to tag file
-jsp.error.plugin.wrongRootElement=Name of root element in {0} different from 
{1}
+jsp.error.plugin.wrongRootElement=Name of root element in [{0}] different from 
[{1}]
 jsp.error.attribute.invalidPrefix=The attribute prefix [{0}] does not 
correspond to any imported tag library
 jsp.error.nested.jspattribute=A jsp:attribute standard action cannot be nested 
within another jsp:attribute standard action
 jsp.error.nested.jspbody=A jsp:body standard action cannot be nested within 
another jsp:body or jsp:attribute standard action
@@ -342,35 +342,35 @@ jsp.error.variable.alias=Both or none of
 jsp.error.attribute.null_name=Null attribute name
 jsp.error.jsptext.badcontent='&lt;', when appears in the body of 
&lt;jsp:text&gt;, must be encapsulated within a CDATA
 jsp.error.jsproot.version.invalid=Invalid version number: [{0}], must be 
"1.2", "2.0", "2.1", "2.2" or "2.3"
-jsp.error.noFunction=The function {0} cannot be located with the specified 
prefix
+jsp.error.noFunction=The function [{0}] cannot be located with the specified 
prefix
 jsp.error.noFunctionMethod=Method [{0}] for function [{1}] not found in class 
[{2}]
-jsp.error.function.classnotfound=The class {0} specified in TLD for the 
function {1} cannot be found: {2}
-jsp.error.signature.classnotfound=The class {0} specified in the method 
signature in TLD for the function {1} cannot be found. {2}
+jsp.error.function.classnotfound=The class [{0}] specified in TLD for the 
function [{1}] cannot be found: [{2}]
+jsp.error.signature.classnotfound=The class [{0}] specified in the method 
signature in TLD for the function [{1}] cannot be found. [{2}]
 jsp.error.text.has_subelement=&lt;jsp:text&gt; must not have any subelements
 jsp.error.data.file.read=Error reading file [{0}]
 jsp.error.data.file.processing=Error processing file [{0}]
-jsp.error.prefix.refined=Attempt to redefine the prefix {0} to {1}, when it 
was already defined as {2} in the current scope.
+jsp.error.prefix.refined=Attempt to redefine the prefix [{0}] to [{1}], when 
it was already defined as [{2}] in the current scope.
 jsp.error.nested_jsproot=Nested &lt;jsp:root&gt;
 jsp.error.unbalanced.endtag=The end tag "&lt;/{0}" is unbalanced
-jsp.error.invalid.bean=The value for the useBean class attribute {0} is 
invalid.
-jsp.error.prefix.use_before_dcl=The prefix {0} specified in this tag directive 
has been previously used by an action in file {1} line {2}.
+jsp.error.invalid.bean=The value for the useBean class attribute [{0}] is 
invalid.
+jsp.error.prefix.use_before_dcl=The prefix [{0}] specified in this tag 
directive has been previously used by an action in file [{1}] line [{2}].
 jsp.error.lastModified=Unable to determine last modified date for file [{0}]
 jsp.info.ignoreSetting=Ignored setting for [{0}] of [{1}] because a 
SecurityManager was enabled
 
-jsp.exception=An exception occurred processing JSP page {0} at line {1}
+jsp.exception=An exception occurred processing JSP page [{0}] at line [{1}]
 
 # JSP 2.1
 jsp.error.el.template.deferred=#{...} is not allowed in template text
-jsp.error.el.parse={0} : {1}
+jsp.error.el.parse=[{0}] : [{1}]
 jsp.error.page.invalid.deferredsyntaxallowedasliteral=Page directive: invalid 
value for deferredSyntaxAllowedAsLiteral
 jsp.error.tag.invalid.deferredsyntaxallowedasliteral=Tag directive: invalid 
value for deferredSyntaxAllowedAsLiteral
-jsp.error.page.conflict.deferredsyntaxallowedasliteral=Page directive: illegal 
to have multiple occurrences of ''deferredSyntaxAllowedAsLiteral'' with 
different values (old: {0}, new: {1})
-jsp.error.tag.conflict.deferredsyntaxallowedasliteral=Tag directive: illegal 
to have multiple occurrences of ''deferredSyntaxAllowedAsLiteral'' with 
different values (old: {0}, new: {1})
+jsp.error.page.conflict.deferredsyntaxallowedasliteral=Page directive: illegal 
to have multiple occurrences of ''deferredSyntaxAllowedAsLiteral'' with 
different values (old: [{0}], new: [{1}])
+jsp.error.tag.conflict.deferredsyntaxallowedasliteral=Tag directive: illegal 
to have multiple occurrences of ''deferredSyntaxAllowedAsLiteral'' with 
different values (old: [{0}], new: [{1}])
 
 jsp.error.page.invalid.trimdirectivewhitespaces=Page directive: invalid value 
for trimDirectiveWhitespaces
 jsp.error.tag.invalid.trimdirectivewhitespaces=Tag directive: invalid value 
for trimDirectiveWhitespaces
-jsp.error.page.conflict.trimdirectivewhitespaces=Page directive: illegal to 
have multiple occurrences of ''trimDirectiveWhitespaces'' with different values 
(old: {0}, new: {1})
-jsp.error.tag.conflict.trimdirectivewhitespaces=Tag directive: illegal to have 
multiple occurrences of ''trimDirectiveWhitespaces'' with different values 
(old: {0}, new: {1})
+jsp.error.page.conflict.trimdirectivewhitespaces=Page directive: illegal to 
have multiple occurrences of ''trimDirectiveWhitespaces'' with different values 
(old: [{0}], new: [{1}])
+jsp.error.tag.conflict.trimdirectivewhitespaces=Tag directive: illegal to have 
multiple occurrences of ''trimDirectiveWhitespaces'' with different values 
(old: [{0}], new: [{1}])
 
 # JSP Servlet
 jsp.error.servlet.invalid.method=JSPs only permit GET POST or HEAD
@@ -386,12 +386,12 @@ jsp.error.bug48498=Unable to display JSP
 jsp.error.duplicateqname=An attribute with duplicate qualified name [{0}] was 
found. Attribute qualified names must be unique within an element.
 
 # JSP unloading handling
-jsp.message.jsp_queue_created=Created jsp queue with length {0} for context 
[{1}]
+jsp.message.jsp_queue_created=Created jsp queue with length [{0}] for context 
[{1}]
 jsp.message.jsp_added=Adding JSP for path [{0}] to queue of context [{1}]
 jsp.message.jsp_queue_update=Updating JSP for path [{0}] in queue of context 
[{1}]
 jsp.message.jsp_removed_excess=Removing excess JSP for path [{0}] from queue 
of context [{1}]
-jsp.message.jsp_removed_idle=Removing idle JSP for path [{0}] in context [{1}] 
after {2} seconds");
-jsp.message.jsp_unload_check=Checking JSPs for unload in context [{0}], JSP 
count: {1} queue length: {2}
+jsp.message.jsp_removed_idle=Removing idle JSP for path [{0}] in context [{1}] 
after [{2}] seconds");
+jsp.message.jsp_unload_check=Checking JSPs for unload in context [{0}], JSP 
count: [{1}] queue length: [{2}]
 
 xmlParser.skipBomFail=Failed to skip BOM when parsing XML input stream
 
@@ -412,6 +412,6 @@ org.apache.jasper.compiler.ELParser.inva
 org.apache.jasper.compiler.TldCache.servletContextNull=The provided 
ServletContext was null
 
 org.apache.jasper.servlet.JasperInitializer.onStartup=Initializing Jasper for 
context [{0}]
-org.apache.jasper.servlet.TldScanner.webxmlSkip=Skipping load of TLD for URI 
{1} from resource path {0} as it has already been defined in <jsp-config>
-org.apache.jasper.servlet.TldScanner.webxmlAdd=Loading TLD for URI {1} from 
resource path {0}
+org.apache.jasper.servlet.TldScanner.webxmlSkip=Skipping load of TLD for URI 
[{1}] from resource path [{0}] as it has already been defined in <jsp-config>
+org.apache.jasper.servlet.TldScanner.webxmlAdd=Loading TLD for URI [{1}] from 
resource path [{0}]
 org.apache.jasper.servlet.TldScanner.webxmlFailPathDoesNotExist=Failed to 
process TLD with path [{0}] and URI [{1}]. The specified path does not exist.



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to