You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/05/03 19:49:05 UTC
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/
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 <code>false</code> 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