[jbosstools-commits] JBoss Tools SVN: r42960 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core.

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2012-08-09 19:24:29 -0400 (Thu, 09 Aug 2012)
New Revision: 42960

Modified:
   trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamResourceVisitor.java
Log:
JBIDE-12410
https://issues.jboss.org/browse/JBIDE-12410
Seam build should support multiple web content folders

Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamResourceVisitor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamResourceVisitor.java	2012-08-09 17:36:14 UTC (rev 42959)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamResourceVisitor.java	2012-08-09 23:24:29 UTC (rev 42960)
@@ -13,6 +13,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
@@ -23,13 +24,13 @@
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
 import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.IJavaProject;
 import org.jboss.tools.common.model.XModel;
-import org.jboss.tools.common.model.XModelObject;
-import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
 import org.jboss.tools.common.model.plugin.ModelPlugin;
 import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.jst.web.WebUtils;
 import org.jboss.tools.jst.web.model.helpers.InnerModelHelper;
 import org.jboss.tools.seam.core.SeamCorePlugin;
 import org.jboss.tools.seam.internal.core.scanner.IFileScanner;
@@ -52,7 +53,7 @@
 	
 	IPath[] outs = new IPath[0];
 	IPath[] srcs = new IPath[0];
-	IPath webinf = null;
+	IPath[] webinfs = new IPath[0];
 	
 	public SeamResourceVisitor(SeamProject p) {
 		this.p = p;
@@ -61,14 +62,16 @@
 			getJavaSourceRoots(p.getProject());
 
 			XModel model = InnerModelHelper.createXModel(p.getProject());
-			if(model != null) {
-				XModelObject wio = FileSystemsHelper.getWebInf(model);
-				if(wio != null) {
-					IResource wir = (IResource)wio.getAdapter(IResource.class);
-					if(wir != null) {
-						webinf = wir.getFullPath();
+			IContainer[] cs = WebUtils.getWebRootFolders(p.getProject());
+			List<IPath> ws = new ArrayList<IPath>();
+			if(model != null && cs.length > 0) {
+				for (IContainer c: cs) {
+					IFolder f = c.getFolder(new Path("WEB-INF"));
+					if(f.exists()) {
+						ws.add(f.getFullPath());
 					}
 				}
+				webinfs = ws.toArray(new IPath[0]);
 			}
 		}
 	}
@@ -199,7 +202,7 @@
 				return true;
 			}
 		}
-		if(webinf != null) {
+		for (IPath webinf: webinfs) {
 			if(webinf.isPrefixOf(path) || path.isPrefixOf(webinf)) {
 				return true;
 			}