date:20160117

[Bug 58882] when i try to deploy my war it is not deploying

2016-01-17 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=58882

Violeta Georgieva  changed:

   What|Removed |Added

 Resolution|WORKSFORME  |INVALID

-- 
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 58882] when i try to deploy my war it is not deploying

2016-01-17 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=58882

venkat  changed:

   What|Removed |Added

 CC||skanda...@gmail.com
 Status|NEW |RESOLVED
 Resolution|--- |WORKSFORME
 OS||All

--- Comment #1 from venkat  ---
It is working fine now , it was my mistaken i found the issue.

-- 
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 58882] New: when i try to deploy my war it is not deploying

2016-01-17 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=58882

Bug ID: 58882
   Summary: when i try to deploy my war it is not deploying
   Product: Tomcat 7
   Version: 7.0.1
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: skanda...@gmail.com

File not found exception when i try to deploy my war using tomcat manager by
uploading war file.

-- 
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 58766] Embedded Tomcat 8 startup hangs on RedHat when calling addWebapp

2016-01-17 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=58766

--- Comment #11 from Konstantin Kolinko  ---
(In reply to Konstantin Kolinko from comment #4)
> It sounds like a duplicate of bug 57823.
> 
> 
> By the way, regarding
> org.apache.catalina.startup.ContextConfig.processAnnotationsFile()
> method:
> 
> 1. This method needs debug logging. (There is none at the moment).
> 2. The following condition needs first && second swapped:
> 
> >> } else if (file.canRead() && file.getName().endsWith(".class")) {
> 
> As can be seen from stacktrace in Comment 0, the "canRead()" call is an I/O
> operation. This is more expensive than a filename check.
> 

The above improvements were implemented and will be in 7.0.68, 8.0.31, 9.0.0.M2
onwards.
(r1725165/r1725167/r1725170)

-- 
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 56785] NullPointer in processAnnotationsFile during Application Startup

2016-01-17 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=56785

--- Comment #10 from Konstantin Kolinko  ---
The fix is in Tomcat 8.0.11 onwards.

Fixed in Tomcat 7 (r1725170) and will be in 7.0.68 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: r1725170 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java java/org/apache/catalina/startup/LocalStrings.properties webapps/docs/changelog.xml

2016-01-17 Thread kkolinko

Author: kkolinko
Date: Mon Jan 18 03:30:42 2016
New Revision: 1725170

URL: http://svn.apache.org/viewvc?rev=1725170&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=56785
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58766#c4
1) Slightly improve performance of scanning a directory:
check the file name first, as file.canRead() is an I/O operation.

2) Add debug logging that prints what is being scanned.

3) Also backport r1615920 - a fix for NPE when there is an unreadable directory 
on the classpath:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56785
> Avoid NullPointerException if directory exists on the class path that is not 
> readable by the Tomcat user.

This is backport of r1615920 and r1725167.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 18 03:30:42 2016
@@ -1,2 +1,2 @@
-/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,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,1702742,1702
 
744,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,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
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238

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

2016-01-17 Thread kkolinko

Author: kkolinko
Date: Mon Jan 18 02:53:30 2016
New Revision: 1725169

URL: http://svn.apache.org/viewvc?rev=1725169&view=rev
Log:
Reorder according to BZ issue number.

Modified:
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1725169&r1=1725168&r2=1725169&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jan 18 02:53:30 2016
@@ -72,16 +72,16 @@
 during evaluation of EL expressions. (kkolinko)
   
   
-58701: Reset the instanceInitialized field in
-StandardWrapper when unloading a Servlet so that a new
-instance may be correctly initialized. (markt)
-  
-  
 58692: Make StandardJarScanner more robust. Log
 a warning if a class path entry cannot be scanned rather than 
triggering
 the failure of the web application. (markt)
   
   
+58701: Reset the instanceInitialized field in
+StandardWrapper when unloading a Servlet so that a new
+instance may be correctly initialized. (markt)
+  
+  
 58702: Ensure an access log entry is generated if the client
 aborts the connection. (markt)
   



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

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

2016-01-17 Thread kkolinko

Author: kkolinko
Date: Mon Jan 18 02:52:00 2016
New Revision: 1725168

URL: http://svn.apache.org/viewvc?rev=1725168&view=rev
Log:
Reorder according to BZ issue number.

Modified:
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1725168&r1=1725167&r2=1725168&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Jan 18 02:52:00 2016
@@ -53,11 +53,6 @@
 session IDs may be rejected if validation is enabled. (markt)
   
   
-58701: Reset the instanceInitialized field in
-StandardWrapper when unloading a Servlet so that a new
-instance may be correctly initialized. (markt)
-  
-  
 Add path parameter handling to
 HttpServletRequest.getContextPath(). This is a follow-up 
to
 the fix for 57215. (markt)
@@ -66,7 +61,12 @@
 58692: Make StandardJarScanner more robust. Log
 a warning if a class path entry cannot be scanned rather than 
triggering
 the failure of the web application. Includes a test case written by
- Derek Abdine. (markt)
+Derek Abdine. (markt)
+  
+  
+58701: Reset the instanceInitialized field in
+StandardWrapper when unloading a Servlet so that a new
+instance may be correctly initialized. (markt)
   
   
 58702: Ensure an access log entry is generated if the client



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

svn commit: r1725167 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java java/org/apache/catalina/startup/LocalStrings.properties webapps/docs/changelog.xml

2016-01-17 Thread kkolinko

Author: kkolinko
Date: Mon Jan 18 02:50:15 2016
New Revision: 1725167

URL: http://svn.apache.org/viewvc?rev=1725167&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58766#c4
Slightly improve performance of scanning a directory:
check the file name first, as file.canRead() is an I/O operation.

Add debug logging.

Merged r1725165 from tomcat/trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 18 02:50:15 2016
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,1657592,1657607,1657
 
609,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-1666387,1666494,1
 
666496,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,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,168555
 
6,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687551,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689

svn commit: r1725165 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java java/org/apache/catalina/startup/LocalStrings.properties webapps/docs/changelog.xml

2016-01-17 Thread kkolinko

Author: kkolinko
Date: Mon Jan 18 02:45:49 2016
New Revision: 1725165

URL: http://svn.apache.org/viewvc?rev=1725165&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58766#c4
Slightly improve performance of scanning a directory:
check the file name first, as file.canRead() is an I/O operation.

Add debug logging.

Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1725165&r1=1725164&r2=1725165&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Mon Jan 18 
02:45:49 2016
@@ -1927,8 +1927,15 @@ public class ContextConfig implements Li
 WebResource[] webResources =
 webResource.getWebResourceRoot().listResources(
 webResource.getWebappPath());
