Author: rob.stryker(a)jboss.com Date: 2008-07-19 17:17:37 -0400 (Sat, 19 Jul 2008) New Revision: 9179 Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ear/ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ear/.project trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ear/.settings/ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ear/.settings/org.eclipse.wst.common.component trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ear/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ear/EarContent/ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ear/EarContent/META-INF/ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ear/EarContent/META-INF/application.xml trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/.classpath trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/.project trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/.settings/ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/.settings/org.eclipse.jdt.core.prefs trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/.settings/org.eclipse.jst.common.project.facet.core.prefs trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/.settings/org.eclipse.wst.common.component trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/build/ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/build/classes/ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/build/classes/META-INF/ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/build/classes/META-INF/MANIFEST.MF trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/build/classes/META-INF/ejb-jar.xml trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/build/classes/my/ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/build/classes/my/bean/ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/build/classes/my/bean/Tiger.class trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/build/classes/my/bean/TigerBean.class trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/ejbModule/ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/ejbModule/META-INF/ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/ejbModule/META-INF/MANIFEST.MF trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/ejbModule/META-INF/ejb-jar.xml trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/ejbModule/my/ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/ejbModule/my/bean/ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/ejbModule/my/bean/Tiger.java trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/ejbModule/my/bean/TigerBean.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/JBIDE2512bTest.java Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/AbstractDeploymentTest.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/JBIDE1104Test.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/JBIDE2512aTest.java Log: Committing new test which proves WTP failures Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF 2008-07-19 01:45:52 UTC (rev 9178) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF 2008-07-19 21:17:37 UTC (rev 9179) @@ -16,6 +16,8 @@ org.eclipse.wst.common.project.facet.core, org.eclipse.wst.common.project.facet.ui, org.eclipse.debug.core, - org.eclipse.jdt.launching + org.eclipse.jdt.launching, + org.eclipse.jst.jee;bundle-version="1.0.100", + org.eclipse.jst.server.core;bundle-version="1.1.0" Eclipse-LazyStart: true Bundle-ClassPath: jbossastest.jar Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ear/.project =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ear/.project (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ear/.project 2008-07-19 21:17:37 UTC (rev 9179) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>JBIDE2512b-ear</name> + <comment></comment> + <projects> + <project>Seam99-ejb</project> + <project>2512b-ejb</project> + <project>JBIDE2512b-ejb</project> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + </natures> +</projectDescription> Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ear/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ear/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ear/.settings/org.eclipse.wst.common.component 2008-07-19 21:17:37 UTC (rev 9179) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="JBIDE2512b-ear"> + <wb-resource deploy-path="/" source-path="/EarContent"/> + <dependent-module deploy-path="/lib/" handle="module:/resource/JBIDE2512b-ejb/JBIDE2512b-ejb"> + <dependent-object/> + <dependency-type>uses</dependency-type> + </dependent-module> + </wb-module> +</project-modules> Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ear/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ear/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ear/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-07-19 21:17:37 UTC (rev 9179) @@ -0,0 +1,6 @@ +<?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/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ear/EarContent/META-INF/application.xml =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ear/EarContent/META-INF/application.xml (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ear/EarContent/META-INF/application.xml 2008-07-19 21:17:37 UTC (rev 9179) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:application="http://java.sun.com/xml/ns/javaee/application_5.x... xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd" version="5"> + <display-name>JBIDE2512b-ear</display-name> + <module> + <ejb>lib/Seam99-ejb.jar</ejb> + </module> + <module> + <ejb>JBIDE2512b-ejb.jar</ejb> + </module> +</application> \ No newline at end of file Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/.classpath =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/.classpath (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/.classpath 2008-07-19 21:17:37 UTC (rev 9179) @@ -0,0 +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.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="output" path="build/classes"/> +</classpath> Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/.project =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/.project (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/.project 2008-07-19 21:17:37 UTC (rev 9179) @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>JBIDE2512b-ejb</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>full,incremental,</triggers> + <arguments> + <dictionary> + <key>LaunchConfigHandle</key> + <value>&lt;project&gt;/.externalToolBuilders/org.jboss.tools.seam.core.seambuilder.launch</value> + </dictionary> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>full,incremental,</triggers> + <arguments> + <dictionary> + <key>LaunchConfigHandle</key> + <value>&lt;project&gt;/.externalToolBuilders/org.hibernate.eclipse.console.hibernateBuilder.launch</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.jboss.tools.seam.core.seamnature</nature> + <nature>org.hibernate.eclipse.console.hibernateNature</nature> + </natures> +</projectDescription> Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/.settings/org.eclipse.jdt.core.prefs 2008-07-19 21:17:37 UTC (rev 9179) @@ -0,0 +1,7 @@ +#Thu Jul 19 17:20:50 PDT 2007 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/.settings/org.eclipse.jst.common.project.facet.core.prefs =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/.settings/org.eclipse.jst.common.project.facet.core.prefs (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/.settings/org.eclipse.jst.common.project.facet.core.prefs 2008-07-19 21:17:37 UTC (rev 9179) @@ -0,0 +1,3 @@ +#Thu Jul 17 15:17:36 EDT 2008 +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 Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/.settings/org.eclipse.wst.common.component 2008-07-19 21:17:37 UTC (rev 9179) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> +<wb-module deploy-name="JBIDE2512b-ejb"> +<wb-resource deploy-path="/" source-path="/ejbModule"/> +<property name="java-output-path" value="build/classes"/> +</wb-module> +</project-modules> Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-07-19 21:17:37 UTC (rev 9179) @@ -0,0 +1,8 @@ +<?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> Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/build/classes/META-INF/MANIFEST.MF =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/build/classes/META-INF/MANIFEST.MF (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/build/classes/META-INF/MANIFEST.MF 2008-07-19 21:17:37 UTC (rev 9179) @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 + Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/build/classes/META-INF/ejb-jar.xml =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/build/classes/META-INF/ejb-jar.xml (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/build/classes/META-INF/ejb-jar.xml 2008-07-19 21:17:37 UTC (rev 9179) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ejb-jar xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:ejb="http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd" version="3.0"> + <interceptors> + <interceptor> + <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class> + </interceptor> + </interceptors> + <assembly-descriptor> + <interceptor-binding> + <ejb-name>*</ejb-name> + <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class> + </interceptor-binding> + </assembly-descriptor> +</ejb-jar> \ No newline at end of file Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/build/classes/my/bean/Tiger.class =================================================================== (Binary files differ) Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/build/classes/my/bean/Tiger.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/build/classes/my/bean/TigerBean.class =================================================================== (Binary files differ) Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/build/classes/my/bean/TigerBean.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/ejbModule/META-INF/MANIFEST.MF =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/ejbModule/META-INF/MANIFEST.MF (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/ejbModule/META-INF/MANIFEST.MF 2008-07-19 21:17:37 UTC (rev 9179) @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 + Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/ejbModule/META-INF/ejb-jar.xml =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/ejbModule/META-INF/ejb-jar.xml (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/ejbModule/META-INF/ejb-jar.xml 2008-07-19 21:17:37 UTC (rev 9179) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ejb-jar xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:ejb="http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd" version="3.0"> + <interceptors> + <interceptor> + <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class> + </interceptor> + </interceptors> + <assembly-descriptor> + <interceptor-binding> + <ejb-name>*</ejb-name> + <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class> + </interceptor-binding> + </assembly-descriptor> +</ejb-jar> \ No newline at end of file Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/ejbModule/my/bean/Tiger.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/ejbModule/my/bean/Tiger.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/ejbModule/my/bean/Tiger.java 2008-07-19 21:17:37 UTC (rev 9179) @@ -0,0 +1,8 @@ +package my.bean; + +import javax.ejb.Remote; + +@Remote +public interface Tiger { + +} Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/ejbModule/my/bean/TigerBean.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/ejbModule/my/bean/TigerBean.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/projects/JBIDE2512b-ejb/ejbModule/my/bean/TigerBean.java 2008-07-19 21:17:37 UTC (rev 9179) @@ -0,0 +1,8 @@ +package my.bean; + +import javax.ejb.Stateless; +import my.bean.Tiger; + +public @Stateless class TigerBean implements Tiger { + +} Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java 2008-07-19 01:45:52 UTC (rev 9178) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java 2008-07-19 21:17:37 UTC (rev 9179) @@ -29,6 +29,7 @@ import org.jboss.ide.eclipse.as.test.classpath.ProjectRuntimeTest; import org.jboss.ide.eclipse.as.test.classpath.RuntimeServerModelTest; import org.jboss.ide.eclipse.as.test.publishing.JBIDE2512aTest; +import org.jboss.ide.eclipse.as.test.publishing.JBIDE2512bTest; public class ASTestSuite extends TestSuite { public static Test suite() { @@ -39,6 +40,7 @@ suite.addTestSuite(ProjectRuntimeTest.class); suite.addTestSuite(JBIDE1657Test.class); suite.addTestSuite(JBIDE2512aTest.class); + suite.addTestSuite(JBIDE2512bTest.class); return suite; } Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/AbstractDeploymentTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/AbstractDeploymentTest.java 2008-07-19 01:45:52 UTC (rev 9178) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/AbstractDeploymentTest.java 2008-07-19 21:17:37 UTC (rev 9179) @@ -34,32 +34,39 @@ public abstract class AbstractDeploymentTest extends TestCase { protected String BUNDLE_NAME = "org.jboss.ide.eclipse.as.test"; - private TestProjectProvider provider; - protected IProject workspaceProject; - protected String sourceProjectName; - protected String testProperties; + private TestProjectProvider[] provider; + protected IProject[] workspaceProject; + protected String[] sourceProjectName; + protected String[] testProperties; protected IRuntime runtime; protected IServer server; protected String deployLocation; - public AbstractDeploymentTest(String projectName, String testProperties) { + public AbstractDeploymentTest(String[] projectNames, String[] testProperties) { try { - this.sourceProjectName = projectName; + this.sourceProjectName = projectNames; this.testProperties = testProperties; this.deployLocation = getFileLocation("/testOutputs").getAbsolutePath(); + this.provider = new TestProjectProvider[sourceProjectName.length]; + this.workspaceProject = new IProject[sourceProjectName.length]; } catch( CoreException ce ) { fail("Could not access deploy location"); } } + public AbstractDeploymentTest(String projectName, String testProperties) { + this(new String[]{projectName}, new String[] {testProperties}); + } protected void setUp() throws Exception { - cleanFolder(getProjectLocation("TempProject").getAbsolutePath()); - assembleInTempProject(); createServer(); - String path = "/projects/TempProject/" + sourceProjectName; - provider = new TestProjectProvider(BUNDLE_NAME, path, sourceProjectName, true); - workspaceProject = provider.getProject(); - workspaceProject.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + for( int i = 0; i < sourceProjectName.length; i++ ) { + cleanFolder(getProjectLocation("TempProject").getAbsolutePath()); + assembleInTempProject(i); + String path = "/projects/TempProject/" + sourceProjectName[i]; + provider[i] = new TestProjectProvider(BUNDLE_NAME, path, sourceProjectName[i], true); + workspaceProject[i] = provider[i].getProject(); + workspaceProject[i].refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + } } protected void cleanFolder(String folder) throws CoreException { @@ -97,30 +104,33 @@ * jars or archives all over the place and to keep the size * of the test plugin small */ - protected void assembleInTempProject() throws CoreException { + protected void assembleInTempProject(int index) throws CoreException { + String sourceProjectName = this.sourceProjectName[index]; File tempProject = getProjectLocation("TempProject"); File srcProject = getProjectLocation(sourceProjectName); File destProject = new File(tempProject, sourceProjectName); FileUtil.fileSafeCopy(srcProject, destProject); // now copy files over from the properties file - File propertiesFile = getFileLocation("projectPieces/" + testProperties); - Properties props = new Properties(); - try { - props.load(new FileInputStream(propertiesFile)); - boolean done = false; - String srcKey, destKey; - int i = 1; - while( !done ) { - srcKey = "copy" + i + "src"; - destKey = "copy" + i + "dest"; - done = copy(props.getProperty(srcKey), props.getProperty(destKey)); - i++; + if( testProperties[index] != null ) { + File propertiesFile = getFileLocation("projectPieces/" + testProperties[index]); + Properties props = new Properties(); + try { + props.load(new FileInputStream(propertiesFile)); + boolean done = false; + String srcKey, destKey; + int i = 1; + while( !done ) { + srcKey = "copy" + i + "src"; + destKey = "copy" + i + "dest"; + done = copy(props.getProperty(srcKey), props.getProperty(destKey)); + i++; + } + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); } - } catch (FileNotFoundException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); } } @@ -159,11 +169,12 @@ } protected void tearDown() throws Exception { - provider.dispose(); + for( int i = 0; i < sourceProjectName.length; i++ ) + provider[i].dispose(); + cleanFolder(getProjectLocation("TempProject").getAbsolutePath()); cleanFolder(getFileLocation("testOutputs")); runtime.delete(); server.delete(); - } - + } } Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/JBIDE1104Test.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/JBIDE1104Test.java 2008-07-19 01:45:52 UTC (rev 9178) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/JBIDE1104Test.java 2008-07-19 21:17:37 UTC (rev 9179) @@ -14,7 +14,7 @@ } public void testJBIDE1104() throws Exception { - IModuleArtifact[] artifacts = ServerPlugin.getModuleArtifacts(workspaceProject); + IModuleArtifact[] artifacts = ServerPlugin.getModuleArtifacts(workspaceProject[0]); assertNotNull(artifacts); assertEquals(1, artifacts.length); assertNotNull(artifacts[0]); Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/JBIDE2512aTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/JBIDE2512aTest.java 2008-07-19 01:45:52 UTC (rev 9178) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/JBIDE2512aTest.java 2008-07-19 21:17:37 UTC (rev 9179) @@ -15,7 +15,7 @@ } public void testJBIDE2512a() throws Exception { - IModuleArtifact[] artifacts = ServerPlugin.getModuleArtifacts(workspaceProject); + IModuleArtifact[] artifacts = ServerPlugin.getModuleArtifacts(workspaceProject[0]); assertNotNull(artifacts); assertEquals(1, artifacts.length); assertNotNull(artifacts[0]); Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/JBIDE2512bTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/JBIDE2512bTest.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/JBIDE2512bTest.java 2008-07-19 21:17:37 UTC (rev 9179) @@ -0,0 +1,39 @@ +package org.jboss.ide.eclipse.as.test.publishing; + +import org.eclipse.jst.server.core.IEnterpriseApplication; +import org.eclipse.wst.server.core.IModule; +import org.eclipse.wst.server.core.IModuleArtifact; +import org.eclipse.wst.server.core.IModuleType; +import org.eclipse.wst.server.core.internal.ServerPlugin; + +// associated with eclipse bug id 241466 +public class JBIDE2512bTest extends AbstractDeploymentTest { + + public JBIDE2512bTest() { + super(new String[] { "JBIDE2512b-ear", "JBIDE2512b-ejb"}, new String[] {null, null}); + } + + public void testJBIDE2512b() throws Exception { + IModuleArtifact[] earArtifacts = ServerPlugin.getModuleArtifacts(workspaceProject[0]); + assertNotNull(earArtifacts); + assertEquals(1, earArtifacts.length); + assertNotNull(earArtifacts[0]); + IModule earModule = earArtifacts[0].getModule(); + + IModuleArtifact[] ejbArtifacts = ServerPlugin.getModuleArtifacts(workspaceProject[1]); + assertNotNull(ejbArtifacts); + assertEquals(1, ejbArtifacts.length); + assertNotNull(ejbArtifacts[0]); + IModule ejbModule = ejbArtifacts[0].getModule(); + + IModuleType moduleType = earModule.getModuleType(); + assertTrue("jst.ear".equals(moduleType.getId())); + IEnterpriseApplication enterpriseApplication = (IEnterpriseApplication) earModule + .loadAdapter(IEnterpriseApplication.class, null); + assertNotNull(enterpriseApplication); + + String uri = enterpriseApplication.getURI(ejbModule); + assertNotNull(uri); + assertFalse("JBIDE2512b-ejb.jar".equals(uri)); + } +}