svn commit: r1761683 - in /tomcat/tc8.5.x/trunk: ./ webapps/docs/changelog.xml

2016-09-21 Thread violetagg
Author: violetagg
Date: Wed Sep 21 07:05:04 2016
New Revision: 1761683

URL: http://svn.apache.org/viewvc?rev=1761683&view=rev
Log:
Remove extra traling spaces

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 21 07:05:04 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759611,1760005,1760300,1760446,1760454,1760640,1760648,1761422,1761550,1761553,1761572,1761574,1761628
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159

svn commit: r1761686 - /tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java

2016-09-21 Thread violetagg
Author: violetagg
Date: Wed Sep 21 07:27:25 2016
New Revision: 1761686

URL: http://svn.apache.org/viewvc?rev=1761686&view=rev
Log:
Remove extra spaces

Modified:

tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java

Modified: 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java?rev=1761686&r1=1761685&r2=1761686&view=diff
==
--- 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
 Wed Sep 21 07:27:25 2016
@@ -307,7 +307,7 @@ public class StatementCache extends Stat
 }
 return key;
 }
-
+
 
 private static final class CacheKey {
 private final String stmtType;



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



svn commit: r1761688 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/changelog.xml

2016-09-21 Thread violetagg
Author: violetagg
Date: Wed Sep 21 07:42:17 2016
New Revision: 1761688

URL: http://svn.apache.org/viewvc?rev=1761688&view=rev
Log:
Remove extra trailing spaces

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 21 07:42:17 2016
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 
7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,1687551,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1692894,1692896,1693088,1693105,1693429,1693461,1694058,1694111,169429

svn commit: r1761690 - in /tomcat/tc7.0.x/trunk: ./ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java

2016-09-21 Thread violetagg
Author: violetagg
Date: Wed Sep 21 07:48:50 2016
New Revision: 1761690

URL: http://svn.apache.org/viewvc?rev=1761690&view=rev
Log:
Remove extra spaces

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 21 07:48:50 2016
@@ -1,3 +1,3 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702
 
742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1
 
726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1759565
+/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1

buildbot success in on tomcat-8-trunk

2016-09-21 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-8-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-8-trunk/builds/770

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1761686
Blamelist: violetagg

Build succeeded!

Sincerely,
 -The Buildbot




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



svn commit: r1761692 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/changelog.xml

2016-09-21 Thread violetagg
Author: violetagg
Date: Wed Sep 21 07:51:48 2016
New Revision: 1761692

URL: http://svn.apache.org/viewvc?rev=1761692&view=rev
Log:
Remove extra trailing spaces

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 21 07:51:48 2016
@@ -1,4 +1,4 @@
 
/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989
 
,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717107,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722645,1722801,1723151,1724435,1724553,1724675,1724797,1724806,1725931,1726631,1726808,1726813,1726815,1726817,1726819,1726917,1726919,1726922-1726924,1727031,1727034,1727043,1727158,1727672,1727903,1728450,1729363,1731010,1731119,1731956,1731978,1732362,1732674-1732675,1733942,1734116,1734134,1734532,1737249,1737253,1737968,1738049,1738186,1739778,1741178,1741184,1741193,1741211,1741218,1741228,1741235,1742281,1743121,1743142,1743649,1744061,1744129,1744155,1744241,1744383,1744689,1745230,1746942,1746994,1749377,1750018,1750980,1751066,1754114,1754147,1754728,1754880,1754891,1754898,1754902,1756030,1756417,1756420,1756423,1756942,1757275,1757284,1757503,1758490,1758495,1761631
 
/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207,1715866,1716216-1716217,1716414,1717208-1717209,1720235,1720396,1720442,1720463,1721813,1721882,1722800,1723130,1724434,1724674,1724792,1724803,1725929,1725963-1725965,1725970,1725974,1726172,1726175,1726179-1726182,1726195-1726198,1726200,1726203,1726226,1726576,1726630,1727029,1727037,1727671,1727900,1728449,1729362,1731009,1731955,1731977,1732360,1732672,1733941,1734115,1734133,1734531,1737967,1738173,1739777,1741217,1743647,1744152,1756018
 
/tomcat/tc8.5.x/trunk:1737199,1737966,1738044,1741174,1741182,1741191,1741209,1741226,1741233,1742277,1743118,1743139-1743140,1744059,1744127,1744151,1744232,1744377,1744687,1745228,1746940,1749375,1750016,1750976,1751062,1754112,1754144,1754726,1754806,1754878,1754889,1754894,1754900,1756412,1756940,1757272,1757282,1757501,1758488,1758493,1761629
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770
 
809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,

svn commit: r1761689 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml

2016-09-21 Thread violetagg
Author: violetagg
Date: Wed Sep 21 07:47:04 2016
New Revision: 1761689

URL: http://svn.apache.org/viewvc?rev=1761689&view=rev
Log:
Remove extra trailing spaces

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 21 07:47:04 2016
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702
 
742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1
 
726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1759565
 
/tomcat/tc8.5.x/trunk:1735579,1736839,1737199,1737966,1738042,1738044,1738162,1738165,1738178,1739157,1739173,1739177,1739476,1740132,1740521,1740536,1740804,1740811,1740981,1741165,1741174,1741182,1741191,1741203,1741209,1741226,1741233,1741410,1742277,1743118,1743126,1743139-1743140,1743718,1743722,1743724,1744059,1744127,1744151,1744232,1744377,1744687,1744698,1744706,1745228,1746940,1748548,1748716,1749288,1749375,1749668-1749669,1750016,1750057,1750976,1751000,1751062,1751098,1754112,1754144,1754282,1754312,1754614,1754726,1754806,1754878,1754889,1754894,1754900,1754945,1754954,1754958,1755891,1755944,1756040,1756412,1756940,1757134,1757176,1757203,1757272,1757282,1757348,1757355,1757423,1757501,1757535,1758488,1758493,1758500,1758589,1759275,1761629
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1

[Bug 60077] When use compression with gzip , unzip data for client(explore) has a redundant brace at last(Occasional)

2016-09-21 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60077

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |INVALID
 Status|NEEDINFO|RESOLVED

--- Comment #2 from Mark Thomas  ---
Insufficient information provided to demonstrate a problem.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



svn commit: r1761682 - /tomcat/trunk/webapps/docs/changelog.xml

2016-09-21 Thread violetagg
Author: violetagg
Date: Wed Sep 21 07:01:32 2016
New Revision: 1761682

URL: http://svn.apache.org/viewvc?rev=1761682&view=rev
Log:
Remove extra traling spaces

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1761682&r1=1761681&r2=1761682&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Sep 21 07:01:32 2016
@@ -74,7 +74,7 @@
 Tatsuya Bessho. (kfujino)
   
   
-60138: Fix the SSLHostConfig so that the 
+60138: Fix the SSLHostConfig so that the
 protocols attribute is limited to the protocols supported
 by the current JSSE implementation rather than the default protocols
 used by the implementation. (markt)
@@ -105,7 +105,7 @@
   
 60123: Avoid potential threading issues that could cause
 excessively large vales to be returned for the processing time of
-a current request. (markt)  
+a current request. (markt)
   
 
   



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



[Bug 60087] Bouncy Castle in WEB-INF/lib not working on Tomcat 8 when unpackWars=false

2016-09-21 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60087

Akshay  changed:

   What|Removed |Added

 CC||akshay.she...@gmail.com

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



svn commit: r1761718 - in /tomcat/tc6.0.x/trunk/java/org/apache/jasper: compiler/JspRuntimeContext.java security/SecurityClassLoad.java

2016-09-21 Thread markt
Author: markt
Date: Wed Sep 21 11:12:06 2016
New Revision: 1761718

URL: http://svn.apache.org/viewvc?rev=1761718&view=rev
Log:
Follow-up to r1754904.
Remove remaining references to PrivilegedIntrospectHelper

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/security/SecurityClassLoad.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java?rev=1761718&r1=1761717&r2=1761718&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java 
Wed Sep 21 11:12:06 2016
@@ -82,8 +82,6 @@ public final class JspRuntimeContext {
 factory.getClass().getClassLoader().loadClass( basePackage +

"runtime.JspRuntimeLibrary");
 factory.getClass().getClassLoader().loadClass( basePackage +
-   
"runtime.JspRuntimeLibrary$PrivilegedIntrospectHelper");
-factory.getClass().getClassLoader().loadClass( basePackage +

"runtime.ServletResponseWrapperInclude");
 factory.getClass().getClassLoader().loadClass( basePackage +

"servlet.JspServletWrapper");

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/security/SecurityClassLoad.java?rev=1761718&r1=1761717&r2=1761718&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/security/SecurityClassLoad.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/security/SecurityClassLoad.java 
Wed Sep 21 11:12:06 2016
@@ -46,8 +46,6 @@ public final class SecurityClassLoad {
 
 loader.loadClass( basePackage +
 "runtime.JspRuntimeLibrary");
-loader.loadClass( basePackage +
-"runtime.JspRuntimeLibrary$PrivilegedIntrospectHelper");
 
 loader.loadClass( basePackage +
 "runtime.ServletResponseWrapperInclude");



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



[Bug 60013] Non-ASCII characters in querystring get mangled after URL Rewrite using RewriteValve

2016-09-21 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60013

--- Comment #39 from Santhana Preethi  ---
Thanks for the fix.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



[Bug 60161] New: RewriteValve: Add more logging support similar to mod-rewrite

2016-09-21 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60161

Bug ID: 60161
   Summary: RewriteValve: Add more logging support similar to
mod-rewrite
   Product: Tomcat 8
   Version: 8.0.35
  Hardware: PC
OS: Mac OS X 10.1
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: santhanapreeth...@gmail.com

Created attachment 34287
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=34287&action=edit
Patch for providing detailed logging in RewriteValve

The logging provided for RewriteValve is minimal. httpd provides detailed
logging support with configurable log levels. Also It would be useful while
debugging, if the time taken for rewrite is logged. I've added a patch
replicating apache mod_rewrite behaviour.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



[Bug 60161] RewriteValve: Add more logging support similar to mod-rewrite

2016-09-21 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60161

Santhana Preethi  changed:

   What|Removed |Added

 CC||santhanapreeth...@gmail.com

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



[Bug 60161] RewriteValve: Add more logging support similar to mod-rewrite

2016-09-21 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60161

Remy Maucherat  changed:

   What|Removed |Added

 Resolution|--- |WONTFIX
 Status|NEW |RESOLVED

--- Comment #1 from Remy Maucherat  ---
This patch is not very good. Changing the log level from debug to info is not
acceptable (debug is more than appropriate given what this is, and there's also
going to be a large performance impact ...), and that's what most of the patch
is doing in addition to logging statistics that don't look very useful (given
the precision of currentTimeMillis).

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



svn commit: r1761727 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/valves/rewrite/ test/org/apache/catalina/valves/rewrite/ webapps/docs/

2016-09-21 Thread markt
Author: markt
Date: Wed Sep 21 13:27:10 2016
New Revision: 1761727

URL: http://svn.apache.org/viewvc?rev=1761727&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60013
Refactor the previous fix to align the behaviour of the Rewrite Valve with 
mod_rewite. As part of this, provide an implementation for the B and NE flags 
and improve the handling for the QSA flag.
Includes multiple test cases by Santhana Preethiand a patch by Tiago Oliveira.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/build.xml
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/Resolver.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteRule.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 21 13:27:10 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759611,1760005,1760300,1760446,1760454,1760640,1760648,1761422,1761550,1761553,1761572,1761574,1761628,1761682
+/tomcat/trunk:1734785,1734799,1734845,1734928,

[Bug 60013] Non-ASCII characters in querystring get mangled after URL Rewrite using RewriteValve

2016-09-21 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60013

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |FIXED

--- Comment #40 from Mark Thomas  ---
This has been fixed in the following branches:
- 9.0.x for 9.0.0.M11 onwards
- 8.5.x for 8.5.6 onwards
- 8.0.x for 8.0.38 onwards

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



svn commit: r1761736 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/valves/rewrite/ test/org/apache/catalina/valves/rewrite/ webapps/docs/

2016-09-21 Thread markt
Author: markt
Date: Wed Sep 21 13:34:36 2016
New Revision: 1761736

URL: http://svn.apache.org/viewvc?rev=1761736&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60013
Refactor the previous fix to align the behaviour of the Rewrite Valve with 
mod_rewite. As part of this, provide an implementation for the B and NE flags 
and improve the handling for the QSA flag.
Includes multiple test cases by Santhana Preethiand a patch by Tiago Oliveira.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/build.xml
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/rewrite/Resolver.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteRule.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 21 13:34:36 2016
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,167

[Bug 60161] RewriteValve: Add more logging support similar to mod-rewrite

2016-09-21 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60161

--- Comment #2 from Mark Thomas  ---
The switch from the container's logger to a dedicated Rewrite logger is
problematic too.

There might be a case for recording the time taken to rewrite the URL but a) it
should only be collected and logged when debug logging is enabled and b) should
use nanoTime.

