[jboss-cvs] JBossAS SVN: r88621 - branches/Branch_5_x/webservices/src/main/org/jboss/wsf/container/jboss50/deployer.

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

Author: beve
Date: 2009-05-11 06:09:11 -0400 (Mon, 11 May 2009)
New Revision: 88621

Modified:
   branches/Branch_5_x/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHook.java
Log:
Work related to https://jira.jboss.org/jira/browse/JBWS-2619.
We are now adding the virtual file roots of the metadata files extracted from the deployment unit.


Modified: branches/Branch_5_x/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHook.java
===================================================================
--- branches/Branch_5_x/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHook.java	2009-05-11 09:56:17 UTC (rev 88620)
+++ branches/Branch_5_x/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHook.java	2009-05-11 10:09:11 UTC (rev 88621)
@@ -21,8 +21,11 @@
  */
 package org.jboss.wsf.container.jboss50.deployer;
 
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
@@ -91,12 +94,13 @@
          {
             VFSDeploymentUnit vfsUnit = (VFSDeploymentUnit)unit;
             List<VirtualFile> virtualFiles = vfsUnit.getMetaDataFiles(WS_FILEFILTER); //get all wsdl and xsd files
-            List<UnifiedVirtualFile> uVirtualFiles = new LinkedList<UnifiedVirtualFile>();
+            Set<UnifiedVirtualFile> uVirtualFiles = new HashSet<UnifiedVirtualFile>();
             for (VirtualFile vf : virtualFiles)
             {
-               uVirtualFiles.add(new VirtualFileAdaptor(vf));
+               // Adding the roots of the virtual files.
+               uVirtualFiles.add(new VirtualFileAdaptor(vf.getVFS().getRoot()));
             }
-            dep.setMetadataFiles(uVirtualFiles);
+            dep.setMetadataFiles(new LinkedList<UnifiedVirtualFile>(uVirtualFiles));
          }
 
          if (unit.getParent() != null)