[webbeans-commits] Webbeans SVN: r3098 - in tck/trunk/impl/src/main: resources/org/jboss/jsr299/tck/tests/context/dependent and 48 other directories.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-07-20 20:56:12 -0400 (Mon, 20 Jul 2009)
New Revision: 3098
Removed:
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyDeployElements/default-beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/beans.xml
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/lowerPrecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/dependent/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/event/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/event/observer/registerUsingEvent/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/realization/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendSimpleBean/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementsInterfaceAndExtendsNothing/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/byname/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/session/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/nonContextual/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/nonContextual/servlet/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/beans.xml
Log:
removed deployment types from beans.xml resources
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/lowerPrecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/lowerPrecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/lowerPrecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java 2009-07-21 00:56:12 UTC (rev 3098)
@@ -8,7 +8,7 @@
import org.testng.annotations.Test;
/**
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/dependent/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/dependent/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/dependent/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.context.dependent.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.context.passivating.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,8 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.definition.stereotype.AnotherDeploymentType</type>
- <type>org.jboss.jsr299.tck.tests.definition.stereotype.HornedAnimalDeploymentType</type>
- </deploy>
+
</beans>
Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyDeployElements/default-beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyDeployElements/default-beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyDeployElements/default-beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,6 +0,0 @@
-<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- </deploy>
-</beans>
Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,8 +0,0 @@
-<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesMultipleDeploymentTypes.AnotherDeploymentType</type>
- <type>org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesMultipleDeploymentTypes.HornedAnimalDeploymentType</type>
- </deploy>
-</beans>
\ No newline at end of file
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,10 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.definition.deployment.AnotherDeploymentType</type>
- <type>org.jboss.jsr299.tck.tests.definition.deployment.HornedAnimalDeploymentType</type>
- <type>org.jboss.jsr299.tck.tests.definition.deployment.NotInheritedDeploymentType</type>
- <type>org.jboss.jsr299.tck.tests.definition.deployment.InheritedDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/event/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/event/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/event/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.event.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/event/observer/registerUsingEvent/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/event/observer/registerUsingEvent/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/event/observer/registerUsingEvent/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.event.observer.registerUsingEvent.AnotherEnabledDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.initializerUnallowed.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.multiParams.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.observesUnallowed.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.producesUnallowed.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.unresolvedMethod.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.implementation.enterprise.definition.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.implementation.producer.field.definition.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.implementation.producer.field.definition.enterprise.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,8 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle.AnotherDeploymentType</type>
- <type>org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle.HighestDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,8 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.implementation.producer.method.definition.AnotherDeploymentType</type>
- <type>org.jboss.jsr299.tck.tests.implementation.producer.method.definition.SpiderDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,8 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle.PoultryFarmDeploymentType</type>
- <type>org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.implementation.simple.lifecycle.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,6 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,6 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/realization/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/realization/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/realization/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,8 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.inheritance.realization.AnotherDeploymentType</type>
- <type>org.jboss.jsr299.tck.tests.inheritance.realization.FarmAnimalDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendSimpleBean/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendSimpleBean/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendSimpleBean/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.directlyExtendSimpleBean.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementsInterfaceAndExtendsNothing/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementsInterfaceAndExtendsNothing/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementsInterfaceAndExtendsNothing/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.implementsInterfaceAndExtendsNothing.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.sameName.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.twoBeansSpecializeTheSameBean.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.indirectOverride.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializesStaticMethod.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializingAndSpecializedBeanHaveSameName.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.twoBeansSpecializeTheSameBean.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.inheritance.specialization.simple.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,6 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.names.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,6 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend1.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,6 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend2.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,6 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend3.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,6 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/byname/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/byname/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/byname/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.lookup.byname.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.lookup.injection.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/session/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/session/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/session/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,6 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/nonContextual/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/nonContextual/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/nonContextual/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,6 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/nonContextual/servlet/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/nonContextual/servlet/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/nonContextual/servlet/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,6 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation.AnotherDeploymentType</type>
- </deploy>
+
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/beans.xml 2009-07-21 00:25:23 UTC (rev 3097)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/beans.xml 2009-07-21 00:56:12 UTC (rev 3098)
@@ -1,7 +1,3 @@
<beans>
- <deploy>
- <type>javax.enterprise.inject.deployment.Standard</type>
- <type>javax.enterprise.inject.deployment.Production</type>
- <type>org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.AnotherDeploymentType</type>
- </deploy>
+
</beans>
14 years, 11 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3097 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing and 19 other directories.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-07-20 20:25:23 -0400 (Mon, 20 Jul 2009)
New Revision: 3097
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
updated some section 3 tests
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java 2009-07-21 00:06:37 UTC (rev 3096)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java 2009-07-21 00:25:23 UTC (rev 3097)
@@ -43,7 +43,7 @@
@Test(groups = { "events", "ri-broken" })
@SpecAssertions( {
@SpecAssertion(section = "10.2", id = "h"),
- @SpecAssertion(section = "10.5", id = "a")
+ @SpecAssertion(section = "10.5", id = "aa")
})
public void testObserverNotifiedWhenEventTypeAndAllBindingsMatch()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java 2009-07-21 00:06:37 UTC (rev 3096)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java 2009-07-21 00:25:23 UTC (rev 3097)
@@ -8,7 +8,7 @@
import org.testng.annotations.Test;
/**
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
public class ObserverExceptionAbortsProcessingTest extends AbstractJSR299Test
@@ -42,7 +42,7 @@
}
@Test(groups = { "events" })
- @SpecAssertion(section = "10.6", id = "c")
+ @SpecAssertion(section = "10.5", id = "cb")
public void testObserverThrowsExceptionAbortsNotifications()
{
// Fire an event that will be delivered to the two above observers
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java 2009-07-21 00:06:37 UTC (rev 3096)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java 2009-07-21 00:25:23 UTC (rev 3097)
@@ -27,7 +27,7 @@
* Tests that a checked exception thrown from a non-transactional
* observer is wrapped and thrown.
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
* @author David Allen
*/
@@ -35,7 +35,7 @@
public class CheckedExceptionWrappedTest extends AbstractJSR299Test
{
@Test(groups = { "events" }, expectedExceptions = { ObserverException.class })
- @SpecAssertion(section = "10.6.1", id = "r")
+ @SpecAssertion(section = "10.6.1", id = "review") // no longer described by spec
public void testNonTransactionalObserverThrowsCheckedExceptionIsWrappedAndRethrown()
{
getCurrentManager().fireEvent(new Integer(1));
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java 2009-07-21 00:06:37 UTC (rev 3096)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java 2009-07-21 00:25:23 UTC (rev 3097)
@@ -26,7 +26,7 @@
* Tests that an unchecked exception thrown from a non-transactional
* observer is rethrown.
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
* @author David Allen
*/
@@ -34,7 +34,7 @@
public class ObserverExceptionRethrownTest extends AbstractJSR299Test
{
@Test(groups = { "events" }, expectedExceptions = { TeaCupPomeranian.OversizedException.class })
- @SpecAssertion(section = "10.6.1", id = "q")
+ @SpecAssertion(section = "review", id = "review") // no longer described by spec?
public void testNonTransactionalObserverThrowsNonCheckedExceptionIsRethrown()
{
getCurrentManager().fireEvent("string event");
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java 2009-07-21 00:06:37 UTC (rev 3096)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java 2009-07-21 00:25:23 UTC (rev 3097)
@@ -9,14 +9,14 @@
import org.testng.annotations.Test;
/**
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
public class ProducesUnallowedDefinitionTest extends AbstractJSR299Test
{
@Test
- @SpecAssertion(section = "3.4.7", id = "ca")
+ @SpecAssertion(section = "3.3.7", id = "ca")
public void testProducesUnallowed()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java 2009-07-21 00:06:37 UTC (rev 3096)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java 2009-07-21 00:25:23 UTC (rev 3097)
@@ -9,7 +9,7 @@
import org.testng.annotations.Test;
/**
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@@ -17,7 +17,7 @@
public class UnresolvedDisposalMethodDefinitionTest extends AbstractJSR299Test
{
@Test(groups = "ri-broken")
- @SpecAssertion(section = "3.4.9", id = "ca")
+ @SpecAssertion(section = "3.3.9", id = "ca")
public void testUnresolvedDisposalMethod()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-07-21 00:06:37 UTC (rev 3096)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-07-21 00:25:23 UTC (rev 3097)
@@ -12,17 +12,15 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@ExpectedDeploymentException(DefinitionError.class)
@Artifact
@Packaging(PackagingType.EAR)
public class SingletonWithConversationScopeTest extends AbstractJSR299Test
{
-
-
@Test(groups = { "enterpriseBeans" })
- @SpecAssertion(section = "3.3", id = "da")
+ @SpecAssertion(section = "3.2", id = "da")
public void testSingletonWithConversationScopeFails()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-07-21 00:06:37 UTC (rev 3096)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-07-21 00:25:23 UTC (rev 3097)
@@ -12,17 +12,15 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
public class SingletonWithRequestScopeTest extends AbstractJSR299Test
{
-
-
@Test(groups = { "incontainer-broken" })
- @SpecAssertion(section = "3.3", id = "da")
+ @SpecAssertion(section = "3.2", id = "da")
public void testSingletonWithRequestScopeFails()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-07-21 00:06:37 UTC (rev 3096)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-07-21 00:25:23 UTC (rev 3097)
@@ -12,16 +12,15 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
public class StatelessWithApplicationScopeTest extends AbstractJSR299Test
-{
-
+{
@Test(groups = { "enterpriseBeans" })
- @SpecAssertion(section = "3.3", id = "da")
+ @SpecAssertion(section = "3.2", id = "da")
public void testStatelessWithSessionScopeFails()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-07-21 00:06:37 UTC (rev 3096)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-07-21 00:25:23 UTC (rev 3097)
@@ -12,17 +12,15 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
public class StatelessWithConversationScopeTest extends AbstractJSR299Test
{
-
-
@Test(groups = { "enterpriseBeans" })
- @SpecAssertion(section = "3.3", id = "da")
+ @SpecAssertion(section = "3.2", id = "da")
public void testStatelessWithConversationScopeFails()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-07-21 00:06:37 UTC (rev 3096)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-07-21 00:25:23 UTC (rev 3097)
@@ -12,17 +12,15 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
public class StatelessWithRequestScopeTest extends AbstractJSR299Test
-{
-
-
+{
@Test(groups = { "enterpriseBeans" })
- @SpecAssertion(section = "3.3", id = "da")
+ @SpecAssertion(section = "3.2", id = "da")
public void testStatelessWithRequestScopeFails()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-07-21 00:06:37 UTC (rev 3096)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-07-21 00:25:23 UTC (rev 3097)
@@ -12,16 +12,15 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
public class StatelessWithSessionScopeTest extends AbstractJSR299Test
{
-
@Test(groups = { "enterpriseBeans" })
- @SpecAssertion(section = "3.3", id = "da")
+ @SpecAssertion(section = "3.2", id = "da")
public void testStatelessWithSessionScopeFails()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java 2009-07-21 00:06:37 UTC (rev 3096)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java 2009-07-21 00:25:23 UTC (rev 3097)
@@ -10,17 +10,15 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
public class ParameterizedTypeWithTypeParameterTest extends AbstractJSR299Test
{
-
-
@Test(groups = "producerMethod")
- @SpecAssertion(section = "3.4", id = "ia")
+ @SpecAssertion(section = "3.3", id = "ia")
public void testParameterizedReturnTypeWithTypeParameter() throws Exception
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-07-21 00:06:37 UTC (rev 3096)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-07-21 00:25:23 UTC (rev 3097)
@@ -10,16 +10,15 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
public class ParameterizedTypeWithTypeParameterTest extends AbstractJSR299Test
-{
-
+{
@Test
- @SpecAssertion(section = "3.4", id = "ia")
+ @SpecAssertion(section = "3.3", id = "ia")
public void testParameterizedType()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-07-21 00:06:37 UTC (rev 3096)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-07-21 00:25:23 UTC (rev 3097)
@@ -44,7 +44,7 @@
@Test(groups = { "producerMethod" })
@SpecAssertions( {
- @SpecAssertion(section = "3.3", id = "a")
+ @SpecAssertion(section = "3.3", id = "aa")
} )
public void testProducerOnNonBean() throws Exception
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-07-21 00:06:37 UTC (rev 3096)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-07-21 00:25:23 UTC (rev 3097)
@@ -18,10 +18,7 @@
{
@Test
- @SpecAssertions({
- @SpecAssertion(section = "3.1.1", id = "ca"),
- @SpecAssertion(section = "3.1", id = "ca")
- })
+ @SpecAssertion(section = "3.1.1", id = "ca")
public void testAbstractClassDeclaredInJavaNotDiscovered()
{
assert getBeans(Cow_NotBean.class).size() == 0;
@@ -101,7 +98,6 @@
}
}.run();
-
}
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-07-21 00:06:37 UTC (rev 3096)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-07-21 00:25:23 UTC (rev 3097)
@@ -10,16 +10,15 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
public class ConstructorHasDisposesParameterTest extends AbstractJSR299Test
{
-
@Test(groups = { "disposalMethod", "ri-broken" })
- @SpecAssertion(section = "3.2.4.1", id = "da")
+ @SpecAssertion(section = "3.1.4.1", id = "da")
public void testConstructorHasDisposesParameter() throws Exception
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-07-21 00:06:37 UTC (rev 3096)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-07-21 00:25:23 UTC (rev 3097)
@@ -10,16 +10,15 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
public class ConstructorHasObservesParameterTest extends AbstractJSR299Test
{
-
@Test(groups = { "ri-broken", "observerMethod" })
- @SpecAssertion(section = "3.2.4.1", id = "ea")
+ @SpecAssertion(section = "3.1.4.1", id = "ea")
public void testConstructorHasObservesParameter()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-07-21 00:06:37 UTC (rev 3096)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-07-21 00:25:23 UTC (rev 3097)
@@ -10,17 +10,15 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
public class DependentWithPublicFieldTest extends AbstractJSR299Test
{
-
-
@Test
- @SpecAssertion(section = "3.2", id = "fba")
+ @SpecAssertion(section = "3.1", id = "fba")
public void testNonDependentScopedBeanCanNotHavePublicField()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java 2009-07-21 00:06:37 UTC (rev 3096)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java 2009-07-21 00:25:23 UTC (rev 3097)
@@ -9,16 +9,14 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
public class NullableBeanTest extends AbstractJSR299Test
{
-
-
@Test(groups = { "injection", "producerMethod" })
- @SpecAssertion(section = "5.1.3", id = "aa")
+ @SpecAssertion(section = "5.3.4", id = "aa")
public void testPrimitiveInjectionPointResolvesToNullableWebBean() throws Exception
{
assert false;
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-21 00:06:37 UTC (rev 3096)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-21 00:25:23 UTC (rev 3097)
@@ -1764,7 +1764,6 @@
</section>
<section id="5.3.4" title="Primitive types and null values">
-
<assertion id="aa">
<text>If necessary, the container performs boxing ~or unboxing~ when it injects a value to a field or parameter of primitive or wrapper type.</text>
</assertion>
14 years, 11 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3096 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/context/passivating and 45 other directories.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-07-20 20:06:37 -0400 (Mon, 20 Jul 2009)
New Revision: 3096
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedAnimalDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyDeploymentTypes/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/HighestDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/PoultryFarmDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentTypeLiteral.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/OtherSpiderProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer2.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Generator.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tuna.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/NonStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DisabledBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledStringObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FarmShop.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/SpiderProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/SpiderProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/SpiderProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/SpiderProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/SpiderProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Monkey.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Polar.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/InfertileChicken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/LameInfertileChicken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/OtherSpiderProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderAsAnimalProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/StaticTarantulaProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/InfertileChicken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AndalusianChicken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/OakTree.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AndalusianChicken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Chicken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Lays.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/LorryProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ShipProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MountainLion.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tuna.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Office.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/Tractor_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/Donkey_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/FarmYard_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/JewelryShop.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/ShoeShop_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/FurnitureShop_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Bookshop_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/PictureShop_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/LazyFarmer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Office.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/FarmYard_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Plaice.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Tuna.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/Tuna_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/Unproxyable_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Tuna.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Plaice.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SpiderProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Tuna.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
removed deployment types
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.context.dependent;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
\ No newline at end of file
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/OtherSpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/OtherSpiderProducer.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/OtherSpiderProducer.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,10 +3,8 @@
import javax.annotation.PreDestroy;
import javax.enterprise.inject.Produces;
-@AnotherDeploymentType
class OtherSpiderProducer
{
-
private static boolean destroyed = false;
@Produces @Tame public Tarantula produceTarantula = new Tarantula();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -7,7 +7,6 @@
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.BeanManager;
-@AnotherDeploymentType
class SpiderProducer
{
@Current
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.context.passivating;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
\ No newline at end of file
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -4,7 +4,6 @@
import javax.enterprise.context.SessionScoped;
import javax.enterprise.inject.Produces;
-@AnotherDeploymentType
class CityProducer
{
@Produces @Dependent public Violation reference = new Violation();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer2.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer2.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer2.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
import javax.enterprise.context.Dependent;
import javax.enterprise.inject.Produces;
-@AnotherDeploymentType
class CityProducer2
{
@Produces @Dependent @Big
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Generator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Generator.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Generator.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -7,7 +7,6 @@
import javax.enterprise.inject.Produces;
@ApplicationScoped
-@AnotherDeploymentType
class Generator implements Serializable
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -61,18 +61,6 @@
assert getBeans(RedSnapper.class).iterator().next().getScopeType().equals(RequestScoped.class);
}
- @Test(groups = "rewrite")
- @SpecAssertions({
- @SpecAssertion(section = "2", id = "d"),
- @SpecAssertion(section = "3.1.3", id = "bc"),
- @SpecAssertion(section = "11.1", id = "ba")
- })
- public void testHasDeploymentType()
- {
- assert getBeans(RedSnapper.class).size() == 1;
- assert getBeans(RedSnapper.class).iterator().next().getDeploymentType().equals(Production.class);
- }
-
@Test(groups = "producerMethod")
@SpecAssertions({
@SpecAssertion(section = "2.2.1", id = "j"),
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.definition.binding;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
\ No newline at end of file
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tuna.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tuna.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
import javax.enterprise.context.RequestScoped;
-@AnotherDeploymentType
@RequestScoped
class Tuna
{
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.definition.stereotype;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -13,7 +13,6 @@
@Stereotype
@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
-@AnotherDeploymentType
@interface AnotherStereotype
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -13,7 +13,6 @@
@Stereotype
@Target( { TYPE })
@Retention(RUNTIME)
-@HornedAnimalDeploymentType
@interface ApplicationScopedHornedMammalStereotype
{
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedAnimalDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedAnimalDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedAnimalDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.definition.stereotype;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface HornedAnimalDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -11,7 +11,6 @@
@Stereotype
@Target( { TYPE })
@Retention(RUNTIME)
-@HornedAnimalDeploymentType
@interface HornedMammalStereotype
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/NonStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/NonStereotype.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/NonStereotype.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -8,7 +8,6 @@
@Target( { TYPE })
@Retention(RUNTIME)
-@HornedAnimalDeploymentType
@interface NonStereotype
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -26,12 +26,13 @@
{
private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {};
- @Test(groups = { "annotationDefinition" })
+ @Test(groups = { "annotationDefinition", "stub" })
@SpecAssertion(section = "2.7.1", id = "b")
public void testHasStereotypeAnnotation()
{
- Bean<Goat> bean = getBeans(Goat.class).iterator().next();
- assert !bean.getDeploymentType().equals(HornedAnimalDeploymentType.class);
+ assert false;
+ //Bean<Goat> bean = getBeans(Goat.class).iterator().next();
+ //assert !bean.getDeploymentType().equals(HornedAnimalDeploymentType.class);
}
@Test
@@ -67,7 +68,6 @@
assert highlandCow.getName() == null;
assert highlandCow.getBindings().contains(TAME_LITERAL);
assert highlandCow.getScopeType().equals(RequestScoped.class);
- assert highlandCow.getDeploymentType().equals(HornedAnimalDeploymentType.class);
}
@Test
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.deployment.lifecycle;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
\ No newline at end of file
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DisabledBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DisabledBean.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DisabledBean.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle;
-@AnotherDeploymentType
class DisabledBean
{
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.event;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.event;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface DisabledDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledStringObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledStringObserver.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledStringObserver.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
import javax.enterprise.event.Observes;
-@DisabledDeploymentType
class DisabledStringObserver
{
public void disabledObserver(@Observes String event)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FarmShop.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FarmShop.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FarmShop.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,7 @@
import javax.enterprise.inject.Specializes;
-@Specializes @AnotherDeploymentType
+@Specializes
class FarmShop extends Shop
{
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -4,7 +4,6 @@
import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Produces;
-@AnotherDeploymentType
class SpiderProducer
{
private static boolean tameSpiderDestroyed = false;
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,19 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.initializerUnallowed;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/SpiderProducer_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/SpiderProducer_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -4,7 +4,6 @@
import javax.enterprise.inject.Initializer;
import javax.enterprise.inject.Produces;
-@AnotherDeploymentType
class SpiderProducer_Broken
{
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.multiParams;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/SpiderProducer_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/SpiderProducer_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Produces;
-@AnotherDeploymentType
class SpiderProducer_Broken
{
@Produces
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.observesUnallowed;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/SpiderProducer_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/SpiderProducer_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -4,7 +4,6 @@
import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Produces;
-@AnotherDeploymentType
class SpiderProducer_Broken
{
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.producesUnallowed;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/SpiderProducer_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/SpiderProducer_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Produces;
-@AnotherDeploymentType
class SpiderProducer_Broken
{
@Produces
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.unresolvedMethod;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/SpiderProducer_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/SpiderProducer_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Produces;
-@AnotherDeploymentType
class SpiderProducer_Broken
{
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,21 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.enterprise.definition;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD, FIELD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -111,20 +111,12 @@
assert monkeyBean.getName().equals("Monkey");
}
- @Test(groups = "enterpriseBeans")
- @SpecAssertion(section = "3.2.3", id = "bc")
- public void testBeanWithDeploymentType()
- {
- Bean<MonkeyLocal> monkeyBean = getBeans(MonkeyLocal.class).iterator().next();
- assert monkeyBean.getDeploymentType().equals(AnotherDeploymentType.class);
- }
@Test(groups = "enterpriseBeans")
@SpecAssertion(section = "3.2.3", id = "bd")
public void testBeanWithStereotype()
{
Bean<PolarBearLocal> polarBearBean = getBeans(PolarBearLocal.class).iterator().next();
- assert polarBearBean.getDeploymentType().equals(AnotherDeploymentType.class);
assert polarBearBean.getScopeType().equals(RequestScoped.class);
assert polarBearBean.getName().equals("polarBear");
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Monkey.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Monkey.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Monkey.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -5,7 +5,6 @@
@Stateless
@Named("Monkey")
-@AnotherDeploymentType
class Monkey implements MonkeyLocal
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Polar.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Polar.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Polar.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -15,7 +15,6 @@
@Stereotype
@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
-@AnotherDeploymentType
@RequestScoped
@Named
@interface Polar
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,21 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.producer.field.definition;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD, FIELD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
\ No newline at end of file
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/InfertileChicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/InfertileChicken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/InfertileChicken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,7 +1,5 @@
package org.jboss.jsr299.tck.tests.implementation.producer.field.definition;
-
-@AnotherDeploymentType
class InfertileChicken extends Chicken
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/LameInfertileChicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/LameInfertileChicken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/LameInfertileChicken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.implementation.producer.field.definition;
-@AnotherDeploymentType
class LameInfertileChicken extends InfertileChicken
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/OtherSpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/OtherSpiderProducer.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/OtherSpiderProducer.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
import javax.enterprise.inject.Named;
import javax.enterprise.inject.Produces;
-@AnotherDeploymentType
class OtherSpiderProducer
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -35,7 +35,6 @@
{
Set<Bean<Tarantula>> tarantulaBeans = getBeans(Tarantula.class);
assert tarantulaBeans.size() == 1;
- assert tarantulaBeans.iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);
}
@Test(groups = "producerField")
@@ -165,7 +164,6 @@
Set<Bean<Tarantula>> tarantulaBeans = getBeans(Tarantula.class, TAME_LITERAL, FOO_LITERAL);
assert !tarantulaBeans.isEmpty();
Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next();
- assert tarantulaModel.getDeploymentType().equals(Production.class);
}
@Test(groups = "producerField")
@@ -209,7 +207,6 @@
assert !tarantulaBeans.isEmpty();
Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next();
assert tarantulaModel.getScopeType().equals(RequestScoped.class);
- assert tarantulaModel.getDeploymentType().equals(Production.class);
}
@Test(groups = "producerField")
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderAsAnimalProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderAsAnimalProducer.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderAsAnimalProducer.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,8 +2,6 @@
import javax.enterprise.inject.Produces;
-
-@AnotherDeploymentType
class SpiderAsAnimalProducer
{
@Produces @AsAnimal
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/StaticTarantulaProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/StaticTarantulaProducer.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/StaticTarantulaProducer.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -19,8 +19,6 @@
import javax.enterprise.inject.Produces;
-
-@AnotherDeploymentType
class StaticTarantulaProducer
{
@Produces @SpiderStereotype @Static public static Tarantula produceTarantula = new Tarantula();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -4,8 +4,6 @@
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.deployment.Production;
-
-@AnotherDeploymentType
class TameTarantulaProducer
{
@Produces @Foo @Tame @RequestScoped @Production public Tarantula produceTarantula = new DefangedTarantula();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaProducer.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaProducer.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
import javax.enterprise.inject.Produces;
-@AnotherDeploymentType
class TarantulaProducer
{
@Produces public Tarantula produceTarantula = new Tarantula();
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,21 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.producer.field.definition.enterprise;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD, FIELD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
\ No newline at end of file
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/InfertileChicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/InfertileChicken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/InfertileChicken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.implementation.producer.field.definition.enterprise;
-@AnotherDeploymentType
public class InfertileChicken extends Chicken implements InfertileChickenLocal
{
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,21 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD, FIELD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
\ No newline at end of file
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowProducer.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowProducer.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
import javax.enterprise.inject.Named;
import javax.enterprise.inject.Produces;
-@AnotherDeploymentType
public class BlackWidowProducer
{
public static BlackWidow blackWidow = new BlackWidow();
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/HighestDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/HighestDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/HighestDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,21 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD, FIELD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface HighestDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -27,7 +27,6 @@
* @author David Allen
*
*/
-@AnotherDeploymentType
public class NullSpiderProducer
{
@Produces @Named("blackWidow") @Null @Working public BlackWidow produceBlackWidow = null;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -28,7 +28,6 @@
* @author David Allen
*
*/
-@AnotherDeploymentType
public class NullSpiderProducer_Broken
{
@Produces @RequestScoped @Named("blackWidow") @Null @Broken public BlackWidow produceBlackWidow = null;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -28,7 +28,6 @@
*
*/
@Specializes
-@HighestDeploymentType
public class SpecializedTarantulaProducer extends TarantulaProducer
{
@Produces public Tarantula produceTarantula = new DefangedTarantula();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaProducer.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaProducer.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
import javax.enterprise.inject.Produces;
-@AnotherDeploymentType
public class TarantulaProducer
{
@Produces public Tarantula produceTarantula = new Tarantula();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AndalusianChicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AndalusianChicken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AndalusianChicken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
import javax.enterprise.inject.Specializes;
@Specializes
-@AnotherDeploymentType
class AndalusianChicken extends Chicken
{
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.producer.method.definition;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/OakTree.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/OakTree.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/OakTree.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -4,7 +4,6 @@
import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.Produces;
-@AnotherDeploymentType
class OakTree
{
@Produces @Dependent public Acorn growAcorn()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -33,17 +33,6 @@
@Test(groups = "producerMethod")
@SpecAssertions( {
- @SpecAssertion(section = "review", id = "review"),
- @SpecAssertion(section = "3.3.3", id = "c")
- } )
- public void testProducerMethodInheritsDeploymentTypeOfDeclaringWebBean() throws Exception
- {
- assert getBeans(Tarantula.class, TAME_LITERAL).size() == 1;
- assert getBeans(Tarantula.class, TAME_LITERAL).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);
- }
-
- @Test(groups = "producerMethod")
- @SpecAssertions( {
@SpecAssertion(section = "3.3", id = "b"),
@SpecAssertion(section = "7.3.4", id = "a")
} )
@@ -187,7 +176,6 @@
{
assert getBeans(LadybirdSpider.class).size() == 1;
Bean<LadybirdSpider> ladybirdSpider = getBeans(LadybirdSpider.class).iterator().next();
- assert ladybirdSpider.getDeploymentType().equals(SpiderDeploymentType.class);
}
@Test(groups = "producerMethod")
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.producer.method.definition;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface SpiderDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -5,7 +5,6 @@
import javax.enterprise.inject.Named;
import javax.enterprise.inject.Produces;
-@AnotherDeploymentType
class SpiderProducer
{
@@ -58,7 +57,7 @@
return new DaddyLongLegs();
}
- @Produces @Named @SpiderDeploymentType public LadybirdSpider getLadybirdSpider()
+ @Produces @Named public LadybirdSpider getLadybirdSpider()
{
return new LadybirdSpider();
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
import javax.ejb.Stateful;
import javax.enterprise.inject.Specializes;
-@AnotherDeploymentType
@Stateful
@Specializes
public class AndalusianChicken extends Chicken implements AndalusianChickenLocal
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AndalusianChicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AndalusianChicken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AndalusianChicken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
import javax.enterprise.inject.Specializes;
@Specializes
-@AnotherDeploymentType
class AndalusianChicken extends Chicken
{
public static Egg egg = new Egg();
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Chicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Chicken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Chicken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
import javax.enterprise.inject.Produces;
-@PoultryFarmDeploymentType
class Chicken
{
private static Egg egg = new Egg();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Lays.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Lays.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Lays.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.Produces;
-@AnotherDeploymentType
class Lays
{
@Produces @RequestScoped
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/LorryProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/LorryProducer_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/LorryProducer_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
import javax.enterprise.inject.Produces;
-@AnotherDeploymentType
class LorryProducer_Broken
{
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/PoultryFarmDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/PoultryFarmDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/PoultryFarmDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface PoultryFarmDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ShipProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ShipProducer_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ShipProducer_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
import javax.enterprise.inject.Produces;
-@AnotherDeploymentType
class ShipProducer_Broken
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -5,7 +5,6 @@
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.BeanManager;
-@AnotherDeploymentType
class SpiderProducer
{
private static boolean tarantulaCreated;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.Produces;
-@AnotherDeploymentType
class SpiderProducer_Broken
{
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MountainLion.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MountainLion.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MountainLion.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
import javax.enterprise.inject.Specializes;
@Specializes
-@AnotherDeploymentType
class MountainLion extends Lion
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tuna.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tuna.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
import javax.enterprise.context.RequestScoped;
-@AnotherDeploymentType
@RequestScoped
class Tuna
{
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -5,7 +5,6 @@
@Specializes @Lazy
-@AnotherDeploymentType
@Stateful
public class LazyFarmer extends Farmer implements LazyFarmerLocal, FarmerLocal
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Office.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Office.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Office.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,9 +3,6 @@
import javax.ejb.Stateful;
import javax.enterprise.inject.Specializes;
-
-
-@AnotherDeploymentType
@Stateful
@Specializes
public class Office extends Building implements OfficeLocal
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.directlyExtendsSimpleBean;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/Tractor_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/Tractor_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/Tractor_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -4,7 +4,6 @@
import javax.enterprise.inject.Specializes;
@Specializes
-@AnotherDeploymentType
@Stateful
class Tractor_Broken extends FarmEquipment implements TractorLocal
{
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.implementInterfaceAndExtendsNothing;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/Donkey_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/Donkey_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/Donkey_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -4,7 +4,6 @@
import javax.enterprise.inject.Specializes;
@Specializes
-@AnotherDeploymentType
@Stateful
class Donkey_Broken implements Animal
{
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.sameName;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/FarmYard_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/FarmYard_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/FarmYard_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -5,7 +5,6 @@
import javax.enterprise.inject.Specializes;
@Specializes
-@AnotherDeploymentType
@Stateful
@Named
class FarmYard_Broken extends Yard
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,19 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.twoBeansSpecializeTheSameBean;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -4,7 +4,6 @@
import javax.enterprise.inject.Specializes;
@Specializes
-@AnotherDeploymentType
@Stateful
class FishFarmer_Broken extends Farmer
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -4,7 +4,6 @@
import javax.enterprise.inject.Specializes;
@Specializes
-@AnotherDeploymentType
@Stateful
class SheepFarmer_Broken extends Farmer
{
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/JewelryShop.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/JewelryShop.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/JewelryShop.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -5,8 +5,7 @@
class JewelryShop extends Shop
{
-
- @Override @Produces @Specializes @Sparkly @AnotherDeploymentType
+ @Override @Produces @Specializes @Sparkly
public Product getExpensiveGift()
{
return new Necklace();
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.indirectOverride;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/ShoeShop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/ShoeShop_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/ShoeShop_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -5,8 +5,7 @@
class ShoeShop_Broken extends MallShop
{
-
- @Override @Produces @Specializes @AnotherDeploymentType
+ @Override @Produces @Specializes
public Product getExpensiveGift()
{
return super.getExpensiveGift();
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializesStaticMethod;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/FurnitureShop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/FurnitureShop_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/FurnitureShop_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,11 +3,9 @@
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.Specializes;
-
class FurnitureShop_Broken extends Shop
{
-
- @Specializes @Produces @AnotherDeploymentType
+ @Specializes @Produces
public static Product getChair()
{
return new Product();
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializingAndSpecializedBeanHaveName;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -6,8 +6,7 @@
class HighSchool_Broken extends School
{
-
- @Override @Produces @Specializes @AnotherDeploymentType @Named
+ @Override @Produces @Specializes@Named
public Pupil getStarPupil()
{
return super.getStarPupil();
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.twoBeansSpecializeTheSameBean;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Bookshop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Bookshop_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Bookshop_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -5,8 +5,7 @@
class Bookshop_Broken extends Shop
{
-
- @Override @Specializes @Produces @AnotherDeploymentType
+ @Override @Specializes @Produces
public Product getExpensiveGift()
{
return new Product();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/PictureShop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/PictureShop_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/PictureShop_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -5,8 +5,7 @@
class PictureShop_Broken extends Shop
{
-
- @Override @Produces @Specializes @AnotherDeploymentType
+ @Override @Produces @Specializes
public Product getExpensiveGift()
{
// TODO Auto-generated method stub
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.simple;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/LazyFarmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/LazyFarmer.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/LazyFarmer.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -4,7 +4,6 @@
@Specializes @Lazy
-@AnotherDeploymentType
class LazyFarmer extends Farmer
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Office.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Office.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Office.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,9 +2,7 @@
import javax.enterprise.inject.Specializes;
-
-
-@AnotherDeploymentType @Specializes
+@Specializes
class Office extends Building
{
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.extendejb;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
import javax.enterprise.inject.Specializes;
@Specializes
-@AnotherDeploymentType
class Tractor_Broken extends FarmEquipment
{
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.names;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/FarmYard_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/FarmYard_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/FarmYard_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -4,7 +4,6 @@
import javax.enterprise.inject.Specializes;
@Specializes
-@AnotherDeploymentType
@Named
class FarmYard_Broken extends Yard
{
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend1;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
import javax.enterprise.inject.Specializes;
@Specializes
-@AnotherDeploymentType
class Donkey_Broken implements Animal
{
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend2;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
import javax.enterprise.inject.Specializes;
@Specializes
-@AnotherDeploymentType
class Cow_Broken
{
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend3;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
import javax.enterprise.inject.Specializes;
@Specializes
-@AnotherDeploymentType
class Cow_Broken extends Mammal
{
public Cow_Broken()
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
import javax.enterprise.inject.Specializes;
@Specializes
-@AnotherDeploymentType
class FishFarmer_Broken extends Farmer
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,7 @@
import javax.enterprise.inject.Specializes;
-@Specializes @AnotherDeploymentType
+@Specializes
class SheepFarmer_Broken extends Farmer
{
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.byname;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Plaice.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Plaice.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Plaice.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
import javax.enterprise.inject.Named;
-@AnotherDeploymentType
@Whitefish
@Named("whitefish")
final class Plaice implements Animal
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Tuna.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Tuna.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
import javax.enterprise.context.RequestScoped;
-@AnotherDeploymentType
@RequestScoped
class Tuna
{
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,21 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.clientProxy.finalmethod;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
-
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/Tuna_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/Tuna_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/Tuna_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
import javax.enterprise.context.RequestScoped;
-@AnotherDeploymentType
@RequestScoped
class Tuna_Broken
{
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.clientProxy.privateconstructor;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/Unproxyable_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/Unproxyable_Broken.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/Unproxyable_Broken.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
import javax.enterprise.context.RequestScoped;
-@AnotherDeploymentType
@RequestScoped
class Unproxyable_Broken
{
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.injection;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderProducer.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderProducer.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
import javax.enterprise.inject.Produces;
-@AnotherDeploymentType
class SpiderProducer
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Tuna.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Tuna.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
import javax.enterprise.context.RequestScoped;
-@AnotherDeploymentType
@RequestScoped
class Tuna
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -195,26 +195,6 @@
}.run();
}
- @Test(groups = { "injectionPoint", "deployment" })
- @SpecAssertions({
- @SpecAssertion(section = "5.6.9", id = "e"),
- @SpecAssertion(section = "2.5.1", id="review") // deployment types removed from spec
- })
- public void testStandardDeployment() throws Exception
- {
- new RunInDependentContext()
- {
-
- @Override
- protected void execute() throws Exception
- {
- assert getBeans(InjectionPoint.class).size() == 1;
- assert getBeans(InjectionPoint.class).iterator().next().getDeploymentType().equals(Standard.class);
- }
-
- }.run();
- }
-
@Test(groups = { "injectionPoint" })
@SpecAssertion(section = "5.6.9", id = "e")
public void testDependentScope() throws Exception
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentType.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentType.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
-
-import static java.lang.annotation.ElementType.METHOD;
-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;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentTypeLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentTypeLiteral.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentTypeLiteral.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,8 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
-
-import javax.enterprise.inject.AnnotationLiteral;
-
-class AnotherDeploymentTypeLiteral extends AnnotationLiteral<AnotherDeploymentType> implements AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Plaice.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Plaice.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Plaice.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
import javax.enterprise.inject.Named;
-@AnotherDeploymentType
@Whitefish
@Named("whitefish")
final class Plaice implements Animal
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -51,13 +51,6 @@
getBeans(Tuna.class, new CurrentLiteral(), new CurrentLiteral());
}
- @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class)
- @SpecAssertion(section="5.3", id = "review") // seems to be removed from spec - double check
- public void testNonBindingTypeUsed()
- {
- getBeans(Tuna.class, new AnotherDeploymentTypeLiteral());
- }
-
@Test(groups="resolution")
@SpecAssertions({
@SpecAssertion(section = "5.3", id ="review") // removed from spec?
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SpiderProducer.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SpiderProducer.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
import javax.enterprise.inject.Produces;
-@AnotherDeploymentType
class SpiderProducer
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Tuna.java 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Tuna.java 2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
import javax.enterprise.context.RequestScoped;
-@AnotherDeploymentType
@RequestScoped
class Tuna
{
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-21 00:06:37 UTC (rev 3096)
@@ -578,23 +578,19 @@
</assertion>
<assertion id="ba">
- <text>A bean class may also specify a scope~, name, deployment type, stereotypes and/or bindings~</text>
+ <text>A bean class may also specify a scope~, name, stereotypes and/or bindings~</text>
</assertion>
<assertion id="bb">
- <text>A bean class may also specify a ~scope, ~name~, deployment type, stereotypes and/or bindings~</text>
+ <text>A bean class may also specify a ~scope, ~name~, stereotypes and/or bindings~</text>
</assertion>
- <assertion id="bc">
- <text>A bean class may also specify a ~scope, name, ~deployment type~, stereotypes and/or bindings~</text>
- </assertion>
-
<assertion id="bd">
- <text>A bean class may also specify ~a scope, name, deployment type, ~stereotypes~ and/or bindings~</text>
+ <text>A bean class may also specify ~a scope, name, ~stereotypes~ and/or bindings~</text>
</assertion>
<assertion id="be">
- <text>A bean class may also specify ~a scope, name, deployment type, stereotypes and/or ~bindings</text>
+ <text>A bean class may also specify ~a scope, name, stereotypes and/or ~bindings</text>
</assertion>
<assertion id="c">
@@ -743,23 +739,19 @@
</assertion>
<assertion id="ba">
- <text>A bean class may also specify a scope~, name, deployment type, stereotypes and/or bindings~</text>
+ <text>A bean class may also specify a scope~, name, stereotypes and/or bindings~</text>
</assertion>
<assertion id="bb">
- <text>A bean class may also specify a ~scope, ~name~, deployment type, stereotypes and/or bindings~</text>
+ <text>A bean class may also specify a ~scope, ~name~, stereotypes and/or bindings~</text>
</assertion>
- <assertion id="bc">
- <text>A bean class may also specify a ~scope, name, ~deployment type~, stereotypes and/or bindings~</text>
- </assertion>
-
<assertion id="bd">
- <text>A bean class may also specify ~a scope, name, deployment type, ~stereotypes~ and/or bindings~</text>
+ <text>A bean class may also specify ~a scope, name, ~stereotypes~ and/or bindings~</text>
</assertion>
<assertion id="be">
- <text>A bean class may also specify ~a scope, name, deployment type, stereotypes and/or ~bindings</text>
+ <text>A bean class may also specify ~a scope, name, stereotypes and/or ~bindings</text>
</assertion>
<assertion id="c">
@@ -1135,7 +1127,7 @@
</assertion>
<assertion id="hh">
- <text>The bean type, bindings and deployment type of the resource are determined by the producer field declaration.</text>
+ <text>The bean type and bindings of the resource are determined by the producer field declaration.</text>
</assertion>
</section>
@@ -1583,10 +1575,6 @@
<text>If two beans both support a certain bean type, and share at least one binding, then they are both eligible for injection to any injection point with that declared type and binding.</text>
</assertion>
- <assertion id="b">
- <text>If the bean with the lower priority deployment type declares a binding that is not declared by the bean with the higher priority deployment type, then the bean with the higher priority deployment type will not be eligible for injection to an injection point with that binding.</text>
- </assertion>
-
<assertion id="ca">
<text>The only way one bean can completely override a lower-priority bean at all injection points is if it implements all the bean types and declares all the bindings of the lower-priority bean. However, if the lower-priority bean declares a producer method or observer method, then even this is not enough to ensure that the lower-priority bean is never called.</text>
</assertion>
@@ -2071,7 +2059,7 @@
</assertion>
<assertion id="e">
- <text>The container must provide a bean with deployment type |@Standard|, scope |@Dependent|, bean type |InjectionPoint| and binding |@Current|, allowing dependent objects, as defined in Section 6.4.2, "Dependent objects", to obtain information about the injection point to which they belong. The built-in implementation must be a passivation capable dependency, as defined in Section 6.6.2, "Passivation capable dependencies".</text>
+ <text>The container must provide a bean with scope |@Dependent|, bean type |InjectionPoint| and binding |@Current|, allowing dependent objects, as defined in Section 6.4.2, "Dependent objects", to obtain information about the injection point to which they belong. The built-in implementation must be a passivation capable dependency, as defined in Section 6.6.2, "Passivation capable dependencies".</text>
</assertion>
<assertion id="f">
14 years, 11 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3094 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle and 4 other directories.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-07-20 03:38:29 -0400 (Mon, 20 Jul 2009)
New Revision: 3094
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesOnBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/MethodAnnotatedProducesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
match lifecycle and producer method tests, minor fix in tck-audit
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesOnBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesOnBeanTest.java 2009-07-20 04:25:41 UTC (rev 3093)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesOnBeanTest.java 2009-07-20 07:38:29 UTC (rev 3094)
@@ -28,15 +28,15 @@
/**
* Single test for a bean with multiple active deployment types.
*
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
public class TooManyDeploymentTypesOnBeanTest extends AbstractJSR299Test
{
@Test(groups = { "deploymentType" })
- @SpecAssertion(section = "2.5.3", id = "da")
- public void testMultipleActiveDeploymentTypesOnBean()
+ @SpecAssertion(section = "2.5.3", id = "review")
+ public void testMultipleActiveDeploymentTypesOnBean() // deployment types removed from spec
{
assert false;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-07-20 04:25:41 UTC (rev 3093)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-07-20 07:38:29 UTC (rev 3094)
@@ -31,7 +31,7 @@
* @author Nicklas Karlsson
* @author David Allen
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
*/
@Artifact
@@ -42,9 +42,9 @@
@Test(groups = {"enterpriseBeans", "clientProxy", "lifecycle", "integration" })
@SpecAssertions( {
- @SpecAssertion(section = "3.3.5", id = "a"),
- @SpecAssertion(section = "7.3", id = "aa"),
- @SpecAssertion(section = "7.3", id = "bb")
+ @SpecAssertion(section = "3.2.5", id = "a"),
+ @SpecAssertion(section = "7.3.2", id = "aa"),
+ @SpecAssertion(section = "7.3.2", id = "bb")
})
public void testCreateSFSB() throws Exception
{
@@ -86,7 +86,7 @@
@Test(groups = { "enterpriseBeans", "clientProxy", "lifecycle", "integration" })
@SpecAssertions({
- @SpecAssertion(section = "7.3", id = "bc")
+ @SpecAssertion(section = "7.3.2", id = "bc")
})
public void testDestroyRemovesSFSB() throws Exception
{
@@ -107,8 +107,8 @@
@Test(groups = { "enterpriseBeans", "lifecycle", "integration" })
@SpecAssertions({
- @SpecAssertion(section = "7.3", id = "bc"),
- @SpecAssertion(section = "3.3.1", id = "dba")
+ @SpecAssertion(section = "7.3.2", id = "bc"),
+ @SpecAssertion(section = "3.2.1", id = "dba")
})
public void testRemovedEjbIgnored()
{
@@ -124,7 +124,7 @@
}
@Test(groups = { "enterpriseBeans", "lifecycle", "integration" })
- @SpecAssertion(section = "7.4", id = "a")
+ @SpecAssertion(section = "7.3.3", id = "a")
public void testCreateSLSB()
{
Bean<NeueStadt> stadtBean = getBeans(NeueStadt.class).iterator().next();
@@ -140,7 +140,7 @@
}
@Test(groups = { "enterpriseBeans", "lifecycle", "integration" })
- @SpecAssertion(section = "3.9.2", id = "b")
+ @SpecAssertion(section = "3.8.2", id = "b")
public void testInitializerMethodsCalledWithCurrentParameterValues()
{
AlteStadt alteStadt = this.getCurrentConfiguration().getBeans().getEnterpriseBean(Mainz.class, AlteStadt.class);
@@ -149,7 +149,7 @@
}
@Test(groups = { "enterpriseBeans", "lifecycle", "ri-broken" })
- @SpecAssertion(section = "6.11", id = "f")
+ @SpecAssertion(section = "5.6.5", id = "a")
public void testDependentObjectsDestroyed()
{
UniStadt marburg = getInstanceByType(UniStadt.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/MethodAnnotatedProducesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/MethodAnnotatedProducesTest.java 2009-07-20 04:25:41 UTC (rev 3093)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/MethodAnnotatedProducesTest.java 2009-07-20 07:38:29 UTC (rev 3094)
@@ -11,7 +11,7 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@@ -19,7 +19,8 @@
{
@Test(groups = "initializerMethod")
- @SpecAssertions( { @SpecAssertion(section = "3.9.1", id = "ba"), @SpecAssertion(section = "3.4.2", id = "c") })
+ @SpecAssertions( { @SpecAssertion(section = "3.8.1", id = "ba"),
+ @SpecAssertion(section = "3.3.2", id = "ca") })
public void testInitializerMethodAnnotatedProduces()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-07-20 04:25:41 UTC (rev 3093)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-07-20 07:38:29 UTC (rev 3094)
@@ -10,7 +10,7 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@@ -19,7 +19,7 @@
@Test(groups = "initializerMethod")
- @SpecAssertion(section = "3.9.1", id = "ca")
+ @SpecAssertion(section = "3.8.1", id = "ca")
public void testInitializerMethodHasParameterAnnotatedDisposes()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-07-20 04:25:41 UTC (rev 3093)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-07-20 07:38:29 UTC (rev 3094)
@@ -10,7 +10,7 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
*/
@Artifact
@@ -19,7 +19,7 @@
{
@Test(groups = "producerMethod")
- @SpecAssertion(section = "3.4.2", id = "ea")
+ @SpecAssertion(section = "3.3.2", id = "ea")
public void testProducerMethodWithParameterAnnotatedObserves() throws Exception
{
assert false;
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-20 04:25:41 UTC (rev 3093)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-20 07:38:29 UTC (rev 3094)
@@ -848,7 +848,6 @@
</section>
<section id="3.3.2" title="Declaring a producer method">
-
<assertion id="a">
<text>A producer method may be declared by annotating a method with the |(a)javax.enterprise.inject.Produces| annotation</text>
</assertion>
@@ -1979,8 +1978,8 @@
</section>
<section id="5.6.5" title="Destruction of dependent objects">
- <assertion>
- <text>When the container destroys an instance of a bean or of any Java EE component class supporting injection, the container destroys all dependent objects, as defined in Section 6.4.3, "Dependent object destruction", after the |@PreDestroy| callback completes and after the servlet |destroy()| method is called.</text>
+ <assertion id="a">
+ <text>When the container destroys an instance of a bean or of any Java EE component class supporting injection, the container destroys all dependent objects, as defined in Section 6.4.2, "Dependent object destruction", after the |@PreDestroy| callback completes and after the servlet |destroy()| method is called.</text>
</assertion>
</section>
14 years, 11 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3093 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery and 6 other directories.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-07-20 00:25:41 -0400 (Mon, 20 Jul 2009)
New Revision: 3093
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
matched observer tests with assertions
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java 2009-07-20 03:56:29 UTC (rev 3092)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java 2009-07-20 04:25:41 UTC (rev 3093)
@@ -12,7 +12,7 @@
import org.testng.annotations.Test;
/**
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@IntegrationTest
@Artifact
@@ -34,14 +34,14 @@
}
@Test
- @SpecAssertion(section = "4.1", id = "dba")
+ @SpecAssertion(section = "4.1", id = "hhh")
public void testStereotypeScopeIsOverriddenByInheritedScope()
{
assert getBeans(ChihuahuaLocal.class).iterator().next().getScopeType().equals(SessionScoped.class);
}
@Test
- @SpecAssertion(section = "4.1", id = "dda")
+ @SpecAssertion(section = "4.1", id = "hhi")
public void testStereotypeScopeIsOverriddenByIndirectlyInheritedScope()
{
assert getBeans(MexicanChihuahuaLocal.class).iterator().next().getScopeType().equals(SessionScoped.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java 2009-07-20 03:56:29 UTC (rev 3092)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java 2009-07-20 04:25:41 UTC (rev 3093)
@@ -11,7 +11,7 @@
import org.testng.annotations.Test;
/**
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@Packaging(PackagingType.EAR)
@@ -22,7 +22,7 @@
// TODO make this an integration test using Extension
@Test
@SpecAssertions({
- @SpecAssertion(section = "10.5.2", id = "e"),
+ @SpecAssertion(section = "10.4.2", id = "e"),
@SpecAssertion(section = "11.5.2", id = "a")
})
public void testDeploymentFailsBeforeNotifyingObserversAfterBeanDiscovery()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java 2009-07-20 03:56:29 UTC (rev 3092)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java 2009-07-20 04:25:41 UTC (rev 3093)
@@ -29,7 +29,7 @@
* Tests an observer method that is also a disposes method
* for something else.
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
* @author David Allen
*/
@@ -38,7 +38,7 @@
public class ObserverMethodAnnotatedDisposesTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
- @SpecAssertion(section = "10.5.2", id = "f")
+ @SpecAssertion(section = "10.4.2", id = "f")
public void testObserverMethodWithDisposesParamFails()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java 2009-07-20 03:56:29 UTC (rev 3092)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java 2009-07-20 04:25:41 UTC (rev 3093)
@@ -29,7 +29,7 @@
* Tests an observer method that is also annotated as an
* initializer method.
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
* @author David Allen
*/
@@ -38,7 +38,7 @@
public class ObserverMethodAnnotatedInitialzerTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
- @SpecAssertion(section = "10.5.2", id = "e")
+ @SpecAssertion(section = "10.4.2", id = "e")
public void testObserverMethodAnnotatedInitializerFails()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java 2009-07-20 03:56:29 UTC (rev 3092)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java 2009-07-20 04:25:41 UTC (rev 3093)
@@ -17,7 +17,6 @@
package org.jboss.jsr299.tck.tests.event.broken.observer.isProducer;
-
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.DefinitionError;
@@ -28,7 +27,7 @@
/**
* Tests an observer method which is also annotated as a producer method.
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
* @author David Allen
*/
@@ -37,7 +36,7 @@
public class ObserverMethodAnnotatedProducesTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
- @SpecAssertion(section = "10.5.2", id = "d")
+ @SpecAssertion(section = "10.4.2", id = "d")
public void testObserverMethodAnnotatedProducesFails()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java 2009-07-20 03:56:29 UTC (rev 3092)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java 2009-07-20 04:25:41 UTC (rev 3093)
@@ -30,7 +30,7 @@
* Test an observer method on an EJB that is neither a business method nor a
* static method of the class.
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
* @author David Allen
*/
@@ -40,7 +40,8 @@
public class EJBObserverMethodNotBusinessMethodTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
- @SpecAssertions( { @SpecAssertion(section = "10.5", id = "d"), @SpecAssertion(section = "10.5.2", id = "g") })
+ @SpecAssertions( { @SpecAssertion(section = "10.4", id = "d"),
+ @SpecAssertion(section = "10.4.2", id = "g") })
public void testObserverMethodOnEnterpriseBeanNotBusinessMethodOrStaticFails()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java 2009-07-20 03:56:29 UTC (rev 3092)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java 2009-07-20 04:25:41 UTC (rev 3093)
@@ -9,14 +9,15 @@
import org.testng.annotations.Test;
/**
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
public class ObserverMethodWithTwoEventParametersTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
- @SpecAssertions( { @SpecAssertion(section = "10.5.1", id = "a"), @SpecAssertion(section = "10.5.2", id = "b") })
+ @SpecAssertions( { @SpecAssertion(section = "10.4.1", id = "a"),
+ @SpecAssertion(section = "10.4.2", id = "b") })
public void testObserverMethodMustHaveOnlyOneEventParameter()
{
assert false;
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-20 03:56:29 UTC (rev 3092)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-20 04:25:41 UTC (rev 3093)
@@ -1415,8 +1415,12 @@
</assertion>
<assertion id="hhh">
- <text>A scope type explicitly declared by X and inherited by Y from X takes precedence over default scopes of stereotypes declared or inherited by Y.</text>
+ <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, a scope type explicitly declared by X and inherited by Y from X takes precedence over default scopes of stereotypes declared or inherited by Y.</text>
</assertion>
+
+ <assertion id="hhi">
+ <text>For class X which is extended _indirectly_ by the bean class of a _managed_ bean Y, a scope type explicitly declared by X and inherited by Y from X takes precedence over default scopes of stereotypes declared or inherited by Y.</text>
+ </assertion>
<assertion id="i" testable="false">
<text>For annotations defined by the bean specification, all built-in _scope types_ are declared |@Inherited|</text>
14 years, 11 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3092 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-07-19 23:56:29 -0400 (Sun, 19 Jul 2009)
New Revision: 3092
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java
Log:
oops missed a couple
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java 2009-07-20 03:26:04 UTC (rev 3091)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java 2009-07-20 03:56:29 UTC (rev 3092)
@@ -86,7 +86,7 @@
}
@Test(groups = { "events", "integration", "broken" })
- @SpecAssertions( { @SpecAssertion(section = "10.4.5", id = "c"), @SpecAssertion(section = "7.5.6", id = "i"), @SpecAssertion(section = "7.5.8", id = "d"), @SpecAssertion(section = "7.5.8", id = "f") })
+ @SpecAssertion(section = "10.4.5", id = "c")
public void testAfterTransactionCompletionObserver() throws InterruptedException
{
dog.setCorrectContext(false);
14 years, 11 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3091 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer and 2 other directories.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-07-19 23:26:04 -0400 (Sun, 19 Jul 2009)
New Revision: 3091
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
matched initializer tests to assertions
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java 2009-07-20 02:46:20 UTC (rev 3090)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java 2009-07-20 03:26:04 UTC (rev 3091)
@@ -11,7 +11,7 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
*/
@Artifact
@@ -19,11 +19,10 @@
@IntegrationTest
public class EjbInitializerMethodTest extends AbstractJSR299Test
{
-
@Test(groups = { "initializerMethod", "ejb3" })
@SpecAssertions({
- @SpecAssertion(section = "3.9", id = "e"),
- @SpecAssertion(section = "3.9", id = "ca")
+ @SpecAssertion(section = "3.8", id = "e"),
+ @SpecAssertion(section = "3.8", id = "ca")
})
public void testInitializerMethodNotABusinessMethod()
{
@@ -31,5 +30,4 @@
getInstanceByType(LocalChicken.class).cluck();
assert AndalusianChicken.nonBusinessMethodCalled = true;
}
-
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java 2009-07-20 02:46:20 UTC (rev 3090)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java 2009-07-20 03:26:04 UTC (rev 3091)
@@ -10,7 +10,7 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@Packaging(PackagingType.EAR)
@@ -19,7 +19,7 @@
@Test(groups = { "initializerMethod" })
@SpecAssertions({
- @SpecAssertion(section = "3.9.2", id = "b")
+ @SpecAssertion(section = "3.8.2", id = "b")
})
public void testBindingTypeOnInitializerParameter()
{
@@ -30,7 +30,7 @@
}
@Test(groups = { "stub", "initializerMethod", "interceptors" })
- @SpecAssertion(section = "3.9", id = "f")
+ @SpecAssertion(section = "3.8", id = "f")
public void testMethodInterceptorNotCalledOnInitializerMethod()
{
assert false;
@@ -38,10 +38,10 @@
@Test(groups = { "initializerMethod" })
@SpecAssertions({
- @SpecAssertion(section = "3.9", id = "g"),
- @SpecAssertion(section = "5.3", id = "b"),
- @SpecAssertion(section = "3.9.1", id = "a"),
- @SpecAssertion(section = "3.9.2", id = "aa")
+ @SpecAssertion(section = "3.8", id = "g"),
+ @SpecAssertion(section = "5.5", id = "b"),
+ @SpecAssertion(section = "3.8.1", id = "a"),
+ @SpecAssertion(section = "3.8.2", id = "aa")
})
public void testMultipleInitializerMethodsAreCalled()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java 2009-07-20 02:46:20 UTC (rev 3090)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java 2009-07-20 03:26:04 UTC (rev 3091)
@@ -10,7 +10,7 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@@ -18,7 +18,7 @@
{
@Test(groups = "initializerMethod")
- @SpecAssertion(section = "3.9", id = "aa")
+ @SpecAssertion(section = "3.8", id = "aa")
public void testStaticInitializerMethodNotAllowed()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-07-20 02:46:20 UTC (rev 3090)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-07-20 03:26:04 UTC (rev 3091)
@@ -10,7 +10,7 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
*/
@Artifact
@@ -19,7 +19,7 @@
{
@Test
- @SpecAssertion(section = "3.2.4.1", id = "ca")
+ @SpecAssertion(section = "3.1.4.1", id = "ca")
public void testTooManyInitializerAnnotatedConstructor()
{
assert false;
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-20 02:46:20 UTC (rev 3090)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-20 03:26:04 UTC (rev 3091)
@@ -1214,6 +1214,10 @@
<text>If the bean is a session bean, the initializer method is not required to be a business method of the session bean</text>
</assertion>
+ <assertion id="f">
+ <text>Method interceptors are never called when the container calls an initializer method</text>
+ </assertion>
+
<assertion id="g">
<text>A bean class may declare multiple (or zero) initializer methods</text>
</assertion>
@@ -1222,10 +1226,6 @@
<text>Initializer methods are called by the container after injected fields are initialized, and before the |@PostConstruct| callback occurs.</text>
</assertion>
- <assertion id="f">
- <text>Method interceptors are never called when the container calls an initializer method</text>
- </assertion>
-
<assertion id="h" testable="false">
<text>The application may call initializer methods directly, but then no parameters will be passed to the method by the container</text>
<note>This is a statement of intent</note>
14 years, 11 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3090 - in tck/trunk/impl/src/main: resources and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-07-19 22:46:20 -0400 (Sun, 19 Jul 2009)
New Revision: 3090
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
match session context tests, split assertion into two
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java 2009-07-20 01:34:56 UTC (rev 3089)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java 2009-07-20 02:46:20 UTC (rev 3090)
@@ -14,7 +14,7 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@IntegrationTest(runLocally=true)
@@ -58,7 +58,7 @@
}
@Test(groups = { "contexts", "integration" })
- @SpecAssertion(section = "6.7.2", id = "c")
+ @SpecAssertion(section = "6.7.2", id = "ca")
public void testSessionContextDestroyedWhenHttpSessionInvalidated() throws Exception
{
WebClient webClient = new WebClient();
@@ -79,7 +79,7 @@
}
@Test(groups = { "contexts", "integration" })
- @SpecAssertion(section = "6.7.2", id = "d")
+ @SpecAssertion(section = "6.7.2", id = "cb")
public void testSessionContextDestroyedWhenHttpSessionTimesOut() throws Exception
{
WebClient webClient = new WebClient();
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-20 01:34:56 UTC (rev 3089)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-20 02:46:20 UTC (rev 3090)
@@ -2713,8 +2713,12 @@
</assertion>
<assertion id="ca">
- <text>The session context is destroyed when the |HTTPSession| times out, after all |HttpSessionListener|s have been called, and at the very end of any request in which |invalidate()| was called, after all filters and |ServletRequestListeners| have been called.</text>
+ <text>The session context is destroyed when the ~|HTTPSession| times out, after all |HttpSessionListener|s have been called~, and at the very end of any request in which |invalidate()| was called, after all filters and |ServletRequestListeners| have been called.</text>
</assertion>
+
+ <assertion id="cb">
+ <text>The session context is destroyed when the |HTTPSession| times out, ~after all |HttpSessionListener|s have been called, and at the very end of any request in which |invalidate()| was called~, after all filters and |ServletRequestListeners| have been called.</text>
+ </assertion>
</section>
<section id="6.7.3" title="Application context lifecycle">
14 years, 11 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3089 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: implementation/disposal/method/definition and 5 other directories.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-07-19 21:34:56 -0400 (Sun, 19 Jul 2009)
New Revision: 3089
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
Log:
matched disposal method, scope definition and resolution by name tests to assertions
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java 2009-07-19 23:52:32 UTC (rev 3088)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java 2009-07-20 01:34:56 UTC (rev 3089)
@@ -19,7 +19,7 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
*/
@Artifact
@@ -64,7 +64,7 @@
assert bean.getScopeType().equals(RequestScoped.class);
}
- @Test @SpecAssertion(section="2.4.4", id = "a")
+ @Test @SpecAssertion(section="2.4.4", id = "aa")
public void testDefaultScope()
{
assert getBeans(Order.class).size() == 1;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-07-19 23:52:32 UTC (rev 3088)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-07-20 01:34:56 UTC (rev 3089)
@@ -14,7 +14,7 @@
import org.testng.annotations.Test;
/**
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@BeansXml("beans.xml")
@@ -25,12 +25,12 @@
@Test
@SpecAssertions({
@SpecAssertion(section = "2.3.5", id = "c"),
- @SpecAssertion(section = "3.4.5", id = "b"),
- @SpecAssertion(section = "3.4.5", id = "c"),
- @SpecAssertion(section = "3.4.5", id = "e"),
- @SpecAssertion(section = "3.4.6", id = "ba"),
- @SpecAssertion(section = "3.4.7", id = "a"),
- @SpecAssertion(section = "3.4.9", id = "aa")
+ @SpecAssertion(section = "3.3.5", id = "b"),
+ @SpecAssertion(section = "3.3.5", id = "c"),
+ @SpecAssertion(section = "3.3.5", id = "e"),
+ @SpecAssertion(section = "3.3.6", id = "ba"),
+ @SpecAssertion(section = "3.3.7", id = "a"),
+ @SpecAssertion(section = "3.3.9", id = "aa")
})
public void testBindingTypesAppliedToDisposalMethodParameters() throws Exception
{
@@ -53,8 +53,8 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "3.4.5", id = "a"),
- @SpecAssertion(section = "3.4.6", id = "ba")
+ @SpecAssertion(section = "3.3.5", id = "a"),
+ @SpecAssertion(section = "3.3.6", id = "ba")
})
public void testDisposalMethodOnNonBean() throws Exception
{
@@ -83,7 +83,7 @@
* @throws Exception
*/
@Test(groups = { "disposalMethod" })
- @SpecAssertion(section = "3.4.8", id = "a")
+ @SpecAssertion(section = "3.3.8", id = "a")
public void testDisposalMethodParametersGetInjected() throws Exception
{
new RunInDependentContext()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java 2009-07-19 23:52:32 UTC (rev 3088)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java 2009-07-20 01:34:56 UTC (rev 3089)
@@ -12,7 +12,7 @@
import org.testng.annotations.Test;
/**
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@@ -22,8 +22,8 @@
{
@Test
@SpecAssertions({
- @SpecAssertion(section = "3.4.5", id = "d"),
- @SpecAssertion(section = "3.4.7", id = "fa")
+ @SpecAssertion(section = "3.3.5", id = "d"),
+ @SpecAssertion(section = "3.3.7", id = "fa")
})
public void testDisposalMethodNotBusinessOrStatic()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java 2009-07-19 23:52:32 UTC (rev 3088)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java 2009-07-20 01:34:56 UTC (rev 3089)
@@ -11,7 +11,7 @@
import org.testng.annotations.Test;
/**
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@@ -20,8 +20,8 @@
{
@Test
@SpecAssertions({
- @SpecAssertion(section = "3.4.6", id = "a"),
- @SpecAssertion(section = "3.4.7", id = "ba")
+ @SpecAssertion(section = "3.3.6", id = "a"),
+ @SpecAssertion(section = "3.3.7", id = "ba")
})
public void testMultipleDisposeParameters()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-07-19 23:52:32 UTC (rev 3088)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-07-20 01:34:56 UTC (rev 3089)
@@ -8,7 +8,7 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
*/
@Artifact
@@ -17,7 +17,7 @@
{
@Test(groups = { "resolution" })
- @SpecAssertion(section = "5.2", id = "c")
+ @SpecAssertion(section = "5.4", id = "review") // deployment types removed from spec
public void testOnlyHighestPrecedenceResolved() throws Exception
{
// Both Cod and Plaice are named "whitefish" - Plaice has the highest
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java 2009-07-19 23:52:32 UTC (rev 3088)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java 2009-07-20 01:34:56 UTC (rev 3089)
@@ -13,27 +13,27 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
*/
@Artifact
public class ResolutionByNameTest extends AbstractJSR299Test
{
- @Test(groups={"stub", "el"}) @SpecAssertion(section="5.6", id = "aba")
+ @Test(groups={"stub", "el"}) @SpecAssertion(section="5.8", id = "aba")
public void testELResolverRegisteredWithJsf()
{
assert false;
}
- @Test(groups={"stub", "el"}) @SpecAssertion(section="5.6", id = "aaa")
+ @Test(groups={"stub", "el"}) @SpecAssertion(section="5.8", id = "aaa")
public void testELResolverRegisteredWithServlet()
{
assert false;
}
@Test
- @SpecAssertion(section="5.6", id="c")
+ @SpecAssertion(section="5.8", id="c")
public void testQualifiedNameLookup()
{
assert getCurrentConfiguration().getEl().evaluateValueExpression("#{javax.context.conversation}", Conversation.class) != null;
@@ -42,7 +42,7 @@
@Test(groups = "beanLifecycle")
@SpecAssertions({
- @SpecAssertion(section = "5.6", id = "bc"),
+ @SpecAssertion(section = "5.8", id = "bc"),
@SpecAssertion(section = "6.5.2", id = "a")
})
public void testContextCreatesNewInstanceForInjection()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-07-19 23:52:32 UTC (rev 3088)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-07-20 01:34:56 UTC (rev 3089)
@@ -52,7 +52,7 @@
}
@Test(groups="resolution", expectedExceptions=IllegalArgumentException.class)
- @SpecAssertion(section="5.3", id = "e")
+ @SpecAssertion(section="5.3", id = "review") // seems to be removed from spec - double check
public void testNonBindingTypeUsed()
{
getBeans(Tuna.class, new AnotherDeploymentTypeLiteral());
14 years, 11 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3088 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: implementation/producer/method/definition and 7 other directories.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-07-19 19:52:32 -0400 (Sun, 19 Jul 2009)
New Revision: 3088
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
Log:
matched miscellaneous tests to assertions
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-07-19 13:31:12 UTC (rev 3087)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-07-19 23:52:32 UTC (rev 3088)
@@ -11,7 +11,7 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
*/
@Artifact
@@ -21,7 +21,7 @@
@Test(groups = { "producerField" })
@SpecAssertions({
- @SpecAssertion(section = "7.6", id = "b")
+ @SpecAssertion(section = "7.3.5", id = "review") // removed from spec
})
public void testProducerFieldNotAnotherBean()
{
@@ -38,8 +38,8 @@
@Test(groups = { "producerField" })
@SpecAssertions({
- @SpecAssertion(section = "5.4.7", id = "a"),
- @SpecAssertion(section = "3.5", id = "b")
+ @SpecAssertion(section = "5.6.7", id = "a"),
+ @SpecAssertion(section = "3.4", id = "b")
})
public void testProducerStaticFieldBean()
{
@@ -58,9 +58,8 @@
@Test(groups = { "producerField" })
@SpecAssertions({
@SpecAssertion(section = "4.3.2", id = "a"),
- @SpecAssertion(section = "5.4.7", id = "b"),
- @SpecAssertion(section = "7.6", id = "ga"),
- @SpecAssertion(section = "7.6", id = "a")
+ @SpecAssertion(section = "5.6.7", id = "b"),
+ @SpecAssertion(section = "7.3.5", id = "ga")
})
public void testProducerFieldBeanCreate() throws Exception
{
@@ -95,8 +94,8 @@
@Test(groups = { "producerField" })
@SpecAssertions({
- @SpecAssertion(section = "3.5", id = "d"),
- @SpecAssertion(section = "7.6", id = "m")
+ @SpecAssertion(section = "3.4", id = "d"),
+ @SpecAssertion(section = "7.3.5", id = "m")
})
public void testProducerFieldReturnsNullIsDependent() throws Exception
{
@@ -113,8 +112,8 @@
@Test(groups = { "producerField" }, expectedExceptions = IllegalProductException.class)
@SpecAssertions({
- @SpecAssertion(section = "3.5", id = "e"),
- @SpecAssertion(section = "7.6", id = "n")
+ @SpecAssertion(section = "3.4", id = "e"),
+ @SpecAssertion(section = "7.3.5", id = "n")
})
public void testProducerFieldReturnsNullIsNotDependent() throws Exception
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-07-19 13:31:12 UTC (rev 3087)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-07-19 23:52:32 UTC (rev 3088)
@@ -180,7 +180,7 @@
@Test(groups = "producerMethod")
@SpecAssertions({
- @SpecAssertion(section = "3.3.2", id = "bc"),
+ @SpecAssertion(section = "review", id = "review"), // deployment types removed from spec
@SpecAssertion(section = "review", id = "review")
})
public void testDeploymentType() throws Exception
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-07-19 13:31:12 UTC (rev 3087)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-07-19 23:52:32 UTC (rev 3088)
@@ -14,6 +14,11 @@
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
import org.testng.annotations.Test;
+/**
+ *
+ * Spec version: 20090625
+ *
+ */
@Artifact
@IntegrationTest
@Packaging(PackagingType.EAR)
@@ -25,9 +30,8 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "4.3.1", id = "f"),
- @SpecAssertion(section = "3.3.7", id = "b"),
- @SpecAssertion(section = "3.3.7", id = "c")
+ @SpecAssertion(section = "3.2.4", id = "review"), // removed from spec?
+ @SpecAssertion(section = "3.2.4", id = "review")
})
public void testSpecializedBeanNotInstantiated() throws Exception
{
@@ -46,7 +50,7 @@
@Test
- @SpecAssertion(section="4.3.1", id = "g")
+ @SpecAssertion(section="review", id = "review") // removed from spec?
public void testProducerMethodOnSpecializedBeanCalledOnSpecializingBean() throws Exception
{
new RunInDependentContext()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java 2009-07-19 13:31:12 UTC (rev 3087)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java 2009-07-19 23:52:32 UTC (rev 3088)
@@ -9,7 +9,7 @@
import org.testng.annotations.Test;
/**
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@Packaging(PackagingType.EAR)
@@ -17,14 +17,14 @@
public class InvalidEnterpriseBeanSpecializationTest extends AbstractJSR299Test
{
@Test(groups={"stub", "specialization"})
- @SpecAssertion(section="3.3.4", id = "e")
+ @SpecAssertion(section="3.2.4", id = "review") // removed from spec?
public void testSpecializingBeanDoesNotSupportAllLocalInterfacesOnSpecializedBean()
{
assert false;
}
@Test(groups={"stub", "specialization"})
- @SpecAssertion(section="3.3.4", id = "f")
+ @SpecAssertion(section="3.2.4", id = "review") // removed from spec?
public void testSpecializingBeanDoesNotSupportLocalInterfaceView()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-07-19 13:31:12 UTC (rev 3087)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-07-19 23:52:32 UTC (rev 3088)
@@ -11,7 +11,7 @@
import org.testng.annotations.Test;
/**
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@@ -21,7 +21,7 @@
@Test(groups={"specialization"})
- @SpecAssertion(section="3.3.4", id = "da")
+ @SpecAssertion(section="3.2.4", id = "da")
public void testSpecializingClassDirectlyExtendsNothing()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-07-19 13:31:12 UTC (rev 3087)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-07-19 23:52:32 UTC (rev 3088)
@@ -11,7 +11,7 @@
import org.testng.annotations.Test;
/**
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@Packaging(PackagingType.EAR)
@@ -21,7 +21,7 @@
@Test(groups={"specialization"})
- @SpecAssertion(section="3.3.4", id = "da")
+ @SpecAssertion(section="3.2.4", id = "da")
public void testSpecializingClassDirectlyExtendsSimpleBean()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-07-19 13:31:12 UTC (rev 3087)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-07-19 23:52:32 UTC (rev 3088)
@@ -11,7 +11,7 @@
import org.testng.annotations.Test;
/**
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@ExpectedDeploymentException(DefinitionError.class)
@Artifact
@@ -20,7 +20,7 @@
{
@Test(groups={"specialization"})
- @SpecAssertion(section="3.3.4", id = "da")
+ @SpecAssertion(section="3.2.4", id = "da")
public void testSpecializingClassImplementsInterfaceAndExtendsNothing()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java 2009-07-19 13:31:12 UTC (rev 3087)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java 2009-07-19 23:52:32 UTC (rev 3088)
@@ -22,7 +22,7 @@
/**
* Tests for dependency resolution problem detection
*
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
public class DependencyResolutionTest extends AbstractJSR299Test
@@ -83,7 +83,7 @@
}
@Test(groups = "rewrite")
- @SpecAssertion(section = "5.1.2", id = "aa")
+ @SpecAssertion(section = "5.3.1", id = "aa")
public void testUnsatisfiedDependencyDetected() throws Exception
{
Bean<Vanilla> vanillaBean = getBeans(Vanilla.class).iterator().next();
@@ -97,7 +97,7 @@
}
@Test(groups = "rewrite")
- @SpecAssertion(section = "5.1.2", id = "aa")
+ @SpecAssertion(section = "5.3.1", id = "aa")
public void testAmbiguousDependencyDetected() throws Exception
{
Bean<Vanilla> vanillaBean = getBeans(Vanilla.class).iterator().next();
@@ -110,7 +110,7 @@
}
@Test(groups = "rewrite")
- @SpecAssertion(section = "5.3.1", id = "aa")
+ @SpecAssertion(section = "5.5.1", id = "aa")
public void testUnproxyableDependencyDetected() throws Exception
{
final Bean<Mustard> bean = getBeans(Mustard.class).iterator().next();
@@ -164,7 +164,7 @@
}
@Test
- @SpecAssertion(section="5.1.3", id="aa")
+ @SpecAssertion(section="5.3.4", id="aa")
public void testTypeBoxing()
{
assert getInstanceByType(Integer.class, new AnnotationLiteral<Small>() {}).equals(IntegerProducer.VALUE);
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java 2009-07-19 13:31:12 UTC (rev 3087)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java 2009-07-19 23:52:32 UTC (rev 3088)
@@ -8,16 +8,15 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
*/
@Artifact
@BeansXml("beans.xml")
public class InjectionTest extends AbstractJSR299Test
{
-
@Test(groups = { "injection", "producerMethod" })
- @SpecAssertion(section = "5.1.3", id = "aa")
+ @SpecAssertion(section = "5.3.4", id = "aa")
public void testInjectionPerformsBoxingIfNecessary() throws Exception
{
assert getBeans(SpiderNest.class).size() == 1;
@@ -59,7 +58,7 @@
}
@Test(groups = {"injection", "underInvestigation"})
- @SpecAssertion(section = "3.8", id = "aa")
+ @SpecAssertion(section = "3.7", id = "aa")
public void testInjectingStaticField()
{
assert getBeans(BeanWithStaticBoundField_Broken.class).size() == 1;
@@ -67,7 +66,7 @@
}
@Test(groups = {"injection", "underInvestigation"})
- @SpecAssertion(section = "3.8", id = "ab")
+ @SpecAssertion(section = "3.7", id = "ab")
public void testInjectingFinalField()
{
assert getBeans(BeanWithFinalBoundField_Broken.class).size() == 1;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-07-19 13:31:12 UTC (rev 3087)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-07-19 23:52:32 UTC (rev 3088)
@@ -18,7 +18,7 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
*/
@Artifact
@@ -28,7 +28,7 @@
@Test(groups="resolution")
@SpecAssertions({
- @SpecAssertion(section="5.1", id = "gaa")
+ @SpecAssertion(section="5.3", id = "review") // removed from spec?
})
public void testDefaultBindingTypeAssumed() throws Exception
{
@@ -45,14 +45,14 @@
}
@Test(groups = { "resolution", "rewrite" }, expectedExceptions=IllegalArgumentException.class)
- @SpecAssertion(section="5.1", id = "d")
+ @SpecAssertion(section="5.3", id = "review") // removed from spec?
public void testDuplicateBindingTypesUsed()
{
getBeans(Tuna.class, new CurrentLiteral(), new CurrentLiteral());
}
@Test(groups="resolution", expectedExceptions=IllegalArgumentException.class)
- @SpecAssertion(section="5.1", id = "e")
+ @SpecAssertion(section="5.3", id = "e")
public void testNonBindingTypeUsed()
{
getBeans(Tuna.class, new AnotherDeploymentTypeLiteral());
@@ -60,7 +60,7 @@
@Test(groups="resolution")
@SpecAssertions({
- @SpecAssertion(section = "5.1", id ="faa")
+ @SpecAssertion(section = "5.3", id ="review") // removed from spec?
})
public void testResolveByType() throws Exception
{
@@ -95,9 +95,9 @@
@Test(groups="injection")
@SpecAssertions({
@SpecAssertion(section = "2.3.4", id = "b" ),
- @SpecAssertion(section = "5.1", id = "gba"),
+ @SpecAssertion(section = "5.3", id = "l"),
@SpecAssertion(section = "2.3.3", id = "d" ),
- @SpecAssertion(section = "5.1.5", id = "a" )
+ @SpecAssertion(section = "5.3.6", id = "a" )
})
public void testAllBindingTypesSpecifiedForResolutionMustAppearOnWebBean()
{
@@ -123,9 +123,8 @@
@Test(groups="resolution")
@SpecAssertions({
- @SpecAssertion(section="5.1", id = "fd"),
- @SpecAssertion(section="2.2", id="bb"),
- @SpecAssertion(section="2.2", id="ba")
+ @SpecAssertion(section="2.2", id="review"),
+ @SpecAssertion(section="2.2", id="review") // what is this testing?
})
public void testResolveByTypeWithTypeParameter() throws Exception
{
@@ -134,13 +133,13 @@
}
@Test(groups={"resolution", "producerMethod"})
- @SpecAssertion(section="5.1", id = "fc")
+ @SpecAssertion(section="2.2.1", id = "i")
public void testResolveByTypeWithArray() throws Exception
{
assert getBeans(Spider[].class).size() == 1;
}
- @Test @SpecAssertion(section="5.1", id = "ha")
+ @Test @SpecAssertion(section="5.3", id = "review") // deployment types removed
public void testOnlyHighestEnabledPrecedenceWebBeansResolved() throws Exception
{
assert getBeans(Animal.class, new AnnotationLiteral<Whitefish>() {}).size() == 1;
@@ -149,7 +148,7 @@
@Test(groups="resolution")
- @SpecAssertion(section="5.1", id = "hb")
+ @SpecAssertion(section="5.3", id = "review") // deployment types removed
public void testNoWebBeansFound() throws Exception
{
assert getBeans(Tuna.class, new AnnotationLiteral<FakeFish>() {}).size() == 0;
@@ -157,7 +156,7 @@
@Test(groups="resolution")
@SpecAssertions({
- @SpecAssertion(section="5.1", id = "gca")
+ @SpecAssertion(section="5.3", id = "l")
})
public void testResolveByTypeWithNonBindingMembers() throws Exception
{
@@ -195,7 +194,7 @@
}
@Test(groups={"resolution", "broken"})
- @SpecAssertion(section="5.1.4", id = "ca")
+ @SpecAssertion(section="5.3.5", id = "ca")
public void testArrayValuedAnnotationMemberWithoutNonBinding()
{
Throwable t = null;
@@ -220,7 +219,7 @@
}
@Test(groups={"resolution", "broken"})//, expectedExceptions=DefinitionException.class)
- @SpecAssertion(section="5.1.4", id = "cb")
+ @SpecAssertion(section="5.3.5", id = "cb")
public void testAnnotationValuedAnnotationMemberWithoutNonBinding()
{
Throwable t = null;
14 years, 11 months
- 1
- 0