[jboss-cvs] JBossAS SVN: r99047 - in branches/vfs3-int/connector/src/main/java/org/jboss/resource/deployers: management and 1 other directory.

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

Author: johnbailey
Date: 2010-01-05 16:20:45 -0500 (Tue, 05 Jan 2010)
New Revision: 99047

Modified:
   branches/vfs3-int/connector/src/main/java/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java
   branches/vfs3-int/connector/src/main/java/org/jboss/resource/deployers/RARParserDeployer.java
   branches/vfs3-int/connector/src/main/java/org/jboss/resource/deployers/management/DsDataSourceTemplate.java
Log:
[JBAS-7344] - Initial VFS3 integration

Modified: branches/vfs3-int/connector/src/main/java/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java
===================================================================
--- branches/vfs3-int/connector/src/main/java/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java	2010-01-05 20:06:18 UTC (rev 99046)
+++ branches/vfs3-int/connector/src/main/java/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java	2010-01-05 21:20:45 UTC (rev 99047)
@@ -46,7 +46,7 @@
 import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentGroup;
 import org.jboss.resource.metadata.repository.JCAMetaDataRepository;
 import org.jboss.util.xml.JBossEntityResolver;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLReaderFactory;

Modified: branches/vfs3-int/connector/src/main/java/org/jboss/resource/deployers/RARParserDeployer.java
===================================================================
--- branches/vfs3-int/connector/src/main/java/org/jboss/resource/deployers/RARParserDeployer.java	2010-01-05 20:06:18 UTC (rev 99046)
+++ branches/vfs3-int/connector/src/main/java/org/jboss/resource/deployers/RARParserDeployer.java	2010-01-05 21:20:45 UTC (rev 99047)
@@ -33,7 +33,7 @@
 import org.jboss.resource.metadata.JBossRAMetaData;
 import org.jboss.resource.metadata.RARDeploymentMetaData;
 import org.jboss.resource.metadata.repository.JCAMetaDataRepository;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
 import org.jboss.xb.binding.ObjectModelFactory;
 
 /**

Modified: branches/vfs3-int/connector/src/main/java/org/jboss/resource/deployers/management/DsDataSourceTemplate.java
===================================================================
--- branches/vfs3-int/connector/src/main/java/org/jboss/resource/deployers/management/DsDataSourceTemplate.java	2010-01-05 20:06:18 UTC (rev 99046)
+++ branches/vfs3-int/connector/src/main/java/org/jboss/resource/deployers/management/DsDataSourceTemplate.java	2010-01-05 21:20:45 UTC (rev 99047)
@@ -45,8 +45,8 @@
 import org.jboss.resource.metadata.mcf.NoTxDataSourceDeploymentMetaData;
 import org.jboss.resource.metadata.mcf.TxConnectionFactoryDeploymentMetaData;
 import org.jboss.resource.metadata.mcf.XADataSourceDeploymentMetaData;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
 
 /**
  * The connection factory template implementation.
@@ -93,7 +93,7 @@
       // Write template
       writeTemplate(dsXml, values);
       // Return virtual file
-      return VFS.getRoot(dsXml.toURI());
+      return VFS.getChild(dsXml.toURI());
    }
 
    public DeploymentTemplateInfo getInfo()