[jboss-cvs] JBossAS SVN: r103993 - in projects/scanning/trunk: scanning-impl/src/main/java/org/jboss/scanning/plugins and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 15 08:47:16 EDT 2010
Author: alesj
Date: 2010-04-15 08:47:15 -0400 (Thu, 15 Apr 2010)
New Revision: 103993
Added:
projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/VFSUrlScanner.java
Modified:
projects/scanning/trunk/indexer/src/main/java/org/jboss/scanning/indexer/core/ScanUtils.java
projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/DefaultScanner.java
projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/DeploymentUnitScanner.java
Log:
Fix VFS issues.
Modified: projects/scanning/trunk/indexer/src/main/java/org/jboss/scanning/indexer/core/ScanUtils.java
===================================================================
--- projects/scanning/trunk/indexer/src/main/java/org/jboss/scanning/indexer/core/ScanUtils.java 2010-04-15 12:43:21 UTC (rev 103992)
+++ projects/scanning/trunk/indexer/src/main/java/org/jboss/scanning/indexer/core/ScanUtils.java 2010-04-15 12:47:15 UTC (rev 103993)
@@ -38,6 +38,9 @@
import org.jboss.scanning.spi.Scanner;
import org.jboss.scanning.spi.ScanningHandle;
import org.jboss.scanning.spi.ScanningPlugin;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.util.automount.Automounter;
/**
* Scan utils.
@@ -81,7 +84,16 @@
scaner.setPlugins(plugins);
scaner.setIgnoreIndexedHandles(true); // re-index
- scaner.scan(); // do the actual scanning
+ VirtualFile vfs = VFS.getChild(root);
+ Automounter.mount(vfs);
+ try
+ {
+ scaner.scan(); // do the actual scanning
+ }
+ finally
+ {
+ Automounter.cleanup(vfs);
+ }
// write handles to file
Map<ScanningPlugin, ScanningHandle> handles = scaner.getHandles();
Modified: projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/DefaultScanner.java
===================================================================
--- projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/DefaultScanner.java 2010-04-15 12:43:21 UTC (rev 103992)
+++ projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/DefaultScanner.java 2010-04-15 12:47:15 UTC (rev 103993)
@@ -33,7 +33,6 @@
import org.jboss.classloading.spi.visitor.ResourceFilter;
import org.jboss.scanning.spi.ScanningHandle;
import org.jboss.scanning.spi.ScanningPlugin;
-import org.jboss.scanning.spi.helpers.UrlScanner;
import org.jboss.vfs.VFS;
import org.jboss.vfs.VirtualFile;
@@ -42,7 +41,7 @@
*
* @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
*/
-public class DefaultScanner extends UrlScanner
+public class DefaultScanner extends VFSUrlScanner
{
/** The class loader */
private ClassLoader classLoader;
@@ -57,6 +56,7 @@
super(roots);
this.classLoader = classLoader;
this.handles = new HashMap<ScanningPlugin, ScanningHandle>();
+ setToVFS(true); // by default we force the vfs
}
/**
@@ -71,7 +71,12 @@
protected void scan(Set<ScanningPlugin> plugins) throws Exception
{
- URL[] urls = getRoots();
+ URL[] urls;
+ if (isToVFS())
+ urls = toVFS(getRoots());
+ else
+ urls = getRoots();
+
VirtualFile[] roots = new VirtualFile[urls.length];
for (int i = 0; i < roots.length; i++)
{
Modified: projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/DeploymentUnitScanner.java
===================================================================
--- projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/DeploymentUnitScanner.java 2010-04-15 12:43:21 UTC (rev 103992)
+++ projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/DeploymentUnitScanner.java 2010-04-15 12:47:15 UTC (rev 103993)
@@ -34,14 +34,13 @@
import org.jboss.scanning.plugins.helpers.VoidScanningHandle;
import org.jboss.scanning.spi.ScanningHandle;
import org.jboss.scanning.spi.ScanningPlugin;
-import org.jboss.scanning.spi.helpers.UrlScanner;
/**
* Per deployment unit scanner.
*
* @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
*/
-public class DeploymentUnitScanner extends UrlScanner
+public class DeploymentUnitScanner extends VFSUrlScanner
{
/** The deployment unit */
private final DeploymentUnit unit;
@@ -89,11 +88,19 @@
filter = wrap(ResourceFilter.class.getName() + ".resource", filter);
recurseFilter = wrap(ResourceFilter.class.getName() + ".recurse", recurseFilter);
+ // by default we don't use VFS,
+ // since we already expect it to be VFS based
+ URL[] urls;
+ if (isToVFS())
+ urls = toVFS(getRoots());
+ else
+ urls = getRoots();
+
// something in javassist uses TCL
ClassLoader tccl = SecurityActions.setContextClassLoader(unit.getClassLoader());
try
{
- module.visit(visitor, filter, recurseFilter, getRoots());
+ module.visit(visitor, filter, recurseFilter, urls);
}
finally
{
Copied: projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/VFSUrlScanner.java (from rev 103955, projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/DefaultScanner.java)
===================================================================
--- projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/VFSUrlScanner.java (rev 0)
+++ projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/VFSUrlScanner.java 2010-04-15 12:47:15 UTC (rev 103993)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.scanning.plugins;
+
+import java.net.URL;
+
+import org.jboss.scanning.spi.helpers.UrlScanner;
+import org.jboss.vfs.VFS;
+
+/**
+ * VFS url scanner.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public abstract class VFSUrlScanner extends UrlScanner
+{
+ private boolean toVFS;
+
+ public VFSUrlScanner(URL... roots)
+ {
+ super(roots);
+ }
+
+ /**
+ * Change non-VFS url to VFS urls.
+ *
+ * @param urls the urls to transform
+ * @return new vfs based urls
+ * @throws Exception for any error
+ */
+ protected static URL[] toVFS(URL[] urls) throws Exception
+ {
+ URL[] vfs = new URL[urls.length];
+ for (int i = 0; i < urls.length; i++)
+ vfs[i] = VFS.getChild(urls[i]).toURL();
+ return vfs;
+ }
+
+ public boolean isToVFS()
+ {
+ return toVFS;
+ }
+
+ public void setToVFS(boolean toVFS)
+ {
+ this.toVFS = toVFS;
+ }
+}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list