[188737] JEE Preference consolidation

tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectClasspathRefactoringTests.java

diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectClasspathRefactoringTests.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectClasspathRefactoringTests.java
index 2a3a706..22173c7 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectClasspathRefactoringTests.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectClasspathRefactoringTests.java
@@ -1,16 +1,16 @@
 package org.eclipse.jst.j2ee.dependency.tests;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jst.j2ee.dependency.tests.util.DependencyUtil;
 import org.eclipse.jst.j2ee.dependency.tests.util.ProjectUtil;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
+import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences;
 
 /**
  * Tests refactoring logic that updates component mappings when source IClasspathEntries are 
@@ -74,7 +74,7 @@
 	
 	public void testWebContentRename() throws Exception {
 		final IProject webProject = ProjectUtil.createWebProject("TestWeb", null);
-		final IPath webContent = new Path(ProductManager.getProperty(IProductConstants.WEB_CONTENT_FOLDER));
+		final IPath webContent = new Path(J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.WEB_CONTENT_FOLDER));
 		final IPath newWebContent = new Path("WebContent2");
 		
 		DependencyUtil.verifyComponentMapping(webProject, webContent, Path.ROOT, true);
@@ -91,7 +91,7 @@
 	
 	public void testEarContentRename() throws Exception {
 		final IProject earProject = ProjectUtil.createEARProject("TestEAR");
-		final IPath earContent = new Path(ProductManager.getProperty(IProductConstants.APPLICATION_CONTENT_FOLDER));
+		final IPath earContent = new Path(J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.APPLICATION_CONTENT_FOLDER));
 		final IPath newEarContent = new Path("EarContent2");
 		
 		DependencyUtil.verifyComponentMapping(earProject, earContent, Path.ROOT, true);

tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/JEE5ModelTest.java

diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/JEE5ModelTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/JEE5ModelTest.java
index f8f3798..ed3f8a4 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/JEE5ModelTest.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/JEE5ModelTest.java
@@ -33,6 +33,8 @@
 import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
 import org.eclipse.jst.j2ee.internal.common.CreationConstants;
 import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
+import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
+import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences;
 import org.eclipse.jst.j2ee.project.facet.IAppClientFacetInstallDataModelProperties;
 import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
 import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
@@ -55,8 +57,6 @@
 import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
 import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
 import org.eclipse.wst.common.tests.SimpleTestSuite;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
 
 public class JEE5ModelTest extends GeneralEMFPopulationTest {
 	
@@ -239,7 +239,7 @@
 	
 	EMFAttributeFeatureGenerator.reset();
 	String modelPathURI = J2EEConstants.APPLICATION_DD_URI;
-	URI uri = URI.createURI(ProductManager.getProperty(IProductConstants.APPLICATION_CONTENT_FOLDER) + "/" + modelPathURI);
+	URI uri = URI.createURI(J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.APPLICATION_CONTENT_FOLDER) + "/" + modelPathURI);
 	ProjectResourceSet resSet = getResourceSet(projName);
 	
 	ApplicationResourceImpl earRes = (ApplicationResourceImpl) resSet.getResource(uri,true);