EOL of Tomcat 7

[Silambarasan Madhappan]

 Hi Team,

Please let us know by when Tomcat 7 will reach end of life .

Thanks and Regards,
Silambarasan M

File Permissions in SVN/Git

[Igal Sapir]

The new files bin/makebase.bat and makebase.sh do not have the same
permissions as the other files in bin, possibly because I committed them
from a Windows machine.

Specifically, the file bin/makebase.sh is missing the eXecute permission.

Any idea how to fix that?

drwxrwxr-x.  2 ux ux  4096 Jul  2 21:17 .
drwxrwxr-x. 10 ux ux  4096 Jul  2 21:17 ..
-rwxrwxr-x.  1 ux ux 15528 Jul  2 21:17 catalina.bat
-rwxrwxr-x.  1 ux ux 23463 Jul  2 21:17 catalina.sh
-rw-rw-r--.  1 ux ux  1664 Jul  2 21:17 catalina-tasks.xml
-rwxrwxr-x.  1 ux ux  2065 Jul  2 21:17 ciphers.bat
-rwxrwxr-x.  1 ux ux  1997 Jul  2 21:17 ciphers.sh
-rwxrwxr-x.  1 ux ux  1982 Jul  2 21:17 configtest.bat
-rwxrwxr-x.  1 ux ux  1922 Jul  2 21:17 configtest.sh
-rwxrwxr-x.  1 ux ux  8509 Jul  2 21:17 daemon.sh
-rwxrwxr-x.  1 ux ux  2033 Jul  2 21:17 digest.bat
-rwxrwxr-x.  1 ux ux  1965 Jul  2 21:17 digest.sh
-rw-rw-r--.  1 ux ux  2381 Jul  2 21:17 makebase.bat <--- missing x
-rw-rw-r--.  1 ux ux  2350 Jul  2 21:17 makebase.sh  <--- missing x
-rwxrwxr-x.  1 ux ux  7145 Jul  2 21:17 service.bat
-rwxrwxr-x.  1 ux ux  3366 Jul  2 21:17 setclasspath.bat
-rwxrwxr-x.  1 ux ux  3680 Jul  2 21:17 setclasspath.sh
-rwxrwxr-x.  1 ux ux  1962 Jul  2 21:17 shutdown.bat
-rwxrwxr-x.  1 ux ux  1902 Jul  2 21:17 shutdown.sh
-rwxrwxr-x.  1 ux ux  1964 Jul  2 21:17 startup.bat
-rwxrwxr-x.  1 ux ux  1904 Jul  2 21:17 startup.sh
-rwxrwxr-x.  1 ux ux  4464 Jul  2 21:17 tool-wrapper.bat
-rwxrwxr-x.  1 ux ux  5483 Jul  2 21:17 tool-wrapper.sh
-rwxrwxr-x.  1 ux ux  1968 Jul  2 21:17 version.bat
-rwxrwxr-x.  1 ux ux  1908 Jul  2 21:17 version.sh

Thanks,

Igal

[Bug 62258] getOutputStream() has already been called for this response with caught IOException and jsp error page

[bugzilla]

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

--- Comment #4 from clem...@guillaume.bzh ---
I confirmed the bug is fixed.

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

[Bug 53492] Make JspC shell multithreaded

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #3 from Mark Thomas  ---
Sorry it took so long.

Fixed in:
- trunk for 9.0.11 onwards
- 8.5.x for 8.5.33 onwards
- 7.0.x for 7.0.91 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: r1834892 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/JspC.java java/org/apache/jasper/resources/LocalStrings.properties webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Jul  2 20:39:49 2018
New Revision: 1834892

URL: http://svn.apache.org/viewvc?rev=1834892=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=53492
Make the Java file generation process multi-threaded. By default, one thread 
will be used per core.
Based on a patch by Dan Fabulich.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java

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

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

svn commit: r1834890 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/JspC.java java/org/apache/jasper/resources/LocalStrings.properties webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Jul  2 20:37:51 2018
New Revision: 1834890

URL: http://svn.apache.org/viewvc?rev=1834890=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=53011
When pre-compiling with JspC, report all compilation errors rather than 
stopping after the first error. A new option -failFast can be used to restore 
the previous behaviour of stopping after the first error.
Based on a patch provided by Marc Pompl.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java

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

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

svn commit: r1834888 - /tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java

[markt]

Author: markt
Date: Mon Jul  2 20:34:51 2018
New Revision: 1834888

URL: http://svn.apache.org/viewvc?rev=1834888=rev
Log:
Back-port code clean-up to avoid conflicts in subsequent back-ports.

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java

Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java?rev=1834888=1834887=1834888=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java Mon Jul  2 20:34:51 
2018
@@ -34,7 +34,6 @@ import java.net.URLClassLoader;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -139,7 +138,7 @@ public class JspC extends Task implement
 protected static final int DEFAULT_DIE_LEVEL = 1;
 protected static final int NO_DIE_LEVEL = 0;
 protected static final Set insertBefore = new HashSet();