As a general rule, please keep the coding style of any patches consistent with
the code being patched.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



[Bug 60151] JNDI Datasource lookup failure - throws javax.naming.NamingException

2016-09-21 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60151

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

--- Comment #8 from Mark Thomas  ---
Setting state to NEEDINFO as we need to see the ResourceLink configuration to
confirm the root cause of the NPE.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



svn commit: r1761740 - in /tomcat/trunk: java/org/apache/naming/factory/LocalStrings.properties java/org/apache/naming/factory/ResourceLinkFactory.java webapps/docs/changelog.xml

2016-09-21 Thread markt
Author: markt
Date: Wed Sep 21 13:57:21 2016
New Revision: 1761740

URL: http://svn.apache.org/viewvc?rev=1761740&view=rev
Log:
Review of https://bz.apache.org/bugzilla/show_bug.cgi?id=60151
Improve the exception error messages when a ResourceLink fails to specify the 
type, specifies an unknown type or specifies the wrong type.

Added:
tomcat/trunk/java/org/apache/naming/factory/LocalStrings.properties   (with 
props)
Modified:
tomcat/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java
tomcat/trunk/webapps/docs/changelog.xml

Added: tomcat/trunk/java/org/apache/naming/factory/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/LocalStrings.properties?rev=1761740&view=auto
==
--- tomcat/trunk/java/org/apache/naming/factory/LocalStrings.properties (added)
+++ tomcat/trunk/java/org/apache/naming/factory/LocalStrings.properties Wed Sep 
21 13:57:21 2016
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+resourceLinkFactory.nullType=The local resource link [{0}] that refers to 
global resource [{1}] does not specify the required attribute type
+resourceLinkFactory.unknownType=The local resource link [{0}] that refers to 
global resource [{1}] specified the unknown type [{2}]
+resourceLinkFactory.wrongType=The local resource link [{0}] that refers to 
global resource [{1}] was expected to return an instance of [{2}] but returned 
an instance of [{3}]
\ No newline at end of file