-for (WebResource r : webResources) {
-processAnnotationsWebResource(r, fragment, handlesTypesOnly);
+if (webResources.length > 0) {
+if (log.isDebugEnabled()) {
+log.debug(sm.getString(
+"contextConfig.processAnnotationsWebDir.debug",
+webResource.getURL()));
+}
+for (WebResource r : webResources) {
+processAnnotationsWebResource(r, fragment, 
handlesTypesOnly);
+}
 }
 } else if (webResource.isFile() &&
 webResource.getName().endsWith(".class")) {
@@ -1971,6 +1978,11 @@ public class ContextConfig implements Li
 boolean handlesTypesOnly) {
 
 try (Jar jar = JarFactory.newInstance(url)) {
+if (log.isDebugEnabled()) {
+log.debug(sm.getString(
+"contextConfig.processAnnotationsJar.debug", url));
+}
+
 jar.nextEntry();
 String entryName = jar.getEntryName();
 while (entryName != null) {
@@ -2002,12 +2014,16 @@ public class ContextConfig implements Li
 // Returns null if directory is not readable
 String[] dirs = file.list();
 if (dirs != null) {
+if (log.isDebugEnabled()) {
+log.debug(sm.getString(
+"contextConfig.processAnnotationsDir.debug", 
file));
+}
 for (String dir : dirs) {
 processAnnotationsFile(
 new File(file,dir), fragment, handlesTypesOnly);
 }
 }
-} else if (file.canRead() && file.getName().endsWith(".class")) {
+} else if (file.getName().endsWith(".class") && file.canRead()) {
 try (FileInputStream fis = new FileInputStream(file)) {
 processAnnotationsStream(fis, fragment, handlesTypesOnly);
 } catch (IOException e) {

Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1725165&r1=1725164&r2=1725165&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Mon 
Jan 18 02:45:49 2016
@@ -55,6 +55,9 @@ contextConfig.jndiUrlNotDirContextConn=T
 contextConfig.jspFile.error=JSP file {0} must start with a ''/'
 contextConfig.jspFile.warning=WARNING: JSP file {0} must start with a ''/'' in 
Servlet 2.4
 contextConfig.missingRealm=No Realm has been configured to authenticate against
+contextConfig.processAnnotationsDir.debug=Scanning directory for class files 
with annotations [{0}]
+contextConfig.processAnnotationsJar.debug=Scanning jar file for class files 
with annotations [{0}]
+contextConfig.processAnnotationsWebDir.debug=Scanning web application 
directory for class files with annotations [{0}]
 contextConfig.resourceJarFail=Failed to process JAR found at URL [{0}] for 
static resources to be included in context with name [{1}]
 contextConfig.role.auth=Security role name {0} used in an  
without being defined in a 
 contextConfig.role.link=Security role name {0} used in a  without 
being defined in a 

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

svn commit: r1725156 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java

2016-01-17 Thread kkolinko

Author: kkolinko
Date: Mon Jan 18 00:04:59 2016
New Revision: 1725156

URL: http://svn.apache.org/viewvc?rev=1725156&view=rev
Log:
Followup to r1725155. Move digester.reset() call even earlier, before closing 
the streams.
Streams are local, digester is a shared instance.

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1725156&r1=1725155&r2=1725156&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Mon 
Jan 18 00:04:59 2016
@@ -938,6 +938,7 @@ public class HostConfig
 "hostConfig.deployDescriptor.error",
 war.getAbsolutePath()), e);
 } finally {
+digester.reset();
 if (istream != null) {
 try {
 istream.close();
@@ -954,7 +955,6 @@ public class HostConfig
 }
 jar = null;
 }
-digester.reset();
 if (context == null) {
 context = new FailedContext();
 }



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

svn commit: r1725155 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/HostConfig.java webapps/docs/changelog.xml

2016-01-17 Thread kkolinko

Author: kkolinko
Date: Sun Jan 17 23:56:27 2016
New Revision: 1725155

URL: http://svn.apache.org/viewvc?rev=1725155&view=rev
Log:
Small code improvements in HostConfig class:

1) In deployWAR() call digester.reset() first before doing non-trivial work 
such as "new URL(...)",
because digester is a shared instance. Though a failure in the "new URL()" call 
there is very unlikely.

2) Reduce scope of "JarEntry entry" variable, getting rid of 
"finally{entry=null;}" blocks.
Anyway a JarEntry is available only while the original JarFile is open.

Backport of r1725154 from tomcat/tc8.0.x/trunk.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 17 23:56:27 2016
@@ -1,2 +1,2 @@
-/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,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,1702742,1702
 
744,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,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
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,124

buildbot success in ASF Buildbot on tomcat-trunk

2016-01-17 Thread buildbot

The Buildbot has detected a restored build on builder tomcat-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/937

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1725150
Blamelist: kkolinko

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: r1725154 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/HostConfig.java webapps/docs/changelog.xml

2016-01-17 Thread kkolinko

Author: kkolinko
Date: Sun Jan 17 23:47:14 2016
New Revision: 1725154

URL: http://svn.apache.org/viewvc?rev=1725154&view=rev
Log:
Small code improvements in HostConfig class:

1) In deployWAR() call digester.reset() first before doing non-trivial work 
such as "new URL(...)",
because digester is a shared instance. Though a failure in the "new URL()" call 
there is very unlikely.

2) Reduce scope of "JarEntry entry" variable, getting rid of 
"finally{entry=null;}" blocks.
Anyway a JarEntry is available only while the original JarFile is open.

Merged r1725150 from tomcat/trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 17 23:47:14 2016
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,1657592,1657607,1657
 
609,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-1666387,1666494,1
 
666496,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,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,168555
 
6,1685591,1685739,1685744,1685772,

svn commit: r1725150 - in /tomcat/trunk: java/org/apache/catalina/startup/HostConfig.java webapps/docs/changelog.xml

2016-01-17 Thread kkolinko

Author: kkolinko
Date: Sun Jan 17 23:41:04 2016
New Revision: 1725150

URL: http://svn.apache.org/viewvc?rev=1725150&view=rev
Log:
Small code improvements in HostConfig class:

1) In deployWAR() call digester.reset() first before doing non-trivial work 
such as "new URL(...)",
because digester is a shared instance. Though a failure in the "new URL()" call 
there is very unlikely.

2) Reduce scope of "JarEntry entry" variable, getting rid of 
"finally{entry=null;}" blocks.
Anyway a JarEntry is available only while the original JarFile is open.

Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1725150&r1=1725149&r2=1725150&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Sun Jan 17 
23:41:04 2016
@@ -549,10 +549,10 @@ public class HostConfig implements Lifec
 "hostConfig.deployDescriptor.error",
 contextXml.getAbsolutePath()), e);
 } finally {
+digester.reset();
 if (context == null) {
 context = new FailedContext();
 }
-digester.reset();
 }
 }
 
@@ -798,16 +798,13 @@ public class HostConfig implements Lifec
 cn.getBaseName() + "/" + Constants.WarTracker);
 
 boolean xmlInWar = false;
-JarEntry entry = null;
 try (JarFile jar = new JarFile(war)) {
-entry = jar.getJarEntry(Constants.ApplicationContextXml);
+JarEntry entry = jar.getJarEntry(Constants.ApplicationContextXml);
 if (entry != null) {
 xmlInWar = true;
 }
 } catch (IOException e) {
 /* Ignore */
-} finally {
-entry = null;
 }
 
 // If there is an expanded directory then any xml in that directory
