Author: markt
Date: Mon Oct 2 07:28:14 2017
New Revision: 1810302
URL: http://svn.apache.org/viewvc?rev=1810302&view=rev
Log:
Enable Javadoc to be built with Java 9. (markt)
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/build.xml
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/jmx/package.html
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/package.html
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/package.html
tomcat/tc8.5.x/trunk/java/org/apache/juli/logging/package.html
tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/package.html
tomcat/tc8.5.x/trunk/java/org/apache/naming/java/package.html
tomcat/tc8.5.x/trunk/java/org/apache/naming/package.html
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/package.html
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/package.html
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 2 07:28:14 2017
@@ -1,2 +1,2 @@
/tomcat/tc8.0.x/trunk:1809644
-/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,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,176
8651,1768762,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,17887
53,1788764,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789447,1789453,1789456,1789458,1789461-1789463,1789465-1789467,1789470,1789472,1789474,1789476,1789479-1789480,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,1792140,1792460,1792468,1792791,1792957,1793095,1793121,1793123,1793127,1793136,1793139,1793147-1793148,1793266,1793437,1793449,1793460,1793468,1793487,1793498,1793502,1793514,1793682-1793683,1793711-1793712,1793719,1793736,1793746,1793771,1793776,1793798,1793802,1793812,1793819,1793844,1793854,1793887,1793891,1793898,1793901-1793902,1793907,1793910,1793980,1794674,1794941-1794942,1795278,1795289,1795298,1795305,1795813,1795893,1796090,1796275,1796693-1796695,1796729,1796806,1796836,1796873,1796878,1797197,1797338,17
97344,1797354-1797355,1797516,1797528,1797532,1797536,1797540,1797543,1797677-1797678,1797692,1797694,1797748,1797828,1798126,1798238,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799216,1799231,1799250,1799253,1799285,1799368,1799412,1799515,1799701-1799702,1799704,1799709,1799885,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800629,1800791,1800816,1800850,1800864,1800867,1800874,1800885,1800981,1800984,1800988,1800992,1801195,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802195,1802204-1802205,1802210,1802225-1802226,1802229,1802403,1802475,1802490,1802788,1802796,1802803,1802820,1802828,1802833,1802836,1803030,1803038,1803055,1803135,1803165,1803174,1803193,1803205,1803224,1803278,1803281,1803295,1803297,1803446,1803451,1803456,1803459,1803616,1803636,1803828,1803901,1803972,1804040,1804094,1804306,1804461-1804463,1804501,1804506-1804507,1804754
,1804813,1804888,1804890,1804903-1804908,1804915,1804917,1805523-1805530,1805550,1805612-1805613,1805637,1805645,1805652,1805726,1805752,1805782,1805826,1806307,1806356,1806445,1806736,1806794,1806798,1806801,1806807,1806873,1806966,1807004,1807093,1807135,1807205-1807206,1807237,1807242,1807251,1807282,1807455,1807686,1807698,1807713,1807715,1807729,1807742,1807747,1807751,1807755,1808116,1808156,1808266,1808433,1808438-1808439,1808695,1808701,1808766,1809011,1809025,1809141,1809143-1809144,1809146,1809158,1809212,1809214,1809239,1809248,1809263,1809265,1809317,1809434,1809669,1809671,1809674,1809684,1809711,1809828,1809830,1809908-1809909,1809922,1810106,1810110,1810280
+/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,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,176
8651,1768762,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,17887
53,1788764,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789447,1789453,1789456,1789458,1789461-1789463,1789465-1789467,1789470,1789472,1789474,1789476,1789479-1789480,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,1792140,1792460,1792468,1792791,1792957,1793095,1793121,1793123,1793127,1793136,1793139,1793147-1793148,1793266,1793437,1793449,1793460,1793468,1793487,1793498,1793502,1793514,1793682-1793683,1793711-1793712,1793719,1793736,1793746,1793771,1793776,1793798,1793802,1793812,1793819,1793844,1793854,1793887,1793891,1793898,1793901-1793902,1793907,1793910,1793980,1794674,1794941-1794942,1795278,1795289,1795298,1795305,1795813,1795893,1796090,1796275,1796693-1796695,1796729,1796806,1796836,1796873,1796878,1797197,1797338,17
97344,1797354-1797355,1797516,1797528,1797532,1797536,1797540,1797543,1797677-1797678,1797692,1797694,1797748,1797828,1798126,1798238,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799216,1799231,1799250,1799253,1799285,1799368,1799412,1799515,1799701-1799702,1799704,1799709,1799885,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800629,1800791,1800816,1800850,1800864,1800867,1800874,1800885,1800981,1800984,1800988,1800992,1801195,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802195,1802204-1802205,1802210,1802225-1802226,1802229,1802403,1802475,1802490,1802788,1802796,1802803,1802820,1802828,1802833,1802836,1803030,1803038,1803055,1803135,1803165,1803174,1803193,1803205,1803224,1803278,1803281,1803295,1803297,1803446,1803451,1803456,1803459,1803616,1803636,1803828,1803901,1803972,1804040,1804094,1804306,1804461-1804463,1804501,1804506-1804507,1804754
,1804813,1804888,1804890,1804903-1804908,1804915,1804917,1805523-1805530,1805550,1805612-1805613,1805637,1805645,1805652,1805726,1805752,1805782,1805826,1806307,1806356,1806445,1806736,1806794,1806798,1806801,1806807,1806873,1806966,1807004,1807093,1807135,1807205-1807206,1807237,1807242,1807251,1807282,1807455,1807686,1807698,1807713,1807715,1807729,1807742,1807747,1807751,1807755,1808116,1808156,1808266,1808433,1808438-1808439,1808695,1808701,1808766,1809011,1809025,1809141,1809143-1809144,1809146,1809158,1809212,1809214,1809239,1809248,1809263,1809265,1809317,1809434,1809669,1809671,1809674,1809684,1809711,1809828,1809830,1809908-1809909,1809922,1810106,1810110,1810280,1810300
Modified: tomcat/tc8.5.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.xml?rev=1810302&r1=1810301&r2=1810302&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/build.xml (original)
+++ tomcat/tc8.5.x/trunk/build.xml Mon Oct 2 07:28:14 2017
@@ -191,6 +191,12 @@
<defaultexcludes remove="**/.gitignore" />
<!--<defaultexcludes echo="true" />-->
+ <!-- Java 9 -->
+ <available classname="java.lang.reflect.InaccessibleObjectException"
+ property="java9.add.modules"
+ value="--add-modules java.xml.ws"/>
+ <property name="java9.add.modules" value=""/>
+
<!-- Classpaths -->
<path id="compile.classpath">
<pathelement location="${jdt.jar}"/>
@@ -1848,7 +1854,7 @@ Apache Tomcat ${version} native binaries
encoding="UTF-8"
docencoding="UTF-8"
charset="UTF-8"
- additionalparam="-breakiterator -notimestamp"
+ additionalparam="-breakiterator -notimestamp ${java9.add.modules}"
maxmemory="512m"
failonerror="true"
failonwarning="true">
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/jmx/package.html
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/jmx/package.html?rev=1810302&r1=1810301&r2=1810302&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/jmx/package.html
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/jmx/package.html Mon Oct
2 07:28:14 2017
@@ -27,42 +27,43 @@ http://tomcat.apache.org/tomcat-7.0-doc/
existing one. The following attribute are exists in every tasks:</p>
<table>
+ <caption>Common task attributes</caption>
<tr>
- <th align="center" width="15%">Attribute</th>
- <th align="center" width="85%">Description</th>
+ <th>Attribute</th>
+ <th>Description</th>
</tr>
<tr>
- <td align="center">url</td>
+ <td>url</td>
<td>
The JMX Connection URL of the remote Tomcat MBeansServer.
</td>
</tr>
<tr>
- <td align="center">username</td>
+ <td>username</td>
<td>
The username of a MBeanServer auth, when configured.
</td>
</tr>
<tr>
- <td align="center">password</td>
+ <td>password</td>
<td>
The password of a MBeanServer auth, when configured.
</td>
</tr>
<tr>
- <td align="center">host</td>
+ <td>host</td>
<td>
The JMX Connection host.
</td>
</tr>
<tr>
- <td align="center">port</td>
+ <td>port</td>
<td>
The JMX Connection port.
</td>
</tr>
<tr>
- <td align="center">ref</td>
+ <td>ref</td>
<td>
The name of the ant internal reference for a jmx connection.
</td>
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/package.html
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/package.html?rev=1810302&r1=1810301&r2=1810302&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/package.html (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/package.html Mon Oct 2
07:28:14 2017
@@ -29,12 +29,13 @@ sent directly to the Manager application
</p>
<table>
+ <caption>Task attributes</caption>
<tr>
- <th align="center" width="15%">Attribute</th>
- <th align="center" width="85%">Description</th>
+ <th>Attribute</th>
+ <th>Description</th>
</tr>
<tr>
- <td align="center">url</td>
+ <td>url</td>
<td>
The URL of the Manager web application you will use to
perform the requested operations. If not specified, defaults to
@@ -43,7 +44,7 @@ sent directly to the Manager application
</td>
</tr>
<tr>
- <td align="center">username</td>
+ <td>username</td>
<td>
The username of a Tomcat user that has been configured with the
<code>manager-script</code> role, as required to execute Manager
@@ -51,7 +52,7 @@ sent directly to the Manager application
</td>
</tr>
<tr>
- <td align="center">password</td>
+ <td>password</td>
<td>
The password of a Tomcat user that has been configured with the
<code>manager-script</code> role, as required to execute Manager
@@ -59,7 +60,7 @@ sent directly to the Manager application
</td>
</tr>
<tr>
- <td align="center">config</td>
+ <td>config</td>
<td>
A URL pointing at the context configuration file (i.e. a file
containing only the <code><Context></code> element, and
@@ -70,7 +71,7 @@ sent directly to the Manager application
</td>
</tr>
<tr>
- <td align="center">path</td>
+ <td>path</td>
<td>
The context path (including the leading slash) of the web application
this command is intended to manage, or a zero-length string for the
@@ -81,7 +82,7 @@ sent directly to the Manager application
</td>
</tr>
<tr>
- <td align="center">war</td>
+ <td>war</td>
<td>
A <code>jar:</code> URL that points at a web application archive (WAR)
file, or a <code>file:</code> URL that points at an unpacked directory
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/package.html
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/package.html?rev=1810302&r1=1810301&r2=1810302&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/package.html (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/package.html Mon Oct
2 07:28:14 2017
@@ -14,8 +14,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<head>
+<title>Apache Tribes - The Tomcat Cluster Communication Module</title>
+</head>
<body>
-<head><title>Apache Tribes - The Tomcat Cluster Communication Module</title>
<h3>QuickStart</h3>
<pre><code>
//create a channel
Modified: tomcat/tc8.5.x/trunk/java/org/apache/juli/logging/package.html
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/juli/logging/package.html?rev=1810302&r1=1810301&r2=1810302&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/juli/logging/package.html (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/juli/logging/package.html Mon Oct 2
07:28:14 2017
@@ -32,6 +32,6 @@ logging and use commons-logging-jdk.jar.
</p>
<p>This package generates commons-logging-jdk14.jar - i.e. the java.util
implementation
-of commons-logging api.<p>
+of commons-logging api.</p>
</body>
Modified: tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/package.html
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/package.html?rev=1810302&r1=1810301&r2=1810302&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/package.html (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/package.html Mon Oct 2
07:28:14 2017
@@ -18,6 +18,4 @@
<p>This package contains object factories used by the naming service.</p>
-<p></p>
-
</body>
Modified: tomcat/tc8.5.x/trunk/java/org/apache/naming/java/package.html
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/naming/java/package.html?rev=1810302&r1=1810301&r2=1810302&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/naming/java/package.html (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/naming/java/package.html Mon Oct 2
07:28:14 2017
@@ -18,6 +18,4 @@
<p>This package contains the URL context factory for the "java" namespace.</p>
-<p></p>
-
</body>
Modified: tomcat/tc8.5.x/trunk/java/org/apache/naming/package.html
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/naming/package.html?rev=1810302&r1=1810301&r2=1810302&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/naming/package.html (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/naming/package.html Mon Oct 2
07:28:14 2017
@@ -18,6 +18,4 @@
<p>This package contains a memory based naming service provider.</p>
-<p></p>
-
</body>
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/package.html
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/package.html?rev=1810302&r1=1810301&r2=1810302&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/package.html (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/package.html Mon Oct
2 07:28:14 2017
@@ -34,5 +34,4 @@ other tuned encoders could be added.
My benchmarks ( I'm costin :-) show only small differences between C2B, B2C
and hand-written codders/decoders,
so UTF8Decoder may be disabled.
-<p>
</body></html>
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/package.html
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/package.html?rev=1810302&r1=1810301&r2=1810302&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/package.html
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/package.html Mon
Oct 2 07:28:14 2017
@@ -23,7 +23,7 @@ The Digester package provides for rules-
XML documents.
<br><br>
<a name="doc.Description"></a>
-<div align="center">
+<div>
<a href="#doc.Intro">[Introduction]</a>
<a href="#doc.Properties">[Configuration Properties]</a>
<a href="#doc.Stack">[The Object Stack]</a>
@@ -95,12 +95,13 @@ parse.</p>
<blockquote>
<table border="1">
+ <caption>Digester Configuration Properties</caption>
<tr>
- <th width="15%">Property</th>
- <th width="85%">Description</th>
+ <th>Property</th>
+ <th>Description</th>
</tr>
<tr>
- <td align="center">classLoader</td>
+ <td>classLoader</td>
<td>You can optionally specify the class loader that will be used to
load classes when required by the <code>ObjectCreateRule</code>
and <code>FactoryCreateRule</code> rules. If not specified,
@@ -110,14 +111,14 @@ parse.</p>
used to load the <code>Digester</code> class itself.</td>
</tr>
<tr>
- <td align="center">errorHandler</td>
+ <td>errorHandler</td>
<td>You can optionally specify a SAX <code>ErrorHandler</code> that
is notified when parsing errors occur. By default, any parsing
errors that are encountered are logged, but Digester will continue
processing as well.</td>
</tr>
<tr>
- <td align="center">namespaceAware</td>
+ <td>namespaceAware</td>
<td>A boolean that is set to <code>true</code> to perform parsing in a
manner that is aware of XML namespaces. Among other things, this
setting affects how elements are matched to processing rules. See
@@ -125,7 +126,7 @@ parse.</p>
information.</td>
</tr>
<tr>
- <td align="center">ruleNamespaceURI</td>
+ <td>ruleNamespaceURI</td>
<td>The public URI of the namespace for which all subsequently added
rules are associated, or <code>null</code> for adding rules that
are not associated with any namespace. See
@@ -133,7 +134,7 @@ parse.</p>
information.</td>
</tr>
<tr>
- <td align="center">rules</td>
+ <td>rules</td>
<td>The <code>Rules</code> component that actually performs matching of
<code>Rule</code> instances against the current element nesting
pattern is pluggable. By default, Digester includes a
@@ -143,7 +144,7 @@ parse.</p>
more information.</td>
</tr>
<tr>
- <td align="center">useContextClassLoader</code>
+ <td>useContextClassLoader</td>
<td>A boolean that is set to <code>true</code> if you want application
classes required by <code>FactoryCreateRule</code> and
<code>ObjectCreateRule</code> to be loaded from the context class
@@ -154,7 +155,7 @@ parse.</p>
will be used unconditionally.</td>
</tr>
<tr>
- <td align="center">validating</td>
+ <td>validating</td>
<td>A boolean that is set to <code>true</code> if you wish to validate
the XML document against a Document Type Definition (DTD) that is
specified in its <code>DOCTYPE</code> declaration. The default
@@ -268,7 +269,7 @@ such arrangements are called <em>element
pattern is matched whenever an <code><a></code> top-level element is
encountered in the XML document, no matter how many times it occurs. Note that
nested <code><a></code> elements will <strong>not</strong> match this
-pattern -- we will describe means to support this kind of matching later.</li>
+pattern -- we will describe means to support this kind of matching later.</p>
<p>The next step up in matching pattern complexity is "a/b". This pattern will
be matched when a <code><b></code> element is found nested inside a
@@ -448,7 +449,7 @@ works before you start using Digester se
<h3>Usage Examples</h3>
-<h5>Creating a Simple Object Tree</h5>
+<h4>Creating a Simple Object Tree</h4>
<p>Let's assume that you have two simple JavaBeans, <code>Foo</code> and
<code>Bar</code>, with the following method signatures:</p>
@@ -528,7 +529,7 @@ have had its properties set, and all of
created for you.</p>
-<h5>Processing A Struts Configuration File</h5>
+<h4>Processing A Struts Configuration File</h4>
<p>As stated earlier, the primary reason that the
<code>Digester</code> package was created is because the
@@ -622,7 +623,7 @@ now represented as collections of object
servlet, as well as being exposed as servlet context attributes.</p>
-<h5>Parsing Body Text In XML Files</h5>
+<h4>Parsing Body Text In XML Files</h4>
<p>The Digester module also allows you to process the nested body text in an
XML file, not just the elements and attributes that are encountered. The
@@ -861,7 +862,7 @@ Example usage:
digester.setRules(new RegexRules(new SimpleRegexMatcher()));
...
</pre>
-<h5>RegexMatchers</h5>
+<h4>RegexMatchers</h4>
<p>
<code>Digester</code> ships only with one <code>RegexMatcher</code>
implementation: <a href='SimpleRegexMatcher.html'>SimpleRegexMatcher</a>.
@@ -987,7 +988,7 @@ the term <em>named stack</em> comes from
accessed through calls to:
</p>
<ul>
- <li><a href='Digester.html#push(java.lang.String, java.lang.Object)'>
+ <li><a href='Digester.html#push(java.lang.String,%20java.lang.Object)'>
void push(String stackName, Object value)</a></li>
<li><a href='Digester.html#pop(java.lang.String)'>
Object pop(String stackName)</a></li>
@@ -1063,9 +1064,9 @@ but ships with a simple internal impleme
to be easily associated with <code><em>public-identifiers</em></code>.
</p>
<p>For example:</p>
-<code><pre>
+<pre>
digester.register("-//Example Dot Com //DTD Sample Example//EN",
"assets/sample.dtd");
-</pre></code>
+</pre>
<p>
will make digester return the relative file path <code>assets/sample.dtd</code>
whenever an external entity with public id
@@ -1091,7 +1092,7 @@ that developers know all about. The seco
of the XML cannot be completed. So, to diagnose the cause a certain
familiarity with
the way that SAX error handling works is very useful.
</p>
-<h5>Diagnosing SAX Exceptions</h5>
+<h4>Diagnosing SAX Exceptions</h4>
<p>
This is a short, potted guide to SAX error handling strategies. It's not
intended as a
proper guide to error handling in SAX.
@@ -1116,16 +1117,15 @@ exception to diagnose what went wrong.
</p>
<a name="doc.FAQ"></a>
<h3>Frequently Asked Questions</h3>
-<p><ul>
+<ul>
<li><strong>Why do I get warnings when using a JAXP 1.1 parser?</strong>
-<p>If you're using a JAXP 1.1 parser, you might see the following warning (in
your log):
-<code><pre>
+If you're using a JAXP 1.1 parser, you might see the following warning (in
your log):
+<pre>
[WARN] Digester - -Error: JAXP SAXParser property not recognized:
http://java.sun.com/xml/jaxp/properties/schemaLanguage
-</pre></code>
+</pre>
This property is needed for JAXP 1.2 (XML Schema support) as required
for the Servlet Spec. 2.4 but is not recognized by JAXP 1.1 parsers.
-This warning is harmless.</p>
-<p>
+This warning is harmless.
</li>
<li><strong>Why Doesn't Schema Validation Work With Parser XXX Out Of The
Box?</strong>
<p>
@@ -1160,7 +1160,7 @@ Digester logs but the processing will co
</p>
<li><strong>Where Can I Find Example Code?</strong>
-<a name="doc.FAQ.Examples">
+<a name="doc.FAQ.Examples"></a>
<p>Digester ships with a sample application: a mapping for the <em>Rich Site
Summary</em> format used by many newsfeeds. Download the source distribution
to see how it works.</p>
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1810302&r1=1810301&r2=1810302&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Mon Oct 2 07:28:14 2017
@@ -45,6 +45,13 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 8.5.24 (markt)" rtext="in development">
+ <subsection name="Web applications">
+ <changelog>
+ <fix>
+ Enable Javadoc to be built with Java 9. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