Propchange: tomcat/trunk/java/org/apache/naming/factory/LocalStrings.properties
--
svn:eol-style = native

Modified: tomcat/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java?rev=1761740&r1=1761739&r2=1761740&view=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java 
(original)
+++ tomcat/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java Wed 
Sep 21 13:57:21 2016
@@ -29,6 +29,7 @@ import javax.naming.Reference;
 import javax.naming.spi.ObjectFactory;
 
 import org.apache.naming.ResourceLinkRef;
+import org.apache.naming.StringManager;
 
 /**
  * Object factory for resource links.
@@ -39,6 +40,8 @@ public class ResourceLinkFactory impleme
 
 // --- Static Variables
 
+private static final StringManager sm = 
StringManager.getManager(ResourceLinkFactory.class);
+
 /**
  * Global naming context.
  */
@@ -146,14 +149,20 @@ public class ResourceLinkFactory impleme
 result = globalContext.lookup(globalName);
 // Check the expected type
 String expectedClassName = ref.getClassName();
+if (expectedClassName == null) {
+throw new IllegalArgumentException(
+sm.getString("resourceLinkFactory.nullType", name, 
globalName));
+}
 try {
 Class expectedClazz = Class.forName(
 expectedClassName, true, 
Thread.currentThread().getContextClassLoader());
 if (!expectedClazz.isAssignableFrom(result.getClass())) {
-throw new IllegalArgumentException();
+throw new 
IllegalArgumentException(sm.getString("resourceLinkFactory.wrongType",
+name, globalName, expectedClassName, 
result.getClass().getName()));
 }
 } catch (ClassNotFoundException e) {
-throw new IllegalStateException(e);
+throw new 
IllegalArgumentException(sm.getString("resourceLinkFactory.unknownType",
+name, globalName, expectedClassName), e);
 }
 return result;
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1761740&r1=1761739&r2=1761740&view=diff
===

