Bug 581626 - Correct WebImportDataModelVerifier and JEEImportDataModelVerifier to use correct folders Change-Id: I04fb121bbe1d4d841a744b7537cf69018c0ea5ff

diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/JEEImportDataModelVerifier.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/JEEImportDataModelVerifier.java
index 4978ef8..398a56a 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/JEEImportDataModelVerifier.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/JEEImportDataModelVerifier.java

@@ -159,7 +159,7 @@
 	private void verifyAllFilesImported(IArchive archive) throws Exception {
 		List<IArchiveResource> resources = archive.getArchiveResources();
 		IPath resourcePath = null;
-		IFolder importedClassesFolder = project.getFolder("ImportedClasses");
+		IFolder importedClassesFolder = project.getFolder("src/main/ImportedClasses");
 
 		IVirtualComponent projectComponent = ComponentUtilities.getComponent(project.getName());
 		IVirtualFolder rootVirtFolder = projectComponent.getRootFolder();

diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/web/verifiers/WebImportDataModelVerifier.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/web/verifiers/WebImportDataModelVerifier.java
index 297583d..8832c4f 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/web/verifiers/WebImportDataModelVerifier.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/web/verifiers/WebImportDataModelVerifier.java

@@ -9,8 +9,6 @@
 import java.io.FileNotFoundException;
 import java.util.Collection;
 
-import junit.framework.Assert;
-
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
@@ -19,11 +17,17 @@
 import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants;
 import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
 import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
+import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
+import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
 import org.eclipse.jst.jee.archive.IArchive;
 import org.eclipse.jst.jee.archive.IArchiveResource;
+import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
+import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 import org.eclipse.wtp.j2ee.headless.tests.j2ee.verifiers.ModuleImportDataModelVerifier;
 
+import junit.framework.Assert;
+
 /**
  * @author Administrator
  * @author Ian Tewksbury (ictewksb@us.ibm.com)
@@ -52,7 +56,11 @@
 
 		IPath resourcePath = null;
 		IFile resourceFile = null;
-		IFolder sourceFolder = project.getFolder("src");
+
+		FacetDataModelMap dataModelMap = (FacetDataModelMap) model.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
+		IDataModel facetDataModel = dataModelMap.getFacetDataModel(IJ2EEFacetConstants.DYNAMIC_WEB);
+		String configuredSourceFolder = facetDataModel.getStringProperty(IWebFacetInstallDataModelProperties.SOURCE_FOLDER);
+		IFolder sourceFolder = project.getFolder(configuredSourceFolder);
 
 		//verify all of the resources from the archive were imported to the project correctly
 		for(IArchiveResource sourceResource : sourceResources) {