[webbeans-commits] Webbeans SVN: r1711 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap and 13 other directories.

Author: pete.muir(a)jboss.org Date: 2009-02-25 17:38:35 -0500 (Wed, 25 Feb 2009) New Revision: 1711 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/BuildingLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmerLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmerLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/OfficeLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsNothing/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsNothing/Cow_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/FarmEquipment.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/TractorLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/Tractor_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Donkey_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/FarmYard_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/SameNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/Yard.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/YardInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/FarmerInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/Landowner.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/OrganicFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/SamePrecedenceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FarmerInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Landowner.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendSimpleBean/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendSimpleBean/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementsInterfaceAndExtendsNothing/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementsInterfaceAndExtendsNothing/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/beans.xml Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/BuildingInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Cow_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Donkey_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Egg.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmYard_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmerInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FishFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/OrganicFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/SheepFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Tractor_Broken.java Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Building.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Office.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/TractorLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Waste.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/YardInterface.java Log: Migrate more tests to @Artifact Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-02-25 21:03:05 UTC (rev 1710) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -288,7 +288,7 @@ super.preSpecialize(); if (getAnnotatedItem().getSuperclass() == null || getAnnotatedItem().getSuperclass().getType().equals(Object.class)) { - throw new DefinitionException("Specializing bean must extend another bean"); + throw new DefinitionException("Specializing bean must extend another bean " + toString()); } } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-02-25 21:03:05 UTC (rev 1710) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -136,6 +136,7 @@ { manager.setEnabledDeploymentTypes(enabledDeploymentTypes); } + log.info("Deployment types: " + manager.getEnabledDeploymentTypes()); registerBeans(getWebBeanDiscovery().discoverWebBeanClasses()); manager.fireEvent(manager, new InitializedLiteral()); log.info("Web Beans initialized. Validating beans."); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Building.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Building.java 2009-02-25 21:03:05 UTC (rev 1710) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Building.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -4,7 +4,7 @@ import javax.inject.Produces; @Stateful -class Building implements BuildingInterface +public class Building implements BuildingLocal { @Produces Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/BuildingInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/BuildingInterface.java 2009-02-25 21:03:05 UTC (rev 1710) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/BuildingInterface.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -import javax.ejb.Local; - -@Local -public interface BuildingInterface -{ - - String getClassName(); - -} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/BuildingLocal.java (from rev 1704, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/BuildingInterface.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/BuildingLocal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/BuildingLocal.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; + +import javax.ejb.Local; + +@Local +public interface BuildingLocal +{ + + String getClassName(); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/BuildingLocal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Cow_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Cow_Broken.java 2009-02-25 21:03:05 UTC (rev 1710) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Cow_Broken.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -1,12 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -import javax.ejb.Stateful; -import javax.inject.Specializes; - -@Specializes -@AnotherDeploymentType -@Stateful -class Cow_Broken -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Donkey_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Donkey_Broken.java 2009-02-25 21:03:05 UTC (rev 1710) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Donkey_Broken.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -1,12 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -import javax.ejb.Stateful; -import javax.inject.Specializes; - -@Specializes -@AnotherDeploymentType -@Stateful -class Donkey_Broken implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Egg.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Egg.java 2009-02-25 21:03:05 UTC (rev 1710) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Egg.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -class Egg -{ - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,63 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; + +import java.lang.annotation.Annotation; + +import javax.inject.AnnotationLiteral; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; +import org.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +@Artifact +@IntegrationTest +(a)Packaging(PackagingType.EAR) +(a)BeansXml(&quot;beans.xml&quot;) +public class EnterpriseBeanSpecializationIntegrationTest extends AbstractDeclarativeTest +{ + + private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral<Landowner>() {}; + + @Test + @SpecAssertions({ + @SpecAssertion(section = "4.3.1", id = "f"), + @SpecAssertion(section = "3.3.7", id = "b") + }) + public void testSpecializedBeanNotInstantiated() throws Exception + { + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + FarmerLocal farmer = getCurrentManager().getInstanceByType(FarmerLocal.class, LANDOWNER_LITERAL); + assert farmer.getClassName().equals(LazyFarmer.class.getName()); + } + + }.run(); + } + + + @Test(groups="ri-broken") + @SpecAssertion(section="4.3.1", id = "g") + public void testProducerMethodOnSpecializedBeanCalledOnSpecializingBean() throws Exception + { + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + assert getCurrentManager().resolveByType(Waste.class).size() == 1; + assert getCurrentManager().getInstanceByType(Waste.class).getFrom().equals(Office.class.getName()); + } + + }.run(); + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-02-25 21:03:05 UTC (rev 1710) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -3,34 +3,30 @@ import static org.jboss.jsr299.tck.impl.util.Reflections.annotationSetMatches; import java.lang.annotation.Annotation; -import java.util.ArrayList; -import java.util.List; import javax.inject.AnnotationLiteral; import javax.inject.DefinitionException; -import javax.inject.InconsistentSpecializationException; +import javax.inject.manager.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; /** * * Spec version: PRD2 */ +@Artifact +(a)Packaging(PackagingType.EAR) +(a)BeansXml(&quot;beans.xml&quot;) public class EnterpriseBeanSpecializationTest extends AbstractDeclarativeTest { - @Override - protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() - { - List<Class<? extends Annotation>> deploymentTypes = new ArrayList<Class<? extends Annotation>>(); - deploymentTypes.addAll(getStandardDeploymentTypes()); - deploymentTypes.add(AnotherDeploymentType.class); - return deploymentTypes; - } - private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral<Landowner>() {}; @Test @@ -40,11 +36,11 @@ }) public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean() { - deployBeans(Farmer.class, LazyFarmer.class); - assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmer.class); - assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getBindings().size() == 2; - assert annotationSetMatches( getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getBindings(), Landowner.class, Lazy.class); + assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).size() == 1; + Bean<FarmerLocal> bean = getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next(); + assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmerLocal.class); + assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getBindings().size() == 2; + assert annotationSetMatches( getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getBindings(), Landowner.class, Lazy.class); } @Test @@ -54,96 +50,11 @@ }) public void testSpecializingBeanHasNameOfSpecializedBean() { - deployBeans(Farmer.class, LazyFarmer.class); - assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmer.class); - assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getName().equals("farmer"); + assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).size() == 1; + assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmerLocal.class); + assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getName().equals("farmer"); } - @Test(expectedExceptions=DefinitionException.class) - @SpecAssertion(section = "4.3.1", id = "e") - public void testSpecializingAndSpecializedBeanHasName() - { - deployBeans(FarmYard_Broken.class); - } - - @Test(groups="broken") - @SpecAssertions({ - @SpecAssertion(section = "4.3.1", id = "f"), - @SpecAssertion(section = "3.3.7", id = "b") - }) - public void testSpecializedBeanNotInstantiated() throws Exception - { - // TODO Needs integration env - deployBeans(LazyFarmer.class, Farmer.class); - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - Farmer farmer = getCurrentManager().getInstanceByType(Farmer.class, LANDOWNER_LITERAL); - assert farmer.getClassName().equals(LazyFarmer.class.getName()); - } - - }.run(); - } - - @Test(expectedExceptions=InconsistentSpecializationException.class) - @SpecAssertion(section="4.3.3", id = "a") - public void testSpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBean() - { - deployBeans(Farmer.class, OrganicFarmer_Broken.class); - } - - @Test(groups="broken") - @SpecAssertion(section="4.3.1", id = "g") - public void testProducerMethodOnSpecializedBeanCalledOnSpecializingBean() throws Exception - { - - // TODO needs integration env! - deployBeans(Office.class, Building.class); - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - assert getCurrentManager().resolveByType(Waste.class).size() == 1; - assert getCurrentManager().getInstanceByType(Waste.class).getFrom().equals(Office.class.getName()); - } - - }.run(); - } - - @Test(expectedExceptions=InconsistentSpecializationException.class) - @SpecAssertion(section="4.3.3", id = "a") - public void testTwoBeansSpecializeTheSameBean() - { - deployBeans(Farmer.class, SheepFarmer_Broken.class, FishFarmer_Broken.class); - } - - @Test(groups={"specialization"},expectedExceptions=DefinitionException.class) - @SpecAssertion(section="3.3.7", id = "d") - public void testSpecializingClassDirectlyExtendsSimpleBean() - { - deployBeans(Tractor_Broken.class); - } - - @Test(groups={"specialization"},expectedExceptions=DefinitionException.class) - @SpecAssertion(section="3.3.7", id = "d") - public void testSpecializingClassDirectlyExtendsNothing() - { - deployBeans(Cow_Broken.class); - } - - @Test(groups={"specialization"},expectedExceptions=DefinitionException.class) - @SpecAssertion(section="3.3.7", id = "d") - public void testSpecializingClassImplementsInterfaceAndExtendsNothing() - { - deployBeans(Donkey_Broken.class); - } - @Test(groups={"stub", "specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.3.7", id = "a") public void testSpecializingBeanDoesNotSupportAllLocalInterfacesOnSpecializedBean() Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmYard_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmYard_Broken.java 2009-02-25 21:03:05 UTC (rev 1710) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmYard_Broken.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -1,14 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -import javax.annotation.Named; -import javax.ejb.Stateful; -import javax.inject.Specializes; - -@Specializes -@AnotherDeploymentType -@Stateful -@Named -class FarmYard_Broken extends Yard -{ - -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Farmer.java 2009-02-25 21:03:05 UTC (rev 1710) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Farmer.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -7,7 +7,7 @@ @Landowner @Named @Stateful -class Farmer implements FarmerInterface +class Farmer implements FarmerLocal { public String getClassName() Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmerInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmerInterface.java 2009-02-25 21:03:05 UTC (rev 1710) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmerInterface.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -import javax.ejb.Local; - -@Local -public interface FarmerInterface -{ - -} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmerLocal.java (from rev 1704, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmerInterface.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmerLocal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmerLocal.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; + +import javax.ejb.Local; + +@Local +public interface FarmerLocal +{ + public String getClassName(); +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmerLocal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FishFarmer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FishFarmer_Broken.java 2009-02-25 21:03:05 UTC (rev 1710) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FishFarmer_Broken.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -1,12 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -import javax.ejb.Stateful; -import javax.inject.Specializes; - -@Specializes -@AnotherDeploymentType -@Stateful -class FishFarmer_Broken extends Farmer -{ - -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmer.java 2009-02-25 21:03:05 UTC (rev 1710) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmer.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -7,7 +7,7 @@ @Specializes @Lazy @AnotherDeploymentType @Stateful -class LazyFarmer extends Farmer +public class LazyFarmer extends Farmer implements LazyFarmerLocal, FarmerLocal { @Override Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmerLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmerLocal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmerLocal.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; + +import javax.ejb.Local; + +@Local +public interface LazyFarmerLocal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmerLocal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Office.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Office.java 2009-02-25 21:03:05 UTC (rev 1710) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Office.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -1,12 +1,14 @@ package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; import javax.ejb.Stateful; +import javax.inject.Specializes; @AnotherDeploymentType @Stateful -class Office extends Building +@Specializes +public class Office extends Building implements OfficeLocal { @Override Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/OfficeLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/OfficeLocal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/OfficeLocal.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; + +public interface OfficeLocal +{ + + public String getClassName(); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/OfficeLocal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/OrganicFarmer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/OrganicFarmer_Broken.java 2009-02-25 21:03:05 UTC (rev 1710) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/OrganicFarmer_Broken.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -import javax.ejb.Stateful; -import javax.inject.Specializes; - -@Specializes -@Stateful -class OrganicFarmer_Broken extends Farmer -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/SheepFarmer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/SheepFarmer_Broken.java 2009-02-25 21:03:05 UTC (rev 1710) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/SheepFarmer_Broken.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -import javax.ejb.Stateful; -import javax.inject.Specializes; - -@Specializes @AnotherDeploymentType -@Stateful -class SheepFarmer_Broken extends Farmer -{ - -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/TractorLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/TractorLocal.java 2009-02-25 21:03:05 UTC (rev 1710) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/TractorLocal.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -3,7 +3,7 @@ import javax.ejb.Local; @Local -interface TractorLocal +public interface TractorLocal { } Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Tractor_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Tractor_Broken.java 2009-02-25 21:03:05 UTC (rev 1710) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Tractor_Broken.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -1,12 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -import javax.ejb.Stateful; -import javax.inject.Specializes; - -@Specializes -@AnotherDeploymentType -@Stateful -class Tractor_Broken extends FarmEquipment implements TractorLocal -{ - -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Waste.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Waste.java 2009-02-25 21:03:05 UTC (rev 1710) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Waste.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; -class Waste +public class Waste { private String from; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/YardInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/YardInterface.java 2009-02-25 21:03:05 UTC (rev 1710) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/YardInterface.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -3,7 +3,7 @@ import javax.ejb.Local; @Local -interface YardInterface +public interface YardInterface { } Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsNothing/Cow_Broken.java (from rev 1704, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Cow_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsNothing/Cow_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsNothing/Cow_Broken.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.directlyExtendsNothing; + +import javax.ejb.Stateful; +import javax.inject.Specializes; + +@Specializes +@Stateful +class Cow_Broken +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsNothing/Cow_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,27 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.directlyExtendsNothing; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DefinitionException.class) +(a)Packaging(PackagingType.EAR) +public class DirectlyExtendsNothingTest extends AbstractDeclarativeTest +{ + + + @Test(groups={"specialization"}) + @SpecAssertion(section="3.3.7", id = "d") + public void testSpecializingClassDirectlyExtendsNothing() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/AnotherDeploymentType.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.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.inject.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface AnotherDeploymentType +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/AnotherDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,27 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.directlyExtendsSimpleBean; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.testng.annotations.Test; + +@Artifact +(a)Packaging(PackagingType.EAR) +(a)ExpectedDeploymentException(DefinitionException.class) +public class DirectlyExtendsSimpleBeanTest extends AbstractDeclarativeTest +{ + + + @Test(groups={"specialization"}) + @SpecAssertion(section="3.3.7", id = "d") + public void testSpecializingClassDirectlyExtendsSimpleBean() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/FarmEquipment.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/FarmEquipment.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/FarmEquipment.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.directlyExtendsSimpleBean; + +import javax.annotation.Named; + + +@Named("plough") +class FarmEquipment +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/FarmEquipment.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/TractorLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/TractorLocal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/TractorLocal.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.directlyExtendsSimpleBean; + +import javax.ejb.Local; + +@Local +interface TractorLocal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/TractorLocal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/Tractor_Broken.java (from rev 1704, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Tractor_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/Tractor_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/Tractor_Broken.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.directlyExtendsSimpleBean; + +import javax.ejb.Stateful; +import javax.inject.Specializes; + +@Specializes +@AnotherDeploymentType +@Stateful +class Tractor_Broken extends FarmEquipment implements TractorLocal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/Tractor_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Animal.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.implementInterfaceAndExtendsNothing; + +interface Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Animal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.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.inject.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface AnotherDeploymentType +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Donkey_Broken.java (from rev 1704, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Donkey_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Donkey_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Donkey_Broken.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.implementInterfaceAndExtendsNothing; + +import javax.ejb.Stateful; +import javax.inject.Specializes; + +@Specializes +@AnotherDeploymentType +@Stateful +class Donkey_Broken implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Donkey_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,26 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.implementInterfaceAndExtendsNothing; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.testng.annotations.Test; + +(a)ExpectedDeploymentException(DefinitionException.class) +@Artifact +(a)Packaging(PackagingType.EAR) +public class ImplementsInterfaceAndExtendsNothingTest extends AbstractDeclarativeTest +{ + + @Test(groups={"specialization"}) + @SpecAssertion(section="3.3.7", id = "d") + public void testSpecializingClassImplementsInterfaceAndExtendsNothing() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/AnotherDeploymentType.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.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.inject.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface AnotherDeploymentType +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/AnotherDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/FarmYard_Broken.java (from rev 1704, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmYard_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/FarmYard_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/FarmYard_Broken.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.sameName; + +import javax.annotation.Named; +import javax.ejb.Stateful; +import javax.inject.Specializes; + +@Specializes +@AnotherDeploymentType +@Stateful +@Named +class FarmYard_Broken extends Yard +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/FarmYard_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/SameNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/SameNameTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/SameNameTest.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,29 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.sameName; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DefinitionException.class) +(a)Packaging(PackagingType.EAR) +(a)BeansXml(&quot;beans.xml&quot;) +public class SameNameTest extends AbstractDeclarativeTest +{ + + + @Test + @SpecAssertion(section = "4.3.1", id = "e") + public void testSpecializingAndSpecializedBeanHasName() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/SameNameTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/Yard.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/Yard.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/Yard.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.sameName; + +import javax.annotation.Named; +import javax.ejb.Stateful; + +@Named("backyard") +@Stateful +class Yard implements YardInterface +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/Yard.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/YardInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/YardInterface.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/YardInterface.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.sameName; + +import javax.ejb.Local; + +@Local +public interface YardInterface +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/YardInterface.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/Farmer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/Farmer.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.samePrecedence; + +import javax.annotation.Named; +import javax.ejb.Stateful; + +import org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.FarmerLocal; + + +@Landowner +@Named +@Stateful +class Farmer implements FarmerLocal +{ + + public String getClassName() + { + return Farmer.class.getName(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/Farmer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/FarmerInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/FarmerInterface.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/FarmerInterface.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.samePrecedence; + +import javax.ejb.Local; + +@Local +public interface FarmerInterface +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/FarmerInterface.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/Landowner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/Landowner.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/Landowner.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.samePrecedence; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +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.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Landowner +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/Landowner.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/OrganicFarmer_Broken.java (from rev 1704, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/OrganicFarmer_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/OrganicFarmer_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/OrganicFarmer_Broken.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.samePrecedence; + +import javax.ejb.Stateful; +import javax.inject.Specializes; + +@Specializes +@Stateful +class OrganicFarmer_Broken extends Farmer +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/OrganicFarmer_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/SamePrecedenceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/SamePrecedenceTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/SamePrecedenceTest.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,27 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.samePrecedence; + +import javax.inject.InconsistentSpecializationException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.testng.annotations.Test; + +@Artifact +(a)Packaging(PackagingType.EAR) +(a)ExpectedDeploymentException(InconsistentSpecializationException.class) +public class SamePrecedenceTest extends AbstractDeclarativeTest +{ + + @Test + @SpecAssertion(section="4.3.3", id = "a") + public void testSpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBean() + { + assert false; + } + + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/SamePrecedenceTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.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.inject.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface AnotherDeploymentType +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Farmer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Farmer.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; + +import javax.annotation.Named; +import javax.ejb.Stateful; + + +@Landowner +@Named +@Stateful +class Farmer implements FarmerInterface +{ + + public String getClassName() + { + return Farmer.class.getName(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Farmer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FarmerInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FarmerInterface.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FarmerInterface.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; + +import javax.ejb.Local; + +@Local +public interface FarmerInterface +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FarmerInterface.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java (from rev 1704, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FishFarmer_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; + +import javax.ejb.Stateful; +import javax.inject.Specializes; + +@Specializes +@AnotherDeploymentType +@Stateful +class FishFarmer_Broken extends Farmer +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Landowner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Landowner.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Landowner.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +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.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Landowner +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Landowner.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java (from rev 1704, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/SheepFarmer_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; + +import javax.ejb.Stateful; +import javax.inject.Specializes; + +@Specializes @AnotherDeploymentType +@Stateful +class SheepFarmer_Broken extends Farmer +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,29 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; + +import javax.inject.InconsistentSpecializationException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +@Artifact +(a)Packaging(PackagingType.EAR) +(a)ExpectedDeploymentException(InconsistentSpecializationException.class) +(a)BeansXml(&quot;beans.xml&quot;) +public class TwoBeansSpecializeTheSameBeanTest extends AbstractDeclarativeTest +{ + + + @Test + @SpecAssertion(section="4.3.3", id = "a") + public void testTwoBeansSpecializeTheSameBean() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/beans.xml 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,8 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise"> + <Deploy> + <Standard /> + <Production /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendSimpleBean/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendSimpleBean/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendSimpleBean/beans.xml 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,8 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.directlyExtendSimpleBean"> + <Deploy> + <Standard /> + <Production /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendSimpleBean/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementsInterfaceAndExtendsNothing/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementsInterfaceAndExtendsNothing/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementsInterfaceAndExtendsNothing/beans.xml 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,8 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.implementsInterfaceAndExtendsNothing"> + <Deploy> + <Standard /> + <Production /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementsInterfaceAndExtendsNothing/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/beans.xml 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,8 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.sameName"> + <Deploy> + <Standard /> + <Production /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/beans.xml 2009-02-25 22:38:35 UTC (rev 1711) @@ -0,0 +1,8 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean"> + <Deploy> + <Standard /> + <Production /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain