[Bug 62897] New: Provide a property to disable WebappClassLoaderBase.checkThreadLocalsForLeaks()

2018-11-09 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=62897

Bug ID: 62897
   Summary: Provide a property to disable
WebappClassLoaderBase.checkThreadLocalsForLeaks()
   Product: Tomcat 9
   Version: 9.0.x
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: awilkin...@pivotal.io
  Target Milestone: -

When running on Java 11 with clearReferencesObjectStreamClassCaches and
clearReferencesRmiTargets both set to false, a number of reflective access
warnings are still generated when the web app class loader is stopped:

WARNING: Illegal reflective access by
org.apache.catalina.loader.WebappClassLoaderBase
(file:/Users/awilkinson/.m2/repository/org/apache/tomcat/embed/tomcat-embed-core/9.0.12/tomcat-embed-core-9.0.12.jar)
to field java.lang.Thread.threadLocals
WARNING: Illegal reflective access by
org.apache.catalina.loader.WebappClassLoaderBase
(file:/Users/awilkinson/.m2/repository/org/apache/tomcat/embed/tomcat-embed-core/9.0.12/tomcat-embed-core-9.0.12.jar)
to field java.lang.Thread.inheritableThreadLocals
WARNING: Illegal reflective access by
org.apache.catalina.loader.WebappClassLoaderBase
(file:/Users/awilkinson/.m2/repository/org/apache/tomcat/embed/tomcat-embed-core/9.0.12/tomcat-embed-core-9.0.12.jar)
to field java.lang.ThreadLocal$ThreadLocalMap.table
WARNING: Illegal reflective access by
org.apache.catalina.loader.WebappClassLoaderBase
(file:/Users/awilkinson/.m2/repository/org/apache/tomcat/embed/tomcat-embed-core/9.0.12/tomcat-embed-core-9.0.12.jar)
to method java.lang.ThreadLocal$ThreadLocalMap.expungeStaleEntries()
WARNING: Illegal reflective access by
org.apache.catalina.loader.WebappClassLoaderBase
(file:/Users/awilkinson/.m2/repository/org/apache/tomcat/embed/tomcat-embed-core/9.0.12/tomcat-embed-core-9.0.12.jar)
to field java.lang.ThreadLocal$ThreadLocalMap$Entry.value

I believe these all originate from code that's called by
WebappClassLoaderBase.checkThreadLocalsForLeaks(). It would be useful to have a
property that allows these checks to be disabled in the same way as the others.

-- 
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: r1846225 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_92: ./ build.properties.default

2018-11-09 Thread violetagg 
Author: violetagg
Date: Fri Nov  9 09:55:36 2018
New Revision: 1846225

URL: http://svn.apache.org/viewvc?rev=1846225&view=rev
Log:
Tag 7.0.92

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

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

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

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_92/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Fri Nov  9 09:55:36 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_92/
--
bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

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

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_92/
--
--- svn:ignore (added)
+++ svn:ignore Fri Nov  9 09:55:36 2018
@@ -0,0 +1,7 @@
+.*
+build.properties
+logs
+nbproject
+output
+work
+*.iml

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_92/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov  9 09:55:36 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
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,17

svn commit: r1846226 - in /tomcat/trunk/java/org/apache/tomcat/buildutil/translate: ./ Constants.java Export.java

2018-11-09 Thread markt 
Author: markt
Date: Fri Nov  9 10:16:18 2018
New Revision: 1846226

URL: http://svn.apache.org/viewvc?rev=1846226&view=rev
Log:
Add the code I've been using to export translations to a single file per 
language. Plenty of scope for improvement.

Added:
tomcat/trunk/java/org/apache/tomcat/buildutil/translate/
tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Constants.java   
(with props)
tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java   (with 
props)

Added: tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Constants.java?rev=1846226&view=auto
==
--- tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Constants.java 
(added)
+++ tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Constants.java Fri 
Nov  9 10:16:18 2018
@@ -0,0 +1,27 @@
+/*
+* 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.
+*/
+package org.apache.tomcat.buildutil.translate;
+
+public class Constants {
+
+public static final String L10N_PREFIX = "LocalStrings";
+public static final String L10N_SUFFIX = ".properties";
+
+public static final String[] SEARCH_DIRS = new String[] { "java", 
"webapps" };
+
+public static final String END_PACKAGE_MARKER = ".zzz.";
+}

Propchange: 
tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Constants.java
--
svn:eol-style = native

Added: tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java?rev=1846226&view=auto
==
--- tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java (added)
+++ tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java Fri Nov 
 9 10:16:18 2018
