dev@javaserverfaces.java.net

Fix for taglib.xml loading on OC4J

From: Adam Winer <adam.winer_at_oracle.com>
Date: Wed, 23 Nov 2005 13:59:54 -0800

A minor addition to Roland Huss's contribution that fixes taglib.xml loading
on OC4J as well; looking for r=jhook so I can check this in. (And a new
build of 1.0 would be great too :))

-- Adam



Index: src/java/com/sun/facelets/util/Classpath.java
===================================================================
RCS file: /cvs/facelets/src/java/com/sun/facelets/util/Classpath.java,v
retrieving revision 1.2.6.1
diff -r1.2.6.1 Classpath.java
88a89,95
> /** For URLs to JARs that do not use JarURLConnection - allowed by
> * the servlet spec - attempt to produce a JarFile object all the same.
> * Known servlet engines that function like this include Weblogic
> * and OC4J.
> * This is not a full solution, since an unpacked WAR or EAR will not
> * have JAR "files" as such.
> */
90a98
> // Trim off any suffix - which is prefixed by "!/" on Weblogic
91a100,105
>
> // OK, didn't find that. Try the less safe "!", used on OC4J
> if (separatorIndex == -1) {
> separatorIndex = urlFile.indexOf('!');
> }
>
93a108
> // And trim off any "file:" prefix.