[jboss-cvs] JBossAS SVN: r100720 - in projects/jboss-seam-int/branches/vfs3-int: jbossas and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 8 16:19:52 EST 2010
Author: johnbailey
Date: 2010-02-08 16:19:52 -0500 (Mon, 08 Feb 2010)
New Revision: 100720
Modified:
projects/jboss-seam-int/branches/vfs3-int/jbossas/pom.xml
projects/jboss-seam-int/branches/vfs3-int/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/CachingVFSScanner.java
projects/jboss-seam-int/branches/vfs3-int/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/LeafVirtualFileFilter.java
projects/jboss-seam-int/branches/vfs3-int/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/VFSScanner.java
projects/jboss-seam-int/branches/vfs3-int/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/VirtualFileModifiableResource.java
projects/jboss-seam-int/branches/vfs3-int/microcontainer/pom.xml
projects/jboss-seam-int/branches/vfs3-int/pom.xml
Log:
[JBAS-7712] - Initial VFS3 integration for jboss-seam-int
Modified: projects/jboss-seam-int/branches/vfs3-int/jbossas/pom.xml
===================================================================
--- projects/jboss-seam-int/branches/vfs3-int/jbossas/pom.xml 2010-02-08 21:16:02 UTC (rev 100719)
+++ projects/jboss-seam-int/branches/vfs3-int/jbossas/pom.xml 2010-02-08 21:19:52 UTC (rev 100720)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.seam.integration</groupId>
<artifactId>jboss-seam-int</artifactId>
- <version>5.2.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-seam-int-jbossas</artifactId>
Modified: projects/jboss-seam-int/branches/vfs3-int/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/CachingVFSScanner.java
===================================================================
--- projects/jboss-seam-int/branches/vfs3-int/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/CachingVFSScanner.java 2010-02-08 21:16:02 UTC (rev 100719)
+++ projects/jboss-seam-int/branches/vfs3-int/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/CachingVFSScanner.java 2010-02-08 21:19:52 UTC (rev 100720)
@@ -1,12 +1,7 @@
package org.jboss.seam.integration.jbossas.vfs;
-import java.io.IOException;
-import java.net.URL;
-
import org.jboss.seam.deployment.DeploymentStrategy;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
/**
* Caching JBoss VFS aware scanner.
@@ -14,40 +9,16 @@
* Use this one when you know VFSContext will be present in cache.
* This is mostly true for apps that are deployed into jbossas deploy directory.
* Otherwise change the VFSCache impl to make sure or use plain VFSScanner.
+ *
+ * @deprecated This is no longer needed with VFS3
*
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
+ at Deprecated
public class CachingVFSScanner extends VFSScanner
{
public CachingVFSScanner(DeploymentStrategy deploymentStrategy)
{
super(deploymentStrategy);
}
-
- /**
- * Get the virtual file root.
- *
- * @param url the root URL
- * @param parentDepth level of parent depth
- * @return actual virtual file from url param
- * @throws java.io.IOException for any error
- */
- protected VirtualFile getRoot(URL url, int parentDepth) throws IOException
- {
- log.trace("Root url: " + url);
-
- // get the cached file directly, as we expect it to already be there
- VirtualFile top = VFS.getRoot(url);
- while (parentDepth > 0)
- {
- if (top == null)
- throw new IllegalArgumentException("Null parent: " + url + ", there might be no matching VFSContext in VFSCache.");
- top = top.getParent();
- parentDepth--;
- }
-
- log.trace("Top: " + top);
-
- return top;
- }
}
\ No newline at end of file
Modified: projects/jboss-seam-int/branches/vfs3-int/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/LeafVirtualFileFilter.java
===================================================================
--- projects/jboss-seam-int/branches/vfs3-int/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/LeafVirtualFileFilter.java 2010-02-08 21:16:02 UTC (rev 100719)
+++ projects/jboss-seam-int/branches/vfs3-int/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/LeafVirtualFileFilter.java 2010-02-08 21:19:52 UTC (rev 100720)
@@ -21,11 +21,9 @@
*/
package org.jboss.seam.integration.jbossas.vfs;
-import java.io.IOException;
+import org.jboss.vfs.VirtualFileFilter;
+import org.jboss.vfs.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
-import org.jboss.virtual.VirtualFile;
-
/**
* Only accept leaves.
*
@@ -41,13 +39,6 @@
public boolean accepts(VirtualFile file)
{
- try
- {
- return file.isLeaf();
- }
- catch (IOException e)
- {
- return false;
- }
+ return file.isFile();
}
}
Modified: projects/jboss-seam-int/branches/vfs3-int/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/VFSScanner.java
===================================================================
--- projects/jboss-seam-int/branches/vfs3-int/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/VFSScanner.java 2010-02-08 21:16:02 UTC (rev 100719)
+++ projects/jboss-seam-int/branches/vfs3-int/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/VFSScanner.java 2010-02-08 21:19:52 UTC (rev 100720)
@@ -4,6 +4,7 @@
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Method;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.Enumeration;
import java.util.List;
@@ -12,9 +13,8 @@
import org.jboss.seam.deployment.DeploymentStrategy;
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.spi.registry.VFSRegistry;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
/**
* JBoss VFS aware scanner.
@@ -59,59 +59,19 @@
{
log.trace("Root url: " + url);
- // try cache first, it should also have proper depth
- VFSRegistry registry = VFSRegistry.getInstance();
- VirtualFile vf = registry.getFile(url);
- int depth = parentDepth;
- while (vf != null && depth > 0)
- {
- vf = vf.getParent();
- depth--;
+ VirtualFile top;
+ try {
+ top = VFS.getChild(url);
}
- if (vf != null)
- return vf;
-
- String urlString = url.toExternalForm();
- int p = urlString.indexOf(":");
- String file = urlString.substring(p + 1);
- URL vfsurl = null;
- String relative;
- File fp = new File(file);
-
- log.trace("File: " + fp);
-
- if (fp.exists())
- {
- vfsurl = fp.getParentFile().toURL();
- relative = fp.getName();
+ catch (URISyntaxException e) {
+ IOException ioe = new IOException();
+ ioe.initCause(e);
+ throw ioe;
}
- else
- {
- File curr = fp;
- relative = fp.getName();
- while ((curr = curr.getParentFile()) != null)
- {
- if (curr.exists())
- {
- vfsurl = curr.toURL();
- break;
- }
- else
- {
- relative = curr.getName() + "/" + relative;
- }
- }
- }
-
- log.trace("URL: " + vfsurl + ", relative: " + relative);
-
- // no sense in checking cache, we already did that
- VirtualFile top = VFS.createNewRoot(vfsurl);
- top = top.getChild(relative);
while (parentDepth > 0)
{
if (top == null)
- throw new IllegalArgumentException("Null parent: " + vfsurl + ", relative: " + relative);
+ throw new IllegalArgumentException("Null parent: " + url + "Must have reached root VirtualFile");
top = top.getParent();
parentDepth--;
}
@@ -189,10 +149,10 @@
{
URL url = urlEnum.nextElement();
VirtualFile root = getRoot(url, resourceName.lastIndexOf('/') > 0 ? 2 : 1);
- if (root != null)
+ if (root.exists())
handleRoot(root);
else
- log.trace("Null root: " + url);
+ log.trace("Root does not exist: " + url);
}
}
catch (IOException ioe)
@@ -213,7 +173,7 @@
// one wrapper delegate per invocation
VirtualFileModifiableResource delegate = new VirtualFileModifiableResource();
- if (root.isLeaf())
+ if (root.isFile())
{
delegate.setFile(root);
touchTimestamp(delegate);
@@ -221,31 +181,13 @@
}
else
{
- boolean isArchive = root.isArchive();
- String rootPathName = root.getPathName();
- int rootPathNameLength = rootPathName.length();
List<VirtualFile> children = root.getChildrenRecursively(LeafVirtualFileFilter.INSTANCE);
for (VirtualFile child : children)
{
- String name = child.getPathName();
- // move past '/'
- int length = rootPathNameLength;
- if (name.charAt(length) == '/')
- length++;
-
- String path = name.substring(length);
-
- if (isArchive)
- {
- // don't timestamp check zip entries, just handle them
- handleItemIgnoreErrors(path);
- }
- else
- {
- // check if we need to touch
- delegate.setFile(child);
- handleItem(delegate, path);
- }
+ String path = child.getPathNameRelativeTo(root);
+ // check if we need to touch
+ delegate.setFile(child);
+ handleItem(delegate, path);
}
}
}
Modified: projects/jboss-seam-int/branches/vfs3-int/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/VirtualFileModifiableResource.java
===================================================================
--- projects/jboss-seam-int/branches/vfs3-int/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/VirtualFileModifiableResource.java 2010-02-08 21:16:02 UTC (rev 100719)
+++ projects/jboss-seam-int/branches/vfs3-int/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/VirtualFileModifiableResource.java 2010-02-08 21:19:52 UTC (rev 100720)
@@ -23,7 +23,7 @@
import java.io.IOException;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* VirtualFile delegate to ModifieableResource.
Modified: projects/jboss-seam-int/branches/vfs3-int/microcontainer/pom.xml
===================================================================
--- projects/jboss-seam-int/branches/vfs3-int/microcontainer/pom.xml 2010-02-08 21:16:02 UTC (rev 100719)
+++ projects/jboss-seam-int/branches/vfs3-int/microcontainer/pom.xml 2010-02-08 21:19:52 UTC (rev 100720)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.seam.integration</groupId>
<artifactId>jboss-seam-int</artifactId>
- <version>5.2.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-seam-int-microcontainer</artifactId>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
+ <artifactId>jboss-metadata-war</artifactId>
</dependency>
<dependency>
Modified: projects/jboss-seam-int/branches/vfs3-int/pom.xml
===================================================================
--- projects/jboss-seam-int/branches/vfs3-int/pom.xml 2010-02-08 21:16:02 UTC (rev 100719)
+++ projects/jboss-seam-int/branches/vfs3-int/pom.xml 2010-02-08 21:19:52 UTC (rev 100720)
@@ -7,7 +7,7 @@
</parent>
<groupId>org.jboss.seam.integration</groupId>
<artifactId>jboss-seam-int</artifactId>
- <version>5.2.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JBoss Seam Int Aggregator</name>
<url>http://www.jboss.org/jbossmc/</url>
@@ -28,15 +28,15 @@
<properties>
<version.jboss.seam>2.1.1.GA</version.jboss.seam>
- <version.jboss.vfs>2.1.1.GA</version.jboss.vfs>
+ <version.jboss.vfs>3.0.0.CR1-SNAPSHOT</version.jboss.vfs>
<version.jboss.man>2.1.0.CR8</version.jboss.man>
<version.jboss.microcontainer>2.0.5.GA</version.jboss.microcontainer>
- <version.jboss.cl>2.0.5.GA</version.jboss.cl>
- <version.jboss.deployers>2.0.6.GA</version.jboss.deployers>
- <version.jboss.common.core>2.2.13.GA</version.jboss.common.core>
- <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
+ <version.jboss.cl>2.2.0-SNAPSHOT</version.jboss.cl>
+ <version.jboss.deployers>2.2.0-SNAPSHOT</version.jboss.deployers>
+ <version.jboss.common.core>2.2.17.GA</version.jboss.common.core>
+ <version.jboss.logging.spi>2.2.0.CR1</version.jboss.logging.spi>
<version.jboss.classloading.spi>5.0.3.GA</version.jboss.classloading.spi>
- <version.jboss.metadata>1.0.0.CR18</version.jboss.metadata>
+ <version.jboss.metadata>2.0.0-SNAPSHOT</version.jboss.metadata>
<version.jbossxb>2.0.1.GA</version.jbossxb>
<version.servlet.api>2.5</version.servlet.api>
<version.org.jboss.test>1.1.1.GA</version.org.jboss.test>
@@ -309,7 +309,7 @@
<dependency>
<groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
+ <artifactId>jboss-metadata-war</artifactId>
<version>${version.jboss.metadata}</version>
</dependency>
More information about the jboss-cvs-commits
mailing list