-
+
 static {
 insertBefore.add("");
 insertBefore.add("");
@@ -289,7 +288,7 @@ public class JspC extends Task implement
 
 /**
  * Apply command-line arguments.
- * 
+ *
  * @param arg
  *The arguments
  */
@@ -354,7 +353,7 @@ public class JspC extends Task implement
 caching = false;
 } else {
 caching = true;
-}
+}
 } else if (tok.equals(SWITCH_CLASSPATH)) {
 setClassPath(nextArg());
 } else if (tok.startsWith(SWITCH_DIE)) {
@@ -548,7 +547,7 @@ public class JspC extends Task implement
 
 /**
  * Sets the option to enable caching.
- * 
+ *
  * @see Options#isCaching()
  */
 public void setCaching(boolean caching) {
@@ -590,8 +589,8 @@ public class JspC extends Task implement
 public boolean getRecompileOnFail() {
 return false;
 }
-
-
+
+
 /**
  * In JspC this always returns false.
  * {@inheritDoc}
@@ -626,14 +625,14 @@ public class JspC extends Task implement
 
 /**
  * Sets smapDumped flag.
- * 
+ *
  * @see Options#isSmapDumped()
  */
 public void setSmapDumped(boolean smapDumped) {
 this.smapDumped = smapDumped;
 }
 
-
+
 /**
  * Determines whether text strings are to be generated as char arrays,
  * which improves performance in some cases.
@@ -656,7 +655,7 @@ public class JspC extends Task implement
 /**
  * Sets the class-id value to be sent to Internet Explorer when using
  * jsp:plugin tags.
- * 
+ *
  * @param ieClassId
  *Class-id value
  */
@@ -690,7 +689,7 @@ public class JspC extends Task implement
 
 /**
  * Sets the option to determine what compiler to use.
- * 
+ *
  * @see Options#getCompiler()
  */
 public void setCompiler(String c) {
@@ -715,7 +714,7 @@ public class JspC extends Task implement
 
 /**
  * Sets the compiler target VM.
- * 
+ *
  * @see Options#getCompilerTargetVM()
  */
 public void setCompilerTargetVM(String vm) {
@@ -732,7 +731,7 @@ public class JspC extends Task implement
 
  /**
   * Sets the compiler source VM.
-  * 
+  *
   * @see Options#getCompilerSourceVM()
   */
 public void setCompilerSourceVM(String vm) {
@@ -986,11 +985,11 @@ public class JspC extends Task implement
 
 /**
  * Sets the encoding to be used to read and write web.xml files.
- * 
+ *
  * 
  * If not specified, defaults to the platform default encoding.
  * 
- * 
+ *
  * @param encoding
  *Encoding, e.g. "UTF-8".
  */
@@ -1001,7 +1000,7 @@ public class JspC extends Task implement
 /**
  * Sets the option to merge generated web.xml fragment into the
  * WEB-INF/web.xml file of the web application that we were processing.
- * 
+ *
  * @param b
  *true to merge the fragment into the existing
  *web.xml file of the processed web application
@@ -1046,7 +1045,7 @@ public class JspC extends Task implement
 /**
  * Adds servlet declaration and mapping for the JSP page servlet to the
  * generated web.xml fragment.
- * 
+ *
  * @param file
  *Context-relative path to the JSP file, e.g.
  */index.jsp
@@ -1208,21 +1207,21 @@ public class JspC extends Task implement
 if(!webXml2.delete() && log.isDebugEnabled())
 log.debug(Localizer.getMessage("jspc.delete.fail",
 webXml2.toString()));
-
+
 if (!(new File(webxmlFile)).delete() && log.isDebugEnabled())
 log.debug(Localizer.getMessage("jspc.delete.fail", 

svn commit: r1834884 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/jasper/JspC.java java/org/apache/jasper/resources/LocalStrings.properties webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Jul  2 20:18:47 2018
New Revision: 1834884

URL: http://svn.apache.org/viewvc?rev=1834884=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=53492
Make the Java file generation process multi-threaded. By default, one thread 
will be used per core.
Based on a patch by Dan Fabulich.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspC.java

tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

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

svn commit: r1834882 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/jasper/JspC.java java/org/apache/jasper/resources/LocalStrings.properties webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Jul  2 20:17:03 2018
New Revision: 1834882

URL: http://svn.apache.org/viewvc?rev=1834882=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=53011
When pre-compiling with JspC, report all compilation errors rather than 
stopping after the first error. A new option -failFast can be used to restore 
the previous behaviour of stopping after the first error. Based on a patch 
provided by Marc Pompl.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspC.java

tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

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

svn commit: r1834881 [1/2] - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/ha/backend/ java/org/apache/catalina/ha/session/ j

[markt]

Author: markt
Date: Mon Jul  2 20:15:08 2018
New Revision: 1834881

URL: http://svn.apache.org/viewvc?rev=1834881=rev
Log:
Backport
Use foreach loops instead of while+iterator loops

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/StandardManager.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ssi/SSIPrintenv.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/Membership.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/ExtensionValidator.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/ManifestResource.java

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

tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspC.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Compiler.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/ELNode.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspConfig.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Node.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Parser.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/SmapUtil.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java

tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/RulesBase.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsWriteTimeout.java
tomcat/tc8.5.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul  2 20:15:08 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644

svn commit: r1834881 [2/2] - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/ha/backend/ java/org/apache/catalina/ha/session/ j

[markt]

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java?rev=1834881=1834880=1834881=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
 Mon Jul  2 20:15:08 2018
@@ -181,11 +181,10 @@ public class ServiceRefFactory implement
 Method m = 
serviceInterfaceClass.getMethod("setEndpointAddress",
 new Class[] { java.lang.String.class,
 java.lang.String.class });
-for (Iterator i = ports.keySet().iterator(); 
i.hasNext();) {
-String portName = i.next();
+for (String portName : ports.keySet()) {
 Port port = wsdlservice.getPort(portName);
 String endpoint = getSOAPLocation(port);
-m.invoke(service, new Object[] {port.getName(), 
endpoint });
+m.invoke(service, new Object[]{port.getName(), 
endpoint});
 portComponentRef.put(endpoint, new 
QName(port.getName()));
 }
 } catch (Exception e) {
@@ -301,10 +300,10 @@ public class ServiceRefFactory implement
 handlerInfo.setHandlerConfig(config);
 
 if (!portNames.isEmpty()) {
-Iterator iter = portNames.iterator();
-while (iter.hasNext())
-initHandlerChain(new QName(iter.next()), 
handlerRegistry,
+for (String portName : portNames) {
+initHandlerChain(new QName(portName), 
handlerRegistry,
 handlerInfo, soaproles);
+}
 } else {
 Enumeration e = portComponentRef.elements();
 while(e.hasMoreElements())
@@ -330,9 +329,7 @@ public class ServiceRefFactory implement
 String endpoint = null;
 @SuppressWarnings("unchecked")
 List extensions = 
port.getExtensibilityElements();
-for (Iterator i = extensions.iterator();
-i.hasNext();) {
-ExtensibilityElement ext = i.next();
+for (ExtensibilityElement ext : extensions) {
 if (ext instanceof SOAPAddress) {
 SOAPAddress addr = (SOAPAddress) ext;
 endpoint = addr.getLocationURI();

Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java?rev=1834881=1834880=1834881=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java Mon Jul 
 2 20:15:08 2018
@@ -25,7 +25,6 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -97,9 +96,7 @@ public class Txt2Html
 int count = 0;
 
 // Step through each file and convert.
-Iterator iter = filesets.iterator();
-while( iter.hasNext() ) {
-FileSet fs = iter.next();
+for (FileSet fs : filesets) {
 DirectoryScanner ds = fs.getDirectoryScanner(getProject());
 File basedir = ds.getBasedir();
 String[] files = ds.getIncludedFiles();

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java?rev=1834881=1834880=1834881=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
 Mon Jul  2 20:15:08 2018
@@ -22,7 +22,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -558,9 +557,7 @@ public class SecurityConstraint extends
 // Add the per method constraints
 Collection methods =
 element.getHttpMethodConstraints();
-Iterator methodIter = methods.iterator();
-while (methodIter.hasNext()) {
-

buildbot failure in on tomcat-trunk

[buildbot]

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

Buildbot URL: https://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] 1834877
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: r1834877 - in /tomcat/trunk: java/org/apache/jasper/JspC.java java/org/apache/jasper/resources/LocalStrings.properties webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Jul  2 19:47:37 2018
New Revision: 1834877

URL: http://svn.apache.org/viewvc?rev=1834877=rev
Log:
Make the Java file generation process multi-threaded. By default, one thread 
will be used per core.
Based on a patch by Dan Fabulich.

Modified:
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1834877=1834876=1834877=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Mon Jul  2 19:47:37 2018
@@ -40,6 +40,11 @@ import java.util.Set;
 import java.util.Stack;
 import java.util.StringTokenizer;
 import java.util.Vector;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorCompletionService;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import javax.servlet.jsp.JspFactory;
 import javax.servlet.jsp.tagext.TagLibraryInfo;
@@ -140,6 +145,7 @@ public class JspC extends Task implement
 protected static final String SWITCH_NO_STRICT_QUOTE_ESCAPING = 
"-no-strictQuoteEscaping";
 protected static final String SWITCH_QUOTE_ATTRIBUTE_EL = 
"-quoteAttributeEL";
 protected static final String SWITCH_NO_QUOTE_ATTRIBUTE_EL = 
"-no-quoteAttributeEL";
+protected static final String SWITCH_THREAD_COUNT = "-threadCount";
 protected static final String SHOW_SUCCESS ="-s";
 protected static final String LIST_ERRORS = "-l";
 protected static final int INC_WEBXML = 10;
@@ -235,6 +241,9 @@ public class JspC extends Task implement
  */
 protected String javaEncoding = "UTF-8";
 
+/** The number of threads to use; default is one per core */
+protected int threadCount = Runtime.getRuntime().availableProcessors();
+
 // Generation of web.xml fragments
 protected String webxmlFile;
 protected int webxmlLevel;
@@ -414,6 +423,8 @@ public class JspC extends Task implement
 setQuoteAttributeEL(true);
 } else if (tok.equals(SWITCH_NO_QUOTE_ATTRIBUTE_EL)) {
 setQuoteAttributeEL(false);
+} else if (tok.equals(SWITCH_THREAD_COUNT)) {
+setThreadCount(nextArg());
 } else {
 if (tok.startsWith("-")) {
 throw new JasperException("Unrecognized option: " + tok +
@@ -970,6 +981,31 @@ public class JspC extends Task implement
 return quoteAttributeEL;
 }
 
+public int getThreadCount() {
+return threadCount;
+}
+
+public void setThreadCount(String threadCount) {
+if (threadCount == null) {
+return;
+}
+int newThreadCount;
+try {
+if (threadCount.endsWith("C")) {
+double factor = Double.parseDouble(threadCount.substring(0, 
threadCount.length() - 1));
+newThreadCount = (int) (factor * 
Runtime.getRuntime().availableProcessors());
+} else {
+newThreadCount = Integer.parseInt(threadCount);
+}
+} catch (NumberFormatException e) {
+throw new BuildException("Couldn't parse thread count: " + 
threadCount);
+}
+if (newThreadCount < 1) {
+throw new BuildException("There must be at least one thread: " + 
newThreadCount);
+}
+this.threadCount = newThreadCount;
+}
+
 public void setListErrors( boolean b ) {
 listErrors = b;
 }
@@ -1273,9 +1309,8 @@ public class JspC extends Task implement
 return result.toString();
 }
 
-protected void processFile(String file)
-throws JasperException
-{
+protected void processFile(String file) throws JasperException {
+
 if (log.isDebugEnabled()) {
 log.debug("Processing file: " + file);
 }
@@ -1406,29 +1441,25 @@ public class JspC extends Task implement
 
 try {
 if (uriRoot == null) {
-if( pages.size() == 0 ) {
-throw new JasperException(
-Localizer.getMessage("jsp.error.jspc.missingTarget"));
+if (pages.size() == 0) {
+throw new 
JasperException(Localizer.getMessage("jsp.error.jspc.missingTarget"));
 }
-String firstJsp = pages.get( 0 );
-File firstJspF = new File( firstJsp );
+String firstJsp = pages.get(0);
+File firstJspF = new File(firstJsp);
 if (!firstJspF.exists()) {
-throw new JasperException(
-Localizer.getMessage("jspc.error.fileDoesNotExist",
-   

[VOTE] Release Apache Tomcat 7.0.90

[Violeta Georgieva]

The proposed Apache Tomcat 7.0.90 release is now available for voting.

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.90/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1190/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_90/

The proposed 7.0.90 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 7.0.90 Stable

Regards,
Violeta

svn commit: r1834870 - in /tomcat/tc7.0.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Mon Jul  2 17:33:34 2018
New Revision: 1834870

URL: http://svn.apache.org/viewvc?rev=1834870=rev
Log:
Increment version for next dev cycle

Modified:
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1834870=1834869=1834870=diff
==
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Mon Jul  2 17:33:34 2018
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=7
 version.minor=0
-version.build=90
+version.build=91
 version.patch=0
 version.suffix=-dev
 

Modified: tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default?rev=1834870=1834869=1834870=diff
==
--- tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Mon Jul  2 17:33:34 
2018
@@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases
 
 # Release version info
-maven.asf.release.deploy.version=7.0.90
+maven.asf.release.deploy.version=7.0.91
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib

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=1834870=1834869=1834870=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jul  2 17:33:34 2018
@@ -57,6 +57,8 @@
   They eventually become mixed with the numbered issues. (I.e., numbered
   issues do not "pop up" wrt. others).
 -->
+
+
 
   
 



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

svn commit: r27872 [2/2] - in /dev/tomcat/tomcat-7/v7.0.90: ./ bin/ bin/embed/ bin/extras/ src/

[violetagg]

Added: dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-jmx-remote.jar.asc
==
--- dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-jmx-remote.jar.asc (added)
+++ dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-jmx-remote.jar.asc Mon Jul  
2 17:30:50 2018
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEcT2oi+UJEVNf5xb1IIsKsdYwEccFAls6W/UACgkQIIsKsdYw
+EcfUGQ//c3d6O4fEzmw0903cmx+wjQ0G6lr9ieFY07bajK6c5dric+cmChqZ5Emc
+wyx/Ik/IWu9yvlLq08upwmN8yCzh90f8pU1eBtVKma3MhUYo4vgr/0cccPt3T8/9
+Ckl4nUlozFr4oM1wjUkkWlg6ej/rswXUrdnbWTaaPV87I0ftIsi3YgsqaHS6OLqG
+7Y7A0m1a4xgV5ESa77cpde+ZKyY+6OIUvxMJ1YxTqmFsUnhFjUuBJuBaV3oLJenv
+MHbiR7iC/HzVIUbQ6dZoG7caZIYe/98Yl02eN63l4PcFyp8aUOKZuZDQ45puuyar
+crUcrBaI8MLBBsXWl1n1qWEuqD4VFUsWL+sEGlVu4z3Geqnl1BArA3iBdGMwxkjW
+HggtUMwk+8GDRBcmEn7KvVRFyjTsjpQ81n+Wl3Od0P/WB+aD1TKRxssCZmd/RfIE
+3Mog/Gq4hCscdWQJvBXBVUjkP2xXk3+Ut0z+84V54b4Za0Y3LbsChV/vy6xsVUqe
+WEYZ5vNfgehuch8dLESfOJ7+W1BkIwzZK25bCOSBdzBm+NxpiTDotzlsNhFkfHuK
+rjICuAP8Lz3FKP0Id5IM9xeQ5Op8n0RsPBIWQpXZvzOVN/ciywN3zjGGXYs/f42r
+sGrO0LsgU9ciGpJJN27P5Qns0U7yyF8wmtr/cqrFBu6zzmPH1+4=
+=h0Kr
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-jmx-remote.jar.sha1
==
--- dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-jmx-remote.jar.sha1 (added)
+++ dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-jmx-remote.jar.sha1 Mon Jul 
 2 17:30:50 2018
@@ -0,0 +1 @@
+8d6b0ab415c103b62ab766ad181a157c7e129a35 *catalina-jmx-remote.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-jmx-remote.jar.sha512
==
--- dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-jmx-remote.jar.sha512 
(added)
+++ dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-jmx-remote.jar.sha512 Mon 
Jul  2 17:30:50 2018
@@ -0,0 +1 @@
+e983a72fbcbecec64e80379deaf3393d95f8f3de22ca29b177af7ab098e3458e789e3e0bd062b26b93d5c23d308cd3b92e09e5c7b0118c0cf08833d0c8bbe306
 *catalina-jmx-remote.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-ws.jar
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-ws.jar
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-ws.jar.asc
==
--- dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-ws.jar.asc (added)
+++ dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-ws.jar.asc Mon Jul  2 
17:30:50 2018
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEcT2oi+UJEVNf5xb1IIsKsdYwEccFAls6W/QACgkQIIsKsdYw
+Ece7NQ/7BV8BJfoj31/gzkDoxnDovbNW3S0/ZLkGXMwlMSrVdkqUvotcGzGzgMql
+vLISFtVeNIfZfg7LTvoXeWya++c2Rr3FcZYr0Qdwyy3G4D956w3nESM/N6QXi9VF
+4tZtpcRdBGi6MWQggzrPYRnST39DRo1YhskysQ+HchA0IQtiIJK/GbuvBGJ45fr7
+kpp+jnGBQHd64lzdp2fCxPN1JLy0DEEeGtvB1tyY0GfAatwo0W6QDQjSX5p79QPp
+0BdcvNIjqntF11N50carE+bOKTT6NM/BRcpmMSWDNazKOjXvuwcRNcK9FD1zBKFP
+aHqM9pk5baf+2ogCMk6ZMxVEJDGUQhLHXYquJ0BBkPKsnUKs8f9QKRrVBVegFkYW
+ESZYYcIqWAv2Yvcf9KaIKUIOmY0uc2n4xDKCr51N0gYAZFAUGOu95fuleMPuUgtN
+UIWmYGmbIHqBt2O/TEf8mORn3XC781A8qjuCtnqJ/qiHXXuh8hBR/gsJcAq94+2E
+WAEP5aBtMzo7ZiRAjNT+xMqfKFehXG6aAyGsSocMkp7PcRHjGKvB6lqqkx3RFQIs
+PnAkiKGWLKa+VG2+xSubVe5s6DhcMB30noHeYdEqkq/D+EcvPDCGuRHUeHnsJKrA
+Y4jewiN5FNBC5HLY+nGxS2FtFJiU0wmMF9fYm32yz3zmOeTvDOU=
+=U8gf
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-ws.jar.sha1
==
--- dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-ws.jar.sha1 (added)
+++ dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-ws.jar.sha1 Mon Jul  2 
17:30:50 2018
@@ -0,0 +1 @@
+931973a584b4fa4c045929b7775da2accee49d76 *catalina-ws.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-ws.jar.sha512
==
--- dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-ws.jar.sha512 (added)
+++ dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-ws.jar.sha512 Mon Jul  2 
17:30:50 2018
@@ -0,0 +1 @@
+9d5c5406dcf8791dd44f286d6392abd6b7adbaf0c390cffcd909dd3d353fffebbf34252d0ffefa28474e504d21d1515cab907483edbf63f3b8ac3ec0de391203
 *catalina-ws.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.90/bin/extras/tomcat-juli-adapters.jar
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-7/v7.0.90/bin/extras/tomcat-juli-adapters.jar
--
svn:mime-type = 

svn commit: r27872 [1/2] - in /dev/tomcat/tomcat-7/v7.0.90: ./ bin/ bin/embed/ bin/extras/ src/

[violetagg]

Author: violetagg
Date: Mon Jul  2 17:30:50 2018
New Revision: 27872

Log:
Stage Tomcat 7.0.90

Added:
dev/tomcat/tomcat-7/v7.0.90/
dev/tomcat/tomcat-7/v7.0.90/KEYS
dev/tomcat/tomcat-7/v7.0.90/README.html
dev/tomcat/tomcat-7/v7.0.90/RELEASE-NOTES
dev/tomcat/tomcat-7/v7.0.90/bin/
dev/tomcat/tomcat-7/v7.0.90/bin/README.html
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90-deployer.tar.gz.asc
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90-deployer.tar.gz.sha1
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90-deployer.tar.gz.sha512
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90-deployer.zip   (with 
props)
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90-deployer.zip.asc
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90-deployer.zip.sha1
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90-deployer.zip.sha512
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90-fulldocs.tar.gz.asc
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90-fulldocs.tar.gz.sha1
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90-windows-x64.zip   
(with props)
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90-windows-x64.zip.asc
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90-windows-x64.zip.sha1
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90-windows-x64.zip.sha512
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90-windows-x86.zip   
(with props)
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90-windows-x86.zip.asc
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90-windows-x86.zip.sha1
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90-windows-x86.zip.sha512
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90.exe   (with props)
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90.exe.asc
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90.exe.sha1
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90.exe.sha512
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90.tar.gz   (with props)
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90.tar.gz.asc
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90.tar.gz.sha1
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90.tar.gz.sha512
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90.zip   (with props)
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90.zip.asc
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90.zip.sha1
dev/tomcat/tomcat-7/v7.0.90/bin/apache-tomcat-7.0.90.zip.sha512
dev/tomcat/tomcat-7/v7.0.90/bin/embed/
dev/tomcat/tomcat-7/v7.0.90/bin/embed/apache-tomcat-7.0.90-embed.tar.gz   
(with props)
dev/tomcat/tomcat-7/v7.0.90/bin/embed/apache-tomcat-7.0.90-embed.tar.gz.asc
dev/tomcat/tomcat-7/v7.0.90/bin/embed/apache-tomcat-7.0.90-embed.tar.gz.sha1

dev/tomcat/tomcat-7/v7.0.90/bin/embed/apache-tomcat-7.0.90-embed.tar.gz.sha512
dev/tomcat/tomcat-7/v7.0.90/bin/embed/apache-tomcat-7.0.90-embed.zip   
(with props)
dev/tomcat/tomcat-7/v7.0.90/bin/embed/apache-tomcat-7.0.90-embed.zip.asc
dev/tomcat/tomcat-7/v7.0.90/bin/embed/apache-tomcat-7.0.90-embed.zip.sha1
dev/tomcat/tomcat-7/v7.0.90/bin/embed/apache-tomcat-7.0.90-embed.zip.sha512
dev/tomcat/tomcat-7/v7.0.90/bin/extras/
dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-jmx-remote.jar.sha1
dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-jmx-remote.jar.sha512
dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-ws.jar.sha1
dev/tomcat/tomcat-7/v7.0.90/bin/extras/catalina-ws.jar.sha512
dev/tomcat/tomcat-7/v7.0.90/bin/extras/tomcat-juli-adapters.jar   (with 
props)
dev/tomcat/tomcat-7/v7.0.90/bin/extras/tomcat-juli-adapters.jar.asc
dev/tomcat/tomcat-7/v7.0.90/bin/extras/tomcat-juli-adapters.jar.sha1
dev/tomcat/tomcat-7/v7.0.90/bin/extras/tomcat-juli-adapters.jar.sha512
dev/tomcat/tomcat-7/v7.0.90/bin/extras/tomcat-juli.jar   (with props)
dev/tomcat/tomcat-7/v7.0.90/bin/extras/tomcat-juli.jar.asc
dev/tomcat/tomcat-7/v7.0.90/bin/extras/tomcat-juli.jar.sha1
dev/tomcat/tomcat-7/v7.0.90/bin/extras/tomcat-juli.jar.sha512
dev/tomcat/tomcat-7/v7.0.90/src/
dev/tomcat/tomcat-7/v7.0.90/src/apache-tomcat-7.0.90-src.tar.gz   (with 
props)
dev/tomcat/tomcat-7/v7.0.90/src/apache-tomcat-7.0.90-src.tar.gz.asc
dev/tomcat/tomcat-7/v7.0.90/src/apache-tomcat-7.0.90-src.tar.gz.sha1

Re: [VOTE] Release Apache Tomcat 8.0.53

[Coty Sutherland]

On Fri, Jun 29, 2018 at 12:42 PM Violeta Georgieva 
wrote:

> The proposed Apache Tomcat 8.0.53 release is now available for voting.
>
> NOTE: This is the last release!
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.53/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1189/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_53/
>
> The proposed 8.0.53 release is:
> [ ] Broken - do not release
> [x] Stable - go ahead and release as 8.0.53
>

+1, LGTM


>
> Regards,
> Violeta
>

svn commit: r1834866 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_90: ./ build.properties.default

[violetagg]

Author: violetagg
Date: Mon Jul  2 16:35:55 2018
New Revision: 1834866

URL: http://svn.apache.org/viewvc?rev=1834866=rev
Log:
Tag 7.0.90

Added:
tomcat/tc7.0.x/tags/TOMCAT_7_0_90/   (props changed)
  - copied from r1834865, tomcat/tc7.0.x/trunk/
Modified:
tomcat/tc7.0.x/tags/TOMCAT_7_0_90/build.properties.default

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_90/
--
bugtraq:append = false

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_90/
--
bugtraq:label = Bugzilla ID (optional)

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_90/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Mon Jul  2 16:35:55 2018
@@ -0,0 +1,2 @@
+(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+)
+(\d+)

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_90/
--
bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_90/
--
bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_90/
--
--- svn:ignore (added)
+++ svn:ignore Mon Jul  2 16:35:55 2018
@@ -0,0 +1,7 @@
+.*
+build.properties
+logs
+nbproject
+output
+work
+*.iml

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_90/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Jul  2 16:35:55 2018
@@ -0,0 +1,3 @@
+/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 

svn commit: r1834865 - in /tomcat/tc7.0.x/trunk: ./ build.xml

[violetagg]

Author: violetagg
Date: Mon Jul  2 16:24:56 2018
New Revision: 1834865

URL: http://svn.apache.org/viewvc?rev=1834865=rev
Log:
Switch back to http for Javadoc as https causes build failures. Merge revision 
1834765.

  [javadoc] javadoc: warning - Error fetching URL: https://commons.apache.org/pr
oper/commons-io/javadocs/api-release/package-list

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

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

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

[violetagg]

Author: violetagg
Date: Mon Jul  2 15:58:07 2018
New Revision: 1834863

URL: http://svn.apache.org/viewvc?rev=1834863=rev
Log:
7.0.89 vote did not pass

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=1834863=1834862=1834863=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jul  2 15:58:07 2018
@@ -72,7 +72,7 @@
 
   
 
-
+
   
 
   



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

svn commit: r27864 - /dev/tomcat/tomcat-7/v7.0.89/

[violetagg]

Author: violetagg
Date: Mon Jul  2 15:55:19 2018
New Revision: 27864

Log:
Tomcat 7.0.89 did not pass the vote

Removed:
dev/tomcat/tomcat-7/v7.0.89/


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

Re: [CANCEL][VOTE] Release Apache Tomcat 7.0.89

[Violeta Georgieva]

Hi,

2018-06-29 16:24 GMT+03:00 Violeta Georgieva :
>
> The proposed Apache Tomcat 7.0.89 release is now available for voting.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.89/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1188/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_89/
>
> The proposed 7.0.89 release is:
> [ ] Broken - do not release
> [ ] Stable - go ahead and release as 7.0.89 Stable

I'm canceling the vote because of the issue reported by Mark.
I'll start preparing Tomcat 7.0.90 shortly.

Regards,
Violeta

Re: [VOTE] Release Apache Tomcat 7.0.89

[Violeta Georgieva]

2018-07-02 18:47 GMT+03:00 Mark Thomas :
>
> On 02/07/18 16:38, Violeta Georgieva wrote:
> > Hi,
> >
> > 2018-07-02 18:35 GMT+03:00 Mark Thomas :
> >>
> >> On 29/06/18 14:24, Violeta Georgieva wrote:
> >>> The proposed Apache Tomcat 7.0.89 release is now available for voting.
> >>>
> >>> It can be obtained from:
> >>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.89/
> >>> The Maven staging repo is:
> >>>
https://repository.apache.org/content/repositories/orgapachetomcat-1188/
> >>> The svn tag is:
> >>> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_89/
> >>>
> >>> The proposed 7.0.89 release is:
> >>> [X] Broken - do not release
> >>> [ ] Stable - go ahead and release as 7.0.89 Stable
> >>
> >> Fails to start with a security manager.
> >>
> >> Sorry. Looks like one of my changes failed to update SecurityClassLoad.
> >
> > Is this applicable also for 8.0.53?
>
> No. 8.0.53 was OK.

OK
Thanks a lot

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

svn commit: r1834860 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java

[markt]

Author: markt
Date: Mon Jul  2 15:47:54 2018
New Revision: 1834860

URL: http://svn.apache.org/viewvc?rev=1834860=rev
Log:
Don't use in-memory certs with DKS key stores

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java?rev=1834860=1834859=1834860=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java Mon Jul  2 
15:47:54 2018
@@ -244,7 +244,8 @@ public class JSSEUtil extends SSLUtilBas
 }
 
 Key k = ks.getKey(keyAlias, keyPassArray);
-if (k != null && "PKCS#8".equalsIgnoreCase(k.getFormat())) {
+if (k != null && 
!"DKS".equalsIgnoreCase(certificate.getCertificateKeystoreType()) &&
+"PKCS#8".equalsIgnoreCase(k.getFormat())) {
 // Switch to in-memory key store
 String provider = certificate.getCertificateKeystoreProvider();
 if (provider == null) {



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

Re: [VOTE] Release Apache Tomcat 7.0.89

[Mark Thomas]

On 02/07/18 16:38, Violeta Georgieva wrote:
> Hi,
> 
> 2018-07-02 18:35 GMT+03:00 Mark Thomas :
>>
>> On 29/06/18 14:24, Violeta Georgieva wrote:
>>> The proposed Apache Tomcat 7.0.89 release is now available for voting.
>>>
>>> It can be obtained from:
>>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.89/
>>> The Maven staging repo is:
>>> https://repository.apache.org/content/repositories/orgapachetomcat-1188/
>>> The svn tag is:
>>> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_89/
>>>
>>> The proposed 7.0.89 release is:
>>> [X] Broken - do not release
>>> [ ] Stable - go ahead and release as 7.0.89 Stable
>>
>> Fails to start with a security manager.
>>
>> Sorry. Looks like one of my changes failed to update SecurityClassLoad.
> 
> Is this applicable also for 8.0.53?

No. 8.0.53 was OK.

Mark

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

Re: [VOTE] Release Apache Tomcat 7.0.89

[Violeta Georgieva]

Hi,

2018-07-02 18:35 GMT+03:00 Mark Thomas :
>
> On 29/06/18 14:24, Violeta Georgieva wrote:
> > The proposed Apache Tomcat 7.0.89 release is now available for voting.
> >
> > It can be obtained from:
> > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.89/
> > The Maven staging repo is:
> > https://repository.apache.org/content/repositories/orgapachetomcat-1188/
> > The svn tag is:
> > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_89/
> >
> > The proposed 7.0.89 release is:
> > [X] Broken - do not release
> > [ ] Stable - go ahead and release as 7.0.89 Stable
>
> Fails to start with a security manager.
>
> Sorry. Looks like one of my changes failed to update SecurityClassLoad.

Is this applicable also for 8.0.53?

Regards,
Violeta

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

Re: [VOTE] Release Apache Tomcat 7.0.89

[Mark Thomas]

On 29/06/18 14:24, Violeta Georgieva wrote:
> The proposed Apache Tomcat 7.0.89 release is now available for voting.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.89/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1188/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_89/
> 
> The proposed 7.0.89 release is:
> [X] Broken - do not release
> [ ] Stable - go ahead and release as 7.0.89 Stable

Fails to start with a security manager.

Sorry. Looks like one of my changes failed to update SecurityClassLoad.

Mark

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

svn commit: r1834856 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/security/SecurityClassLoad.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Jul  2 15:34:33 2018
New Revision: 1834856

URL: http://svn.apache.org/viewvc?rev=1834856=rev
Log:
Delete reference to removed class that prevented Tomcat from starting when 
running under a security manager.

Modified:

tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1834856=1834855=1834856=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java 
Mon Jul  2 15:34:33 2018
@@ -191,7 +191,6 @@ public final class SecurityClassLoad {
 clazz.newInstance();
 loader.loadClass(basePackage + "util.http.HttpMessages");
 loader.loadClass(basePackage + "util.http.parser.HttpParser");
-loader.loadClass(basePackage + 
"util.http.parser.HttpParser$AllowsEnd");
 loader.loadClass(basePackage + 
"util.http.parser.HttpParser$DomainParseState");
 loader.loadClass(basePackage + 
"util.http.parser.HttpParser$SkipResult");
 loader.loadClass(basePackage + "util.http.parser.MediaType");

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=1834856=1834855=1834856=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jul  2 15:34:33 2018
@@ -65,6 +65,10 @@
 that caused request failures for some requests when using the
 VirtualDirContext. (markt)
   
+  
+Delete reference to removed class that prevented Tomcat from starting
+when running under a security manager. (markt)
+  
 
   
 



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

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

[markt]

Author: markt
Date: Mon Jul  2 15:33:16 2018
New Revision: 1834855

URL: http://svn.apache.org/viewvc?rev=1834855=rev
Log:
Correct markup

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=1834855=1834854=1834855=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jul  2 15:33:16 2018
@@ -60,9 +60,11 @@
 
   
 
-  62498: Correct a regression in the fix for CVE-2017-12617 that
-  caused request failures for some requests when using the
-  VirtualDirContext. (markt)
+  
+62498: Correct a regression in the fix for CVE-2017-12617
+that caused request failures for some requests when using the
+VirtualDirContext. (markt)
+  
 
   
 



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

svn commit: r1834853 - /tomcat/trunk/bin/makebase.bat

[markt]

Author: markt
Date: Mon Jul  2 15:24:23 2018
New Revision: 1834853

URL: http://svn.apache.org/viewvc?rev=1834853=rev
Log:
Replace '::' with 'rem' for consistency with other .bat files. Also, research 
suggests '::' is not an official comment marker but a malformed label which 
causes the line to be ignored. The end result is generally the same but there 
are some edge cases with '::'

Modified:
tomcat/trunk/bin/makebase.bat

Modified: tomcat/trunk/bin/makebase.bat
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/makebase.bat?rev=1834853=1834852=1834853=diff
==
--- tomcat/trunk/bin/makebase.bat (original)
+++ tomcat/trunk/bin/makebase.bat Mon Jul  2 15:24:23 2018
@@ -1,35 +1,35 @@
-:: Licensed to the Apache Software Foundation (ASF) under one or more
-:: contributor license agreements.  See the NOTICE file distributed with
-:: this work for additional information regarding copyright ownership.
-:: The ASF licenses this file to You under the Apache License, Version 2.0
-:: (the "License"); you may not use this file except in compliance with
-:: the License.  You may obtain a copy of the License at
-::
-:: http://www.apache.org/licenses/LICENSE-2.0
-::
-:: Unless required by applicable law or agreed to in writing, software
-:: distributed under the License is distributed on an "AS IS" BASIS,
-:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-:: See the License for the specific language governing permissions and
-:: limitations under the License.
-
-:: This script creates the directory structure required for running Tomcat
-:: in a separate directory by pointing %CATALINA_BASE% to it. It copies the
-:: conf directory from %CATALINA_HOME%, and creates empty directories for
-:: bin, lib, logs, temp, webapps, and work.
-::
-:: If the file %CATALINA_HOME%/bin/setenv.sh exists then it is copied to
-:: the target directory as well.
-::
-:: Usage: makebase 
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements.  See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License.  You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+
+rem This script creates the directory structure required for running Tomcat
+rem in a separate directory by pointing %CATALINA_BASE% to it. It copies the
+rem conf directory from %CATALINA_HOME%, and creates empty directories for
+rem bin, lib, logs, temp, webapps, and work.
+rem
+rem If the file %CATALINA_HOME%/bin/setenv.sh exists then it is copied to
+rem the target directory as well.
+rem
+rem Usage: makebase 
 
 @echo off
 
-:: first arg is the target directory
+rem first arg is the target directory
 set BASE_TGT=%1
 
 if %BASE_TGT%.==. (
-:: target directory not provided; exit
+rem target directory not provided; exit
 echo "Usage: makebase "
 goto :EOF
 )
@@ -38,28 +38,28 @@ set CURR_DIR=%~dp0
 set HOME_DIR=%CURR_DIR%..\
 
 if exist %BASE_TGT% (
-  :: target directory exists
+  rem target directory exists
   echo "Target directory exists"
 
-:: exit if target directory is not empty
+rem exit if target directory is not empty
 for /F %%i in ('dir /b "%BASE_TGT%\*.*"') do (
 echo "Target directory is not empty"
 goto :EOF
 )
 ) else (
-:: create the target directory
+rem create the target directory
 mkdir %BASE_TGT%
 )
 
-:: create empty directories for bin, lib, logs, temp, webapps, and work
+rem create empty directories for bin, lib, logs, temp, webapps, and work
 for %%d in (bin, lib, logs, temp, webapps, work) do (
 mkdir "%BASE_TGT%\%%d"
 )
 
-:: copy conf directory
+rem copy conf directory
 robocopy %HOME_DIR%\conf %BASE_TGT%\conf > nul
 
-:: copy setenv.bat if exists
+rem copy setenv.bat if exists
 robocopy %HOME_DIR%\bin %BASE_TGT%\bin setenv.bat > nul
 
 echo "Created CATALINA_BASE directory at $BASE_TGT"



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

Re: Slides for ApacheCon EU Roadshow 2018

[Violeta Georgieva]

Hi,

2018-06-27 2:40 GMT+03:00 Huxing Zhang :
>
> Hi All,
>
> I have check the presentation page[1] but could only find slide of
> Mark's "State of the Cat" topic.
>
> Do we have slides/recordings for the other topics?
>
> [1] http://tomcat.apache.org/presentations.html

I added my presentation to the Tomcat website.
As there was a demo, I added a link to GitHub in the presentation.

Regards,
Violeta


> --
> Best Regards！
> Huxing
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

svn commit: r1834848 - in /tomcat/site/trunk: docs/presentations.html xdocs/presentations.xml

[violetagg]

Author: violetagg
Date: Mon Jul  2 13:18:32 2018
New Revision: 1834848

URL: http://svn.apache.org/viewvc?rev=1834848=rev
Log:
Reactive Applications on Apache Tomcat - Apache EU Roadshow 2018

Modified:
tomcat/site/trunk/docs/presentations.html
tomcat/site/trunk/xdocs/presentations.xml

Modified: tomcat/site/trunk/docs/presentations.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/presentations.html?rev=1834848=1834847=1834848=diff
==
--- tomcat/site/trunk/docs/presentations.html (original)
+++ tomcat/site/trunk/docs/presentations.html Mon Jul  2 13:18:32 2018
@@ -287,6 +287,12 @@ mailing list.
 http://home.apache.org/~rjung/presentations/2018-06-14-ApacheRoadShow-WebServerConfgurationFeatures.pdf;>slides
   
 
+  
+
+Reactive Applications on Apache Tomcat - Violeta Georgieva,
+http://home.apache.org/~violetagg/presentations/2018-06-13-Reactive-Applications-on-Apache-Tomcat.pdf;>slides
+  
+
 
 
 

Modified: tomcat/site/trunk/xdocs/presentations.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/presentations.xml?rev=1834848=1834847=1834848=diff
==
--- tomcat/site/trunk/xdocs/presentations.xml (original)
+++ tomcat/site/trunk/xdocs/presentations.xml Mon Jul  2 13:18:32 2018
@@ -49,6 +49,10 @@ mailing list.
 Apache Web Server 2.4 - 10 Must-know Configuration Features - Rainer Jung,
 http://home.apache.org/~rjung/presentations/2018-06-14-ApacheRoadShow-WebServerConfgurationFeatures.pdf;>slides
   
+  
+Reactive Applications on Apache Tomcat - Violeta Georgieva,
+http://home.apache.org/~violetagg/presentations/2018-06-13-Reactive-Applications-on-Apache-Tomcat.pdf;>slides
+  
 
 
 



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

Re: [VOTE] Release Apache Tomcat 7.0.89

[Rémy Maucherat]

On Fri, Jun 29, 2018 at 3:24 PM Violeta Georgieva 
wrote:

> The proposed Apache Tomcat 7.0.89 release is now available for voting.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.89/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1188/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_89/
>
> The proposed 7.0.89 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 7.0.89 Stable
>
>
Rémy

Re: [VOTE] Release Apache Tomcat 8.0.53

[Rémy Maucherat]

On Fri, Jun 29, 2018 at 6:42 PM Violeta Georgieva 
wrote:

> The proposed Apache Tomcat 8.0.53 release is now available for voting.
>
> NOTE: This is the last release!
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.53/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1189/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_53/
>
> The proposed 8.0.53 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.0.53
>
> All ok for tests.

Rémy

[VOTE] Release Apache Tomcat 8.0.53

[Mark Thomas]

On 29/06/18 17:42, Violeta Georgieva wrote:
> The proposed Apache Tomcat 8.0.53 release is now available for voting.
> 
> NOTE: This is the last release!
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.53/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1189/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_53/
> 
> The proposed 8.0.53 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.0.53

Passes a simple smoke test when running under a security manager.

Unit tests pass (excluding OpenSSL cipher tests which are expected to
fail on my system due to the wrong version of OpenSSL being present) for
BIO, NIO, NIO2 and APR/native (with 1.2.17) on Linux, Windows and OSX.

Mark

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

[Bug 62507] Insufficient control over keystore loading to support DKS-keystores

[bugzilla]

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

--- Comment #4 from Andy Wilkinson  ---
I've built trunk and the DKS keystore is now being handled specially but it
doesn't appear to be working correctly:

org.apache.catalina.LifecycleException: Protocol handler start failed
at
org.apache.catalina.connector.Connector.startInternal(Connector.java:960)
~[tomcat-embed-core.jar:9.0.11-dev]
at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183)
~[tomcat-embed-core.jar:9.0.11-dev]
at
org.apache.catalina.core.StandardService.addConnector(StandardService.java:225)
[tomcat-embed-core.jar:9.0.11-dev]
at
org.springframework.boot.web.embedded.tomcat.TomcatWebServer.addPreviouslyRemovedConnectors(TomcatWebServer.java:256)
[classes/:na]
at
org.springframework.boot.web.embedded.tomcat.TomcatWebServer.start(TomcatWebServer.java:198)
[classes/:na]
at
org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.startWebServer(ServletWebServerApplicationContext.java:300)
[classes/:na]
at
org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.finishRefresh(ServletWebServerApplicationContext.java:162)
[classes/:na]
at
org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:553)
[spring-context-5.1.0.BUILD-SNAPSHOT.jar:5.1.0.BUILD-SNAPSHOT]
at
org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:140)
[classes/:na]
at
org.springframework.boot.SpringApplication.refresh(SpringApplication.java:769)
[classes/:na]
at
org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:405)
[classes/:na]
at
org.springframework.boot.SpringApplication.run(SpringApplication.java:334)
[classes/:na]
at
org.springframework.boot.SpringApplication.run(SpringApplication.java:1252)
[classes/:na]
at
org.springframework.boot.SpringApplication.run(SpringApplication.java:1240)
[classes/:na]
at
sample.tomcat.ssl.SampleTomcatSslApplication.main(SampleTomcatSslApplication.java:26)
[classes/:na]
Caused by: java.lang.IllegalArgumentException: Error setting key entry for
'app1 spring-boot-ssl-sample'
at
org.apache.tomcat.util.net.AbstractJsseEndpoint.createSSLContext(AbstractJsseEndpoint.java:114)
~[tomcat-embed-core.jar:9.0.11-dev]
at
org.apache.tomcat.util.net.AbstractJsseEndpoint.initialiseSsl(AbstractJsseEndpoint.java:85)
~[tomcat-embed-core.jar:9.0.11-dev]
at org.apache.tomcat.util.net.NioEndpoint.bind(NioEndpoint.java:224)
~[tomcat-embed-core.jar:9.0.11-dev]
at
org.apache.tomcat.util.net.AbstractEndpoint.start(AbstractEndpoint.java:1107)
~[tomcat-embed-core.jar:9.0.11-dev]
at org.apache.coyote.AbstractProtocol.start(AbstractProtocol.java:550)
~[tomcat-embed-core.jar:9.0.11-dev]
at
org.apache.catalina.connector.Connector.startInternal(Connector.java:957)
~[tomcat-embed-core.jar:9.0.11-dev]
... 14 common frames omitted
Caused by: java.security.KeyStoreException: Error setting key entry for 'app1
spring-boot-ssl-sample'
at
sun.security.provider.DomainKeyStore.engineSetKeyEntry(DomainKeyStore.java:269)
~[na:1.8.0_151]
at
sun.security.provider.DomainKeyStore$DKS.engineSetKeyEntry(DomainKeyStore.java:68)
~[na:1.8.0_151]
at java.security.KeyStore.setKeyEntry(KeyStore.java:1140)
~[na:1.8.0_151]
at
org.apache.tomcat.util.net.jsse.JSSEUtil.getKeyManagers(JSSEUtil.java:257)
~[tomcat-embed-core.jar:9.0.11-dev]
at
org.apache.tomcat.util.net.AbstractJsseEndpoint.createSSLContext(AbstractJsseEndpoint.java:112)
~[tomcat-embed-core.jar:9.0.11-dev]
... 19 common frames omitted

This error is occurring because DomainKeyStore$DKS.getKeyStoreForWriting is
being called with 'app1 spring-boot-ssl-sample' and returning null. The passed
in String is split on space and the first component, app1, is used as the key
for a map lookup. The map only contains a single entry with the key
iostream1 so it returns null when asked for app1. The iostream1 entry is
written as a result of the ksUsed.load(null,  null) call on line 256 of
JSSEUtil.getKeyManagers(). Prior to the call to load, the map is empty. By
contrast to ksUsed, at this point the map within ks contains a single entry
named app1. In short, it appears that the switch to an in-memory store for a
PKSC#8 key does not work.

I'm insufficiently experienced with DKS to know if the above is expected
behaviour. If it is expected, the diagnostics could be approved as I could
only determine the above by stepping through in the debugger.

-- 
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 62515] New: Tomcat should perform a graceful shutdown

[bugzilla]

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

Bug ID: 62515
   Summary: Tomcat should perform a graceful shutdown
   Product: Tomcat 8
   Version: 8.0.x-trunk
  Hardware: PC
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: k...@semler.dk
  Target Milestone: 

Tomcat does not shutdown as other Java servers do.

Usual java server shutdown practice:
1. Stop listening on inbound port
2. Finish executing all existing requests based on X timeout
3. Shutdown server

Tomcat does this:
1. Finish executing all existing requests based on unloaddelay timeout
2. Stop listening on inbound port
3. Shutdown server

Due to tomcat still listening on inbound port it will accept requests to the
end, which are then terminated, as they do not have sufficient time to finish,
regardless of the value set for unloaddelay attribute.

Furthermore, it is impossible for any loadbalancer, reverse proxy, etc upstream
to know that the tomcat is shutting down. For other java servers, because the
inbound port is closed, the upstream cannot connect and behaves according to
its purpose & configuration (for example send new requests to another server).

So in conclusion, by stopping the inbound port first thing, we can ensure
existing request completing successfully as well as allowing upstream
components to know that the server is not available for new requests.

To produce this problem, you need a simple servlet with a long response time.
Invoke it, request shutdown of server, invoke it again.
Depending on unloaddelay value, either both requests will fail or the last
request will fail.

-- 
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

JDK 11 is now in Rampdown Phase one

[Rory O'Donnell]

Hi Mark,

*JDK 11 is now in Rampdown Phase one***
The overall feature set is frozen. No further JEPs will be targeted to 
this release.We’ve forked the main-line source repository, jdk/jdk, to 
the jdk/jdk11 stabilization repository. Any changes pushed to jdk/jdk or 
jdk/client are now bound for JDK 12.


 * For more details , see Mark Reinhold's email to jdk-dev mailing list
   [1]
 * The Rampdown Phase one process  [2].

*Note: -* Early-Access build archive format on Windows has changed to zip.

Since our last email the following JEPs have been targeted to JDK 11 :

 * 181: Nest-Based Access Control
 * 315: Improve Aarch64 Intrinsics
 * 330: Launch Single-File Source-Code Programs
 * 331: Low-Overhead Heap Profiling
 * 332: Transport Layer Security (TLS) 1.3
 * 333: ZGC: A Scalable Low-Latency Garbage Collector (Experimental)
 * 335: *Deprecate the Nashorn JavaScript Engine*
 * 336: *Deprecate the Pack200 Tools and API*

Other important changes since last email:

   Build 19:
   JDK-8205043  : G1
   enables adaptive parallel reference processing by default
   Build 18:
   JDK-8196141  : Add
   GoDaddy root certificates
   JDK-8204243  :
   *remove Thread.destroy() and Thread.stop(Throwable)*
   JDK-8202088  :
   Japanese New Era Implementation
   Build 17:
   JDK-8189949  :
   Remove Baltimore Cybertrust Code Signing CA
   JDK-8191031  :
   Remove several Symantec Root CAs
   JDK-8072996  :
   Deprecate stream-based GSSContext methods
   Build 16:
   JDK-8191844  :
   Remove SECOM root

Rgds, Rory

[1] http://mail.openjdk.java.net/pipermail/jdk-dev/2018-June/001509.html
[2] http://openjdk.java.net/projects/jdk/11/#Schedule

svn commit: r1834826 - in /tomcat/trunk/bin: makebase.bat makebase.sh

[remm]

Author: remm
Date: Mon Jul  2 08:19:20 2018
New Revision: 1834826

URL: http://svn.apache.org/viewvc?rev=1834826=rev
Log:
Trailing WS

Modified:
tomcat/trunk/bin/makebase.bat
tomcat/trunk/bin/makebase.sh

Modified: tomcat/trunk/bin/makebase.bat
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/makebase.bat?rev=1834826=1834825=1834826=diff
==
--- tomcat/trunk/bin/makebase.bat (original)
+++ tomcat/trunk/bin/makebase.bat Mon Jul  2 08:19:20 2018
@@ -13,7 +13,7 @@
 :: See the License for the specific language governing permissions and
 :: limitations under the License.
 
-:: This script creates the directory structure required for running Tomcat 
+:: This script creates the directory structure required for running Tomcat
 :: in a separate directory by pointing %CATALINA_BASE% to it. It copies the
 :: conf directory from %CATALINA_HOME%, and creates empty directories for
 :: bin, lib, logs, temp, webapps, and work.
@@ -46,7 +46,7 @@ if exist %BASE_TGT% (
 echo "Target directory is not empty"
 goto :EOF
 )
-) else ( 
+) else (
 :: create the target directory
 mkdir %BASE_TGT%
 )

Modified: tomcat/trunk/bin/makebase.sh
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/makebase.sh?rev=1834826=1834825=1834826=diff
==
--- tomcat/trunk/bin/makebase.sh (original)
+++ tomcat/trunk/bin/makebase.sh Mon Jul  2 08:19:20 2018
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This script creates the directory structure required for running Tomcat 
+# This script creates the directory structure required for running Tomcat
 # in a separate directory by pointing $CATALINA_BASE to it. It copies the
 # conf directory from $CATALINA_HOME, and creates empty directories for
 # bin, lib, logs, temp, webapps, and work.
@@ -44,13 +44,13 @@ if [ -d ${BASE_TGT} ]; then
 [ "$(ls -A ${BASE_TGT})" ] && \
 echo "Target directory is not empty" && \
 exit 1
-else 
+else
 # create the target directory
 mkdir -p ${BASE_TGT}
 fi
 
-for dir in bin lib logs temp webapps work; 
-do 
+for dir in bin lib logs temp webapps work;
+do
 # copy directory with permissions and delete contents if any
 mkdir "${BASE_TGT}/${dir}"
 done



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

[GUMP@vmgump-vm3]: Project tomcat-trunk-validate (in module tomcat-trunk) failed

[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-validate 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-trunk-validate :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on checkstyle exists, no need to add for property 
checkstyle.jar.
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html
Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 40 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-8.12-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/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/checkstyle/target/checkstyle-8.12-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/commons-beanutils/dist/commons-beanutils-20180702.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/commons-cli/target/commons-cli-1.5-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.8-SNAPSHOT.jar:/srv/gump/pu
 
blic/workspace/apache-commons/logging/target/commons-logging-20180702.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20180702.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-HEAD-jre-SNAPSHOT.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml

build-prepare:
   [delete] Deleting directory 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp

compile-prepare:

download-validate:

testexist:
 [echo] Testing  for 
/srv/gump/public/workspace/checkstyle/target/checkstyle-8.12-SNAPSHOT.jar

setproxy:

downloadfile:

validate:
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle
[checkstyle] Running Checkstyle 8.12-SNAPSHOT on 3288 files
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/bin/makebase.bat:16: Line matches the 
illegal pattern '\s+$'. [RegexpSingleline]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/bin/makebase.bat:49: Line matches the 
illegal pattern '\s+$'. [RegexpSingleline]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/bin/makebase.sh:18: Line matches the 
illegal pattern '\s+$'. [RegexpSingleline]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/bin/makebase.sh:47: Line matches the 
illegal pattern '\s+$'. [RegexpSingleline]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/bin/makebase.sh:52: Line matches the 
illegal pattern '\s+$'. [RegexpSingleline]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/bin/makebase.sh:53: Line matches the 
illegal pattern '\s+$'. [RegexpSingleline]

BUILD FAILED
/srv/gump/public/workspace/tomcat-trunk/build.xml:569: Got 6 errors and 0 
warnings.

Total time: 39 seconds
-

To subscribe to this information via syndicated feeds:
- RSS: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/rss.xml
- Atom: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 20180702060006, vmgump-vm3.apache.org:vmgump:20180702060006
Gump E-mail

buildbot success in on tomcat-trunk

[buildbot]

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

Buildbot URL: https://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] 1834817
Blamelist: isapir

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: r1834817 - in /tomcat/trunk/bin: makebase.bat makebase.sh

[isapir]

Author: isapir
Date: Mon Jul  2 06:03:21 2018
New Revision: 1834817

URL: http://svn.apache.org/viewvc?rev=1834817=rev
Log:
Updated makebase scripts per feedback

Modified:
tomcat/trunk/bin/makebase.bat
tomcat/trunk/bin/makebase.sh

Modified: tomcat/trunk/bin/makebase.bat
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/makebase.bat?rev=1834817=1834816=1834817=diff
==
--- tomcat/trunk/bin/makebase.bat (original)
+++ tomcat/trunk/bin/makebase.bat Mon Jul  2 06:03:21 2018
@@ -16,10 +16,12 @@
 :: This script creates the directory structure required for running Tomcat 
 :: in a separate directory by pointing %CATALINA_BASE% to it. It copies the
 :: conf directory from %CATALINA_HOME%, and creates empty directories for
-:: logs, temp, webapps, and work.
+:: bin, lib, logs, temp, webapps, and work.
 ::
 :: If the file %CATALINA_HOME%/bin/setenv.sh exists then it is copied to
 :: the target directory as well.
+::
+:: Usage: makebase 
 
 @echo off
 
@@ -49,8 +51,10 @@ if exist %BASE_TGT% (
 mkdir %BASE_TGT%
 )
 
-:: create empty directories for bin, logs, temp, webapps, and work
-mkdir %BASE_TGT%\bin %BASE_TGT%\logs %BASE_TGT%\temp %BASE_TGT%\webapps 
%BASE_TGT%\work
+:: create empty directories for bin, lib, logs, temp, webapps, and work
+for %%d in (bin, lib, logs, temp, webapps, work) do (
+mkdir "%BASE_TGT%\%%d"
+)
 
 :: copy conf directory
 robocopy %HOME_DIR%\conf %BASE_TGT%\conf > nul
@@ -60,8 +64,8 @@ robocopy %HOME_DIR%\bin %BASE_TGT%\bin s
 
 echo "Created CATALINA_BASE directory at $BASE_TGT"
 
-echo "Attention: The ports in server.xml might be bound by a "
-echo "   different instance. Each instance must bind "
-echo "   to a unique host:port combination."
+echo "Attention: The ports in conf/server.xml might be bound by a "
+echo "   different instance. Please review your config files "
+echo "   and update them where necessary."
 
 :EOF

Modified: tomcat/trunk/bin/makebase.sh
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/makebase.sh?rev=1834817=1834816=1834817=diff
==
--- tomcat/trunk/bin/makebase.sh (original)
+++ tomcat/trunk/bin/makebase.sh Mon Jul  2 06:03:21 2018
@@ -18,10 +18,12 @@
 # This script creates the directory structure required for running Tomcat 
 # in a separate directory by pointing $CATALINA_BASE to it. It copies the
 # conf directory from $CATALINA_HOME, and creates empty directories for
-# bin, logs, temp, webapps, and work.
+# bin, lib, logs, temp, webapps, and work.
 #
 # If the file $CATALINA_HOME/bin/setenv.sh exists then it is copied to
 # the target directory as well.
+#
+# Usage: makebase 
 
 # first arg is the target directory
 BASE_TGT=$1
@@ -47,11 +49,10 @@ else
 mkdir -p ${BASE_TGT}
 fi
 
-for dir in bin logs temp webapps work; 
+for dir in bin lib logs temp webapps work; 
 do 
 # copy directory with permissions and delete contents if any
-cp -a "${HOME_DIR}/${dir}" "${BASE_TGT}/${dir}"
-rm -fr "${BASE_TGT}/${dir}"/*
+mkdir "${BASE_TGT}/${dir}"
 done
 
 # copy conf directory recursively and preserve permissions
@@ -63,6 +64,6 @@ cp -a "${HOME_DIR}/conf" "${BASE_TGT}/"
 
 echo "Created CATALINA_BASE directory at $BASE_TGT"
 
-echo "Attention: The ports in server.xml might be bound by a "
-echo "   different instance. Each instance must bind "
-echo "   to a unique host:port combination."
+echo "Attention: The ports in conf/server.xml might be bound by a "
+echo "   different instance. Please review your config files "
+echo "   and update them where necessary."



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