Author: dgolovin Date: 2008-11-06 00:48:59 -0500 (Thu, 06 Nov 2008) New Revision: 11557 Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/META-INF/MANIFEST.MF trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.settings/org.eclipse.jst.common.project.facet.core.prefs Removed: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/lib/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject1/ Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.classpath trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.classpath trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.classpath trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.settings/org.eclipse.jst.common.project.facet.core.prefs trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java Log: SeamEARTest errors fix Unused test project was removed Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2008-11-06 05:41:20 UTC (rev 11556) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2008-11-06 05:48:59 UTC (rev 11557) @@ -34,5 +34,6 @@ org.eclipse.jface, org.eclipse.jdt.core.manipulation, org.eclipse.jst.jsf.core, - org.eclipse.wst.validation + org.eclipse.wst.validation, + org.eclipse.jdt.launching Provide-Package: org.jboss.tools.seam.core.test Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.classpath =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.classpath 2008-11-06 05:41:20 UTC (rev 11556) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.classpath 2008-11-06 05:48:59 UTC (rev 11557) @@ -2,7 +2,7 @@ <classpath> <classpathentry kind="src" output="WebContent/WEB-INF/dev" path="src/action"/> <classpathentry kind="src" path="src/model"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-1.5.0-sun-1.5.0.15"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.preview.runtimeTarget/J2EE Preview"/> <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs 2008-11-06 05:41:20 UTC (rev 11556) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs 2008-11-06 05:48:59 UTC (rev 11557) @@ -1,4 +1,4 @@ #Wed Nov 05 07:46:18 PST 2008 -classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:java-1.5.0-sun-1.5.0.15/owners=jst.java\:5.0 +classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.launching.JRE_CONTAINER/owners=jst.java\:5.0 classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.preview.runtimeTarget\:\:J2EE\ Preview/owners=jst.web\:2.5 eclipse.preferences.version=1 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-11-06 05:41:20 UTC (rev 11556) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-11-06 05:48:59 UTC (rev 11557) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <faceted-project> - <runtime name="J2EE Preview"/> <fixed facet="jst.web"/> <fixed facet="jst.java"/> <installed facet="jst.java" version="5.0"/> Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.classpath =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.classpath 2008-11-06 05:41:20 UTC (rev 11556) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.classpath 2008-11-06 05:48:59 UTC (rev 11557) @@ -1,8 +1,9 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> - <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> - <classpathentry kind="output" path="build/classes"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> + <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> + <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 4.2 Runtime"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="build/classes"/> +</classpath> Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.settings/org.eclipse.jst.common.project.facet.core.prefs =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.settings/org.eclipse.jst.common.project.facet.core.prefs 2008-11-06 05:41:20 UTC (rev 11556) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.settings/org.eclipse.jst.common.project.facet.core.prefs 2008-11-06 05:48:59 UTC (rev 11557) @@ -1,3 +1,4 @@ -#Tue Aug 28 17:17:16 MSD 2007 -classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER/owners=jst.java\:5.0 -eclipse.preferences.version=1 +#Wed Nov 05 15:08:03 PST 2008 +classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.launching.JRE_CONTAINER/owners=jst.java\:5.0 +classpath.helper/org.eclipse.jst.server.core.container\:\:org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget\:\:JBoss\ 4.2\ Runtime/owners=jst.web\:2.5;jst.jsf\:1.2 +eclipse.preferences.version=1 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-11-06 05:41:20 UTC (rev 11556) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-11-06 05:48:59 UTC (rev 11557) @@ -1,11 +1,12 @@ -<?xml version="1.0" encoding="UTF-8"?> -<faceted-project> - <fixed facet="jst.seam"/> - <fixed facet="jst.java"/> - <fixed facet="jst.web"/> - <fixed facet="jst.jsf"/> - <installed facet="jst.java" version="5.0"/> - <installed facet="jst.web" version="2.5"/> - <installed facet="jst.jsf" version="1.2"/> - <installed facet="jst.seam" version="1.2"/> -</faceted-project> +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <runtime name="JBoss 4.2 Runtime"/> + <fixed facet="jst.seam"/> + <fixed facet="jst.java"/> + <fixed facet="jst.web"/> + <fixed facet="jst.jsf"/> + <installed facet="jst.java" version="5.0"/> + <installed facet="jst.web" version="2.5"/> + <installed facet="jst.jsf" version="1.2"/> + <installed facet="jst.seam" version="1.2"/> +</faceted-project> Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-11-06 05:41:20 UTC (rev 11556) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-11-06 05:48:59 UTC (rev 11557) @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="UTF-8"?> -<faceted-project> - <runtime name=""/> - <fixed facet="jst.ear"/> - <installed facet="jst.ear" version="5.0"/> -</faceted-project> +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <runtime name="JBoss 4.2 Runtime"/> + <fixed facet="jst.ear"/> + <installed facet="jst.ear" version="5.0"/> +</faceted-project> Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/META-INF/MANIFEST.MF 2008-11-06 05:48:59 UTC (rev 11557) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/META-INF/MANIFEST.MF ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.classpath =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.classpath 2008-11-06 05:41:20 UTC (rev 11556) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.classpath 2008-11-06 05:48:59 UTC (rev 11557) @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="ejbModule"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.generic.runtimeTarget/"/> - <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> - <classpathentry kind="output" path="build/classes"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="ejbModule"/> + <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> + <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 4.2 Runtime"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="build/classes"/> +</classpath> Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.settings/org.eclipse.jst.common.project.facet.core.prefs =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.settings/org.eclipse.jst.common.project.facet.core.prefs (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.settings/org.eclipse.jst.common.project.facet.core.prefs 2008-11-06 05:48:59 UTC (rev 11557) @@ -0,0 +1,4 @@ +#Wed Nov 05 15:08:04 PST 2008 +classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.launching.JRE_CONTAINER/owners=jst.java\:5.0 +classpath.helper/org.eclipse.jst.server.core.container\:\:org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget\:\:JBoss\ 4.2\ Runtime/owners=jst.ejb\:3.0 +eclipse.preferences.version=1 Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.settings/org.eclipse.jst.common.project.facet.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-11-06 05:41:20 UTC (rev 11556) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-11-06 05:48:59 UTC (rev 11557) @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?> -<faceted-project> - <runtime name=""/> - <fixed facet="jst.java"/> - <fixed facet="jst.ejb"/> - <installed facet="jst.java" version="5.0"/> - <installed facet="jst.ejb" version="3.0"/> -</faceted-project> +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <runtime name="JBoss 4.2 Runtime"/> + <fixed facet="jst.java"/> + <fixed facet="jst.ejb"/> + <installed facet="jst.java" version="5.0"/> + <installed facet="jst.ejb" version="3.0"/> +</faceted-project> Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java 2008-11-06 05:41:20 UTC (rev 11556) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java 2008-11-06 05:48:59 UTC (rev 11557) @@ -13,10 +13,19 @@ import junit.framework.TestCase; import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.jdt.launching.IVMInstall; +import org.eclipse.jdt.launching.JavaRuntime; +import org.eclipse.wst.server.core.IRuntime; +import org.eclipse.wst.server.core.IRuntimeType; +import org.eclipse.wst.server.core.IRuntimeWorkingCopy; +import org.eclipse.wst.server.core.ServerUtil; +import org.eclipse.wst.server.core.internal.RuntimeWorkingCopy; import org.jboss.tools.common.test.util.TestProjectProvider; import org.jboss.tools.seam.core.ISeamComponent; import org.jboss.tools.seam.core.ISeamProject; @@ -41,15 +50,17 @@ public SeamEARTest() {} protected void setUp() throws Exception { + createRuntime("JBoss 4.2 Runtime"); + JobUtils.waitForIdle(); providerEAR = new TestProjectProvider("org.jboss.tools.seam.core.test", null, "Test1-ear", makeCopy); projectEAR = providerEAR.getProject(); JobUtils.waitForIdle(); + providerEJB = new TestProjectProvider("org.jboss.tools.seam.core.test", null, "Test1-ejb", makeCopy); + projectEJB = providerEJB.getProject(); + JobUtils.waitForIdle(); providerWAR = new TestProjectProvider("org.jboss.tools.seam.core.test", null, "Test1", makeCopy); projectWAR = providerWAR.getProject(); JobUtils.waitForIdle(); - providerEJB = new TestProjectProvider("org.jboss.tools.seam.core.test", null, "Test1-ejb", makeCopy); - projectEJB = providerEJB.getProject(); - JobUtils.waitForIdle(); } private ISeamProject getSeamProject(IProject project) throws CoreException { @@ -83,4 +94,30 @@ providerEJB.dispose(); providerEAR.dispose(); } + + private static IRuntime createRuntime(String runtimeName) throws CoreException { + IRuntimeWorkingCopy runtime = null; + String type = null; + String version = null; + String runtimeId = null; + IPath jbossAsLocationPath = new Path(System.getProperty("jbosstools.test.jboss.home.4.2")); + IRuntimeType[] runtimeTypes = ServerUtil.getRuntimeTypes(null, null, "org.jboss.ide.eclipse.as.runtime.42"); + if (runtimeTypes.length > 0) { + runtime = runtimeTypes[0].createRuntime(null, new NullProgressMonitor()); + runtime.setLocation(jbossAsLocationPath); + if(runtimeName!=null) { + runtime.setName(runtimeName); + } + IVMInstall defaultVM = JavaRuntime.getDefaultVMInstall(); + // IJBossServerRuntime.PROPERTY_VM_ID + ((RuntimeWorkingCopy) runtime).setAttribute("PROPERTY_VM_ID", defaultVM.getId()); + // IJBossServerRuntime.PROPERTY_VM_TYPE_ID + ((RuntimeWorkingCopy) runtime).setAttribute("PROPERTY_VM_TYPE_ID", defaultVM.getVMInstallType().getId()); + // IJBossServerRuntime.PROPERTY_CONFIGURATION_NAME + ((RuntimeWorkingCopy) runtime).setAttribute("org.jboss.ide.eclipse.as.core.runtime.configurationName", "default"); + + return runtime.save(false, new NullProgressMonitor()); + } + return runtime; + } } \ No newline at end of file