Only in Facelets: bin
diff -crB Facelets/build.xml /home/ghu/downloads/facelets/facelets-1.1.15/build.xml
*** Facelets/build.xml 2010-11-22 12:23:26.000000000 -0600
--- /home/ghu/downloads/facelets/facelets-1.1.15/build.xml 2007-06-03 17:50:26.000000000 -0500
***************
*** 26,42 ****
-
-
-
-
--- 26,38 ----
***************
*** 271,281 ****
-
-
-
-
-
--- 267,272 ----
***************
*** 287,293 ****
-
--- 278,283 ----
***************
*** 310,319 ****
-
-
-
-
-
-
-
-
--- 320,325 ----
Only in Facelets: .classpath
diff -crB Facelets/src/java/com/sun/facelets/util/Classpath.java /home/ghu/downloads/facelets/facelets-1.1.15/src/java/com/sun/facelets/util/Classpath.java
*** Facelets/src/java/com/sun/facelets/util/Classpath.java 2010-11-22 12:37:59.000000000 -0600
--- /home/ghu/downloads/facelets/facelets-1.1.15/src/java/com/sun/facelets/util/Classpath.java 2008-06-02 22:20:14.000000000 -0500
***************
*** 37,55 ****
* @version $Id: Classpath.java,v 1.9 2008/06/03 03:20:14 youngm Exp $
*/
public final class Classpath {
!
! /*******************************************************************************/
! //this is part of the fix for JBAS-8583
! private static boolean isVFSPresent;
!
! static {
! try {
! Classpath.class.getClassLoader().loadClass("org.jboss.virtual.VFS");
! isVFSPresent = true;
! } catch (Throwable ignored) {
! }
! }
! /*******************************************************************************/
/**
*
*/
--- 37,43 ----
* @version $Id: Classpath.java,v 1.9 2008/06/03 03:20:14 youngm Exp $
*/
public final class Classpath {
!
/**
*
*/
***************
*** 61,74 ****
return search(Thread.currentThread().getContextClassLoader(), prefix,
suffix);
}
!
! //this method is part of the fix for JBAS-8583
public static URL[] search(ClassLoader cl, String prefix, String suffix) throws IOException {
- return isVFSPresent ? VFSClasspath.search(cl, prefix, suffix) : doSearch(cl, prefix, suffix);
- }
-
- //this method is part of fix for JBAS-8583 the original signature before the fix was: public static URL[] search(ClassLoader cl, String prefix, String suffix) throws IOException
- private static URL[] doSearch(ClassLoader cl, String prefix, String suffix) throws IOException {
Enumeration[] e = new Enumeration[] {
cl.getResources(prefix),
cl.getResources(prefix + "MANIFEST.MF")
--- 49,56 ----
return search(Thread.currentThread().getContextClassLoader(), prefix,
suffix);
}
!
public static URL[] search(ClassLoader cl, String prefix, String suffix) throws IOException {
Enumeration[] e = new Enumeration[] {
cl.getResources(prefix),
cl.getResources(prefix + "MANIFEST.MF")
***************
*** 254,260 ****
}
}
}
-
-
}
--- 236,240 ----
Only in Facelets/src/java/com/sun/facelets/util: VFSClasspath.java