[webbeans-commits] Webbeans SVN: r2825 - in tck/trunk: impl/src/main/java/org/jboss/jsr299/tck/tests/xml and 59 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Fri Jun 12 09:09:32 EDT 2009
Author: dallen6
Date: 2009-06-12 09:09:32 -0400 (Fri, 12 Jun 2009)
New Revision: 2825
Added:
tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/
tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/
tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/
tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/
tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/
tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/tests/xml/schema/
tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/
tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/declaration/deployment/
tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/
tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/
tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/
tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/schema/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/declaration/deployment/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/
tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/beans.xml
tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/declaration/deployment/beans.xml
tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/beans.xml
tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/invalid-beans.xml
tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/schema.xsd
tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/standard-beans.xml
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.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/deployment/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/broken/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/custom/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/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/definition/stereotype/tooManyDeployElements/default-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/register/fires1/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/broken1/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/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/directlyExtendSimpleBean/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementsInterfaceAndExtendsNothing/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/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/indirectOverride/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/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:
Changed all beans.xml files to new format and moved all XML tests to xml module
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java 2009-06-12 13:09:32 UTC (rev 2825)
@@ -2,7 +2,10 @@
import javax.enterprise.inject.AnnotationLiteral;
-abstract class ChunkyLiteral extends AnnotationLiteral<Chunky> implements Chunky
+class ChunkyLiteral extends AnnotationLiteral<Chunky> implements Chunky
{
-
+ public boolean realChunky()
+ {
+ return true;
+ }
}
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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-06-12 13:09:32 UTC (rev 2825)
@@ -30,8 +30,7 @@
@Test(groups="resolution")
@SpecAssertions({
- @SpecAssertion(section="5.9", id = "b"),
- @SpecAssertion(section="5.9", id = "ga")
+ @SpecAssertion(section="5.1", id = "gaa")
})
public void testDefaultBindingTypeAssumed() throws Exception
{
@@ -40,29 +39,22 @@
assert possibleTargets.iterator().next().getTypes().contains(Tuna.class);
}
- @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class)
- @SpecAssertion(section="5.9", id = "cb")
- public void testParameterizedTypeWithWildcardParameter()
- {
- getBeans(new TypeLiteral<ParameterizedBean_Broken<?>>(){});
- }
-
- @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class)
- @SpecAssertion(section="5.9", id = "ca")
+ @Test(groups = { "resolution", "rewrite" }, expectedExceptions = IllegalArgumentException.class)
+ // This assertion comes back later
public <T> void testParameterizedTypeWithTypeParameter()
{
getBeans(new TypeLiteral<ParameterizedBean_Broken<T>>(){});
}
- @Test(groups="resolution", expectedExceptions=DuplicateBindingTypeException.class)
- @SpecAssertion(section="5.9", id = "d")
+ @Test(groups = { "resolution", "rewrite" }, expectedExceptions=DuplicateBindingTypeException.class)
+ @SpecAssertion(section="5.1", id = "d")
public void testDuplicateBindingTypesUsed()
{
getBeans(Tuna.class, new CurrentLiteral(), new CurrentLiteral());
}
@Test(groups="resolution", expectedExceptions=IllegalArgumentException.class)
- @SpecAssertion(section="5.9", id = "e")
+ @SpecAssertion(section="5.1", id = "e")
public void testNonBindingTypeUsed()
{
getBeans(Tuna.class, new AnotherDeploymentTypeLiteral());
@@ -70,8 +62,8 @@
@Test(groups="resolution")
@SpecAssertions({
- @SpecAssertion(section="5.9", id = "a"),
- @SpecAssertion(section = "5.9", id ="fa")
+ @SpecAssertion(section="5.1", id = "a"),
+ @SpecAssertion(section = "5.1", id ="fa")
})
public void testResolveByType() throws Exception
{
@@ -105,29 +97,15 @@
@Test(groups="injection")
@SpecAssertions({
- @SpecAssertion(section = "2.3.5", id = "b" ),
- @SpecAssertion(section = "5.9", id = "gb"),
+ @SpecAssertion(section = "2.3.4", id = "b" ),
+ @SpecAssertion(section = "5.1", id = "gb"),
@SpecAssertion(section = "2.3.3", id = "d" ),
- @SpecAssertion(section = "5.9.2", id = "a" )
+ @SpecAssertion(section = "5.1.5", id = "a" )
})
public void testAllBindingTypesSpecifiedForResolutionMustAppearOnWebBean()
{
- assert getBeans(Animal.class, new ChunkyLiteral() {
-
- public boolean realChunky()
- {
- return true;
- }
-
- }, new AnnotationLiteral<Whitefish>() {}).size() == 1;
- assert getBeans(Animal.class, new ChunkyLiteral() {
-
- public boolean realChunky()
- {
- return true;
- }
-
- }, new AnnotationLiteral<Whitefish>() {}).iterator().next().getTypes().contains(Cod.class);
+ assert getBeans(Animal.class, new ChunkyLiteral(), new AnnotationLiteral<Whitefish>() {}).size() == 1;
+ assert getBeans(Animal.class, new ChunkyLiteral(), new AnnotationLiteral<Whitefish>() {}).iterator().next().getTypes().contains(Cod.class);
assert getBeans(ScottishFish.class, new AnnotationLiteral<Whitefish>() {}).size() == 2;
List<Class<? extends Animal>> classes = new ArrayList<Class<? extends Animal>>();
@@ -148,7 +126,7 @@
@Test(groups="resolution")
@SpecAssertions({
- @SpecAssertion(section="5.9", id = "fd"),
+ @SpecAssertion(section="5.1", id = "fd"),
@SpecAssertion(section="2.2", id="bb"),
@SpecAssertion(section="2.2", id="ba")
})
@@ -159,13 +137,13 @@
}
@Test(groups={"resolution", "producerMethod"})
- @SpecAssertion(section="5.9", id = "fc")
+ @SpecAssertion(section="5.1", id = "fc")
public void testResolveByTypeWithArray() throws Exception
{
assert getBeans(Spider[].class).size() == 1;
}
- @Test @SpecAssertion(section="5.9", id = "ha")
+ @Test @SpecAssertion(section="5.1", id = "ha")
public void testOnlyHighestEnabledPrecedenceWebBeansResolved() throws Exception
{
assert getBeans(Animal.class, new AnnotationLiteral<Whitefish>() {}).size() == 1;
@@ -175,7 +153,7 @@
@Test(groups="resolution")
- @SpecAssertion(section="5.9", id = "hb")
+ @SpecAssertion(section="5.1", id = "hb")
public void testNoWebBeansFound() throws Exception
{
assert getBeans(Tuna.class, new AnnotationLiteral<FakeFish>() {}).size() == 0;
@@ -183,9 +161,8 @@
@Test(groups="resolution")
@SpecAssertions({
- @SpecAssertion(section="5.9.1", id = "b"),
- @SpecAssertion(section="5.9", id = "gc"),
- @SpecAssertion(section="5.9", id = "gd")
+ @SpecAssertion(section="5.1.4", id = "b"),
+ @SpecAssertion(section="5.1", id = "gca")
})
public void testResolveByTypeWithNonBindingMembers() throws Exception
{
@@ -223,7 +200,7 @@
}
@Test(groups="resolution", expectedExceptions=DefinitionException.class)
- @SpecAssertion(section="5.9.1", id = "ca")
+ @SpecAssertion(section="5.1.4", id = "ca")
public void testArrayValuedAnnotationMemberWithoutNonBinding()
{
getBeans(Animal.class, new BindingTypeWithBindingArrayTypeMemberLiteral_Broken() {
@@ -237,7 +214,7 @@
}
@Test(groups="resolution", expectedExceptions=DefinitionException.class)
- @SpecAssertion(section="5.9.1", id = "cb")
+ @SpecAssertion(section="5.1.4", id = "cb")
public void testAnnotationValuedAnnotationMemberWithoutNonBinding()
{
getBeans(Animal.class, new BindingTypeWithBindingAnnotationMemberLiteral_Broken()
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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/dependent/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.context.dependent">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.context.passivating">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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/deployment/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/beans.xml 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,11 +1,10 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.definition.deployment">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- <test:HornedAnimalDeploymentType />
- <test:NotInheritedDeploymentType />
- <test:InheritedDeploymentType />
- </Deploy>
-</Beans>
+<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/definition/deployment/broken/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/broken/beans.xml 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/broken/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,6 +1,6 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.definition.deployment">
- <Deploy>
- <Production />
- </Deploy>
-</Beans>
+<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/definition/deployment/custom/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/custom/beans.xml 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/custom/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.definition.deployment.custom">
- <Deploy>
- <Standard />
- <test:AnotherDeploymentType />
- <test:HornedAnimalDeploymentType />
- </Deploy>
-</Beans>
+<beans>
+ <deploy>
+ <type>javax.enterprise.inject.deployment.Standard</type>
+ <type>org.jboss.jsr299.tck.tests.definition.deployment.custom.AnotherDeploymentType</type>
+ <type>org.jboss.jsr299.tck.tests.definition.deployment.custom.HornedAnimalDeploymentType</type>
+ </deploy>
+</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/beans.xml 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,9 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.definition.deployment.enterprise">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- <test:HornedAnimalDeploymentType />
- </Deploy>
-</Beans>
+<beans>
+ <deploy>
+ <type>javax.enterprise.inject.deployment.Standard</type>
+ <type>org.jboss.jsr299.tck.tests.definition.deployment.enterprise.AnotherDeploymentType</type>
+ <type>org.jboss.jsr299.tck.tests.definition.deployment.enterprise.HornedAnimalDeploymentType</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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,9 +1,8 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.definition.stereotype">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- <test:HornedAnimalDeploymentType />
- </Deploy>
-</Beans>
+<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>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeployElements/default-beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeployElements/default-beans.xml 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeployElements/default-beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,6 +1,6 @@
-<Beans xmlns="urn:java:ee">
- <Deploy>
- <Standard />
- <Production />
- </Deploy>
-</Beans>
+<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/event/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/event/beans.xml 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/event/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.event">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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/register/fires1/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/event/register/fires1/beans.xml 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/event/register/fires1/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.event.register.fires1">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<beans>
+ <deploy>
+ <type>javax.enterprise.inject.deployment.Standard</type>
+ <type>javax.enterprise.inject.deployment.Production</type>
+ <type>org.jboss.jsr299.tck.tests.event.register.fires1.AnotherDeploymentType</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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.implementation.disposal.method.definition">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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/broken1/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/beans.xml 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,7 +1,7 @@
-<Beans xmlns="urn:java:ee" xmlns:test="urn:java:org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken1" >
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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.broken1.AnotherDeploymentType</type>
+ </deploy>
+</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/beans.xml 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken2" >
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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.broken2.AnotherDeploymentType</type>
+ </deploy>
+</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/beans.xml 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken3" >
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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.broken3.AnotherDeploymentType</type>
+ </deploy>
+</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/beans.xml 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken4" >
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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.broken4.AnotherDeploymentType</type>
+ </deploy>
+</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/beans.xml 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken5" >
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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.broken5.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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.implementation.enterprise.definition">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.implementation.producer.field.definition">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.implementation.producer.field.definition.enterprise">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,9 +1,8 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- <test:HighestDeploymentType />
- </Deploy>
-</Beans>
+<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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,9 +1,8 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.implementation.producer.method.definition">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- <test:SpiderDeploymentType />
- </Deploy>
-</Beans>
+<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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,9 +1,8 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle">
- <Deploy>
- <Standard />
- <Production />
- <test:PoultryFarmDeploymentType />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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.AnotherDeploymentType</type>
+ <type>org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle.PoultryFarmDeploymentType</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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,11 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.implementation.simple.lifecycle">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
- <test:Farm>
- <test:location>Indiana</test:location>
- </test:Farm>
-</Beans>
+<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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,12 +1,6 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb">
- <Deploy>
- <Standard />
- <Production />
- </Deploy>
- <test:RemoteEjbInterface>
- <EJB>
- <mappedName>ejb/MyRemoteEjb</mappedName>
- </EJB>
- </test:RemoteEjbInterface>
-</Beans>
+<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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,13 +1,5 @@
-<Beans xmlns="urn:java:ee">
- <EntityManager>
- <PersistenceContext>
- <unitName>test</unitName>
- </PersistenceContext>
- </EntityManager>
-
- <EntityManagerFactory>
- <PersistenceUnit>
- <unitName>test</unitName>
- </PersistenceUnit>
- </EntityManagerFactory>
-</Beans>
+<beans>
+ <deploy>
+ <type>javax.enterprise.inject.deployment.Standard</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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/realization/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,9 +1,8 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.realization">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- <test:FarmAnimalDeploymentType />
- </Deploy>
-</Beans>
+<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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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/directlyExtendSimpleBean/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendSimpleBean/beans.xml 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendSimpleBean/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendSimpleBean">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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.directlyExtendSimpleBean.AnotherDeploymentType</type>
+ </deploy>
+</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementsInterfaceAndExtendsNothing/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementsInterfaceAndExtendsNothing/beans.xml 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementsInterfaceAndExtendsNothing/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.implementsInterfaceAndExtendsNothing">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<beans>
+ <deploy>
+ <type>javax.enterprise.inject.deployment.Standard</type>
+ <type>javax.enterprise.inject.deployment.Production</type>
+ <type>org.jboss.jsr299.tck.tests.inheritance.specialization.implementsInterfaceAndExtendsNothing.AnotherDeploymentType</type>
+ </deploy>
+</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/beans.xml 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.sameName">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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.sameName.AnotherDeploymentType</type>
+ </deploy>
+</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/beans.xml 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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.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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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/indirectOverride/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/beans.xml 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.producer.indirectOverride">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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.indirectOverride.AnotherDeploymentType</type>
+ </deploy>
+</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/beans.xml 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializesStaticMethod">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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.specializesStaticMethod.AnotherDeploymentType</type>
+ </deploy>
+</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/beans.xml 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.producer.specializingAndSpecializedBeanHaveSameName">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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.specializingAndSpecializedBeanHaveSameName.AnotherDeploymentType</type>
+ </deploy>
+</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/beans.xml 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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.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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.simple">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,7 +1,6 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.names">
- <Deploy>
- <Standard />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,7 +1,6 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend1">
- <Deploy>
- <Standard />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,7 +1,6 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend2">
- <Deploy>
- <Standard />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,7 +1,6 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend3">
- <Deploy>
- <Standard />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,7 +1,6 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two">
- <Deploy>
- <Standard />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/byname/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.lookup.byname">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.lookup.injection">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/session/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,7 +1,6 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.lookup.injection">
- <Deploy>
- <Standard />
- <Production />
- </Deploy>
-</Beans>
+<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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/nonContextual/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,7 +1,6 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.lookup.nonContextual">
- <Deploy>
- <Standard />
- <Production />
- </Deploy>
-</Beans>
+<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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/nonContextual/servlet/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,7 +1,6 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.lookup.nonContextual">
- <Deploy>
- <Standard />
- <Production />
- </Deploy>
-</Beans>
+<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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,8 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.lookup.typesafe.resolution">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
-</Beans>
+<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>
Copied: tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes (from rev 2824, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes)
Copied: tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration (from rev 2824, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration)
Copied: tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata (from rev 2824, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata)
Copied: tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace (from rev 2824, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace)
Copied: tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/tests/xml/resource (from rev 2824, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource)
Copied: tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/tests/xml/schema (from rev 2824, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/schema)
Copied: tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes (from rev 2824, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes)
Deleted: tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/beans.xml 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,46 +0,0 @@
-<Beans xmlns="urn:java:ee"
- xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes"
- xmlns:manager="urn:java:javax.enterprise.inject.spi">
- <dd:TestBindingType>
- <BindingType />
- </dd:TestBindingType>
- <dd:AnotherTestBindingType>
- <BindingType />
- </dd:AnotherTestBindingType>
- <dd:TestInterceptorBindingType>
- <InterceptorBindingType />
- </dd:TestInterceptorBindingType>
- <dd:AnotherTestInterceptorBindingType>
- <InterceptorBindingType />
- </dd:AnotherTestInterceptorBindingType>
- <dd:TestStereotype>
- <Stereotype />
- <Named />
- <dd:TestScopeType />
- <dd:TestDeploymentType />
- <dd:AnotherTestInterceptorBindingType />
- </dd:TestStereotype>
- <dd:AnotherTestStereotype>
- <Stereotype />
- <RequestScoped />
- </dd:AnotherTestStereotype>
- <!--
- *** Uncomment once WBRI-252 is fixed. ***
- <dd:InterceptorType1>
- <InterceptorBindingType />
- </dd:InterceptorType1>
- <dd:InterceptorType2>
- <InterceptorBindingType />
- <dd:InterceptorType1 />
- </dd:InterceptorType2>
- -->
- <!--
- *** Uncomment once WBRI-244 is fixed. ***
- <dd:BeanWithBindingAnnotation>
- <dd:TestBindingType />
- </dd:BeanWithBindingAnnotation>
- -->
- <dd:BeanWithAnotherStereotype>
- <dd:AnotherTestStereotype />
- </dd:BeanWithAnotherStereotype>
-</Beans>
\ No newline at end of file
Copied: tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/declaration/deployment (from rev 2824, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/declaration/deployment)
Deleted: tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/declaration/deployment/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/declaration/deployment/beans.xml 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/declaration/deployment/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,11 +0,0 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.xml.declaration.deployment.foo">
- <Deploy>
- <Standard />
- <Production />
- <test:TestDeploymentType />
- </Deploy>
- <test:Order>
- <test:TestDeploymentType />
- </test:Order>
-</Beans>
Copied: tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata (from rev 2824, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata)
Deleted: tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/beans.xml 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,19 +0,0 @@
-<Beans xmlns="urn:java:ee"
- xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.metadata.foo"
- xmlns:bb="urn:java:org.jboss.jsr299.tck.tests.xml.metadata.foo.another">
- <Deploy>
- <Standard />
- <Production />
- <dd:AnotherDeploymentType />
- </Deploy>
- <dd:Order>
- <dd:AnotherDeploymentType />
- <dd:str />
- <dd:getStr />
- </dd:Order>
- <bb:AnotherOrder>
- <dd:AnotherDeploymentType />
- <bb:str />
- <bb:getStr />
- </bb:AnotherOrder>
-</Beans>
\ No newline at end of file
Copied: tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace (from rev 2824, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace)
Copied: tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource (from rev 2824, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource)
Copied: tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema (from rev 2824, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema)
Deleted: tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/invalid-beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/invalid-beans.xml 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/invalid-beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,11 +0,0 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.xml.schema">
- <Deploy>
- <Standard />
- <Production />
- </Deploy>
- <test:Order>
- <test:shipToAddress>123 Main St., Anywhere, MA</test:shipToAddress>
- <test:shippingMethod>DHL</test:shippingMethod>
- </test:Order>
-</Beans>
\ No newline at end of file
Deleted: tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/schema.xsd
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/schema.xsd 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/schema.xsd 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,9 +0,0 @@
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:java:org.jboss.jsr299.tck.tests.xml.schema">
- <xs:element name="Order">
- <xs:complexType>
- <xs:sequence minOccurs="0" maxOccurs="unbounded">
- <xs:element name="shipToAddress" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-</xs:schema>
\ No newline at end of file
Deleted: tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/standard-beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/standard-beans.xml 2009-06-11 15:21:47 UTC (rev 2824)
+++ tck/trunk/xml/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/standard-beans.xml 2009-06-12 13:09:32 UTC (rev 2825)
@@ -1,10 +0,0 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.xml.schema">
- <Deploy>
- <Standard />
- <Production />
- </Deploy>
- <test:Order>
- <test:shipToAddress>123 Main St., Anywhere, MA</test:shipToAddress>
- </test:Order>
-</Beans>
\ No newline at end of file
More information about the weld-commits
mailing list