[webbeans-commits] Webbeans SVN: r1570 - in tck/trunk/impl/src: main/java/org/jboss/jsr299/tck/impl/packaging/jsr299 and 4 other directories.

Author: pete.muir(a)jboss.org Date: 2009-02-18 10:08:47 -0500 (Wed, 18 Feb 2009) New Revision: 1570 Added: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest.java Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/EjbArtifact.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest_Broken.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Artifact.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactScanner.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Classes.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/IntegrationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Packaging.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/PackagingType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Resources.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/EventTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/DeclarativeEarTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DeclarativeStandaloneTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyEjbTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/DeclarativeWarTest.java Log: Remove @EjbArtifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Artifact.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Artifact.java 2009-02-18 14:30:32 UTC (rev 1569) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Artifact.java 2009-02-18 15:08:47 UTC (rev 1570) @@ -17,7 +17,6 @@ * standalone mode, the artifact itself won't be deployed, just the contained * classes and /META-INF/beans.xml file). * - * @see EjbArtifact * @see Classes * @see IntegrationTest * @see Packaging Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java 2009-02-18 14:30:32 UTC (rev 1569) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java 2009-02-18 15:08:47 UTC (rev 1570) @@ -1,7 +1,6 @@ package org.jboss.jsr299.tck.impl.packaging; import static org.jboss.jsr299.tck.impl.packaging.PackagingType.EAR; -import static org.jboss.jsr299.tck.impl.packaging.PackagingType.UNSPECIFIED; import static org.jboss.jsr299.tck.impl.packaging.PackagingType.WAR; import java.io.File; @@ -32,7 +31,6 @@ private static final Logger log = Logger.getLogger(ArtifactProcessor.class); private final boolean unit; - private final boolean ejbs; private final boolean addDeclaringPackage; private final String beansXml; private final PackagingType packagingType; @@ -53,13 +51,7 @@ if (declaringClass.isAnnotationPresent(Artifact.class)) { this.addDeclaringPackage = declaringClass.getAnnotation(Artifact.class).addCurrentPackage(); - this.ejbs = false; } - else if (declaringClass.isAnnotationPresent(EjbArtifact.class)) - { - this.addDeclaringPackage = declaringClass.getAnnotation(EjbArtifact.class).addCurrentPackage(); - this.ejbs = true; - } else { throw new IllegalStateException("Unable to find @Artifact on " + declaringClass); @@ -80,7 +72,7 @@ } else { - this.packagingType = UNSPECIFIED; + this.packagingType = WAR; } if (declaringClass.isAnnotationPresent(IntegrationTest.class)) @@ -92,11 +84,6 @@ this.unit = true; } - if (unit && (packagingType.equals(WAR) || packagingType.equals(EAR))) - { - throw new IllegalArgumentException("Cannot specify @Packaging(WAR) or @Packaging(EAR) if @Integration test is not present"); - } - if (declaringClass.isAnnotationPresent(Resources.class)) { this.resources = asResourceDescriptors(declaringClass.getAnnotation(Resources.class).value()); @@ -157,8 +144,7 @@ public TCKArtifactDescriptor createArtifact() { - final TCKArtifactDescriptor artifact = newArtifact(packagingType, declaringClass, beansXml, standalone, ejbs, addDeclaringPackage); - artifact.setEjbs(ejbs); + final TCKArtifactDescriptor artifact = newArtifact(packagingType, declaringClass, beansXml, standalone, addDeclaringPackage); artifact.setUnit(unit); artifact.setExpectedDeploymentException(expectedDeploymentException); artifact.getClasses().addAll(classes); @@ -189,25 +175,17 @@ } } - private static TCKArtifactDescriptor newArtifact(PackagingType packagingType, Class<?> declaringClass, String beansXml, boolean standalone, boolean ejbs, boolean addDeclaringPackage) + private static TCKArtifactDescriptor newArtifact(PackagingType packagingType, Class<?> declaringClass, String beansXml, boolean standalone, boolean addDeclaringPackage) { TCKArtifactDescriptor artifact; - if (packagingType.equals(WAR)) + if (!standalone && packagingType.equals(WAR)) { artifact = new WarArtifactDescriptor(declaringClass, beansXml); } - else if (packagingType.equals(EAR)) + else if (!standalone && packagingType.equals(EAR)) { artifact = new EarArtifactDescriptor(declaringClass, beansXml); } - else if (!standalone && ejbs) - { - artifact = new EarArtifactDescriptor(declaringClass, beansXml); - } - else if (!standalone) - { - artifact = new WarArtifactDescriptor(declaringClass, beansXml); - } else { artifact = new TCKArtifactDescriptor(declaringClass, beansXml); @@ -281,7 +259,7 @@ public TCKArtifactDescriptor createArtifact(Class<?> declaringClass) { - if (declaringClass.isAnnotationPresent(Artifact.class) || declaringClass.isAnnotationPresent(EjbArtifact.class)) + if (declaringClass.isAnnotationPresent(Artifact.class)) { return new ArtifactProcessor(declaringClass, configuration.isStandalone(), configuration.getLibraryDirectory()).createArtifact(); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactScanner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactScanner.java 2009-02-18 14:30:32 UTC (rev 1569) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactScanner.java 2009-02-18 15:08:47 UTC (rev 1570) @@ -122,7 +122,7 @@ private void addClass(String className) { Class<?> clazz = Reflections.loadClass(className); - if (clazz != null && clazz.isAnnotationPresent(Artifact.class) || clazz.isAnnotationPresent(EjbArtifact.class)) + if (clazz != null && clazz.isAnnotationPresent(Artifact.class)) { if (annotationType != null && clazz.isAnnotationPresent(annotationType)) { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Classes.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Classes.java 2009-02-18 14:30:32 UTC (rev 1569) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Classes.java 2009-02-18 15:08:47 UTC (rev 1570) @@ -11,7 +11,6 @@ * Add classes to the deployed artifact * * @see Artifact - * @see EjbArtifact * @see Resources * * @author Pete Muir Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/EjbArtifact.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/EjbArtifact.java 2009-02-18 14:30:32 UTC (rev 1569) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/EjbArtifact.java 2009-02-18 15:08:47 UTC (rev 1570) @@ -1,36 +0,0 @@ -package org.jboss.jsr299.tck.impl.packaging; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Mark this class as requiring an JSR299 artifact to be deployed to the - * container. By default all classes in the current package, as well as support - * classes, will be deployed. The resultant artifact will support session beans. - * - * This test may be a unit test (in which case, if the suite is run in - * standalone mode, the artifact itself won't be deployed, just the contained - * classes and /META-INF/beans.xml file). - * - * @author Pete Muir - * - * @see Artifact - * @see Classes - * @see IntegrationTest - * @see Packaging - * @see Resources - * - */ -@Documented -@Retention(RUNTIME) -@Target(TYPE) -public @interface EjbArtifact -{ - - boolean addCurrentPackage() default true; - -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/IntegrationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/IntegrationTest.java 2009-02-18 14:30:32 UTC (rev 1569) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/IntegrationTest.java 2009-02-18 15:08:47 UTC (rev 1570) @@ -11,7 +11,6 @@ * container. * * @see Artifact - * @see EjbArtifact * @see IntegrationTest * * @author Pete Muir Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Packaging.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Packaging.java 2009-02-18 14:30:32 UTC (rev 1569) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Packaging.java 2009-02-18 15:08:47 UTC (rev 1570) @@ -2,7 +2,7 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import static org.jboss.jsr299.tck.impl.packaging.PackagingType.UNSPECIFIED; +import static org.jboss.jsr299.tck.impl.packaging.PackagingType.WAR; import java.lang.annotation.Documented; import java.lang.annotation.Retention; @@ -14,7 +14,6 @@ * * @see IntegrationTest * @see Artifact - * @see EjbArtifact * * @author Pete Muir * @@ -25,6 +24,6 @@ public @interface Packaging { - PackagingType value() default UNSPECIFIED; + PackagingType value() default WAR; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/PackagingType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/PackagingType.java 2009-02-18 14:30:32 UTC (rev 1569) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/PackagingType.java 2009-02-18 15:08:47 UTC (rev 1570) @@ -3,6 +3,6 @@ public enum PackagingType { - UNSPECIFIED, EAR, WAR + EAR, WAR } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Resources.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Resources.java 2009-02-18 14:30:32 UTC (rev 1569) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Resources.java 2009-02-18 15:08:47 UTC (rev 1570) @@ -12,7 +12,6 @@ * @see Resource * @see Classes * @see Artifact - * @see EjbArtifact * * @author Pete Muir * Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java 2009-02-18 14:30:32 UTC (rev 1569) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java 2009-02-18 15:08:47 UTC (rev 1570) @@ -40,7 +40,6 @@ private static final Logger log = Logger.getLogger(TCKArtifactDescriptor.class); private boolean unit; - private boolean ejbs; private Class<? extends Throwable> expectedDeploymentException; public TCKArtifactDescriptor(Class<?> declaringClass, String beansXmlSourceFileName) @@ -71,16 +70,6 @@ return new ByteArrayInputStream(os.toByteArray()); } - public boolean isEjbs() - { - return ejbs; - } - - public void setEjbs(boolean ejbs) - { - this.ejbs = ejbs; - } - public boolean isUnit() { return unit; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/EventTest.java 2009-02-18 14:30:32 UTC (rev 1569) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/EventTest.java 2009-02-18 15:08:47 UTC (rev 1570) @@ -22,10 +22,12 @@ import javax.event.Observer; import javax.inject.manager.Bean; +import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.EjbArtifact; +import org.jboss.jsr299.tck.impl.packaging.Artifact; import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; import org.testng.annotations.Test; /** @@ -36,8 +38,9 @@ * Spec version: Public Release Draft 2 * */ -@EjbArtifact +@Artifact @IntegrationTest +(a)Packaging(PackagingType.EAR) public class EventTest extends AbstractDeclarativeTest { @Test(groups = { "stub", "events", "integration" }) Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/DeclarativeEarTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/DeclarativeEarTest.java 2009-02-18 14:30:32 UTC (rev 1569) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/DeclarativeEarTest.java 2009-02-18 15:08:47 UTC (rev 1570) @@ -20,7 +20,7 @@ public void beforeClass() { configuration = new MockConfiguration(); - configuration.setStandalone(true); + configuration.setStandalone(false); } @Test Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DeclarativeStandaloneTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DeclarativeStandaloneTest.java 2009-02-18 14:30:32 UTC (rev 1569) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DeclarativeStandaloneTest.java 2009-02-18 15:08:47 UTC (rev 1570) @@ -5,7 +5,9 @@ import org.jboss.jsr299.tck.api.Configuration; import org.jboss.jsr299.tck.impl.packaging.ArtifactGenerator; +import org.jboss.jsr299.tck.impl.packaging.ear.EarArtifactDescriptor; import org.jboss.jsr299.tck.impl.packaging.jsr299.TCKArtifactDescriptor; +import org.jboss.jsr299.tck.impl.packaging.war.WarArtifactDescriptor; import org.jboss.jsr299.tck.test.impl.mock.MockConfiguration; import org.jboss.jsr299.tck.test.impl.packaging.AbstractArtifactTest; import org.testng.annotations.BeforeClass; @@ -14,20 +16,23 @@ public class DeclarativeStandaloneTest extends AbstractArtifactTest { - private Configuration configuration; + private Configuration standaloneConfiguration; + private Configuration nonStandaloneConfiguration; @BeforeClass public void beforeClass() { - configuration = new MockConfiguration(); - configuration.setStandalone(true); + standaloneConfiguration = new MockConfiguration(); + standaloneConfiguration.setStandalone(true); + nonStandaloneConfiguration = new MockConfiguration(); + nonStandaloneConfiguration.setStandalone(false); } @Test public void testDefaultDeclartiveArtifact() throws Exception { - TCKArtifactDescriptor artifact = new ArtifactGenerator(configuration).createArtifact(DummyTest.class); - assert !artifact.isEjbs(); + TCKArtifactDescriptor artifact = new ArtifactGenerator(standaloneConfiguration).createArtifact(DummyTest.class); + assert artifact.getClass().equals(TCKArtifactDescriptor.class); assert artifact.isUnit(); File root = artifact.getExplodedJar(); File currentPackage = getCurrentPackageAsFile(root); @@ -77,7 +82,7 @@ @Test public void testClassesSpecifiedArtifact() throws Exception { - TCKArtifactDescriptor artifact = new ArtifactGenerator(configuration).createArtifact(DummyClassesSpecifiedTest.class); + TCKArtifactDescriptor artifact = new ArtifactGenerator(standaloneConfiguration).createArtifact(DummyClassesSpecifiedTest.class); File root = artifact.getExplodedJar(); File currentPackage = getCurrentPackageAsFile(root); assert currentPackage.listFiles().length == 1; @@ -99,7 +104,7 @@ @Test public void testResourcesSpecifiedArtifact() throws Exception { - TCKArtifactDescriptor artifact = new ArtifactGenerator(configuration).createArtifact(DummyResourcesSpecifiedTest.class); + TCKArtifactDescriptor artifact = new ArtifactGenerator(standaloneConfiguration).createArtifact(DummyResourcesSpecifiedTest.class); File root = artifact.getExplodedJar(); assert root.listFiles(META_INF_FILTER).length == 1; File metaInf = root.listFiles(META_INF_FILTER)[0]; @@ -117,14 +122,14 @@ @Test public void testIntegrationTestDeclartiveArtifact() throws Exception { - TCKArtifactDescriptor artifact = new ArtifactGenerator(configuration).createArtifact(DummyIntegrationTest.class); + TCKArtifactDescriptor artifact = new ArtifactGenerator(standaloneConfiguration).createArtifact(DummyIntegrationTest.class); assert !artifact.isUnit(); } @Test public void testCustomBeansXml() throws Exception { - TCKArtifactDescriptor artifact = new ArtifactGenerator(configuration).createArtifact(DummyCustomBeansXmlTest.class); + TCKArtifactDescriptor artifact = new ArtifactGenerator(standaloneConfiguration).createArtifact(DummyCustomBeansXmlTest.class); File root = artifact.getExplodedJar(); File metaInf = root.listFiles(META_INF_FILTER)[0]; assert metaInf.listFiles(BEANS_XML_FILTER).length == 1; @@ -133,17 +138,25 @@ assert beans.startsWith("<my></my>"); } - //@Test + @Test public void testEjbTestDeclartiveArtifact() throws Exception { - TCKArtifactDescriptor artifact = new ArtifactGenerator(configuration).createArtifact(DummyEjbTest.class); - assert artifact.isEjbs(); + TCKArtifactDescriptor artifact = new ArtifactGenerator(nonStandaloneConfiguration).createArtifact(DummyEjbTest.class); + assert artifact.getClass().equals(EarArtifactDescriptor.class); } - @Test(expectedExceptions=IllegalArgumentException.class) - public void testWrongPackaging() + @Test + public void testStandaloneEjbTestDeclartiveArtifact() throws Exception { - TCKArtifactDescriptor artifact = new ArtifactGenerator(configuration).createArtifact(DummyWarUnitTest_Broken.class); + TCKArtifactDescriptor artifact = new ArtifactGenerator(standaloneConfiguration).createArtifact(DummyEjbTest.class); + assert artifact.getClass().equals(TCKArtifactDescriptor.class); } + @Test + public void testWarDeclarativePackaging() + { + TCKArtifactDescriptor artifact = new ArtifactGenerator(nonStandaloneConfiguration).createArtifact(DummyWarUnitTest.class); + assert artifact.getClass().equals(WarArtifactDescriptor.class); + } + } Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyEjbTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyEjbTest.java 2009-02-18 14:30:32 UTC (rev 1569) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyEjbTest.java 2009-02-18 15:08:47 UTC (rev 1570) @@ -1,9 +1,11 @@ package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone; -import org.jboss.jsr299.tck.impl.packaging.EjbArtifact; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; -@EjbArtifact +@Artifact @Packaging(PackagingType.EAR) class DummyEjbTest { Copied: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest.java (from rev 1567, tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest_Broken.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest.java 2009-02-18 15:08:47 UTC (rev 1570) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone; + +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; + + +@Artifact +(a)Packaging(PackagingType.WAR) +class DummyWarUnitTest +{ + + public void test() + { + assert true; + } + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest_Broken.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest_Broken.java 2009-02-18 14:30:32 UTC (rev 1569) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest_Broken.java 2009-02-18 15:08:47 UTC (rev 1570) @@ -1,18 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone; - -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; - - -@Artifact -(a)Packaging(PackagingType.WAR) -class DummyWarUnitTest_Broken -{ - - public void test() - { - assert true; - } - -} Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/DeclarativeWarTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/DeclarativeWarTest.java 2009-02-18 14:30:32 UTC (rev 1569) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/DeclarativeWarTest.java 2009-02-18 15:08:47 UTC (rev 1570) @@ -19,7 +19,7 @@ public void beforeClass() { configuration = new MockConfiguration(); - configuration.setStandalone(true); + configuration.setStandalone(false); } @Test