svn commit: r1761741 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/naming/factory/LocalStrings.properties java/org/apache/naming/factory/ResourceLinkFactory.java webapps/docs/changelog.xml

2016-09-21 Thread markt
Author: markt
Date: Wed Sep 21 13:59:39 2016
New Revision: 1761741

URL: http://svn.apache.org/viewvc?rev=1761741&view=rev
Log:
Review of https://bz.apache.org/bugzilla/show_bug.cgi?id=60151
Improve the exception error messages when a ResourceLink fails to specify the 
type, specifies an unknown type or specifies the wrong type.

Added:
tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/LocalStrings.properties
  - copied unchanged from r1761740, 
tomcat/trunk/java/org/apache/naming/factory/LocalStrings.properties
Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 21 13:59:39 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682
+/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

svn commit: r1761742 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/naming/StringManager.java java/org/apache/naming/factory/LocalStrings.properties java/org/apache/naming/factory/ResourceLinkFactory.

2016-09-21 Thread markt
Author: markt
Date: Wed Sep 21 14:01:19 2016
New Revision: 1761742

URL: http://svn.apache.org/viewvc?rev=1761742&view=rev
Log:
Review of https://bz.apache.org/bugzilla/show_bug.cgi?id=60151
Improve the exception error messages when a ResourceLink fails to specify the 
type, specifies an unknown type or specifies the wrong type.

Added:
tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/LocalStrings.properties
  - copied unchanged from r1761740, 
tomcat/trunk/java/org/apache/naming/factory/LocalStrings.properties
Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/naming/StringManager.java
tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 21 14:01:19 2016
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311

svn commit: r1761748 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/naming/StringManager.java java/org/apache/naming/factory/LocalStrings.properties java/org/apache/naming/factory/ResourceLinkFactory.

2016-09-21 Thread markt
Author: markt
Date: Wed Sep 21 14:03:37 2016
New Revision: 1761748

URL: http://svn.apache.org/viewvc?rev=1761748&view=rev
Log:
Review of https://bz.apache.org/bugzilla/show_bug.cgi?id=60151
Improve the exception error messages when a ResourceLink fails to specify the 
type, specifies an unknown type or specifies the wrong type.

Added:
tomcat/tc7.0.x/trunk/java/org/apache/naming/factory/LocalStrings.properties
  - copied unchanged from r1761741, 
tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/LocalStrings.properties
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/naming/StringManager.java
tomcat/tc7.0.x/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 21 14:03:37 2016
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702
 
742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1
 
726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1759565,1761686
-/tomcat/tc8.5.x/trunk:1735579,1736839,1737199,1737966,1738042,1738044,1738162,1738165,1738178,1739157,1739173,1739177,1739476,1740132,1740521,1740536,1740804,1740811,1740981,1741165,1741174,1741182,1741191,1741203,1741209,1741226,1741233,1741410,1742277,1743118,1743126,1743139-1743140,1743718,1743722,1743724,1744059,1744127,1744151

svn commit: r1761750 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/naming/StringManager.java java/org/apache/naming/factory/LocalStrings.properties java/org/apache/naming/factory/ResourceLinkFactory.

2016-09-21 Thread markt
Author: markt
Date: Wed Sep 21 14:08:38 2016
New Revision: 1761750

URL: http://svn.apache.org/viewvc?rev=1761750&view=rev
Log:
Review of https://bz.apache.org/bugzilla/show_bug.cgi?id=60151
Improve the exception error messages when a ResourceLink fails to specify the 
type, specifies an unknown type or specifies the wrong type.

Added:
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/LocalStrings.properties
  - copied unchanged from r1761748, 
tomcat/tc7.0.x/trunk/java/org/apache/naming/factory/LocalStrings.properties
Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/StringManager.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 21 14:08:38 2016
@@ -1,4 +1,4 @@
-/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989
 
