Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7EDC9200AEE for ; Tue, 3 May 2016 19:49:15 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 7DFDE1609F6; Tue, 3 May 2016 19:49:15 +0200 (CEST) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id AD0451609F5 for ; Tue, 3 May 2016 19:49:14 +0200 (CEST) Received: (qmail 48463 invoked by uid 500); 3 May 2016 17:49:08 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 48453 invoked by uid 99); 3 May 2016 17:49:08 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 May 2016 17:49:08 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 461AA1A4F89 for ; Tue, 3 May 2016 17:49:08 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.799 X-Spam-Level: * X-Spam-Status: No, score=1.799 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id 62z1J8s-6-yQ for ; Tue, 3 May 2016 17:49:06 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with ESMTP id F40AC611F5 for ; Tue, 3 May 2016 17:49:05 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 3580AE009C for ; Tue, 3 May 2016 17:49:05 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 36C063A019B for ; Tue, 3 May 2016 17:49:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1742162 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/jasper/servlet/ java/org/apache/tomcat/ java/org/apache/tomcat/util/descriptor/web/ test/org/apache/jasper/servlet/ test/org/apache/tomcat/util/scan/ Date: Tue, 03 May 2016 17:49:05 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160503174905.36C063A019B@svn01-us-west.apache.org> archived-at: Tue, 03 May 2016 17:49:15 -0000 Author: markt Date: Tue May 3 17:49:04 2016 New Revision: 1742162 URL: http://svn.apache.org/viewvc?rev=1742162&view=rev Log: Drop the deprecated code. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/TldScanner.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/JarScannerCallback.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java tomcat/tc8.5.x/trunk/test/org/apache/jasper/servlet/TestTldScanner.java tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/scan/TestStandardJarScanner.java Propchange: tomcat/tc8.5.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 3 17:49:04 2016 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677 ,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146 +/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,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677 ,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148 Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/TldScanner.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/TldScanner.java?rev=1742162&r1=1742161&r2=1742162&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/TldScanner.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/TldScanner.java Tue May 3 17:49:04 2016 @@ -18,7 +18,6 @@ package org.apache.jasper.servlet; import java.io.File; import java.io.IOException; -import java.net.JarURLConnection; import java.net.URL; import java.nio.file.FileVisitResult; import java.nio.file.Files; @@ -295,12 +294,6 @@ public class TldScanner { private boolean foundJarWithoutTld = false; private boolean foundFileWithoutTld = false; - @Override - public void scan(JarURLConnection jarConn, String webappPath, boolean isWebapp) - throws IOException { - scan(jarConn.getURL(), webappPath, isWebapp); - } - @Override public void scan(URL jarUrl, String webappPath, boolean isWebapp) throws IOException { Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/JarScannerCallback.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/JarScannerCallback.java?rev=1742162&r1=1742161&r2=1742162&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/JarScannerCallback.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/JarScannerCallback.java Tue May 3 17:49:04 2016 @@ -18,7 +18,6 @@ package org.apache.tomcat; import java.io.File; import java.io.IOException; -import java.net.JarURLConnection; import java.net.URL; /** @@ -29,28 +28,6 @@ public interface JarScannerCallback { /** * A JAR was found and may be accessed for further processing via the - * provided URL connection. - * - * @param urlConn The connection to the identified JAR - * @param webappPath The path, if any, to the JAR within the web application - * @param isWebapp Indicates if the JAR was found within a web - * application. If false the JAR should - * be treated as being provided by the container - * - * @throws IOException if an I/O error occurs while scanning the JAR - * - * @deprecated Use {@link #scan(URL, String, boolean)} instead. Because the - * urlConn parameter could refer directly to a JAR or to a JAR - * as an entry in a WAR, it required further processing that - * included obtaining the original URL. It is simpler to provide - * the URL to start with.. - */ - @Deprecated - public void scan(JarURLConnection urlConn, String webappPath, boolean isWebapp) - throws IOException; - - /** - * A JAR was found and may be accessed for further processing via the * provided URL connection. * * @param jarURL The URL for the identified JAR Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java?rev=1742162&r1=1742161&r2=1742162&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java Tue May 3 17:49:04 2016 @@ -20,7 +20,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import java.net.JarURLConnection; import java.net.URL; import java.util.HashMap; import java.util.Map; @@ -50,12 +49,6 @@ public class FragmentJarScannerCallback this.parseRequired = parseRequired; } - @Override - public void scan(JarURLConnection jarConn, String webappPath, boolean isWebapp) - throws IOException { - scan(jarConn.getURL(), webappPath, isWebapp); - } - @Override public void scan(URL jarUrl, String webappPath, boolean isWebapp) throws IOException { Modified: tomcat/tc8.5.x/trunk/test/org/apache/jasper/servlet/TestTldScanner.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/jasper/servlet/TestTldScanner.java?rev=1742162&r1=1742161&r2=1742162&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/test/org/apache/jasper/servlet/TestTldScanner.java (original) +++ tomcat/tc8.5.x/trunk/test/org/apache/jasper/servlet/TestTldScanner.java Tue May 3 17:49:04 2016 @@ -18,7 +18,6 @@ package org.apache.jasper.servlet; import java.io.File; import java.lang.reflect.Constructor; -import java.net.JarURLConnection; import java.net.URL; import java.util.HashMap; import java.util.List; @@ -110,9 +109,7 @@ public class TestTldScanner extends Tomc throws Exception { String fullPath = new File(webapp, path).toURI().toString(); URL jarUrl = new URL("jar:" + fullPath + "!/"); - JarURLConnection connection = (JarURLConnection) jarUrl.openConnection(); - callback.scan(connection, path, true); + callback.scan(jarUrl, path, true); } - } Modified: tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/scan/TestStandardJarScanner.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/scan/TestStandardJarScanner.java?rev=1742162&r1=1742161&r2=1742162&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/scan/TestStandardJarScanner.java (original) +++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/scan/TestStandardJarScanner.java Tue May 3 17:49:04 2016 @@ -18,7 +18,6 @@ package org.apache.tomcat.util.scan; import java.io.File; import java.io.IOException; -import java.net.JarURLConnection; import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; @@ -105,12 +104,6 @@ public class TestStandardJarScanner { } @Override - public void scan(JarURLConnection urlConn, String webappPath, - boolean isWebapp) throws IOException { - callbacks.add(urlConn.toString() + "::" + webappPath + "::" + isWebapp); - } - - @Override public void scan(File file, String webappPath, boolean isWebapp) throws IOException { callbacks.add(file.toString() + "::" + webappPath + "::" + isWebapp); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org