[jboss-cvs] JBossAS SVN: r80922 - projects/jboss-seam-int/trunk/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2008-11-13 03:51:57 -0500 (Thu, 13 Nov 2008)
New Revision: 80922

Modified:
   projects/jboss-seam-int/trunk/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/CachingVFSScanner.java
   projects/jboss-seam-int/trunk/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/VFSScanner.java
Log:
Remove TODO vfs check.

Modified: projects/jboss-seam-int/trunk/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/CachingVFSScanner.java
===================================================================
--- projects/jboss-seam-int/trunk/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/CachingVFSScanner.java	2008-11-13 07:50:40 UTC (rev 80921)
+++ projects/jboss-seam-int/trunk/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/CachingVFSScanner.java	2008-11-13 08:51:57 UTC (rev 80922)
@@ -36,11 +36,6 @@
    {
       log.trace("Root url: " + url);
 
-      String urlString = url.toString();
-      // TODO - this should go away once we figure out why -exp.war is part of CL resources
-      if (urlString.startsWith("vfs") == false)
-         return null;
-
       // get the cached file directly, as we expect it to already be there
       VirtualFile top = VFS.getCachedFile(url);
       while (parentDepth > 0)

Modified: projects/jboss-seam-int/trunk/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/VFSScanner.java
===================================================================
--- projects/jboss-seam-int/trunk/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/VFSScanner.java	2008-11-13 07:50:40 UTC (rev 80921)
+++ projects/jboss-seam-int/trunk/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/VFSScanner.java	2008-11-13 08:51:57 UTC (rev 80922)
@@ -45,11 +45,6 @@
    {
       log.trace("Root url: " + url);
 
-      String urlString = url.toString();
-      // TODO - this should go away once we figure out why -exp.war is part of CL resources
-      if (urlString.startsWith("vfs") == false)
-         return null;
-
       // try cache first, it should also have proper depth
       VFSCache cache = VFSCacheFactory.getInstance();
       VirtualFile vf = cache.getFile(url);
@@ -62,6 +57,7 @@
       if (vf != null)
          return vf;
 
+      String urlString = url.toExternalForm();
       int p = urlString.indexOf(":");
       String file = urlString.substring(p + 1);
       URL vfsurl = null;