[jboss-cvs] JBossAS SVN: r98862 - in branches/vfs3-int/hibernate-int/src/main/java/org/jboss/hibernate: jmx and 1 other directory.

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

Author: johnbailey
Date: 2009-12-22 14:46:12 -0500 (Tue, 22 Dec 2009)
New Revision: 98862

Modified:
   branches/vfs3-int/hibernate-int/src/main/java/org/jboss/hibernate/deployers/metadata/SessionFactoryMetaData.java
   branches/vfs3-int/hibernate-int/src/main/java/org/jboss/hibernate/jmx/Hibernate.java
   branches/vfs3-int/hibernate-int/src/main/java/org/jboss/hibernate/jmx/HibernateMappingVisitor.java
Log:
[JBAS-7347] - Update VFS reference to VFS3 names/API

Modified: branches/vfs3-int/hibernate-int/src/main/java/org/jboss/hibernate/deployers/metadata/SessionFactoryMetaData.java
===================================================================
--- branches/vfs3-int/hibernate-int/src/main/java/org/jboss/hibernate/deployers/metadata/SessionFactoryMetaData.java	2009-12-22 19:38:56 UTC (rev 98861)
+++ branches/vfs3-int/hibernate-int/src/main/java/org/jboss/hibernate/deployers/metadata/SessionFactoryMetaData.java	2009-12-22 19:46:12 UTC (rev 98862)
@@ -33,7 +33,7 @@
 import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
 import org.jboss.hibernate.jmx.Hibernate;
 import org.jboss.util.id.GUID;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
 
 /**
  * Hibernate session factory metadata.

Modified: branches/vfs3-int/hibernate-int/src/main/java/org/jboss/hibernate/jmx/Hibernate.java
===================================================================
--- branches/vfs3-int/hibernate-int/src/main/java/org/jboss/hibernate/jmx/Hibernate.java	2009-12-22 19:38:56 UTC (rev 98861)
+++ branches/vfs3-int/hibernate-int/src/main/java/org/jboss/hibernate/jmx/Hibernate.java	2009-12-22 19:46:12 UTC (rev 98862)
@@ -23,6 +23,7 @@
 
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Collections;
 import java.util.Date;
@@ -55,8 +56,8 @@
 import org.jboss.kernel.spi.dependency.KernelController;
 import org.jboss.logging.Logger;
 import org.jboss.util.naming.Util;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
 
 /**
  * The {@link HibernateMBean} implementation.
@@ -394,14 +395,14 @@
       }
    }
 
-   private void handleMappings(Configuration cfg) throws IOException
+   private void handleMappings(Configuration cfg) throws IOException, URISyntaxException
    {
       if (root == null)
       {
          if (harUrl == null)
             throw new IllegalArgumentException("Must set one of the resources, root or harUrl: " + this);
 
-         root = VFS.getRoot(harUrl);
+         root = VFS.getChild(harUrl);
       }
 
       log.debug("Scanning for Hibernate mappings, root: " + root);

Modified: branches/vfs3-int/hibernate-int/src/main/java/org/jboss/hibernate/jmx/HibernateMappingVisitor.java
===================================================================
--- branches/vfs3-int/hibernate-int/src/main/java/org/jboss/hibernate/jmx/HibernateMappingVisitor.java	2009-12-22 19:38:56 UTC (rev 98861)
+++ branches/vfs3-int/hibernate-int/src/main/java/org/jboss/hibernate/jmx/HibernateMappingVisitor.java	2009-12-22 19:46:12 UTC (rev 98862)
@@ -25,9 +25,9 @@
 import java.util.Set;
 import java.util.HashSet;
 
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileVisitor;
-import org.jboss.virtual.VisitorAttributes;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileVisitor;
+import org.jboss.vfs.VisitorAttributes;
 
 /**
  * Mapping visitor, matching .hbm.xml files.