[jboss-cvs] JBossAS SVN: r99248 - in projects/mc-ann/branches/vfs3-int: core/src/main/java/org/jboss/mcann/scanner and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 11 15:43:13 EST 2010
Author: johnbailey
Date: 2010-01-11 15:43:12 -0500 (Mon, 11 Jan 2010)
New Revision: 99248
Modified:
projects/mc-ann/branches/vfs3-int/core/src/main/java/org/jboss/mcann/scanner/AbstractAnnotationScanner.java
projects/mc-ann/branches/vfs3-int/core/src/main/java/org/jboss/mcann/scanner/DefaultAnnotationScanner.java
projects/mc-ann/branches/vfs3-int/pom.xml
Log:
[JBAS-7613] Initial VFS3 integration
Modified: projects/mc-ann/branches/vfs3-int/core/src/main/java/org/jboss/mcann/scanner/AbstractAnnotationScanner.java
===================================================================
--- projects/mc-ann/branches/vfs3-int/core/src/main/java/org/jboss/mcann/scanner/AbstractAnnotationScanner.java 2010-01-11 20:21:32 UTC (rev 99247)
+++ projects/mc-ann/branches/vfs3-int/core/src/main/java/org/jboss/mcann/scanner/AbstractAnnotationScanner.java 2010-01-11 20:43:12 UTC (rev 99248)
@@ -25,7 +25,6 @@
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.net.URL;
-import java.net.URLConnection;
import java.util.ArrayList;
import java.util.List;
import java.util.zip.GZIPInputStream;
@@ -35,8 +34,6 @@
import org.jboss.mcann.AnnotationScanner;
import org.jboss.mcann.repository.Configuration;
import org.jboss.mcann.repository.DefaultConfiguration;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.plugins.vfs.VirtualFileURLConnection;
/**
* Abstract annotation scanner.
@@ -99,24 +96,13 @@
{
try
{
- URLConnection conn = url.openConnection();
- // a bit of a hack; making vfs and vfsmemory work as well
- if (conn instanceof VirtualFileURLConnection)
- {
- VirtualFileURLConnection vfConn = VirtualFileURLConnection.class.cast(conn);
- VirtualFile file = vfConn.getContent();
- VirtualFile mcann = file.getChild(AnnotationRepository.MCANN_PATH);
- return (mcann != null) ? mcann.openStream() : null;
- }
- else
- {
- String urlString = url.toExternalForm();
- if (urlString.endsWith("/") == false)
- urlString += "/";
- urlString += AnnotationRepository.MCANN_PATH;
- URL mcannURL = new URL(urlString);
- return mcannURL.openStream();
- }
+
+ String urlString = url.toExternalForm();
+ if (urlString.endsWith("/") == false)
+ urlString += "/";
+ urlString += AnnotationRepository.MCANN_PATH;
+ URL mcannURL = new URL(urlString);
+ return mcannURL.openStream();
}
catch (IOException e)
{
Modified: projects/mc-ann/branches/vfs3-int/core/src/main/java/org/jboss/mcann/scanner/DefaultAnnotationScanner.java
===================================================================
--- projects/mc-ann/branches/vfs3-int/core/src/main/java/org/jboss/mcann/scanner/DefaultAnnotationScanner.java 2010-01-11 20:21:32 UTC (rev 99247)
+++ projects/mc-ann/branches/vfs3-int/core/src/main/java/org/jboss/mcann/scanner/DefaultAnnotationScanner.java 2010-01-11 20:43:12 UTC (rev 99248)
@@ -31,8 +31,8 @@
import org.jboss.mcann.repository.GenericAnnotationResourceVisitor;
import org.jboss.mcann.repository.MutableAnnotationRepository;
import org.jboss.mcann.repository.TypeInfoProvider;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
/**
* Default annotation scanner.
@@ -90,7 +90,7 @@
VirtualFile[] roots = new VirtualFile[urls.length];
for (int i = 0; i < roots.length; i++)
{
- roots[i] = VFS.getRoot(urls[i]);
+ roots[i] = VFS.getChild(urls[i]);
}
VFSResourceVisitor.visit(roots, excludedRoots, included, excluded, classLoader, visitor, filter, recurseFilter, urls);
Modified: projects/mc-ann/branches/vfs3-int/pom.xml
===================================================================
--- projects/mc-ann/branches/vfs3-int/pom.xml 2010-01-11 20:21:32 UTC (rev 99247)
+++ projects/mc-ann/branches/vfs3-int/pom.xml 2010-01-11 20:43:12 UTC (rev 99248)
@@ -24,10 +24,10 @@
<properties>
<version.org.jboss.common.core>2.2.16.GA</version.org.jboss.common.core>
- <version.org.jboss.vfs>2.2.0.Alpha1</version.org.jboss.vfs>
+ <version.org.jboss.vfs>3.0.0.CR1-SNAPSHOT</version.org.jboss.vfs>
<version.org.jboss.reflect>2.2.0.Alpha1</version.org.jboss.reflect>
<version.org.jboss.man>2.1.1.GA</version.org.jboss.man>
- <version.org.jboss.classloader>2.0.8.GA</version.org.jboss.classloader>
+ <version.org.jboss.classloader>2.2.0-SNAPSHOT</version.org.jboss.classloader>
<version.javassist>3.11.0.GA</version.javassist>
<version.ant>1.7.1</version.ant>
<version.junit>4.4</version.junit>
More information about the jboss-cvs-commits
mailing list