,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717107,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722645,1722801,1723151,1724435,1724553,1724675,1724797,1724806,1725931,1726631,1726808,1726813,1726815,1726817,1726819,1726917,1726919,1726922-1726924,1727031,1727034,1727043,1727158,1727672,1727903,1728450,1729363,1731010,1731119,1731956,1731978,1732362,1732674-1732675,1733942,1734116,1734134,1734532,1737249,1737253,1737968,1738049,1738186,1739778,1741178,1741184,1741193,1741211,1741218,1741228,1741235,1742281,1743121,1743142,1743649,1744061,1744129,1744155,1744241,1744383,1744689,1745230,1746942,1746994,1749377,1750018,1750980,1751066,1754114,1754147,1754728,1754880,1754891,1754898,1754902,1756030,1756417,1756420,1756423,1756942,1757275,1757284,1757503,1758490,1758495,1761631
+/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989
 
,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717107,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722645,1722801,1723151,1724435,1724553,1724675,1724797,1724806,1725931,1726631,1726808,1726813,1726815,1726817,1726819,1726917,1726919,1726922-1726924,1727031,1727034,1727043,1727158,1727672,1727903,1728450,1729363,1731010,1731119,1731956,1731978,1732362,1732674-1732675,1733942,1734116,1734134,1734532,1737249,1737253,1737968,1738049,1738186,1739778,1741178,1741184,1741193,1741211,1741218,1741228,1741235,1742281,1743121,1743142,1743649,1744061,1744129,1744155,1744241,1744383,1744689,1745230,1746942,1746994,1749377,1750018,1750980,1751066,1754114,1754147,1754728,1754880,1754891,1754898,1754902,1756030,1756417,1756420,1756423,1756942,1757275,1757284,1757503,1758490,1758495,1761631,1761748
 
/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,164

[Bug 60151] JNDI Datasource lookup failure - throws javax.naming.NamingException

2016-09-21 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60151

--- Comment #9 from Mark Thomas  ---
After reviewing the code, I've applied a fix to improve the exception error
message when the type is missing or incorrect.

This has been fixed in the following branches:
- 9.0.x for 9.0.0.M11 onwards
- 8.5.x for 8.5.6 onwards
- 8.0.x for 8.0.38 onwards
- 7.0.x for 7.0.73 onwards
- 6.0.x for 6.0.46 onwards

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



Re: Deploying Tomcat on Snappy Ubuntu Core

2016-09-21 Thread Christopher Schultz
Martin,

On 9/20/16 5:44 PM, Martin Grigorov wrote:
> Hi Chris,
> 
> On Tue, Sep 20, 2016 at 10:51 PM, Christopher Schultz <
> ch...@christopherschultz.net> wrote:
> 
>> Martin,
>>
>> On 9/20/16 3:28 PM, Martin Grigorov wrote:
>>> Hi Michael,
>>>
>>> On Tue, Sep 20, 2016 at 9:11 PM, Michael Hall 
>> wrote:
>>>
 Hi Martin,


 On 09/20/2016 02:56 PM, Martin Grigorov wrote:
> Hi Michael,
>
> On Tue, Sep 20, 2016 at 3:10 PM, Michael Hall 
 wrote:
>
>> Hi Coty,
>>
>> Have you had an opportunity to try this yet? If you need help please
>> let
>> me know, or you could find help on #snappy on Freenode or
>> https://gitter.im/ubuntu/snappy-playpen (a new slack-like service
>> connected to github)
>>
>
> I am an Ubuntu user and I've tried once Snap.
> I've installed the featured Notes application and I was amazed to see
 that
> it downloaded 60Mb for such a simple application! After being unzipped
>> it
> is 196MB !!
> Then I removed it.
> I hope Canonical will keep .deb around for the near future!
>

 .deb package aren't going away, snaps are just a new option that bring a

>>>
>>> Yes, I know that .deb isn't going away.
>>> I just said it to express my frustration with those 196MB.
>>>
>>>
 lot of benefit. Desktop apps like Notes are currently quite large
 because they bundle the whole GUI toolkit that they use. This is
 something that has a solution underway, but it won't affect services
 like tomcat nearly as much,

 The Tomcat snap does include a JRE though, so you always know that one
 is available and that Tomcat will work with it. Even with that the

>>>
>>> What if I need different combination of Tomcat and JRE versions than what
>>> your Snap versions provide ?
>>> Let's say I experience some bug in the bundled JRE version (e.g. X) and
>>> your next Snap version bundles JRE X+1 but also Tomcat Y+1.
>>> What if I need JRE X+1 and Tomcat Y because there is a regression in Y+1
>> ?
>>> Just thinking loud here.
>>>
>>>
 resulting snap is only 48MB. Snaps are never "unzipped", instead they
 are loop-mounted into your filesystem, so the download size is the

