weld-commits June 2009

weld-commits@lists.jboss.org

1 participants
201 discussions

[webbeans-commits] Webbeans SVN: r2916 - in ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit: activities and 4 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-06-28 13:31:37 -0400 (Sun, 28 Jun 2009) New Revision: 2916 Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/ServletLifecycleTest.java Removed: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/servlet/ Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/ActivitiesTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Donkey.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Animal.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/DeadlyAnimal.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/DeadlySpider.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/DefangedTarantula.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Hound.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/HoundLocal.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Salmon.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/ScottishFish.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/SeaBass.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/ServletEnvironmentTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Sole.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Spider.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Tame.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Tarantula.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/TarantulaProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Tuna.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Whitefish.java Log: make tests pass i/c, slight reorg Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/ActivitiesTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/ActivitiesTest.java 2009-06-28 15:48:12 UTC (rev 2915) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/ActivitiesTest.java 2009-06-28 17:31:37 UTC (rev 2916) @@ -23,7 +23,6 @@ import org.jboss.webbeans.bean.ForwardingBean; import org.jboss.webbeans.literal.CurrentLiteral; import org.jboss.webbeans.test.AbstractWebBeansTest; -import org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle.MockCreationalContext; import org.testng.annotations.Test; @@ -190,7 +189,7 @@ BeanManager childActivity = getCurrentManager().createActivity(); Bean<?> dummyBean = createDummyBean(childActivity, Cow.class); childActivity.addBean(dummyBean); - assert childActivity.getInjectableReference(dummyBean.getInjectionPoints().iterator().next(), new MockCreationalContext<Cow>()) != null; + assert childActivity.getInjectableReference(dummyBean.getInjectionPoints().iterator().next(), childActivity.createCreationalContext(dummyBean)) != null; } @Test Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Donkey.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Donkey.java 2009-06-28 15:48:12 UTC (rev 2915) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Donkey.java 2009-06-28 17:31:37 UTC (rev 2916) @@ -11,7 +11,7 @@ public Donkey() throws NamingException { - beanManager = (BeanManager) new InitialContext().lookup("java:app/Manager"); + beanManager = (BeanManager) new InitialContext().lookup("java:app/BeanManager"); } public BeanManager getManager() Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet (from rev 2914, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Animal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Animal.java 2009-06-28 15:17:17 UTC (rev 2914) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Animal.java 2009-06-28 17:31:37 UTC (rev 2916) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.environments; +package org.jboss.webbeans.test.unit.environments.servlet; interface Animal { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/DeadlyAnimal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/DeadlyAnimal.java 2009-06-28 15:17:17 UTC (rev 2914) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/DeadlyAnimal.java 2009-06-28 17:31:37 UTC (rev 2916) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.environments; +package org.jboss.webbeans.test.unit.environments.servlet; interface DeadlyAnimal { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/DeadlySpider.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/DeadlySpider.java 2009-06-28 15:17:17 UTC (rev 2914) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/DeadlySpider.java 2009-06-28 17:31:37 UTC (rev 2916) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.environments; +package org.jboss.webbeans.test.unit.environments.servlet; interface DeadlySpider extends DeadlyAnimal { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/DefangedTarantula.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/DefangedTarantula.java 2009-06-28 15:17:17 UTC (rev 2914) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/DefangedTarantula.java 2009-06-28 17:31:37 UTC (rev 2916) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.environments; +package org.jboss.webbeans.test.unit.environments.servlet; class DefangedTarantula extends Tarantula { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Hound.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Hound.java 2009-06-28 15:17:17 UTC (rev 2914) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Hound.java 2009-06-28 17:31:37 UTC (rev 2916) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.environments; +package org.jboss.webbeans.test.unit.environments.servlet; import javax.ejb.Remove; import javax.ejb.Stateful; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/HoundLocal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/HoundLocal.java 2009-06-28 15:17:17 UTC (rev 2914) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/HoundLocal.java 2009-06-28 17:31:37 UTC (rev 2916) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.environments; +package org.jboss.webbeans.test.unit.environments.servlet; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Salmon.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Salmon.java 2009-06-28 15:17:17 UTC (rev 2914) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Salmon.java 2009-06-28 17:31:37 UTC (rev 2916) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.environments; +package org.jboss.webbeans.test.unit.environments.servlet; import javax.enterprise.inject.Named; import javax.enterprise.inject.deployment.Production; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/ScottishFish.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/ScottishFish.java 2009-06-28 15:17:17 UTC (rev 2914) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/ScottishFish.java 2009-06-28 17:31:37 UTC (rev 2916) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.environments; +package org.jboss.webbeans.test.unit.environments.servlet; interface ScottishFish extends Animal { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/SeaBass.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/SeaBass.java 2009-06-28 15:17:17 UTC (rev 2914) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/SeaBass.java 2009-06-28 17:31:37 UTC (rev 2916) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.environments; +package org.jboss.webbeans.test.unit.environments.servlet; import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.deployment.Production; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/ServletEnvironmentTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/ServletEnvironmentTest.java 2009-06-28 15:17:17 UTC (rev 2914) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/ServletEnvironmentTest.java 2009-06-28 17:31:37 UTC (rev 2916) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.environments; +package org.jboss.webbeans.test.unit.environments.servlet; import java.util.Arrays; import java.util.HashMap; Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/ServletLifecycleTest.java (from rev 2914, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/servlet/ServletLifecycleTest.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/ServletLifecycleTest.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/ServletLifecycleTest.java 2009-06-28 17:31:37 UTC (rev 2916) @@ -0,0 +1,80 @@ +package org.jboss.webbeans.test.unit.environments.servlet; + +import javax.servlet.http.HttpSession; + +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.Classes; +import org.jboss.webbeans.context.ContextLifecycle; +import org.jboss.webbeans.context.RequestContext; +import org.jboss.webbeans.context.SessionContext; +import org.jboss.webbeans.context.api.BeanStore; +import org.jboss.webbeans.context.api.helpers.ConcurrentHashMapBeanStore; +import org.jboss.webbeans.conversation.ConversationManager; +import org.jboss.webbeans.mock.MockHttpSession; +import org.jboss.webbeans.servlet.ServletLifecycle; +import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +/** + * A set of tests that validates that the contexts are properly created + * and destroyed from the perspective of a servlet environment. + * + * @author Dan Allen + */ +@Artifact +(a)Classes(ConversationManager.class) +public class ServletLifecycleTest extends AbstractWebBeansTest +{ + @Test(groups = "incontainer-broken") + public void testEndSessionWithActiveRequestAndSessionContexts() + { + ServletLifecycle servletLifecycle = new ServletLifecycle(new ContextLifecycle()); + BeanStore requestBeanStore = new ConcurrentHashMapBeanStore(); + RequestContext.instance().setBeanStore(requestBeanStore); + RequestContext.instance().setActive(true); + + BeanStore sessionBeanStore = new ConcurrentHashMapBeanStore(); + SessionContext.instance().setBeanStore(sessionBeanStore); + SessionContext.instance().setActive(true); + + HttpSession session = new MockHttpSession("99"); + servletLifecycle.endSession(session); + assert Boolean.FALSE.equals(SessionContext.instance().isActive()) : "Session context should no longer be active"; + assert Boolean.TRUE.equals(RequestContext.instance().isActive()) : "Request context should still be active"; + } + + @Test(groups = "incontainer-broken") + public void testEndSessionWithActiveRequestContextOnly() + { + ServletLifecycle servletLifecycle = new ServletLifecycle(new ContextLifecycle()); + BeanStore requestBeanStore = new ConcurrentHashMapBeanStore(); + RequestContext.instance().setBeanStore(requestBeanStore); + RequestContext.instance().setActive(true); + + HttpSession session = new MockHttpSession("99"); + servletLifecycle.endSession(session); + assert Boolean.FALSE.equals(SessionContext.instance().isActive()) : "Session context should no longer be active"; + assert Boolean.TRUE.equals(RequestContext.instance().isActive()) : "Request context should still be active"; + } + + @Test(groups = "incontainer-broken") + public void testEndSessionWithNoActiveRequestOrSessionContexts() + { + ServletLifecycle servletLifecycle = new ServletLifecycle(new ContextLifecycle()); + + HttpSession session = new MockHttpSession("99"); + servletLifecycle.endSession(session); + assert Boolean.FALSE.equals(SessionContext.instance().isActive()) : "Session context should no longer be active"; + assert Boolean.FALSE.equals(RequestContext.instance().isActive()) : "Temporary request context should have been deactivated"; + } + + @BeforeMethod(groups = "incontainer-broken") + public void beforeMethod() + { + RequestContext.instance().setBeanStore(null); + RequestContext.instance().setActive(false); + SessionContext.instance().setBeanStore(null); + SessionContext.instance().setActive(false); + } +} Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Sole.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Sole.java 2009-06-28 15:17:17 UTC (rev 2914) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Sole.java 2009-06-28 17:31:37 UTC (rev 2916) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.environments; +package org.jboss.webbeans.test.unit.environments.servlet; import javax.ejb.EJB; import javax.enterprise.inject.Named; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Spider.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Spider.java 2009-06-28 15:17:17 UTC (rev 2914) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Spider.java 2009-06-28 17:31:37 UTC (rev 2916) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.environments; +package org.jboss.webbeans.test.unit.environments.servlet; class Spider implements Animal { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Tame.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Tame.java 2009-06-28 15:17:17 UTC (rev 2914) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Tame.java 2009-06-28 17:31:37 UTC (rev 2916) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.environments; +package org.jboss.webbeans.test.unit.environments.servlet; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Tarantula.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Tarantula.java 2009-06-28 15:17:17 UTC (rev 2914) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Tarantula.java 2009-06-28 17:31:37 UTC (rev 2916) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.environments; +package org.jboss.webbeans.test.unit.environments.servlet; class Tarantula extends Spider implements DeadlySpider { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/TarantulaProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/TarantulaProducer.java 2009-06-28 15:17:17 UTC (rev 2914) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/TarantulaProducer.java 2009-06-28 17:31:37 UTC (rev 2916) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.environments; +package org.jboss.webbeans.test.unit.environments.servlet; import javax.enterprise.inject.Produces; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Tuna.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Tuna.java 2009-06-28 15:17:17 UTC (rev 2914) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Tuna.java 2009-06-28 17:31:37 UTC (rev 2916) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.environments; +package org.jboss.webbeans.test.unit.environments.servlet; import javax.enterprise.context.RequestScoped; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Whitefish.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Whitefish.java 2009-06-28 15:17:17 UTC (rev 2914) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Whitefish.java 2009-06-28 17:31:37 UTC (rev 2916) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.environments; +package org.jboss.webbeans.test.unit.environments.servlet; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD;

11 years, 9 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2915 - in ri/trunk: impl/src/main/java/org/jboss/webbeans/metadata/cache and 1 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-06-28 11:48:12 -0400 (Sun, 28 Jun 2009) New Revision: 2915 Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/MergedStereotypes.java ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/StereotypeModel.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java Log: Actually remove stereotypes requiredTypes/supportedScopes Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-06-28 15:17:17 UTC (rev 2914) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-06-28 15:48:12 UTC (rev 2915) @@ -161,7 +161,6 @@ initScopeType(); initSerializable(); initProxyable(); - checkRequiredTypesImplemented(); initInjectionPoints(); initDecorates(); checkDecorates(); @@ -348,22 +347,6 @@ } } - /** - * Validates that the required types are implemented - */ - protected void checkRequiredTypesImplemented() - { - for (Class<?> requiredType : getMergedStereotypes().getRequiredTypes()) - { - if (log.isTraceEnabled()) - log.trace("Checking if required type " + requiredType + " is implemented"); - if (!requiredType.isAssignableFrom(type)) - { - throw new DefinitionException("Required type " + requiredType + " isn't implemented on " + type); - } - } - } - protected void postSpecialize() { if (getAnnotatedItem().isAnnotationPresent(Named.class) && getSpecializedBean().getAnnotatedItem().isAnnotationPresent(Named.class)) Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-06-28 15:17:17 UTC (rev 2914) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-06-28 15:48:12 UTC (rev 2915) @@ -114,7 +114,6 @@ { initInitializerMethods(); super.initialize(environment); - checkScopeAllowed(); checkBeanImplementation(); initDecorators(); checkType(); @@ -362,22 +361,6 @@ } /** - * Validate that the scope type is allowed by the stereotypes on the bean and - * the bean type - */ - protected void checkScopeAllowed() - { - log.trace("Checking if " + getScopeType() + " is allowed for " + type); - if (getMergedStereotypes().getSupportedScopes().size() > 0) - { - if (!getMergedStereotypes().getSupportedScopes().contains(getScopeType())) - { - throw new DefinitionException("Scope " + getScopeType() + " is not an allowed by the stereotype for " + type); - } - } - } - - /** * Validates the bean implementation */ protected void checkBeanImplementation() {} Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-06-28 15:17:17 UTC (rev 2914) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-06-28 15:48:12 UTC (rev 2915) @@ -124,6 +124,7 @@ checkEJBTypeAllowed(); checkConflictingRoles(); checkObserverMethods(); + checkScopeAllowed(); } } @@ -172,10 +173,8 @@ * Check that the scope type is allowed by the stereotypes on the bean and * the bean type */ - @Override protected void checkScopeAllowed() { - super.checkScopeAllowed(); if (ejbDescriptor.isStateless() && !isDependent()) { throw new DefinitionException("Scope " + getScopeType() + " is not allowed on stateless enterpise beans for " + getType() + ". Only @Dependent is allowed on stateless enterprise beans"); Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java 2009-06-28 15:17:17 UTC (rev 2914) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java 2009-06-28 15:48:12 UTC (rev 2915) @@ -110,10 +110,4 @@ return false; } - @Override - protected void checkScopeAllowed() - { - // No-op - } - } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/MergedStereotypes.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/MergedStereotypes.java 2009-06-28 15:17:17 UTC (rev 2914) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/MergedStereotypes.java 2009-06-28 15:48:12 UTC (rev 2915) @@ -37,10 +37,6 @@ private final Set<Annotation> possibleScopeTypes; // Is the bean name defaulted? private boolean beanNameDefaulted; - // The required types - private final Set<Class<?>> requiredTypes; - // The supported scopes - private final Set<Class<? extends Annotation>> supportedScopes; private final BeanManagerImpl manager; @@ -53,8 +49,6 @@ { this.possibleDeploymentTypes = new HashMap<Class<? extends Annotation>, Annotation>(); this.possibleScopeTypes = new HashSet<Annotation>(); - this.requiredTypes = new HashSet<Class<?>>(); - this.supportedScopes = new HashSet<Class<? extends Annotation>>(); this.manager = manager; merge(stereotypeAnnotations); } @@ -82,8 +76,6 @@ { possibleScopeTypes.add(stereotype.getDefaultScopeType()); } - requiredTypes.addAll(stereotype.getRequiredTypes()); - supportedScopes.addAll(stereotype.getSupportedScopes()); if (stereotype.isBeanNameDefaulted()) { beanNameDefaulted = true; @@ -122,26 +114,6 @@ } /** - * Returns the required types - * - * @return The required types - */ - public Set<Class<?>> getRequiredTypes() - { - return requiredTypes; - } - - /** - * Returns the supported scopes - * - * @return The supported scopes - */ - public Set<Class<? extends Annotation>> getSupportedScopes() - { - return supportedScopes; - } - - /** * Indicates if the bean was declared in XML * * @return True if declared in XML, else false @@ -160,8 +132,7 @@ public String toString() { return "Merged stereotype model with possible deployment types " + - possibleDeploymentTypes + ", required types " + requiredTypes + - ", possible scopes " + possibleScopeTypes + " and supported scopes " + supportedScopes; + possibleDeploymentTypes + " and possible scopes " + possibleScopeTypes; } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/StereotypeModel.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/StereotypeModel.java 2009-06-28 15:17:17 UTC (rev 2914) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/StereotypeModel.java 2009-06-28 15:48:12 UTC (rev 2915) @@ -44,10 +44,6 @@ private Annotation defaultScopeType; // Is the bean name defaulted private boolean beanNameDefaulted; - // The supported scopes - private Set<Class<? extends Annotation>> supportedScopes; - // The required types - private Set<Class<?>> requiredTypes; // The interceptor bindings private Set<Annotation> interceptorBindings; @@ -174,48 +170,6 @@ } /** - * Gets the supported scopes - * - * @return A set of supported scopes, or an empty set if none are specified - */ - public Set<Class<? extends Annotation>> getSupportedScopes() - { - return supportedScopes; - } - - /** - * Gets the required types - * - * @return A set of required types, or an empty set if none are specified - */ - public Set<Class<?>> getRequiredTypes() - { - return requiredTypes; - } - - /** - * Gets the type - * - * @return The type - */ - @Deprecated - public Class<? extends Annotation> getStereotypeClass() - { - return getRawType(); - } - - /** - * Gets a string representation of the stereotype - * - * @return The string representation - */ - @Override - public String toString() - { - return "Stereotype model with required types " + requiredTypes + " and supported scopes " + supportedScopes; - } - - /** * Gets the meta-annotation type * * @return The Stereotype class Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java 2009-06-28 15:17:17 UTC (rev 2914) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java 2009-06-28 15:48:12 UTC (rev 2915) @@ -1,7 +1,5 @@ package org.jboss.webbeans.test.unit.definition; -import java.util.Arrays; - import javax.enterprise.context.RequestScoped; import org.jboss.testharness.impl.packaging.Artifact; @@ -23,9 +21,6 @@ StereotypeModel<AnimalStereotype> animalStereotype = new StereotypeModel<AnimalStereotype>(AnimalStereotype.class, transformer); assert animalStereotype.getDefaultScopeType().annotationType().equals(RequestScoped.class); assert animalStereotype.getInterceptorBindings().size() == 0; - assert animalStereotype.getRequiredTypes().size() == 1; - assert animalStereotype.getRequiredTypes().contains(Animal.class); - assert animalStereotype.getSupportedScopes().size() == 0; assert !animalStereotype.isBeanNameDefaulted(); assert animalStereotype.getDefaultDeploymentType() == null; } @@ -36,10 +31,6 @@ StereotypeModel<AnimalOrderStereotype> animalStereotype = new StereotypeModel<AnimalOrderStereotype>(AnimalOrderStereotype.class, transformer); assert animalStereotype.getDefaultScopeType() == null; assert animalStereotype.getInterceptorBindings().size() == 0; - assert animalStereotype.getRequiredTypes().size() == 2; - Class<?> [] requiredTypes = {Animal.class, Order.class}; - assert animalStereotype.getRequiredTypes().containsAll(Arrays.asList(requiredTypes)); - assert animalStereotype.getSupportedScopes().size() == 0; assert !animalStereotype.isBeanNameDefaulted(); assert animalStereotype.getDefaultDeploymentType() == null; } @@ -50,10 +41,6 @@ StereotypeModel<RequestScopedAnimalStereotype> animalStereotype = new StereotypeModel<RequestScopedAnimalStereotype>(RequestScopedAnimalStereotype.class, transformer); assert animalStereotype.getDefaultScopeType() == null; assert animalStereotype.getInterceptorBindings().size() == 0; - assert animalStereotype.getRequiredTypes().size() == 1; - assert Animal.class.equals(animalStereotype.getRequiredTypes().iterator().next()); - assert animalStereotype.getSupportedScopes().size() == 1; - assert animalStereotype.getSupportedScopes().contains(RequestScoped.class); assert !animalStereotype.isBeanNameDefaulted(); assert animalStereotype.getDefaultDeploymentType() == null; }

11 years, 9 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2914 - in ri/trunk: api/src/main/java/javax/enterprise/inject/stereotype and 16 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-06-28 11:17:17 -0400 (Sun, 28 Jun 2009) New Revision: 2914 Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/TypeStore.java ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/MetaAnnotationStore.java Removed: ri/trunk/core-api/src/main/java/org/jboss/webbeans/Realizes.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WrappedWBClass.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WrappedWBField.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WrappedWBMethod.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WrappedWBParameter.java ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/MetaDataCache.java ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/inheritance/realization/ Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeforeBeanDiscovery.java ri/trunk/api/src/main/java/javax/enterprise/inject/stereotype/Stereotype.java ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/FacadeImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AbstractBeanDeployer.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeforeBeanDiscoveryImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventObserver.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableWBClass.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBAnnotationImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBClassImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBConstructorImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBFieldImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBMethodImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBParameterImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/MergedStereotypes.java ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/StereotypeModel.java ri/trunk/impl/src/main/java/org/jboss/webbeans/resources/ClassTransformer.java ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Beans.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/PassivatingContextTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalOrderStereotype.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalStereotype.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/RequestScopedAnimalStereotype.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java Log: Remove realization, remove stereotype requirements, impl BeforeBeanDiscovery Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeforeBeanDiscovery.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeforeBeanDiscovery.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeforeBeanDiscovery.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -32,4 +32,6 @@ public void addStereotype(Class<? extends Annotation> stereotype, Annotation... stereotypeDef); public void addInterceptorBindingType(Class<? extends Annotation> bindingType); + + public void addAnnotatedType(AnnotatedType<?> type); } Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/stereotype/Stereotype.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/stereotype/Stereotype.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/stereotype/Stereotype.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -20,7 +20,6 @@ import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import java.lang.annotation.Annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; @@ -35,21 +34,4 @@ @Retention(RUNTIME) @Target(ANNOTATION_TYPE) @Documented -public @interface Stereotype -{ - - /** - * Restrict the scope of the stereotyped bean - * - * @return the allowed scopes - */ - public Class<? extends Annotation>[] supportedScopes() default {}; - - /** - * Require that stereotype beans have certain API types - * - * @return the required types - */ - public Class<?>[] requiredTypes() default {}; - -} +public @interface Stereotype {} Deleted: ri/trunk/core-api/src/main/java/org/jboss/webbeans/Realizes.java =================================================================== --- ri/trunk/core-api/src/main/java/org/jboss/webbeans/Realizes.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/core-api/src/main/java/org/jboss/webbeans/Realizes.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -1,40 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2008, Red Hat Middleware LLC, and individual contributors -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -package org.jboss.webbeans; - -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; - -/** - * Specifies that an implementation class directly specializes its superclass, - * of that a producer method directly specializes the method it overrides. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target(TYPE) -@Retention(RUNTIME) -@Documented -public @interface Realizes -{ -} Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -86,7 +86,7 @@ import org.jboss.webbeans.log.Log; import org.jboss.webbeans.log.Logging; import org.jboss.webbeans.manager.api.WebBeansManager; -import org.jboss.webbeans.metadata.cache.MetaDataCache; +import org.jboss.webbeans.metadata.cache.MetaAnnotationStore; import org.jboss.webbeans.util.Beans; import org.jboss.webbeans.util.Proxies; import org.jboss.webbeans.util.Reflections; @@ -359,7 +359,7 @@ Class<?> clazz = event.getClass(); for (Annotation annotation : bindings) { - if (!getServices().get(MetaDataCache.class).getBindingTypeModel(annotation.annotationType()).isValid()) + if (!getServices().get(MetaAnnotationStore.class).getBindingTypeModel(annotation.annotationType()).isValid()) { throw new IllegalArgumentException("Not a binding type " + annotation); } @@ -463,7 +463,7 @@ { for (Annotation annotation : element.getAnnotations()) { - if (!getServices().get(MetaDataCache.class).getBindingTypeModel(annotation.annotationType()).isValid()) + if (!getServices().get(MetaAnnotationStore.class).getBindingTypeModel(annotation.annotationType()).isValid()) { throw new IllegalArgumentException("Not a binding type " + annotation); } @@ -704,7 +704,7 @@ { creationalContext = ((CreationalContextImpl<?>) creationalContext).getCreationalContext(bean); } - if (getServices().get(MetaDataCache.class).getScopeModel(bean.getScopeType()).isNormal()) + if (getServices().get(MetaAnnotationStore.class).getScopeModel(bean.getScopeType()).isNormal()) { if (creationalContext != null || (creationalContext == null && getContext(bean.getScopeType()).get(bean) != null)) { @@ -742,7 +742,7 @@ } WBAnnotated<?, ?> element = ResolvableWBClass.of(injectionPoint.getType(), injectionPoint.getBindings().toArray(new Annotation[0]), this); Bean<?> resolvedBean = getBean(element, element.getBindingsAsArray()); - if (getServices().get(MetaDataCache.class).getScopeModel(resolvedBean.getScopeType()).isNormal() && !Proxies.isTypeProxyable(injectionPoint.getType())) + if (getServices().get(MetaAnnotationStore.class).getScopeModel(resolvedBean.getScopeType()).isNormal() && !Proxies.isTypeProxyable(injectionPoint.getType())) { throw new UnproxyableResolutionException("Attempting to inject an unproxyable normal scoped bean " + resolvedBean + " into " + injectionPoint); } @@ -802,7 +802,7 @@ throw new AmbiguousResolutionException(element + "Resolved multiple Web Beans"); } Bean<T> bean = (Bean<T>) beans.iterator().next(); - boolean normalScoped = getServices().get(MetaDataCache.class).getScopeModel(bean.getScopeType()).isNormal(); + boolean normalScoped = getServices().get(MetaAnnotationStore.class).getScopeModel(bean.getScopeType()).isNormal(); if (normalScoped && !Beans.isBeanProxyable(bean)) { throw new UnproxyableResolutionException("Normal scoped bean " + bean + " is not proxyable"); @@ -890,7 +890,7 @@ public BeanManagerImpl setCurrent(Class<? extends Annotation> scopeType) { - if (!getServices().get(MetaDataCache.class).getScopeModel(scopeType).isNormal()) + if (!getServices().get(MetaAnnotationStore.class).getScopeModel(scopeType).isNormal()) { throw new IllegalArgumentException("Scope must be a normal scope type " + scopeType); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/FacadeImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/FacadeImpl.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/FacadeImpl.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -24,7 +24,7 @@ import java.util.HashSet; import java.util.Set; -import org.jboss.webbeans.metadata.cache.MetaDataCache; +import org.jboss.webbeans.metadata.cache.MetaAnnotationStore; /** * Common implementation for binding-type-based helpers @@ -77,7 +77,7 @@ result.addAll(bindings); for (Annotation newAnnotation : newBindings) { - if (!getManager().getServices().get(MetaDataCache.class).getBindingTypeModel(newAnnotation.annotationType()).isValid()) + if (!getManager().getServices().get(MetaAnnotationStore.class).getBindingTypeModel(newAnnotation.annotationType()).isValid()) { throw new IllegalArgumentException(newAnnotation + " is not a binding for " + this); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -48,7 +48,7 @@ import org.jboss.webbeans.bootstrap.api.Service; import org.jboss.webbeans.injection.resolution.ResolvableWBClass; import org.jboss.webbeans.introspector.WBAnnotated; -import org.jboss.webbeans.metadata.cache.MetaDataCache; +import org.jboss.webbeans.metadata.cache.MetaAnnotationStore; import org.jboss.webbeans.util.Beans; import org.jboss.webbeans.util.ListComparator; import org.jboss.webbeans.util.Names; @@ -70,7 +70,7 @@ { validateInjectionPoint(ij, beanManager); } - boolean normalScoped = beanManager.getServices().get(MetaDataCache.class).getScopeModel(bean.getScopeType()).isNormal(); + boolean normalScoped = beanManager.getServices().get(MetaAnnotationStore.class).getScopeModel(bean.getScopeType()).isNormal(); if (normalScoped && !Beans.isBeanProxyable(bean)) { throw new UnproxyableResolutionException("Normal scoped bean " + bean + " is not proxyable"); @@ -158,7 +158,7 @@ throw new AmbiguousResolutionException("The injection point " + ij + " with binding types " + Names.annotationsToString(ij.getBindings()) + " in " + ij.getBean() + " has ambiguous dependencies"); } Bean<?> resolvedBean = (Bean<?>) resolvedBeans.iterator().next(); - if (beanManager.getServices().get(MetaDataCache.class).getScopeModel(resolvedBean.getScopeType()).isNormal() && !Proxies.isTypeProxyable(ij.getType())) + if (beanManager.getServices().get(MetaAnnotationStore.class).getScopeModel(resolvedBean.getScopeType()).isNormal() && !Proxies.isTypeProxyable(ij.getType())) { throw new UnproxyableResolutionException("The injection point " + ij + " has non-proxyable dependencies"); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -47,7 +47,7 @@ import org.jboss.webbeans.log.LogProvider; import org.jboss.webbeans.log.Logging; import org.jboss.webbeans.metadata.cache.MergedStereotypes; -import org.jboss.webbeans.metadata.cache.MetaDataCache; +import org.jboss.webbeans.metadata.cache.MetaAnnotationStore; import org.jboss.webbeans.util.Reflections; /** @@ -292,7 +292,7 @@ private boolean checkInjectionPointsAreSerializable() { - boolean passivating = manager.getServices().get(MetaDataCache.class).getScopeModel(this.getScopeType()).isPassivating(); + boolean passivating = manager.getServices().get(MetaAnnotationStore.class).getScopeModel(this.getScopeType()).isPassivating(); for (WBInjectionPoint<?, ?> injectionPoint : getAnnotatedInjectionPoints()) { Annotation[] bindings = injectionPoint.getMetaAnnotationsAsArray(BindingType.class); Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -45,7 +45,7 @@ import org.jboss.webbeans.introspector.WBMember; import org.jboss.webbeans.log.LogProvider; import org.jboss.webbeans.log.Logging; -import org.jboss.webbeans.metadata.cache.MetaDataCache; +import org.jboss.webbeans.metadata.cache.MetaAnnotationStore; import org.jboss.webbeans.util.Beans; import org.jboss.webbeans.util.Names; import org.jboss.webbeans.util.Reflections; @@ -206,7 +206,7 @@ { throw new IllegalProductException("Cannot return null from a non-dependent producer method"); } - boolean passivating = manager.getServices().get(MetaDataCache.class).getScopeModel(getScopeType()).isPassivating(); + boolean passivating = manager.getServices().get(MetaAnnotationStore.class).getScopeModel(getScopeType()).isPassivating(); if (passivating && !Reflections.isSerializable(instance.getClass())) { throw new IllegalProductException("Producers cannot declare passivating scope and return a non-serializable class"); Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -44,7 +44,7 @@ import org.jboss.webbeans.introspector.WBParameter; import org.jboss.webbeans.log.LogProvider; import org.jboss.webbeans.log.Logging; -import org.jboss.webbeans.metadata.cache.MetaDataCache; +import org.jboss.webbeans.metadata.cache.MetaAnnotationStore; import org.jboss.webbeans.persistence.PersistenceApiAbstraction; import org.jboss.webbeans.persistence.spi.JpaServices; import org.jboss.webbeans.resources.spi.ResourceServices; @@ -335,7 +335,7 @@ { throw new DefinitionException("Simple bean " + type + " cannot be a parameterized type"); } - boolean passivating = manager.getServices().get(MetaDataCache.class).getScopeModel(scopeType).isPassivating(); + boolean passivating = manager.getServices().get(MetaAnnotationStore.class).getScopeModel(scopeType).isPassivating(); if (passivating && !_serializable) { throw new DefinitionException("Simple bean declaring a passivating scope must have a serializable implementation class " + toString()); Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AbstractBeanDeployer.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AbstractBeanDeployer.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AbstractBeanDeployer.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -16,18 +16,14 @@ */ package org.jboss.webbeans.bootstrap; -import java.lang.annotation.Annotation; import java.util.Set; import javax.enterprise.event.Observes; -import javax.enterprise.inject.BindingType; import javax.enterprise.inject.Disposes; import javax.enterprise.inject.Initializer; import javax.enterprise.inject.Produces; -import javax.enterprise.inject.deployment.DeploymentType; import org.jboss.webbeans.BeanManagerImpl; -import org.jboss.webbeans.Realizes; import org.jboss.webbeans.bean.AbstractClassBean; import org.jboss.webbeans.bean.DecoratorBean; import org.jboss.webbeans.bean.DisposalMethodBean; @@ -44,8 +40,6 @@ import org.jboss.webbeans.introspector.WBClass; import org.jboss.webbeans.introspector.WBField; import org.jboss.webbeans.introspector.WBMethod; -import org.jboss.webbeans.introspector.WrappedWBField; -import org.jboss.webbeans.introspector.WrappedWBMethod; import org.jboss.webbeans.jsf.JsfApiAbstraction; import org.jboss.webbeans.log.LogProvider; import org.jboss.webbeans.log.Logging; @@ -121,13 +115,6 @@ createObserverMethods(bean, bean.getAnnotatedItem()); createDisposalMethods(bean, bean.getAnnotatedItem()); - if (bean.getAnnotatedItem().isAnnotationPresent(Realizes.class)) - { - createRealizedProducerMethods(bean, bean.getAnnotatedItem()); - createRealizedProducerFields(bean, bean.getAnnotatedItem()); - createRealizedObserverMethods(bean, bean.getAnnotatedItem()); - } - } protected void createProducerMethods(AbstractClassBean<?> declaringBean, WBClass<?> annotatedClass) @@ -154,24 +141,6 @@ manager.getResolver().addInjectionPoints(bean.getAnnotatedInjectionPoints()); } - protected void createRealizedProducerMethods(AbstractClassBean<?> declaringBean, WBClass<?> realizingClass) - { - WBClass<?> realizedClass = realizingClass.getSuperclass(); - for (WBMethod<?> realizedMethod : realizedClass.getDeclaredAnnotatedMethods(Produces.class)) - { - createProducerMethod(declaringBean, realizeProducerMethod(realizedMethod, realizingClass)); - } - } - - protected void createRealizedProducerFields(AbstractClassBean<?> declaringBean, WBClass<?> realizingClass) - { - WBClass<?> realizedClass = realizingClass.getSuperclass(); - for (final WBField<?> realizedField : realizedClass.getDeclaredAnnotatedFields(Produces.class)) - { - createProducerField(declaringBean, realizeProducerField(realizedField, realizingClass)); - } - } - protected <T> void createProducerField(AbstractClassBean<?> declaringBean, WBField<T> field) { ProducerFieldBean<T> bean = ProducerFieldBean.of(field, declaringBean, manager); @@ -194,11 +163,6 @@ } } - protected void createRealizedObserverMethods(AbstractClassBean<?> declaringBean, WBClass<?> realizingClass) - { - createObserverMethods(declaringBean, realizingClass.getSuperclass()); - } - protected void createObserverMethod(RIBean<?> declaringBean, WBMethod<?> method) { ObserverImpl<?> observer = ObserverFactory.create(method, declaringBean, manager); @@ -257,75 +221,7 @@ { return type.getNoArgsConstructor() != null || type.getAnnotatedConstructors(Initializer.class).size() > 0; } - - private static <T> WBMethod<T> realizeProducerMethod(final WBMethod<T> method, final WBClass<?> realizingClass) - { - return new WrappedWBMethod<T>(method, realizingClass.getMetaAnnotations(BindingType.class)) - { - - @Override - public Set<Annotation> getMetaAnnotations(Class<? extends Annotation> metaAnnotationType) - { - if (metaAnnotationType.equals(DeploymentType.class)) - { - return realizingClass.getMetaAnnotations(DeploymentType.class); - } - else - { - return super.getMetaAnnotations(metaAnnotationType); - } - } - - @Override - public Set<Annotation> getDeclaredMetaAnnotations(Class<? extends Annotation> metaAnnotationType) - { - if (metaAnnotationType.equals(DeploymentType.class)) - { - return realizingClass.getDeclaredMetaAnnotations(DeploymentType.class); - } - else - { - return super.getDeclaredMetaAnnotations(metaAnnotationType); - } - } - - }; - } - - private static <T> WBField<T> realizeProducerField(final WBField<T> field, final WBClass<?> realizingClass) - { - return new WrappedWBField<T>(field, realizingClass.getMetaAnnotations(BindingType.class)) - { - - @Override - public Set<Annotation> getMetaAnnotations(Class<? extends Annotation> metaAnnotationType) - { - if (metaAnnotationType.equals(DeploymentType.class)) - { - return realizingClass.getMetaAnnotations(DeploymentType.class); - } - else - { - return super.getMetaAnnotations(metaAnnotationType); - } - } - - @Override - public Set<Annotation> getDeclaredMetaAnnotations(Class<? extends Annotation> metaAnnotationType) - { - if (metaAnnotationType.equals(DeploymentType.class)) - { - return realizingClass.getDeclaredMetaAnnotations(DeploymentType.class); - } - else - { - return super.getDeclaredMetaAnnotations(metaAnnotationType); - } - } - - }; - } - + public BeanDeployerEnvironment getBeanDeployerEnvironment() { return environment; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -21,6 +21,7 @@ import java.util.Set; import javax.decorator.Decorator; +import javax.enterprise.inject.spi.AnnotatedType; import org.jboss.webbeans.BeanManagerImpl; import org.jboss.webbeans.bean.RIBean; @@ -65,6 +66,16 @@ } return this; } + + public AbstractBeanDeployer addClass(AnnotatedType<?> clazz) + { + ClassTransformer classTransformer = getManager().getServices().get(ClassTransformer.class); + if (!clazz.getJavaClass().isAnnotation() && !clazz.getJavaClass().isEnum()) + { + classes.add(classTransformer.loadClass(clazz)); + } + return this; + } public AbstractBeanDeployer addClasses(Iterable<Class<?>> classes) { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeforeBeanDiscoveryImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeforeBeanDiscoveryImpl.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeforeBeanDiscoveryImpl.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -2,31 +2,52 @@ import java.lang.annotation.Annotation; +import javax.enterprise.inject.spi.AnnotatedType; import javax.enterprise.inject.spi.BeforeBeanDiscovery; +import org.jboss.webbeans.BeanManagerImpl; +import org.jboss.webbeans.literal.BindingTypeLiteral; +import org.jboss.webbeans.literal.InterceptorBindingTypeLiteral; +import org.jboss.webbeans.literal.ScopeTypeLiteral; +import org.jboss.webbeans.metadata.TypeStore; + public class BeforeBeanDiscoveryImpl implements BeforeBeanDiscovery { + + private final TypeStore typeStore; + private final BeanDeployer beanDeployer; + + public BeforeBeanDiscoveryImpl(BeanManagerImpl manager, BeanDeployer beanDeployer) + { + this.typeStore = manager.getServices().get(TypeStore.class); + this.beanDeployer = beanDeployer; + } public void addBindingType(Class<? extends Annotation> bindingType) { - + typeStore.add(bindingType, new BindingTypeLiteral()); } public void addInterceptorBindingType(Class<? extends Annotation> bindingType) { - throw new RuntimeException("Not Yet Implemented"); + typeStore.add(bindingType, new InterceptorBindingTypeLiteral()); } public void addScopeType(Class<? extends Annotation> scopeType, boolean normal, boolean passivating) { - throw new RuntimeException("Not Yet Implemented"); + typeStore.add(scopeType, new ScopeTypeLiteral(normal, passivating)); } public void addStereotype(Class<? extends Annotation> stereotype, Annotation... stereotypeDef) { - throw new RuntimeException("Not Yet Implemented"); + throw new UnsupportedOperationException(); } + + public void addAnnotatedType(AnnotatedType<?> type) + { + beanDeployer.addClass(type); + } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -51,7 +51,8 @@ import org.jboss.webbeans.log.Log; import org.jboss.webbeans.log.Logging; import org.jboss.webbeans.messaging.spi.JmsServices; -import org.jboss.webbeans.metadata.cache.MetaDataCache; +import org.jboss.webbeans.metadata.TypeStore; +import org.jboss.webbeans.metadata.cache.MetaAnnotationStore; import org.jboss.webbeans.persistence.PersistenceApiAbstraction; import org.jboss.webbeans.persistence.spi.JpaServices; import org.jboss.webbeans.resources.ClassTransformer; @@ -134,9 +135,10 @@ getServices().add(ServletApiAbstraction.class, new ServletApiAbstraction(resourceLoader)); // Temporary workaround to provide context for building annotated class // TODO expose AnnotatedClass on SPI and allow container to provide impl of this via ResourceLoader - getServices().add(ClassTransformer.class, new ClassTransformer()); - getServices().add(MetaDataCache.class, new MetaDataCache(getServices().get(ClassTransformer.class))); getServices().add(Validator.class, new Validator()); + getServices().add(TypeStore.class, new TypeStore()); + getServices().add(ClassTransformer.class, new ClassTransformer(getServices().get(TypeStore.class))); + getServices().add(MetaAnnotationStore.class, new MetaAnnotationStore(getServices().get(ClassTransformer.class))); } public BeanManagerImpl getManager() @@ -207,7 +209,7 @@ BeanDeployer beanDeployer = new BeanDeployer(manager, ejbDescriptors); - fireBeforeBeanDiscoveryEvent(); + fireBeforeBeanDiscoveryEvent(beanDeployer); registerBeans(getServices().get(WebBeanDiscovery.class).discoverWebBeanClasses(), beanDeployer); fireAfterBeanDiscoveryEvent(); log.debug("Web Beans initialized. Validating beans."); @@ -241,12 +243,12 @@ log.debug("Enabled interceptor types: " + manager.getEnabledInterceptorClasses()); } - private void fireBeforeBeanDiscoveryEvent() + private void fireBeforeBeanDiscoveryEvent(BeanDeployer beanDeployer) { - BeforeBeanDiscoveryImpl event = new BeforeBeanDiscoveryImpl(); + BeforeBeanDiscoveryImpl event = new BeforeBeanDiscoveryImpl(getManager(), beanDeployer); try { - manager.fireEvent(event); + getManager().fireEvent(event); } catch (Exception e) { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventObserver.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventObserver.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventObserver.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -25,7 +25,7 @@ import javax.enterprise.inject.Current; import org.jboss.webbeans.BeanManagerImpl; -import org.jboss.webbeans.metadata.cache.MetaDataCache; +import org.jboss.webbeans.metadata.cache.MetaAnnotationStore; import org.jboss.webbeans.util.Reflections; import org.jboss.webbeans.util.Strings; @@ -140,7 +140,7 @@ boolean found = false; for (Annotation y : bindings) { - if (manager.getServices().get(MetaDataCache.class).getBindingTypeModel(x.annotationType()).isEqual(x, y)) + if (manager.getServices().get(MetaAnnotationStore.class).getBindingTypeModel(x.annotationType()).isEqual(x, y)) { found = true; } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableWBClass.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableWBClass.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableWBClass.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -35,6 +35,7 @@ import org.jboss.webbeans.introspector.AnnotationStore; import org.jboss.webbeans.introspector.WBAnnotated; import org.jboss.webbeans.introspector.jlr.AbstractWBAnnotated; +import org.jboss.webbeans.metadata.TypeStore; import org.jboss.webbeans.util.Names; import org.jboss.webbeans.util.Reflections; @@ -128,12 +129,12 @@ private ResolvableWBClass(Type type, Annotation[] annotations, BeanManagerImpl manager) { - this(type, AnnotationStore.of(annotations, EMPTY_ANNOTATION_ARRAY), manager); + this(type, AnnotationStore.of(annotations, EMPTY_ANNOTATION_ARRAY, manager.getServices().get(TypeStore.class)), manager); } private ResolvableWBClass(Type type, Set<Annotation>annotations, BeanManagerImpl manager) { - this(type, AnnotationStore.of(annotations, EMPTY_ANNOTATION_SET), manager); + this(type, AnnotationStore.of(annotations, EMPTY_ANNOTATION_SET, manager.getServices().get(TypeStore.class)), manager); } @Override Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -30,6 +30,7 @@ import javax.enterprise.inject.BindingType; import org.jboss.webbeans.literal.CurrentLiteral; +import org.jboss.webbeans.metadata.TypeStore; import org.jboss.webbeans.util.collections.multi.SetHashMultiMap; import org.jboss.webbeans.util.collections.multi.SetMultiMap; @@ -81,22 +82,22 @@ * @param annotatedElement * @return */ - public static AnnotationStore of(AnnotatedElement annotatedElement) + public static AnnotationStore of(AnnotatedElement annotatedElement, TypeStore typeStore) { - return new AnnotationStore(buildAnnotationMap(annotatedElement.getAnnotations()), buildAnnotationMap(annotatedElement.getDeclaredAnnotations())); + return new AnnotationStore(buildAnnotationMap(annotatedElement.getAnnotations()), buildAnnotationMap(annotatedElement.getDeclaredAnnotations()), typeStore); } - public static AnnotationStore of(Annotation[] annotations, Annotation[] declaredAnnotations) + public static AnnotationStore of(Annotation[] annotations, Annotation[] declaredAnnotations, TypeStore typeStore) { - return new AnnotationStore(buildAnnotationMap(annotations), buildAnnotationMap(declaredAnnotations)); + return new AnnotationStore(buildAnnotationMap(annotations), buildAnnotationMap(declaredAnnotations), typeStore); } - public static AnnotationStore of(Set<Annotation> annotations, Set<Annotation> declaredAnnotations) + public static AnnotationStore of(Set<Annotation> annotations, Set<Annotation> declaredAnnotations, TypeStore typeStore) { - return new AnnotationStore(buildAnnotationMap(annotations), buildAnnotationMap(declaredAnnotations)); + return new AnnotationStore(buildAnnotationMap(annotations), buildAnnotationMap(declaredAnnotations), typeStore); } - public static AnnotationStore wrap(AnnotationStore annotationStore, Set<Annotation> annotations, Set<Annotation> declaredAnnotations) + public static AnnotationStore wrap(AnnotationStore annotationStore, Set<Annotation> annotations, Set<Annotation> declaredAnnotations, TypeStore typeStore) { Map<Class<? extends Annotation>, Annotation> annotationMap = new HashMap<Class<? extends Annotation>, Annotation>(); annotationMap.putAll(buildAnnotationMap(annotations)); @@ -106,7 +107,7 @@ declaredAnnotationMap.putAll(buildAnnotationMap(declaredAnnotations)); declaredAnnotationMap.putAll(annotationStore.getDeclaredAnnotationMap()); - return new AnnotationStore(annotationMap, declaredAnnotationMap); + return new AnnotationStore(annotationMap, declaredAnnotationMap, typeStore); } // The annotation map (annotation type -> annotation) of the item @@ -134,7 +135,7 @@ * @param annotationMap A map of annotation to register * */ - protected AnnotationStore(Map<Class<? extends Annotation>, Annotation> annotationMap, Map<Class<? extends Annotation>, Annotation> declaredAnnotationMap) + protected AnnotationStore(Map<Class<? extends Annotation>, Annotation> annotationMap, Map<Class<? extends Annotation>, Annotation> declaredAnnotationMap, TypeStore typeStore) { if (annotationMap == null) { @@ -145,14 +146,8 @@ this.metaAnnotationMap = new SetHashMultiMap<Class<? extends Annotation>, Annotation>(); for (Annotation annotation : annotationMap.values()) { - for (Annotation metaAnnotation : annotation.annotationType().getAnnotations()) - { - // Only map meta-annotations we are interested in - if (MAPPED_METAANNOTATIONS.contains(metaAnnotation.annotationType())) - { - metaAnnotationMap.put(metaAnnotation.annotationType(), annotation); - } - } + addMetaAnnotations(metaAnnotationMap, annotation, annotation.annotationType().getAnnotations()); + addMetaAnnotations(metaAnnotationMap, annotation, typeStore.get(annotation.annotationType())); annotationSet.add(annotation); } @@ -163,20 +158,39 @@ this.declaredAnnotationMap = declaredAnnotationMap; this.declaredAnnotationSet = new HashSet<Annotation>(); this.declaredMetaAnnotationMap = new SetHashMultiMap<Class<? extends Annotation>, Annotation>(); - for (Annotation annotation : declaredAnnotationMap.values()) + for (Annotation declaredAnnotation : declaredAnnotationMap.values()) { - for (Annotation metaAnnotation : annotation.annotationType().getAnnotations()) - { - // Only map meta-annotations we are interested in - if (MAPPED_METAANNOTATIONS.contains(metaAnnotation.annotationType())) - { - declaredMetaAnnotationMap.put(metaAnnotation.annotationType(), annotation); - } - } - declaredAnnotationSet.add(annotation); + addMetaAnnotations(declaredMetaAnnotationMap, declaredAnnotation, declaredAnnotation.annotationType().getAnnotations()); + addMetaAnnotations(declaredMetaAnnotationMap, declaredAnnotation, typeStore.get(declaredAnnotation.annotationType())); + declaredAnnotationSet.add(declaredAnnotation); } } + private static void addMetaAnnotations(SetMultiMap<Class<? extends Annotation>, Annotation> metaAnnotationMap, Annotation annotation, Annotation[] metaAnnotations) + { + for (Annotation metaAnnotation : metaAnnotations) + { + addMetaAnnotation(metaAnnotationMap, annotation, metaAnnotation.annotationType()); + } + } + + private static void addMetaAnnotations(SetMultiMap<Class<? extends Annotation>, Annotation> metaAnnotationMap, Annotation annotation, Iterable<Annotation> metaAnnotations) + { + for (Annotation metaAnnotation : metaAnnotations) + { + addMetaAnnotation(metaAnnotationMap, annotation, metaAnnotation.annotationType()); + } + } + + private static void addMetaAnnotation(SetMultiMap<Class<? extends Annotation>, Annotation> metaAnnotationMap, Annotation annotation, Class<? extends Annotation> metaAnnotationType) + { + // Only map meta-annotations we are interested in + if (MAPPED_METAANNOTATIONS.contains(metaAnnotationType)) + { + metaAnnotationMap.put(metaAnnotationType, annotation); + } + } + public Set<Annotation> getAnnotations() { return Collections.unmodifiableSet(annotationSet); Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WrappedWBClass.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WrappedWBClass.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WrappedWBClass.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -1,88 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.webbeans.introspector; - -import java.lang.annotation.Annotation; -import java.util.Set; - -public class WrappedWBClass<T> extends ForwardingWBClass<T> -{ - - private final WBClass<T> delegate; - private AnnotationStore annotationStore; - - public WrappedWBClass(WBClass<T> clazz, Set<Annotation> extraAnnotations, Set<Annotation> extraDeclaredAnnotations) - { - this.delegate = clazz; - this.annotationStore = AnnotationStore.wrap(clazz.getAnnotationStore(), extraAnnotations, extraDeclaredAnnotations); - } - - @Override - protected WBClass<T> delegate() - { - return delegate; - } - - @Override - public AnnotationStore getAnnotationStore() - { - return annotationStore; - } - - public <A extends Annotation> A getAnnotation(Class<A> annotationType) - { - return getAnnotationStore().getAnnotation(annotationType); - } - - public Set<Annotation> getAnnotations() - { - return getAnnotationStore().getAnnotations(); - } - - public Set<Annotation> getMetaAnnotations(Class<? extends Annotation> metaAnnotationType) - { - return getAnnotationStore().getMetaAnnotations(metaAnnotationType); - } - - public Annotation[] getMetaAnnotationsAsArray(Class<? extends Annotation> metaAnnotationType) - { - return getAnnotationStore().getMetaAnnotationsAsArray(metaAnnotationType); - } - - @Deprecated - public Set<Annotation> getBindings() - { - return getAnnotationStore().getBindings(); - } - - @Deprecated - public Annotation[] getBindingsAsArray() - { - return getAnnotationStore().getBindingsAsArray(); - } - - public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) - { - return getAnnotationStore().isAnnotationPresent(annotationType); - } - - public Set<Annotation> getDeclaredMetaAnnotations(Class<? extends Annotation> metaAnnotationType) - { - return getAnnotationStore().getDeclaredMetaAnnotations(metaAnnotationType); - } - -} Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WrappedWBField.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WrappedWBField.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WrappedWBField.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -1,107 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */package org.jboss.webbeans.introspector; -import java.lang.annotation.Annotation; -import java.util.Set; - -public class WrappedWBField<T> extends ForwardingWBField<T> -{ - - private final WBField<T> delegate; - private AnnotationStore annotationStore; - - public WrappedWBField(WBField<T> field, Set<Annotation> extraAnnotations) - { - this.delegate = field; - this.annotationStore = AnnotationStore.wrap(field.getAnnotationStore(), extraAnnotations, extraAnnotations); - } - - @Override - protected WBField<T> delegate() - { - return delegate; - } - - @Override - public AnnotationStore getAnnotationStore() - { - return annotationStore; - } - - /** - * @see org.jboss.webbeans.introspector.WBAnnotated - */ - public <A extends Annotation> A getAnnotation(Class<A> annotationType) - { - return getAnnotationStore().getAnnotation(annotationType); - } - - /** - * @see org.jboss.webbeans.introspector.WBAnnotated - */ - public Set<Annotation> getAnnotations() - { - return getAnnotationStore().getAnnotations(); - } - - /** - * @see org.jboss.webbeans.introspector.WBAnnotated - */ - public Set<Annotation> getMetaAnnotations(Class<? extends Annotation> metaAnnotationType) - { - return getAnnotationStore().getMetaAnnotations(metaAnnotationType); - } - - /** - * @see org.jboss.webbeans.introspector.WBAnnotated - */ - public Annotation[] getMetaAnnotationsAsArray(Class<? extends Annotation> metaAnnotationType) - { - return getAnnotationStore().getMetaAnnotationsAsArray(metaAnnotationType); - } - - /** - * @see org.jboss.webbeans.introspector.WBAnnotated - */ - @Deprecated - public Set<Annotation> getBindings() - { - return getAnnotationStore().getBindings(); - } - - /** - * @see org.jboss.webbeans.introspector.WBAnnotated - */ - @Deprecated - public Annotation[] getBindingsAsArray() - { - return getAnnotationStore().getBindingsAsArray(); - } - - /** - * @see org.jboss.webbeans.introspector.WBAnnotated - */ - public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) - { - return getAnnotationStore().isAnnotationPresent(annotationType); - } - - public Set<Annotation> getDeclaredMetaAnnotations(Class<? extends Annotation> metaAnnotationType) - { - return getAnnotationStore().getDeclaredMetaAnnotations(metaAnnotationType); - } - -} Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WrappedWBMethod.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WrappedWBMethod.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WrappedWBMethod.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -1,109 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.webbeans.introspector; - -import java.lang.annotation.Annotation; -import java.util.Set; - -public class WrappedWBMethod<T> extends ForwardingWBMethod<T> -{ - - private final WBMethod<T> delegate; - private AnnotationStore annotationStore; - - public WrappedWBMethod(WBMethod<T> method, Set<Annotation> extraAnnotations) - { - this.delegate = method; - this.annotationStore = AnnotationStore.wrap(method.getAnnotationStore(), extraAnnotations, extraAnnotations); - } - - @Override - protected WBMethod<T> delegate() - { - return delegate; - } - - @Override - public AnnotationStore getAnnotationStore() - { - return annotationStore; - } - - /** - * @see org.jboss.webbeans.introspector.WBAnnotated - */ - public <A extends Annotation> A getAnnotation(Class<A> annotationType) - { - return getAnnotationStore().getAnnotation(annotationType); - } - - /** - * @see org.jboss.webbeans.introspector.WBAnnotated - */ - public Set<Annotation> getAnnotations() - { - return getAnnotationStore().getAnnotations(); - } - - /** - * @see org.jboss.webbeans.introspector.WBAnnotated - */ - public Set<Annotation> getMetaAnnotations(Class<? extends Annotation> metaAnnotationType) - { - return getAnnotationStore().getMetaAnnotations(metaAnnotationType); - } - - /** - * @see org.jboss.webbeans.introspector.WBAnnotated - */ - public Annotation[] getMetaAnnotationsAsArray(Class<? extends Annotation> metaAnnotationType) - { - return getAnnotationStore().getMetaAnnotationsAsArray(metaAnnotationType); - } - - /** - * @see org.jboss.webbeans.introspector.WBAnnotated - */ - @Deprecated - public Set<Annotation> getBindings() - { - return getAnnotationStore().getBindings(); - } - - /** - * @see org.jboss.webbeans.introspector.WBAnnotated - */ - @Deprecated - public Annotation[] getBindingsAsArray() - { - return getAnnotationStore().getBindingsAsArray(); - } - - /** - * @see org.jboss.webbeans.introspector.WBAnnotated - */ - public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) - { - return getAnnotationStore().isAnnotationPresent(annotationType); - } - - public Set<Annotation> getDeclaredMetaAnnotations(Class<? extends Annotation> metaAnnotationType) - { - return getAnnotationStore().getDeclaredMetaAnnotations(metaAnnotationType); - } - -} Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WrappedWBParameter.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WrappedWBParameter.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WrappedWBParameter.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -1,114 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.webbeans.introspector; - -import java.lang.annotation.Annotation; -import java.util.Set; - -public class WrappedWBParameter<T> extends ForwardingWBParameter<T> -{ - - public static <T> WrappedWBParameter<T> of(WBParameter<T> parameter, Set<Annotation> extraAnnotations) - { - return new WrappedWBParameter<T>(parameter, extraAnnotations); - } - - private final WBParameter<T> delegate; - private AnnotationStore annotationStore; - - public WrappedWBParameter(WBParameter<T> parameter, Set<Annotation> extraAnnotations) - { - this.delegate = parameter; - this.annotationStore = AnnotationStore.wrap(parameter.getAnnotationStore(), extraAnnotations, extraAnnotations); - } - - @Override - protected WBParameter<T> delegate() - { - return delegate; - } - - @Override - public AnnotationStore getAnnotationStore() - { - return annotationStore; - } - - /** - * @see org.jboss.webbeans.introspector.WBAnnotated - */ - public <A extends Annotation> A getAnnotation(Class<A> annotationType) - { - return getAnnotationStore().getAnnotation(annotationType); - } - - /** - * @see org.jboss.webbeans.introspector.WBAnnotated - */ - public Set<Annotation> getAnnotations() - { - return getAnnotationStore().getAnnotations(); - } - - /** - * @see org.jboss.webbeans.introspector.WBAnnotated - */ - public Set<Annotation> getMetaAnnotations(Class<? extends Annotation> metaAnnotationType) - { - return getAnnotationStore().getMetaAnnotations(metaAnnotationType); - } - - /** - * @see org.jboss.webbeans.introspector.WBAnnotated - */ - public Annotation[] getMetaAnnotationsAsArray(Class<? extends Annotation> metaAnnotationType) - { - return getAnnotationStore().getMetaAnnotationsAsArray(metaAnnotationType); - } - - /** - * @see org.jboss.webbeans.introspector.WBAnnotated - */ - @Deprecated - public Set<Annotation> getBindings() - { - return getAnnotationStore().getBindings(); - } - - /** - * @see org.jboss.webbeans.introspector.WBAnnotated - */ - @Deprecated - public Annotation[] getBindingsAsArray() - { - return getAnnotationStore().getBindingsAsArray(); - } - - /** - * @see org.jboss.webbeans.introspector.WBAnnotated - */ - public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) - { - return getAnnotationStore().isAnnotationPresent(annotationType); - } - - public Set<Annotation> getDeclaredMetaAnnotations(Class<? extends Annotation> metaAnnotationType) - { - return getAnnotationStore().getDeclaredMetaAnnotations(metaAnnotationType); - } - -} Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBAnnotationImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBAnnotationImpl.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBAnnotationImpl.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -70,14 +70,14 @@ */ protected WBAnnotationImpl(Class<T> annotationType, ClassTransformer classTransformer) { - super(AnnotationStore.of(annotationType), annotationType, annotationType, classTransformer); + super(AnnotationStore.of(annotationType, classTransformer.getTypeStore()), annotationType, annotationType, classTransformer); this.clazz = annotationType; members = new HashSet<WBMethod<?>>(); annotatedMembers = new SetHashMultiMap<Class<? extends Annotation>, WBMethod<?>>(); this.namedMembers = new HashMap<String, WBMethod<?>>(); for (Method member : clazz.getDeclaredMethods()) { - WBMethod<?> annotatedMethod = WBMethodImpl.of(member, this); + WBMethod<?> annotatedMethod = WBMethodImpl.of(member, this, classTransformer); members.add(annotatedMethod); for (Annotation annotation : annotatedMethod.getAnnotations()) { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBClassImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBClassImpl.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBClassImpl.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -29,6 +29,8 @@ import java.util.Map; import java.util.Set; +import javax.enterprise.inject.spi.AnnotatedType; + import org.jboss.webbeans.introspector.AnnotationStore; import org.jboss.webbeans.introspector.ConstructorSignature; import org.jboss.webbeans.introspector.MethodSignature; @@ -53,16 +55,16 @@ */ public class WBClassImpl<T> extends AbstractWBType<T> implements WBClass<T> { - + private static List<Class<?>> NO_ARGUMENTS = Collections.emptyList(); - + // The set of abstracted fields private final Set<WBField<?>> fields; // The map from annotation type to abstracted field with annotation private final SetMultiMap<Class<? extends Annotation>, WBField<?>> annotatedFields; // The map from annotation type to abstracted field with meta-annotation private final SetMultiMap<Class<? extends Annotation>, WBField<?>> metaAnnotatedFields; - + // The set of abstracted fields private final Set<WBField<?>> declaredFields; private final Map<String, WBField<?>> declaredFieldsByName; @@ -70,7 +72,7 @@ private final SetMultiMap<Class<? extends Annotation>, WBField<?>> declaredAnnotatedFields; // The map from annotation type to abstracted field with meta-annotation private final SetMultiMap<Class<? extends Annotation>, WBField<?>> declaredMetaAnnotatedFields; - + // The set of abstracted methods private final Set<WBMethod<?>> methods; private final Map<MethodSignature, WBMethod<?>> declaredMethodsBySignature; @@ -79,14 +81,14 @@ private final SetMultiMap<Class<? extends Annotation>, WBMethod<?>> annotatedMethods; // The map from annotation type to method with a parameter with annotation private final SetMultiMap<Class<? extends Annotation>, WBMethod<?>> methodsByAnnotatedParameters; - + // The set of abstracted methods private final Set<WBMethod<?>> declaredMethods; // The map from annotation type to abstracted method with annotation private final SetMultiMap<Class<? extends Annotation>, WBMethod<?>> declaredAnnotatedMethods; // The map from annotation type to method with a parameter with annotation private final SetMultiMap<Class<? extends Annotation>, WBMethod<?>> declaredMethodsByAnnotatedParameters; - + // The set of abstracted constructors private final Set<WBConstructor<T>> constructors; private final Map<ConstructorSignature, WBConstructor<?>> declaredConstructorsBySignature; @@ -94,26 +96,32 @@ private final SetMultiMap<Class<? extends Annotation>, WBConstructor<T>> annotatedConstructors; // The map from class list to abstracted constructor private final Map<List<Class<?>>, WBConstructor<T>> constructorsByArgumentMap; - + private final SetMultiMap<Class<? extends Annotation>, WBConstructor<?>> constructorsByAnnotatedParameters; - + // Cached string representation private String toString; - + private final boolean _nonStaticMemberClass; private final boolean _abstract; private final boolean _enum; - public static <T> WBClass<T> of(Class<T> clazz, ClassTransformer classTransformer) { - return new WBClassImpl<T>(clazz, clazz, clazz.getAnnotations(), clazz.getDeclaredAnnotations(), classTransformer); + AnnotationStore annotationStore = AnnotationStore.of(clazz.getAnnotations(), clazz.getDeclaredAnnotations(), classTransformer.getTypeStore()); + return new WBClassImpl<T>(clazz, clazz, annotationStore, classTransformer); } + + public static <T> WBClass<T> of(AnnotatedType<T> annotatedType, ClassTransformer classTransformer) + { + AnnotationStore annotationStore = AnnotationStore.of(annotatedType.getAnnotations(), annotatedType.getAnnotations(), classTransformer.getTypeStore()); + return new WBClassImpl<T>(annotatedType.getJavaClass(), annotatedType.getBaseType(), annotationStore, classTransformer); + } - private WBClassImpl(Class<T> rawType, Type type, Annotation[] annotations, Annotation[] declaredAnnotations, ClassTransformer classTransformer) + private WBClassImpl(Class<T> rawType, Type type, AnnotationStore annotationStore, ClassTransformer classTransformer) { - super(AnnotationStore.of(annotations, declaredAnnotations), rawType, type, classTransformer); - + super(annotationStore, rawType, type, classTransformer); + this.fields = new HashSet<WBField<?>>(); this.annotatedFields = new SetHashMultiMap<Class<? extends Annotation>, WBField<?>>(); this.metaAnnotatedFields = new SetHashMultiMap<Class<? extends Annotation>, WBField<?>>(); @@ -132,7 +140,7 @@ { field.setAccessible(true); } - WBField<?> annotatedField = new WBFieldImpl<Object>(field, this); + WBField<?> annotatedField = new WBFieldImpl<Object>(field, this, classTransformer); this.fields.add(annotatedField); if (c == rawType) { @@ -155,10 +163,10 @@ } } } - + } } - + this.constructors = new HashSet<WBConstructor<T>>(); this.constructorsByArgumentMap = new HashMap<List<Class<?>>, WBConstructor<T>>(); this.annotatedConstructors = new SetHashMultiMap<Class<? extends Annotation>, WBConstructor<T>>(); @@ -168,16 +176,16 @@ { @SuppressWarnings("unchecked") Constructor<T> c = (Constructor<T>) constructor; - WBConstructor<T> annotatedConstructor = WBConstructorImpl.of(c, this); + WBConstructor<T> annotatedConstructor = WBConstructorImpl.of(c, this, classTransformer); if (!constructor.isAccessible()) { constructor.setAccessible(true); } this.constructors.add(annotatedConstructor); this.constructorsByArgumentMap.put(Arrays.asList(constructor.getParameterTypes()), annotatedConstructor); - + this.declaredConstructorsBySignature.put(annotatedConstructor.getSignature(), annotatedConstructor); - + for (Annotation annotation : annotatedConstructor.getAnnotations()) { if (!annotatedConstructors.containsKey(annotation.annotationType())) @@ -186,7 +194,7 @@ } annotatedConstructors.get(annotation.annotationType()).add(annotatedConstructor); } - + for (Class<? extends Annotation> annotationType : WBConstructor.MAPPED_PARAMETER_ANNOTATIONS) { if (annotatedConstructor.getAnnotatedParameters(annotationType).size() > 0) @@ -195,7 +203,7 @@ } } } - + this.methods = new HashSet<WBMethod<?>>(); this.annotatedMethods = new SetHashMultiMap<Class<? extends Annotation>, WBMethod<?>>(); this.methodsByAnnotatedParameters = new SetHashMultiMap<Class<? extends Annotation>, WBMethod<?>>(); @@ -212,8 +220,8 @@ { method.setAccessible(true); } - - WBMethod<?> annotatedMethod = WBMethodImpl.of(method, this); + + WBMethod<?> annotatedMethod = WBMethodImpl.of(method, this, classTransformer); this.methods.add(annotatedMethod); this.methodsBySignature.put(annotatedMethod.getSignature(), annotatedMethod); if (c == rawType) @@ -243,7 +251,7 @@ } } } - + /** * Gets the implementing class * @@ -253,7 +261,7 @@ { return getJavaClass(); } - + /** * Gets the delegate (class) * @@ -263,7 +271,7 @@ { return getJavaClass(); } - + /** * Gets the abstracted fields of the class * @@ -275,22 +283,22 @@ { return Collections.unmodifiableSet(fields); } - + public Set<WBField<?>> getDeclaredFields() { return Collections.unmodifiableSet(declaredFields); } - + public <F> WBField<F> getDeclaredField(String fieldName, WBClass<F> expectedType) { return (WBField<F>) declaredFieldsByName.get(fieldName); } - + public Set<WBField<?>> getDeclaredAnnotatedFields(Class<? extends Annotation> annotationType) { return Collections.unmodifiableSet(declaredAnnotatedFields.get(annotationType)); } - + /** * Gets the abstracted constructors of the class * @@ -302,12 +310,12 @@ { return Collections.unmodifiableSet(constructors); } - + public WBConstructor<T> getDeclaredConstructor(ConstructorSignature signature) { return (WBConstructor<T>) declaredConstructorsBySignature.get(signature); } - + /** * Gets abstracted fields with requested meta-annotation type present * @@ -316,8 +324,7 @@ * populated for the requested meta-annotation type and the result is * returned * - * @param metaAnnotationType - * The meta-annotation type to match + * @param metaAnnotationType The meta-annotation type to match * @return The set of abstracted fields with meta-annotation present. Returns * an empty set if no matches are found. */ @@ -325,14 +332,13 @@ { return Collections.unmodifiableSet(metaAnnotatedFields.get(metaAnnotationType)); } - + /** * Gets the abstracted field annotated with a specific annotation type * * If the fields map is null, initialize it first * - * @param annotationType - * The annotation type to match + * @param annotationType The annotation type to match * @return A set of matching abstracted fields, null if none are found. * */ @@ -340,29 +346,28 @@ { return Collections.unmodifiableSet(annotatedFields.get(annotationType)); } - + public boolean isNonStaticMemberClass() { return _nonStaticMemberClass; } - + public boolean isAbstract() { return _abstract; } - + public boolean isEnum() { return _enum; } - + /** * Gets the abstracted methods that have a certain annotation type present * * If the annotated methods map is null, initialize it first * - * @param annotationType - * The annotation type to match + * @param annotationType The annotation type to match * @return A set of matching method abstractions. Returns an empty set if no * matches are found. * @@ -372,17 +377,16 @@ { return Collections.unmodifiableSet(annotatedMethods.get(annotationType)); } - + public Set<WBMethod<?>> getDeclaredAnnotatedMethods(Class<? extends Annotation> annotationType) { return Collections.unmodifiableSet(declaredAnnotatedMethods.get(annotationType)); } - + /** * Gets constructors with given annotation type * - * @param annotationType - * The annotation type to match + * @param annotationType The annotation type to match * @return A set of abstracted constructors with given annotation type. If * the constructors set is empty, initialize it first. Returns an * empty set if there are no matches. @@ -393,27 +397,27 @@ { return Collections.unmodifiableSet(annotatedConstructors.get(annotationType)); } - + public WBConstructor<T> getNoArgsConstructor() { return constructorsByArgumentMap.get(NO_ARGUMENTS); } - + public Set<WBMethod<?>> getMethodsWithAnnotatedParameters(Class<? extends Annotation> annotationType) { return Collections.unmodifiableSet(methodsByAnnotatedParameters.get(annotationType)); } - + public Set<WBConstructor<?>> getConstructorsWithAnnotatedParameters(Class<? extends Annotation> annotationType) { return Collections.unmodifiableSet(constructorsByAnnotatedParameters.get(annotationType)); } - + public Set<WBMethod<?>> getDeclaredMethodsWithAnnotatedParameters(Class<? extends Annotation> annotationType) { return Collections.unmodifiableSet(declaredMethodsByAnnotatedParameters.get(annotationType)); } - + public WBMethod<?> getMethod(Method methodDescriptor) { // TODO Should be cached @@ -426,12 +430,12 @@ } return null; } - + public Set<WBMethod<?>> getMethods() { return Collections.unmodifiableSet(methods); } - + public WBMethod<?> getDeclaredMethod(Method method) { // TODO Should be cached @@ -444,19 +448,19 @@ } return null; } - + @SuppressWarnings("unchecked") public <M> WBMethod<M> getDeclaredMethod(MethodSignature signature, WBClass<M> expectedReturnType) { return (WBMethod<M>) declaredMethodsBySignature.get(signature); } - + @SuppressWarnings("unchecked") public <M> WBMethod<M> getMethod(MethodSignature signature) { return (WBMethod<M>) methodsBySignature.get(signature); } - + /** * Gets a string representation of the class * @@ -472,17 +476,17 @@ toString = "Annotated class " + Names.classToString(getDelegate()); return toString; } - + @SuppressWarnings("unchecked") public <U> WBClass<? extends U> asSubclass(WBClass<U> clazz) { return (WBClass<? extends U>) this; } - + @SuppressWarnings("unchecked") public T cast(Object object) { return (T) object; } - + } \ No newline at end of file Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBConstructorImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBConstructorImpl.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBConstructorImpl.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -30,6 +30,7 @@ import org.jboss.webbeans.introspector.WBConstructor; import org.jboss.webbeans.introspector.WBParameter; import org.jboss.webbeans.introspector.WBType; +import org.jboss.webbeans.resources.ClassTransformer; import org.jboss.webbeans.util.Names; import org.jboss.webbeans.util.collections.multi.ListHashMultiMap; import org.jboss.webbeans.util.collections.multi.ListMultiMap; @@ -62,9 +63,9 @@ // Cached string representation private String toString; - public static <T> WBConstructor<T> of(Constructor<T> constructor, WBType<T> declaringClass) + public static <T> WBConstructor<T> of(Constructor<T> constructor, WBType<T> declaringClass, ClassTransformer classTransformer) { - return new WBConstructorImpl<T>(constructor, declaringClass); + return new WBConstructorImpl<T>(constructor, declaringClass, classTransformer); } /** @@ -75,9 +76,9 @@ * @param constructor The constructor method * @param declaringClass The declaring class */ - protected WBConstructorImpl(Constructor<T> constructor, WBType<T> declaringClass) + protected WBConstructorImpl(Constructor<T> constructor, WBType<T> declaringClass, ClassTransformer classTransformer) { - super(AnnotationStore.of(constructor), constructor, constructor.getDeclaringClass(), constructor.getDeclaringClass()); + super(AnnotationStore.of(constructor, classTransformer.getTypeStore()), constructor, constructor.getDeclaringClass(), constructor.getDeclaringClass()); this.constructor = constructor; this.declaringClass = declaringClass; @@ -90,7 +91,7 @@ { Class<?> clazz = constructor.getParameterTypes()[i]; Type type = constructor.getGenericParameterTypes()[i]; - WBParameter<?> parameter = WBParameterImpl.of(constructor.getParameterAnnotations()[i], clazz, type, this); + WBParameter<?> parameter = WBParameterImpl.of(constructor.getParameterAnnotations()[i], clazz, type, this, classTransformer); parameters.add(parameter); for (Annotation annotation : parameter.getAnnotations()) @@ -110,7 +111,7 @@ { type = clazz; } - WBParameter<?> parameter = WBParameterImpl.of(new Annotation[0], clazz, type, this); + WBParameter<?> parameter = WBParameterImpl.of(new Annotation[0], clazz, type, this, classTransformer); parameters.add(parameter); for (Annotation annotation : parameter.getAnnotations()) Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBFieldImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBFieldImpl.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBFieldImpl.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -21,6 +21,7 @@ import org.jboss.webbeans.introspector.AnnotationStore; import org.jboss.webbeans.introspector.WBField; import org.jboss.webbeans.introspector.WBType; +import org.jboss.webbeans.resources.ClassTransformer; import org.jboss.webbeans.util.Names; import org.jboss.webbeans.util.Reflections; @@ -53,9 +54,9 @@ * @param field The actual field * @param declaringClass The abstraction of the declaring class */ - protected WBFieldImpl(Field field, WBType<?> declaringClass) + protected WBFieldImpl(Field field, WBType<?> declaringClass, ClassTransformer classTransformer) { - super(AnnotationStore.of(field), field, (Class<T>) field.getType(), field.getGenericType()); + super(AnnotationStore.of(field, classTransformer.getTypeStore()), field, (Class<T>) field.getType(), field.getGenericType()); this.field = field; field.setAccessible(true); this.declaringClass = declaringClass; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBMethodImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBMethodImpl.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBMethodImpl.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -30,6 +30,7 @@ import org.jboss.webbeans.introspector.WBMethod; import org.jboss.webbeans.introspector.WBParameter; import org.jboss.webbeans.introspector.WBType; +import org.jboss.webbeans.resources.ClassTransformer; import org.jboss.webbeans.util.Names; import org.jboss.webbeans.util.Reflections; import org.jboss.webbeans.util.collections.multi.ListHashMultiMap; @@ -67,9 +68,9 @@ private final MethodSignature signature; - public static <T> WBMethodImpl<T> of(Method method, WBType<?> declaringClass) + public static <T> WBMethodImpl<T> of(Method method, WBType<?> declaringClass, ClassTransformer classTransformer) { - return new WBMethodImpl<T>(method, declaringClass); + return new WBMethodImpl<T>(method, declaringClass, classTransformer); } /** @@ -82,9 +83,9 @@ * @param declaringClass The declaring class abstraction */ @SuppressWarnings("unchecked") - protected WBMethodImpl(Method method, WBType<?> declaringClass) + protected WBMethodImpl(Method method, WBType<?> declaringClass, ClassTransformer classTransformer) { - super(AnnotationStore.of(method), method, (Class<T>) method.getReturnType(), method.getGenericReturnType()); + super(AnnotationStore.of(method, classTransformer.getTypeStore()), method, (Class<T>) method.getReturnType(), method.getGenericReturnType()); this.method = method; this.method.setAccessible(true); this.declaringClass = declaringClass; @@ -97,7 +98,7 @@ { Class<? extends Object> clazz = method.getParameterTypes()[i]; Type type = method.getGenericParameterTypes()[i]; - WBParameter<?> parameter = WBParameterImpl.of(method.getParameterAnnotations()[i], (Class<Object>) clazz, type, this); + WBParameter<?> parameter = WBParameterImpl.of(method.getParameterAnnotations()[i], (Class<Object>) clazz, type, this, classTransformer); this.parameters.add(parameter); for (Annotation annotation : parameter.getAnnotations()) { @@ -111,7 +112,7 @@ { Class<? extends Object> clazz = method.getParameterTypes()[i]; Type type = method.getGenericParameterTypes()[i]; - WBParameter<?> parameter = WBParameterImpl.of(new Annotation[0], (Class<Object>) clazz, type, this); + WBParameter<?> parameter = WBParameterImpl.of(new Annotation[0], (Class<Object>) clazz, type, this, classTransformer); this.parameters.add(parameter); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBParameterImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBParameterImpl.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBParameterImpl.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -23,6 +23,7 @@ import org.jboss.webbeans.introspector.AnnotationStore; import org.jboss.webbeans.introspector.WBMember; import org.jboss.webbeans.introspector.WBParameter; +import org.jboss.webbeans.resources.ClassTransformer; /** * Represents a parameter @@ -47,9 +48,9 @@ // Cached string representation private String toString; - public static <T> WBParameter<T> of(Annotation[] annotations, Class<T> rawType, Type type, WBMember<?, ?> declaringMember) + public static <T> WBParameter<T> of(Annotation[] annotations, Class<T> rawType, Type type, WBMember<?, ?> declaringMember, ClassTransformer classTransformer) { - return new WBParameterImpl<T>(annotations, rawType, type, declaringMember); + return new WBParameterImpl<T>(annotations, rawType, type, declaringMember, classTransformer); } /** @@ -58,9 +59,9 @@ * @param annotations The annotations array * @param type The type of the parameter */ - protected WBParameterImpl(Annotation[] annotations, Class<T> rawType, Type type, WBMember<?, ?> declaringMember) + protected WBParameterImpl(Annotation[] annotations, Class<T> rawType, Type type, WBMember<?, ?> declaringMember, ClassTransformer classTransformer) { - super(AnnotationStore.of(annotations, annotations), rawType, type); + super(AnnotationStore.of(annotations, annotations, classTransformer.getTypeStore()), rawType, type); this.declaringMember = declaringMember; } Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/TypeStore.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/TypeStore.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/TypeStore.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -0,0 +1,56 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.metadata; + +import java.lang.annotation.Annotation; +import java.util.Set; +import java.util.concurrent.CopyOnWriteArraySet; + +import org.jboss.webbeans.bootstrap.api.Service; +import org.jboss.webbeans.util.collections.multi.ConcurrentSetHashMultiMap; +import org.jboss.webbeans.util.collections.multi.ConcurrentSetMultiMap; + +/** + * @author pmuir + * + */ +public class TypeStore implements Service +{ + + private final ConcurrentSetMultiMap<Class<? extends Annotation>, Annotation> extraAnnotations; + + public TypeStore() + { + this.extraAnnotations = new ConcurrentSetHashMultiMap<Class<? extends Annotation>, Annotation>(); + } + + public Set<Annotation> get(Class<? extends Annotation> annotationType) + { + return extraAnnotations.get(annotationType); + } + + public void add(Class<? extends Annotation> annotationType, Annotation annotation) + { + this.extraAnnotations.put(annotationType, annotation); + } + + public void addAll(Class<? extends Annotation> annotationType, Set<Annotation> annotations) + { + this.extraAnnotations.putIfAbsent(annotationType, new CopyOnWriteArraySet<Annotation>()); + this.extraAnnotations.get(annotationType).addAll(annotations); + } +} Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/TypeStore.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/MergedStereotypes.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/MergedStereotypes.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/MergedStereotypes.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -69,7 +69,7 @@ for (Annotation stereotypeAnnotation : stereotypeAnnotations) { // Retrieve and merge all metadata from stereotypes - StereotypeModel<?> stereotype = manager.getServices().get(MetaDataCache.class).getStereotype(stereotypeAnnotation.annotationType()); + StereotypeModel<?> stereotype = manager.getServices().get(MetaAnnotationStore.class).getStereotype(stereotypeAnnotation.annotationType()); if (stereotype == null) { throw new IllegalStateException("Stereotype " + stereotypeAnnotation + " not registered with container"); Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/MetaAnnotationStore.java (from rev 2903, ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/MetaDataCache.java) =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/MetaAnnotationStore.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/MetaAnnotationStore.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -0,0 +1,130 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.metadata.cache; + +import java.lang.annotation.Annotation; +import java.util.concurrent.Callable; + +import org.jboss.webbeans.bootstrap.api.Service; +import org.jboss.webbeans.resources.ClassTransformer; +import org.jboss.webbeans.util.collections.ConcurrentCache; + +/** + * Metadata singleton for holding EJB metadata, scope models etc. + * + * @author Pete Muir + * + */ +public class MetaAnnotationStore implements Service +{ + + // The stereotype models + private ConcurrentCache<Class<? extends Annotation>, StereotypeModel<?>> stereotypes = new ConcurrentCache<Class<? extends Annotation>, StereotypeModel<?>>(); + // The scope models + private ConcurrentCache<Class<? extends Annotation>, ScopeModel<?>> scopes = new ConcurrentCache<Class<? extends Annotation>, ScopeModel<?>>(); + // The binding type models + private ConcurrentCache<Class<? extends Annotation>, BindingTypeModel<?>> bindingTypes = new ConcurrentCache<Class<? extends Annotation>, BindingTypeModel<?>>(); + + private final ClassTransformer classTransformer; + + public MetaAnnotationStore(ClassTransformer classTransformer) + { + this.classTransformer = classTransformer; + } + + /** + * Gets a stereotype model + * + * Adds the model if it is not present. + * + * @param <T> The type + * @param stereotype The stereotype + * @return The stereotype model + */ + public <T extends Annotation> StereotypeModel<T> getStereotype(final Class<T> stereotype) + { + return stereotypes.putIfAbsent(stereotype, new Callable<StereotypeModel<T>>() + { + + public StereotypeModel<T> call() throws Exception + { + return new StereotypeModel<T>(stereotype, classTransformer); + } + }); + } + + /** + * Gets a scope model + * + * Adds the model if it is not present. + * + * @param <T> The type + * @param scopeType The scope type + * @return The scope type model + */ + public <T extends Annotation> ScopeModel<T> getScopeModel(final Class<T> scopeType) + { + return scopes.putIfAbsent(scopeType, new Callable<ScopeModel<T>>() + { + + public ScopeModel<T> call() throws Exception + { + return new ScopeModel<T>(scopeType, classTransformer); + } + + }); + } + + /** + * Gets a binding type model. + * + * Adds the model if it is not present. + * + * @param <T> The type + * @param bindingType The binding type + * @return The binding type model + */ + public <T extends Annotation> BindingTypeModel<T> getBindingTypeModel(final Class<T> bindingType) + { + return bindingTypes.putIfAbsent(bindingType, new Callable<BindingTypeModel<T>>() + { + + public BindingTypeModel<T> call() throws Exception + { + return new BindingTypeModel<T>(bindingType, classTransformer); + } + + }); + } + + /** + * Gets a string representation + * + * @return A string representation + */ + @Override + public String toString() + { + StringBuilder buffer = new StringBuilder(); + buffer.append("Metadata cache\n"); + buffer.append("Registered binding type models: " + bindingTypes.size() + "\n"); + buffer.append("Registered scope type models: " + scopes.size() + "\n"); + buffer.append("Registered stereotype models: " + stereotypes.size() + "\n"); + return buffer.toString(); + } + +} Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/MetaDataCache.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/MetaDataCache.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/MetaDataCache.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -1,130 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.webbeans.metadata.cache; - -import java.lang.annotation.Annotation; -import java.util.concurrent.Callable; - -import org.jboss.webbeans.bootstrap.api.Service; -import org.jboss.webbeans.resources.ClassTransformer; -import org.jboss.webbeans.util.collections.ConcurrentCache; - -/** - * Metadata singleton for holding EJB metadata, scope models etc. - * - * @author Pete Muir - * - */ -public class MetaDataCache implements Service -{ - - // The stereotype models - private ConcurrentCache<Class<? extends Annotation>, StereotypeModel<?>> stereotypes = new ConcurrentCache<Class<? extends Annotation>, StereotypeModel<?>>(); - // The scope models - private ConcurrentCache<Class<? extends Annotation>, ScopeModel<?>> scopes = new ConcurrentCache<Class<? extends Annotation>, ScopeModel<?>>(); - // The binding type models - private ConcurrentCache<Class<? extends Annotation>, BindingTypeModel<?>> bindingTypes = new ConcurrentCache<Class<? extends Annotation>, BindingTypeModel<?>>(); - - private final ClassTransformer classTransformer; - - public MetaDataCache(ClassTransformer classTransformer) - { - this.classTransformer = classTransformer; - } - - /** - * Gets a stereotype model - * - * Adds the model if it is not present. - * - * @param <T> The type - * @param stereotype The stereotype - * @return The stereotype model - */ - public <T extends Annotation> StereotypeModel<T> getStereotype(final Class<T> stereotype) - { - return stereotypes.putIfAbsent(stereotype, new Callable<StereotypeModel<T>>() - { - - public StereotypeModel<T> call() throws Exception - { - return new StereotypeModel<T>(stereotype, classTransformer); - } - }); - } - - /** - * Gets a scope model - * - * Adds the model if it is not present. - * - * @param <T> The type - * @param scopeType The scope type - * @return The scope type model - */ - public <T extends Annotation> ScopeModel<T> getScopeModel(final Class<T> scopeType) - { - return scopes.putIfAbsent(scopeType, new Callable<ScopeModel<T>>() - { - - public ScopeModel<T> call() throws Exception - { - return new ScopeModel<T>(scopeType, classTransformer); - } - - }); - } - - /** - * Gets a binding type model. - * - * Adds the model if it is not present. - * - * @param <T> The type - * @param bindingType The binding type - * @return The binding type model - */ - public <T extends Annotation> BindingTypeModel<T> getBindingTypeModel(final Class<T> bindingType) - { - return bindingTypes.putIfAbsent(bindingType, new Callable<BindingTypeModel<T>>() - { - - public BindingTypeModel<T> call() throws Exception - { - return new BindingTypeModel<T>(bindingType, classTransformer); - } - - }); - } - - /** - * Gets a string representation - * - * @return A string representation - */ - @Override - public String toString() - { - StringBuilder buffer = new StringBuilder(); - buffer.append("Metadata cache\n"); - buffer.append("Registered binding type models: " + bindingTypes.size() + "\n"); - buffer.append("Registered scope type models: " + scopes.size() + "\n"); - buffer.append("Registered stereotype models: " + stereotypes.size() + "\n"); - return buffer.toString(); - } - -} Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/StereotypeModel.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/StereotypeModel.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/StereotypeModel.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -17,8 +17,6 @@ package org.jboss.webbeans.metadata.cache; import java.lang.annotation.Annotation; -import java.util.Arrays; -import java.util.HashSet; import java.util.Set; import javax.enterprise.context.ScopeType; @@ -64,8 +62,6 @@ initDefaultDeploymentType(); initDefaultScopeType(); initBeanNameDefaulted(); - initSupportedScopes(); - initRequiredTypes(); initInterceptorBindings(); checkBindings(); } @@ -91,32 +87,6 @@ } /** - * Initializes the supported scopes - */ - private void initSupportedScopes() - { - this.supportedScopes = new HashSet<Class<? extends Annotation>>(); - Class<? extends Annotation>[] supportedScopes = getAnnotatedAnnotation().getAnnotation(Stereotype.class).supportedScopes(); - if (supportedScopes.length > 0) - { - this.supportedScopes.addAll(Arrays.asList(supportedScopes)); - } - } - - /** - * Initializes the required types - */ - private void initRequiredTypes() - { - this.requiredTypes = new HashSet<Class<?>>(); - Class<?>[] requiredTypes = getAnnotatedAnnotation().getAnnotation(Stereotype.class).requiredTypes(); - if (requiredTypes.length > 0) - { - this.requiredTypes.addAll(Arrays.asList(requiredTypes)); - } - } - - /** * Initializes the bean name defaulted */ private void initBeanNameDefaulted() Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/resources/ClassTransformer.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/resources/ClassTransformer.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/resources/ClassTransformer.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -19,27 +19,34 @@ import java.lang.annotation.Annotation; import java.util.concurrent.Callable; +import javax.enterprise.inject.spi.AnnotatedType; + import org.jboss.webbeans.bootstrap.api.Service; import org.jboss.webbeans.introspector.WBAnnotation; import org.jboss.webbeans.introspector.WBClass; import org.jboss.webbeans.introspector.jlr.WBAnnotationImpl; import org.jboss.webbeans.introspector.jlr.WBClassImpl; +import org.jboss.webbeans.metadata.TypeStore; import org.jboss.webbeans.util.collections.ConcurrentCache; public class ClassTransformer implements Service { private final ConcurrentCache<Class<?>, WBClass<?>> classes; + private final ConcurrentCache<AnnotatedType<?>, WBClass<?>> annotatedTypes; private final ConcurrentCache<Class<?>, WBAnnotation<?>> annotations; private final ClassTransformer transformer = this; + private final TypeStore typeStore; /** * */ - public ClassTransformer() + public ClassTransformer(TypeStore typeStore) { classes = new ConcurrentCache<Class<?>, WBClass<?>>(); + this.annotatedTypes = new ConcurrentCache<AnnotatedType<?>, WBClass<?>>(); annotations = new ConcurrentCache<Class<?>, WBAnnotation<?>>(); + this.typeStore = typeStore; } public <T> WBClass<T> loadClass(final Class<T> clazz) @@ -54,7 +61,20 @@ }); } + + public <T> WBClass<T> loadClass(final AnnotatedType<T> clazz) + { + return annotatedTypes.putIfAbsent(clazz, new Callable<WBClass<T>>() + { + public WBClass<T> call() throws Exception + { + return WBClassImpl.of(clazz, transformer); + } + + }); + } + public <T extends Annotation> WBAnnotation<T> loadAnnotation(final Class<T> clazz) { return annotations.putIfAbsent(clazz, new Callable<WBAnnotation<T>>() @@ -66,5 +86,10 @@ }); } + + public TypeStore getTypeStore() + { + return typeStore; + } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Beans.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Beans.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Beans.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -33,7 +33,7 @@ import org.jboss.webbeans.introspector.WBClass; import org.jboss.webbeans.introspector.WBField; import org.jboss.webbeans.metadata.cache.BindingTypeModel; -import org.jboss.webbeans.metadata.cache.MetaDataCache; +import org.jboss.webbeans.metadata.cache.MetaAnnotationStore; /** * Helper class for bean inspection @@ -58,7 +58,7 @@ } else { - return manager.getServices().get(MetaDataCache.class).getScopeModel(bean.getScopeType()).isPassivating(); + return manager.getServices().get(MetaAnnotationStore.class).getScopeModel(bean.getScopeType()).isPassivating(); } } @@ -122,7 +122,7 @@ { for (Annotation binding : bindings1) { - BindingTypeModel<?> bindingType = manager.getServices().get(MetaDataCache.class).getBindingTypeModel(binding.annotationType()); + BindingTypeModel<?> bindingType = manager.getServices().get(MetaAnnotationStore.class).getBindingTypeModel(binding.annotationType()); if (bindingType.getNonBindingTypes().size() > 0) { boolean matchFound = false; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/PassivatingContextTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/PassivatingContextTest.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/PassivatingContextTest.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -6,7 +6,7 @@ import javax.enterprise.context.SessionScoped; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.metadata.cache.MetaDataCache; +import org.jboss.webbeans.metadata.cache.MetaAnnotationStore; import org.testng.annotations.Test; @Artifact @@ -20,7 +20,7 @@ @Test(groups = { "contexts", "passivation" }) public void testIsSessionScopePassivating() { - assert getCurrentManager().getServices().get(MetaDataCache.class).getScopeModel(SessionScoped.class).isPassivating(); + assert getCurrentManager().getServices().get(MetaAnnotationStore.class).getScopeModel(SessionScoped.class).isPassivating(); } /** @@ -30,7 +30,7 @@ @Test(groups = { "contexts", "passivation" }) public void testIsConversationScopePassivating() { - assert getCurrentManager().getServices().get(MetaDataCache.class).getScopeModel(ConversationScoped.class).isPassivating(); + assert getCurrentManager().getServices().get(MetaAnnotationStore.class).getScopeModel(ConversationScoped.class).isPassivating(); } /** @@ -40,7 +40,7 @@ @Test(groups = { "contexts", "passivation" }) public void testIsApplicationScopeNonPassivating() { - assert !getCurrentManager().getServices().get(MetaDataCache.class).getScopeModel(ApplicationScoped.class).isPassivating(); + assert !getCurrentManager().getServices().get(MetaAnnotationStore.class).getScopeModel(ApplicationScoped.class).isPassivating(); } /** @@ -50,7 +50,7 @@ @Test(groups = { "contexts", "passivation" }) public void testIsRequestScopeNonPassivating() { - assert !getCurrentManager().getServices().get(MetaDataCache.class).getScopeModel(RequestScoped.class).isPassivating(); + assert !getCurrentManager().getServices().get(MetaAnnotationStore.class).getScopeModel(RequestScoped.class).isPassivating(); } } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalOrderStereotype.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalOrderStereotype.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalOrderStereotype.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -10,7 +10,7 @@ -(a)Stereotype(requiredTypes={Animal.class, Order.class}) +@Stereotype @Target( { TYPE }) @Retention(RUNTIME) @interface AnimalOrderStereotype Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalStereotype.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalStereotype.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalStereotype.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -11,7 +11,7 @@ import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.stereotype.Stereotype; -(a)Stereotype(requiredTypes=Animal.class) +@Stereotype @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) @RequestScoped Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/RequestScopedAnimalStereotype.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/RequestScopedAnimalStereotype.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/RequestScopedAnimalStereotype.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -6,10 +6,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.stereotype.Stereotype; -(a)Stereotype(requiredTypes=Animal.class, supportedScopes=RequestScoped.class) +@Stereotype @Target( { TYPE }) @Retention(RUNTIME) public @interface RequestScopedAnimalStereotype Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -5,6 +5,7 @@ import javax.enterprise.context.RequestScoped; import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.webbeans.metadata.TypeStore; import org.jboss.webbeans.metadata.cache.StereotypeModel; import org.jboss.webbeans.resources.ClassTransformer; import org.jboss.webbeans.test.AbstractWebBeansTest; @@ -14,7 +15,7 @@ public class StereotypesTest extends AbstractWebBeansTest { - private final ClassTransformer transformer = new ClassTransformer(); + private final ClassTransformer transformer = new ClassTransformer(new TypeStore()); @Test public void testAnimalStereotype() Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java 2009-06-28 15:05:58 UTC (rev 2913) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java 2009-06-28 15:17:17 UTC (rev 2914) @@ -11,6 +11,7 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.introspector.WBClass; import org.jboss.webbeans.introspector.jlr.WBClassImpl; +import org.jboss.webbeans.metadata.TypeStore; import org.jboss.webbeans.resources.ClassTransformer; import org.jboss.webbeans.test.AbstractWebBeansTest; import org.testng.annotations.Test; @@ -19,7 +20,7 @@ public class ClassAnnotatedItemTest extends AbstractWebBeansTest { - private final ClassTransformer transformer = new ClassTransformer(); + private final ClassTransformer transformer = new ClassTransformer(new TypeStore()); @Test public void testDeclaredAnnotations()

11 years, 9 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2913 - ri/trunk/impl/src/main/java/org/jboss/webbeans/util/reflection.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-06-28 11:05:58 -0400 (Sun, 28 Jun 2009) New Revision: 2913 Removed: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/reflection/AnnotationImpl.java Log: clean up Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/reflection/AnnotationImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/reflection/AnnotationImpl.java 2009-06-28 15:03:00 UTC (rev 2912) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/reflection/AnnotationImpl.java 2009-06-28 15:05:58 UTC (rev 2913) @@ -1,121 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2008, Red Hat Middleware LLC, and individual contributors -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -package org.jboss.webbeans.util.reflection; - -import java.lang.annotation.Annotation; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -/** - * Supports instantiation of annotation type instances. - * - * @author Pete Muir - * @author Gavin King - * - * @param <T> - * the annotation type - */ -public class AnnotationImpl<T extends Annotation> implements Annotation -{ - - private final Class<T> annotationType; - private final Method[] members; - - public AnnotationImpl(Class<T> annotationType, Method[] members) - { - this.annotationType = annotationType; - this.members = members; - } - - public Class<? extends Annotation> annotationType() - { - return annotationType; - } - - @Override - public String toString() - { - String string = "@" + annotationType().getName() + "("; - for (int i = 0; i < members.length; i++) - { - string += members[i].getName() + "="; - string += invoke(members[i], this); - if (i < members.length - 1) - { - string += ","; - } - } - return string + ")"; - } - - @Override - public boolean equals(Object other) - { - if (other instanceof Annotation) - { - Annotation that = (Annotation) other; - if (this.annotationType().equals(that.annotationType())) - { - for (Method member : members) - { - Object thisValue = invoke(member, this); - Object thatValue = invoke(member, that); - if (!thisValue.equals(thatValue)) - { - return false; - } - } - return true; - } - } - return false; - } - - @Override - public int hashCode() - { - int hashCode = 0; - for (Method member : members) - { - int memberNameHashCode = 127 * member.getName().hashCode(); - int memberValueHashCode = invoke(member, this).hashCode(); - hashCode += memberNameHashCode ^ memberValueHashCode; - } - return hashCode; - } - - private static Object invoke(Method method, Object instance) - { - try - { - method.setAccessible(true); - return method.invoke(instance); - } - catch (IllegalArgumentException e) - { - throw new RuntimeException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); - } - catch (IllegalAccessException e) - { - throw new RuntimeException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); - } - catch (InvocationTargetException e) - { - throw new RuntimeException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); - } - } -}

11 years, 9 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2912 - ri/trunk/impl/src/main/java/org/jboss/webbeans/literal.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-06-28 11:03:00 -0400 (Sun, 28 Jun 2009) New Revision: 2912 Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/BindingTypeLiteral.java ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/InterceptorBindingTypeLiteral.java ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ScopeTypeLiteral.java ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/StereotypeLiteral.java Log: Add literals for *Type Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/BindingTypeLiteral.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/BindingTypeLiteral.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/BindingTypeLiteral.java 2009-06-28 15:03:00 UTC (rev 2912) @@ -0,0 +1,25 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.literal; + +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.BindingType; + +public class BindingTypeLiteral extends AnnotationLiteral<BindingType> implements BindingType +{ + +} \ No newline at end of file Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/BindingTypeLiteral.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/InterceptorBindingTypeLiteral.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/InterceptorBindingTypeLiteral.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/InterceptorBindingTypeLiteral.java 2009-06-28 15:03:00 UTC (rev 2912) @@ -0,0 +1,25 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.literal; + +import javax.enterprise.inject.AnnotationLiteral; +import javax.interceptor.InterceptorBindingType; + +public class InterceptorBindingTypeLiteral extends AnnotationLiteral<InterceptorBindingType> implements InterceptorBindingType +{ + +} \ No newline at end of file Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/InterceptorBindingTypeLiteral.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ScopeTypeLiteral.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ScopeTypeLiteral.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ScopeTypeLiteral.java 2009-06-28 15:03:00 UTC (rev 2912) @@ -0,0 +1,44 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.literal; + +import javax.enterprise.context.ScopeType; +import javax.enterprise.inject.AnnotationLiteral; + +public class ScopeTypeLiteral extends AnnotationLiteral<ScopeTypeLiteral> implements ScopeType +{ + + private final boolean normal; + private final boolean passivating; + + public ScopeTypeLiteral(boolean normal, boolean passivating) + { + this.normal = normal; + this.passivating = passivating; + } + + public boolean normal() + { + return normal; + } + + public boolean passivating() + { + return passivating; + } + +} \ No newline at end of file Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ScopeTypeLiteral.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/StereotypeLiteral.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/StereotypeLiteral.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/StereotypeLiteral.java 2009-06-28 15:03:00 UTC (rev 2912) @@ -0,0 +1,27 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.literal; + +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.stereotype.Stereotype; + +public class StereotypeLiteral extends AnnotationLiteral<Stereotype> implements Stereotype +{ + + + +} \ No newline at end of file Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/StereotypeLiteral.java ___________________________________________________________________ Name: svn:mime-type + text/plain

11 years, 9 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2911 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken and 46 other directories.

by webbeans-commits＠lists.jboss.org

Author: dallen6 Date: 2009-06-27 12:30:31 -0400 (Sat, 27 Jun 2009) New Revision: 2911 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/stereotypeEnforcesRequiredTypes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/broken/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/broken/newAndOtherBindingType/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/samePrecedence/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/lowerPrecedence/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendSimpleBean/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendSimpleBean/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementsInterfaceAndExtendsNothing/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementsInterfaceAndExtendsNothing/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/ Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/enterprise/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendSimpleBean/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementsInterfaceAndExtendsNothing/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/ Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/Foo.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/FooProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/FooProducerLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/FunnelWeaver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/TProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/FunnelWeaver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/stereotypeEnforcesRequiredTypes/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/stereotypeEnforcesRequiredTypes/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/stereotypeEnforcesRequiredTypes/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/stereotypeEnforcesRequiredTypes/StereotypeEnforcesRequiredTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/broken/newAndOtherBindingType/NewAndOtherBindingTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/broken/newAndOtherBindingType/NewAndOtherBindingType_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/broken/newAndOtherBindingType/WrappedSimpleBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/CowLocal_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/Cow_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/FarmEquipment.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/TractorLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/Tractor_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/Donkey_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/FarmYard_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/Yard.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/YardInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/samePrecedence/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/samePrecedence/FarmerLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/samePrecedence/Landowner.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/samePrecedence/OrganicFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/samePrecedence/SamePrecedenceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/FarmerInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/Landowner.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/Expensive.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/MallShop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/Product.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/ShoeShop_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/Shop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/lowerPrecedence/ClothesShop_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/lowerPrecedence/Expensive.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/lowerPrecedence/Product.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/lowerPrecedence/Shop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/lowerPrecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/Expensive.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/FurnitureShop_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/Product.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/Shop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/Pupil.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/School.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Bookshop_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Expensive.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/PictureShop_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Product.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Shop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/beans.xml Log: Updated more tests to the 20090519 spec version and moved error tests based on new package naming convention Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise (from rev 2910, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/enterprise) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/Foo.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/enterprise/nonbusiness/Foo.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/Foo.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.producer.method.enterprise.nonbusiness; +package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.enterprise.nonbusiness; public class Foo { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/FooProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/enterprise/nonbusiness/FooProducer.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/FooProducer.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.producer.method.enterprise.nonbusiness; +package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.enterprise.nonbusiness; import javax.ejb.Stateful; import javax.enterprise.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/FooProducerLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/enterprise/nonbusiness/FooProducerLocal.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/FooProducerLocal.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.producer.method.enterprise.nonbusiness; +package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.enterprise.nonbusiness; import javax.ejb.Local; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.producer.method.enterprise.nonbusiness; +package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.enterprise.nonbusiness; import org.hibernate.tck.annotations.SpecAssertion; @@ -11,6 +11,11 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; +/** + * + * Spec version: 20090519 + * + */ @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DefinitionError.class) @@ -18,7 +23,7 @@ { @Test @SpecAssertions({ - @SpecAssertion(section = "3.4.2", id = "f"), + @SpecAssertion(section = "3.4.2", id = "fa"), @SpecAssertion(section = "3.4", id = "d") }) public void testProducerMethodOnSessionBeanMustBeBusinessMethod() Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes (from rev 2910, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.producer.method.parameterAnnotatedDisposes; +package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterAnnotatedDisposes; import org.hibernate.tck.annotations.SpecAssertion; @@ -8,6 +8,11 @@ import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; +/** + * + * Spec version: 20090519 + * + */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class ParameterAnnotatedDisposesTest extends AbstractJSR299Test @@ -15,7 +20,7 @@ @Test(groups = "producerMethod") - @SpecAssertion(section = "3.4.2", id = "d") + @SpecAssertion(section = "3.4.2", id = "da") public void testProducerMethodWithParameterAnnotatedDisposes() throws Exception { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/SpiderProducer_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/SpiderProducer_Broken.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.producer.method.parameterAnnotatedDisposes; +package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterAnnotatedDisposes; import javax.enterprise.inject.Disposes; import javax.enterprise.inject.Produces; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves (from rev 2910, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.producer.method.parameterAnnotatedObserves; +package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterAnnotatedObserves; import org.hibernate.tck.annotations.SpecAssertion; @@ -8,13 +8,18 @@ import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; +/** + * + * Spec version: 20090519 + * + */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class ParameterAnnotatedObservesTest extends AbstractJSR299Test { @Test(groups = "producerMethod") - @SpecAssertion(section = "3.4.2", id = "e") + @SpecAssertion(section = "3.4.2", id = "ea") public void testProducerMethodWithParameterAnnotatedObserves() throws Exception { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/SpiderProducer_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/SpiderProducer_Broken.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.producer.method.parameterAnnotatedObserves; +package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterAnnotatedObserves; import javax.enterprise.event.Observes; import javax.enterprise.inject.Produces; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter (from rev 2910, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/FunnelWeaver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/FunnelWeaver.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/FunnelWeaver.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.producer.method.parametermizedTypeWithTypeParameter; +package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterizedTypeWithTypeParameter; class FunnelWeaver<T> { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.producer.method.parametermizedTypeWithTypeParameter; +package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterizedTypeWithTypeParameter; import org.hibernate.tck.annotations.SpecAssertion; @@ -8,6 +8,11 @@ import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; +/** + * + * Spec version: 20090519 + * + */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class ParameterizedTypeWithTypeParameterTest extends AbstractJSR299Test @@ -15,7 +20,7 @@ @Test(groups = "producerMethod") - @SpecAssertion(section = "3.4", id = "i") + @SpecAssertion(section = "3.4", id = "ia") public void testParameterizedReturnTypeWithTypeParameter() throws Exception { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/SpiderProducer.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/SpiderProducer.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.producer.method.parametermizedTypeWithTypeParameter; +package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterizedTypeWithTypeParameter; import javax.enterprise.inject.Produces; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2 (from rev 2910, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.producer.method.parametermizedTypeWithTypeParameter2; +package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterizedTypeWithTypeParameter2; import org.hibernate.tck.annotations.SpecAssertion; @@ -8,13 +8,18 @@ import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; +/** + * + * Spec version: 20090519 + * + */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class ParameterizedTypeWithTypeParameterTest extends AbstractJSR299Test { @Test - @SpecAssertion(section = "3.4", id = "i") + @SpecAssertion(section = "3.4", id = "ia") public void testParameterizedType() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/TProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/TProducer.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/TProducer.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.producer.method.parametermizedTypeWithTypeParameter2; +package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterizedTypeWithTypeParameter2; import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.InjectionPoint; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard (from rev 2910, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/FunnelWeaver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/FunnelWeaver.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/FunnelWeaver.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.producer.method.parametermizedTypeWithWildcard; +package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterizedTypeWithWildcard; class FunnelWeaver<T> { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.producer.method.parametermizedTypeWithWildcard; +package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterizedTypeWithWildcard; import org.hibernate.tck.annotations.SpecAssertion; @@ -8,13 +8,18 @@ import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; +/** + * + * Spec version: 20090519 + * + */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class PamaterizedTypeWithWildcardTest extends AbstractJSR299Test { @Test(groups = "producerMethod") - @SpecAssertion(section = "3.4", id = "h") + @SpecAssertion(section = "3.4", id = "ha") public void testParameterizedReturnTypeWithWildcard() throws Exception { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/SpiderProducer.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/SpiderProducer.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.producer.method.parametermizedTypeWithWildcard; +package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterizedTypeWithWildcard; import javax.enterprise.inject.Produces; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/stereotypeEnforcesRequiredTypes (from rev 2910, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/stereotypeEnforcesRequiredTypes/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/Animal.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/stereotypeEnforcesRequiredTypes/Animal.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.producer.method.stereotypeEnforcesRequiredTypes; +package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.stereotypeEnforcesRequiredTypes; interface Animal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/stereotypeEnforcesRequiredTypes/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/AnimalStereotype.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/stereotypeEnforcesRequiredTypes/AnimalStereotype.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.producer.method.stereotypeEnforcesRequiredTypes; +package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.stereotypeEnforcesRequiredTypes; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/stereotypeEnforcesRequiredTypes/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/SpiderProducer_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/stereotypeEnforcesRequiredTypes/SpiderProducer_Broken.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.producer.method.stereotypeEnforcesRequiredTypes; +package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.stereotypeEnforcesRequiredTypes; import javax.enterprise.inject.Produces; import javax.enterprise.inject.deployment.Production; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/stereotypeEnforcesRequiredTypes/StereotypeEnforcesRequiredTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/StereotypeEnforcesRequiredTypesTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/stereotypeEnforcesRequiredTypes/StereotypeEnforcesRequiredTypesTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,26 +1,23 @@ -package org.jboss.jsr299.tck.tests.implementation.producer.method.stereotypeEnforcesRequiredTypes; +package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.stereotypeEnforcesRequiredTypes; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.testng.annotations.Test; +/** + * + * Spec version: 20090519 + * + */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class StereotypeEnforcesRequiredTypesTest extends AbstractJSR299Test { - @Test(groups = "producerMethod") - @SpecAssertions({ - @SpecAssertion(section = "2.7.2", id = "b"), - @SpecAssertion(section = "3.4.2", id = "bc"), - @SpecAssertion(section = "2.7.4", id = "b") - }) +// @Test(groups = "producerMethod") public void testStereotypeEnforcesTypes() throws Exception { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -19,7 +19,7 @@ /** * - * Spec version: PRD2 + * Spec version: 20090519 * */ @Artifact @@ -33,7 +33,7 @@ @Test(groups = "producerMethod") @SpecAssertions( { @SpecAssertion(section = "2.5.3", id = "g"), - @SpecAssertion(section = "3.4.4", id = "a") + @SpecAssertion(section = "3.4.3", id = "c") } ) public void testProducerMethodInheritsDeploymentTypeOfDeclaringWebBean() throws Exception { @@ -43,9 +43,8 @@ @Test(groups = "producerMethod") @SpecAssertions( { - @SpecAssertion(section = "3.4", id = "b"), - @SpecAssertion(section = "6.7", id = "a"), - @SpecAssertion(section = "6.7", id = "f") + @SpecAssertion(section = "3.4", id = "b"), + @SpecAssertion(section = "7.5", id = "a") } ) public void testStaticMethod() throws Exception { @@ -64,7 +63,7 @@ @Test(groups = "producerMethod") @SpecAssertions( { - @SpecAssertion(section = "6.7", id = "n") + @SpecAssertion(section = "3.4.5", id = "b") } ) public void testStaticDisposalMethod() throws Exception { @@ -76,7 +75,7 @@ } @Test(groups = "producerMethod") - @SpecAssertion(section = "3.4", id = "g") + @SpecAssertion(section = "3.4", id = "ga") public void testParameterizedReturnType() throws Exception { assert getBeans(new TypeLiteral<FunnelWeaver<Spider>>() {}).size() == 1; @@ -86,7 +85,8 @@ @SpecAssertions({ @SpecAssertion(section = "3.4", id = "c"), @SpecAssertion(section = "3.4.2", id = "a"), - @SpecAssertion(section = "2.3.1", id = "a") + @SpecAssertion(section = "2.3.1", id = "a0"), + @SpecAssertion(section = "2.3.1", id = "aa") }) public void testDefaultBindingType() throws Exception { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -2,35 +2,33 @@ import javax.enterprise.inject.AnnotationLiteral; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; -import org.testng.annotations.Test; +/** + * + * Spec version: 20090519 + * These tests are no longer needed in the TCK. + * + */ @IntegrationTest @Artifact @BeansXml("beans.xml") @Packaging(PackagingType.EAR) public class EnterpriseProducerMethodDefinitionTest extends AbstractJSR299Test { - @Test - @SpecAssertion(section = "4.2", id = "dd") +// @Test public void testNonStaticProducerMethodInheritedBySpecializingSubclass() { assert getBeans(Egg.class, new AnnotationLiteral<Yummy>() {}).size() == 1; assert getInstanceByType(Egg.class,new AnnotationLiteral<Yummy>() {}).getMother().getClass().equals(AndalusianChicken.class); } - @Test - @SpecAssertions({ - @SpecAssertion(section = "4.2", id = "dd"), - @SpecAssertion(section = "4.2", id = "dj") - }) +// @Test public void testNonStaticProducerMethodNotInherited() { assert getBeans(Apple.class, new AnnotationLiteral<Yummy>() {}).size() == 1; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -12,7 +12,7 @@ /** * - * Spec version: PRD2 + * Spec version: 20090519 * */ @Artifact @@ -22,12 +22,8 @@ @Test(groups = { "producerMethod", "disposalMethod" }) @SpecAssertions({ - @SpecAssertion(section = "6", id = "f"), - @SpecAssertion(section = "6.7", id = "m"), - @SpecAssertion(section = "6.7", id = "o"), - @SpecAssertion(section = "6.7", id = "p"), - @SpecAssertion(section = "6.7", id = "q"), - @SpecAssertion(section = "6.7", id = "r") + @SpecAssertion(section = "7", id = "f"), + @SpecAssertion(section = "7.5", id = "ma") }) public void testProducerMethodBeanDestroy() throws Exception { @@ -51,7 +47,7 @@ @Test(groups = { "producerMethod" }) @SpecAssertions({ - @SpecAssertion(section = "6", id = "b") + @SpecAssertion(section = "7", id = "b") }) public void testProducerMethodBeanCreate() throws Exception { @@ -70,7 +66,7 @@ @Test(groups = { "producerMethod" }) @SpecAssertions({ - @SpecAssertion(section = "6.7", id = "e") + @SpecAssertion(section = "7.5", id = "ea") }) public void testProducerMethodInvokedOnCreate() throws Exception { @@ -87,12 +83,10 @@ }.run(); } - @Test(groups = { "producerMethod" }) + @Test(groups = { "producerMethod", "rewrite" }) + //Test needs to user the InjectionTarget interface for these assertions @SpecAssertions({ - @SpecAssertion(section = "6.7", id = "g"), - @SpecAssertion(section = "6.7", id = "h"), - @SpecAssertion(section = "6.7", id = "i"), - @SpecAssertion(section = "6.7", id = "j") + @SpecAssertion(section = "11.4.1", id = "g") }) public void testProducerMethodFromMostSpecializedBeanUsed() throws Exception { @@ -112,7 +106,7 @@ @Test(groups = { "producerMethod" }) @SpecAssertions({ - @SpecAssertion(section = "6.7", id = "k") + @SpecAssertion(section = "7.5", id = "k") }) public void testCreateReturnsNullIfProducerDoesAndDependent() throws Exception { @@ -122,7 +116,7 @@ @Test(groups = { "producerMethod", "broken" }, expectedExceptions = IllegalProductException.class ) @SpecAssertions({ - @SpecAssertion(section = "6.7", id = "l") + @SpecAssertion(section = "7.5", id = "l") }) // TODO I'm not quite sure what this test is currently doing! public void testCreateFailsIfProducerReturnsNullAndNotDependent() throws Exception Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -10,7 +10,7 @@ /** * - * Spec version: PRD2 + * Spec version: 20090519 * */ @Artifact @@ -29,7 +29,6 @@ @Test(groups = "innerClass") @SpecAssertions({ - @SpecAssertion(section = "3.2.1", id = "cc"), @SpecAssertion(section = "3.2.1", id = "ba") }) public void testStaticInnerClassDeclaredInJavaAllowed() @@ -39,8 +38,7 @@ @Test @SpecAssertions({ - @SpecAssertion(section = "3.2.1", id = "b"), - @SpecAssertion(section = "3.2", id = "a") + @SpecAssertion(section = "3.2.1", id = "b") }) public void testNonStaticInnerClassDeclaredInJavaNotDiscovered() { @@ -48,53 +46,31 @@ } @Test - @SpecAssertions({ - @SpecAssertion(section = "3.2.1", id = "a"), - @SpecAssertion(section = "3.2", id = "b") - }) - public void testParameterizedClassDeclaredInJavaIsNotDiscovered() - { - assert getBeans(ParameterizedClass_NotBean.class).size() == 0; - } - - @Test @SpecAssertion(section = "3.2.1", id = "cb") public void testInterfaceNotDiscoveredAsSimpleBean() { assert getBeans(Car.class).size() == 0; } - @Test - @SpecAssertions( { - @SpecAssertion(section = "3.2.1", id = "g"), - @SpecAssertion(section = "3.2.1", id = "h"), - @SpecAssertion(section = "3.2.1", id = "i"), - @SpecAssertion(section = "3.2.1", id = "j"), - @SpecAssertion(section = "3.2.1", id = "k")}) - public void testClassesImplementingServletInterfacesNotDiscoveredAsSimpleBeans() - { - assert getBeans(MockFilter.class).size() == 0; - assert getBeans(MockHttpSessionListener.class).size() == 0; - assert getBeans(MockServlet.class).size() == 0; - assert getBeans(MockServletContextListener.class).size() == 0; - assert getBeans(MockServletRequestListener.class).size() == 0; - } + //Not sure yet whether this is needed +// @Test +// public void testClassesImplementingServletInterfacesNotDiscoveredAsSimpleBeans() +// { +// assert getBeans(MockFilter.class).size() == 0; +// assert getBeans(MockHttpSessionListener.class).size() == 0; +// assert getBeans(MockServlet.class).size() == 0; +// assert getBeans(MockServletContextListener.class).size() == 0; +// assert getBeans(MockServletRequestListener.class).size() == 0; +// } @Test - @SpecAssertion(section="3.2.1", id="l") + @SpecAssertion(section="3.2.1", id="f") public void testClassesImplementingEnterpriseBeanInterfaceNotDiscoveredAsSimpleBean() { assert getBeans(MockEnterpriseBean.class).size() == 0; } @Test - @SpecAssertion(section="3.2.1", id="m") - public void testClassExtendingUiComponentNotDiscoveredAsSimpleBean() - { - assert getBeans(MockUIComponent.class).size() == 0; - } - - @Test @SpecAssertion(section="3.2.1", id="p") public void testSimpleBeanOnlyIfConstructorParameterless() { @@ -111,7 +87,7 @@ } @Test - @SpecAssertion(section = "3.2.6.1", id = "a") + @SpecAssertion(section = "3.2.4.1", id = "a") public void testInitializerAnnotatedConstructor() throws Exception { new RunInDependentContext() @@ -131,7 +107,7 @@ @Test @SpecAssertions({ @SpecAssertion(section = "3.2.5", id = "a"), - @SpecAssertion(section = "3.2.6.1", id = "b"), + @SpecAssertion(section = "3.2.4.1", id = "ba"), @SpecAssertion(section = "3.1", id = "a"), @SpecAssertion(section = "3.2.3", id = "a") }) @@ -143,7 +119,7 @@ } @Test - @SpecAssertion(section = "3.2.6.1", id = "a") + @SpecAssertion(section = "3.2.4.1", id = "a") public void testInitializerAnnotatedConstructorUsedOverEmptyConstuctor() throws Exception { new RunInDependentContext() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -8,13 +8,18 @@ import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; +/** + * + * Spec version: 20090519 + * + */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class ConstructorHasDisposesParameterTest extends AbstractJSR299Test { @Test(groups = { "disposalMethod", "ri-broken" }) - @SpecAssertion(section = "3.2.6.1", id = "d") + @SpecAssertion(section = "3.2.4.1", id = "da") public void testConstructorHasDisposesParameter() throws Exception { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -8,13 +8,18 @@ import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; +/** + * + * Spec version: 20090519 + * + */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class ConstructorHasObservesParameterTest extends AbstractJSR299Test { @Test(groups = { "ri-broken", "observerMethod" }) - @SpecAssertion(section = "3.2.6.1", id = "e") + @SpecAssertion(section = "3.2.4.1", id = "ea") public void testConstructorHasObservesParameter() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -8,6 +8,11 @@ import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; +/** + * + * Spec version: 20090519 + * + */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class DependentWithPublicFieldTest extends AbstractJSR299Test @@ -15,7 +20,7 @@ @Test - @SpecAssertion(section = "3.2", id = "fb") + @SpecAssertion(section = "3.2", id = "fba") public void testNonDependentScopedBeanCanNotHavePublicField() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -8,13 +8,18 @@ import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; +/** + * + * Spec version: 20090519 + * + */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class TooManyInitializerAnnotatedConstructorsTest extends AbstractJSR299Test { @Test - @SpecAssertion(section = "3.2.6.1", id = "c") + @SpecAssertion(section = "3.2.4.1", id = "ca") public void testTooManyInitializerAnnotatedConstructor() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -21,7 +21,7 @@ /** * - * Spec version: PRD2 + * Spec version: 20090519 * */ @Artifact @@ -36,7 +36,7 @@ @SpecAssertions({ @SpecAssertion(section = "3.2.4.2", id = "b"), @SpecAssertion(section = "3.2.4.2", id = "c"), - @SpecAssertion(section = "2.3.6", id = "d") + @SpecAssertion(section = "2.3.5", id = "d") }) public void testInjectionOfParametersIntoBeanConstructor() { @@ -107,7 +107,7 @@ @SpecAssertions({ @SpecAssertion(section = "6.1.1", id = "a"), @SpecAssertion(section="2", id="g"), - @SpecAssertion(section="2.2", id="f"), + @SpecAssertion(section="2.2.1", id="b"), @SpecAssertion(section="3.2.6", id="a"), @SpecAssertion(section = "7", id = "d") }) @@ -201,7 +201,6 @@ assert Salmon.isBeanDestroyed(); } - //Diese ist noch ältere @Test @SpecAssertion(section = "4.2", id = "baa") public void testSubClassInheritsPostConstructOnSuperclass() throws Exception @@ -312,7 +311,7 @@ } @Test(expectedExceptions = CreationException.class) - @SpecAssertion(section = "6.2", id = "h") + @SpecAssertion(section = "6.1.1", id = "b") public void testCreationExceptionWrapsCheckedExceptionThrownFromCreate() throws Exception { assert getBeans(Lorry_Broken.class).size() == 1; @@ -329,7 +328,7 @@ } @Test(expectedExceptions = FooException.class) - @SpecAssertion(section = "6.2", id = "g") + @SpecAssertion(section = "6.1.1", id = "b") public void testUncheckedExceptionThrownFromCreateNotWrapped() throws Exception { assert getBeans(Van_Broken.class).size() == 1; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/broken/newAndOtherBindingType (from rev 2910, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/broken/newAndOtherBindingType/NewAndOtherBindingTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingTypeTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/broken/newAndOtherBindingType/NewAndOtherBindingTypeTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean.newAndOtherBindingType; +package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean.broken.newAndOtherBindingType; import org.hibernate.tck.annotations.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/broken/newAndOtherBindingType/NewAndOtherBindingType_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingType_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/broken/newAndOtherBindingType/NewAndOtherBindingType_Broken.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean.newAndOtherBindingType; +package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean.broken.newAndOtherBindingType; import javax.enterprise.inject.Current; import javax.enterprise.inject.New; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/broken/newAndOtherBindingType/WrappedSimpleBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/WrappedSimpleBean.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/broken/newAndOtherBindingType/WrappedSimpleBean.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean.newAndOtherBindingType; +package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean.broken.newAndOtherBindingType; import java.io.Serializable; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing (from rev 2910, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/CowLocal_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/CowLocal_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/CowLocal_Broken.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendsNothing; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.directlyExtendsNothing; import javax.ejb.Local; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/Cow_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/Cow_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/Cow_Broken.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendsNothing; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.directlyExtendsNothing; import javax.ejb.Stateful; import javax.enterprise.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendsNothing; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.directlyExtendsNothing; import org.hibernate.tck.annotations.SpecAssertion; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean (from rev 2910, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/AnotherDeploymentType.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/AnotherDeploymentType.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendsSimpleBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.directlyExtendsSimpleBean; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendsSimpleBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.directlyExtendsSimpleBean; import org.hibernate.tck.annotations.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/FarmEquipment.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/FarmEquipment.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/FarmEquipment.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendsSimpleBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.directlyExtendsSimpleBean; import javax.enterprise.inject.Named; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/TractorLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/TractorLocal.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/TractorLocal.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendsSimpleBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.directlyExtendsSimpleBean; import javax.ejb.Local; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/Tractor_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/Tractor_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/Tractor_Broken.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendsSimpleBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.directlyExtendsSimpleBean; import javax.ejb.Stateful; import javax.enterprise.inject.Specializes; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing (from rev 2910, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Animal.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/Animal.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.implementInterfaceAndExtendsNothing; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.implementInterfaceAndExtendsNothing; interface Animal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.implementInterfaceAndExtendsNothing; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.implementInterfaceAndExtendsNothing; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/Donkey_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Donkey_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/Donkey_Broken.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.implementInterfaceAndExtendsNothing; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.implementInterfaceAndExtendsNothing; import javax.ejb.Stateful; import javax.enterprise.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.implementInterfaceAndExtendsNothing; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.implementInterfaceAndExtendsNothing; import org.hibernate.tck.annotations.SpecAssertion; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName (from rev 2910, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/AnotherDeploymentType.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/AnotherDeploymentType.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.sameName; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.sameName; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/FarmYard_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/FarmYard_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/FarmYard_Broken.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.sameName; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.sameName; import javax.ejb.Stateful; import javax.enterprise.inject.Named; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/SameNameTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.sameName; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.sameName; import org.hibernate.tck.annotations.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/Yard.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/Yard.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/Yard.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.sameName; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.sameName; import javax.ejb.Stateful; import javax.enterprise.inject.Named; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/YardInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/YardInterface.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/YardInterface.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.sameName; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.sameName; import javax.ejb.Local; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/samePrecedence (from rev 2910, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/samePrecedence/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/Farmer.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/samePrecedence/Farmer.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.samePrecedence; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.samePrecedence; import javax.ejb.Stateful; import javax.enterprise.inject.Named; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/samePrecedence/FarmerLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/FarmerLocal.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/samePrecedence/FarmerLocal.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.samePrecedence; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.samePrecedence; import javax.ejb.Local; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/samePrecedence/Landowner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/Landowner.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/samePrecedence/Landowner.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.samePrecedence; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.samePrecedence; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/samePrecedence/OrganicFarmer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/OrganicFarmer_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/samePrecedence/OrganicFarmer_Broken.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.samePrecedence; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.samePrecedence; import javax.ejb.Stateful; import javax.enterprise.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/samePrecedence/SamePrecedenceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/SamePrecedenceTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/samePrecedence/SamePrecedenceTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.samePrecedence; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.samePrecedence; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean (from rev 2910, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.twoBeansSpecializeTheSameBean; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Farmer.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/Farmer.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.twoBeansSpecializeTheSameBean; import javax.ejb.Stateful; import javax.enterprise.inject.Named; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/FarmerInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FarmerInterface.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/FarmerInterface.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.twoBeansSpecializeTheSameBean; import javax.ejb.Local; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.twoBeansSpecializeTheSameBean; import javax.ejb.Stateful; import javax.enterprise.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/Landowner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Landowner.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/Landowner.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.twoBeansSpecializeTheSameBean; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.twoBeansSpecializeTheSameBean; import javax.ejb.Stateful; import javax.enterprise.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.twoBeansSpecializeTheSameBean; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride (from rev 2910, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/AnotherDeploymentType.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/AnotherDeploymentType.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.indirectOverride; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.indirectOverride; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/Expensive.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Expensive.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/Expensive.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.indirectOverride; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.indirectOverride; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.indirectOverride; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.indirectOverride; import org.hibernate.tck.annotations.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/MallShop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/MallShop.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/MallShop.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.indirectOverride; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.indirectOverride; class MallShop extends Shop { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/Product.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Product.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/Product.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.indirectOverride; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.indirectOverride; class Product { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/ShoeShop_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/ShoeShop_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/ShoeShop_Broken.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.indirectOverride; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.indirectOverride; import javax.enterprise.inject.Produces; import javax.enterprise.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/Shop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Shop.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/Shop.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.indirectOverride; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.indirectOverride; import javax.enterprise.inject.Named; import javax.enterprise.inject.Produces; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/lowerPrecedence (from rev 2910, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/lowerPrecedence/ClothesShop_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/ClothesShop_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/lowerPrecedence/ClothesShop_Broken.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.lowerprecedence; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.lowerPrecedence; import javax.enterprise.inject.Produces; import javax.enterprise.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/lowerPrecedence/Expensive.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Expensive.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/lowerPrecedence/Expensive.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.lowerprecedence; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.lowerPrecedence; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/lowerPrecedence/Product.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Product.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/lowerPrecedence/Product.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.lowerprecedence; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.lowerPrecedence; class Product { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/lowerPrecedence/Shop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Shop.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/lowerPrecedence/Shop.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.lowerprecedence; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.lowerPrecedence; import javax.enterprise.inject.Named; import javax.enterprise.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/lowerPrecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/lowerPrecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.lowerprecedence; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.lowerPrecedence; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod (from rev 2910, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/AnotherDeploymentType.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/AnotherDeploymentType.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializesStaticMethod; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializesStaticMethod; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/Expensive.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Expensive.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/Expensive.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializesStaticMethod; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializesStaticMethod; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/FurnitureShop_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/FurnitureShop_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/FurnitureShop_Broken.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializesStaticMethod; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializesStaticMethod; import javax.enterprise.inject.Produces; import javax.enterprise.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/Product.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Product.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/Product.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializesStaticMethod; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializesStaticMethod; class Product { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/Shop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Shop.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/Shop.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializesStaticMethod; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializesStaticMethod; import javax.enterprise.inject.Named; import javax.enterprise.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializesStaticMethod; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializesStaticMethod; import org.hibernate.tck.annotations.SpecAssertion; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName (from rev 2910, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializingAndSpecializedBeanHaveName; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializingAndSpecializedBeanHaveName; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializingAndSpecializedBeanHaveName; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializingAndSpecializedBeanHaveName; import javax.enterprise.inject.Named; import javax.enterprise.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/Pupil.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/Pupil.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/Pupil.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializingAndSpecializedBeanHaveName; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializingAndSpecializedBeanHaveName; class Pupil { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/School.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/School.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/School.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializingAndSpecializedBeanHaveName; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializingAndSpecializedBeanHaveName; import javax.enterprise.inject.Named; import javax.enterprise.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializingAndSpecializedBeanHaveName; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializingAndSpecializedBeanHaveName; import org.hibernate.tck.annotations.SpecAssertion; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean (from rev 2910, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.twoBeansSpecializeTheSameBean; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Bookshop_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Bookshop_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Bookshop_Broken.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.twoBeansSpecializeTheSameBean; import javax.enterprise.inject.Produces; import javax.enterprise.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Expensive.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Expensive.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Expensive.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.twoBeansSpecializeTheSameBean; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/PictureShop_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/PictureShop_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/PictureShop_Broken.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.twoBeansSpecializeTheSameBean; import javax.enterprise.inject.Produces; import javax.enterprise.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Product.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Product.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Product.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.twoBeansSpecializeTheSameBean; class Product { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Shop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Shop.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Shop.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.twoBeansSpecializeTheSameBean; import javax.enterprise.inject.Named; import javax.enterprise.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-06-27 16:30:31 UTC (rev 2911) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.twoBeansSpecializeTheSameBean; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendSimpleBean/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendSimpleBean/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendSimpleBean/beans.xml 2009-06-27 16:30:31 UTC (rev 2911) @@ -0,0 +1,7 @@ +<beans> + <deploy> + <type>javax.enterprise.inject.deployment.Standard</type> + <type>javax.enterprise.inject.deployment.Production</type> + <type>org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.directlyExtendSimpleBean.AnotherDeploymentType</type> + </deploy> +</beans> Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementsInterfaceAndExtendsNothing/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementsInterfaceAndExtendsNothing/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementsInterfaceAndExtendsNothing/beans.xml 2009-06-27 16:30:31 UTC (rev 2911) @@ -0,0 +1,7 @@ +<beans> + <deploy> + <type>javax.enterprise.inject.deployment.Standard</type> + <type>javax.enterprise.inject.deployment.Production</type> + <type>org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.implementsInterfaceAndExtendsNothing.AnotherDeploymentType</type> + </deploy> +</beans> Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/beans.xml 2009-06-27 16:30:31 UTC (rev 2911) @@ -0,0 +1,7 @@ +<beans> + <deploy> + <type>javax.enterprise.inject.deployment.Standard</type> + <type>javax.enterprise.inject.deployment.Production</type> + <type>org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.sameName.AnotherDeploymentType</type> + </deploy> +</beans> Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/beans.xml 2009-06-27 16:30:31 UTC (rev 2911) @@ -0,0 +1,7 @@ +<beans> + <deploy> + <type>javax.enterprise.inject.deployment.Standard</type> + <type>javax.enterprise.inject.deployment.Production</type> + <type>org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.twoBeansSpecializeTheSameBean.AnotherDeploymentType</type> + </deploy> +</beans> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride (from rev 2910, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/beans.xml 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/beans.xml 2009-06-27 16:30:31 UTC (rev 2911) @@ -2,6 +2,6 @@ <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> + <type>org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.indirectOverride.AnotherDeploymentType</type> </deploy> </beans> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod (from rev 2910, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/beans.xml 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/beans.xml 2009-06-27 16:30:31 UTC (rev 2911) @@ -2,6 +2,6 @@ <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> + <type>org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializesStaticMethod.AnotherDeploymentType</type> </deploy> </beans> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName (from rev 2910, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/beans.xml 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/beans.xml 2009-06-27 16:30:31 UTC (rev 2911) @@ -2,6 +2,6 @@ <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> + <type>org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializingAndSpecializedBeanHaveSameName.AnotherDeploymentType</type> </deploy> </beans> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean (from rev 2910, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/beans.xml 2009-06-27 04:48:41 UTC (rev 2910) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/beans.xml 2009-06-27 16:30:31 UTC (rev 2911) @@ -2,6 +2,6 @@ <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> + <type>org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.twoBeansSpecializeTheSameBean.AnotherDeploymentType</type> </deploy> </beans>

11 years, 9 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2910 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation: disposal/method/definition/broken1 and 7 other directories.

by webbeans-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-06-27 00:48:41 -0400 (Sat, 27 Jun 2009) New Revision: 2910 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/MultipleDisposeParametersDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/ProducesUnallowedDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/InitializerUnallowedDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/ObserverParameterUnallowedDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/Cat.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/UnresolvedDisposalMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java Log: update section numbers to comply with 20090519 spec assertions Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -12,6 +12,9 @@ import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; +/** + * Spec version: 20090519 + */ @Artifact @BeansXml("beans.xml") public class DisposalMethodDefinitionTest extends AbstractJSR299Test @@ -20,13 +23,13 @@ @Test @SpecAssertions({ - @SpecAssertion(section = "2.3.6", id = "c"), - @SpecAssertion(section = "3.4.6", id = "b"), - @SpecAssertion(section = "3.4.6", id = "c"), - @SpecAssertion(section = "3.4.6", id = "e"), - @SpecAssertion(section = "3.4.7", id = "b"), - @SpecAssertion(section = "3.4.8", id = "a"), - @SpecAssertion(section = "3.4.11", id = "a") + @SpecAssertion(section = "2.3.5", id = "c"), + @SpecAssertion(section = "3.4.5", id = "b"), + @SpecAssertion(section = "3.4.5", id = "c"), + @SpecAssertion(section = "3.4.5", id = "e"), + @SpecAssertion(section = "3.4.6", id = "ba"), + @SpecAssertion(section = "3.4.7", id = "a"), + @SpecAssertion(section = "3.4.9", id = "aa") }) public void testBindingTypesAppliedToDisposalMethodParameters() throws Exception { @@ -48,8 +51,8 @@ @Test @SpecAssertions({ - @SpecAssertion(section = "3.4.6", id = "a"), - @SpecAssertion(section = "3.4.7", id = "d") + @SpecAssertion(section = "3.4.5", id = "a"), + @SpecAssertion(section = "3.4.6", id = "ba") }) public void testDisposalMethodOnNonBean() throws Exception { @@ -74,10 +77,10 @@ * calls Manager.getInstanceToInject() to determine a value for each * parameter of a disposal method and calls the disposal method with those * parameter values - * @throws Exception + * @throws Exception */ @Test(groups = { "disposalMethod" }) - @SpecAssertion(section = "3.4.10", id = "a") + @SpecAssertion(section = "3.4.8", id = "a") public void testDisposalMethodParametersGetInjected() throws Exception { new RunInDependentContext() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/MultipleDisposeParametersDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/MultipleDisposeParametersDefinitionTest.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/MultipleDisposeParametersDefinitionTest.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -11,9 +11,7 @@ import org.testng.annotations.Test; /** - * - * Spec version: PRD2 - * + * Spec version: 20090519 */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @@ -22,9 +20,8 @@ { @Test @SpecAssertions({ - @SpecAssertion(section = "3.4.7", id = "a"), - @SpecAssertion(section = "3.4.8", id = "b"), - @SpecAssertion(section = "3.4.11", id = "b") + @SpecAssertion(section = "3.4.6", id = "a"), + @SpecAssertion(section = "3.4.7", id = "ba") }) public void testMultipleDisposeParameters() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/Spider.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/Spider.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -1,7 +1,5 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken1; - -class Spider +class Spider { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/SpiderProducer_Broken.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/SpiderProducer_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -6,7 +6,6 @@ @AnotherDeploymentType class SpiderProducer_Broken { - @Produces public static Spider getSpider() { @@ -15,7 +14,5 @@ public static void destorySpider(@Disposes Spider spider, @Disposes Spider another) { - } - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/ProducesUnallowedDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/ProducesUnallowedDefinitionTest.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/ProducesUnallowedDefinitionTest.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -9,16 +9,14 @@ import org.testng.annotations.Test; /** - * - * Spec version: PRD2 - * + * Spec version: 20090519 */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class ProducesUnallowedDefinitionTest extends AbstractJSR299Test { @Test - @SpecAssertion(section = "3.4.8", id = "c") + @SpecAssertion(section = "3.4.7", id = "ca") public void testProducesUnallowed() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/Spider.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/Spider.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -1,7 +1,5 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken2; - -class Spider +class Spider { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/SpiderProducer_Broken.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/SpiderProducer_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -6,7 +6,6 @@ @AnotherDeploymentType class SpiderProducer_Broken { - @Produces public static Spider getSpider() { @@ -16,7 +15,5 @@ @Produces public static void destorySpider(@Disposes Spider spider) { - } - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/AnotherDeploymentType.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/AnotherDeploymentType.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -16,5 +16,4 @@ @DeploymentType @interface AnotherDeploymentType { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/InitializerUnallowedDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/InitializerUnallowedDefinitionTest.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/InitializerUnallowedDefinitionTest.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -10,9 +10,7 @@ import org.testng.annotations.Test; /** - * - * Spec version: PRD2 - * + * Spec version: 20090519 */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @@ -20,7 +18,7 @@ public class InitializerUnallowedDefinitionTest extends AbstractJSR299Test { @Test - @SpecAssertion(section = "3.4.8", id = "d") + @SpecAssertion(section = "3.4.7", id = "da") public void testInitializerUnallowed() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/Spider.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/Spider.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -1,7 +1,5 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken3; - -class Spider +class Spider { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/SpiderProducer_Broken.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/SpiderProducer_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -17,7 +17,6 @@ @Initializer public static void destorySpider(@Disposes Spider spider) { - } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/ObserverParameterUnallowedDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/ObserverParameterUnallowedDefinitionTest.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/ObserverParameterUnallowedDefinitionTest.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -1,6 +1,5 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken4; - import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; @@ -10,9 +9,7 @@ import org.testng.annotations.Test; /** - * - * Spec version: PRD2 - * + * Spec version: 20090519 */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @@ -20,7 +17,7 @@ public class ObserverParameterUnallowedDefinitionTest extends AbstractJSR299Test { @Test - @SpecAssertion(section = "3.4.8", id = "e") + @SpecAssertion(section = "3.4.7", id = "ea") public void testObserverParameterUnallowed() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/Spider.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/Spider.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -1,7 +1,5 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken4; - -class Spider +class Spider { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/SpiderProducer_Broken.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/SpiderProducer_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -16,7 +16,6 @@ public static void destorySpider(@Disposes @Observes Spider spider) { - } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/Cat.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/Cat.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/Cat.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -1,7 +1,5 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken5; - -class Cat +class Cat { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/Spider.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/Spider.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -1,7 +1,5 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken5; - -class Spider +class Spider { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/SpiderProducer_Broken.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/SpiderProducer_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -15,12 +15,10 @@ public static void destorySpider(@Disposes Spider spider) { - } public static void destorySpider2(@Disposes Cat cat) { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/UnresolvedDisposalMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/UnresolvedDisposalMethodDefinitionTest.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/UnresolvedDisposalMethodDefinitionTest.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -1,29 +1,25 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken5; -import javax.enterprise.inject.UnsatisfiedResolutionException; - import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; /** - * - * Spec version: PRD2 - * + * Spec version: 20090519 */ @Artifact -(a)ExpectedDeploymentException(UnsatisfiedResolutionException.class) +(a)ExpectedDeploymentException(DefinitionError.class) @BeansXml("beans.xml") public class UnresolvedDisposalMethodDefinitionTest extends AbstractJSR299Test { - @Test - @SpecAssertion(section = "3.4.7", id = "c") + @Test(groups = "ri-broken") + @SpecAssertion(section = "3.4.9", id = "ca") public void testUnresolvedDisposalMethod() { assert false; } - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -1,6 +1,5 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken6; - import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -12,6 +11,9 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; +/** + * Spec version: 20090519 + */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @IntegrationTest @@ -20,8 +22,8 @@ { @Test @SpecAssertions({ - @SpecAssertion(section = "3.4.6", id = "d"), - @SpecAssertion(section = "3.4.8", id = "f") + @SpecAssertion(section = "3.4.5", id = "d"), + @SpecAssertion(section = "3.4.7", id = "fa") }) public void testDisposalMethodNotBusinessOrStatic() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -2,6 +2,7 @@ import java.lang.annotation.Annotation; +import javax.enterprise.context.Dependent; import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.spi.Bean; @@ -27,9 +28,10 @@ { @Test(groups = { "enterpriseBeans" }) @SpecAssertion(section = "3.3", id = "b") - public void testStatelessWithDependentScopeOK() + public void testStatelessMustBeDependentScoped() { assert getBeans(GiraffeLocal.class).size() == 1; + assert getBeans(GiraffeLocal.class).iterator().next().getScopeType().equals(Dependent.class); } @Test(groups = { "enterpriseBeans" }) @@ -47,16 +49,9 @@ } @Test(groups = { "enterpriseBeans" }) - @SpecAssertion(section = "3.3.2", id = "a") - public void testAnnotatedEnterpriseBean() - { - assert getBeans(GiraffeLocal.class).size() > 0; - } - - @Test(groups = { "enterpriseBeans" }) - @SpecAssertions( { - @SpecAssertion(section = "3.2.1", id = "f"), - @SpecAssertion(section = "3.3.3", id = "a"), + @SpecAssertions( { + @SpecAssertion(section = "3.2.1", id = "f"), + @SpecAssertion(section = "3.3.3", id = "a"), @SpecAssertion(section = "3.3.4", id = "c") } ) public void testBeanTypesAreLocalInterfacesWithoutWildcardTypesOrTypeVariablesWithSuperInterfaces() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -7,5 +7,4 @@ @Dependent class Labrador { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionBean.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionBean.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -4,6 +4,7 @@ import javax.ejb.Remove; import javax.ejb.Stateful; import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.BeanManager; @Stateful public class DependentSessionBean implements DependentSessionInterface @@ -18,9 +19,10 @@ } @Remove - public void anotherRemoveWithParameters(String reason) + public void anotherRemoveWithParameters(String reason, @Current BeanManager manager) { stateKeeper.setRemoveCalled(true); + assert manager == null; } @PreDestroy Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionInterface.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionInterface.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -1,13 +1,14 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.remove; import javax.ejb.Local; +import javax.enterprise.inject.spi.BeanManager; @Local public interface DependentSessionInterface { public void remove(); - public void anotherRemoveWithParameters(String reason); + public void anotherRemoveWithParameters(String reason, BeanManager manager); public void businessMethod(); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -13,10 +13,9 @@ import org.testng.annotations.Test; /** - * + * Spec version: 20090519 + * * @author Nicklas Karlsson - * - * Spec version: PRD2 */ @Artifact @Packaging(EAR) @@ -37,7 +36,7 @@ DependentSessionInterface sessionBean = getInstanceByType(DependentSessionInterface.class); sessionBean.remove(); Bean<?> bean = getCurrentManager().getBeans(StateKeeper.class).iterator().next(); - StateKeeper stateKeeper = (StateKeeper) + StateKeeper stateKeeper = (StateKeeper) getCurrentManager().getReference(bean,StateKeeper.class, getCurrentManager().createCreationalContext(bean)); assert stateKeeper.isRemoveCalled(); } @@ -55,7 +54,7 @@ protected void execute() throws Exception { DependentSessionInterface sessionBean = getInstanceByType(DependentSessionInterface.class); - sessionBean.anotherRemoveWithParameters("required"); + sessionBean.anotherRemoveWithParameters("required", null); StateKeeper stateKeeper = getInstanceByType(StateKeeper.class); assert stateKeeper.isRemoveCalled(); } @@ -63,7 +62,7 @@ } @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle" }, expectedExceptions = UnsupportedOperationException.class) - @SpecAssertions({ + @SpecAssertions({ @SpecAssertion(section = "3.3.1", id = "b"), @SpecAssertion(section = "3.3.1", id = "c") })

11 years, 9 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2909 - tck/trunk/impl/src/main/resources.

by webbeans-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-06-26 18:40:54 -0400 (Fri, 26 Jun 2009) New Revision: 2909 Modified: tck/trunk/impl/src/main/resources/tck-audit.xml Log: add qualifier to id to reflect change in spec wording Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-06-26 21:56:37 UTC (rev 2908) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-06-26 22:40:54 UTC (rev 2909) @@ -1117,7 +1117,7 @@ <text>If there are multiple disposal methods for a single producer method, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text> </assertion> - <assertion id="c"> + <assertion id="ca"> <text>If the disposed parameter of a disposal method does not resolve to any producer method declared by the bean class, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text> </assertion> </section>

11 years, 9 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2908 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle: broken and 6 other directories.

by webbeans-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-06-26 17:56:37 -0400 (Fri, 26 Jun 2009) New Revision: 2908 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/ Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken6/ Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/BeanDiscoveryObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/BeanDiscoveryObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/BeanDiscoveryObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/FooException.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/BeanDiscoveryObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/BeanDiscoveryObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/InitializerBean_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/BeanDiscoveryObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/BeanWithInjection.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/NotABean.java Log: repackage lifecycle tests Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError (from rev 2903, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/AddDefinitionErrorTest.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2009-06-26 21:56:37 UTC (rev 2908) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken5; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.addDefinitionError; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/BeanDiscoveryObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/BeanDiscoveryObserver.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/BeanDiscoveryObserver.java 2009-06-26 21:56:37 UTC (rev 2908) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken5; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.addDefinitionError; import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.AfterBeanDiscovery; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem (from rev 2903, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken6) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken6/AddDeploymentProblemTest.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2009-06-26 21:56:37 UTC (rev 2908) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken6; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.addDeploymentProblem; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/BeanDiscoveryObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken6/BeanDiscoveryObserver.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/BeanDiscoveryObserver.java 2009-06-26 21:56:37 UTC (rev 2908) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken6; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.addDeploymentProblem; import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.AfterDeploymentValidation; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver (from rev 2903, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-06-26 21:56:37 UTC (rev 2908) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken3; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.exceptionInAfterBeanDiscoveryObserver; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/BeanDiscoveryObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/BeanDiscoveryObserver.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/BeanDiscoveryObserver.java 2009-06-26 21:56:37 UTC (rev 2908) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken3; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.exceptionInAfterBeanDiscoveryObserver; import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.AfterBeanDiscovery; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/FooException.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/FooException.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/FooException.java 2009-06-26 21:56:37 UTC (rev 2908) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken3; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.exceptionInAfterBeanDiscoveryObserver; /** * @author pmuir Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver (from rev 2903, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-06-26 21:56:37 UTC (rev 2908) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken4; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.exceptionInAfterBeanValidationObserver; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/BeanDiscoveryObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/BeanDiscoveryObserver.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/BeanDiscoveryObserver.java 2009-06-26 21:56:37 UTC (rev 2908) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken4; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.exceptionInAfterBeanValidationObserver; import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.AfterDeploymentValidation; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery (from rev 2903, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/BeanDiscoveryObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/BeanDiscoveryObserver.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/BeanDiscoveryObserver.java 2009-06-26 21:56:37 UTC (rev 2908) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken1; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.failsDuringBeanDiscovery; import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.AfterBeanDiscovery; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/DeploymentFailureTest.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java 2009-06-26 21:56:37 UTC (rev 2908) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken1; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.failsDuringBeanDiscovery; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/InitializerBean_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/InitializerBean_Broken.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/InitializerBean_Broken.java 2009-06-26 21:56:37 UTC (rev 2908) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken1; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.failsDuringBeanDiscovery; import javax.enterprise.event.Observes; import javax.enterprise.inject.Initializer; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation (from rev 2903, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/AfterBeanDiscoveryFailureTest.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java 2009-06-26 21:56:37 UTC (rev 2908) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken2; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.failsDuringValidation; import javax.enterprise.inject.UnsatisfiedResolutionException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/BeanDiscoveryObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/BeanDiscoveryObserver.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/BeanDiscoveryObserver.java 2009-06-26 21:56:37 UTC (rev 2908) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken2; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.failsDuringValidation; import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.AfterBeanDiscovery; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/BeanWithInjection.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/BeanWithInjection.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/BeanWithInjection.java 2009-06-26 21:56:37 UTC (rev 2908) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken2; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.failsDuringValidation; import javax.enterprise.inject.Current; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/NotABean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/NotABean.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/NotABean.java 2009-06-26 21:56:37 UTC (rev 2908) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken2; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.failsDuringValidation; class NotABean {

11 years, 9 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2907 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event: broken and 9 other directories.

by webbeans-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-06-26 17:52:51 -0400 (Fri, 26 Jun 2009) New Revision: 2907 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventPayload.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/NonManagedBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotypeAnnotationLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/OwlFinch_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EventPayload.java Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/NonSimpleBean_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer12/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/tooManyObserverParameters/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeTest.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BullTerrier.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Egg.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StockPrice.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StockWatcher.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/Boxer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/YorkshireTerrier_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Egg.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/FarmerLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IndirectStockWatcher.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IndirectStockWatcherLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IntermediateStockWatcher.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/LazyFarmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/LazyFarmerLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockPrice.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcher.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcherLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java Log: implement and align more event tests w/ 20090519 spec repackage some tests Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BullTerrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BullTerrier.java 2009-06-26 20:10:55 UTC (rev 2906) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BullTerrier.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -7,12 +7,12 @@ private static boolean multiBindingEventObserved = false; private static boolean singleBindingEventObserved = false; - public void observesEvent(@Observes @Role("Admin") @Tame MultiBindingEvent someEvent) + public void observesMultiBindingEvent(@Observes @Role("Admin") @Tame MultiBindingEvent someEvent) { multiBindingEventObserved = true; } - public void observesMoreEvent(@Observes @Tame MultiBindingEvent someEvent) + public void observesSingleBindingEvent(@Observes @Tame MultiBindingEvent someEvent) { singleBindingEventObserved = true; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Egg.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Egg.java 2009-06-26 20:10:55 UTC (rev 2906) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Egg.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,6 +1,5 @@ package org.jboss.jsr299.tck.tests.event; -class Egg +class Egg extends EventPayload { - } Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventPayload.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventPayload.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventPayload.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.event; + +import java.util.ArrayList; +import java.util.List; + +class EventPayload +{ + private List<Class<?>> classesVisited = new ArrayList<Class<?>>(); + + public List<Class<?>> getClassesVisited() + { + return classesVisited; + } + + public void recordVisit(Object o) + { + classesVisited.add(o.getClass()); + } +} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-06-26 20:10:55 UTC (rev 2906) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -4,19 +4,13 @@ import java.util.ArrayList; import java.util.Set; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Event; import javax.enterprise.event.Observer; import javax.enterprise.inject.AnnotationLiteral; -import javax.enterprise.inject.TypeLiteral; -import javax.enterprise.inject.deployment.Standard; -import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.literals.AnyLiteral; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; @@ -428,8 +422,8 @@ assert spider.getWeb().getRings() == 1; } - @Test(groups = { "events" }) - @SpecAssertion(section = "7.5.8", id = "p") // skipped + @Test(groups = { "events", "stub" }) + @SpecAssertion(section = "10.6.1", id = "p") public void testAsynchronousObserverThrowsExceptionIsLogged() throws Exception { new RunInDependentContext() @@ -446,8 +440,8 @@ }.run(); } - @Test(groups = { "stub", "events" }) - @SpecAssertion(section = "7.5.9", id = "a") // skipped + @Test(groups = { "events", "stub" }) + @SpecAssertion(section = "10.6.2", id = "a") public void testAsynchronousObserverMethodContexts() { assert false; @@ -485,107 +479,7 @@ }.run(); } - - // left off here - - @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertion(section = "7.6", id = "h") - public void testNonBindingTypePassedToFireFails() throws Exception - { - new RunInDependentContext() - { - @Override - protected void execute() throws Exception - { - OwlFinch_Broken bean = getInstanceByType(OwlFinch_Broken.class); - bean.methodThatFiresEvent(); - } - - }.run(); - } - - @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertion(section = "7.6", id = "h") - public void testNonBindingTypePassedToObservesFails() throws Exception - { - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - OwlFinch_Broken bean = getInstanceByType(OwlFinch_Broken.class); - bean.methodThatRegistersObserver(); - } - - }.run(); - } - - @Test(groups = { "events" }) - @SpecAssertions( { @SpecAssertion(section = "7.6", id = "n") } ) - public void testImplicitEventBeanMatchesAPITypeOfInectionPoint() throws Exception - { - // Retrieve the implicit event bean from the manager only by - // its API type - Set<?> eventBeans = getBeans(new TypeLiteral<Event<AnEventType>>() {}, new AnyLiteral()); - assert !eventBeans.isEmpty(); - } - - @Test(groups = { "events" }) - public void testImplicitEventHasAnyBinding() - { - Set<Bean<Event<AnEventType>>> eventBeans = getBeans(new TypeLiteral<Event<AnEventType>>() {}, new AnyLiteral()); - assert !eventBeans.isEmpty(); - assert eventBeans.iterator().next().getBindings().contains(new AnyLiteral()); - } - - @Test(groups = { "events" }) - @SpecAssertions( { @SpecAssertion(section = "7.6", id = "n") } ) - public void testImplicitEventBeanMatchesBindingAnnotationsOfInjectionPoint() throws Exception - { - Set<?> eventBeans = getBeans(new TypeLiteral<Event<AnEventType>>(){}, new AnyLiteral(), new TameAnnotationLiteral(), new RoleBinding("Admin")); - assert !eventBeans.isEmpty(); - } - - @Test(groups = { "events" }) - @SpecAssertion(section = "7.6", id = "o") - public void testImplicitEventBeanHasStandardDeploymentType() throws Exception - { - Set<?> eventBeans = getBeans(new TypeLiteral<Event<AnEventType>>() {}, new AnyLiteral()); - assert eventBeans.size() == 1; - Bean<?> eventBean = (Bean<?>) eventBeans.iterator().next(); - assert eventBean.getDeploymentType().equals(Standard.class); - } - - @Test(groups = { "events" }) - @SpecAssertion(section = "7.6", id = "p") - public void testImplicitEventBeanHasDependentScope() throws Exception - { - Set<?> eventBeans = getBeans(new TypeLiteral<Event<AnEventType>>() {}, new AnyLiteral()); - assert eventBeans.size() == 1; - Bean<?> eventBean = (Bean<?>) eventBeans.iterator().next(); - assert eventBean.getScopeType().equals(Dependent.class); - } - - @Test(groups = { "events" }) - @SpecAssertion(section = "7.6", id = "q") - public void testImplicitEventBeanHasNoName() throws Exception - { - Set<?> eventBeans = getBeans(new TypeLiteral<Event<AnEventType>>() {}, new AnyLiteral()); - assert eventBeans.size() == 1; - Bean<?> eventBean = (Bean<?>) eventBeans.iterator().next(); - assert eventBean.getName() == null; - } - - @Test(groups = { "events" }) - @SpecAssertions( { @SpecAssertion(section = "7.6", id = "a"), @SpecAssertion(section = "7.6", id = "r") } ) - public void testImplicitEventBeanProvidedByContainer() throws Exception - { - Set<?> eventBeans = getBeans(new TypeLiteral<Event<AnEventType>>() {}, new AnyLiteral()); - assert eventBeans.size() == 1; - } - // FIXME the assertion is being verified indirectly by verifying outcome // to verify directly, would need to mock BeanManager (very hard) or // intercept the call to BeanManager#fireEvent() (equally hard) @@ -601,40 +495,19 @@ } @Test(groups = { "events", "underInvestigation" }) - @SpecAssertion(section = "7.6", id = "s") - public void testFireMethodCallsManagerFireWithBindingAnnotationsExceptFires() - { - assert false; - } - - @Test(groups = { "events", "underInvestigation" }) - @SpecAssertion(section = "7.6", id = "s") - public void testFireMethodCallsManagerFireWithAllBindingAnnotationInstances() - { - assert false; - } - - @Test(groups = { "events", "underInvestigation" }) - @SpecAssertions( { @SpecAssertion(section = "7.5.8", id = "s"), @SpecAssertion(section = "7.6", id = "u")} ) + @SpecAssertion(section = "11.2.7", id = "a") public void testObserverMethodCallsManagerAddObserverWithObserverObject() { assert false; } @Test(groups = { "events", "underInvestigation" }) - @SpecAssertion(section = "7.6", id = "u") + @SpecAssertion(section = "10.4.1", id = "ee") public void testObserverMethodCallsManagerAddObserverWithAllBindingAnnotationsExceptFires() { assert false; } - @Test(groups = { "events", "underInvestigation" }) - @SpecAssertion(section = "7.6", id = "u") - public void testObserverMethodCallsManagerAddObserverWithAllBindingAnnotationInstance() - { - assert false; - } - @Test(groups = { "events" }, expectedExceptions = IllegalArgumentException.class) @SpecAssertion(section = "11.2.9", id = "c") public void testEventObjectContainsTypeVariablesWhenResolvingFails() @@ -647,8 +520,8 @@ getCurrentManager().resolveObservers(eventToFire); } - @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertion(section = "7.7", id = "c") + @Test(groups = { "events", "ri-broken" }) + @SpecAssertion(section = "unknown", id = "unknown") public void testEventObjectContainsWildcardsWhenResolvingFails() { eventObjectContainsWildcards(new ArrayList<String>()); @@ -656,14 +529,15 @@ private void eventObjectContainsWildcards(ArrayList<?> eventToFire) { + // FIXME create a valid observer and assert it is found getCurrentManager().resolveObservers(eventToFire); } @Test(groups = { "events" }) @SpecAssertions( { - @SpecAssertion(section = "7.7.2", id = "b"), - @SpecAssertion(section = "7.7.2", id = "c") + @SpecAssertion(section = "10.2.2", id = "b"), + @SpecAssertion(section = "10.2.2", id = "c") } ) public void testObserverMethodNotifiedWhenBindingsMatch() { @@ -673,35 +547,56 @@ } @Test(groups = { "events", "stub" }) - @SpecAssertions( { @SpecAssertion(section = "7.8", id = "a") }) + @SpecAssertions( { @SpecAssertion(section = "10.7", id = "a") }) public void testEventTypeMappedToJmsTopic() { assert false; } @Test(groups = { "events", "stub" }) - @SpecAssertions( { @SpecAssertion(section = "7.8", id = "b") }) - public void testMultipleEventTypesMappedToSameJmsTopic() + @SpecAssertions( { @SpecAssertion(section = "10.7", id = "b") }) + public void testEventMappingIsObserverMethodDeclaredByInterface() { assert false; } @Test(groups = { "events", "stub" }) - @SpecAssertions( { @SpecAssertion(section = "7.8", id = "d") }) - public void testSerializedEventAndBindingsSentToJmsTopic() + @SpecAssertions( { @SpecAssertion(section = "10.7", id = "c") }) + public void testEventParameterSpecifiesMappedEventTypeAndBindings() { assert false; } + + @Test(groups = { "events", "stub" }) + @SpecAssertions( { @SpecAssertion(section = "10.7", id = "d") }) + public void testMessageDestinationInjectedIsMappedTopic() + { + assert false; + } + + @Test(groups = { "events", "stub" }) + @SpecAssertions( { @SpecAssertion(section = "10.7", id = "e") }) + public void testEventMappingMemberOfAnyInterface() + { + assert false; + } + + @Test(groups = { "events", "stub" }) + @SpecAssertions( { @SpecAssertion(section = "10.7", id = "f") }) + public void testObserversOfJmsTopicMustBeAsynchronous() + { + assert false; + } @Test(groups = { "events", "stub" }) - @SpecAssertions( { @SpecAssertion(section = "7.8", id = "e") }) + @SpecAssertions( { @SpecAssertion(section = "10.7", id = "g") }) public void testObserversNotifiedOfEventFromJmsTopic() { assert false; } @Test(groups = { "events", "stub" }) - @SpecAssertions( { @SpecAssertion(section = "7.8", id = "f") }) + @SpecAssertions( { @SpecAssertion(section = "10.7", id = "g") }) public void testEventsDistributedToProcessesWithSameTypeAndJmsTopic() { assert false; @@ -720,17 +615,18 @@ { new RunInDependentContext() { - @Override protected void execute() throws Exception { - Set<Observer<Egg>> observers = getCurrentManager().resolveObservers(new Egg()); + Egg egg = new Egg(); + Set<Observer<Egg>> observers = getCurrentManager().resolveObservers(egg); assert observers.size() == 1; // Notify the observer so we can confirm that it // is a method only on Farmer, and not LazyFarmer - observers.iterator().next().notify(new Egg()); - assert Farmer.getObserverClazz().equals(Farmer.class); + observers.iterator().next().notify(egg); + assert egg.getClassesVisited().size() == 1; + assert egg.getClassesVisited().iterator().next().equals(Farmer.class); } }.run(); @@ -742,18 +638,19 @@ { new RunInDependentContext() { - @Override protected void execute() throws Exception { - Set<Observer<StockPrice>> observers = getCurrentManager().resolveObservers(new StockPrice()); + StockPrice price = new StockPrice(); + Set<Observer<StockPrice>> observers = getCurrentManager().resolveObservers(price); assert observers.size() == 1; // Notify the observer so we can confirm that it // is a method only on StockWatcher, and not IntermediateStockWatcher // or IndirectStockWatcher - observers.iterator().next().notify(new StockPrice()); - assert StockWatcher.getObserverClazz().equals(StockWatcher.class); + observers.iterator().next().notify(price); + assert price.getClassesVisited().size() == 1; + assert price.getClassesVisited().iterator().next().equals(StockWatcher.class); } }.run(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Farmer.java 2009-06-26 20:10:55 UTC (rev 2906) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Farmer.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -9,6 +9,7 @@ public void observeEggLaying(@Observes Egg egg) { observerClazz = this.getClass(); + egg.recordVisit(this); } public static Class<?> getObserverClazz() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StockPrice.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StockPrice.java 2009-06-26 20:10:55 UTC (rev 2906) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StockPrice.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,6 +1,5 @@ package org.jboss.jsr299.tck.tests.event; -class StockPrice +class StockPrice extends EventPayload { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StockWatcher.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StockWatcher.java 2009-06-26 20:10:55 UTC (rev 2906) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StockWatcher.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -9,6 +9,7 @@ public void observeStockPrice(@Observes StockPrice price) { observerClazz = this.getClass(); + price.recordVisit(this); } public static Class<?> getObserverClazz() Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged (from rev 2903, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer12) Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/NonManagedBean.java (from rev 2903, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer12/NonSimpleBean_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/NonManagedBean.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/NonManagedBean.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.jsr299.tck.tests.event.broken.observer.beanNotManaged; + +import javax.enterprise.event.Observes; + +/** + * This class is not a bean since it does not have a default constructor + * nor does it have a constructor annotated with {@link @Initializer}. + * As such, an observer method is not detected on this class. + * + * @author David Allen + */ +class NonManagedBean +{ + public NonManagedBean(String name) + { + } + + public void observe(@Observes String event) + { + } +} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/NonSimpleBean_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer12/NonSimpleBean_Broken.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/NonSimpleBean_Broken.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,40 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jboss.jsr299.tck.tests.event.broken.observer12; - -import javax.enterprise.event.Observes; - -/** - * This bean is neither simple nor session. As such, an observer method is not - * allowed to be here. - * - * @author David Allen - * - */ -class NonSimpleBean_Broken -{ - public NonSimpleBean_Broken(String name) - { - - } - - public void observe(@Observes String event) - { - - } -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer12/ObserverMethodOnIncorrectBeanTest.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -9,31 +9,31 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ +package org.jboss.jsr299.tck.tests.event.broken.observer.beanNotManaged; -package org.jboss.jsr299.tck.tests.event.broken.observer12; - import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** - * Tests an observer method on something that is not a simple bean - * or session bean. + * Tests an observer method on something that is not a managed bean + * or a session bean. * + * Spec version: 20090519 + * * @author David Allen - * */ @Artifact public class ObserverMethodOnIncorrectBeanTest extends AbstractJSR299Test { @Test(groups = { "events" }) - @SpecAssertion(section = "7.5", id = "b") + @SpecAssertion(section = "10.5", id = "b") public void testObserverMethodNotOnSimpleOrSessionBeanFails() { assert getCurrentManager().resolveObservers("event").isEmpty(); Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters (from rev 2903, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/tooManyObserverParameters) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/Boxer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/tooManyObserverParameters/Boxer.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/Boxer.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.event.broken.tooManyObserverParameters; +package org.jboss.jsr299.tck.tests.event.broken.observer.tooManyParameters; class Boxer { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/tooManyObserverParameters/ObserverMethodWithTwoEventParametersTest.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.event.broken.tooManyObserverParameters; +package org.jboss.jsr299.tck.tests.event.broken.observer.tooManyParameters; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/YorkshireTerrier_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/tooManyObserverParameters/YorkshireTerrier_Broken.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/YorkshireTerrier_Broken.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.event.broken.tooManyObserverParameters; +package org.jboss.jsr299.tck.tests.event.broken.observer.tooManyParameters; import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.AfterBeanDiscovery; Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotype.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.event.fires.nonbinding; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.stereotype.Stereotype; + +@Stereotype() +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@RequestScoped +@interface AnimalStereotype +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotypeAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotypeAnnotationLiteral.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotypeAnnotationLiteral.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.tests.event.fires.nonbinding; + +import javax.enterprise.inject.AnnotationLiteral; + +class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -0,0 +1,26 @@ +package org.jboss.jsr299.tck.tests.event.fires.nonbinding; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.testng.annotations.Test; + +@Artifact +public class NonBindingTypePassedToFireTest extends AbstractJSR299Test +{ + @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) + @SpecAssertion(section = "11.2.8", id = "e") + public void testExceptionThrownIfNonBindingTypePassedToFire() throws Exception + { + new RunInDependentContext() + { + @Override + protected void execute() throws Exception + { + OwlFinch_Broken bean = getInstanceByType(OwlFinch_Broken.class); + bean.methodThatFiresEvent(); + } + + }.run(); + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/OwlFinch_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/OwlFinch_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/OwlFinch_Broken.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -0,0 +1,28 @@ +package org.jboss.jsr299.tck.tests.event.fires.nonbinding; + +import javax.enterprise.event.Event; +import javax.enterprise.event.Observer; +import javax.enterprise.inject.Any; + + +class OwlFinch_Broken +{ + @Any + private Event<String> simpleEvent; + + public void methodThatFiresEvent() + { + simpleEvent.fire("An event", new AnimalStereotypeAnnotationLiteral()); + } + + public void methodThatRegistersObserver() + { + simpleEvent.observe(new Observer<String>() + { + public boolean notify(String event) + { + return false; + } + }, new AnimalStereotypeAnnotationLiteral()); + } +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise (from rev 2903, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Egg.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/Egg.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Egg.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,6 +1,5 @@ -package org.jboss.jsr299.tck.tests.event.enterprise; +package org.jboss.jsr299.tck.tests.event.observer.enterprise; -class Egg +class Egg extends EventPayload { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/EnterpriseEventInheritenceTest.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.event.enterprise; +package org.jboss.jsr299.tck.tests.event.observer.enterprise; import java.util.Set; @@ -15,6 +15,8 @@ /** * Tests for event inheritence with enterprise beans * + * Spec version: 20090519 + * * @author Shane Bryzak */ @Artifact @@ -31,13 +33,15 @@ @Override protected void execute() throws Exception { - Set<Observer<Egg>> observers = getCurrentManager().resolveObservers(new Egg()); + Egg egg = new Egg(); + Set<Observer<Egg>> observers = getCurrentManager().resolveObservers(egg); assert observers.size() == 1; // Notify the observer so we can confirm that it // is a method only on Farmer, and not LazyFarmer - observers.iterator().next().notify(new Egg()); - assert Farmer.getObserverClazz().equals(Farmer.class); + observers.iterator().next().notify(egg); + assert egg.getClassesVisited().size() == 1; + assert egg.getClassesVisited().iterator().next().equals(Farmer.class); } }.run(); @@ -52,15 +56,17 @@ @Override protected void execute() throws Exception { - Set<Observer<StockPrice>> observers = getCurrentManager().resolveObservers(new StockPrice()); + StockPrice stockPrice = new StockPrice(); + Set<Observer<StockPrice>> observers = getCurrentManager().resolveObservers(stockPrice); assert observers.size() == 1; // Notify the observer so we can confirm that it // is a method only on StockWatcher, and not IndirectStockWatcher - observers.iterator().next().notify(new StockPrice()); - assert StockWatcher.getObserverClazz().equals(StockWatcher.class); + observers.iterator().next().notify(stockPrice); + assert stockPrice.getClassesVisited().size() == 1; + assert stockPrice.getClassesVisited().iterator().next().equals(StockWatcher.class); } }.run(); - } + } } Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EventPayload.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EventPayload.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EventPayload.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.event.observer.enterprise; + +import java.util.ArrayList; +import java.util.List; + +class EventPayload +{ + private List<Class<?>> classesVisited = new ArrayList<Class<?>>(); + + public List<Class<?>> getClassesVisited() + { + return classesVisited; + } + + public void recordVisit(Object o) + { + classesVisited.add(o.getClass()); + } +} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/Farmer.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Farmer.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,21 +1,13 @@ -package org.jboss.jsr299.tck.tests.event.enterprise; +package org.jboss.jsr299.tck.tests.event.observer.enterprise; import javax.ejb.Stateful; import javax.enterprise.event.Observes; -@Stateful -public class Farmer implements FarmerLocal +public @Stateful class Farmer implements FarmerLocal { - private static Class<?> observerClazz; - public void observeEggLaying(@Observes Egg egg) { - observerClazz = this.getClass(); + egg.recordVisit(this); } - public static Class<?> getObserverClazz() - { - return observerClazz; - } - } \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/FarmerLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/FarmerLocal.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/FarmerLocal.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,10 +1,9 @@ -package org.jboss.jsr299.tck.tests.event.enterprise; +package org.jboss.jsr299.tck.tests.event.observer.enterprise; import javax.ejb.Local; import javax.enterprise.event.Observes; -@Local -public interface FarmerLocal +public @Local interface FarmerLocal { void observeEggLaying(@Observes Egg egg); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IndirectStockWatcher.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/IndirectStockWatcher.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IndirectStockWatcher.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,9 +1,7 @@ -package org.jboss.jsr299.tck.tests.event.enterprise; +package org.jboss.jsr299.tck.tests.event.observer.enterprise; import javax.ejb.Stateful; -@Stateful -public class IndirectStockWatcher extends IntermediateStockWatcher implements IndirectStockWatcherLocal +public @Stateful class IndirectStockWatcher extends IntermediateStockWatcher implements IndirectStockWatcherLocal { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IndirectStockWatcherLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/IndirectStockWatcherLocal.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IndirectStockWatcherLocal.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,9 +1,7 @@ -package org.jboss.jsr299.tck.tests.event.enterprise; +package org.jboss.jsr299.tck.tests.event.observer.enterprise; import javax.ejb.Local; -@Local -public interface IndirectStockWatcherLocal +public @Local interface IndirectStockWatcherLocal { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IntermediateStockWatcher.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/IntermediateStockWatcher.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IntermediateStockWatcher.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,6 +1,5 @@ -package org.jboss.jsr299.tck.tests.event.enterprise; +package org.jboss.jsr299.tck.tests.event.observer.enterprise; class IntermediateStockWatcher extends StockWatcher { - } \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/LazyFarmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/LazyFarmer.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/LazyFarmer.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,9 +1,7 @@ -package org.jboss.jsr299.tck.tests.event.enterprise; +package org.jboss.jsr299.tck.tests.event.observer.enterprise; import javax.ejb.Stateful; -@Stateful -public class LazyFarmer extends Farmer implements LazyFarmerLocal +public @Stateful class LazyFarmer extends Farmer implements LazyFarmerLocal { - } \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/LazyFarmerLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/LazyFarmerLocal.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/LazyFarmerLocal.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,9 +1,7 @@ -package org.jboss.jsr299.tck.tests.event.enterprise; +package org.jboss.jsr299.tck.tests.event.observer.enterprise; import javax.ejb.Local; -@Local -public interface LazyFarmerLocal +public @Local interface LazyFarmerLocal { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockPrice.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/StockPrice.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockPrice.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,6 +1,5 @@ -package org.jboss.jsr299.tck.tests.event.enterprise; +package org.jboss.jsr299.tck.tests.event.observer.enterprise; -class StockPrice +class StockPrice extends EventPayload { - } \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcher.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/StockWatcher.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcher.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,20 +1,13 @@ -package org.jboss.jsr299.tck.tests.event.enterprise; +package org.jboss.jsr299.tck.tests.event.observer.enterprise; import javax.ejb.Stateful; import javax.enterprise.event.Observes; -@Stateful -public class StockWatcher implements StockWatcherLocal +public @Stateful class StockWatcher implements StockWatcherLocal { - private static Class<?> observerClazz; - public void observeStockPrice(@Observes StockPrice price) { - observerClazz = this.getClass(); + price.recordVisit(this); } - public static Class<?> getObserverClazz() - { - return observerClazz; - } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcherLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/StockWatcherLocal.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcherLocal.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,10 +1,9 @@ -package org.jboss.jsr299.tck.tests.event.enterprise; +package org.jboss.jsr299.tck.tests.event.observer.enterprise; import javax.ejb.Local; import javax.enterprise.event.Observes; -@Local -public interface StockWatcherLocal +public @Local interface StockWatcherLocal { void observeStockPrice(@Observes StockPrice price); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-06-26 20:10:55 UTC (rev 2906) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -10,6 +10,9 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; +/** + * Spec version: 20090519 + */ @Artifact public class ResolvingChecksBindingTypeMembersTest extends AbstractJSR299Test { Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeTest.java 2009-06-26 20:10:55 UTC (rev 2906) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeTest.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,43 +0,0 @@ -package org.jboss.jsr299.tck.tests.event.resolve.binding; - -import java.util.Set; - -import javax.enterprise.event.Observer; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.testharness.impl.packaging.Artifact; -import org.testng.annotations.Test; - -@Artifact -public class ResolvingChecksBindingTypeTest extends AbstractJSR299Test -{ - public static class AnEventType - { - } - - public static class AnObserver implements Observer<AnEventType> - { - public boolean wasNotified = false; - - public boolean notify(AnEventType event) - { - wasNotified = true; - return false; - } - } - - @Test(groups = { "events" }) - @SpecAssertion(section = "7.7", id = "g") - public void testResolvingChecksBindingTypes() - { - AnObserver observer = new AnObserver(); - AnObserver anotherObserver = new AnObserver(); - getCurrentManager().addObserver(observer, new BindingTypeABinding()); - getCurrentManager().addObserver(anotherObserver, new BindingTypeBBinding()); - Set<Observer<AnEventType>> resolvedObservers = getCurrentManager().resolveObservers(new AnEventType(), new BindingTypeABinding()); - assert resolvedObservers.size() == 1; - } - - -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java 2009-06-26 20:10:55 UTC (rev 2906) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -37,6 +37,5 @@ AnObserver observer = new AnObserver(); getCurrentManager().addObserver(observer); Set<Observer<AnEventType>> resolvedObservers = getCurrentManager().resolveObservers(new AnEventType(), new AnimalStereotypeAnnotationLiteral()); - assert !resolvedObservers.isEmpty(); } }

11 years, 9 months

1
0
0 / 0

← Newer
1
2
3
4
5
6
...
21
Older →

Jump to page:

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits June 2009