[jboss-cvs] JBossAS SVN: r99068 - branches/vfs3-int/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment.

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

Author: johnbailey
Date: 2010-01-06 11:31:59 -0500 (Wed, 06 Jan 2010)
New Revision: 99068

Modified:
   branches/vfs3-int/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java
   branches/vfs3-int/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSVirtualFileFilter.java
Log:
[JBAS-7356] - Initial VFS3 integration

Modified: branches/vfs3-int/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java
===================================================================
--- branches/vfs3-int/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java	2010-01-06 16:03:06 UTC (rev 99067)
+++ branches/vfs3-int/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java	2010-01-06 16:31:59 UTC (rev 99068)
@@ -121,14 +121,7 @@
          for (VirtualFile vf : virtualFiles)
          {
             // Adding the roots of the virtual files.
-            try
-            {
-               uVirtualFiles.add(new VirtualFileAdaptor(vf.getVFS().getRoot()));
-            }
-            catch (IOException ioe)
-            {
-               throw new WSFDeploymentException(ioe);
-            }
+            uVirtualFiles.add(new VirtualFileAdaptor(vf)); // TODO: Figure out why this was using the VFS2 VFS root instead of the meta-data file itself.  
          }
          dep.setMetadataFiles(new LinkedList<UnifiedVirtualFile>(uVirtualFiles));
       }

Modified: branches/vfs3-int/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSVirtualFileFilter.java
===================================================================
--- branches/vfs3-int/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSVirtualFileFilter.java	2010-01-06 16:03:06 UTC (rev 99067)
+++ branches/vfs3-int/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSVirtualFileFilter.java	2010-01-06 16:31:59 UTC (rev 99068)
@@ -1,8 +1,8 @@
 package org.jboss.webservices.integration.deployers.deployment;
 
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilterWithAttributes;
-import org.jboss.virtual.VisitorAttributes;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileFilterWithAttributes;
+import org.jboss.vfs.VisitorAttributes;
 
 /**
  * WS file filter for files with the '.wsdl', or '.xsd' or '.xml' suffix.