>>>
>>> I haven't read about squashfs, so I'm not sure how exactly it works.
>>> 196MB is what "du" program reports.
>>> If it is not disk size then I hope this 60MB download is not unzipped in
>>> the RAM.
>>> http://snapcraft.io/ says "That directory will be compressed into a
>>> squashfs - a zipped directory - and then it will be mounted at
>>> /snap//current when the snap is installed."
>>
>> It's like an executable JAR file, except that the kernel loads the thing
>> as a filesystem. So 'du' will tell you it's bigger than it actually is
>> (it's bigger on the inside than it is on the outside).
> 
> 
>> That 60MiB download isn't being uncompressed elsewhere on the disk or
>> into RAM. It's being decompressed on the fly as necessary, just like a
>> remotely-mounted filesystem isn't copied locally whenever you access
>> files. Sore, a file or two might have some parts cached locally, but you
>> aren't sucking-down your entire multi-petabyte SAN contents when you
>> login to your corporate network.
>>
> 
> Thanks for the explanation!
> But I think the example with reading data from SAN is not exactly the same
> as executing a process in the kernel.
> To start the process the kernel needs to load (big?!) part of the zipped
> bundle. Everything else might be loaded if needed later.

ZIP files store their catalog at the end of the file, and most
filesystems store their catalogs at the beginning of the "file". Both
have a structure which describes the file names and where the data can
be found. I think it's a reasonable analogy.

> 1) Dealing with compressed data is definitely slower than dealing with
> uncompressed data, and this is valid both for startup time and runtime.

Agreed. I was using the SAN as an example of something that "takes time"
much in the same way as reading from a ZIP file "takes time". Of course,
for the SAN example, the CPU isn't doing any work waiting for the data
to become available while in the ZIP case it's being used to decompress
the content.

> 2) Snaps share nothing, by design. So if more than one app needs the same
> dependency then it is not just about the disk space but also duplicated
> stuff in memory.

Possibly. I know that VM hypervisors perform page-merging but I have no
idea if "normal" OSs do that. It's possible that loading libcrypt in 10
processes only gets you a single copy of libcrypt in memory, even if
they were loaded from separate Snaps. (Same versions of libcrypt, of
course.)

> This is advertized as Pros but for me is Cons.

Meh. This solves a particular problem and the use case is valid. If you
can do everything without Snaps (e.g. a typical server configuration)
then go for it. If Snaps solve a problem for you ("DLL hell") then use
that instead.

> 3) I cann

Re: Deploying Tomcat on Snappy Ubuntu Core

2016-09-21 Thread Michael Hall

On 09/20/2016 05:44 PM, Martin Grigorov wrote:
> Hi Chris,
> 
> On Tue, Sep 20, 2016 at 10:51 PM, Christopher Schultz <
> ch...@christopherschultz.net> wrote:
> 
>> Martin,
>>
>> On 9/20/16 3:28 PM, Martin Grigorov wrote:
>>> Hi Michael,
>>>
>>> On Tue, Sep 20, 2016 at 9:11 PM, Michael Hall 
>> wrote:
>>>
 Hi Martin,


 On 09/20/2016 02:56 PM, Martin Grigorov wrote:
> Hi Michael,
>
> On Tue, Sep 20, 2016 at 3:10 PM, Michael Hall 
 wrote:
>
>> Hi Coty,
>>
>> Have you had an opportunity to try this yet? If you need help please
>> let
>> me know, or you could find help on #snappy on Freenode or
>> https://gitter.im/ubuntu/snappy-playpen (a new slack-like service
>> connected to github)
>>
>
> I am an Ubuntu user and I've tried once Snap.
> I've installed the featured Notes application and I was amazed to see
 that
> it downloaded 60Mb for such a simple application! After being unzipped
>> it
> is 196MB !!
> Then I removed it.
> I hope Canonical will keep .deb around for the near future!
>

 .deb package aren't going away, snaps are just a new option that bring a

>>>
>>> Yes, I know that .deb isn't going away.
>>> I just said it to express my frustration with those 196MB.
>>>
>>>
 lot of benefit. Desktop apps like Notes are currently quite large
 because they bundle the whole GUI toolkit that they use. This is
 something that has a solution underway, but it won't affect services
 like tomcat nearly as much,

 The Tomcat snap does include a JRE though, so you always know that one
 is available and that Tomcat will work with it. Even with that the

>>>
>>> What if I need different combination of Tomcat and JRE versions than what
>>> your Snap versions provide ?
>>> Let's say I experience some bug in the bundled JRE version (e.g. X) and
>>> your next Snap version bundles JRE X+1 but also Tomcat Y+1.
>>> What if I need JRE X+1 and Tomcat Y because there is a regression in Y+1
>> ?
>>> Just thinking loud here.
>>>
>>>
 resulting snap is only 48MB. Snaps are never "unzipped", instead they
 are loop-mounted into your filesystem, so the download size is the

>>>
>>> I haven't read about squashfs, so I'm not sure how exactly it works.
>>> 196MB is what "du" program reports.
>>> If it is not disk size then I hope this 60MB download is not unzipped in
>>> the RAM.
>>> http://snapcraft.io/ says "That directory will be compressed into a
>>> squashfs - a zipped directory - and then it will be mounted at
>>> /snap//current when the snap is installed."
>>
>> It's like an executable JAR file, except that the kernel loads the thing
>> as a filesystem. So 'du' will tell you it's bigger than it actually is
>> (it's bigger on the inside than it is on the outside).
> 
> 
>> That 60MiB download isn't being uncompressed elsewhere on the disk or
>> into RAM. It's being decompressed on the fly as necessary, just like a
>> remotely-mounted filesystem isn't copied locally whenever you access
>> files. Sore, a file or two might have some parts cached locally, but you
>> aren't sucking-down your entire multi-petabyte SAN contents when you
>> login to your corporate network.
>>
> 
> Thanks for the explanation!
> But I think the example with reading data from SAN is not exactly the same
> as executing a process in the kernel.
> To start the process the kernel needs to load (big?!) part of the zipped
> bundle. Everything else might be loaded if needed later.
> 
> 1) Dealing with compressed data is definitely slower than dealing with
> uncompressed data, and this is valid both for startup time and runtime.

