Revert "The web container has to be added after copying the resources"

This reverts commit 8f3c2f252ed8c01c140f058e30096e208d14ebea.

tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java

diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java
index 8e30bbf..a58d11d 100644
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java
+++ b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java
@@ -275,7 +275,7 @@
 		// Create new project
 		IProject project = BundleResourceUtil.createSimpleProject(testName, Platform.getStateLocation(JSPCoreTestsPlugin.getDefault().getBundle()).append(testName), null);
 		assertTrue(project.exists());
-
+		BundleResourceUtil.addWebContainer(project);
 		/*
 		 * Should be set to false. A referenced class in an included segment
 		 * does not exist.
@@ -284,8 +284,6 @@
 		BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
 		BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/struts.jar", "/" + testName + "/WebContent/WEB-INF/lib/struts.jar");
 
-		BundleResourceUtil.addWebContainer(project);
-
 		waitForBuildAndValidation(project);
 
 		JSPCorePlugin.getDefault().getPluginPreferences().setValue(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, doValidateSegments);
@@ -556,10 +554,9 @@
 		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(testName);
 		if (!project.isAccessible()) {
 			// Create new project
-			project = BundleResourceUtil.createJavaWebProject(testName);
+			project = BundleResourceUtil.createSimpleProject(testName, null, null);
 			assertTrue(project.exists());
 			BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
-			BundleResourceUtil.addWebContainer(project);
 		}
 		waitForBuildAndValidation(project);
 		IFile testFile = project.getFile("/WebContent/test.jsp");
@@ -610,10 +607,9 @@
 		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(testName);
 		if (!project.isAccessible()) {
 			// Create new project
-			project = BundleResourceUtil.createJavaWebProject(testName);
+			project = BundleResourceUtil.createSimpleProject(testName, null, null);
 			assertTrue(project.exists());
 			BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
-			BundleResourceUtil.addWebContainer(project);
 		}
 		waitForBuildAndValidation(project);
 		IFile testFile = project.getFile("/WebContent/test_missing_end_tag.jsp");
@@ -641,10 +637,9 @@
 		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(testName);
 		if (!project.isAccessible()) {
 			// Create new project
-			project = BundleResourceUtil.createJavaWebProject(testName);
+			project = BundleResourceUtil.createSimpleProject(testName, null, null);
 			assertTrue(project.exists());
 			BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
-			BundleResourceUtil.addWebContainer(project);
 		}
 		waitForBuildAndValidation(project);
 		TaglibHelper helper = new TaglibHelper(project);
@@ -671,7 +666,6 @@
 			project = BundleResourceUtil.createJavaWebProject(testName);
 			assertTrue(project.exists());
 			BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
-			BundleResourceUtil.addWebContainer(project);
 		}
 		waitForBuildAndValidation(project);
 		TaglibHelper helper = new TaglibHelper(project);
@@ -696,7 +690,6 @@
 		IProject project = BundleResourceUtil.createJavaWebProject(testFolderName);
 		assertTrue(project.exists());
 		BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testFolderName, "/" + testFolderName);
-		BundleResourceUtil.addWebContainer(project);
 
 		waitForBuildAndValidation(project);
 		
@@ -758,7 +751,7 @@
         IProject project = BundleResourceUtil.createJavaWebProject(testName);
         assertTrue(project.exists());
         BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
-        BundleResourceUtil.addWebContainer(project);
+
         waitForBuildAndValidation(project);
 
         IFile file = project.getFile("/WebContent/test.jsp");