root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

JBoss "vfszip" resources need to be treated as jar URLs 

Issue: SPR-11676
(cherry picked from commit be6b54f)
This commit is contained in:
Juergen Hoeller 2014-04-09 20:30:50 +02:00
parent 7135e729e2
commit 196f629a20
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spring-core/src/main/java/org/springframework/util/ResourceUtils.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2013 the original author or authors. * Copyright 2002-2014 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -66,15 +66,15 @@ public abstract class ResourceUtils {
/** URL protocol for an entry from a zip file: "zip" */ /** URL protocol for an entry from a zip file: "zip" */
public static final String URL_PROTOCOL_ZIP = "zip"; public static final String URL_PROTOCOL_ZIP = "zip";
/** URL protocol for an entry from a WebSphere jar file: "wsjar" */
public static final String URL_PROTOCOL_WSJAR = "wsjar";
/** URL protocol for an entry from a JBoss jar file: "vfszip" */ /** URL protocol for an entry from a JBoss jar file: "vfszip" */
public static final String URL_PROTOCOL_VFSZIP = "vfszip"; public static final String URL_PROTOCOL_VFSZIP = "vfszip";
/** URL protocol for a JBoss VFS resource: "vfs" */ /** URL protocol for a JBoss VFS resource: "vfs" */
public static final String URL_PROTOCOL_VFS = "vfs"; public static final String URL_PROTOCOL_VFS = "vfs";
/** URL protocol for an entry from a WebSphere jar file: "wsjar" */
public static final String URL_PROTOCOL_WSJAR = "wsjar";
/** Separator between JAR URL and file path within the JAR */ /** Separator between JAR URL and file path within the JAR */
public static final String JAR_URL_SEPARATOR = "!/"; public static final String JAR_URL_SEPARATOR = "!/";
@ -252,7 +252,7 @@ public abstract class ResourceUtils {
*/ */
public static boolean isFileURL(URL url) { public static boolean isFileURL(URL url) {
String protocol = url.getProtocol(); String protocol = url.getProtocol();
return (URL_PROTOCOL_FILE.equals(protocol) || protocol.startsWith(URL_PROTOCOL_VFS)); return (URL_PROTOCOL_FILE.equals(protocol) || URL_PROTOCOL_VFS.equals(protocol));
} }
/** /**
@ -264,8 +264,9 @@ public abstract class ResourceUtils {
* @return whether the URL has been identified as a JAR URL * @return whether the URL has been identified as a JAR URL
*/ */
public static boolean isJarURL(URL url) { public static boolean isJarURL(URL url) {
String up = url.getProtocol(); String protocol = url.getProtocol();
return (URL_PROTOCOL_JAR.equals(up) || URL_PROTOCOL_ZIP.equals(up) || URL_PROTOCOL_WSJAR.equals(up)); return (URL_PROTOCOL_JAR.equals(protocol) || URL_PROTOCOL_ZIP.equals(protocol) ||
URL_PROTOCOL_WSJAR.equals(protocol) || URL_PROTOCOL_VFSZIP.equals(protocol));
} }
/** /**