Author: markt
Date: Tue May 3 17:33:05 2016
New Revision: 1742148
URL: http://svn.apache.org/viewvc?rev=1742148&view=rev
Log:
Drop the deprecated code.
Modified:
tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
tomcat/trunk/java/org/apache/tomcat/JarScannerCallback.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java
tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java
tomcat/trunk/test/org/apache/tomcat/util/scan/TestStandardJarScanner.java
Modified: tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java?rev=1742148&r1=1742147&r2=1742148&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java Tue May 3 17:33:05 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/trunk/java/org/apache/tomcat/JarScannerCallback.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/JarScannerCallback.java?rev=1742148&r1=1742147&r2=1742148&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/JarScannerCallback.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/JarScannerCallback.java Tue May 3 17:33:05 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/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java?rev=1742148&r1=1742147&r2=1742148&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java
Tue May 3 17:33:05 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/trunk/test/org/apache/jasper/servlet/TestTldScanner.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java?rev=1742148&r1=1742147&r2=1742148&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java (original)
+++ tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java Tue May 3 17:33:05 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/trunk/test/org/apache/tomcat/util/scan/TestStandardJarScanner.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/scan/TestStandardJarScanner.java?rev=1742148&r1=1742147&r2=1742148&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/scan/TestStandardJarScanner.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/scan/TestStandardJarScanner.java Tue May 3 17:33:05
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
|