@@ -0,0 +1,162 @@
+/*
+* 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.
+*/
+package org.apache.tomcat.buildutil.translate;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.regex.Pattern;
+
+/**
+ * Generates a single properties file per language for import into a 
translation
+ * tool.
+ */
+public class Export {
+
+private static final Map translations = new HashMap<>();
+private static final Pattern ADD_CONTINUATION = Pattern.compile("\\n", 
Pattern.MULTILINE);
+private static final Pattern ESCAPE_LEADING_SPACE = 
Pattern.compile("^(\\s)", Pattern.MULTILINE);
+
+public static void main(String... args) {
+for (String dir : Constants.SEARCH_DIRS) {
+processRoot(dir);
+}
+
+outputTranslations();
+}
+
+
+private static void processRoot(String dir) {
+// Run from within IDE so working dir is root of project.
+File root = new File(dir);
+
+// Assumes no l18n files directly in roots
+for (File f : root.listFiles()) {
+if (f.isDirectory()) {
+processDirectory(f);
+}
+}
+}
+
+
+

[Bug 62895] load-on-startup of the @WebServlet does not word

2018-11-09 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=62895

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |INVALID

--- Comment #2 from Mark Thomas  ---
Servlet specification, version 4, section 8.1.1


The annotated servlet MUST specify at least one url pattern to be deployed.


No such restriction applies to web.xml.

-- 
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: r1846232 - in /tomcat/trunk/java/org/apache/catalina: startup/CatalinaBaseConfigurationSource.java startup/ContextConfig.java valves/rewrite/RewriteValve.java

2018-11-09 Thread markt 
Author: markt
Date: Fri Nov  9 11:02:10 2018
New Revision: 1846232

URL: http://svn.apache.org/viewvc?rev=1846232&view=rev
Log:
Fix null warnings in IDE

Modified:

tomcat/trunk/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java

Modified: 
tomcat/trunk/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java?rev=1846232&r1=1846231&r2=1846232&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
 Fri Nov  9 11:02:10 2018
@@ -64,7 +64,8 @@ public class CatalinaBaseConfigurationSo
 }
 }
 }
