Author: markt
Date: Tue Nov 5 11:39:25 2013
New Revision: 1538949
URL: http://svn.apache.org/r1538949
Log:
Better names
Added:
tomcat/trunk/java/org/apache/tomcat/util/scan/JarFileUrlJar.java
- copied, changed from r1538919,
tomcat/trunk/java/org/apache/tomcat/util/scan/FileUrlJar.java
tomcat/trunk/java/org/apache/tomcat/util/scan/JarFileUrlNestedJar.java
- copied, changed from r1538919,
tomcat/trunk/java/org/apache/tomcat/util/scan/FileUrlNestedJar.java
Removed:
tomcat/trunk/java/org/apache/tomcat/util/scan/FileUrlJar.java
tomcat/trunk/java/org/apache/tomcat/util/scan/FileUrlNestedJar.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/scan/JarFactory.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/scan/JarFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/JarFactory.java?rev=1538949&r1=1538948&r2=1538949&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/scan/JarFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/JarFactory.java Tue Nov 5
11:39:25 2013
@@ -33,9 +33,9 @@ public class JarFactory {
String jarUrl = url.toString();
if (jarUrl.startsWith("jar:file:")) {
if (jarUrl.endsWith("!/")) {
- return new FileUrlJar(url);
+ return new JarFileUrlJar(url);
} else {
- return new FileUrlNestedJar(url);
+ return new JarFileUrlNestedJar(url);
}
} else {
return new UrlJar(url);
Copied: tomcat/trunk/java/org/apache/tomcat/util/scan/JarFileUrlJar.java (from
r1538919, tomcat/trunk/java/org/apache/tomcat/util/scan/FileUrlJar.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/JarFileUrlJar.java?p2=tomcat/trunk/java/org/apache/tomcat/util/scan/JarFileUrlJar.java&p1=tomcat/trunk/java/org/apache/tomcat/util/scan/FileUrlJar.java&r1=1538919&r2=1538949&rev=1538949&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/scan/FileUrlJar.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/JarFileUrlJar.java Tue Nov 5
11:39:25 2013
@@ -29,14 +29,14 @@ import java.util.zip.ZipEntry;
* Implementation of {@link Jar} that is optimised for file based JAR URLs that
* refer directly to a JAR file (e.g URLs of the form jar:file: ... .jar!/) .
*/
-public class FileUrlJar implements Jar {
+public class JarFileUrlJar implements Jar {
private final JarFile jarFile;
private final URL jarFileURL;
private Enumeration<JarEntry> entries;
private JarEntry entry = null;
- public FileUrlJar(URL url) throws IOException {
+ public JarFileUrlJar(URL url) throws IOException {
JarURLConnection jarConn = (JarURLConnection) url.openConnection();
jarConn.setUseCaches(false);
jarFile = jarConn.getJarFile();
Copied: tomcat/trunk/java/org/apache/tomcat/util/scan/JarFileUrlNestedJar.java
(from r1538919,
tomcat/trunk/java/org/apache/tomcat/util/scan/FileUrlNestedJar.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/JarFileUrlNestedJar.java?p2=tomcat/trunk/java/org/apache/tomcat/util/scan/JarFileUrlNestedJar.java&p1=tomcat/trunk/java/org/apache/tomcat/util/scan/FileUrlNestedJar.java&r1=1538919&r2=1538949&rev=1538949&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/scan/FileUrlNestedJar.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/JarFileUrlNestedJar.java Tue
Nov 5 11:39:25 2013
@@ -29,7 +29,7 @@ import java.util.jar.JarFile;
* refer to a JAR file nested inside a WAR
* (e.g URLs of the form jar:file: ... .war!/ ... .jar).
*/
-public class FileUrlNestedJar implements Jar {
+public class JarFileUrlNestedJar implements Jar {
private final URL jarFileURL;
private final JarFile warFile;
@@ -37,7 +37,7 @@ public class FileUrlNestedJar implements
private NonClosingJarInputStream jarInputStream = null;
private JarEntry entry = null;
- public FileUrlNestedJar(URL url) throws IOException {
+ public JarFileUrlNestedJar(URL url) throws IOException {
jarFileURL = url;
JarURLConnection jarConn = (JarURLConnection) url.openConnection();
jarConn.setUseCaches(false);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
