ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-19 19:26:27 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

rename "resource" URL protocol to "avian_vm_resource"

Browse Source 
This fixes a problem with JOSM, which attaches its own meaning to the
"resource" protocol.  The new name is less likely to cause such
conflicts.
This commit is contained in:
Joel Dice 2012-08-11 19:01:32 -06:00
parent 373a92d4d6
commit b325221579
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classpath/avian/resource/Handler.java → classpath/avian/avian_vm_resource/Handler.java
View File

@ -8,7 +8,7 @@
There is NO WARRANTY for this software. See license.txt for There is NO WARRANTY for this software. See license.txt for
details. */ details. */
package avian.resource; package avian.avian_vm_resource;
import java.net.URL; import java.net.URL;
import java.net.URLStreamHandler; import java.net.URLStreamHandler;

4
classpath/java/net/URL.java
View File

@ -83,8 +83,8 @@ public final class URL {
{ {
if ("http".equals(protocol) || "https".equals(protocol)) { if ("http".equals(protocol) || "https".equals(protocol)) {
return new avian.http.Handler(); return new avian.http.Handler();
} else if ("resource".equals(protocol)) { } else if ("avian_vm_resource".equals(protocol)) {
return new avian.resource.Handler(); return new avian.avian_vm_resource.Handler();
} else if ("file".equals(protocol)) { } else if ("file".equals(protocol)) {
return new avian.file.Handler(); return new avian.file.Handler();
} else if ("jar".equals(protocol)) { } else if ("jar".equals(protocol)) {

2
makefile
View File

@ -795,7 +795,7 @@ ifneq ($(classpath),avian)
$(classpath-src)/avian/VMClass.java \ $(classpath-src)/avian/VMClass.java \
$(classpath-src)/avian/VMField.java \ $(classpath-src)/avian/VMField.java \
$(classpath-src)/avian/VMMethod.java \ $(classpath-src)/avian/VMMethod.java \
$(classpath-src)/avian/resource/Handler.java $(classpath-src)/avian/avian_vm_resource/Handler.java
ifneq ($(openjdk),) ifneq ($(openjdk),)
classpath-sources := $(classpath-sources) \ classpath-sources := $(classpath-sources) \

2
src/finder.cpp
View File

@ -602,7 +602,7 @@ class BuiltinElement: public JarElement {
} }
virtual const char* urlPrefix() { virtual const char* urlPrefix() {
return "resource:"; return "avian_vm_resource:";
} }
virtual const char* sourceUrl() { virtual const char* sourceUrl() {