[jboss-cvs] JBossAS SVN: r98860 - in projects/metadata/common/branches/vfs3-int: src/main/java/org/jboss/metadata/serviceref and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Dec 22 13:41:14 EST 2009
Author: johnbailey
Date: 2009-12-22 13:41:14 -0500 (Tue, 22 Dec 2009)
New Revision: 98860
Modified:
projects/metadata/common/branches/vfs3-int/pom.xml
projects/metadata/common/branches/vfs3-int/src/main/java/org/jboss/metadata/serviceref/VirtualFileAdaptor.java
Log:
[JBAS-7367] - Updated to correct VFS3 packages and APIs
Modified: projects/metadata/common/branches/vfs3-int/pom.xml
===================================================================
--- projects/metadata/common/branches/vfs3-int/pom.xml 2009-12-22 18:37:42 UTC (rev 98859)
+++ projects/metadata/common/branches/vfs3-int/pom.xml 2009-12-22 18:41:14 UTC (rev 98860)
@@ -123,7 +123,7 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
- <version>2.0.5.GA</version>
+ <version>2.2.0.CR1</version>
</dependency>
<dependency>
@@ -181,7 +181,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
- <version>2.0.0.CR1</version>
+ <version>3.0.0.CR1-SNAPSHOT</version>
</dependency>
<dependency>
Modified: projects/metadata/common/branches/vfs3-int/src/main/java/org/jboss/metadata/serviceref/VirtualFileAdaptor.java
===================================================================
--- projects/metadata/common/branches/vfs3-int/src/main/java/org/jboss/metadata/serviceref/VirtualFileAdaptor.java 2009-12-22 18:37:42 UTC (rev 98859)
+++ projects/metadata/common/branches/vfs3-int/src/main/java/org/jboss/metadata/serviceref/VirtualFileAdaptor.java 2009-12-22 18:41:14 UTC (rev 98860)
@@ -30,8 +30,8 @@
import java.util.LinkedList;
import java.util.List;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
// $Id: VirtualFileAdaptor.java 4049 2007-08-01 11:26:30Z thomas.diesler at jboss.com $
@@ -87,8 +87,16 @@
{
if (file == null)
{
- VirtualFile root = VFS.getRoot(rootUrl);
- file = root.findChild(path);
+ VirtualFile root;
+ try
+ {
+ root = VFS.getChild(rootUrl);
+ }
+ catch (URISyntaxException e)
+ {
+ throw new IOException("Unable to get Virtualfile from URL: " + rootUrl, e);
+ }
+ file = root.getChild(path);
}
return file;
}
@@ -96,7 +104,7 @@
@SuppressWarnings("deprecation")
public UnifiedVirtualFile findChild(String child) throws IOException
{
- VirtualFile vf = getFile().findChild(child);
+ VirtualFile vf = getFile().getChild(child);
return new VirtualFileAdaptor(vf);
}
@@ -117,12 +125,12 @@
URL url = rootUrl;
if (url == null)
{
- VFS vfs = getFile().getVFS();
- url = vfs.getRoot().toURL();
+ VirtualFile parentFile = getFile().getParent();
+ url = parentFile != null ? parentFile.toURL() : null;
}
String pathName = path;
if (pathName == null)
- pathName = getFile().getPathName();
+ pathName = getFile().getName();
ObjectOutputStream.PutField fields = out.putFields();
fields.put("rootUrl", url);
More information about the jboss-cvs-commits
mailing list