Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Fri Jun 22 07:57:00 2018 @@ -53,7 +53,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> @@ -170,7 +170,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/tc7.0.x/trunk/java/org/apache/catalina/manager/Constants.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/Constants.java?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/Constants.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/Constants.java Fri Jun 22 07:57:00 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/tc7.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java Fri Jun 22 07:57:00 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/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java Fri Jun 22 07:57:00 2018 @@ -126,7 +126,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/tc7.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java Fri Jun 22 07:57:00 2018 @@ -136,7 +136,7 @@ import org.apache.tomcat.util.buf.UriUti * 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/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java Fri Jun 22 07:57:00 2018 @@ -112,8 +112,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> * * @author Filip Hanik * @version 1.0 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Fri Jun 22 07:57:00 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> @@ -154,7 +154,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/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java Fri Jun 22 07:57:00 2018 @@ -190,7 +190,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/tc7.0.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java Fri Jun 22 07:57:00 2018 @@ -213,7 +213,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/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Fri Jun 22 07:57:00 2018 @@ -527,7 +527,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/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jun 22 07:57:00 2018 @@ -2,4 +2,4 @@ /commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6:1725719-1747272 /jakarta/bcel/trunk/src/main/java/org/apache/bcel:886845-1149511 /tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel:1782870,1817276,1829831 -/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/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/package.html URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/package.html?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/package.html (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/package.html Fri Jun 22 07:57:00 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/tc7.0.x/trunk/java/org/apache/tomcat/util/codec/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jun 22 07:57:00 2018 @@ -1,4 +1,4 @@ /commons/proper/codec/trunk/src/main/java/org/apache/commons/codec:1507057-1521057,1609341-1682326,1725747-1817136 /tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec:1682331,1817287 /tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/codec:1743724,1757176 -/tomcat/trunk/java/org/apache/tomcat/util/codec:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222328,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,12401 01,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,13 42029,1342315,1342320,1342476,1342498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993 ,1352011,1352056,1352059,1352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,1364141,1364149,1364411-1364412,1364448,1366708,1366720,1366729,1366734,1366910,1366945,1366953,1366959,1367214,1370346,1370364,1370373,1370386,1370473,1370537,1370549,1370553,1370879,1370916,1370958,1370960,1370973,1371017,1371283,1371336,1371620,1371812,1371823,1371896,1371976,1371978,1371995,1371999,1372131,1372152,1372156,1372390,1373003,1373080,1373142,1373488,1373578,1373618,1373622,1373666,1373985,1373987,1373990,1373993,1374000,1374019,1374823,1376994,1377 078,1377292,1377311,1377342,1377433,1377444,1377516,1377518-1377519,1377532,1377535,1377544,1377689,1377785,1377794,1377811,1377824,1377827,1377831,1377852-1377853,1377887,1377900,1378322,1378361,1378394,1378699,1378715,1378818,1378868,1378918,1379047,1379090,1379178,1379206,1379213,1379418,1379580,1379590,1379639,1379647,1379649,1379665,1379733,1379735,1380066,1380073,1380075,1380376,1380635,1380637,1380838,1381411,1381623,1382314,1382343,1382366,1382515,1382832,1382842,1385336,1387937,1388709,1390882,1392098,1392619,1393071,1393115,1396615,1396723,1397086,1397464,1397466,1397472,1397482,1397484,1397839,1397868,1397944,1399022,1401472,1401792,1401808,1401814,1402113,1402122,1402345,1402348,1402350,1402428,1402573,1402576,1402600-1402601,1402622,1402643,1402683,1402837,1402855,1403099,1403468,1404374,1404658,1404704,1404773,1404917-1404918,1405133,1405168,1405321,1405353,1405357,1405364,1405397,1405399-1405400,1405415,1405435,1405676,1405681,1406456,1406481,1406526,1407595,1407619,1 408043,1408148,1408154,1408156,1408159,1408163-1408165,1408248,1408438,1408504,1408513-1408517,1408562-1408565,1408714,1408721,1408739,1408750,1408774,1408792,1408872-1408876,1408906,1408934,1409007,1409030,1410466,1410545,1410609,1410611,1410632,1410714,1410763-1410764,1410766,1411585,1411993,1412575,1413552,1413556,1413562,1414053,1414113,1414215,1414889,1415177-1415179,1415186,1416458,1416481,1416501,1416529,1416534-1416535,1416658,1417201,1417224,1417282,1417347-1417348,1417353,1417363,1417365,1417370-1417372,1417463,1417465,1417467,1417469,1417476,1424894,1425502,1425564,1425628,1426662,1427013,1427757,1427784,1427804,1427846,1428010,1428079,1428283,1428355,1428403,1428643,1428869,1428959,1428993,1429123,1429153,1429167,1429173,1429179-1429180,1429182,1429356,1429687,1429745,1429784,1429836,1429863,1429946,1429969,1430079,1430147,1430165,1430445,1430448,1430481,1430487,1430508,1430550,1430567,1430771,1430773,1430775,1430791,1430799,1430806,1430809,1430921,1431164,1431171,143120 6,1431221,1431293,1431298,1431302,1431308,1431310,1431320,1431661,1431920,1431990,1432517,1432867,1433976,1434403,1434428,1434438,1434447,1434456,1434463,1434500,1434598,1434660,1434685,1434725,1434757,1434882,1435126,1435505,1435509,1435600,1435606,1435636,1435642,1435759-1435760,1435765,1435767,1437317,1437337,1437505,1437637,1437649,1437743,1437891,1437897,1437903,1438411,1438463,1439054,1439334,1439434,1439442,1439445,1439667,1440095,1440622,1440911,1441342,1441348,1441403,1441416,1441428,1441807,1441895,1441916,1441920,1443350,1443405,1443427,1445111,1445125,1445190,1445208,1445212,1445328,1445337,1445520,1446108,1446137,1446357,1446612,1446640,1446650,1447012,1447178,1447791,1447817-1447818,1448117,1448121,1448125,1448826,1449225,1449406,1450990,1451053,1451061,1451105,1451408,1451434,1451769,1451938-1451939,1451947,1451955-1451956,1452295,1452501,1452707,1452719,1452721,1452752,1453105,1453112,1453435,1453439,1453490,1453544,1453549,1453621,1454828,1454832,1454953,1455344,145 5854,1455973,1456083,1456440,1456453,1456491,1456494,1456657,1456666,1456678,1456706,1456713,1456716,1456721,1456740,1456762,1456766,1456822,1456844,1456863,1456872,1456882,1456885,1456895,1456899,1456904,1456916,1456920,1456926,1456932,1456959,1456963,1456970,1457299,1457301,1457362,1457382,1457402,1457452,1457748,1457968,1458187,1458192,1458200,1458221,1458564-1458565,1458694,1458726,1458738-1458739,1459010,1459028,1459031,1459061,1459074-1459075,1459085,1459218,1459223,1459289,1459389,1459523-1459524,1459673,1459681,1459761,1459769,1459933,1460107,1460115,1460234,1460313,1460330,1460342,1460533,1460633,1460679,1461026,1461110,1461341,1461349,1461849,1464781,1465795,1465807,1466051,1466072,1466106,1467091,1468415,1470400,1470435,1470765,1471371,1471632,1475750,1475791,1475900,1475930,1475968,1476761,1476805,1476815,1476972,1477051,1479175,1479179,1479248,1479482,1479951,1481164,1482309,1482311,1482720,1482799,1483229,1484592,1484862,1485114,1485489,1485495,1485611,1485847,1486134, 1486217,1486294,1486443,1486834,1486861,1486875,1486890,1486939,1487862,1487882,1488151,1488793,1489170,1489195-1489196,1489201,1489385,1489390,1489405,1489437,1489536,1489610,1489738,1489886,1491485,1491841,1492307,1492336,1492343,1492358,1492555,1492570,1493011,1493013-1493014,1493071,1493113,1493615,1493740,1493801,1493910,1494044,1494048,1494051,1494056,1494143,1495015,1495043,1495154,1495197,1495880,1495886,1496061,1496732,1496734,1497474,1497538,1497754,1498340,1498363,1498368,1498409,1498475,1498482,1498498,1498669,1498698,1498808,1498896,1499953,1500003,1500062,1500371,1500380,1500577,1500590,1500663,1501266,1501719,1501823,1501910,1501927,1501929,1502254,1502349,1503851,1505843,1506053,1507013,1507052,1507096,1507872,1508196,1508346,1509128,1509151,1509156,1509161,1509806,1510246,1510488,1511212,1511217,1511434,1513148-1513149,1513665,1514281,1514291,1514305,1514368,1514470,1514485-1514486,1515841,1515926,1516113,1516295,1516419,1516710,1516953,1517536,1517898,1517941,15179 70,1517980,1518189,1518210,1519611,1520349,1520632,1520655,1521023,1521025,1521027,1521030,1521032,1521034,1521040,1521043,1521049-1521050,1521059,1561166-1561170,1587378-1587379,1587723,1682330,1743701,1757175,1817137 +/tomcat/trunk/java/org/apache/tomcat/util/codec:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222328,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,12401 01,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,13 42029,1342315,1342320,1342476,1342498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993 ,1352011,1352056,1352059,1352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,1364141,1364149,1364411-1364412,1364448,1366708,1366720,1366729,1366734,1366910,1366945,1366953,1366959,1367214,1370346,1370364,1370373,1370386,1370473,1370537,1370549,1370553,1370879,1370916,1370958,1370960,1370973,1371017,1371283,1371336,1371620,1371812,1371823,1371896,1371976,1371978,1371995,1371999,1372131,1372152,1372156,1372390,1373003,1373080,1373142,1373488,1373578,1373618,1373622,1373666,1373985,1373987,1373990,1373993,1374000,1374019,1374823,1376994,1377 078,1377292,1377311,1377342,1377433,1377444,1377516,1377518-1377519,1377532,1377535,1377544,1377689,1377785,1377794,1377811,1377824,1377827,1377831,1377852-1377853,1377887,1377900,1378322,1378361,1378394,1378699,1378715,1378818,1378868,1378918,1379047,1379090,1379178,1379206,1379213,1379418,1379580,1379590,1379639,1379647,1379649,1379665,1379733,1379735,1380066,1380073,1380075,1380376,1380635,1380637,1380838,1381411,1381623,1382314,1382343,1382366,1382515,1382832,1382842,1385336,1387937,1388709,1390882,1392098,1392619,1393071,1393115,1396615,1396723,1397086,1397464,1397466,1397472,1397482,1397484,1397839,1397868,1397944,1399022,1401472,1401792,1401808,1401814,1402113,1402122,1402345,1402348,1402350,1402428,1402573,1402576,1402600-1402601,1402622,1402643,1402683,1402837,1402855,1403099,1403468,1404374,1404658,1404704,1404773,1404917-1404918,1405133,1405168,1405321,1405353,1405357,1405364,1405397,1405399-1405400,1405415,1405435,1405676,1405681,1406456,1406481,1406526,1407595,1407619,1 408043,1408148,1408154,1408156,1408159,1408163-1408165,1408248,1408438,1408504,1408513-1408517,1408562-1408565,1408714,1408721,1408739,1408750,1408774,1408792,1408872-1408876,1408906,1408934,1409007,1409030,1410466,1410545,1410609,1410611,1410632,1410714,1410763-1410764,1410766,1411585,1411993,1412575,1413552,1413556,1413562,1414053,1414113,1414215,1414889,1415177-1415179,1415186,1416458,1416481,1416501,1416529,1416534-1416535,1416658,1417201,1417224,1417282,1417347-1417348,1417353,1417363,1417365,1417370-1417372,1417463,1417465,1417467,1417469,1417476,1424894,1425502,1425564,1425628,1426662,1427013,1427757,1427784,1427804,1427846,1428010,1428079,1428283,1428355,1428403,1428643,1428869,1428959,1428993,1429123,1429153,1429167,1429173,1429179-1429180,1429182,1429356,1429687,1429745,1429784,1429836,1429863,1429946,1429969,1430079,1430147,1430165,1430445,1430448,1430481,1430487,1430508,1430550,1430567,1430771,1430773,1430775,1430791,1430799,1430806,1430809,1430921,1431164,1431171,143120 6,1431221,1431293,1431298,1431302,1431308,1431310,1431320,1431661,1431920,1431990,1432517,1432867,1433976,1434403,1434428,1434438,1434447,1434456,1434463,1434500,1434598,1434660,1434685,1434725,1434757,1434882,1435126,1435505,1435509,1435600,1435606,1435636,1435642,1435759-1435760,1435765,1435767,1437317,1437337,1437505,1437637,1437649,1437743,1437891,1437897,1437903,1438411,1438463,1439054,1439334,1439434,1439442,1439445,1439667,1440095,1440622,1440911,1441342,1441348,1441403,1441416,1441428,1441807,1441895,1441916,1441920,1443350,1443405,1443427,1445111,1445125,1445190,1445208,1445212,1445328,1445337,1445520,1446108,1446137,1446357,1446612,1446640,1446650,1447012,1447178,1447791,1447817-1447818,1448117,1448121,1448125,1448826,1449225,1449406,1450990,1451053,1451061,1451105,1451408,1451434,1451769,1451938-1451939,1451947,1451955-1451956,1452295,1452501,1452707,1452719,1452721,1452752,1453105,1453112,1453435,1453439,1453490,1453544,1453549,1453621,1454828,1454832,1454953,1455344,145 5854,1455973,1456083,1456440,1456453,1456491,1456494,1456657,1456666,1456678,1456706,1456713,1456716,1456721,1456740,1456762,1456766,1456822,1456844,1456863,1456872,1456882,1456885,1456895,1456899,1456904,1456916,1456920,1456926,1456932,1456959,1456963,1456970,1457299,1457301,1457362,1457382,1457402,1457452,1457748,1457968,1458187,1458192,1458200,1458221,1458564-1458565,1458694,1458726,1458738-1458739,1459010,1459028,1459031,1459061,1459074-1459075,1459085,1459218,1459223,1459289,1459389,1459523-1459524,1459673,1459681,1459761,1459769,1459933,1460107,1460115,1460234,1460313,1460330,1460342,1460533,1460633,1460679,1461026,1461110,1461341,1461349,1461849,1464781,1465795,1465807,1466051,1466072,1466106,1467091,1468415,1470400,1470435,1470765,1471371,1471632,1475750,1475791,1475900,1475930,1475968,1476761,1476805,1476815,1476972,1477051,1479175,1479179,1479248,1479482,1479951,1481164,1482309,1482311,1482720,1482799,1483229,1484592,1484862,1485114,1485489,1485495,1485611,1485847,1486134, 1486217,1486294,1486443,1486834,1486861,1486875,1486890,1486939,1487862,1487882,1488151,1488793,1489170,1489195-1489196,1489201,1489385,1489390,1489405,1489437,1489536,1489610,1489738,1489886,1491485,1491841,1492307,1492336,1492343,1492358,1492555,1492570,1493011,1493013-1493014,1493071,1493113,1493615,1493740,1493801,1493910,1494044,1494048,1494051,1494056,1494143,1495015,1495043,1495154,1495197,1495880,1495886,1496061,1496732,1496734,1497474,1497538,1497754,1498340,1498363,1498368,1498409,1498475,1498482,1498498,1498669,1498698,1498808,1498896,1499953,1500003,1500062,1500371,1500380,1500577,1500590,1500663,1501266,1501719,1501823,1501910,1501927,1501929,1502254,1502349,1503851,1505843,1506053,1507013,1507052,1507096,1507872,1508196,1508346,1509128,1509151,1509156,1509161,1509806,1510246,1510488,1511212,1511217,1511434,1513148-1513149,1513665,1514281,1514291,1514305,1514368,1514470,1514485-1514486,1515841,1515926,1516113,1516295,1516419,1516710,1516953,1517536,1517898,1517941,15179 70,1517980,1518189,1518210,1519611,1520349,1520632,1520655,1521023,1521025,1521027,1521030,1521032,1521034,1521040,1521043,1521049-1521050,1521059,1561166-1561170,1587378-1587379,1587723,1682330,1743701,1757175,1817137,1833989 Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java Fri Jun 22 07:57:00 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 = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -313,7 +313,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 @@ -410,7 +410,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/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java Fri Jun 22 07:57:00 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/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/package.html URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/package.html?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/package.html (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/package.html Fri Jun 22 07:57:00 2018 @@ -561,7 +561,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 @@ -891,8 +891,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>) @@ -1219,7 +1219,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/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jun 22 07:57:00 2018 @@ -1,4 +1,4 @@ /commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload:605690-1458500,1458580,1458597,1458928,1458936,1459121,1459183-1459184,1459188,1459901,1460343,1475836,1507048,1513134-1565163,1596087-1682322,1725745-1754664 /tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/fileupload:1659191,1682325 /tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload:1743722,1757203,1817283 -/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222328,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-124 0046,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178, 1342027,1342029,1342315,1342320,1342476,1342498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,13519 91,1351993,1352011,1352056,1352059,1352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,1364141,1364149,1364411-1364412,1364448,1366708,1366720,1366729,1366734,1366910,1366945,1366953,1366959,1367214,1370346,1370364,1370373,1370386,1370473,1370537,1370549,1370553,1370879,1370916,1370958,1370960,1370973,1371017,1371283,1371336,1371620,1371812,1371823,1371896,1371976,1371978,1371995,1371999,1372131,1372152,1372156,1372390,1373003,1373080,1373142,1373488,1373578,1373618,1373622,1373666,1373985,1373987,1373990,1373993,1374000,1374019,1374823,13 76994,1377078,1377292,1377311,1377342,1377433,1377444,1377516,1377518-1377519,1377532,1377535,1377544,1377689,1377785,1377794,1377811,1377824,1377827,1377831,1377852-1377853,1377887,1377900,1378322,1378361,1378394,1378699,1378715,1378818,1378868,1378918,1379047,1379090,1379178,1379206,1379213,1379418,1379580,1379590,1379639,1379647,1379649,1379665,1379733,1379735,1380066,1380073,1380075,1380635,1380637,1380838,1381411,1381623,1382314,1382343,1382366,1382515,1382832,1382842,1385336,1387937,1388709,1390882,1392098,1392619,1393071,1393115,1396615,1396723,1397086,1397464,1397466,1397472,1397482,1397484,1397839,1397868,1397944,1399022,1401472,1401792,1401808,1401814,1402113,1402122,1402345,1402348,1402350,1402428,1402573,1402576,1402600-1402601,1402622,1402643,1402837,1402855,1403099,1403468,1404374,1404658,1404704,1404773,1404917-1404918,1405133,1405168,1405321,1405353,1405357,1405364,1405397,1405399-1405400,1405415,1405435,1405676,1405681,1406456,1406481,1406526,1407595,1407619,1408043 ,1408148,1408154,1408156,1408159,1408163-1408165,1408248,1408438,1408504,1408513-1408517,1408562-1408565,1408714,1408721,1408739,1408750,1408774,1408792,1408872-1408876,1408906,1408934,1409007,1409030,1410466,1410545,1410609,1410611,1410632,1410714,1410763-1410764,1410766,1411585,1411993,1412575,1413552,1413556,1413562,1414053,1414113,1414215,1414889,1415177-1415179,1415186,1416458,1416481,1416501,1416529,1416534-1416535,1416658,1417201,1417224,1417282,1417347-1417348,1417353,1417363,1417365,1417370-1417372,1417463,1417465,1417467,1417469,1417476,1424894,1425502,1427013,1427757,1427784,1427804,1427846,1428010,1428079,1428283,1428355,1428403,1428643,1428869,1428959,1428993,1429123,1429153,1429167,1429173,1429179-1429180,1429182,1429356,1429687,1429745,1429784,1429836,1429863,1429946,1429969,1430079,1430147,1430165,1430445,1430448,1430481,1430487,1430508,1430550,1430567,1430771,1430773,1430775,1430791,1430799,1430806,1430809,1430921,1431164,1431171,1431206,1431221,1431293,1431298,1431 302,1431308,1431310,1431320,1431661,1431920,1431990,1434660,1434685,1434882,1435606,1435636,1435642,1435767,1437317,1437337,1437505,1437637,1437649,1437743,1437891,1437897,1437903,1438411,1438463,1439054,1439334,1439434,1439442,1439445,1439667,1440095,1440622,1440911,1441342,1441348,1441403,1441416,1441428,1441895,1443350,1443405,1443427,1445111,1445125,1445190,1445208,1445212,1445328,1445337,1445520,1446108,1446137,1446357,1446612,1446640,1446650,1447012,1447178,1447791,1447817-1447818,1448117,1448121,1448125,1448826,1449225,1449406,1450990,1451053,1451061,1451105,1451408,1451434,1451769,1451938-1451939,1451947,1451955-1451956,1452295,1452501,1452707,1452719,1452721,1452752,1453105,1453112,1453435,1453439,1453490,1453544,1453549,1453621,1454828,1454832,1454953,1455854,1455973,1456083,1456440,1456453,1456491,1456494,1456657,1456666,1456678,1456706,1456713,1456716,1456721,1456740,1456762,1456766,1456822,1456844,1456863,1456872,1456882,1456885,1456895,1456899,1456904,1456916,1456920,1 456926,1456932,1456963,1458187,1458192,1458200,1458564-1458565,1458726,1459289,1461341,1461849,1470435,1507052,1521060,1561173-1561174,1587378-1587379,1587723,1659189,1682324,1743700,1757180,1757195,1817136 +/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222328,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-124 0046,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178, 1342027,1342029,1342315,1342320,1342476,1342498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,13519 91,1351993,1352011,1352056,1352059,1352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,1364141,1364149,1364411-1364412,1364448,1366708,1366720,1366729,1366734,1366910,1366945,1366953,1366959,1367214,1370346,1370364,1370373,1370386,1370473,1370537,1370549,1370553,1370879,1370916,1370958,1370960,1370973,1371017,1371283,1371336,1371620,1371812,1371823,1371896,1371976,1371978,1371995,1371999,1372131,1372152,1372156,1372390,1373003,1373080,1373142,1373488,1373578,1373618,1373622,1373666,1373985,1373987,1373990,1373993,1374000,1374019,1374823,13 76994,1377078,1377292,1377311,1377342,1377433,1377444,1377516,1377518-1377519,1377532,1377535,1377544,1377689,1377785,1377794,1377811,1377824,1377827,1377831,1377852-1377853,1377887,1377900,1378322,1378361,1378394,1378699,1378715,1378818,1378868,1378918,1379047,1379090,1379178,1379206,1379213,1379418,1379580,1379590,1379639,1379647,1379649,1379665,1379733,1379735,1380066,1380073,1380075,1380635,1380637,1380838,1381411,1381623,1382314,1382343,1382366,1382515,1382832,1382842,1385336,1387937,1388709,1390882,1392098,1392619,1393071,1393115,1396615,1396723,1397086,1397464,1397466,1397472,1397482,1397484,1397839,1397868,1397944,1399022,1401472,1401792,1401808,1401814,1402113,1402122,1402345,1402348,1402350,1402428,1402573,1402576,1402600-1402601,1402622,1402643,1402837,1402855,1403099,1403468,1404374,1404658,1404704,1404773,1404917-1404918,1405133,1405168,1405321,1405353,1405357,1405364,1405397,1405399-1405400,1405415,1405435,1405676,1405681,1406456,1406481,1406526,1407595,1407619,1408043 ,1408148,1408154,1408156,1408159,1408163-1408165,1408248,1408438,1408504,1408513-1408517,1408562-1408565,1408714,1408721,1408739,1408750,1408774,1408792,1408872-1408876,1408906,1408934,1409007,1409030,1410466,1410545,1410609,1410611,1410632,1410714,1410763-1410764,1410766,1411585,1411993,1412575,1413552,1413556,1413562,1414053,1414113,1414215,1414889,1415177-1415179,1415186,1416458,1416481,1416501,1416529,1416534-1416535,1416658,1417201,1417224,1417282,1417347-1417348,1417353,1417363,1417365,1417370-1417372,1417463,1417465,1417467,1417469,1417476,1424894,1425502,1427013,1427757,1427784,1427804,1427846,1428010,1428079,1428283,1428355,1428403,1428643,1428869,1428959,1428993,1429123,1429153,1429167,1429173,1429179-1429180,1429182,1429356,1429687,1429745,1429784,1429836,1429863,1429946,1429969,1430079,1430147,1430165,1430445,1430448,1430481,1430487,1430508,1430550,1430567,1430771,1430773,1430775,1430791,1430799,1430806,1430809,1430921,1431164,1431171,1431206,1431221,1431293,1431298,1431 302,1431308,1431310,1431320,1431661,1431920,1431990,1434660,1434685,1434882,1435606,1435636,1435642,1435767,1437317,1437337,1437505,1437637,1437649,1437743,1437891,1437897,1437903,1438411,1438463,1439054,1439334,1439434,1439442,1439445,1439667,1440095,1440622,1440911,1441342,1441348,1441403,1441416,1441428,1441895,1443350,1443405,1443427,1445111,1445125,1445190,1445208,1445212,1445328,1445337,1445520,1446108,1446137,1446357,1446612,1446640,1446650,1447012,1447178,1447791,1447817-1447818,1448117,1448121,1448125,1448826,1449225,1449406,1450990,1451053,1451061,1451105,1451408,1451434,1451769,1451938-1451939,1451947,1451955-1451956,1452295,1452501,1452707,1452719,1452721,1452752,1453105,1453112,1453435,1453439,1453490,1453544,1453549,1453621,1454828,1454832,1454953,1455854,1455973,1456083,1456440,1456453,1456491,1456494,1456657,1456666,1456678,1456706,1456713,1456716,1456721,1456740,1456762,1456766,1456822,1456844,1456863,1456872,1456882,1456885,1456895,1456899,1456904,1456916,1456920,1 456926,1456932,1456963,1458187,1458192,1458200,1458564-1458565,1458726,1459289,1461341,1461849,1470435,1507052,1521060,1561173-1561174,1587378-1587379,1587723,1659189,1682324,1743700,1757180,1757195,1817136,1833989 Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/package-info.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/package-info.java?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/package-info.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/package-info.java Fri Jun 22 07:57:00 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/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/package-info.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/package-info.java?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/package-info.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/package-info.java Fri Jun 22 07:57:00 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/tc7.0.x/trunk/modules/jdbc-pool/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.properties.default?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.properties.default (original) +++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.properties.default Fri Jun 22 07:57:00 2018 @@ -64,13 +64,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 c3p0.home=${base.path}/c3p0-0.9.1.2 c3p0.jar=${c3p0.home}/lib/c3p0-0.9.1.2.jar @@ -88,16 +88,16 @@ tomcat.version=6.0.32 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-6/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip +tomcat.loc=https://archive.apache.org/dist/tomcat/tomcat-6/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.home=${base.path}/h2 Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml (original) +++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml Fri Jun 22 07:57:00 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/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original) +++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Fri Jun 22 07:57:00 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> @@ -710,7 +710,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-7.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-7.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; @@ -917,7 +917,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-7.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-7.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 \ @@ -926,7 +926,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. Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/package.xsl URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/package.xsl?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/package.xsl (original) +++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/package.xsl Fri Jun 22 07:57:00 2018 @@ -36,8 +36,8 @@ <xsl:param name="relative-path" select="'.'"/> <xsl:param name="void-image" select="'/images/void.gif'"/> <xsl:param name="standalone" select="''"/> - <xsl:param name="buglink" select="'http://bz.apache.org/bugzilla/show_bug.cgi?id='"/> - <xsl:param name="revlink" select="'http://svn.apache.org/viewvc?view=rev&rev='"/> + <xsl:param name="buglink" select="'https://bz.apache.org/bugzilla/show_bug.cgi?id='"/> + <xsl:param name="revlink" select="'https://svn.apache.org/viewvc?view=rev&rev='"/> <!-- Defined variables (non-overrideable) --> <xsl:variable name="body-bg" select="'#ffffff'"/> Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/pom.xml?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/modules/jdbc-pool/pom.xml (original) +++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/pom.xml Fri Jun 22 07:57:00 2018 @@ -31,7 +31,7 @@ <packaging>jar</packaging> <name>jdbc-pool</name> - <url>http://people.apache.org/~fhanik/jdbc-pool/</url> + <url>https://people.apache.org/~fhanik/jdbc-pool/</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -55,7 +55,7 @@ <scm> <connection>scm:svn:https://svn.apache.org/repos/asf/tomcat/trunk/modules/jdbc-pool</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tomcat/trunk/modules/jdbc-pool</developerConnection> - <url>http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool</url> + <url>https://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool</url> </scm> <dependencies> Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java (original) +++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java Fri Jun 22 07:57:00 2018 @@ -42,7 +42,7 @@ import org.apache.juli.logging.LogFactor * <code>BasicDataSource</code> bean properties.</p> * <br> * Properties available for configuration:<br> - * <a href="http://commons.apache.org/dbcp/configuration.html";>Commons DBCP properties</a><br> + * <a href="https://commons.apache.org/dbcp/configuration.html";>Commons DBCP properties</a><br> *<ol> * <li>initSQL - A query that gets executed once, right after the connection is established.</li> * <li>testOnConnect - run validationQuery after connection has been established.</li> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-annotations-api.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-annotations-api.pom?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-annotations-api.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-annotations-api.pom Fri Jun 22 07:57:00 2018 @@ -21,7 +21,7 @@ <artifactId>tomcat-annotations-api</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Annotations Package</description> - <url>http://tomcat.apache.org/</url> + <url>https://tomcat.apache.org/</url> <licenses> <license> <name>Apache License, Version 2.0</name> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-api.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-api.pom?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-api.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-api.pom Fri Jun 22 07:57:00 2018 @@ -21,7 +21,7 @@ <artifactId>tomcat-api</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Definition of interfaces shared by Catalina and Jasper</description> - <url>http://tomcat.apache.org/</url> + <url>https://tomcat.apache.org/</url> <licenses> <license> <name>Apache License, Version 2.0</name> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ant.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ant.pom?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ant.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ant.pom Fri Jun 22 07:57:00 2018 @@ -21,7 +21,7 @@ <artifactId>tomcat-catalina-ant</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Tomcat Ant tasks for remote management</description> - <url>http://tomcat.apache.org/</url> + <url>https://tomcat.apache.org/</url> <licenses> <license> <name>Apache License, Version 2.0</name> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ha.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ha.pom?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ha.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ha.pom Fri Jun 22 07:57:00 2018 @@ -21,7 +21,7 @@ <artifactId>tomcat-catalina-ha</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Tomcat High Availability Implementation</description> - <url>http://tomcat.apache.org/</url> + <url>https://tomcat.apache.org/</url> <licenses> <license> <name>Apache License, Version 2.0</name> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-jmx-remote.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-jmx-remote.pom?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-jmx-remote.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-jmx-remote.pom Fri Jun 22 07:57:00 2018 @@ -21,7 +21,7 @@ <artifactId>tomcat-catalina-jmx-remote</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Tomcat Remote JMX listener</description> - <url>http://tomcat.apache.org/</url> + <url>https://tomcat.apache.org/</url> <licenses> <license> <name>Apache License, Version 2.0</name> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ws.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ws.pom?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ws.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ws.pom Fri Jun 22 07:57:00 2018 @@ -21,7 +21,7 @@ <artifactId>tomcat-catalina-ws</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Tomcat JNDI Factory for Web Services</description> - <url>http://tomcat.apache.org/</url> + <url>https://tomcat.apache.org/</url> <licenses> <license> <name>Apache License, Version 2.0</name> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina.pom?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina.pom Fri Jun 22 07:57:00 2018 @@ -21,7 +21,7 @@ <artifactId>tomcat-catalina</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Tomcat Servlet Engine Core Classes and Standard implementations</description> - <url>http://tomcat.apache.org/</url> + <url>https://tomcat.apache.org/</url> <licenses> <license> <name>Apache License, Version 2.0</name> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-coyote.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-coyote.pom?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-coyote.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-coyote.pom Fri Jun 22 07:57:00 2018 @@ -21,7 +21,7 @@ <artifactId>tomcat-coyote</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Tomcat Connectors and HTTP parser</description> - <url>http://tomcat.apache.org/</url> + <url>https://tomcat.apache.org/</url> <licenses> <license> <name>Apache License, Version 2.0</name> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-dbcp.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-dbcp.pom?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-dbcp.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-dbcp.pom Fri Jun 22 07:57:00 2018 @@ -21,7 +21,7 @@ <artifactId>tomcat-dbcp</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Tomcat Database Connection Pooling package</description> - <url>http://tomcat.apache.org/</url> + <url>https://tomcat.apache.org/</url> <licenses> <license> <name>Apache License, Version 2.0</name> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-el-api.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-el-api.pom?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-el-api.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-el-api.pom Fri Jun 22 07:57:00 2018 @@ -21,7 +21,7 @@ <artifactId>tomcat-el-api</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Expression language package</description> - <url>http://tomcat.apache.org/</url> + <url>https://tomcat.apache.org/</url> <licenses> <license> <name>Apache License, Version 2.0</name> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-core.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-core.pom?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-core.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-core.pom Fri Jun 22 07:57:00 2018 @@ -21,7 +21,7 @@ <artifactId>tomcat-embed-core</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Core Tomcat implementation</description> - <url>http://tomcat.apache.org/</url> + <url>https://tomcat.apache.org/</url> <licenses> <license> <name>Apache License, Version 2.0</name> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-el.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-el.pom?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-el.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-el.pom Fri Jun 22 07:57:00 2018 @@ -21,7 +21,7 @@ <artifactId>tomcat-embed-el</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Core Tomcat implementation</description> - <url>http://tomcat.apache.org/</url> + <url>https://tomcat.apache.org/</url> <licenses> <license> <name>Apache License, Version 2.0</name> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom Fri Jun 22 07:57:00 2018 @@ -21,7 +21,7 @@ <artifactId>tomcat-embed-jasper</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Core Tomcat implementation</description> - <url>http://tomcat.apache.org/</url> + <url>https://tomcat.apache.org/</url> <licenses> <license> <name>Apache License, Version 2.0</name> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-es.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-es.pom?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-es.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-es.pom Fri Jun 22 07:57:00 2018 @@ -21,7 +21,7 @@ <artifactId>tomcat-i18n-es</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Spanish translations</description> - <url>http://tomcat.apache.org/</url> + <url>https://tomcat.apache.org/</url> <licenses> <license> <name>Apache License, Version 2.0</name> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-fr.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-fr.pom?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-fr.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-fr.pom Fri Jun 22 07:57:00 2018 @@ -21,7 +21,7 @@ <artifactId>tomcat-i18n-fr</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>French translations</description> - <url>http://tomcat.apache.org/</url> + <url>https://tomcat.apache.org/</url> <licenses> <license> <name>Apache License, Version 2.0</name> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-ja.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-ja.pom?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-ja.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-ja.pom Fri Jun 22 07:57:00 2018 @@ -21,7 +21,7 @@ <artifactId>tomcat-i18n-ja</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Japanese translations</description> - <url>http://tomcat.apache.org/</url> + <url>https://tomcat.apache.org/</url> <licenses> <license> <name>Apache License, Version 2.0</name> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper-el.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper-el.pom?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper-el.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper-el.pom Fri Jun 22 07:57:00 2018 @@ -21,7 +21,7 @@ <artifactId>tomcat-jasper-el</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Jasper Expression Language Impl</description> - <url>http://tomcat.apache.org/</url> + <url>https://tomcat.apache.org/</url> <licenses> <license> <name>Apache License, Version 2.0</name> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom Fri Jun 22 07:57:00 2018 @@ -21,7 +21,7 @@ <artifactId>tomcat-jasper</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Tomcats JSP Parser</description> - <url>http://tomcat.apache.org/</url> + <url>https://tomcat.apache.org/</url> <licenses> <license> <name>Apache License, Version 2.0</name> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-jdbc.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-jdbc.pom?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-jdbc.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-jdbc.pom Fri Jun 22 07:57:00 2018 @@ -21,7 +21,7 @@ <artifactId>tomcat-jdbc</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Tomcat JDBC Pool Package</description> - <url>http://tomcat.apache.org/</url> + <url>https://tomcat.apache.org/</url> <licenses> <license> <name>Apache License, Version 2.0</name> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-jsp-api.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-jsp-api.pom?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-jsp-api.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-jsp-api.pom Fri Jun 22 07:57:00 2018 @@ -21,7 +21,7 @@ <artifactId>tomcat-jsp-api</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>JSP package</description> - <url>http://tomcat.apache.org/</url> + <url>https://tomcat.apache.org/</url> <licenses> <license> <name> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-juli.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-juli.pom?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-juli.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-juli.pom Fri Jun 22 07:57:00 2018 @@ -21,7 +21,7 @@ <artifactId>tomcat-juli</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Tomcat Core Logging Package</description> - <url>http://tomcat.apache.org/</url> + <url>https://tomcat.apache.org/</url> <licenses> <license> <name>Apache License, Version 2.0</name> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-servlet-api.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-servlet-api.pom?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-servlet-api.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-servlet-api.pom Fri Jun 22 07:57:00 2018 @@ -21,7 +21,7 @@ <artifactId>tomcat-servlet-api</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>javax.servlet package</description> - <url>http://tomcat.apache.org/</url> + <url>https://tomcat.apache.org/</url> <licenses> <license> <name> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-tribes.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-tribes.pom?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-tribes.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-tribes.pom Fri Jun 22 07:57:00 2018 @@ -21,7 +21,7 @@ <artifactId>tomcat-tribes</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Tomcat Group Communication Package</description> - <url>http://tomcat.apache.org/</url> + <url>https://tomcat.apache.org/</url> <licenses> <license> <name>Apache License, Version 2.0</name> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-util.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-util.pom?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-util.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-util.pom Fri Jun 22 07:57:00 2018 @@ -21,7 +21,7 @@ <artifactId>tomcat-util</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Common code shared by Catalina and Jasper</description> - <url>http://tomcat.apache.org/</url> + <url>https://tomcat.apache.org/</url> <licenses> <license> <name>Apache License, Version 2.0</name> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-websocket-api.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-websocket-api.pom?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-websocket-api.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-websocket-api.pom Fri Jun 22 07:57:00 2018 @@ -21,7 +21,7 @@ <artifactId>tomcat-websocket-api</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>WebSocket (JSR356) API</description> - <url>http://tomcat.apache.org/</url> + <url>https://tomcat.apache.org/</url> <licenses> <license> <name>Apache License, Version 2.0</name> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat.pom?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat.pom Fri Jun 22 07:57:00 2018 @@ -21,7 +21,7 @@ <artifactId>tomcat</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Binary distribution of Apache Tomcat</description> - <url>http://tomcat.apache.org/</url> + <url>https://tomcat.apache.org/</url> <packaging>pom</packaging> <licenses> <license> Modified: tomcat/tc7.0.x/trunk/res/rat/rat-excludes.txt URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/rat/rat-excludes.txt?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/rat/rat-excludes.txt (original) +++ tomcat/tc7.0.x/trunk/res/rat/rat-excludes.txt Fri Jun 22 07:57:00 2018 @@ -15,7 +15,7 @@ This is excludes file for Apache RAT tool run by ASF Buildbot, - http://incubator.apache.org/rat/ + https://creadur.apache.org/rat/ The following files are excluded: Modified: tomcat/tc7.0.x/trunk/res/tomcat.nsi URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/tomcat.nsi?rev=1834079&r1=1834078&r2=1834079&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/tomcat.nsi (original) +++ tomcat/tc7.0.x/trunk/res/tomcat.nsi Fri Jun 22 07:57:00 2018 @@ -213,11 +213,11 @@ Section "Core" SecTomcatCore FileSeek $ServiceInstallLog 0 END InstallRetry: - FileWrite $ServiceInstallLog '"$INSTDIR\bin\$TomcatServiceFileName" //IS//$TomcatServiceName --DisplayName "Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName" --Description "Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/"; --LogPath "$INSTDIR\logs" --Install "$INSTDIR\bin\$TomcatServiceFileName" --Jvm "$JvmDll" --StartPath "$INSTDIR" --StopPath "$INSTDIR"' + FileWrite $ServiceInstallLog '"$INSTDIR\bin\$TomcatServiceFileName" //IS//$TomcatServiceName --DisplayName "Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName" --Description "Apache Tomcat @VERSION@ Server - https://tomcat.apache.org/"; --LogPath "$INSTDIR\logs" --Install "$INSTDIR\bin\$TomcatServiceFileName" --Jvm "$JvmDll" --StartPath "$INSTDIR" --StopPath "$INSTDIR"' FileWrite $ServiceInstallLog "$\r$\n" ClearErrors DetailPrint "Installing $TomcatServiceName service" - nsExec::ExecToStack '"$INSTDIR\bin\$TomcatServiceFileName" //IS//$TomcatServiceName --DisplayName "Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName" --Description "Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/"; --LogPath "$INSTDIR\logs" --Install "$INSTDIR\bin\$TomcatServiceFileName" --Jvm "$JvmDll" --StartPath "$INSTDIR" --StopPath "$INSTDIR"' + nsExec::ExecToStack '"$INSTDIR\bin\$TomcatServiceFileName" //IS//$TomcatServiceName --DisplayName "Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName" --Description "Apache Tomcat @VERSION@ Server - https://tomcat.apache.org/"; --LogPath "$INSTDIR\logs" --Install "$INSTDIR\bin\$TomcatServiceFileName" --Jvm "$JvmDll" --StartPath "$INSTDIR" --StopPath "$INSTDIR"' Pop $0 Pop $1 StrCmp $0 "0" InstallOk @@ -1103,7 +1103,7 @@ Function createShortcuts SetOutPath "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName" CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName\Tomcat Home Page.lnk" \ - "http://tomcat.apache.org/"; + "https://tomcat.apache.org/"; CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName\Welcome.lnk" \ "http://127.0.0.1:$TomcatPortHttp/"; --------------------------------------------------------------------- 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}