-if (result == null) {
+
+if (result == null && ioe != null) {
 throw ioe;
 } else {
 return result;

Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1846232&r1=1846231&r2=1846232&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Fri Nov  9 
11:02:10 2018
@@ -1898,7 +1898,7 @@ public class ContextConfig implements Li
 try {
 stream = webXmlResource.getInputStream();
 source = new InputSource(webXmlResource.getURI().toString());
-if (stream != null && source != null) {
+if (stream != null) {
 source.setByteStream(stream);
 }
 } catch (Exception e) {

Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java?rev=1846232&r1=1846231&r2=1846232&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java Fri 
Nov  9 11:02:10 2018
@@ -143,7 +143,7 @@ public class RewriteValve extends ValveB
 ConfigurationSource.Resource resource = 
ConfigFileLoader.getSource().getConfResource(resourceName);
 is = resource.getInputStream();
 } catch (IOException e) {
-if ((is == null) && (containerLog.isDebugEnabled())) {
+if (containerLog.isDebugEnabled()) {
 containerLog.debug("No configuration resource found: " + 
resourceName, e);
 }
 }



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

JDK 12 , JDK 8u202 & Project Panama Early-Access builds available

2018-11-09 Thread Rory O'Donnell 

Hi Mark,

*JDK 12 Early Access build 19 is available at : - jdk.java.net/12/*

 * These early-access, open-source builds are provided under the GNU
   General Public License, version 2, with the Classpath Exception
   .

 * Release Notes updates since last email
 o Build 18 – JDK-8211883: Disable anon and NULL cipher suites
 + Crypto Roadmap
    Updated
 o Build 17 – JDK-8211806: TLS 1.3 handshake server name indication
   is missing on a session resume
 o Build 16 – JDK-8211866: TLS 1.3 CertificateRequest message
   sometimes offers disallowed signature algorithms
 o Build 17 – JDK-8195793 : Remove GTE CyberTrust Global Root
 o Build 16 - JDK-8191053 : Provide a mechanism to make system's
   security manager immutable

 * JEPs proposed for JDK 12 so far:
 o JEP 230 - Microbenchmark Suite 
 * JEPs targeted to JDK 12, so far
 o 325: Switch Expressions (Preview) 
 o 326: Raw String Literals (Preview)
   
 o 340: One AArch64 Port, Not Two 
 o 341: Default CDS Archives 

*JDK 8u202 Early Access build 03 is available at : - 
**http://jdk.java.net/8/*


 * JDK 8u202 timeline is available [1]
 o GA is scheduled for January 2019

*Project Panama Early-Access build 0 ***is available at : - 
http://jdk.java.net/panama/

**

 * Early access builds from Project Panama
   
 * Early-access builds are provided under the GNU General Public
   License, version 2, with the Classpath Exception
   .
 * Feedback - Please send feedback via e-mail to
   panama-...@openjdk.java.net .
 * To send e-mail to this address you must first subscribe to the
   mailing list
   .

*Crypto Roadmap Updated [2]
*


Rgds,Rory

[1] http://openjdk.java.net/projects/jdk8u/releases/8u202.html
[2] https://java.com/en/jre-jdk-cryptoroadmap.html

--
Rgds,Rory O'Donnell
Quality Engineering Manager
Oracle EMEA , Dublin, Ireland

buildbot failure in on tomcat-trunk

2018-11-09 Thread 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/3729

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] 1846232
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: r30780 [2/2] - in /dev/tomcat/tomcat-7/v7.0.92: ./ bin/ bin/embed/ bin/extras/ src/

2018-11-09 Thread violetagg 
Added: dev/tomcat/tomcat-7/v7.0.92/bin/extras/tomcat-juli-adapters.jar.sha512
==
--- dev/tomcat/tomcat-7/v7.0.92/bin/extras/tomcat-juli-adapters.jar.sha512 
(added)
+++ dev/tomcat/tomcat-7/v7.0.92/bin/extras/tomcat-juli-adapters.jar.sha512 Fri 
Nov  9 11:32:17 2018
@@ -0,0 +1 @@
+38f31f60902e22e7497f9e4da28e272f83b83be60bb24d3a2dc40df0f5f43928e6493b5a6e4f7595261ba1263edc676615b71f3f8d539b06f3aa9d8ec96949d8
 *tomcat-juli-adapters.jar
\ No newline at end of file

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

Propchange: dev/tomcat/tomcat-7/v7.0.92/bin/extras/tomcat-juli.jar
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-7/v7.0.92/bin/extras/tomcat-juli.jar.asc
==
--- dev/tomcat/tomcat-7/v7.0.92/bin/extras/tomcat-juli.jar.asc (added)
+++ dev/tomcat/tomcat-7/v7.0.92/bin/extras/tomcat-juli.jar.asc Fri Nov  9 
11:32:17 2018
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEcT2oi+UJEVNf5xb1IIsKsdYwEccFAlvlas4ACgkQIIsKsdYw
+EceyUBAA/BhYUa0vLOY8tsCHwTv2Kis4K9QILIrasaK/ujDqXk4wp3so1gQ+4iNt
+1f1rIhLKPq7OhoP2mXC+9pMoDt9XxJkIE2cEx8smmlC2rfqOlhz/KpkODkdvOeMG
++Khel1TqIxSZJCeteQUBcAEsrapPWUBi5fnEpAoxR9k7oTHYJCcQN09s0Fm837/k
+3m43ffihVQOgr4OrwYej4FUdUqcmY4QuOjf97Gc9Ih82iiYUTU0T6BYnh5JSS01v
+x6uZ4cubHUIyc8t+ow70efcO6k4vbVu1fMfH5WKmWY7AOwqSHfX59x4vyRxVNwsd
+/LLB7jGo2HFJ4NBJYZT0tDz0Oi9uBRb1Pz1kH7UrvA5zgEmnFvDFYgZLJTlGR8jt
+ZeeANwXKmpEVy0N0Zgn6fR/CENqeGlu+QQ2BwIjMKJTRdgqdsJbyg8EjjP/WPTnN
+yDTwOHHGxZjY90k7HtIvdBqhAUIWmwZtAZBhJ9ZY5uRn2QWfX9FtXUecfrVTM5ju
+3c/jcR4wYAriNUxhq+wfOpSPUxhmn4md53j0d2+iSzVmGQILU7IzjwnazrRscv4l
+3dg06awojAa1GpBxkRozO6daZ2hZ62c5h6WAaqU4CiIWKmV1uZpaqPQ8c9fPMz2o
+21tpxi+5sox4vULCQS74arwAtYjM3+5/r1qf7ZCt4xb0A6dEvhM=
+=wUYB
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-7/v7.0.92/bin/extras/tomcat-juli.jar.sha512
==
--- dev/tomcat/tomcat-7/v7.0.92/bin/extras/tomcat-juli.jar.sha512 (added)
+++ dev/tomcat/tomcat-7/v7.0.92/bin/extras/tomcat-juli.jar.sha512 Fri Nov  9 
11:32:17 2018
@@ -0,0 +1 @@
+7f69b7528225ff1469dfeda0d5082579046ca052c1a6225b17b7d81dcf75ae7cdb734ccb614513d8a3f5e135cfaf0489449c497007564c1f25e0bb2d7e7212a8
 *tomcat-juli.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.92/src/apache-tomcat-7.0.92-src.tar.gz
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-7/v7.0.92/src/apache-tomcat-7.0.92-src.tar.gz
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-7/v7.0.92/src/apache-tomcat-7.0.92-src.tar.gz.asc
==
--- dev/tomcat/tomcat-7/v7.0.92/src/apache-tomcat-7.0.92-src.tar.gz.asc (added)
+++ dev/tomcat/tomcat-7/v7.0.92/src/apache-tomcat-7.0.92-src.tar.gz.asc Fri Nov 
 9 11:32:17 2018
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEcT2oi+UJEVNf5xb1IIsKsdYwEccFAlvla+4ACgkQIIsKsdYw
+Ecdqjw//Yx4v7/j34jacvJzG5nob+uQApNnaowIYFNuCfn+lXjjJr0Z4r7kLKPXC
+MYBKkRjT6e9169XqdCzWjRnIsl6ELuOtWGlT+mBoeXtccr3FTFHuqZ8KwaZv/PO4
+O8GmRJiSGBvfgMQiuvQI6LVRGdsKhy78O4ZF/zNd2HPeVEZhzqE8kxvfC3CTpqoL
+brdnBag8g4DpkYpQFL/4Fp5ZhNIe8bgEv1LRtW3S2D/TnBwp8GHM4OeGiNZ8VLVz
+XiTx5o0zOpC1vnjteqxGAfMwC4HgE2O1qxiztI9F/f0g42LJbyPZplwtVXxpxmYL
+elyCqgnW8xcPMO6IMYjWYPKx5QSI2uQ4/1JMrQoWl9QMC5+2eRIqb+tiS/fsxdQx
+YweRFZEMrqWYrJOC+bk0BQ2FEEZAeXS174ZMlyxxZOLihrUEFNDXVQszCkzrX7gh
+sqnRhfSx3ymmi1FtF6I1K24Vhwp8qIm14wURjR/oNpmxTcbVqV4lnZCCdUlsr09j
+nYPOjadaojsUWahI7Na1T9HEuPWFDYFX2f7SzuXswlCb/8qUGsAspTa9CI0a4CZG
+JPZjFH2SGKLXcsssmTVL8RH4NsVgGpO7atgB/XJMA0obbQltBiG4fgRTjOWa3qBI
+HVvp3eFSncz4GBl9LDibnpwj6wdAdhFDl6US/yKn55eXiVJjdfs=
+=XK2A
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-7/v7.0.92/src/apache-tomcat-7.0.92-src.tar.gz.sha512
==
--- dev/tomcat/tomcat-7/v7.0.92/src/apache-tomcat-7.0.92-src.tar.gz.sha512 
(added)
+++ dev/tomcat/tomcat-7/v7.0.92/src/apache-tomcat-7.0.92-src.tar.gz.sha512 Fri 
Nov  9 11:32:17 2018
@@ -0,0 +1 @@
+8cbcaf6d8dcda5ad8bd667582a39e91c1feaa4cc7216cafc23b9f5cf005cce9af24473c1c9d573f4da26c88ea68520a113dc0a7e2a50823f3ba3bb1510ec9e0a
 *apache-tomcat-7.0.92-src.tar.gz
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.92/src/apache-tomcat-7.0.92-src.zip
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-7/v7.0.92/src/apache-tomcat-7.0.92-src.zip
--

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

2018-11-09 Thread violetagg 
Author: violetagg
Date: Fri Nov  9 11:32:17 2018
New Revision: 30780

Log:
Stage Tomcat 7.0.92

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

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

Added: dev/tomcat/tomcat-7/v7.0.92/KEYS
==
--- dev/tomcat/tomcat-7/v7.0.92/KEYS (added)
+++ dev/tomcat/tomcat-7/v7.0.92/KEYS Fri Nov  9 11:32:17 2018
@@ -0,0 +1,650 @@
+This file contains the PGP&GPG keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+Type Bits/KeyIDDate   User ID
+pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
+
+-BEGIN PGP PUBLIC KEY BLOCK-

[VOTE] Release Apache Tomcat 7.0.92

2018-11-09 Thread Violeta Georgieva 
The proposed Apache Tomcat 7.0.92 release is now available for voting.

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

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

Regards,
Violeta

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

2018-11-09 Thread violetagg 
Author: violetagg
Date: Fri Nov  9 11:41:50 2018
New Revision: 1846235

URL: http://svn.apache.org/viewvc?rev=1846235&view=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=1846235&r1=1846234&r2=1846235&view=diff
==
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Fri Nov  9 11:41:50 2018
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=7
 version.minor=0
-version.build=92
+version.build=93
 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=1846235&r1=1846234&r2=1846235&view=diff
==
--- tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Fri Nov  9 11:41:50 
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.92
+maven.asf.release.deploy.version=7.0.93
 
 #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=1846235&r1=1846234&r2=1846235&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Nov  9 11:41:50 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: r1846236 - in /tomcat/trunk: java/org/apache/catalina/core/ java/org/apache/catalina/loader/ webapps/docs/ webapps/docs/config/

2018-11-09 Thread markt 
Author: markt
Date: Fri Nov  9 11:49:37 2018
New Revision: 1846236

URL: http://svn.apache.org/viewvc?rev=1846236&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62897
Provide a property clearReferencesThreadLocals on the standard Context 
implementation that enables the check for memory leaks via ThreadLocals to be 
disabled because this check depends on the use of an API that has been 
deprecated in later versions of Java.

Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/context.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1846236&r1=1846235&r2=1846236&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Fri Nov  9 
11:49:37 2018
@@ -743,6 +743,12 @@ public class StandardContext extends Con
 private boolean clearReferencesObjectStreamClassCaches = true;
 
 /**
+ * Should Tomcat attempt to clear references to classes loaded by this 
class
+ * loader from ThreadLocals?
+ */
+private boolean clearReferencesThreadLocals = true;
+
+/**
  * Should Tomcat skip the memory leak checks when the web application is
  * stopped as part of the process of shutting down the JVM?
  */
@@ -2697,6 +2703,20 @@ public class StandardContext extends Con
 }
 
 
+public boolean getClearReferencesThreadLocals() {
+return clearReferencesThreadLocals;
+}
+
+
+public void setClearReferencesThreadLocals(boolean 
clearReferencesThreadLocals) {
+boolean oldClearReferencesThreadLocals = 
this.clearReferencesThreadLocals;
+this.clearReferencesThreadLocals = clearReferencesThreadLocals;
+support.firePropertyChange("clearReferencesThreadLocals",
+oldClearReferencesThreadLocals,
+this.clearReferencesThreadLocals);
+}
+
+
 public boolean getSkipMemoryLeakChecksOnJvmShutdown() {
 return skipMemoryLeakChecksOnJvmShutdown;
 }
@@ -4967,8 +4987,10 @@ public class StandardContext extends Con
 getClearReferencesHttpClientKeepAliveThread());
 
setClassLoaderProperty("clearReferencesObjectStreamClassCaches",
 getClearReferencesObjectStreamClassCaches());
-setClassLoaderProperty("skipMemoryLeakChecksOnJvmShutdown",
-getSkipMemoryLeakChecksOnJvmShutdown());
+
setClassLoaderProperty("clearReferencesObjectStreamClassCaches",
+getClearReferencesObjectStreamClassCaches());
+setClassLoaderProperty("clearReferencesThreadLocals",
+getClearReferencesThreadLocals());
 
 // By calling unbindThread and bindThread in a row, we setup 
the
 // current Thread CCL to be the webapp classloader

Modified: tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=1846236&r1=1846235&r2=1846236&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Fri Nov  
9 11:49:37 2018
@@ -94,6 +94,10 @@
description="Should Tomcat attempt to terminate TimerThreads 
that have been started by the web application? Advisable to be used only in a 
development environment."
type="boolean"/>
 
+
+
 

Modified: 
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1846236&r1=1846235&r2=1846236&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Fri 
Nov  9 11:49:37 2018
@@ -370,6 +370,12 @@ public abstract class WebappClassLoaderB
 private boolean clearReferencesObjectStreamClassCaches = true;
 
 /**
+ * Should Tomcat attempt to clear references to classes loaded by this 
class
+ * loader from ThreadLocals?
+ */
+private boolean clearReferencesThreadLocals = true;
+
+/**
  * Should Tomcat skip the memory leak checks when the web application is
  * stopped as part of the

svn commit: r1846238 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/loader/ webapps/docs/ webapps/docs/config/

2018-11-09 Thread markt 
Author: markt
Date: Fri Nov  9 11:56:52 2018
New Revision: 1846238

URL: http://svn.apache.org/viewvc?rev=1846238&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62897
Provide a property clearReferencesThreadLocals on the standard Context 
implementation that enables the check for memory leaks via ThreadLocals to be 
disabled because this check depends on the use of an API that has been 
deprecated in later versions of Java.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml

tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/context.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov  9 11:56:52 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,17615

svn commit: r1846239 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java

2018-11-09 Thread markt 
Author: markt
Date: Fri Nov  9 12:02:41 2018
New Revision: 1846239

URL: http://svn.apache.org/viewvc?rev=1846239&view=rev
Log:
Correct previous merge error

Modified:

tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1846239&r1=1846238&r2=1846239&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
Fri Nov  9 12:02:41 2018
@@ -575,7 +575,6 @@ public abstract class WebappClassLoaderB
 private boolean clearReferencesHttpClientKeepAliveThread = true;
 
 /**
-<<< .working
  * Name of associated context used with logging and JMX to associate with
  * the right web application. Particularly useful for the clear references
  * messages. Defaults to unknown but if standard Tomcat components are used
@@ -584,15 +583,12 @@ public abstract class WebappClassLoaderB
 private String contextName = "unknown";
 
 /**
-||| .merge-left.r1826689
-===
  * Should Tomcat attempt to clear references to classes loaded by this 
class
  * loader from the ObjectStreamClass caches?
  */
 private boolean clearReferencesObjectStreamClassCaches = true;
 
 /**
->>> .merge-right.r1826690
  * Holds the class file transformers decorating this class loader. The
  * CopyOnWriteArrayList is thread safe. It is expensive on writes, but
  * those should be rare. It is very fast on reads, since synchronization



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

svn commit: r1846240 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/loader/ webapps/docs/ webapps/docs/config/

2018-11-09 Thread markt 
Author: markt
Date: Fri Nov  9 12:07:37 2018
New Revision: 1846240

URL: http://svn.apache.org/viewvc?rev=1846240&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62897
Provide a property clearReferencesThreadLocals on the standard Context 
implementation that enables the check for memory leaks via ThreadLocals to be 
disabled because this check depends on the use of an API that has been 
deprecated in later versions of Java.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml

tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov  9 12:07:37 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,

[Bug 62897] Provide a property to disable WebappClassLoaderBase.checkThreadLocalsForLeaks()

2018-11-09 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=62897

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
Fixed in:
- trunk for 9.0.14 onwards
- 8.5.x for 8.5.36 onwards
- 7.0.x for 7.0.93 onwards

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

Re: JDK 12 , JDK 8u202 & Project Panama Early-Access builds available

2018-11-09 Thread Mark Thomas 
On 09/11/2018 10:57, Rory O'Donnell wrote:



> *Project Panama Early-Access build 0 ***is available at : -
> http://jdk.java.net/panama/

This looks interesting. If I am reading the information correctly, it
could reduce the scope of Tomcat Native or even remove it completely
(assuming we dropped the APR connector).

I'm going to try experimenting with it and I'll report back.

Mark

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

buildbot success in on tomcat-trunk

2018-11-09 Thread 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/3730

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] 1846236
Blamelist: markt

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: r1846245 - in /tomcat/trunk: java/org/apache/catalina/core/StandardService.java webapps/docs/config/service.xml

2018-11-09 Thread remm 
Author: remm
Date: Fri Nov  9 13:44:39 2018
New Revision: 1846245

URL: http://svn.apache.org/viewvc?rev=1846245&view=rev
Log:
Add a daemon flag for the utility threads. Those threads are not bad candidates 
for non daemon by default, given they are managed by an executor.

Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardService.java
tomcat/trunk/webapps/docs/config/service.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardService.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardService.java?rev=1846245&r1=1846244&r2=1846245&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardService.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardService.java Fri Nov  9 
13:44:39 2018
@@ -100,6 +100,11 @@ public class StandardService extends Lif
 protected int utilityThreads = 0;
 
 /**
+ * The utility threads daemon flag.
+ */
+protected boolean utilityThreadsAsDaemon = true;
+
+/**
  * Utility executor with scheduling capabilities.
  */
 private ScheduledThreadPoolExecutor utilityExecutor = null;
@@ -267,7 +272,8 @@ public class StandardService extends Lif
 utilityExecutor.setMaximumPoolSize(threads);
 } else {
 ScheduledThreadPoolExecutor scheduledThreadPoolExecutor =
-new ScheduledThreadPoolExecutor(1, new 
UtilityThreadFactory(getName() + "-utility-"));
+new ScheduledThreadPoolExecutor(1,
+new UtilityThreadFactory(getName() + "-utility-", 
utilityThreadsAsDaemon));
 scheduledThreadPoolExecutor.setMaximumPoolSize(threads);
 scheduledThreadPoolExecutor.setKeepAliveTime(10, TimeUnit.SECONDS);
 scheduledThreadPoolExecutor.setRemoveOnCancelPolicy(true);
@@ -278,6 +284,24 @@ public class StandardService extends Lif
 }
 
 
+/**
+ * Get if the utility threads are daemon threads.
+ * @return the threads daemon flag
+ */
+public boolean getUtilityThreadsAsDaemon() {
+return utilityThreadsAsDaemon;
+}
+
+
+/**
+ * Set the utility threads daemon flag. The default value is true.
+ * @param utilityThreadsAsDaemon the new thread daemon flag
+ */
+public void setUtilityThreadsAsDaemon(boolean utilityThreadsAsDaemon) {
+this.utilityThreadsAsDaemon = utilityThreadsAsDaemon;
+}
+
+
 // - Public Methods
 
 
@@ -705,17 +729,19 @@ public class StandardService extends Lif
 private final ThreadGroup group;
 private final AtomicInteger threadNumber = new AtomicInteger(1);
 private final String namePrefix;
+private final boolean daemon;
 
-public UtilityThreadFactory(String namePrefix) {
+public UtilityThreadFactory(String namePrefix, boolean daemon) {
 SecurityManager s = System.getSecurityManager();
 group = (s != null) ? s.getThreadGroup() : 
Thread.currentThread().getThreadGroup();
 this.namePrefix = namePrefix;
+this.daemon = daemon;
 }
 
 @Override
 public Thread newThread(Runnable r) {
 Thread thread = new Thread(group, r, namePrefix + 
threadNumber.getAndIncrement());
-thread.setDaemon(true);
+thread.setDaemon(daemon);
 return thread;
 }
 }

Modified: tomcat/trunk/webapps/docs/config/service.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/service.xml?rev=1846245&r1=1846244&r2=1846245&view=diff
==
--- tomcat/trunk/webapps/docs/config/service.xml (original)
+++ tomcat/trunk/webapps/docs/config/service.xml Fri Nov  9 13:44:39 2018
@@ -68,7 +68,7 @@
   must be unique.
 
 
-
+
   The number of threads this Service will use for
   various utility tasks, including recurring ones. The special value
   of 0 will result in the value of
@@ -92,6 +92,12 @@
 
   
 
+
+  Set the daemon flag value for the utility threads. The default value
+  is true.
+  
+
+
   
 
   



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

svn commit: r1846246 - in /tomcat/trunk: build.properties.default res/maven/tomcat-embed-jasper.pom res/maven/tomcat-jasper.pom webapps/docs/changelog.xml

2018-11-09 Thread markt 
Author: markt
Date: Fri Nov  9 13:52:53 2018
New Revision: 1846246

URL: http://svn.apache.org/viewvc?rev=1846246&view=rev
Log:
Update the Eclipse Compiler for Java to 4.9.

Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/res/maven/tomcat-embed-jasper.pom
tomcat/trunk/res/maven/tomcat-jasper.pom
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1846246&r1=1846245&r2=1846246&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Fri Nov  9 13:52:53 2018
@@ -125,15 +125,15 @@ wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/
 # - Eclipse JDT, version 4.7 or later -#
 # See https://wiki.apache.org/tomcat/JDTCoreBatchCompiler before updating
 #
-# Checksum is from "SHA512 Checksums for 4.7.3a" link at
-# http://download.eclipse.org/eclipse/downloads/drops4/R-4.7.3a-201803300640/
-# 
http://download.eclipse.org/eclipse/downloads/drops4/R-4.7.3a-201803300640/checksum/eclipse-4.7.3a-SUMSSHA512
+# Checksum is from "SHA512 Checksums for 4.9" link at
+# http://download.eclipse.org/eclipse/downloads/drops4/R-4.9-201809060745/
+# 
http://download.eclipse.org/eclipse/downloads/drops4/R-4.9-201809060745/checksum/eclipse-4.9-SUMSSHA512
 #
-jdt.version=4.7.3a
-jdt.release=R-4.7.3a-201803300640
+jdt.version=4.9
+jdt.release=R-4.9-201809060745
 jdt.checksum.enabled=true
 jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=7287b1ea3e18423d027a99ce40ae72e46e1700a65b474d2ec09af6a17b10653b7c2e69e9bb87efe14f4c593dc66b6370ea566fce90edb4b4190a903046817e6f
+jdt.checksum.value=c4ddf476e161758a0ba5d336052cb5eb7109686b97dd0b62df6e33b417f7c18f210b81edba009bc765bb9122bd5831520a10291a0ff76ee223624bbcfd12ee2f
 jdt.home=${base.path}/ecj-${jdt.version}
 jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
 # The download will be moved to the archive area eventually. We are taking 
care of that in advance.

Modified: tomcat/trunk/res/maven/tomcat-embed-jasper.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-embed-jasper.pom?rev=1846246&r1=1846245&r2=1846246&view=diff
==
--- tomcat/trunk/res/maven/tomcat-embed-jasper.pom (original)
+++ tomcat/trunk/res/maven/tomcat-embed-jasper.pom Fri Nov  9 13:52:53 2018
@@ -45,7 +45,7 @@
 
   org.eclipse.jdt
   ecj
-  3.13.102
+  3.15.0
 
   
 

Modified: tomcat/trunk/res/maven/tomcat-jasper.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jasper.pom?rev=1846246&r1=1846245&r2=1846246&view=diff
==
--- tomcat/trunk/res/maven/tomcat-jasper.pom (original)
+++ tomcat/trunk/res/maven/tomcat-jasper.pom Fri Nov  9 13:52:53 2018
@@ -57,7 +57,7 @@
 
   org.eclipse.jdt
   ecj
-  3.13.102
+  3.15.0
 
 
   org.apache.tomcat

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1846246&r1=1846245&r2=1846246&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Nov  9 13:52:53 2018
@@ -114,6 +114,13 @@
   
 
   
+  
+
+  
+Update the Eclipse Compiler for Java to 4.9. (markt)
+  
+
+  
   
 
   



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

Re: JDK 12 , JDK 8u202 & Project Panama Early-Access builds available

2018-11-09 Thread Mark Thomas 
On 09/11/2018 10:57, Rory O'Donnell wrote:
> Hi Mark,
> 
> *JDK 12 Early Access build 19 is available at : - jdk.java.net/12/*

Built Tomcat 9.0.x and an all the unit tests. All passed.

Mark

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

buildbot failure in on tomcat-trunk

2018-11-09 Thread 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/3732

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

Re: JDK 12 , JDK 8u202 & Project Panama Early-Access builds available

2018-11-09 Thread Rory O'Donnell 

Thanks for the update Mark!

On 09/11/2018 14:05, Mark Thomas wrote:

On 09/11/2018 10:57, Rory O'Donnell wrote:

Hi Mark,

*JDK 12 Early Access build 19 is available at : - jdk.java.net/12/*

Built Tomcat 9.0.x and an all the unit tests. All passed.

Mark

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


--
Rgds,Rory O'Donnell
Quality Engineering Manager
Oracle EMEA , Dublin, Ireland


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

[Bug 62895] load-on-startup of the @WebServlet does not word

2018-11-09 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=62895

--- Comment #3 from richard.gang@gmail.com ---
OK, I see that
But I have another question, if I use the annotation like that 
@WebServlet(loadOnStartup=1, urlPatterns={}),
it means the Servlet don't have any url pattern, right? But the Servlet still
works, It is still a problem?

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

[Bug 62895] load-on-startup of the @WebServlet does not word

2018-11-09 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=62895

--- Comment #4 from richard.gang@gmail.com ---
I have read the original sentence

 The urlPatterns or the value attribute on the annotation MUST be present. 


thank you very much

-- 
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 62899] New: Async servlet over HTTP/2 on embedded server sporadically timeout forever when reading near end of request

2018-11-09 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=62899

Bug ID: 62899
   Summary: Async servlet over HTTP/2 on embedded server
sporadically timeout forever when reading near end of
request
   Product: Tomcat 9
   Version: 9.0.12
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Servlet
  Assignee: dev@tomcat.apache.org
  Reporter: zdap...@google.com
  Target Milestone: -

Steps to produce:

1. Install nghttp (https://github.com/http2/http2-spec/wiki/Tools)

2. Compile the following java code. 

https://github.com/dapengzhang0/servlettest/blob/master/src/main/java/AsyncReadEmbedded.java

(The program runs a simple servlet using Embedded Tomcat server. It creates a
file with 271828 bytes, and use nghttp to send a POST request over HTTP/2 to
the servlet uploading the data from the file. It will fail if the request
timeout or any exception is thrown, otherwise it succeeds.)

3. Write a script to repeatedly run the code until it fails. (My experiments
showed it sporadically fails once every less than 100 runs. The failure is read
timeout near the end of request data, when there is half close from the client
and a window update)

Thanks.

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

Re: JDK 12 , JDK 8u202 & Project Panama Early-Access builds available

2018-11-09 Thread Mark Thomas 
On 09/11/2018 12:38, Mark Thomas wrote:
> On 09/11/2018 10:57, Rory O'Donnell wrote:
> 
> 
> 
>> *Project Panama Early-Access build 0 ***is available at : -
>> http://jdk.java.net/panama/
> 
> This looks interesting. If I am reading the information correctly, it
> could reduce the scope of Tomcat Native or even remove it completely
> (assuming we dropped the APR connector).
> 
> I'm going to try experimenting with it and I'll report back.

No joy. I suspect my lack of C knowledge is holding me back. I'm trying
this in an OpenSSL build directory:

/opt/java/openjdk-12-panama-b0/bin/jextract \
   -I /usr/include/linux \
   -I include \
   include/openssl/rand.h

and getting

/usr/include/stdlib.h:97:8: error: unknown type name 'size_t'


Mark

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

svn commit: r1846265 - in /tomcat/trunk/java/org/apache/tomcat/buildutil/translate: Export.java Import.java Utils.java

2018-11-09 Thread markt 
Author: markt
Date: Fri Nov  9 20:29:29 2018
New Revision: 1846265

URL: http://svn.apache.org/viewvc?rev=1846265&view=rev
Log:
First pass at the import code

Added:
tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Import.java   (with 
props)
tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Utils.java   (with 
props)
Modified:
tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java

Modified: tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java?rev=1846265&r1=1846264&r2=1846265&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java Fri Nov 
 9 20:29:29 2018
@@ -17,18 +17,14 @@
 package org.apache.tomcat.buildutil.translate;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
-import java.io.Reader;
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
-import java.util.regex.Pattern;
 
 /**
  * Generates a single properties file per language for import into a 
translation
@@ -37,8 +33,6 @@ import java.util.regex.Pattern;
 public class Export {
 
 private static final Map translations = new HashMap<>();
-private static final Pattern ADD_CONTINUATION = Pattern.compile("\\n", 
Pattern.MULTILINE);
-private static final Pattern ESCAPE_LEADING_SPACE = 
Pattern.compile("^(\\s)", Pattern.MULTILINE);
 
 public static void main(String... args) {
 for (String dir : Constants.SEARCH_DIRS) {
@@ -82,23 +76,10 @@ public class Export {
 }
 
 // Determine language
-String language = name.substring(Constants.L10N_PREFIX.length(), 
name.length() - Constants.L10N_SUFFIX.length());
-if (language.length() == 0) {
-// Default
-} else if (language.length() == 3) {
-language = language.substring(1);
-}
+String language = Utils.getLanguage(name);
 
 String keyPrefix = getKeyPrefix(f);
-
-Properties props = new Properties();
-
-try (FileInputStream fis = new FileInputStream(f);
-Reader r = new InputStreamReader(fis, StandardCharsets.UTF_8)) 
{
-props.load(r);
-} catch (IOException e) {
-e.printStackTrace();
-}
+Properties props = Utils.load(f);
 
 // Create a Map for the language if one does not exist.
 Properties translation = translations.get(language);
@@ -141,22 +122,12 @@ public class Export {
 try (FileOutputStream fos = new FileOutputStream(out);
 Writer w = new OutputStreamWriter(fos, 
StandardCharsets.UTF_8)) {
 for (Object key : translation.keySet()) {
-w.write(key + "=" + 
formatValue(translation.getProperty((String) key)) + "\n");
+w.write(key + "=" + 
Utils.formatValue(translation.getProperty((String) key)) + "\n");
 }
 } catch (IOException ioe) {
 ioe.printStackTrace();
 }
 }
 }
-
-
-private static String formatValue(String in) {
-String result = ADD_CONTINUATION.matcher(in).replaceAll("n\n");
-if (result.endsWith("\\\n")) {
-result = result.substring(0, result.length() - 2);
-}
-result = ESCAPE_LEADING_SPACE.matcher(result).replaceAll("$1");
-return result;
-}
 }
 

Added: tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Import.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Import.java?rev=1846265&view=auto
==
--- tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Import.java (added)
+++ tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Import.java Fri Nov 
 9 20:29:29 2018
@@ -0,0 +1,136 @@
+/*
+* 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