Squashfs is actually very fast at read operations, it trades off a
slower compression time for a faster decompression time. It's been used
for years in Ubuntu Live CD/DVD images, and the compression algorithm is
also used in AppImage (and I think FlatPak).

> 2) Snaps share nothing, by design. So if more than one app needs the same
> dependency then it is not just about the disk space but also duplicated
> stuff in memory. This is advertized as Pros but for me is Cons.

It's possible for snaps to share content with each other, but currently
only if both snaps are from the same developer. You will usually be
bundling your own copies of dependencies though. But, as previous
stated, that's more of a problem for desktop apps than services, and
combined with the squashfs compression doesn't have that much of an
impact on disk space used.

> 3) I cannot find any information about a running Notes app (I've installed
> it again for the testing!) neither with 'ps', nor with 'htop', nor with
> 'snap'. All I can find is a parent 'snapd' process with several forks. If I
> need to install a spy software I'll pack it as a Snap :-)
> 

Was it running? I installed the Notes app and launched it, after that I
could see "Notes" in ps. Snap processes are run just like any other
process on your machine, th

[Bug 60161] RewriteValve: Add more logging support similar to mod-rewrite

2016-09-21 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60161

--- Comment #3 from Christopher Schultz  ---
(In reply to Mark Thomas from comment #2)
> The switch from the container's logger to a dedicated Rewrite logger is
> problematic too.

Now so? I would think this might be the one good part of this proposed patch,
because it makes it easier to adjust the log level of *only* the RewriteValve.
Honestly, that should have been the only thing necessary, here. Everything else
would have been configuration of the log as per usual.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



svn commit: r1761752 - /tomcat/trunk/webapps/docs/config/http.xml

2016-09-21 Thread violetagg
Author: violetagg
Date: Wed Sep 21 14:31:46 2016
New Revision: 1761752

URL: http://svn.apache.org/viewvc?rev=1761752&view=rev
Log:
Fix typo

Modified:
tomcat/trunk/webapps/docs/config/http.xml

Modified: tomcat/trunk/webapps/docs/config/http.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1761752&r1=1761751&r2=1761752&view=diff
==
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Wed Sep 21 14:31:46 2016
@@ -1443,7 +1443,7 @@
   intending to use the APR connector, and Tomcat will automatically enable 
it
   and the default value of this attribute becomes
   org.apache.tomcat.util.net.openssl.OpenSSLImplementation.
-  In that case, the attributes from either from either JSSE and OpenSSL
+  In that case, the attributes from either JSSE and OpenSSL
   configuration styles can be used, as long as the two types are not mixed
   (for example, it is not allowed to define use of a Java keystore and
   specify a separate pem private key using the OpenSSL attribute).



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



svn commit: r1761754 - in /tomcat/tc8.5.x/trunk: ./ webapps/docs/config/http.xml

2016-09-21 Thread violetagg
Author: violetagg
Date: Wed Sep 21 14:33:40 2016
New Revision: 1761754

URL: http://svn.apache.org/viewvc?rev=1761754&view=rev
Log:
Fix typo

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 21 14:33:40 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,

[Bug 60161] RewriteValve: Add more logging support similar to mod-rewrite

2016-09-21 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60161

--- Comment #4 from Remy Maucherat  ---
If there are more than one rewrite valves used, it doesn't sound like a good
idea.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



[Bug 60161] RewriteValve: Add more logging support similar to mod-rewrite

2016-09-21 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60161

--- Comment #5 from Christopher Schultz  ---
That's a good point, Rémy, but it's no worse than the current situation where
the rewrite logs all go to the container's logger.

I think there's still some useful work that can be done, here.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 60151] JNDI Datasource lookup failure - throws javax.naming.NamingException

2016-09-21 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60151

--- Comment #10 from Per Carlson  ---
Created attachment 34288
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=34288&action=edit
context.xml

As you suspected, the type attribute of the ResourceLinks is missing.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



[Bug 60151] JNDI Datasource lookup failure - throws javax.naming.NamingException

2016-09-21 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60151

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEEDINFO|RESOLVED

--- Comment #11 from Mark Thomas  ---
Thanks for the confirmation.

Given that the docs have said that type is a required attribute since at least
6.0.0 and that I have added a better error message for the next round of
releases I'm going to mark this as fixed.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



Re: How could I get involved into tomcat development?

2016-09-21 Thread Tiramisu Ling
Hi, I meet some problems when I try to build tomcat on ubuntu 16.04 locally.

*compile:
*
*[javac] Compiling 1577 source files to
/home/mikelinf/tomcat/output/classes *
*[javac] javac: invalid target release:
1.8  *
*[javac] Usage: javac *
*[javac] use -help for a list of possible
options*


*BUILD
FAILED
*
*/home/mikelinf/tomcat/build.xml:643: Compile failed; see the compiler
error output for details.*

But both my java -v and javac -v are 1.7.0

*mikelinf@mikeling-pc:~/tomcat$ java -version*
*java version "1.7.0_80"*
*Java(TM) SE Runtime Environment (build 1.7.0_80-b15)*
*Java HotSpot(TM) 64-Bit Server VM (build 24.80-b11, mixed mode)*
*mikelinf@mikeling-pc:~/tomcat$ javac -version*
*javac 1.7.0_80*

And I had add $JAVA_HOME and $ANT_HOME in the $PATH


*# Java environment variable*
*export JAVA_HOME=/usr/lib/jvm/java-7-oracle/*

*# Apache environment variable*
*export ANT_HOME=/home/mikelinf/apache/ant*
*export PATH=$ANT_HOME/bin:$PATH*

What should I do next? How could I fix this issue and make the building
depend on 1.7.0?

Thank you very much!
MikeLing

2016-09-21 2:06 GMT+08:00 Martin Grigorov :

> Hi,
>
> On Tue, Sep 20, 2016 at 5:50 PM, Tiramisu Ling 
> wrote:
>
> > How could I take it if I do interest in that bug and want to work on it?
> I
> > see those bugs been assigned to mail list already.
> >
>
> You can add a comment that you are working on it.
> If you have any questions about the functionality you can ask them here
> (dev@) or at us...@tomcat.apache.org if the answer could be known by a
> non-committer, e.g. related to configuration, deployment, etc.
>
> If you plan to hang around for longer time I'd recommend to read
> https://wiki.apache.org/tomcat/FAQ/Tomcat_User too.
>
> Have fun!
>
> Martin
>
>
> >
> > > 在 2016年9月20日,下午11:22,Mark Thomas  写道:
> > >
> > >> On 20/09/2016 15:40, Tiramisu Ling wrote:
> > >> Hey Mark, thank you for your help :) Do you mean
> > >> https://bz.apache.org/bugzilla/show_bug.cgi?id=60008 above instead of
> > bug
> > >> 6008? Because it tells me bug id is unavailable for
> > https://bz.apache.org/
> > >> bugzilla/show_bug.cgi?id=6008.
> > >
> > > Sorry, I meant
> > > https://bz.apache.org/bugzilla/show_bug.cgi?id=60087
> > >
> > > The last digit was lost in the copy/paste.
> > >
> > > Mark
> > >
> > >
> > >>
> > >> 2016-09-20 21:06 GMT+08:00 Mark Thomas :
> > >>
> >  On 20/09/2016 13:28, Tiramisu Ling wrote:
> >  hello everyone,
> > 
> >  I'm a newbie in tomcat and I would like to get involved into it.
> Could
> > >>> you
> >  tell me where to start with it? How could I find something like
> 'good
> > >>> first
> >  bug'? Thank you very much :)
> > >>>
> > >>> A good bug to get started on is usually one that you care about
> and/or
> > >>> are interested in so you are motivated to fix it.
> > >>>
> > >>> Some possibilities:
> > >>> https://bz.apache.org/bugzilla/show_bug.cgi?id=55969
> > >>> I'd recommend starting with item 3, then 2 and finally 1.
> > >>>
> > >>> https://bz.apache.org/bugzilla/show_bug.cgi?id=6008
> > >>> Not sure how complex fixing this would be. Just having a clear
> > >>> explanation of what is going on would be useful.
> > >>>
> > >>> Other than that, take a look at the open bugs and pick one you think
> is
> > >>> interesting. Even if you can't fix it, if you can put together a
> patch
> > >>> that adds a test case that demonstrates it that would be a huge help.
> > >>>
> > >>> Mark
> > >>>
> > >>>
> > >>> 
> -
> > >>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> > >>> For additional commands, e-mail: dev-h...@tomcat.apache.org
> > >
> > >
> > > -
> > > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> > > For additional commands, e-mail: dev-h...@tomcat.apache.org
> > >
> >
> > -
> > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> > For additional commands, e-mail: dev-h...@tomcat.apache.org
> >
> >
>


RE: How could I get involved into tomcat development?

2016-09-21 Thread Caldarale, Charles R
> From: Tiramisu Ling [mailto:saberge...@gmail.com] 
> Subject: Re: How could I get involved into tomcat development?

> Hi, I meet some problems when I try to build tomcat on ubuntu 16.04 locally.

> *[javac] javac: invalid target release: 1.8   
>*

> But both my java -v and javac -v are 1.7.0

Upgrade your JDK to Java 8.  This is required for building trunk or 9.0.x, and 
recommended for other levels.  You can build Tomcat 8.5 and older on Java 7.  
You didn't tell us what version of Tomcat you're using, but since you're 
working on a Bugzilla entry, you should be testing on trunk first.

 - Chuck


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



[PATCH] - rat-output.xml tweaks for tc8.0.x tc8.5.x trunk

2016-09-21 Thread Gavin McDonald
Hi All,

Please find attached 3 patches for tweaks to the rat-excludes file in trunk
and the 8.0 and 8.5 branches.

RAT tests are currently producing invalid xml reports due to files that
should be excluded 
(and therefore xml parser cant convert to html for pretty reports etc)

HTH

Gav...
 


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