Author: dgolovin Date: 2007-11-09 20:15:06 -0500 (Fri, 09 Nov 2007) New Revision: 4832 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java Log: rroll back the changes Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2007-11-10 01:05:19 UTC (rev 4831) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2007-11-10 01:15:06 UTC (rev 4832) @@ -81,9 +81,7 @@ for (IResource r : this.resourcesToCleanup) { try { System.out.println("Deleting " + r); - // TODO - need to figure out how to wait until all build/validation - // are finished - //r.delete(true, null); + r.delete(true, null); } catch(Exception e) { System.out.println("Error deleting " + r); e.printStackTrace(); Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java 2007-11-10 01:05:19 UTC (rev 4831) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java 2007-11-10 01:15:06 UTC (rev 4832) @@ -21,8 +21,6 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceProxy; import org.eclipse.core.resources.IResourceProxyVisitor; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IFacetedProject; @@ -52,29 +50,22 @@ @Override protected void setUp() throws Exception { - IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot(); - IProject war = (IProject)wsRoot.findMember("warprj"); - IProject ear = (IProject)wsRoot.findMember("earprj"); + + seam2Facet = ProjectFacetsManager.getProjectFacet("jst.seam"); + seam2FacetVersion = seam2Facet.getVersion("2.0"); - if(war==null && ear==null) { + File folder = new File(System.getProperty("jbosstools.test.seam.2.0.0.home", "/home/max/work/products/jboss-seam-2.0.0.CR2")); - seam2Facet = ProjectFacetsManager.getProjectFacet("jst.seam"); - seam2FacetVersion = seam2Facet.getVersion("2.0"); - - File folder = new File(System.getProperty("jbosstools.test.seam.2.0.0.home", "c:/java/jboss-seam-2.0.0.CR3")); - - SeamRuntimeManager.getInstance().addRuntime(SEAM_2_0_0, folder.getAbsolutePath(), SeamVersion.SEAM_2_0, true); - SeamRuntimeManager.getInstance().findRuntimeByName(SEAM_2_0_0); + SeamRuntimeManager.getInstance().addRuntime(SEAM_2_0_0, folder.getAbsolutePath(), SeamVersion.SEAM_2_0, true); + SeamRuntimeManager.getInstance().findRuntimeByName(SEAM_2_0_0); + + warProject = createSeamWarProject("warprj"); + earProject = createSeamEarProject("earprj"); - warProject = createSeamWarProject("warprj"); - earProject = createSeamEarProject("earprj"); - - warProject.getProject().getWorkspace().getRoot().refreshLocal(IResource.DEPTH_INFINITE, null); - } else { - warProject = ProjectFacetsManager.create(war); - earProject = ProjectFacetsManager.create(ear); - } + warProject.getProject().getWorkspace().getRoot().refreshLocal(IResource.DEPTH_INFINITE, null); + + super.setUp(); } @@ -96,9 +87,6 @@ warlibs.add("antlr-runtime.jar"); warlibs.add("commons-beanutils.jar"); warlibs.add("commons-digester.jar"); - warlibs.add("commons-collections.jar"); - warlibs.add("janino.jar"); - warlibs.add("antlr.jar"); warlibs.add("drools-compiler.jar"); warlibs.add("drools-core.jar"); warlibs.add("core.jar");