@@ -832,17 +829,17 @@ public class HostConfig implements Lifec
 "hostConfig.deployDescriptor.error",
 war.getAbsolutePath()), e);
 } finally {
+digester.reset();
 if (context == null) {
 context = new FailedContext();
 }
-digester.reset();
 }
 }
 context.setConfigFile(xml.toURI().toURL());
 } else if (deployXML && xmlInWar) {
 synchronized (digesterLock) {
 try (JarFile jar = new JarFile(war)) {
-entry = 
jar.getJarEntry(Constants.ApplicationContextXml);
+JarEntry entry = 
jar.getJarEntry(Constants.ApplicationContextXml);
 try (InputStream istream = jar.getInputStream(entry)) {
 context = (Context) digester.parse(istream);
 }
@@ -851,14 +848,13 @@ public class HostConfig implements Lifec
 "hostConfig.deployDescriptor.error",
 war.getAbsolutePath()), e);
 } finally {
+digester.reset();
 if (context == null) {
 context = new FailedContext();
 }
 context.setConfigFile(new URL("jar:" +
 war.toURI().toString() + "!/" +
 Constants.ApplicationContextXml));
-entry = null;
-digester.reset();
 }
 }
 } else if (!deployXML && xmlInWar) {
@@ -895,9 +891,8 @@ public class HostConfig implements Lifec
 // Change location of XML file to config base
 xml = new File(host.getConfigBaseFile(),
 cn.getBaseName() + ".xml");
-entry = null;
 try (JarFile jar = new JarFile(war)) {
-entry = jar.getJarEntry(Constants.ApplicationContextXml);
+JarEntry entry = 
jar.getJarEntry(Constants.ApplicationContextXml);
 try (InputStream istream = jar.getInputStream(entry);
 FileOutputStream fos = new FileOutputStream(xml);
 BufferedOutputStream ostream = new 
BufferedOutputStream(fos, 1024)) {
@@ -1071,10 +1066,10 @@ public class HostConfig implements Lifec
 xml), e);
 context = n

svn commit: r1725142 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

2016-01-17 Thread rjung

Author: rjung
Date: Sun Jan 17 22:32:36 2016
New Revision: 1725142

URL: http://svn.apache.org/viewvc?rev=1725142&view=rev
Log:
Remove further unused structure members,
static functions and pcre method calls.

Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1725142&r1=1725141&r2=1725142&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Sun Jan 17 22:32:36 2016
@@ -1530,9 +1530,6 @@ enum {
 /* The structure representing a compiled regular expression. */
 typedef struct {
 void *re_pcre;
-size_t re_nsub;
-size_t re_erroffset;
-const char *real;
 const char *fake;
 } ap_regex_t;
 
@@ -1546,43 +1543,6 @@ typedef struct {
 /* Table of error strings corresponding to POSIX error codes; must be
  * kept in synch with include/ap_regex.h's AP_REG_E* definitions. */
 
-static const char *const pstring[] = {
-  "",/* Dummy for value 0 */
-  "internal error",  /* AP_REG_ASSERT */
-  "failed to get memory",/* AP_REG_ESPACE */
-  "bad argument",/* AP_REG_INVARG */
-  "match failed" /* AP_REG_NOMATCH */
-};
-
-static size_t ap_regerror(int errcode, const ap_regex_t *preg,
-  char *errbuf, size_t errbuf_size)
-{
-const char *message, *addmessage;
-size_t length, addlength;
-
-message = (errcode >= (int)(sizeof(pstring)/sizeof(char *))) ?
-"unknown error code" : pstring[errcode];
-length = strlen(message) + 1;
-
-addmessage = " at offset ";
-addlength = (preg != NULL && (int)preg->re_erroffset != -1)?
-strlen(addmessage) + 6 : 0;
-
-if (errbuf_size > 0) {
-if (addlength > 0 && errbuf_size >= length + addlength) {
-StringCbPrintf(errbuf, sizeof(errbuf), "%s%s%-6d",
-  message, addmessage,
-  (int)preg->re_erroffset);
-}
-else {
-strncpy(errbuf, message, errbuf_size - 1);
-errbuf[errbuf_size-1] = 0;
-}
-}
-
-return length + addlength;
-}
-
 /*
  *   Free store held by a regex  *
  */
@@ -1612,12 +1572,10 @@ static int ap_regcomp(ap_regex_t *preg,
 int erroffset;
 
 preg->re_pcre = pcre_compile(pattern, 0, &errorptr, &erroffset, NULL);
-preg->re_erroffset = erroffset;
 
 if (preg->re_pcre == NULL)
 return AP_REG_INVARG;
 
-pcre_fullinfo((const pcre *)preg->re_pcre, NULL, PCRE_INFO_CAPTURECOUNT, 
&(preg->re_nsub));
 return 0;
 }
 
@@ -1640,8 +1598,6 @@ static int ap_regexec(const ap_regex_t *
 int small_ovector[POSIX_MALLOC_THRESHOLD * 3];
 int allocated_ovector = 0;
 
-((ap_regex_t *)preg)->re_erroffset = (size_t)(-1);  /* Only has meaning 
after compile */
-
 if (nmatch > 0) {
 if (nmatch <= POSIX_MALLOC_THRESHOLD) {
 ovector = &(small_ovector[0]);
@@ -1816,7 +1772,7 @@ static char *rregex_rewrite(jk_pool_t *p
 ap_regex_t *regexp = (ap_regex_t *)jk_map_value_at(rregexp_map, i);
 if (!ap_regexec(regexp, uri, AP_MAX_REG_MATCH, regm)) {
 char *subs = ap_pregsub(regexp->fake, uri,
-   AP_MAX_REG_MATCH, regm);
+AP_MAX_REG_MATCH, regm);
 if (subs) {
 char *buf, *ptr;
 size_t orgsz = strlen(uri);
@@ -2748,20 +2704,20 @@ static int init_jk(char *serverName)
 ap_regex_t *regexp = malloc(sizeof(ap_regex_t));
 const char *val = jk_map_value_at(rewrite_map, i);
 /* Skip leading tilde */
-regexp->real = src + 1;
+src++;
 regexp->fake = val;
-if (!ap_regcomp(regexp, regexp->real) {
-jk_map_add(rregexp_map, regexp->real, regexp);
+if (!ap_regcomp(regexp, src) {
+jk_map_add(rregexp_map, src, regexp);
 if (JK_IS_DEBUG_LEVEL(logger)) {
 jk_log(logger, JK_LOG_DEBUG,
"Added regular expression rule %s -> %s",
-   regexp->real, regexp->fake);
+   src, regexp->fake);
 }
 }
 else {
 jk_log(logger, JK_LOG_ERROR,
"Unable to compile regular expression %s",
-

svn commit: r1725140 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

2016-01-17 Thread rjung

Author: rjung
Date: Sun Jan 17 21:28:14 2016
New Revision: 1725140

URL: http://svn.apache.org/viewvc?rev=1725140&view=rev
Log:
Remove unused defines and parameters
in PCRE handling to ease migrating to PCRE2.

Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1725140&r1=1725139&r2=1725140&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Sun Jan 17 21:28:14 2016
@@ -1516,13 +1516,6 @@ BOOL WINAPI GetFilterVersion(PHTTP_FILTE
 }
 
 
-#define AP_REG_ICASE0x01 /** use a case-insensitive match */
-#define AP_REG_NEWLINE  0x02 /** don't match newlines against '.' etc */
-#define AP_REG_NOTBOL   0x04 /** ^ will not match against start-of-string */
-#define AP_REG_NOTEOL   0x08 /** $ will not match against end-of-string */
-
-#define AP_REG_EXTENDED (0)  /** unused */
-#define AP_REG_NOSUB(0)  /** unused */
 /** The max number of regex captures that can be expanded by ap_pregsub */
 #define AP_MAX_REG_MATCH 10
 
@@ -1600,8 +1593,6 @@ static void ap_regfree(ap_regex_t *preg)
 }
 
 
-
-
 /*
  *Compile a regular expression   *
  */
@@ -1610,24 +1601,17 @@ static void ap_regfree(ap_regex_t *preg)
 Arguments:
   pregpoints to a structure for recording the compiled expression
   pattern the pattern to compile
-  cflags  compilation flags
 
 Returns:  0 on success
   various non-zero codes on failure
 */
 
-static int ap_regcomp(ap_regex_t *preg, const char *pattern, int cflags)
+static int ap_regcomp(ap_regex_t *preg, const char *pattern)
 {
 const char *errorptr;
 int erroffset;
-int options = 0;
 
-if ((cflags & AP_REG_ICASE) != 0)
-options |= PCRE_CASELESS;
-if ((cflags & AP_REG_NEWLINE) != 0)
-options |= PCRE_MULTILINE;
-
-preg->re_pcre = pcre_compile(pattern, options, &errorptr, &erroffset, 
NULL);
+preg->re_pcre = pcre_compile(pattern, 0, &errorptr, &erroffset, NULL);
 preg->re_erroffset = erroffset;
 
 if (preg->re_pcre == NULL)
@@ -1649,18 +1633,13 @@ block of store on the stack, to reduce t
 in a macro that can be changed at configure time. */
 
 static int ap_regexec(const ap_regex_t *preg, const char *string,
-  int nmatch, ap_regmatch_t pmatch[],
-  int eflags)
+  int nmatch, ap_regmatch_t pmatch[])
 {
 int rc;
-int options = 0;
 int *ovector = NULL;
 int small_ovector[POSIX_MALLOC_THRESHOLD * 3];
 int allocated_ovector = 0;
 
-if ((eflags & AP_REG_NOTBOL) != 0) options |= PCRE_NOTBOL;
-if ((eflags & AP_REG_NOTEOL) != 0) options |= PCRE_NOTEOL;
-
 ((ap_regex_t *)preg)->re_erroffset = (size_t)(-1);  /* Only has meaning 
after compile */
 
 if (nmatch > 0) {
@@ -1677,7 +1656,7 @@ static int ap_regexec(const ap_regex_t *
 
 rc = pcre_exec((const pcre *)preg->re_pcre, NULL, string,
lstrlenA(string),
-0, options, ovector, nmatch * 3);
+0, 0, ovector, nmatch * 3);
 
 if (rc == 0)
 rc = nmatch;/* All captured slots were filled in */
@@ -1835,7 +1814,7 @@ static char *rregex_rewrite(jk_pool_t *p
 int i;
 for (i = 0; i < jk_map_size(rregexp_map); i++) {
 ap_regex_t *regexp = (ap_regex_t *)jk_map_value_at(rregexp_map, i);
-if (!ap_regexec(regexp, uri, AP_MAX_REG_MATCH, regm, 0)) {
+if (!ap_regexec(regexp, uri, AP_MAX_REG_MATCH, regm)) {
 char *subs = ap_pregsub(regexp->fake, uri,
AP_MAX_REG_MATCH, regm);
 if (subs) {
@@ -2771,7 +2750,7 @@ static int init_jk(char *serverName)
 /* Skip leading tilde */
 regexp->real = src + 1;
 regexp->fake = val;
-if (!ap_regcomp(regexp, regexp->real, AP_REG_EXTENDED)) {
+if (!ap_regcomp(regexp, regexp->real) {
 jk_map_add(rregexp_map, regexp->real, regexp);
 if (JK_IS_DEBUG_LEVEL(logger)) {
 jk_log(logger, JK_LOG_DEBUG,



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

buildbot failure in ASF Buildbot on tomcat-trunk

2016-01-17 Thread buildbot

The Buildbot has detected a new failure on builder tomcat-trunk while building 
ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/936

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1725127
Blamelist: kkolinko

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

svn commit: r1725135 - /tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java

2016-01-17 Thread kkolinko

Author: kkolinko
Date: Sun Jan 17 21:15:16 2016
New Revision: 1725135

URL: http://svn.apache.org/viewvc?rev=1725135&view=rev
Log:
Simplify code by importing a more popular class. No functional change.

Backport of r1725132 from tomcat/tc8.0.x/trunk.

Modified:

tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java

Modified: 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java?rev=1725135&r1=1725134&r2=1725135&view=diff
==
--- 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java
 (original)
+++ 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java
 Sun Jan 17 21:15:16 2016
@@ -30,7 +30,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.servlet.ServletException;
@@ -47,6 +46,7 @@ import static org.junit.Assert.fail;
 
 import org.junit.Test;
 
+import org.apache.catalina.Context;
 import org.apache.catalina.Host;
 import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleEvent;
@@ -110,8 +110,9 @@ public class TestTomcat extends TomcatBa
 //String name = null;
 //
 //try {
-//Context initCtx = new InitialContext();
-//Context envCtx = (Context) initCtx.lookup("java:comp/env");
+//javax.naming.Context initCtx = new InitialContext();
+//javax.naming.Context envCtx =
+//(javax.naming.Context) 
initCtx.lookup("java:comp/env");
 //name = (String) envCtx.lookup(JNDI_ENV_NAME);
 //} catch (NamingException e) {
 //throw new IOException(e);
@@ -251,7 +252,7 @@ public class TestTomcat extends TomcatBa
 Tomcat tomcat = getTomcatInstance();
 
 // No file system docBase required
-org.apache.catalina.Context ctx = tomcat.addContext("", null);
+Context ctx = tomcat.addContext("", null);
 
 // You can customize the context by calling
 // its API



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

svn commit: r1725132 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/startup/TestTomcat.java

2016-01-17 Thread kkolinko

Author: kkolinko
Date: Sun Jan 17 21:11:30 2016
New Revision: 1725132

URL: http://svn.apache.org/viewvc?rev=1725132&view=rev
Log:
Simplify code by importing a more popular class. No functional change.
javax.naming.Context vs. org.apache.catalina.Context
The first is used only twice, the second is used a dozen of times.

Merged r1725131 from tomcat/tc8.0.x/trunk.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 17 21:11:30 2016
@@ -1,2 +1,2 @@
-/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,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,1702742,1702
 
744,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,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
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587

svn commit: r1725131 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/catalina/startup/TestTomcat.java

2016-01-17 Thread kkolinko

Author: kkolinko
Date: Sun Jan 17 21:09:21 2016
New Revision: 1725131

URL: http://svn.apache.org/viewvc?rev=1725131&view=rev
Log:
Simplify code by importing a more popular class. No functional change.
javax.naming.Context vs. org.apache.catalina.Context
The first is used only twice, the second is used a dozen of times.

Merged r1725127 from tomcat/trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 17 21:09:21 2016
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,1657592,1657607,1657
 
609,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-1666387,1666494,1
 
666496,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,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,168555
 
6,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,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

buildbot success in ASF Buildbot on tomcat-trunk

2016-01-17 Thread buildbot

The Buildbot has detected a restored build on builder tomcat-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/935

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1725126
Blamelist: kkolinko

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: r1725130 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/startup/TestTomcat.java

2016-01-17 Thread kkolinko

Author: kkolinko
Date: Sun Jan 17 21:07:01 2016
New Revision: 1725130

URL: http://svn.apache.org/viewvc?rev=1725130&view=rev
Log:
Simplify diagnostics by showing response text in Assert message.
These tests depend on examples app being built and may fail when run from 
Eclipse IDE.

Merged r1725128 from tomcat/tc8.0.x/trunk.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 17 21:07:01 2016
@@ -1,2 +1,2 @@
-/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,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,1702742,1702
 
744,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,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
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,13040

svn commit: r1725128 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/catalina/startup/TestTomcat.java

2016-01-17 Thread kkolinko

Author: kkolinko
Date: Sun Jan 17 21:04:48 2016
New Revision: 1725128

URL: http://svn.apache.org/viewvc?rev=1725128&view=rev
Log:
Simplify diagnostics by showing response text in Assert message.
These tests depend on examples app being built and may fail when run from 
Eclipse IDE.

Merged r1725126 from tomcat/trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 17 21:04:48 2016
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,1657592,1657607,1657
 
609,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-1666387,1666494,1
 
666496,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,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,168555
 
6,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,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,1693088,1693105,1693429,16934

svn commit: r1725127 - /tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java

2016-01-17 Thread kkolinko

Author: kkolinko
Date: Sun Jan 17 21:02:02 2016
New Revision: 1725127

URL: http://svn.apache.org/viewvc?rev=1725127&view=rev
Log:
Simplify code by importing a more popular class.
javax.naming.Context vs. org.apache.catalina.Context
The first is used only twice, the second is used a dozen of times.

Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java

Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1725127&r1=1725126&r2=1725127&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Sun Jan 17 
21:02:02 2016
@@ -25,7 +25,6 @@ import java.net.URL;
 import java.net.URLConnection;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.servlet.ServletException;
@@ -42,6 +41,7 @@ import static org.junit.Assert.fail;
 
 import org.junit.Test;
 
+import org.apache.catalina.Context;
 import org.apache.catalina.Host;
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.core.StandardHost;
@@ -99,8 +99,9 @@ public class TestTomcat extends TomcatBa
 String name = null;
 
 try {
-Context initCtx = new InitialContext();
-Context envCtx = (Context) initCtx.lookup("java:comp/env");
+javax.naming.Context initCtx = new InitialContext();
+javax.naming.Context envCtx =
+(javax.naming.Context) initCtx.lookup("java:comp/env");
 name = (String) envCtx.lookup(JNDI_ENV_NAME);
 } catch (NamingException e) {
 throw new IOException(e);
@@ -186,7 +187,7 @@ public class TestTomcat extends TomcatBa
 Tomcat tomcat = getTomcatInstance();
 
 // No file system docBase required
-org.apache.catalina.Context ctx = tomcat.addContext("", null);
+Context ctx = tomcat.addContext("", null);
 
 Tomcat.addServlet(ctx, "myServlet", new HelloWorld());
 ctx.addServletMapping("/", "myServlet");
@@ -203,7 +204,7 @@ public class TestTomcat extends TomcatBa
 
 File appDir = new File(getBuildDirectory(), "webapps/examples");
 // app dir is relative to server home
-org.apache.catalina.Context ctxt  = tomcat.addWebapp(
+Context ctxt = tomcat.addWebapp(
 null, "/examples", appDir.getAbsolutePath());
 ctxt.addApplicationListener(WsContextListener.class.getName());
 tomcat.start();
@@ -220,7 +221,7 @@ public class TestTomcat extends TomcatBa
 
 File appDir = new File(getBuildDirectory(), "webapps/examples");
 // app dir is relative to server home
-org.apache.catalina.Context ctxt  = tomcat.addWebapp(
+Context ctxt = tomcat.addWebapp(
 null, "/examples", appDir.getAbsolutePath());
 ctxt.addApplicationListener(WsContextListener.class.getName());
 
@@ -237,7 +238,7 @@ public class TestTomcat extends TomcatBa
 Tomcat tomcat = getTomcatInstance();
 
 // No file system docBase required
-org.apache.catalina.Context ctx = tomcat.addContext("", null);
+Context ctx = tomcat.addContext("", null);
 
 Tomcat.addServlet(ctx, "myServlet", new HelloWorldSession());
 ctx.addServletMapping("/", "myServlet");
@@ -267,7 +268,7 @@ public class TestTomcat extends TomcatBa
 Tomcat tomcat = getTomcatInstance();
 
 // No file system docBase required
-org.apache.catalina.Context ctx = tomcat.addContext("", null);
+Context ctx = tomcat.addContext("", null);
 
 // Enable JNDI - it is disabled by default
 tomcat.enableNaming();
@@ -295,7 +296,7 @@ public class TestTomcat extends TomcatBa
 Tomcat tomcat = getTomcatInstance();
 
 // No file system docBase required
-org.apache.catalina.Context ctx = tomcat.addContext("", null);
+Context ctx = tomcat.addContext("", null);
 
 // Enable JNDI - it is disabled by default
 tomcat.enableNaming();
@@ -332,7 +333,7 @@ public class TestTomcat extends TomcatBa
 
 File appDir = new File(getBuildDirectory(), "webapps" + contextPath);
 // app dir is relative to server home
-org.apache.catalina.Context ctx =
+Context ctx =
 tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
 ctx.addApplicationListener(WsContextListener.class.getName());
 
@@ -373,7 +374,7 @@ public class TestTomcat extends TomcatBa
 Tomcat tomcat = getTomcatInstance();
 
 // No file system docBase required
-org.apache.catalina.Context ctx = tomcat.addContext("", null);
+Context ctx

svn commit: r1725126 - /tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java

2016-01-17 Thread kkolinko

Author: kkolinko
Date: Sun Jan 17 20:54:16 2016
New Revision: 1725126

URL: http://svn.apache.org/viewvc?rev=1725126&view=rev
Log:
Simplify diagnostics by showing response text in Assert message.
These tests depend on examples app being built and may fail when run from 
Eclipse IDE.

Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java

Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1725126&r1=1725125&r2=1725126&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Sun Jan 17 
20:54:16 2016
@@ -210,7 +210,8 @@ public class TestTomcat extends TomcatBa
 
 ByteChunk res = getUrl("http://localhost:"; + getPort() +
 "/examples/servlets/servlet/HelloWorldExample");
-assertTrue(res.toString().indexOf("Hello World!") > 0);
+String text = res.toString();
+assertTrue(text, text.indexOf("Hello World!") > 0);
 }
 
 @Test
@@ -227,7 +228,8 @@ public class TestTomcat extends TomcatBa
 
 ByteChunk res = getUrl("http://localhost:"; + getPort() +
 "/examples/jsp/jsp2/el/basic-arithmetic.jsp");
-assertTrue(res.toString().indexOf("${(1==2) ? 3 : 4}") > 0);
+String text = res.toString();
+assertTrue(text, text.indexOf("${(1==2) ? 3 : 4}") > 0);
 }
 
 @Test



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

buildbot failure in ASF Buildbot on tomcat-trunk

2016-01-17 Thread buildbot

The Buildbot has detected a new failure on builder tomcat-trunk while building 
ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/934

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1725113
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

svn commit: r1725113 - in /tomcat/trunk: java/org/apache/catalina/ha/session/ java/org/apache/catalina/session/ webapps/docs/config/

2016-01-17 Thread markt

Author: markt
Date: Sun Jan 17 19:34:00 2016
New Revision: 1725113

URL: http://svn.apache.org/viewvc?rev=1725113&view=rev
Log:
Pull up the sessionAttributeFilter option from the cluster managers, rename it 
to sessionAttributeNameFilter and make it available in all Manager 
implementations.

Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml
tomcat/trunk/webapps/docs/config/cluster-manager.xml
tomcat/trunk/webapps/docs/config/manager.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=1725113&r1=1725112&r2=1725113&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java 
Sun Jan 17 19:34:00 2016
@@ -18,7 +18,6 @@ package org.apache.catalina.ha.session;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.util.regex.Pattern;
 
 import org.apache.catalina.Cluster;
 import org.apache.catalina.Context;
@@ -49,20 +48,6 @@ public abstract class ClusterManagerBase
 private boolean notifyListenersOnReplication = true;
 
 /**
- * The pattern used for including session attributes to
- *  replication, e.g. ^(userName|sessionHistory)$.
- *  If not set, all session attributes will be eligible for replication.
- */
-private String sessionAttributeFilter = null;
-
-/**
- * The compiled pattern used for including session attributes to
- * replication, e.g. ^(userName|sessionHistory)$.
- * If not set, all session attributes will be eligible for replication.
- */
-private Pattern sessionAttributePattern = null;
-
-/**
  * cached replication valve cluster container!
  */
 private volatile ReplicationValve replicationValve = null ;
@@ -96,9 +81,13 @@ public abstract class ClusterManagerBase
  * to replication.
  *
  * @return the sessionAttributeFilter
+ *
+ * @deprecated Use {@link #getSessionAttributeNameFilter()}. Will be 
removed
+ * in Tomcat 9.0.x
  */
+@Deprecated
 public String getSessionAttributeFilter() {
-return sessionAttributeFilter;
+return getSessionAttributeNameFilter();
 }
 
 /**
@@ -110,16 +99,13 @@ public abstract class ClusterManagerBase
  *
  * @param sessionAttributeFilter
  *the filter name pattern to set
+ *
+ * @deprecated Use {@link #setSessionAttributeNameFilter(String)}. Will be
+ * removed in Tomcat 9.0.x
  */
+@Deprecated
 public void setSessionAttributeFilter(String sessionAttributeFilter) {
-if (sessionAttributeFilter == null
-|| sessionAttributeFilter.trim().equals("")) {
-this.sessionAttributeFilter = null;
-sessionAttributePattern = null;
-} else {
-this.sessionAttributeFilter = sessionAttributeFilter;
-sessionAttributePattern = Pattern.compile(sessionAttributeFilter);
-}
+setSessionAttributeNameFilter(sessionAttributeFilter);
 }
 
 public boolean isRecordAllActions() {
@@ -145,15 +131,6 @@ public abstract class ClusterManagerBase
 }
 
 
-@Override
-public boolean willAttributeDistribute(String name, Object value) {
-if (sessionAttributePattern == null) {
-return true;
-}
-return sessionAttributePattern.matcher(name).matches();
-}
-
-
 public static ClassLoader[] getClassLoaders(Context context) {
 ClassLoader tccl = Thread.currentThread().getContextClassLoader();
 Loader loader = context.getLoader();

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?rev=1725113&r1=1725112&r2=1725113&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml Sun 
Jan 17 19:34:00 2016
@@ -310,6 +310,10 @@
   is="true"
   description="Flag whether send all actions for session across Tomcat 
cluster nodes."
   type="boolean"/>
+
 
+
 http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1725113&r1=1725112&r2=1725113&view=diff
==
--- tomcat/trunk/java

svn commit: r1725105 [1/4] - in /tomcat/jk/trunk: native/iis/pcre/ native/iis/pcre/doc/ native/iis/pcre/doc/html/ native/iis/pcre/sljit/ native/iis/pcre/testdata/ xdocs/miscellaneous/

2016-01-17 Thread rjung

Author: rjung
Date: Sun Jan 17 17:23:28 2016
New Revision: 1725105

URL: http://svn.apache.org/viewvc?rev=1725105&view=rev
Log:
Update PCRE bundled with IIS to version 8.38.

Modified:
tomcat/jk/trunk/native/iis/pcre/132html
tomcat/jk/trunk/native/iis/pcre/ChangeLog
tomcat/jk/trunk/native/iis/pcre/NEWS
tomcat/jk/trunk/native/iis/pcre/NON-AUTOTOOLS-BUILD
tomcat/jk/trunk/native/iis/pcre/RunGrepTest
tomcat/jk/trunk/native/iis/pcre/aclocal.m4
tomcat/jk/trunk/native/iis/pcre/config.h.generic
tomcat/jk/trunk/native/iis/pcre/config.hw
tomcat/jk/trunk/native/iis/pcre/configure.ac
tomcat/jk/trunk/native/iis/pcre/doc/html/NON-AUTOTOOLS-BUILD.txt
tomcat/jk/trunk/native/iis/pcre/doc/html/pcrepattern.html
tomcat/jk/trunk/native/iis/pcre/doc/pcre.txt
tomcat/jk/trunk/native/iis/pcre/doc/pcrepattern.3
tomcat/jk/trunk/native/iis/pcre/pcre.h.generic
tomcat/jk/trunk/native/iis/pcre/pcre_compile.c
tomcat/jk/trunk/native/iis/pcre/pcre_exec.c
tomcat/jk/trunk/native/iis/pcre/pcre_internal.h
tomcat/jk/trunk/native/iis/pcre/pcre_jit_compile.c
tomcat/jk/trunk/native/iis/pcre/pcre_jit_test.c
tomcat/jk/trunk/native/iis/pcre/pcre_study.c
tomcat/jk/trunk/native/iis/pcre/pcre_xclass.c
tomcat/jk/trunk/native/iis/pcre/pcregrep.c
tomcat/jk/trunk/native/iis/pcre/pcretest.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitConfig.h
tomcat/jk/trunk/native/iis/pcre/sljit/sljitConfigInternal.h
tomcat/jk/trunk/native/iis/pcre/sljit/sljitLir.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitLir.h
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeARM_32.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeARM_64.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeARM_T2_32.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeMIPS_common.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativePPC_common.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeSPARC_common.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeTILEGX_64.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeX86_common.c
tomcat/jk/trunk/native/iis/pcre/testdata/grepoutput
tomcat/jk/trunk/native/iis/pcre/testdata/testinput1
tomcat/jk/trunk/native/iis/pcre/testdata/testinput11
tomcat/jk/trunk/native/iis/pcre/testdata/testinput12
tomcat/jk/trunk/native/iis/pcre/testdata/testinput14
tomcat/jk/trunk/native/iis/pcre/testdata/testinput17
tomcat/jk/trunk/native/iis/pcre/testdata/testinput2
tomcat/jk/trunk/native/iis/pcre/testdata/testinput6
tomcat/jk/trunk/native/iis/pcre/testdata/testinput7
tomcat/jk/trunk/native/iis/pcre/testdata/testinputEBC
tomcat/jk/trunk/native/iis/pcre/testdata/testoutput1
tomcat/jk/trunk/native/iis/pcre/testdata/testoutput11-16
tomcat/jk/trunk/native/iis/pcre/testdata/testoutput11-32
tomcat/jk/trunk/native/iis/pcre/testdata/testoutput11-8
tomcat/jk/trunk/native/iis/pcre/testdata/testoutput12
tomcat/jk/trunk/native/iis/pcre/testdata/testoutput14
tomcat/jk/trunk/native/iis/pcre/testdata/testoutput17
tomcat/jk/trunk/native/iis/pcre/testdata/testoutput2
tomcat/jk/trunk/native/iis/pcre/testdata/testoutput6
tomcat/jk/trunk/native/iis/pcre/testdata/testoutput7
tomcat/jk/trunk/native/iis/pcre/testdata/testoutputEBC
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/native/iis/pcre/132html
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/132html?rev=1725105&r1=1725104&r2=1725105&view=diff
==
--- tomcat/jk/trunk/native/iis/pcre/132html (original)
+++ tomcat/jk/trunk/native/iis/pcre/132html Sun Jan 17 17:23:28 2016
@@ -148,7 +148,7 @@ while ()
 printf("$title\n",
   $ref, $ref);
 printf TEMP ("$title\n",
-  $ref, $ref);
+  $ref);
 $ref++;
 }
   else

Modified: tomcat/jk/trunk/native/iis/pcre/ChangeLog
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/ChangeLog?rev=1725105&r1=1725104&r2=1725105&view=diff
==
--- tomcat/jk/trunk/native/iis/pcre/ChangeLog (original)
+++ tomcat/jk/trunk/native/iis/pcre/ChangeLog Sun Jan 17 17:23:28 2016
@@ -1,6 +1,182 @@
 ChangeLog for PCRE
 --
 
+Note that the PCRE 8.xx series (PCRE1) is now in a bugfix-only state. All
+development is happening in the PCRE2 10.xx series.
+
+Version 8.38 23-November-2015
+-
+
+1.  If a group that contained a recursive back reference also contained a
+forward reference subroutine call followed by a non-forward-reference
+subroutine call, for example /.((?2)(?R)\1)()/, pcre2_compile() failed to
+compile correct code, leading to undefined behaviour or an internally
+detected error. This bug was discovered by the LLVM fuzzer.
+
+2.  Quantification of certain items (e.g. atomic back referen

svn commit: r1725105 [4/4] - in /tomcat/jk/trunk: native/iis/pcre/ native/iis/pcre/doc/ native/iis/pcre/doc/html/ native/iis/pcre/sljit/ native/iis/pcre/testdata/ xdocs/miscellaneous/

2016-01-17 Thread rjung

Modified: tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeTILEGX_64.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeTILEGX_64.c?rev=1725105&r1=1725104&r2=1725105&view=diff
==
--- tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeTILEGX_64.c (original)
+++ tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeTILEGX_64.c Sun Jan 17 
17:23:28 2016
@@ -35,21 +35,21 @@
 #define SIMM_16BIT_MIN (-0x8000)
 #define SIMM_17BIT_MAX (0x)
 #define SIMM_17BIT_MIN (-0x1)
-#define SIMM_32BIT_MIN (-0x8000)
 #define SIMM_32BIT_MAX (0x7fff)
-#define SIMM_48BIT_MIN (0x8000L)
+#define SIMM_32BIT_MIN (-0x7fff - 1)
 #define SIMM_48BIT_MAX (0x7fffL)
+#define SIMM_48BIT_MIN (-0x8000L)
 #define IMM16(imm) ((imm) & 0x)
 
 #define UIMM_16BIT_MAX (0x)
 
-#define TMP_REG1 (SLJIT_NO_REGISTERS + 1)
-#define TMP_REG2 (SLJIT_NO_REGISTERS + 2)
-#define TMP_REG3 (SLJIT_NO_REGISTERS + 3)
-#define ADDR_TMP (SLJIT_NO_REGISTERS + 4)
+#define TMP_REG1 (SLJIT_NUMBER_OF_REGISTERS + 2)
+#define TMP_REG2 (SLJIT_NUMBER_OF_REGISTERS + 3)
+#define TMP_REG3 (SLJIT_NUMBER_OF_REGISTERS + 4)
+#define ADDR_TMP (SLJIT_NUMBER_OF_REGISTERS + 5)
 #define PIC_ADDR_REG TMP_REG2
 
-static SLJIT_CONST sljit_ub reg_map[SLJIT_NO_REGISTERS + 5] = {
+static SLJIT_CONST sljit_ub reg_map[SLJIT_NUMBER_OF_REGISTERS + 6] = {
63, 0, 1, 2, 3, 4, 30, 31, 32, 33, 34, 54, 5, 16, 6, 7
 };
 
@@ -58,11 +58,6 @@ static SLJIT_CONST sljit_ub reg_map[SLJI
 #define TMP_REG2_mapped 16
 #define TMP_REG3_mapped 6
 #define ADDR_TMP_mapped 7
-#define SLJIT_SAVED_REG1_mapped 30
-#define SLJIT_SAVED_REG2_mapped 31
-#define SLJIT_SAVED_REG3_mapped 32
-#define SLJIT_SAVED_EREG1_mapped 33
-#define SLJIT_SAVED_EREG2_mapped 34
 
 /* Flags are keept in volatile registers. */
 #define EQUAL_FLAG 8
@@ -399,6 +394,9 @@ static sljit_si push_inst(struct sljit_c
 #define SUB(dst, srca, srcb) \
push_3_buffer(compiler, TILEGX_OPC_SUB, dst, srca, srcb, __LINE__)
 
+#define MUL(dst, srca, srcb) \
+   push_3_buffer(compiler, TILEGX_OPC_MULX, dst, srca, srcb, __LINE__)
+
 #define NOR(dst, srca, srcb) \
push_3_buffer(compiler, TILEGX_OPC_NOR, dst, srca, srcb, __LINE__)
 
@@ -547,8 +545,8 @@ const struct Format* compute_format()
 
const struct Format* match = NULL;
const struct Format *b = NULL;
-   unsigned int i = 0;
-   for (i; i < sizeof formats / sizeof formats[0]; i++) {
+   unsigned int i;
+   for (i = 0; i < sizeof formats / sizeof formats[0]; i++) {
b = &formats[i];
if ((b->pipe_mask & compatible_pipes) == b->pipe_mask) {
match = b;
@@ -625,7 +623,6 @@ tilegx_bundle_bits get_bundle_bit(struct
 
 static sljit_si update_buffer(struct sljit_compiler *compiler)
 {
-   int count;
int i;
int orig_index = inst_buf_index;
struct jit_instr inst0 = inst_buf[0];
@@ -738,8 +735,10 @@ static sljit_si update_buffer(struct slj
 
 static sljit_si flush_buffer(struct sljit_compiler *compiler)
 {
-   while (inst_buf_index != 0)
-   update_buffer(compiler);
+   while (inst_buf_index != 0) {
+   FAIL_IF(update_buffer(compiler));
+   }
+   return SLJIT_SUCCESS;
 }
 
 static sljit_si push_4_buffer(struct sljit_compiler *compiler, tilegx_mnemonic 
opc, int op0, int op1, int op2, int op3, int line)
@@ -787,6 +786,7 @@ static sljit_si push_3_buffer(struct slj
case TILEGX_OPC_ADD:
case TILEGX_OPC_AND:
case TILEGX_OPC_SUB:
+   case TILEGX_OPC_MULX:
case TILEGX_OPC_OR:
case TILEGX_OPC_XOR:
case TILEGX_OPC_NOR:
@@ -905,7 +905,6 @@ static SLJIT_INLINE sljit_ins * detect_j
sljit_sw diff;
sljit_uw target_addr;
sljit_ins *inst;
-   sljit_ins saved_inst;
 
if (jump->flags & SLJIT_REWRITABLE_JUMP)
return code_ptr;
@@ -1009,7 +1008,7 @@ SLJIT_API_FUNC_ATTRIBUTE void * sljit_ge
struct sljit_const *const_;
 
CHECK_ERROR_PTR();
-   check_sljit_generate_code(compiler);
+   CHECK_PTR(check_sljit_generate_code(compiler));
reverse_buf(compiler);
 
code = (sljit_ins *)SLJIT_MALLOC_EXEC(compiler->size * 
sizeof(sljit_ins));
@@ -1178,13 +1177,13 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_
sljit_si fscratches, sljit_si fsaveds, sljit_si local_size)
 {
sljit_ins base;
-   sljit_ins bundle = 0;
-
+   sljit_si i, tmp;
+ 
CHECK_ERROR();
-   check_sljit_emit_enter(compiler, options, args, scratches, saveds, 
fscratches, fsaveds, local_size);
+   CHECK(check_sljit_emit_enter(compiler, options, args, scratches, 
saveds, fscratches, fsaveds, local_size));
set_emit_enter(compiler, options, args, scratches, saveds, fscratches, 
fsaveds, local_size);
 
-   local_size += (saveds + 1) * sizeof(sljit_sw);
+   local_size += GET_SA

svn commit: r1725105 [3/4] - in /tomcat/jk/trunk: native/iis/pcre/ native/iis/pcre/doc/ native/iis/pcre/doc/html/ native/iis/pcre/sljit/ native/iis/pcre/testdata/ xdocs/miscellaneous/

2016-01-17 Thread rjung

Modified: tomcat/jk/trunk/native/iis/pcre/doc/pcrepattern.3
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/doc/pcrepattern.3?rev=1725105&r1=1725104&r2=1725105&view=diff
==
--- tomcat/jk/trunk/native/iis/pcre/doc/pcrepattern.3 (original)
+++ tomcat/jk/trunk/native/iis/pcre/doc/pcrepattern.3 Sun Jan 17 17:23:28 2016
@@ -1,4 +1,4 @@
-.TH PCREPATTERN 3 "08 January 2014" "PCRE 8.35"
+.TH PCREPATTERN 3 "14 June 2015" "PCRE 8.38"
 .SH NAME
 PCRE - Perl-compatible regular expressions
 .SH "PCRE REGULAR EXPRESSION DETAILS"
@@ -308,7 +308,8 @@ A second use of backslash provides a way
 in patterns in a visible manner. There is no restriction on the appearance of
 non-printing characters, apart from the binary zero that terminates a pattern,
 but when a pattern is being prepared by text editing, it is often easier to use
-one of the following escape sequences than the binary character it represents:
+one of the following escape sequences than the binary character it represents.
+In an ASCII or Unicode environment, these escapes are as follows:
 .sp
   \eaalarm, that is, the BEL character (hex 07)
   \ecx   "control-x", where x is any ASCII character
@@ -331,18 +332,30 @@ but \ec{ becomes hex 3B ({ is 7B), and \
 data item (byte or 16-bit value) following \ec has a value greater than 127, a
 compile-time error occurs. This locks out non-ASCII characters in all modes.
 .P
-The \ec facility was designed for use with ASCII characters, but with the
-extension to Unicode it is even less useful than it once was. It is, however,
-recognized when PCRE is compiled in EBCDIC mode, where data items are always
-bytes. In this mode, all values are valid after \ec. If the next character is a
-lower case letter, it is converted to upper case. Then the 0xc0 bits of the
-byte are inverted. Thus \ecA becomes hex 01, as in ASCII (A is C1), but because
-the EBCDIC letters are disjoint, \ecZ becomes hex 29 (Z is E9), and other
-characters also generate different values.
+When PCRE is compiled in EBCDIC mode, \ea, \ee, \ef, \en, \er, and \et
+generate the appropriate EBCDIC code values. The \ec escape is processed
+as specified for Perl in the \fBperlebcdic\fP document. The only characters
+that are allowed after \ec are A-Z, a-z, or one of @, [, \e, ], ^, _, or ?. Any
+other character provokes a compile-time error. The sequence \e@ encodes
+character code 0; the letters (in either case) encode characters 1-26 (hex 01
+to hex 1A); [, \e, ], ^, and _ encode characters 27-31 (hex 1B to hex 1F), and
+\e? becomes either 255 (hex FF) or 95 (hex 5F).
+.P
+Thus, apart from \e?, these escapes generate the same character code values as
+they do in an ASCII environment, though the meanings of the values mostly
+differ. For example, \eG always generates code value 7, which is BEL in ASCII
+but DEL in EBCDIC.
+.P
+The sequence \e? generates DEL (127, hex 7F) in an ASCII environment, but
+because 127 is not a control character in EBCDIC, Perl makes it generate the
+APC character. Unfortunately, there are several variants of EBCDIC. In most of
+them the APC character has the value 255 (hex FF), but in the one Perl calls
+POSIX-BC its value is 95 (hex 5F). If certain other characters have POSIX-BC
+values, PCRE makes \e? generate 95; otherwise it generates 255.
 .P
 After \e0 up to two further octal digits are read. If there are fewer than two
-digits, just those that are present are used. Thus the sequence \e0\ex\e07
-specifies two binary zeros followed by a BEL character (code value 7). Make
+digits, just those that are present are used. Thus the sequence \e0\ex\e015
+specifies two binary zeros followed by a CR character (code value 13). Make
 sure you supply two digits after the initial zero if the pattern character that
 follows is itself an octal digit.
 .P
@@ -3283,6 +3296,6 @@ Cambridge CB2 3QH, England.
 .rs
 .sp
 .nf
-Last updated: 08 January 2014
-Copyright (c) 1997-2014 University of Cambridge.
+Last updated: 14 June 2015
+Copyright (c) 1997-2015 University of Cambridge.
 .fi

Modified: tomcat/jk/trunk/native/iis/pcre/pcre.h.generic
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/pcre.h.generic?rev=1725105&r1=1725104&r2=1725105&view=diff
==
--- tomcat/jk/trunk/native/iis/pcre/pcre.h.generic (original)
+++ tomcat/jk/trunk/native/iis/pcre/pcre.h.generic Sun Jan 17 17:23:28 2016
@@ -42,9 +42,9 @@ POSSIBILITY OF SUCH DAMAGE.
 /* The current PCRE version information. */
 
 #define PCRE_MAJOR  8
-#define PCRE_MINOR  37
+#define PCRE_MINOR  38
 #define PCRE_PRERELEASE 
-#define PCRE_DATE   2015-04-28
+#define PCRE_DATE   2015-11-23
 
 /* When an application links to a PCRE DLL in Windows, the symbols that are
 imported have to be identified as such. When building PCRE, the appropriate

Modified: tomcat/jk/tru

svn commit: r1725105 [2/4] - in /tomcat/jk/trunk: native/iis/pcre/ native/iis/pcre/doc/ native/iis/pcre/doc/html/ native/iis/pcre/sljit/ native/iis/pcre/testdata/ xdocs/miscellaneous/

2016-01-17 Thread rjung

Modified: tomcat/jk/trunk/native/iis/pcre/doc/pcre.txt
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/doc/pcre.txt?rev=1725105&r1=1725104&r2=1725105&view=diff
==
--- tomcat/jk/trunk/native/iis/pcre/doc/pcre.txt (original)
+++ tomcat/jk/trunk/native/iis/pcre/doc/pcre.txt Sun Jan 17 17:23:28 2016
@@ -5000,7 +5000,8 @@ BACKSLASH
appearance  of non-printing characters, apart from the binary zero that
terminates a pattern, but when a pattern  is  being  prepared  by  text
editing,  it  is  often  easier  to  use  one  of  the following escape
-   sequences than the binary character it represents:
+   sequences than the binary character it represents.  In an ASCII or Uni-
+   code environment, these escapes are as follows:
 
  \aalarm, that is, the BEL character (hex 07)
  \cx   "control-x", where x is any ASCII character
@@ -5016,55 +5017,67 @@ BACKSLASH
  \x{hhh..} character with hex code hhh.. (non-JavaScript mode)
  \ucharacter with hex code  (JavaScript mode only)
 
-   The precise effect of \cx on ASCII characters is as follows: if x is  a
-   lower  case  letter,  it  is converted to upper case. Then bit 6 of the
+   The  precise effect of \cx on ASCII characters is as follows: if x is a
+   lower case letter, it is converted to upper case. Then  bit  6  of  the
character (hex 40) is inverted. Thus \cA to \cZ become hex 01 to hex 1A
-   (A  is  41, Z is 5A), but \c{ becomes hex 3B ({ is 7B), and \c; becomes
-   hex 7B (; is 3B). If the data item (byte or 16-bit value) following  \c
-   has  a  value greater than 127, a compile-time error occurs. This locks
+   (A is 41, Z is 5A), but \c{ becomes hex 3B ({ is 7B), and  \c;  becomes
+   hex  7B (; is 3B). If the data item (byte or 16-bit value) following \c
+   has a value greater than 127, a compile-time error occurs.  This  locks
out non-ASCII characters in all modes.
 
-   The \c facility was designed for use with ASCII  characters,  but  with
-   the  extension  to  Unicode it is even less useful than it once was. It
-   is, however, recognized when PCRE is compiled  in  EBCDIC  mode,  where
-   data  items  are always bytes. In this mode, all values are valid after
-   \c. If the next character is a lower case letter, it  is  converted  to
-   upper  case.  Then  the  0xc0  bits  of the byte are inverted. Thus \cA
-   becomes hex 01, as in ASCII (A is C1), but because the  EBCDIC  letters
-   are  disjoint,  \cZ becomes hex 29 (Z is E9), and other characters also
-   generate different values.
-
-   After \0 up to two further octal digits are read. If  there  are  fewer
-   than  two  digits,  just  those  that  are  present  are used. Thus the
-   sequence \0\x\07 specifies two binary zeros followed by a BEL character
-   (code  value 7). Make sure you supply two digits after the initial zero
+   When PCRE is compiled in EBCDIC mode, \a, \e, \f, \n, \r, and \t gener-
+   ate the appropriate EBCDIC code values. The \c escape is  processed  as
+   specified for Perl in the perlebcdic document. The only characters that
+   are allowed after \c are A-Z, a-z, or one of @, [, \, ], ^,  _,  or  ?.
+   Any  other  character  provokes  a  compile-time error. The sequence \@
+   encodes character code 0; the letters (in either case)  encode  charac-
+   ters 1-26 (hex 01 to hex 1A); [, \, ], ^, and _ encode characters 27-31
+   (hex 1B to hex 1F), and \? becomes either 255 (hex FF) or 95 (hex 5F).
+
+   Thus, apart from \?, these escapes generate  the  same  character  code
+   values  as  they do in an ASCII environment, though the meanings of the
+   values mostly differ. For example, \G always generates  code  value  7,
+   which is BEL in ASCII but DEL in EBCDIC.
+
+   The  sequence  \?  generates DEL (127, hex 7F) in an ASCII environment,
+   but because 127 is not a control character in  EBCDIC,  Perl  makes  it
+   generate  the  APC character. Unfortunately, there are several variants
+   of EBCDIC. In most of them the APC character has  the  value  255  (hex
+   FF),  but  in  the one Perl calls POSIX-BC its value is 95 (hex 5F). If
+   certain other characters have POSIX-BC values, PCRE makes  \?  generate
+   95; otherwise it generates 255.
+
+   After  \0  up  to two further octal digits are read. If there are fewer
+   than two digits, just  those  that  are  present  are  used.  Thus  the
+   sequence \0\x\015 specifies two binary zeros followed by a CR character
+   (code value 13). Make sure you supply two digits after the initial zero
if the pattern character that follows is itself an octal digit.
 
-   The escape \o must be followed by a sequence of o

[GUMP@vmgump]: Project tomcat-tc7.0.x-test-nio (in module tomcat-7.0.x) failed

2016-01-17 Thread Bill Barker

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc7.0.x-test-nio has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc7.0.x-test-nio :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/logs-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 42 mins 5 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-NIO 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160117.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=false -Dexecute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/w
 
orkspace/apache-commons/daemon/dist/bin/commons-daemon-20160117-native-src.tar.gz
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160117-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dexecute.test.nio=true -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160117.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomca

[GUMP@vmgump]: Project tomcat-tc7.0.x-test-apr (in module tomcat-7.0.x) failed

2016-01-17 Thread Bill Barker

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc7.0.x-test-apr has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc7.0.x-test-apr :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 43 mins 44 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-APR 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160117.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=true -Dexecute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/wo
 
rkspace/apache-commons/daemon/dist/bin/commons-daemon-20160117-native-src.tar.gz
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160117-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20160117/lib 
-Dexecute.test.nio=false -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160117.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace

[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed

2016-01-17 Thread Bill Barker

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-test-apr has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Timed Out'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-apr :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build timed out
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 1 hour 3 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160117-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20160117/lib 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160117.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160117-native-src.tar.gz
 -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -
 Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20160117/bin/openssl
 -Dexecute.test.apr=true -Dtest.excludePerformance=true 
-Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-tr

[GUMP@vmgump]: Project tomcat-tc7.0.x-test-bio (in module tomcat-7.0.x) failed

2016-01-17 Thread Bill Barker

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc7.0.x-test-bio has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc7.0.x-test-bio :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/logs-BIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-BIO/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio (Type: Build)
Work ended in a state of : Failed
Elapsed: 34 mins 52 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-BIO 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160117.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=false -Dexecute.test.bio=true 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/wo
 
rkspace/apache-commons/daemon/dist/bin/commons-daemon-20160117-native-src.tar.gz
 -Dtest.reports=output/logs-BIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160117-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dexecute.test.nio=false -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160117.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomca

[Bug 58882] when i try to deploy my war it is not deploying

[Bug 58882] when i try to deploy my war it is not deploying

[Bug 58882] New: when i try to deploy my war it is not deploying

[Bug 58766] Embedded Tomcat 8 startup hangs on RedHat when calling addWebapp

[Bug 56785] NullPointer in processAnnotationsFile during Application Startup

svn commit: r1725170 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java java/org/apache/catalina/startup/LocalStrings.properties webapps/docs/changelog.xml

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

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

svn commit: r1725167 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java java/org/apache/catalina/startup/LocalStrings.properties webapps/docs/changelog.xml

svn commit: r1725165 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java java/org/apache/catalina/startup/LocalStrings.properties webapps/docs/changelog.xml

svn commit: r1725156 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java

svn commit: r1725155 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/HostConfig.java webapps/docs/changelog.xml

buildbot success in ASF Buildbot on tomcat-trunk

svn commit: r1725154 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/HostConfig.java webapps/docs/changelog.xml

svn commit: r1725150 - in /tomcat/trunk: java/org/apache/catalina/startup/HostConfig.java webapps/docs/changelog.xml

svn commit: r1725142 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

svn commit: r1725140 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

buildbot failure in ASF Buildbot on tomcat-trunk

svn commit: r1725135 - /tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java

svn commit: r1725132 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/startup/TestTomcat.java

svn commit: r1725131 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/catalina/startup/TestTomcat.java

buildbot success in ASF Buildbot on tomcat-trunk

svn commit: r1725130 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/startup/TestTomcat.java

svn commit: r1725128 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/catalina/startup/TestTomcat.java

svn commit: r1725127 - /tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java

svn commit: r1725126 - /tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java

buildbot failure in ASF Buildbot on tomcat-trunk

svn commit: r1725113 - in /tomcat/trunk: java/org/apache/catalina/ha/session/ java/org/apache/catalina/session/ webapps/docs/config/

svn commit: r1725105 [1/4] - in /tomcat/jk/trunk: native/iis/pcre/ native/iis/pcre/doc/ native/iis/pcre/doc/html/ native/iis/pcre/sljit/ native/iis/pcre/testdata/ xdocs/miscellaneous/

svn commit: r1725105 [4/4] - in /tomcat/jk/trunk: native/iis/pcre/ native/iis/pcre/doc/ native/iis/pcre/doc/html/ native/iis/pcre/sljit/ native/iis/pcre/testdata/ xdocs/miscellaneous/

svn commit: r1725105 [3/4] - in /tomcat/jk/trunk: native/iis/pcre/ native/iis/pcre/doc/ native/iis/pcre/doc/html/ native/iis/pcre/sljit/ native/iis/pcre/testdata/ xdocs/miscellaneous/

svn commit: r1725105 [2/4] - in /tomcat/jk/trunk: native/iis/pcre/ native/iis/pcre/doc/ native/iis/pcre/doc/html/ native/iis/pcre/sljit/ native/iis/pcre/testdata/ xdocs/miscellaneous/

[GUMP@vmgump]: Project tomcat-tc7.0.x-test-nio (in module tomcat-7.0.x) failed

[GUMP@vmgump]: Project tomcat-tc7.0.x-test-apr (in module tomcat-7.0.x) failed

[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed

[GUMP@vmgump]: Project tomcat-tc7.0.x-test-bio (in module tomcat-7.0.x) failed

36 matches

Site Navigation

Mail list logo

Footer information