Author: ebourg
Date: Fri Jun 22 06:53:29 2018
New Revision: 1834075
URL: http://svn.apache.org/viewvc?rev=1834075&view=rev
Log:
Use https URLs in the documentation when possible
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/BUILDING.txt
tomcat/tc8.5.x/trunk/CONTRIBUTING.md
tomcat/tc8.5.x/trunk/NOTICE
tomcat/tc8.5.x/trunk/README.md
tomcat/tc8.5.x/trunk/RELEASE-NOTES
tomcat/tc8.5.x/trunk/RUNNING.txt
tomcat/tc8.5.x/trunk/bin/service.bat
tomcat/tc8.5.x/trunk/build.properties.default
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/core/StandardWrapper.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/Constants.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/FileResource.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/package.html
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/codec/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/package.html
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/ (props
changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/package-info.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/package-info.java
tomcat/tc8.5.x/trunk/modules/jdbc-pool/build.properties.default
tomcat/tc8.5.x/trunk/modules/jdbc-pool/build.xml
tomcat/tc8.5.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
tomcat/tc8.5.x/trunk/modules/jdbc-pool/doc/package.xsl
tomcat/tc8.5.x/trunk/modules/jdbc-pool/pom.xml
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
tomcat/tc8.5.x/trunk/res/maven/tomcat-annotations-api.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-api.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-catalina-ant.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-catalina-ha.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-catalina-jmx-remote.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-catalina-ws.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-catalina.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-coyote.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-dbcp.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-el-api.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-embed-core.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-embed-el.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-embed-jasper.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-embed-websocket.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-i18n-es.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-i18n-fr.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-i18n-ja.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-jasper-el.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-jasper.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-jaspic-api.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-jdbc.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-jni.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-jsp-api.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-juli.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-servlet-api.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-storeconfig.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-tribes.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-util-scan.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-util.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-websocket-api.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-websocket.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat.pom
tomcat/tc8.5.x/trunk/res/rat/rat-excludes.txt
tomcat/tc8.5.x/trunk/res/tomcat.nsi
tomcat/tc8.5.x/trunk/res/welcome.bin.html
tomcat/tc8.5.x/trunk/res/welcome.main.html
tomcat/tc8.5.x/trunk/webapps/ROOT/index.jsp
tomcat/tc8.5.x/trunk/webapps/docs/api/index.html
tomcat/tc8.5.x/trunk/webapps/docs/appdev/installation.xml
tomcat/tc8.5.x/trunk/webapps/docs/appdev/introduction.xml
tomcat/tc8.5.x/trunk/webapps/docs/appdev/processes.xml
tomcat/tc8.5.x/trunk/webapps/docs/appdev/project.xml
tomcat/tc8.5.x/trunk/webapps/docs/appdev/source.xml
tomcat/tc8.5.x/trunk/webapps/docs/apr.xml
tomcat/tc8.5.x/trunk/webapps/docs/architecture/project.xml
tomcat/tc8.5.x/trunk/webapps/docs/building.xml
tomcat/tc8.5.x/trunk/webapps/docs/class-loader-howto.xml
tomcat/tc8.5.x/trunk/webapps/docs/cluster-howto.xml
tomcat/tc8.5.x/trunk/webapps/docs/comments.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/ajp.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/context.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/filter.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/jaspic.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/project.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/realm.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/server.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/systemprops.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/valve.xml
tomcat/tc8.5.x/trunk/webapps/docs/deployer-howto.xml
tomcat/tc8.5.x/trunk/webapps/docs/developers.xml
tomcat/tc8.5.x/trunk/webapps/docs/elapi/index.html
tomcat/tc8.5.x/trunk/webapps/docs/funcspecs/fs-admin-apps.xml
tomcat/tc8.5.x/trunk/webapps/docs/funcspecs/fs-default.xml
tomcat/tc8.5.x/trunk/webapps/docs/funcspecs/project.xml
tomcat/tc8.5.x/trunk/webapps/docs/index.xml
tomcat/tc8.5.x/trunk/webapps/docs/introduction.xml
tomcat/tc8.5.x/trunk/webapps/docs/jasper-howto.xml
tomcat/tc8.5.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml
tomcat/tc8.5.x/trunk/webapps/docs/jndi-resources-howto.xml
tomcat/tc8.5.x/trunk/webapps/docs/jspapi/index.html
tomcat/tc8.5.x/trunk/webapps/docs/logging.xml
tomcat/tc8.5.x/trunk/webapps/docs/manager-howto.xml
tomcat/tc8.5.x/trunk/webapps/docs/maven-jars.xml
tomcat/tc8.5.x/trunk/webapps/docs/project.xml
tomcat/tc8.5.x/trunk/webapps/docs/realm-howto.xml
tomcat/tc8.5.x/trunk/webapps/docs/servletapi/index.html
tomcat/tc8.5.x/trunk/webapps/docs/ssi-howto.xml
tomcat/tc8.5.x/trunk/webapps/docs/ssl-howto.xml
tomcat/tc8.5.x/trunk/webapps/docs/tomcat-docs.xsl
tomcat/tc8.5.x/trunk/webapps/docs/tribes/project.xml
tomcat/tc8.5.x/trunk/webapps/docs/web-socket-howto.xml
tomcat/tc8.5.x/trunk/webapps/docs/websocketapi/index.html
tomcat/tc8.5.x/trunk/webapps/docs/windows-auth-howto.xml
tomcat/tc8.5.x/trunk/webapps/docs/windows-service-howto.xml
tomcat/tc8.5.x/trunk/webapps/examples/jsp/index.html
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 22 06:53:29 2018
@@ -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,1739492,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,1744149,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,1747
404,1747506,1747536,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-1
756289,1756408-1756410,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-176205
3,1762123,1762168,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,1763748,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,176
8283,1768520,1768569,1768651,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,1771226,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,1778575,1778582,1778600,1778603,1779312,1779370,1779545,1779612,1779622,1779641,1779654,1779708,1779718,1779897,1779899,1779932,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,1787662,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,1788543-17885
44,1788548,1788550,1788554,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,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,1789685,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790213,1790376,1790443,1790614,1790983,1790991,1791027-1791028,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,1793716,1793719,1793736,1793746,1793758,1793771,1793776,1793798,1793802,1793812,1793819,1793844,1793854,1793887,1793891,1793898,1793901-1793902,1793907,1793910,1793980,17
94556,1794674,1794941-1794942,1795278,1795289,1795298,1795305,1795813,1795893,1796090,1796275,1796693-1796695,1796729,1796806,1796836,1796873,1796878,1797197,1797338,1797344,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,1799498,1799514-1799515,1799677,1799701-1799702,1799704,1799709,1799885,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800617,1800629,1800791,1800816,1800850,1800864,1800867,1800874,1800885,1800980-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,1806973,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,1808466,1808481-1808482,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,1811031,1811119,1811122,1811132,1811137,1811139,1811174,1811176,1811
198-1811201,1811203-1811206,1811220,1811235,1811246,1811327-1811329,1811350,1811560,1811704,1811837-1811839,1811861,1811932,1812087-1812088,1812092,1812094,1812103,1812107,1812113,1812129,1812134-1812136,1812184,1812315,1812401,1812489,1812513,1812617,1813919,1814192,1814195,1814567,1814825,1814973,1814980,1815066,1815069,1815208,1815215,1815318-1815319,1815325,1815385,1815429,1815441-1815442,1815451,1815459,1815465,1815505,1815615,1815778,1815786,1815790,1815793,1815800,1815802,1815806,1815826,1815829,1815834,1815840,1815903,1815944,1815954,1816076,1816078,1816083,1816087,1816120,1816128,1816140,1816147,1816157,1816338,1816431,1816443,1816538,1816541,1816545,1816549-1816550,1816563,1816570,1816647,1816695-1816704,1816716,1816780,1816887,1817089,1817092,1817096,1817104,1817126,1817136-1817137,1817196,1817223,1817298,1817305,1817495,1817517,1817520,1817965,1817997,1817999-1818001,1818004,1818179,1818184,1818438,1818711,1818919,1818976,1819054,1819057,1819061,1819063,1819068,1819070-1
819071,1819074,1819077,1819148,1819903,1820003,1820005,1820138,1820153,1820194,1820196-1820197,1820202,1820206,1820222,1820265,1820272,1820276,1820279,1820281,1820302,1820634,1820701,1820705,1820932,1820981,1820994,1821157,1821167,1821197-1821203,1821225,1821234-1821235,1821251-1821252,1821293,1821328,1821381,1821490,1821708,1821932,1822001,1822016,1822109,1822111,1822116,1822150,1822232,1822524,1822644,1822775,1822945-1822946,1823006-1823007,1823102,1823111,1823150,1823161,1823262,1823306,1823310,1823337,1823481,1823483,1823492,1823495,1823540,1823620,1824154,1824201,1824228,1824254,1824263,1824297,1824301,1824311,1824323,1824357,1824766,1824774,1824892,1824901,1824959,1825054,1825516,1825519,1825713,1825738,1825872,1825909,1825943,1825987,1826048,1826111,1826115,1826209,1826361,1826375,1826688,1826731,1826794,1826812,1826817,1826825,1826867,1826869,1826958,1826975,1826977,1826979,1826985-1826986,1827150,1827203-1827204,1827223,1827297,1827299,1827363,1827368,1827396,1827408,182742
8,1827479,1827491,1827498,1827860,1828016,1828223-1828239,1828253,1828262,1828545,1828551,1828565,1828946,1829082,1829084,1829086,1829276,1829355,1829364,1829366,1829830,1829879,1829915,1829924,1829934,1829990-1829991,1830013,1830051,1830068,1830087,1830325,1830336,1830341,1830367,1830373,1830378,1830549,1830669-1830670,1830764-1830765,1830772,1830802,1830861,1830864,1830989,1830999-1831001,1831251,1831256,1831262,1831333,1831338,1831341-1831342,1831389,1831410,1831439,1831483,1831486,1831556,1831568,1831573,1831691,1831718,1831726,1831763,1831828,1831985,1832124-1832125,1832127,1832129,1832160,1832163,1832193,1832262,1832518-1832519,1832525-1832526,1832545,1832554,1832572,1832592,1832596,1832602,1832619,1832665,1832692,1832696,1832704,1832707,1832744,1832843,1832856,1832882,1832925,1832965,1833001,1833016,1833062,1833071,1833737,1833757,1833768-1833770,1833794-1833800,1833825,1833831,1833906,1833915,1833918,1833982,1834058
+/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,1739492,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,1744149,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,1747
404,1747506,1747536,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-1
756289,1756408-1756410,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-176205
3,1762123,1762168,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,1763748,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,176
8283,1768520,1768569,1768651,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,1771226,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,1778575,1778582,1778600,1778603,1779312,1779370,1779545,1779612,1779622,1779641,1779654,1779708,1779718,1779897,1779899,1779932,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,1787662,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,1788543-17885
44,1788548,1788550,1788554,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,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,1789685,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790213,1790376,1790443,1790614,1790983,1790991,1791027-1791028,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,1793716,1793719,1793736,1793746,1793758,1793771,1793776,1793798,1793802,1793812,1793819,1793844,1793854,1793887,1793891,1793898,1793901-1793902,1793907,1793910,1793980,17
94556,1794674,1794941-1794942,1795278,1795289,1795298,1795305,1795813,1795893,1796090,1796275,1796693-1796695,1796729,1796806,1796836,1796873,1796878,1797197,1797338,1797344,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,1799498,1799514-1799515,1799677,1799701-1799702,1799704,1799709,1799885,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800617,1800629,1800791,1800816,1800850,1800864,1800867,1800874,1800885,1800980-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,1806973,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,1808466,1808481-1808482,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,1811031,1811119,1811122,1811132,1811137,1811139,1811174,1811176,1811
198-1811201,1811203-1811206,1811220,1811235,1811246,1811327-1811329,1811350,1811560,1811704,1811837-1811839,1811861,1811932,1812087-1812088,1812092,1812094,1812103,1812107,1812113,1812129,1812134-1812136,1812184,1812315,1812401,1812489,1812513,1812617,1813919,1814192,1814195,1814567,1814825,1814973,1814980,1815066,1815069,1815208,1815215,1815318-1815319,1815325,1815385,1815429,1815441-1815442,1815451,1815459,1815465,1815505,1815615,1815778,1815786,1815790,1815793,1815800,1815802,1815806,1815826,1815829,1815834,1815840,1815903,1815944,1815954,1816076,1816078,1816083,1816087,1816120,1816128,1816140,1816147,1816157,1816338,1816431,1816443,1816538,1816541,1816545,1816549-1816550,1816563,1816570,1816647,1816695-1816704,1816716,1816780,1816887,1817089,1817092,1817096,1817104,1817126,1817136-1817137,1817196,1817223,1817298,1817305,1817495,1817517,1817520,1817965,1817997,1817999-1818001,1818004,1818179,1818184,1818438,1818711,1818919,1818976,1819054,1819057,1819061,1819063,1819068,1819070-1
819071,1819074,1819077,1819148,1819903,1820003,1820005,1820138,1820153,1820194,1820196-1820197,1820202,1820206,1820222,1820265,1820272,1820276,1820279,1820281,1820302,1820634,1820701,1820705,1820932,1820981,1820994,1821157,1821167,1821197-1821203,1821225,1821234-1821235,1821251-1821252,1821293,1821328,1821381,1821490,1821708,1821932,1822001,1822016,1822109,1822111,1822116,1822150,1822232,1822524,1822644,1822775,1822945-1822946,1823006-1823007,1823102,1823111,1823150,1823161,1823262,1823306,1823310,1823337,1823481,1823483,1823492,1823495,1823540,1823620,1824154,1824201,1824228,1824254,1824263,1824297,1824301,1824311,1824323,1824357,1824766,1824774,1824892,1824901,1824959,1825054,1825516,1825519,1825713,1825738,1825872,1825909,1825943,1825987,1826048,1826111,1826115,1826209,1826361,1826375,1826688,1826731,1826794,1826812,1826817,1826825,1826867,1826869,1826958,1826975,1826977,1826979,1826985-1826986,1827150,1827203-1827204,1827223,1827297,1827299,1827363,1827368,1827396,1827408,182742
8,1827479,1827491,1827498,1827860,1828016,1828223-1828239,1828253,1828262,1828545,1828551,1828565,1828946,1829082,1829084,1829086,1829276,1829355,1829364,1829366,1829830,1829879,1829915,1829924,1829934,1829990-1829991,1830013,1830051,1830068,1830087,1830325,1830336,1830341,1830367,1830373,1830378,1830549,1830669-1830670,1830764-1830765,1830772,1830802,1830861,1830864,1830989,1830999-1831001,1831251,1831256,1831262,1831333,1831338,1831341-1831342,1831389,1831410,1831439,1831483,1831486,1831556,1831568,1831573,1831691,1831718,1831726,1831763,1831828,1831985,1832124-1832125,1832127,1832129,1832160,1832163,1832193,1832262,1832518-1832519,1832525-1832526,1832545,1832554,1832572,1832592,1832596,1832602,1832619,1832665,1832692,1832696,1832704,1832707,1832744,1832843,1832856,1832882,1832925,1832965,1833001,1833016,1833062,1833071,1833737,1833757,1833768-1833770,1833794-1833800,1833825,1833831,1833906,1833915,1833918,1833982,1833989,1834058
Modified: tomcat/tc8.5.x/trunk/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/BUILDING.txt?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/BUILDING.txt (original)
+++ tomcat/tc8.5.x/trunk/BUILDING.txt Fri Jun 22 06:53:29 2018
@@ -21,7 +21,7 @@
This subproject contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a
container that
implements the Servlet 3.1, JSP 2.3, EL 3.0, WebSocket 1.1 and JASPIC 1.1
-specifications from the Java Community Process <http://www.jcp.org/>.
+specifications from the Java Community Process <https://www.jcp.org/>.
Note: If you just need to run Apache Tomcat, it is not necessary to build
it. You may simply download a binary distribution. It is cross-platform.
@@ -56,7 +56,7 @@ source distribution, do the following:
See Apache Commons DBCP project web site for more details on
available versions of the library and its requirements,
- http://commons.apache.org/dbcp/
+ https://commons.apache.org/dbcp/
3. Install the JDK according to the instructions included with the release.
@@ -71,7 +71,7 @@ source distribution, do the following:
2. Download a binary distribution of Ant from:
- http://ant.apache.org/bindownload.cgi
+ https://ant.apache.org/bindownload.cgi
3. Unpack the binary distribution into a convenient location so that the
Ant release resides in its own directory (conventionally named
@@ -99,11 +99,11 @@ package.
* Tomcat SVN repository URL:
- http://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/trunk/
+
https://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/trunk/
* Source packages can be downloaded from:
- http://tomcat.apache.org/download-@version_ma...@0.cgi
+ https://tomcat.apache.org/download-@version_ma...@0.cgi
The location where the source has been placed will be further referred as
${tomcat.source}.
Modified: tomcat/tc8.5.x/trunk/CONTRIBUTING.md
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/CONTRIBUTING.md?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/CONTRIBUTING.md (original)
+++ tomcat/tc8.5.x/trunk/CONTRIBUTING.md Fri Jun 22 06:53:29 2018
@@ -4,17 +4,17 @@ Firstly, thanks for your interest in con
pleasant first experience for you, and that you will return to continue
contributing.
-Please visit our [Get Involved page](http://tomcat.apache.org/getinvolved.html)
+Please visit our [Get Involved
page](https://tomcat.apache.org/getinvolved.html)
for more information on how to contribute.
## Code of Conduct
This project and everyone participating in it is governed by the Apache
software Foundation's
-[Code of Conduct](http://www.apache.org/foundation/policies/conduct.html). By
+[Code of Conduct](https://www.apache.org/foundation/policies/conduct.html). By
participating, you are expected to adhere to this code. If you are aware of
unacceptable behavior, please visit the
-[Reporting Guidelines
page](http://www.apache.org/foundation/policies/conduct.html#reporting-guidelines)
+[Reporting Guidelines
page](https://www.apache.org/foundation/policies/conduct.html#reporting-guidelines)
and follow the instructions there.
## How Can I Contribute?
@@ -25,7 +25,7 @@ for us to fix.
### Reporting Bugs
-Please review our [guide](http://tomcat.apache.org/bugreport.html) on how to
+Please review our [guide](https://tomcat.apache.org/bugreport.html) on how to
submit a bug report. This page also has links to other resources to assist
you.
@@ -36,7 +36,7 @@ you.
Unsure where to begin contributing to Tomcat? You can start by taking a look at
the issues marked 'Beginner', link below. Please note that the Beginner keyword
is pretty new to the project, so if there aren't any issues in the filter feel
-free to ask on the [dev list](http://tomcat.apache.org/lists.html#tomcat-dev).
+free to ask on the [dev list](https://tomcat.apache.org/lists.html#tomcat-dev).
* [Beginner
issues](https://bz.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&keywords=Beginner&keywords_type=allwords&list_id=160824&product=Tomcat%207&product=Tomcat%208&product=Tomcat%209&query_format=advanced)
-
issues which should only require a few lines of code, and a test or two to
@@ -84,7 +84,7 @@ can download the sources from the "Sourc
If you have chosen to attach a patch to the Bugzilla issue (or email
one), then you'll need to checkout the SVN version. Instructions for new
committers to learn how to do this are found
-[here](http://www.apache.org/dev/contributors.html#svnbasics). However, in the
+[here](https://www.apache.org/dev/contributors.html#svnbasics). However, in the
interest of a fast ramp up, the short version is below. Note that the root of
the SVN repository is
[tomcat/trunk](http://svn.apache.org/repos/asf/tomcat/trunk),
Modified: tomcat/tc8.5.x/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/NOTICE?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/NOTICE (original)
+++ tomcat/tc8.5.x/trunk/NOTICE Fri Jun 22 06:53:29 2018
@@ -2,11 +2,11 @@ Apache Tomcat
Copyright 1999-2018 The Apache Software Foundation
This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+The Apache Software Foundation (https://www.apache.org/).
This software contains code derived from netty-native
developed by the Netty project
-(http://netty.io, https://github.com/netty/netty-tcnative/)
+(https://netty.io, https://github.com/netty/netty-tcnative/)
and from finagle-native developed at Twitter
(https://github.com/twitter/finagle).
@@ -19,7 +19,7 @@ http://nsis.sourceforge.net.
Java compilation software for JSP pages is provided by the Eclipse
JDT Core Batch Compiler component, which is open source software.
The original software and related information is available at
-http://www.eclipse.org/jdt/core/.
+https://www.eclipse.org/jdt/core/.
For portions of the Tomcat JNI OpenSSL API and the OpenSSL JSSE integration
The org.apache.tomcat.jni and the org.apache.tomcat.net.openssl packages
Modified: tomcat/tc8.5.x/trunk/README.md
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/README.md?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/README.md (original)
+++ tomcat/tc8.5.x/trunk/README.md Fri Jun 22 06:53:29 2018
@@ -6,20 +6,20 @@ The Apache Tomcat® software is an ope
Servlet, JavaServer Pages, Java Expression Language and Java WebSocket
technologies. The Java Servlet, JavaServer Pages, Java Expression Language and
Java WebSocket specifications are developed under the
-[Java Community Process](http://jcp.org/en/introduction/overview).
+[Java Community Process](https://jcp.org/en/introduction/overview).
The Apache Tomcat software is developed in an open and participatory
environment and released under the
-[Apache License version 2](http://www.apache.org/licenses/). The Apache Tomcat
+[Apache License version 2](https://www.apache.org/licenses/). The Apache Tomcat
project is intended to be a collaboration of the best-of-breed developers from
around the world. We invite you to participate in this open development
project. To learn more about getting involved,
-[click here](http://tomcat.apache.org/getinvolved.html) or keep reading.
+[click here](https://tomcat.apache.org/getinvolved.html) or keep reading.
Apache Tomcat software powers numerous large-scale, mission-critical web
applications across a diverse range of industries and organizations. Some of
these users and their stories are listed on the
-[PoweredBy wiki page](http://wiki.apache.org/tomcat/PoweredBy).
+[PoweredBy wiki page](https://wiki.apache.org/tomcat/PoweredBy).
Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
project logo are trademarks of the Apache Software Foundation.
@@ -34,7 +34,7 @@ The documentation available as of the da
included in the docs webapp which ships with tomcat. You can access that webapp
by starting tomcat and visiting http://localhost:8080/docs/ in your browser.
The most up-to-date documentation can be found at
-http://tomcat.apache.org/tomcat-9.0-doc/.
+https://tomcat.apache.org/tomcat-9.0-doc/.
### Installation
@@ -47,22 +47,22 @@ Please see [LICENSE](LICENSE) for more i
### Support and Mailing List Information
* Free community support is available through the
-[tomcat-users](http://tomcat.apache.org/lists.html#tomcat-users) email list and
-a dedicated [IRC channel](http://tomcat.apache.org/irc.html) (#tomcat on
+[tomcat-users](https://tomcat.apache.org/lists.html#tomcat-users) email list
and
+a dedicated [IRC channel](https://tomcat.apache.org/irc.html) (#tomcat on
Freenode).
* If you want freely available support for running Apache Tomcat, please see
the
-resources page [here](http://tomcat.apache.org/findhelp.html).
+resources page [here](https://tomcat.apache.org/findhelp.html).
* If you want to be informed about new code releases, bug fixes,
security fixes, general news and information about Apache Tomcat, please
subscribe to the
-[tomcat-announce](http://tomcat.apache.org/lists.html#tomcat-announce) email
+[tomcat-announce](https://tomcat.apache.org/lists.html#tomcat-announce) email
list.
* If you have a concrete bug report for Apache Tomcat, please see the
instructions for reporting a bug
-[here](http://tomcat.apache.org/bugreport.html).
+[here](https://tomcat.apache.org/bugreport.html).
### Contributing
Modified: tomcat/tc8.5.x/trunk/RELEASE-NOTES
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/RELEASE-NOTES?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/RELEASE-NOTES (original)
+++ tomcat/tc8.5.x/trunk/RELEASE-NOTES Fri Jun 22 06:53:29 2018
@@ -139,7 +139,7 @@ the check.
==============================
Viewing the Tomcat Change Log:
==============================
-The full change log is available from http://tomcat.apache.org and is also
+The full change log is available from https://tomcat.apache.org and is also
included in the documentation web application.
@@ -175,4 +175,4 @@ software:
When all else fails:
====================
See the FAQ
-http://tomcat.apache.org/faq/
+https://tomcat.apache.org/faq/
Modified: tomcat/tc8.5.x/trunk/RUNNING.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/RUNNING.txt?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/RUNNING.txt (original)
+++ tomcat/tc8.5.x/trunk/RUNNING.txt Fri Jun 22 06:53:29 2018
@@ -43,7 +43,7 @@ Running With JRE 7 Or Later
(2.1) Download a binary distribution of Tomcat from:
- http://tomcat.apache.org/
+ https://tomcat.apache.org/
(2.2) Unpack the binary distribution so that it resides in its own
directory (conventionally named "apache-tomcat-[version]").
@@ -203,7 +203,7 @@ launches Java directly and does not use
(4.3) Further information about configuring and running Tomcat can be found in
the documentation included here, as well as on the Tomcat web site:
- http://tomcat.apache.org/
+ https://tomcat.apache.org/
(5) Shut Down Tomcat
@@ -393,32 +393,32 @@ For further reading:
* Documentation for APR/Native library in the Tomcat User's Guide
- http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/apr.html
+ https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/apr.html
* Documentation for the HTTP and AJP protocol connectors in the Tomcat
Configuration Reference
-
http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/config/http.html
+
https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/config/http.html
- http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/config/ajp.html
+
https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/config/ajp.html
- Apache Tomcat Native project home
- http://tomcat.apache.org/native-doc/
+ https://tomcat.apache.org/native-doc/
- Other projects
* OpenSSL
- http://openssl.org/
+ https://www.openssl.org/
* Apache Portable Runtime
- http://apr.apache.org/
+ https://apr.apache.org/
* Apache HTTP Server
- http://httpd.apache.org/
+ https://httpd.apache.org/
To disable Apache Tomcat Native library:
@@ -449,17 +449,17 @@ For further reading:
- Apache Commons Daemon project
- http://commons.apache.org/daemon/
+ https://commons.apache.org/daemon/
- Apache Tomcat documentation
* Installing Apache Tomcat
- http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/setup.html
+ https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/setup.html
* Windows service HOW-TO
-
http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/windows-service-howto.html
+
https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/windows-service-howto.html
The binary files of Apache Commons Daemon in Apache Tomcat distributions
for Windows are named:
Modified: tomcat/tc8.5.x/trunk/bin/service.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/bin/service.bat?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/bin/service.bat (original)
+++ tomcat/tc8.5.x/trunk/bin/service.bat Fri Jun 22 06:53:29 2018
@@ -164,7 +164,7 @@ if "%JvmMs%" == "" set JvmMs=128
if "%JvmMx%" == "" set JvmMx=256
"%EXECUTABLE%" //IS//%SERVICE_NAME% ^
- --Description "Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/";
^
+ --Description "Apache Tomcat @VERSION@ Server -
https://tomcat.apache.org/"; ^
--DisplayName "%DISPLAYNAME%" ^
--Install "%EXECUTABLE%" ^
--LogPath "%CATALINA_BASE%\logs" ^
Modified: tomcat/tc8.5.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.properties.default?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/build.properties.default (original)
+++ tomcat/tc8.5.x/trunk/build.properties.default Fri Jun 22 06:53:29 2018
@@ -89,8 +89,8 @@ compile.debug=true
# Do not pass -deprecation (-Xlint:deprecation) flag to javac
compile.deprecation=false
-base-apache.loc.1=http://www.apache.org/dyn/closer.lua?action=download&filename=
-base-apache.loc.2=http://archive.apache.org/dist
+base-apache.loc.1=https://www.apache.org/dyn/closer.lua?action=download&filename=
+base-apache.loc.2=https://archive.apache.org/dist
base-commons.loc.1=${base-apache.loc.1}/commons
base-commons.loc.2=${base-apache.loc.2}/commons
base-tomcat.loc.1=${base-apache.loc.1}/tomcat
Modified: tomcat/tc8.5.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.xml?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/build.xml (original)
+++ tomcat/tc8.5.x/trunk/build.xml Fri Jun 22 06:53:29 2018
@@ -1874,7 +1874,7 @@ Apache Tomcat ${version} native binaries
<link href="../elapi"/>
<link href="../websocketapi"/>
<link href="http://docs.oracle.com/javase/7/docs/api/"/>
- <link
href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+ <link
href="https://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
<link href="http://docs.oracle.com/javaee/7/api/"/>
<packageset dir="${tomcat.dist}/src/java/">
<include name="org/**"/>
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=1834075&r1=1834074&r2=1834075&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 Fri Jun
22 06:53:29 2018
@@ -20,8 +20,8 @@
<em>Ant (version 1.6 or later)</em> that can be used to interact with the
Remote JMX JSR 160 RMI Adaptor to get/set attributes, invoke MBean operations
and query for Mbeans inside a running instance of Tomcat. For more
information, see
-<a href="http://tomcat.apache.org/tomcat-7.0-doc/monitoring.html";>
-http://tomcat.apache.org/tomcat-7.0-doc/monitoring.html</a>.</p>
+<a href="https://tomcat.apache.org/tomcat-7.0-doc/monitoring.html";>
+https://tomcat.apache.org/tomcat-7.0-doc/monitoring.html</a>.</p>
<p>Each task element can open a new jmx connection or reference an
existing one. The following attribute are exists in every tasks:</p>
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=1834075&r1=1834074&r2=1834075&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 Fri Jun 22
06:53:29 2018
@@ -20,8 +20,8 @@
<em>Ant (version 1.6.x or later)</em> that can be used to interact with the
Manager application to deploy, undeploy, list, reload, start and stop web
applications
from a running instance of Tomcat. For more information, see
-<a href="http://tomcat.apache.org/tomcat-7.0-doc/manager-howto.html";>
-http://tomcat.apache.org/tomcat-7.0-doc/manager-howto.html</a>.</p>
+<a href="https://tomcat.apache.org/tomcat-7.0-doc/manager-howto.html";>
+https://tomcat.apache.org/tomcat-7.0-doc/manager-howto.html</a>.</p>
<p>The attributes of each task element correspond
exactly to the request parameters that are included with an HTTP request
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardWrapper.java Fri
Jun 22 06:53:29 2018
@@ -1053,7 +1053,7 @@ public class StandardWrapper extends Con
unavailable(null);
// Added extra log statement for Bugzilla 36630:
- // http://bz.apache.org/bugzilla/show_bug.cgi?id=36630
+ // https://bz.apache.org/bugzilla/show_bug.cgi?id=36630
if(log.isDebugEnabled()) {
log.debug(sm.getString("standardWrapper.instantiate",
servletClass), e);
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/ExpiresFilter.java?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
Fri Jun 22 06:53:29 2018
@@ -47,7 +47,7 @@ import org.apache.juli.logging.LogFactor
/**
* <p>
* ExpiresFilter is a Java Servlet API port of <a
- * href="http://httpd.apache.org/docs/2.2/mod/mod_expires.html";>Apache
+ * href="https://httpd.apache.org/docs/2.2/mod/mod_expires.html";>Apache
* mod_expires</a> to add '{@code Expires}' and
* '{@code Cache-Control: max-age=}' headers to HTTP response according to its
* '{@code Content-Type}'.
@@ -55,7 +55,7 @@ import org.apache.juli.logging.LogFactor
*
* <p>
* Following documentation is inspired by <a
- * href="http://httpd.apache.org/docs/2.2/mod/mod_expires.html";>mod_expires</a>
+ *
href="https://httpd.apache.org/docs/2.2/mod/mod_expires.html";>mod_expires</a>
* </p>
* <h1>Summary</h1>
* <p>
@@ -75,7 +75,7 @@ import org.apache.juli.logging.LogFactor
* To modify {@code Cache-Control} directives other than {@code max-age} (see
* <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9";
>RFC
* 2616 section 14.9</a>), you can use other servlet filters or <a
- * href="http://httpd.apache.org/docs/2.2/mod/mod_headers.html"; >Apache Httpd
+ * href="https://httpd.apache.org/docs/2.2/mod/mod_headers.html"; >Apache Httpd
* mod_headers</a> module.
* </p>
* <h1>Filter Configuration</h1><h2>Basic configuration to add
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
Fri Jun 22 06:53:29 2018
@@ -56,7 +56,7 @@ import org.apache.juli.logging.LogFactor
* </p>
* <p>
* Most of the design of this Servlet Filter is a port of <a
- *
href="http://httpd.apache.org/docs/trunk/mod/mod_remoteip.html";>mod_remoteip</a>,
this servlet filter replaces the apparent client remote
+ *
href="https://httpd.apache.org/docs/trunk/mod/mod_remoteip.html";>mod_remoteip</a>,
this servlet filter replaces the apparent client remote
* IP address and hostname for the request with the IP address list presented
by a proxy or a load balancer via a request headers (e.g.
* "X-Forwarded-For").
* </p>
@@ -171,7 +171,7 @@ import org.apache.juli.logging.LogFactor
* <strong>Regular expression vs. IP address blocks:</strong>
<code>mod_remoteip</code> allows to use address blocks (e.g.
* <code>192.168/16</code>) to configure <code>RemoteIPInternalProxy</code>
and <code>RemoteIPTrustedProxy</code> ; as the JVM doesn't have a
* library similar to <a
- *
href="http://apr.apache.org/docs/apr/1.3/group__apr__network__io.html#gb74d21b8898b7c40bf7fd07ad3eb993d";>apr_ipsubnet_test</a>,
we rely on
+ *
href="https://apr.apache.org/docs/apr/1.3/group__apr__network__io.html#gb74d21b8898b7c40bf7fd07ad3eb993d";>apr_ipsubnet_test</a>,
we rely on
* regular expressions.
* </p>
* <hr>
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/Constants.java?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/Constants.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/Constants.java Fri
Jun 22 06:53:29 2018
@@ -118,11 +118,11 @@ public class Constants {
"<table cellspacing=\"4\" border=\"0\">\n" +
" <tr>\n" +
" <td colspan=\"2\">\n" +
- " <a href=\"http://tomcat.apache.org/\";>\n" +
+ " <a href=\"https://tomcat.apache.org/\";>\n" +
" <img border=\"0\" alt=\"The Tomcat Servlet/JSP Container\"\n"
+
" align=\"left\" src=\"{0}/images/tomcat.gif\">\n" +
" </a>\n" +
- " <a href=\"http://www.apache.org/\";>\n" +
+ " <a href=\"https://www.apache.org/\";>\n" +
" <img border=\"0\" alt=\"The Apache Software Foundation\"
align=\"right\"\n" +
" src=\"{0}/images/asf-logo.svg\" style=\"width: 266px;
height: 83px;\">\n" +
" </a>\n" +
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java Fri Jun
22 06:53:29 2018
@@ -173,7 +173,7 @@ import org.ietf.jgss.GSSCredential;
* <p><strong>WARNING</strong> - There is a reported bug against the Netscape
* provider code (com.netscape.jndi.ldap.LdapContextFactory) with respect to
* successfully authenticated a non-existing user. The
- * report is here: http://bz.apache.org/bugzilla/show_bug.cgi?id=11210 .
+ * report is here: https://bz.apache.org/bugzilla/show_bug.cgi?id=11210 .
* With luck, Netscape has updated their provider code and this is not an
* issue. </p>
*
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java Fri
Jun 22 06:53:29 2018
@@ -125,7 +125,7 @@ import org.apache.tomcat.util.res.String
* or an instance where the specification cited differs from Best
* Community Practice (BCP).
* Such instances should be well-documented here. Please email the
- * <a href="http://tomcat.apache.org/lists.html";>Tomcat group</a>
+ * <a href="https://tomcat.apache.org/lists.html";>Tomcat group</a>
* with amendments.
*
* </p>
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java Fri Jun
22 06:53:29 2018
@@ -134,7 +134,7 @@ import org.apache.tomcat.util.descriptor
* see setters for doc. It can be used for simple tests and
* demo.
*
- * @see <a
href="http://svn.apache.org/repos/asf/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java";>TestTomcat</a>
+ * @see <a
href="https://svn.apache.org/repos/asf/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java";>TestTomcat</a>
* @author Costin Manolache
*/
public class Tomcat {
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
Fri Jun 22 06:53:29 2018
@@ -118,8 +118,8 @@ import org.apache.juli.logging.LogFactor
* Maybe I'll do a state diagram :)
* </p>
* <h2>State Diagrams</h2>
- * <a
href="http://people.apache.org/~fhanik/tribes/docs/leader-election-initiate-election.jpg";>Initiate
an election</a><br><br>
- * <a
href="http://people.apache.org/~fhanik/tribes/docs/leader-election-message-arrives.jpg";>Receive
an election message</a><br><br>
+ * <a
href="https://people.apache.org/~fhanik/tribes/docs/leader-election-initiate-election.jpg";>Initiate
an election</a><br><br>
+ * <a
href="https://people.apache.org/~fhanik/tribes/docs/leader-election-message-arrives.jpg";>Receive
an election message</a><br><br>
*
* @version 1.0
*
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java
Fri Jun 22 06:53:29 2018
@@ -57,7 +57,7 @@ import org.apache.tomcat.util.collection
* <p>Abstract implementation of the <b>Valve</b> interface that generates a
web
* server access log with the detailed line contents matching a configurable
* pattern. The syntax of the available patterns is similar to that supported
by
- * the <a href="http://httpd.apache.org/";>Apache HTTP Server</a>
+ * the <a href="https://httpd.apache.org/";>Apache HTTP Server</a>
* <code>mod_log_config</code> module.</p>
*
* <p>Patterns for the logged message may include constant text or any of the
@@ -107,7 +107,7 @@ import org.apache.tomcat.util.collection
* There is also support to write information from the cookie, incoming
* header, the Session or something else in the ServletRequest.<br>
* It is modeled after the
- * <a href="http://httpd.apache.org/";>Apache HTTP Server</a> log configuration
+ * <a href="https://httpd.apache.org/";>Apache HTTP Server</a> log configuration
* syntax:</p>
* <ul>
* <li><code>%{xxx}i</code> for incoming headers
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
Fri Jun 22 06:53:29 2018
@@ -56,7 +56,7 @@ import org.apache.catalina.util.SessionC
* authentication valves, as the redirection should take place before an
* authentication valve would save a request to a protected resource.</p>
*
- * @see <a
href="http://tomcat.apache.org/connectors-doc/generic_howto/loadbalancers.html";>Load
+ * @see <a
href="https://tomcat.apache.org/connectors-doc/generic_howto/loadbalancers.html";>Load
* balancer documentation</a>
*/
public class LoadBalancerDrainingValve
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Fri
Jun 22 06:53:29 2018
@@ -35,7 +35,7 @@ import org.apache.tomcat.util.http.MimeH
/**
* <p>
- * Tomcat port of <a
href="http://httpd.apache.org/docs/trunk/mod/mod_remoteip.html";>mod_remoteip</a>,
this valve replaces the apparent
+ * Tomcat port of <a
href="https://httpd.apache.org/docs/trunk/mod/mod_remoteip.html";>mod_remoteip</a>,
this valve replaces the apparent
* client remote IP address and hostname for the request with the IP address
list presented by a proxy or a load balancer via a request
* headers (e.g. "X-Forwarded-For").
* </p>
@@ -152,7 +152,7 @@ import org.apache.tomcat.util.http.MimeH
* <strong>Regular expression vs. IP address blocks:</strong>
<code>mod_remoteip</code> allows to use address blocks (e.g.
* <code>192.168/16</code>) to configure <code>RemoteIPInternalProxy</code>
and <code>RemoteIPTrustedProxy</code> ; as Tomcat doesn't have a
* library similar to <a
- *
href="http://apr.apache.org/docs/apr/1.3/group__apr__network__io.html#gb74d21b8898b7c40bf7fd07ad3eb993d";>apr_ipsubnet_test</a>,
+ *
href="https://apr.apache.org/docs/apr/1.3/group__apr__network__io.html#gb74d21b8898b7c40bf7fd07ad3eb993d";>apr_ipsubnet_test</a>,
* <code>RemoteIpValve</code> uses regular expression to configure
<code>internalProxies</code> and <code>trustedProxies</code> in the same
* fashion as {@link RequestFilterValve} does.
* </p>
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/FileResource.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/FileResource.java?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/FileResource.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/FileResource.java
Fri Jun 22 06:53:29 2018
@@ -227,7 +227,7 @@ public class FileResource extends Abstra
// Workaround for certain files on platforms that use
// EBCDIC encoding, when they are read through FileInputStream.
// See commit message of rev.303915 for original details
- // http://svn.apache.org/viewvc?view=revision&revision=303915
+ // https://svn.apache.org/viewvc?view=revision&revision=303915
String str = new String(result);
try {
result = str.getBytes(StandardCharsets.UTF_8);
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
Fri Jun 22 06:53:29 2018
@@ -195,7 +195,7 @@ public class IdentityInputFilter impleme
if (maxSwallowSizeExceeded && swallowed > maxSwallowSize) {
// Note: We do not fail early so the client has a chance to
// read the response before the connection is closed. See:
- //
http://httpd.apache.org/docs/2.0/misc/fin_wait_2.html#appendix
+ //
https://httpd.apache.org/docs/2.0/misc/fin_wait_2.html#appendix
throw new
IOException(sm.getString("inputFilter.maxSwallow"));
}
} else { // errors are handled higher up.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/EncodingDetector.java?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
Fri Jun 22 06:53:29 2018
@@ -26,7 +26,7 @@ import javax.xml.stream.XMLStreamReader;
/*
* The BoM detection is derived from:
- *
http://svn.us.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java?annotate=1742248
+ *
https://svn.us.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java?annotate=1742248
*
* The prolog is always at least as specific as the BOM therefore any encoding
* specified in the prolog should take priority over the BOM.
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java Fri
Jun 22 06:53:29 2018
@@ -215,7 +215,7 @@ class PageDataImpl extends PageData impl
continue;
}
- // Bugzilla 35252:
http://bz.apache.org/bugzilla/show_bug.cgi?id=35252
+ // Bugzilla 35252:
https://bz.apache.org/bugzilla/show_bug.cgi?id=35252
if(rootAttrs.getIndex(qName) == -1) {
rootAttrs.addAttribute(attrs.getURI(i),
attrs.getLocalName(i),
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
Fri Jun 22 06:53:29 2018
@@ -531,7 +531,7 @@ public class JspServletWrapper {
* number in the generated servlet that originated the exception to a line
* number in the JSP. Then constructs an exception containing that
* information, and a snippet of the JSP to help debugging.
- * Please see http://bz.apache.org/bugzilla/show_bug.cgi?id=37062 and
+ * Please see https://bz.apache.org/bugzilla/show_bug.cgi?id=37062 and
* http://www.tfenne.com/jasper/ for more details.
*</p>
*
Propchange: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 22 06:53:29 2018
@@ -1,4 +1,4 @@
/commons/proper/bcel/trunk/src/main/java/org/apache/bcel:1149512-1694910,1747273-1829827
/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6:1694911-1747272
/jakarta/bcel/trunk/src/main/java/org/apache/bcel:886845-1149511
-/tomcat/trunk/java/org/apache/tomcat/util/bcel:1782868,1817089,1829830
+/tomcat/trunk/java/org/apache/tomcat/util/bcel:1782868,1817089,1829830,1833989
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/package.html
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/package.html?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/package.html
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/package.html Fri Jun
22 06:53:29 2018
@@ -21,7 +21,7 @@
<body bgcolor="white">
<p>
This package contains basic classes for the
-<a href="http://commons.apache.org/bcel/";>Byte Code Engineering Library</a>
+<a href="https://commons.apache.org/bcel/";>Byte Code Engineering Library</a>
and constants defined by the
<a href="http://docs.oracle.com/javase/specs/";>
JVM specification</a>.
Propchange: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/codec/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 22 06:53:29 2018
@@ -1,2 +1,2 @@
/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec:1459201-1817136
-/tomcat/trunk/java/org/apache/tomcat/util/codec:1743701,1757175,1807715,1817137
+/tomcat/trunk/java/org/apache/tomcat/util/codec:1743701,1757175,1807715,1817137,1833989
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java
Fri Jun 22 06:53:29 2018
@@ -76,7 +76,7 @@ public class Base64 extends BaseNCodec {
* equivalents as specified in Table 1 of RFC 2045.
*
* Thanks to "commons" project in ws.apache.org for this code.
- * http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/
+ * https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/
*/
private static final byte[] STANDARD_ENCODE_TABLE = {
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
@@ -108,7 +108,7 @@ public class Base64 extends BaseNCodec {
* URL_SAFE and STANDARD base64. (The encoder, on the other hand, needs to
know ahead of time what to emit).
*
* Thanks to "commons" project in ws.apache.org for this code.
- * http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/
+ * https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/
*/
private static final byte[] DECODE_TABLE = {
// 0 1 2 3 4 5 6 7 8 9 A B C D E F
@@ -315,7 +315,7 @@ public class Base64 extends BaseNCodec {
* <p><b>Note: no padding is added when encoding using the URL-safe
alphabet.</b></p>
* <p>
* Thanks to "commons" project in ws.apache.org for the bitwise
operations, and general approach.
- * http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/
+ * https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/
* </p>
*
* @param in
@@ -412,7 +412,7 @@ public class Base64 extends BaseNCodec {
* </p>
* <p>
* Thanks to "commons" project in ws.apache.org for the bitwise
operations, and general approach.
- * http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/
+ * https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/
* </p>
*
* @param in
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
Fri Jun 22 06:53:29 2018
@@ -312,7 +312,7 @@ public class WebXml extends XmlEncodingB
// servlet-mapping
// Note: URLPatterns from web.xml may be URL encoded
- // (http://svn.apache.org/r285186)
+ // (https://svn.apache.org/r285186)
private final Map<String,String> servletMappings = new HashMap<>();
private final Set<String> servletMappingNames = new HashSet<>();
public void addServletMapping(String urlPattern, String servletName) {
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
Fri Jun 22 06:53:29 2018
@@ -38,7 +38,7 @@ import org.xml.sax.Attributes;
* </p>
*
* <p>This rule now uses
- * <a
href="http://commons.apache.org/beanutils/apidocs/org/apache/commons/beanutils/MethodUtils.html";>
+ * <a
href="https://commons.apache.org/beanutils/apidocs/org/apache/commons/beanutils/MethodUtils.html";>
* org.apache.commons.beanutils.MethodUtils#invokeMethod
* </a> by default.
* This increases the kinds of methods successfully and allows primitives
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=1834075&r1=1834074&r2=1834075&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 Fri
Jun 22 06:53:29 2018
@@ -544,7 +544,7 @@ and configures the Digester to be used,
method for where the parsing actually takes place.</p>
<p>(Struts binary and source distributions can be acquired at
-<a href="http://struts.apache.org/";>http://struts.apache.org/</a>.)</p>
+<a href="https://struts.apache.org/";>http://struts.apache.org/</a>.)</p>
<p>The following discussion highlights a few of the matching patterns and
processing rules that are configured, to illustrate the use of some of the
@@ -874,8 +874,8 @@ the way that <code>RegexRules</code> is
</p>
<p>
There are many good regex libraries available. (For example
-<a href='http://jakarta.apache.org/oro/index.html'>Jakarta ORO</a>,
-<a href='http://jakarta.apache.org/regexp/index.html'>Jakarta Regex</a>,
+<a href='https://jakarta.apache.org/oro/index.html'>Jakarta ORO</a>,
+<a href='https://jakarta.apache.org/regexp/index.html'>Jakarta Regex</a>,
<a href='http://www.cacas.org/java/gnu/regexp/'>GNU Regex</a> and
<a
href='http://java.sun.com/j2se/1.4.2/docs/api/java/util/regex/package-summary.html'>
Java 1.4 Regex</a>)
@@ -1176,7 +1176,7 @@ It works but we have no plans to add sup
<p>
We would consider donations of standard digester applications but it's
unlikely that
these would ever be shipped with the base digester distribution.
-If you want to discuss this, please post to <a
href='http://commons.apache.org/mail-lists.html'>
+If you want to discuss this, please post to <a
href='https://commons.apache.org/mail-lists.html'>
commons dev mailing list</a>
</p>
</li>
Propchange: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 22 06:53:29 2018
@@ -1,2 +1,2 @@
/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload:1-1754664
-/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload:1743700,1757180,1757195,1807742,1817136
+/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload:1743700,1757180,1757195,1807742,1817136,1833989
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/package-info.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/package-info.java?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/package-info.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/package-info.java
Fri Jun 22 06:53:29 2018
@@ -81,7 +81,7 @@
* </p>
* <p>
* Please see the FileUpload
- * <a href="http://commons.apache.org/fileupload/using.html";
target="_top">User Guide</a>
+ * <a href="https://commons.apache.org/fileupload/using.html";
target="_top">User Guide</a>
* for further details and examples of how to use this package.
* </p>
*/
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/package-info.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/package-info.java?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/package-info.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/package-info.java
Fri Jun 22 06:53:29 2018
@@ -38,7 +38,7 @@
* </pre>
* <p>
* Please see the FileUpload
- * <a href="http://commons.apache.org/fileupload/using.html";
target="_top">User Guide</a>
+ * <a href="https://commons.apache.org/fileupload/using.html";
target="_top">User Guide</a>
* for further details and examples of how to use this package.
* </p>
*/
Modified: tomcat/tc8.5.x/trunk/modules/jdbc-pool/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/build.properties.default?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/modules/jdbc-pool/build.properties.default (original)
+++ tomcat/tc8.5.x/trunk/modules/jdbc-pool/build.properties.default Fri Jun 22
06:53:29 2018
@@ -67,13 +67,13 @@ testdb.validationQuery=SELECT 1
junit.version=4.11
junit.home=${base.path}/junit-${junit.version}
junit.jar=${junit.home}/junit-${junit.version}.jar
-junit.loc=http://repo.maven.apache.org/maven2/junit/junit/${junit.version}/junit-${junit.version}.jar
+junit.loc=https://repo.maven.apache.org/maven2/junit/junit/${junit.version}/junit-${junit.version}.jar
# Hamcrest Library, used by JUnit
hamcrest.version=1.3
hamcrest.home=${base.path}/hamcrest-${hamcrest.version}
hamcrest.jar=${hamcrest.home}/hamcrest-core-${hamcrest.version}.jar
-hamcrest.loc=http://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/${hamcrest.version}/hamcrest-core-${hamcrest.version}.jar
+hamcrest.loc=https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/${hamcrest.version}/hamcrest-core-${hamcrest.version}.jar
mysql.home=${base.path}/mysql-connector-java-5.1.12
mysql.jar=${mysql.home}/mysql-connector-java-5.1.12-bin.jar
@@ -83,19 +83,19 @@ tomcat.version=8.0.14
tomcat.home=${base.path}/apache-tomcat-${tomcat.version}
tomcat.dbcp.jar=${tomcat.home}/lib/tomcat-dbcp.jar
tomcat.juli.jar=${tomcat.home}/bin/tomcat-juli.jar
-tomcat.loc=http://archive.apache.org/dist/tomcat/tomcat-8/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip
+tomcat.loc=https://archive.apache.org/dist/tomcat/tomcat-8/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip
-tomcat.project.loc=http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/project.xml
+tomcat.project.loc=https://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/project.xml
tomcat.project.dest=${base.path}/project.xml
-tomcat.xsl.loc=http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/tomcat-docs.xsl
+tomcat.xsl.loc=https://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/tomcat-docs.xsl
tomcat.xsl.dest=${base.path}/tomcat-docs.xsl
derby.home=${base.path}/db-derby-10.5.1.1-bin
-derby.loc=http://archive.apache.org/dist/db/derby/db-derby-10.5.1.1/db-derby-10.5.1.1-bin.tar.gz
+derby.loc=https://archive.apache.org/dist/db/derby/db-derby-10.5.1.1/db-derby-10.5.1.1-bin.tar.gz
derby.jar=${derby.home}/lib/derby.jar
h2.version=1.2.129
h2.home=${base.path}/h2-${h2.version}
-h2.loc=http://repo.maven.apache.org/maven2/com/h2database/h2/1.2.129/h2-1.2.129.jar
+h2.loc=https://repo.maven.apache.org/maven2/com/h2database/h2/1.2.129/h2-1.2.129.jar
h2.jar=${h2.home}/h2-1.2.129.jar
Modified: tomcat/tc8.5.x/trunk/modules/jdbc-pool/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/build.xml?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/tc8.5.x/trunk/modules/jdbc-pool/build.xml Fri Jun 22 06:53:29 2018
@@ -118,7 +118,7 @@
style="${basedir}/doc/package.xsl"
excludes="build.xml"
includes="jdbc-pool.xml">
- <param name="relative-path"
expression="http://tomcat.apache.org/tomcat-6.0-doc"/>
+ <param name="relative-path"
expression="https://tomcat.apache.org/tomcat-6.0-doc"/>
<param name="apache-logo" expression="/images/asf-logo.svg"/>
</xslt>
<move
tofile="${basedir}/src/main/java/org/apache/tomcat/jdbc/pool/package.html"
@@ -240,7 +240,7 @@
style="${tomcat.xsl.dest}"
excludes="build.xml project.xml"
includes="*.xml">
- <param name="relative-path"
expression="http://tomcat.apache.org/tomcat-6.0-doc"/>
+ <param name="relative-path"
expression="https://tomcat.apache.org/tomcat-6.0-doc"/>
<param name="apache-logo" expression="/images/asf-logo.svg"/>
</xslt>
</target>
Modified: tomcat/tc8.5.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml?rev=1834075&r1=1834074&r2=1834075&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original)
+++ tomcat/tc8.5.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Fri Jun 22
06:53:29 2018
@@ -36,7 +36,7 @@
<section name="Introduction">
<p>The <strong>JDBC Connection Pool
<code>org.apache.tomcat.jdbc.pool</code></strong>
- is a replacement or an alternative to the <a
href="http://commons.apache.org/dbcp/";>Apache Commons DBCP</a>
+ is a replacement or an alternative to the <a
href="https://commons.apache.org/dbcp/";>Apache Commons DBCP</a>
connection pool.</p>
<p>So why do we need a new connection pool?</p>
@@ -752,7 +752,7 @@
</section>
<section name="Code Example">
- <p>Other examples of Tomcat configuration for JDBC usage can be found <a
href="http://tomcat.apache.org/tomcat-8.0-doc/jndi-datasource-examples-howto.html";>in
the Tomcat documentation</a>. </p>
+ <p>Other examples of Tomcat configuration for JDBC usage can be found <a
href="https://tomcat.apache.org/tomcat-8.0-doc/jndi-datasource-examples-howto.html";>in
the Tomcat documentation</a>. </p>
<subsection name="Plain Ol' Java">
<p>Here is a simple example of how to create and use a data source.</p>
<source><![CDATA[ import java.sql.Connection;
@@ -959,7 +959,7 @@
<section name="Building">
<p>We build the JDBC pool code with 1.6, but it is backwards compatible down
to 1.5 for runtime environment. For unit test, we use 1.6 and higher</p>
- <p>Other examples of Tomcat configuration for JDBC usage can be found <a
href="http://tomcat.apache.org/tomcat-8.0-doc/jndi-datasource-examples-howto.html";>in
the Tomcat documentation</a>. </p>
+ <p>Other examples of Tomcat configuration for JDBC usage can be found <a
href="https://tomcat.apache.org/tomcat-8.0-doc/jndi-datasource-examples-howto.html";>in
the Tomcat documentation</a>. </p>
<subsection name="Building from source">
<p>Building is pretty simple. The pool has a dependency on
<code>tomcat-juli.jar</code> and in case you want the
<code>SlowQueryReportJmx</code></p>
<source><![CDATA[ javac -classpath tomcat-juli.jar \
@@ -968,7 +968,7 @@
org/apache/tomcat/jdbc/pool/interceptor/*.java \
org/apache/tomcat/jdbc/pool/jmx/*.java]]></source>
<p>
- A build file can be found in the Tomcat <a
href="http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/";>source
repository</a>.
+ A build file can be found in the Tomcat <a
href="https://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/";>source
repository</a>.
</p>
<p>
As a convenience, a build file is also included where a simple build
command will generate all files needed.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
![http://people.apache.org/~fhanik/tribes/docs/leader-election-initiate-election.jpg"](http://people.apache.org/~fhanik/tribes/docs/leader-election-initiate-election.jpg"){kind=link}
![http://people.apache.org/~fhanik/tribes/docs/leader-election-message-arrives.jpg"](http://people.apache.org/~fhanik/tribes/docs/leader-election-message-arrives.jpg"){kind=link}
![https://people.apache.org/~fhanik/tribes/docs/leader-election-initiate-election.jpg"](https://people.apache.org/~fhanik/tribes/docs/leader-election-initiate-election.jpg"){kind=link}
![https://people.apache.org/~fhanik/tribes/docs/leader-election-message-arrives.jpg"](https://people.apache.org/~fhanik/tribes/docs/leader-election-message-arrives.jpg"){kind=link}