[webbeans-commits] Webbeans SVN: r1049 - in ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test: annotations and 9 other directories.

Author: pete.muir(a)jboss.org Date: 2009-01-17 15:11:52 -0500 (Sat, 17 Jan 2009) New Revision: 1049 Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractEjbEmbeddableTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Synchronous.java Removed: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractEjbEmbeddableTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SpecAssertion.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SpecVersion.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/AnimalOrderStereotype.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/AnimalStereotype.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/AnotherDeploymentType.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/AnotherScopeType.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Asynchronous.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Chunky.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Expensive.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/FishStereotype.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/HeavyDuty.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/HornedAnimalDeploymentType.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/HornedMammalStereotype.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/MammalStereotype.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/MessageDriven.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Modern.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Motorized.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/RequestScopedAnimalStereotype.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/RiverFishStereotype.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Role.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Singleton.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Synchronous.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Tame.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Whitefish.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/broken/ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Animal.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AnimalFarmer.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Antelope.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BananaSpider.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Barn.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BeanWithInjectionPointMetadata.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BeanWithTooManyScopeTypes.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Bear.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlackWidow.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cat.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Chair.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cheetah.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Chicken.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ChickenHutch.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cod.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ConstructorInjectionPointBean.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cow.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DaddyLongLegs.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DangerCall.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DeadlyAnimal.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DeadlySpider.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DefangedTarantula.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DependentFinalTuna.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Donkey.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Duck.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Elephant.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Farm.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FarmOffice.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Farmer.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FieldInjectionPointBean.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishFarm.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishFarmOffice.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishPond.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Fox.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FoxRun.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FunnelWeaver.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Giraffe.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Goldfish.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Grayling.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Haddock.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Halibut.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/HighlandCow.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Horse.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/InitializedObserver.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/InitializedObserverWhichUsesApplicationContext.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/InitializedObserverWhichUsesRequestContext.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/LadybirdSpider.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Leopard.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Lion.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Minnow.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Moose.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Mullet.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Order.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OtherSpiderProducer.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Panther.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Plaice.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Plough.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Pollock.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Puma.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/RedSnapper.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Reindeer.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Rhinoceros.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/RoundWhitefish.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Salmon.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ScottishFish.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ScottishFishFarmer.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SeaBass.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Sheep.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Sole.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Spider.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SpiderNest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SpiderProducer.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tarantula.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TarantulaProducer.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tiger.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tractor.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TrapdoorSpider.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tuna.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TunaFarm.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TunedTuna.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Turkey.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/WolfSpider.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/contexts/ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/ Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDescriptor.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/BoostrapTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Tiger.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/context/PassivatingContextTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/DeferredEventNotificationTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/Tuna.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/NewSimpleBeanTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/ResolutionByTypeTest.java Log: Clean up the testsuite :-) Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractEjbEmbeddableTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractEjbEmbeddableTest.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractEjbEmbeddableTest.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,72 +0,0 @@ -package org.jboss.webbeans.test; - -import java.net.URL; -import java.util.Properties; - -import javax.ejb.EJBContainer; -import javax.naming.Context; -import javax.naming.InitialContext; - -import org.testng.annotations.AfterMethod; -import org.testng.annotations.AfterSuite; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.BeforeSuite; - - - -public abstract class AbstractEjbEmbeddableTest extends AbstractTest -{ - - private EJBContainer ejbContainer; - - @AfterSuite - public void afterClass() throws Exception - { - EJBContainer current = EJBContainer.getCurrentEJBContainer(); - if(current != null) - { - current.close(); - } - } - - @BeforeSuite - public void beforeClass() throws Exception - { - Properties properties = new Properties(); - String module = getURLToTestClasses(getTestClassesPath()); - properties.setProperty(EJBContainer.EMBEDDABLE_MODULES_PROPERTY, module); - this.ejbContainer = EJBContainer.createEJBContainer(properties); - } - - @BeforeMethod - public void before() throws Exception - { - super.before(); - webBeansBootstrap.getNaming().setContext(new InitialContext()); - } - - @AfterMethod - public void after() throws Exception - { - webBeansBootstrap.getNaming().setContext(null); - } - - - protected String getTestClassesPath() - { - return "org/jboss/webbeans/test"; - } - - private static String getURLToTestClasses(String path) - { - URL url = Thread.currentThread().getContextClassLoader().getResource(path); - String s = url.toString(); - return s.substring(0, s.length() - path.length()); - } - - public Context getContext() - { - return webBeansBootstrap.getNaming().getContext(); - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractTest.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractTest.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,187 +0,0 @@ -package org.jboss.webbeans.test; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.util.Arrays; - -import javax.webbeans.Production; -import javax.webbeans.Standard; - -import org.jboss.webbeans.CurrentManager; -import org.jboss.webbeans.ManagerImpl; -import org.jboss.webbeans.bean.AbstractClassBean; -import org.jboss.webbeans.bean.AbstractProducerBean; -import org.jboss.webbeans.bean.EnterpriseBean; -import org.jboss.webbeans.bean.ProducerFieldBean; -import org.jboss.webbeans.bean.ProducerMethodBean; -import org.jboss.webbeans.bean.SimpleBean; -import org.jboss.webbeans.context.DependentContext; -import org.jboss.webbeans.test.annotations.AnotherDeploymentType; -import org.jboss.webbeans.test.annotations.HornedAnimalDeploymentType; -import org.jboss.webbeans.test.mock.MockBootstrap; -import org.jboss.webbeans.test.mock.MockEjbDescriptor; -import org.testng.annotations.BeforeMethod; - -public class AbstractTest -{ - - protected abstract static class RunInDependentContext - { - - protected void setup() - { - AbstractTest.activateDependentContext(); - } - - protected void cleanup() - { - AbstractTest.deactivateDependentContext(); - } - - public final void run() throws Exception - { - try - { - setup(); - execute(); - } - finally - { - cleanup(); - } - } - - protected abstract void execute() throws Exception; - - } - - protected static final int BUILT_IN_BEANS = 3; - - protected ManagerImpl manager; - protected MockBootstrap webBeansBootstrap; - - public static boolean visited = false; - - @BeforeMethod - public void before() throws Exception - { - webBeansBootstrap = new MockBootstrap(); - manager = webBeansBootstrap.getManager(); - addStandardDeploymentTypesForTests(); - } - - private boolean hasField(Class<?> clazz, String name) - { - try - { - Field field = clazz.getDeclaredField(name); - } - catch (NoSuchFieldException e) - { - return false; - } - return true; - } - - private Method getMethod(Class<?> clazz, String name) - { - for (Method method : clazz.getDeclaredMethods()) - { - if (method.getName().equals(name)) - { - return method; - } - } - return null; - } - - protected AbstractProducerBean<?, ?> registerProducerBean(Class<?> producerBeanClass, String fieldOrMethodName, Class<?> productClass) - { - SimpleBean<?> producerContainerBean = SimpleBean.of(producerBeanClass, manager); - manager.addBean(producerContainerBean); - AbstractProducerBean<?, ?> producerBean = null; - try - { - if (hasField(producerBeanClass, fieldOrMethodName)) - { - Field producerField = producerBeanClass.getDeclaredField(fieldOrMethodName); - producerBean = ProducerFieldBean.of(producerField, producerContainerBean, manager); - } - else - { - Method producerMethod = getMethod(producerBeanClass, fieldOrMethodName); - producerBean = ProducerMethodBean.of(producerMethod, producerContainerBean, manager); - } - } - catch (Exception e) - { - throw new RuntimeException("Could not initialize producer bean", e); - } - manager.addBean(producerBean); - return producerBean; - } - - - protected <T> AbstractClassBean<T> registerBean(Class<T> clazz) - { - AbstractClassBean<T> bean = null; - if (CurrentManager.rootManager().getEjbDescriptorCache().containsKey(clazz)) - { - bean = EnterpriseBean.of(clazz, manager); - } - else - { - bean = SimpleBean.of(clazz, manager); - } - CurrentManager.rootManager().addBean(bean); - return bean; - } - - protected void registerBeans(Class<?>[] classes) - { - for (Class<?> clazz : classes) - { - registerBean(clazz); - } - } - - @SuppressWarnings("unchecked") - protected void addStandardDeploymentTypesForTests() - { - manager.setEnabledDeploymentTypes(Arrays.asList(Standard.class, Production.class, AnotherDeploymentType.class, HornedAnimalDeploymentType.class)); - } - - protected <T> void addToEjbCache(Class<T> clazz) - { - manager.getEjbDescriptorCache().add(MockEjbDescriptor.of(clazz)); - } - - protected byte[] serialize(Object instance) throws IOException - { - ByteArrayOutputStream bytes = new ByteArrayOutputStream(); - ObjectOutputStream out = new ObjectOutputStream(bytes); - out.writeObject(instance); - return bytes.toByteArray(); - } - - protected Object deserialize(byte[] bytes) throws IOException, ClassNotFoundException - { - ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes)); - return in.readObject(); - } - - protected static void activateDependentContext() - { - DependentContext.INSTANCE.setActive(true); - } - - protected static void deactivateDependentContext() - { - DependentContext.INSTANCE.setActive(false); - } -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SpecAssertion.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SpecAssertion.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SpecAssertion.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,16 +0,0 @@ -package org.jboss.webbeans.test; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Target; - -(a)Target(ElementType.METHOD) -@Documented -public @interface SpecAssertion -{ - - public String[] section(); - - public String note() default ""; - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SpecVersion.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SpecVersion.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SpecVersion.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,13 +0,0 @@ -package org.jboss.webbeans.test; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Target; - -@Documented -(a)Target(ElementType.TYPE) -public @interface SpecVersion { - - String value(); - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/AnimalOrderStereotype.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/AnimalOrderStereotype.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/AnimalOrderStereotype.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,20 +0,0 @@ -package org.jboss.webbeans.test.annotations; - -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.webbeans.Stereotype; - -import org.jboss.webbeans.test.beans.Animal; -import org.jboss.webbeans.test.beans.Order; - -(a)Stereotype(requiredTypes={Animal.class, Order.class}) -@Target( { TYPE }) -@Retention(RUNTIME) -public @interface AnimalOrderStereotype -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/AnimalStereotype.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/AnimalStereotype.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/AnimalStereotype.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,23 +0,0 @@ -package org.jboss.webbeans.test.annotations; - -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.webbeans.RequestScoped; -import javax.webbeans.Stereotype; - -import org.jboss.webbeans.test.beans.Animal; - -(a)Stereotype(requiredTypes=Animal.class) -@Target( { TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@RequestScoped -public @interface AnimalStereotype -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/AnotherDeploymentType.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/AnotherDeploymentType.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/AnotherDeploymentType.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,20 +0,0 @@ -package org.jboss.webbeans.test.annotations; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.webbeans.DeploymentType; - -@Target( { TYPE, METHOD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -public @interface AnotherDeploymentType -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/AnotherScopeType.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/AnotherScopeType.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/AnotherScopeType.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,20 +0,0 @@ -package org.jboss.webbeans.test.annotations; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.webbeans.ScopeType; - -@Target( { TYPE, METHOD }) -@Retention(RUNTIME) -@Documented -@ScopeType -public @interface AnotherScopeType -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Asynchronous.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Asynchronous.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Asynchronous.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,21 +0,0 @@ -package org.jboss.webbeans.test.annotations; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.webbeans.BindingType; - -@Target( { TYPE, METHOD, PARAMETER }) -@Retention(RUNTIME) -@Documented -@BindingType -public @interface Asynchronous -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Chunky.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Chunky.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Chunky.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,24 +0,0 @@ -package org.jboss.webbeans.test.annotations; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.webbeans.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -public @interface Chunky -{ - - boolean realChunky(); - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Expensive.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Expensive.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Expensive.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,28 +0,0 @@ -package org.jboss.webbeans.test.annotations; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.webbeans.BindingType; -import javax.webbeans.NonBinding; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -public @interface Expensive -{ - - boolean veryExpensive(); - - @NonBinding - int cost(); - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/FishStereotype.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/FishStereotype.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/FishStereotype.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,23 +0,0 @@ -package org.jboss.webbeans.test.annotations; - -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.webbeans.ApplicationScoped; -import javax.webbeans.Named; -import javax.webbeans.Stereotype; - -import org.jboss.webbeans.test.beans.Animal; - -(a)Stereotype(requiredTypes=Animal.class) -@Target( { TYPE }) -@Retention(RUNTIME) -@ApplicationScoped -@Named -public @interface FishStereotype -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/HeavyDuty.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/HeavyDuty.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/HeavyDuty.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,21 +0,0 @@ -package org.jboss.webbeans.test.annotations; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.webbeans.BindingType; - -@Target( { TYPE, METHOD, PARAMETER }) -@Retention(RUNTIME) -@Documented -@BindingType -public @interface HeavyDuty -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/HornedAnimalDeploymentType.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/HornedAnimalDeploymentType.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/HornedAnimalDeploymentType.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,20 +0,0 @@ -package org.jboss.webbeans.test.annotations; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.webbeans.DeploymentType; - -@Target( { TYPE, METHOD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -public @interface HornedAnimalDeploymentType -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/HornedMammalStereotype.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/HornedMammalStereotype.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/HornedMammalStereotype.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,20 +0,0 @@ -package org.jboss.webbeans.test.annotations; - -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.webbeans.Stereotype; - -import org.jboss.webbeans.test.beans.Animal; - -(a)Stereotype(requiredTypes=Animal.class) -@Target( { TYPE }) -@Retention(RUNTIME) -@HornedAnimalDeploymentType -public @interface HornedMammalStereotype -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/MammalStereotype.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/MammalStereotype.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/MammalStereotype.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,20 +0,0 @@ -package org.jboss.webbeans.test.annotations; - -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.webbeans.Stereotype; - -import org.jboss.webbeans.test.beans.Animal; - -(a)Stereotype(requiredTypes=Animal.class) -@Target( { TYPE }) -@Retention(RUNTIME) -@AnotherDeploymentType -public @interface MammalStereotype -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/MessageDriven.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/MessageDriven.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/MessageDriven.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,13 +0,0 @@ -package org.jboss.webbeans.test.annotations; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -(a)Retention(RetentionPolicy.RUNTIME) -(a)Target(ElementType.TYPE) -public @interface MessageDriven -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Modern.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Modern.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Modern.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,20 +0,0 @@ -package org.jboss.webbeans.test.annotations; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.webbeans.DeploymentType; - -@Target( { TYPE, METHOD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -public @interface Modern -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Motorized.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Motorized.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Motorized.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,21 +0,0 @@ -package org.jboss.webbeans.test.annotations; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.webbeans.BindingType; - -@Target( { TYPE, METHOD, PARAMETER }) -@Retention(RUNTIME) -@Documented -@BindingType -public @interface Motorized -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/RequestScopedAnimalStereotype.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/RequestScopedAnimalStereotype.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/RequestScopedAnimalStereotype.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,20 +0,0 @@ -package org.jboss.webbeans.test.annotations; - -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.webbeans.RequestScoped; -import javax.webbeans.Stereotype; - -import org.jboss.webbeans.test.beans.Animal; - -(a)Stereotype(requiredTypes=Animal.class, supportedScopes=RequestScoped.class) -@Target( { TYPE }) -@Retention(RUNTIME) -public @interface RequestScopedAnimalStereotype -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/RiverFishStereotype.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/RiverFishStereotype.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/RiverFishStereotype.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,21 +0,0 @@ -package org.jboss.webbeans.test.annotations; - -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.webbeans.ApplicationScoped; -import javax.webbeans.Stereotype; - -import org.jboss.webbeans.test.beans.Animal; - -(a)Stereotype(requiredTypes=Animal.class) -@Target( { TYPE }) -@Retention(RUNTIME) -@ApplicationScoped -public @interface RiverFishStereotype -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Role.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Role.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Role.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,14 +0,0 @@ -package org.jboss.webbeans.test.annotations; - -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; - -import javax.webbeans.BindingType; - -@BindingType -@Retention(RUNTIME) -public @interface Role -{ - String value(); -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Singleton.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Singleton.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Singleton.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,14 +0,0 @@ -package org.jboss.webbeans.test.annotations; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -@Target(value=TYPE) -@Retention(value=RUNTIME) -public @interface Singleton -{ - // EJB 3.1. Fake it 'til you make it. -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Synchronous.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Synchronous.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Synchronous.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,21 +0,0 @@ -package org.jboss.webbeans.test.annotations; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.webbeans.BindingType; - -@Target( { TYPE, METHOD, PARAMETER }) -@Retention(RUNTIME) -@Documented -@BindingType -public @interface Synchronous -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Tame.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Tame.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Tame.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,22 +0,0 @@ -package org.jboss.webbeans.test.annotations; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.webbeans.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -public @interface Tame -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Whitefish.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Whitefish.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Whitefish.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,22 +0,0 @@ -package org.jboss.webbeans.test.annotations; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.webbeans.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -public @interface Whitefish -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Animal.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Animal.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Animal.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.test.beans; - -public interface Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AnimalFarmer.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AnimalFarmer.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AnimalFarmer.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.test.beans; - -public class AnimalFarmer extends Farmer<Animal> -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Antelope.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Antelope.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Antelope.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.test.beans; - -public class Antelope implements Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BananaSpider.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BananaSpider.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BananaSpider.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,23 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import java.util.Set; - -import javax.webbeans.Observer; -import javax.webbeans.Observes; -import javax.webbeans.manager.Manager; - -/** - * Simple bean with observer method and another injectable parameter. - * - */ -public class BananaSpider -{ - public void observeStringEvent(@Observes String someEvent, Manager manager) - { - assert someEvent != null; - assert manager != null; - Set<Observer<String>> allStringObservers = manager.resolveObservers(someEvent); - assert allStringObservers != null; - assert allStringObservers.size() > 0; - } -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Barn.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Barn.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Barn.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import org.jboss.webbeans.test.annotations.Tame; - -public class Barn -{ - - @Tame - public Tarantula petSpider; - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BeanWithInjectionPointMetadata.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BeanWithInjectionPointMetadata.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BeanWithInjectionPointMetadata.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,37 +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.test.beans; - -import javax.webbeans.Current; -import javax.webbeans.InjectionPoint; - -/** - * Test bean with injection point on the constructor of the bean - * - * @author David Allen - * - */ -public class BeanWithInjectionPointMetadata -{ - @Current - private InjectionPoint injectedMetadata; - - public InjectionPoint getInjectedMetadata() - { - return injectedMetadata; - } -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BeanWithTooManyScopeTypes.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BeanWithTooManyScopeTypes.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BeanWithTooManyScopeTypes.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.ConversationScoped; -import javax.webbeans.RequestScoped; - -@RequestScoped -@ConversationScoped -public class BeanWithTooManyScopeTypes -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Bear.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Bear.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Bear.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,13 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.ejb.Stateless; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; - -@Production -@RequestScoped -@Stateless -public class Bear -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlackWidow.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlackWidow.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlackWidow.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.test.beans; - -public class BlackWidow extends Spider implements DeadlySpider -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cat.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cat.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cat.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Production; - -import org.jboss.webbeans.test.annotations.Synchronous; - -@Production -@Synchronous -public class Cat -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Chair.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Chair.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Chair.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import org.jboss.webbeans.test.annotations.AnimalStereotype; - -@AnimalStereotype -public class Chair -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cheetah.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cheetah.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cheetah.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,18 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.ejb.Remove; -import javax.webbeans.Destructor; -import javax.webbeans.Production; - -@Production -public class Cheetah -{ - - @Remove @Destructor - public void remove() - { - - } - - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Chicken.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Chicken.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Chicken.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,10 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Production; - -@Production -public class Chicken -{ - - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ChickenHutch.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ChickenHutch.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ChickenHutch.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,23 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Initializer; - -public class ChickenHutch -{ - - public Fox fox; - public Chicken chicken; - - @Initializer - public void setFox(Fox fox) - { - this.fox = fox; - } - - @Initializer - public void setChicken(Chicken chicken) - { - this.chicken = chicken; - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cod.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cod.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cod.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,16 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Named; -import javax.webbeans.Production; - -import org.jboss.webbeans.test.annotations.Chunky; -import org.jboss.webbeans.test.annotations.Whitefish; - -@Production -@Whitefish -@Chunky(realChunky=true) -@Named("whitefish") -public class Cod implements ScottishFish -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ConstructorInjectionPointBean.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ConstructorInjectionPointBean.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ConstructorInjectionPointBean.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,42 +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.test.beans; - -import javax.webbeans.Current; -import javax.webbeans.Initializer; - -/** - * Test bean to inject a bean using injection point metadata into a constructor - * - * @author David Allen - * - */ -public class ConstructorInjectionPointBean -{ - private BeanWithInjectionPointMetadata injectedBean; - - @Initializer - public ConstructorInjectionPointBean(@Current BeanWithInjectionPointMetadata injectedBean) - { - this.injectedBean = injectedBean; - } - - public BeanWithInjectionPointMetadata getInjectedBean() - { - return injectedBean; - } -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cow.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cow.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cow.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Production; - -@Production -public abstract class Cow -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DaddyLongLegs.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DaddyLongLegs.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DaddyLongLegs.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.test.beans; - -public class DaddyLongLegs extends Spider -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DangerCall.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DangerCall.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DangerCall.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Production; - -@Production -public class DangerCall -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DeadlyAnimal.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DeadlyAnimal.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DeadlyAnimal.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.test.beans; - -public interface DeadlyAnimal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DeadlySpider.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DeadlySpider.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DeadlySpider.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.test.beans; - -public interface DeadlySpider extends DeadlyAnimal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DefangedTarantula.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DefangedTarantula.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DefangedTarantula.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.test.beans; - -public class DefangedTarantula extends Tarantula -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DependentFinalTuna.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DependentFinalTuna.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DependentFinalTuna.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import org.jboss.webbeans.test.annotations.AnotherDeploymentType; - -@AnotherDeploymentType -public final class DependentFinalTuna -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Donkey.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Donkey.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Donkey.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,19 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Production; - -@Production -public class Donkey -{ - - public Donkey() - { - - } - - public Donkey(String foo) - { - - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Duck.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Duck.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Duck.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,18 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Initializer; -import javax.webbeans.Production; - -import org.jboss.webbeans.test.annotations.Synchronous; - -@Production -public class Duck -{ - - @Initializer - public Duck(String foo, @Synchronous Integer bar) - { - - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Elephant.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Elephant.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Elephant.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,25 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.ejb.Remove; -import javax.ejb.Stateful; -import javax.webbeans.Destructor; -import javax.webbeans.Production; - -@Production -@Stateful -public class Elephant -{ - - @Remove - public void remove1() - { - - } - - @Remove @Destructor - public void remove2() - { - - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Farm.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Farm.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Farm.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,32 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import java.util.Date; - -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.webbeans.Current; - -public class Farm -{ - - public Date founded; - public Date closed; - public int initialStaff; - - @Current - FarmOffice farmOffice; - - @PostConstruct - private void postConstruct() - { - founded = new Date(); - initialStaff = farmOffice.noOfStaff; - } - - @PreDestroy - private void preDestroy() - { - closed = new Date(); - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FarmOffice.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FarmOffice.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FarmOffice.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.test.beans; - - -public class FarmOffice -{ - - public int noOfStaff = 20; - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Farmer.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Farmer.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Farmer.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Production; - -@Production -public class Farmer<T> -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FieldInjectionPointBean.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FieldInjectionPointBean.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FieldInjectionPointBean.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,42 +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.test.beans; - -import javax.webbeans.Current; -import javax.webbeans.RequestScoped; - -import org.jboss.webbeans.test.annotations.AnimalStereotype; - -/** - * Test bean to inject another bean which uses injection point metadata in a - * field - * - * @author David Allen - * - */ -@RequestScoped -public class FieldInjectionPointBean -{ - @Current @AnimalStereotype - private BeanWithInjectionPointMetadata injectedBean; - - public BeanWithInjectionPointMetadata getInjectedBean() - { - return injectedBean; - } -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishFarm.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishFarm.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishFarm.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,41 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Current; -import javax.webbeans.Production; - -import org.jboss.webbeans.test.annotations.Chunky; -import org.jboss.webbeans.test.annotations.Expensive; -import org.jboss.webbeans.test.annotations.Whitefish; - -@Production -public class FishFarm -{ - - @SuppressWarnings("unused") - @Current - public Tuna tuna; - - @SuppressWarnings("unused") - @Current - public Animal animal; - - @SuppressWarnings("unused") - @Whitefish - public ScottishFish whiteScottishFish; - - @SuppressWarnings("unused") - @Whitefish - public Animal whiteFish; - - @SuppressWarnings("unused") - @Whitefish @Chunky(realChunky=true) - public Animal realChunkyWhiteFish; - - @SuppressWarnings("unused") - @Current - public Farmer<ScottishFish> scottishFishFarmer; - - @Expensive(cost=60, veryExpensive=true) @Whitefish - public Animal veryExpensiveWhitefish; - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishFarmOffice.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishFarmOffice.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishFarmOffice.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Current; -import javax.webbeans.manager.Manager; - -public class FishFarmOffice -{ - - @Current public Manager manager; - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishPond.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishPond.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishPond.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,17 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Initializer; - -public class FishPond -{ - - public Animal goldfish; - - @Initializer - public FishPond(Goldfish goldfish) - { - this.goldfish = goldfish; - } - - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Fox.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Fox.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Fox.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,14 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Dependent; - -@Dependent -public class Fox -{ - - public String getName() - { - return "gavin"; - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FoxRun.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FoxRun.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FoxRun.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,14 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Current; - -public class FoxRun -{ - - @Current - public Fox fox; - - @Current - public Fox anotherFox; - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FunnelWeaver.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FunnelWeaver.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FunnelWeaver.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.test.beans; - -public class FunnelWeaver<T> -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Giraffe.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Giraffe.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Giraffe.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.ejb.Stateless; - -@Stateless -public class Giraffe -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Goldfish.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Goldfish.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Goldfish.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,14 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; - -import org.jboss.webbeans.test.annotations.RequestScopedAnimalStereotype; - -@RequestScopedAnimalStereotype -@RequestScoped -@Production -public class Goldfish implements Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Grayling.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Grayling.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Grayling.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import org.jboss.webbeans.test.annotations.FishStereotype; -import org.jboss.webbeans.test.annotations.RiverFishStereotype; - - -@RiverFishStereotype -@FishStereotype -public class Grayling implements Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Haddock.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Haddock.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Haddock.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Named; -import javax.webbeans.Production; - -@Production -@Named -public class Haddock implements Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Halibut.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Halibut.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Halibut.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import org.jboss.webbeans.test.annotations.Expensive; -import org.jboss.webbeans.test.annotations.Whitefish; - -@Expensive(cost=50, veryExpensive=true) -@Whitefish -public class Halibut implements Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/HighlandCow.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/HighlandCow.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/HighlandCow.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,16 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.RequestScoped; - -import org.jboss.webbeans.test.annotations.HornedMammalStereotype; -import org.jboss.webbeans.test.annotations.RequestScopedAnimalStereotype; -import org.jboss.webbeans.test.annotations.Tame; - -@HornedMammalStereotype -@RequestScopedAnimalStereotype -@RequestScoped -@Tame -public class HighlandCow implements Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Horse.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Horse.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Horse.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; - -@Production -@RequestScoped -public final class Horse -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/InitializedObserver.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/InitializedObserver.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/InitializedObserver.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,17 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Observes; -import javax.webbeans.manager.Initialized; -import javax.webbeans.manager.Manager; - -public class InitializedObserver -{ - - public static boolean observered; - - public void observeInitialized(@Observes @Initialized Manager manager) - { - observered = true; - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/InitializedObserverWhichUsesApplicationContext.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/InitializedObserverWhichUsesApplicationContext.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/InitializedObserverWhichUsesApplicationContext.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,18 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Current; -import javax.webbeans.Observes; -import javax.webbeans.manager.Initialized; -import javax.webbeans.manager.Manager; - -public class InitializedObserverWhichUsesApplicationContext -{ - - @Current LadybirdSpider spider; - - public void observeInitialized(@Observes @Initialized Manager manager) - { - spider.spinWeb(); - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/InitializedObserverWhichUsesRequestContext.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/InitializedObserverWhichUsesRequestContext.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/InitializedObserverWhichUsesRequestContext.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,18 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Current; -import javax.webbeans.Observes; -import javax.webbeans.manager.Initialized; -import javax.webbeans.manager.Manager; - -public class InitializedObserverWhichUsesRequestContext -{ - - @Current Tuna tuna; - - public void observeInitialized(@Observes @Initialized Manager manager) - { - tuna.getName(); - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/LadybirdSpider.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/LadybirdSpider.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/LadybirdSpider.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,14 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.ApplicationScoped; - -@ApplicationScoped -public class LadybirdSpider extends Spider -{ - - public void spinWeb() - { - - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Leopard.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Leopard.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Leopard.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,17 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.jms.Message; -import javax.webbeans.Production; - -@Production -//@MessageDriven -public class Leopard implements javax.jms.MessageListener -{ - - public void onMessage(Message message) - { - // TODO Auto-generated method stub - - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Lion.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Lion.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Lion.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,13 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.ejb.Stateless; -import javax.webbeans.Named; -import javax.webbeans.Production; - -@Production -@Stateless -@Named -public class Lion -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Minnow.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Minnow.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Minnow.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.RequestScoped; - -import org.jboss.webbeans.test.annotations.RiverFishStereotype; - -@RiverFishStereotype -@RequestScoped -public class Minnow implements Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Moose.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Moose.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Moose.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Named; - -import org.jboss.webbeans.test.annotations.MammalStereotype; - -@MammalStereotype -@Named("aMoose") -public class Moose implements Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Mullet.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Mullet.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Mullet.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import org.jboss.webbeans.test.annotations.AnotherScopeType; - -@AnotherScopeType -public class Mullet -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Order.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Order.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Order.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Production; - -@Production -public class Order -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OtherSpiderProducer.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OtherSpiderProducer.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OtherSpiderProducer.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,49 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Dependent; -import javax.webbeans.Named; -import javax.webbeans.Produces; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; - -import org.jboss.webbeans.test.annotations.AnimalStereotype; -import org.jboss.webbeans.test.annotations.AnotherDeploymentType; -import org.jboss.webbeans.test.annotations.Tame; - -@AnotherDeploymentType -public class OtherSpiderProducer -{ - - private static Spider[] ALL_SPIDERS = { new Tarantula(), new LadybirdSpider(), new DaddyLongLegs() }; - - @Produces @Tame public Tarantula produceTameTarantula = new DefangedTarantula(); - - @Produces public Tarantula produceTarantula = new Tarantula(); - - @Produces @Dependent public final TrapdoorSpider produceTrapdoorSpider = new TrapdoorSpider(); - - @Produces @Named("blackWidow") public BlackWidow produceBlackWidow = new BlackWidow(); - - @Produces @Named @RequestScoped public DaddyLongLegs produceDaddyLongLegs = new DaddyLongLegs(); - - @Produces @Named @Production public LadybirdSpider getLadybirdSpider = new LadybirdSpider(); - - @Produces @Named("Shelob") public Tarantula produceShelob; - - @Produces @AnimalStereotype public WolfSpider produceWolfSpider = new WolfSpider(); - - @Produces public Animal makeASpider = new WolfSpider(); - - @Produces public int getWolfSpiderSize = 4; - - @Produces public Spider[] getSpiders = ALL_SPIDERS; - - @Produces public String[] getStrings = new String[0]; - - @Produces public FunnelWeaver<?> getAnotherFunnelWeaver = new FunnelWeaver<Object>(); - - @Produces public FunnelWeaver<Spider> getFunnelWeaverSpider = new FunnelWeaver<Spider>(); - - @Produces public Spider getNullSpider = null; - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Panther.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Panther.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Panther.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,18 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.ejb.Remove; -import javax.ejb.Stateful; -import javax.webbeans.Production; - -@Production -@Stateful -public class Panther -{ - - @Remove - public void remove(String foo) - { - - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Plaice.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Plaice.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Plaice.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,14 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Named; - -import org.jboss.webbeans.test.annotations.AnotherDeploymentType; -import org.jboss.webbeans.test.annotations.Whitefish; - -@AnotherDeploymentType -@Whitefish -@Named("whitefish") -public final class Plaice implements Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Plough.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Plough.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Plough.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Named; - -import org.jboss.webbeans.test.annotations.HeavyDuty; - -@HeavyDuty -@Named("plough") -public class Plough -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Pollock.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Pollock.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Pollock.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,14 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Dependent; - -import org.jboss.webbeans.test.annotations.AnimalStereotype; -import org.jboss.webbeans.test.annotations.FishStereotype; - -@AnimalStereotype -@FishStereotype -@Dependent -public class Pollock implements Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Puma.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Puma.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Puma.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,21 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.ejb.Stateful; -import javax.webbeans.Production; - -@Stateful -@Production -public class Puma -{ - - public void remove1() - { - - } - - public void remove2() - { - - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/RedSnapper.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/RedSnapper.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/RedSnapper.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.RequestScoped; - -import org.jboss.webbeans.test.annotations.FishStereotype; - -@FishStereotype -@RequestScoped -public class RedSnapper implements Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Reindeer.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Reindeer.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Reindeer.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Production; - -import org.jboss.webbeans.test.annotations.HornedMammalStereotype; - -@HornedMammalStereotype -@Production -public class Reindeer implements Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Rhinoceros.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Rhinoceros.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Rhinoceros.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import org.jboss.webbeans.test.annotations.HornedMammalStereotype; -import org.jboss.webbeans.test.annotations.MammalStereotype; - -@HornedMammalStereotype -@MammalStereotype -public class Rhinoceros implements Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/RoundWhitefish.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/RoundWhitefish.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/RoundWhitefish.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import org.jboss.webbeans.test.annotations.Expensive; -import org.jboss.webbeans.test.annotations.Whitefish; - -@Expensive(cost=60, veryExpensive=true) -@Whitefish -public class RoundWhitefish implements Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Salmon.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Salmon.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Salmon.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Named; -import javax.webbeans.Production; - -@Production -@Named -public class Salmon implements ScottishFish -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ScottishFish.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ScottishFish.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ScottishFish.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.test.beans; - -public interface ScottishFish extends Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ScottishFishFarmer.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ScottishFishFarmer.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ScottishFishFarmer.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Production; - -@Production -public class ScottishFishFarmer extends Farmer<ScottishFish> -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SeaBass.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SeaBass.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SeaBass.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; - -@Production -@RequestScoped -public class SeaBass implements Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Sheep.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Sheep.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Sheep.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,16 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Initializer; -import javax.webbeans.Production; - -@Production -public class Sheep -{ - - @Initializer - public Sheep(String foo, Double bar) - { - - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Sole.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Sole.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Sole.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,14 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Named; -import javax.webbeans.Production; - -import org.jboss.webbeans.test.annotations.Whitefish; - -@Production -@Whitefish -@Named("whitefish") -public class Sole implements ScottishFish -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Spider.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Spider.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Spider.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.beans; - -public class Spider implements Animal -{ - - public final void layEggs() - { - - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SpiderNest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SpiderNest.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SpiderNest.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,16 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Initializer; - -public class SpiderNest -{ - - public Integer numberOfSpiders; - - @Initializer - public SpiderNest(Integer numberOfSpiders) - { - this.numberOfSpiders = numberOfSpiders; - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SpiderProducer.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SpiderProducer.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SpiderProducer.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,104 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Dependent; -import javax.webbeans.Named; -import javax.webbeans.Produces; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; - -import org.jboss.webbeans.test.annotations.AnimalStereotype; -import org.jboss.webbeans.test.annotations.AnotherDeploymentType; -import org.jboss.webbeans.test.annotations.Tame; - -@AnotherDeploymentType -public class SpiderProducer -{ - - private static Spider[] ALL_SPIDERS = { new Tarantula(), new LadybirdSpider(), new DaddyLongLegs() }; - - @Produces @Tame public Tarantula produceTameTarantula() - { - return new DefangedTarantula(); - } - - @Produces public Tarantula produceTarantula() - { - return new Tarantula(); - } - - @Produces @Dependent public final TrapdoorSpider produceTrapdoorSpider() - { - return new TrapdoorSpider(); - } - - @Produces @Named("blackWidow") public BlackWidow produceBlackWidow() - { - return new BlackWidow(); - } - - @Produces @Named @RequestScoped public DaddyLongLegs produceDaddyLongLegs() - { - return new DaddyLongLegs(); - } - - @Produces @Named @Production public LadybirdSpider getLadybirdSpider() - { - return new LadybirdSpider(); - } - - @Produces @Named("Shelob") public Tarantula produceShelob() - { - return null; - } - - @Produces @AnimalStereotype public WolfSpider produceWolfSpider() - { - return new WolfSpider(); - } - - @Produces public Animal makeASpider() - { - return new WolfSpider(); - } - - @Produces public int getWolfSpiderSize() - { - return 4; - } - - @Produces public Spider[] getSpiders() - { - return ALL_SPIDERS; - } - - @Produces public String[] getStrings() - { - return new String[0]; - } - - @Produces public <T> FunnelWeaver<T> getFunnelWeaver() - { - return new FunnelWeaver<T>(); - } - - @Produces public FunnelWeaver<?> getAnotherFunnelWeaver() - { - return new FunnelWeaver<Object>(); - } - - @Produces public FunnelWeaver<Spider> getFunnelWeaverSpider() - { - return new FunnelWeaver<Spider>(); - } - - @Produces public Spider getNullSpider() - { - return null; - } - - @Produces public Spider produceSpiderFromInjection(@Tame Tarantula tarantula) - { - return tarantula; - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tarantula.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tarantula.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tarantula.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.test.beans; - -public class Tarantula extends Spider implements DeadlySpider -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TarantulaProducer.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TarantulaProducer.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TarantulaProducer.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,15 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Produces; - -import org.jboss.webbeans.test.annotations.Tame; - -public class TarantulaProducer -{ - - @Produces @Tame public Tarantula produceTameTarantula() - { - return new DefangedTarantula(); - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tiger.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tiger.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tiger.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,21 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.ejb.Remove; -import javax.ejb.Stateful; -import javax.webbeans.Production; - -import org.jboss.webbeans.test.annotations.Synchronous; - -@Production -@Stateful -@Synchronous -public class Tiger -{ - - @Remove - public void remove() - { - - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tractor.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tractor.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tractor.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Specializes; - -import org.jboss.webbeans.test.annotations.Modern; -import org.jboss.webbeans.test.annotations.Motorized; - -@Modern @Motorized @Specializes -public class Tractor extends Plough -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TrapdoorSpider.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TrapdoorSpider.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TrapdoorSpider.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.test.beans; - -public class TrapdoorSpider -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tuna.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tuna.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tuna.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,17 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.RequestScoped; - -import org.jboss.webbeans.test.annotations.AnotherDeploymentType; - -@AnotherDeploymentType -@RequestScoped -public class Tuna -{ - - public String getName() - { - return "Ophir"; - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TunaFarm.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TunaFarm.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TunaFarm.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,17 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Current; -import javax.webbeans.Production; - -@Production -public class TunaFarm -{ - - @SuppressWarnings("unused") - @Current - public Tuna tuna; - - public Tuna notInjectedTuna = new Tuna(); - - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TunedTuna.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TunedTuna.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TunedTuna.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,15 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.RequestScoped; - -import org.jboss.webbeans.test.annotations.AnotherDeploymentType; - -@AnotherDeploymentType -@RequestScoped -public class TunedTuna -{ - public String getState() - { - return "tuned"; - } -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Turkey.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Turkey.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Turkey.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,21 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Initializer; -import javax.webbeans.Production; - -@Production -public class Turkey -{ - - public Turkey() - { - - } - - @Initializer - public Turkey(String foo, Integer bar) - { - - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/WolfSpider.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/WolfSpider.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/WolfSpider.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.test.beans; - -public class WolfSpider implements Animal -{ - -} Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDescriptor.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDescriptor.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDescriptor.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -8,12 +8,12 @@ import javax.ejb.MessageDriven; import javax.ejb.Remove; +import javax.ejb.Singleton; import javax.ejb.Stateful; import javax.ejb.Stateless; import org.jboss.webbeans.ejb.spi.BusinessInterfaceDescriptor; import org.jboss.webbeans.ejb.spi.EjbDescriptor; -import org.jboss.webbeans.test.annotations.Singleton; public class MockEjbDescriptor<T> implements EjbDescriptor<T> { Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractEjbEmbeddableTest.java (from rev 1047, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractEjbEmbeddableTest.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractEjbEmbeddableTest.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractEjbEmbeddableTest.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -0,0 +1,72 @@ +package org.jboss.webbeans.test.unit; + +import java.net.URL; +import java.util.Properties; + +import javax.ejb.EJBContainer; +import javax.naming.Context; +import javax.naming.InitialContext; + +import org.testng.annotations.AfterMethod; +import org.testng.annotations.AfterSuite; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.BeforeSuite; + + + +public abstract class AbstractEjbEmbeddableTest extends AbstractTest +{ + + private EJBContainer ejbContainer; + + @AfterSuite + public void afterClass() throws Exception + { + EJBContainer current = EJBContainer.getCurrentEJBContainer(); + if(current != null) + { + current.close(); + } + } + + @BeforeSuite + public void beforeClass() throws Exception + { + Properties properties = new Properties(); + String module = getURLToTestClasses(getTestClassesPath()); + properties.setProperty(EJBContainer.EMBEDDABLE_MODULES_PROPERTY, module); + this.ejbContainer = EJBContainer.createEJBContainer(properties); + } + + @BeforeMethod + public void before() throws Exception + { + super.before(); + webBeansBootstrap.getNaming().setContext(new InitialContext()); + } + + @AfterMethod + public void after() throws Exception + { + webBeansBootstrap.getNaming().setContext(null); + } + + + protected String getTestClassesPath() + { + return "org/jboss/webbeans/test"; + } + + private static String getURLToTestClasses(String path) + { + URL url = Thread.currentThread().getContextClassLoader().getResource(path); + String s = url.toString(); + return s.substring(0, s.length() - path.length()); + } + + public Context getContext() + { + return webBeansBootstrap.getNaming().getContext(); + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractEjbEmbeddableTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractTest.java (from rev 1047, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractTest.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractTest.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractTest.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -0,0 +1,192 @@ +package org.jboss.webbeans.test.unit; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.List; + +import javax.webbeans.Production; +import javax.webbeans.Standard; + +import org.jboss.webbeans.CurrentManager; +import org.jboss.webbeans.ManagerImpl; +import org.jboss.webbeans.bean.AbstractClassBean; +import org.jboss.webbeans.bean.AbstractProducerBean; +import org.jboss.webbeans.bean.EnterpriseBean; +import org.jboss.webbeans.bean.ProducerFieldBean; +import org.jboss.webbeans.bean.ProducerMethodBean; +import org.jboss.webbeans.bean.SimpleBean; +import org.jboss.webbeans.context.DependentContext; +import org.jboss.webbeans.test.mock.MockBootstrap; +import org.jboss.webbeans.test.mock.MockEjbDescriptor; +import org.testng.annotations.BeforeMethod; + +public class AbstractTest +{ + + protected abstract static class RunInDependentContext + { + + protected void setup() + { + AbstractTest.activateDependentContext(); + } + + protected void cleanup() + { + AbstractTest.deactivateDependentContext(); + } + + public final void run() throws Exception + { + try + { + setup(); + execute(); + } + finally + { + cleanup(); + } + } + + protected abstract void execute() throws Exception; + + } + + protected static final int BUILT_IN_BEANS = 3; + + protected ManagerImpl manager; + protected MockBootstrap webBeansBootstrap; + + public static boolean visited = false; + + @BeforeMethod + public void before() throws Exception + { + webBeansBootstrap = new MockBootstrap(); + manager = webBeansBootstrap.getManager(); + manager.setEnabledDeploymentTypes(getEnabledDeploymentTypes()); + } + + private boolean hasField(Class<?> clazz, String name) + { + try + { + Field field = clazz.getDeclaredField(name); + } + catch (NoSuchFieldException e) + { + return false; + } + return true; + } + + private Method getMethod(Class<?> clazz, String name) + { + for (Method method : clazz.getDeclaredMethods()) + { + if (method.getName().equals(name)) + { + return method; + } + } + return null; + } + + protected AbstractProducerBean<?, ?> registerProducerBean(Class<?> producerBeanClass, String fieldOrMethodName, Class<?> productClass) + { + SimpleBean<?> producerContainerBean = SimpleBean.of(producerBeanClass, manager); + manager.addBean(producerContainerBean); + AbstractProducerBean<?, ?> producerBean = null; + try + { + if (hasField(producerBeanClass, fieldOrMethodName)) + { + Field producerField = producerBeanClass.getDeclaredField(fieldOrMethodName); + producerBean = ProducerFieldBean.of(producerField, producerContainerBean, manager); + } + else + { + Method producerMethod = getMethod(producerBeanClass, fieldOrMethodName); + producerBean = ProducerMethodBean.of(producerMethod, producerContainerBean, manager); + } + } + catch (Exception e) + { + throw new RuntimeException("Could not initialize producer bean", e); + } + manager.addBean(producerBean); + return producerBean; + } + + + protected <T> AbstractClassBean<T> registerBean(Class<T> clazz) + { + AbstractClassBean<T> bean = null; + if (CurrentManager.rootManager().getEjbDescriptorCache().containsKey(clazz)) + { + bean = EnterpriseBean.of(clazz, manager); + } + else + { + bean = SimpleBean.of(clazz, manager); + } + CurrentManager.rootManager().addBean(bean); + return bean; + } + + protected void registerBeans(Class<?>[] classes) + { + for (Class<?> clazz : classes) + { + registerBean(clazz); + } + } + + @SuppressWarnings("unchecked") + protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() + { + return getDefaultDeploymentTypes(); + } + + protected final List<Class<? extends Annotation>> getDefaultDeploymentTypes() + { + return Arrays.asList(Standard.class, Production.class); + } + + protected <T> void addToEjbCache(Class<T> clazz) + { + manager.getEjbDescriptorCache().add(MockEjbDescriptor.of(clazz)); + } + + protected byte[] serialize(Object instance) throws IOException + { + ByteArrayOutputStream bytes = new ByteArrayOutputStream(); + ObjectOutputStream out = new ObjectOutputStream(bytes); + out.writeObject(instance); + return bytes.toByteArray(); + } + + protected Object deserialize(byte[] bytes) throws IOException, ClassNotFoundException + { + ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes)); + return in.readObject(); + } + + protected static void activateDependentContext() + { + DependentContext.INSTANCE.setActive(true); + } + + protected static void deactivateDependentContext() + { + DependentContext.INSTANCE.setActive(false); + } +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/BoostrapTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/BoostrapTest.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/BoostrapTest.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -10,8 +10,8 @@ import org.jboss.webbeans.bean.EnterpriseBean; import org.jboss.webbeans.bean.ProducerMethodBean; import org.jboss.webbeans.bean.SimpleBean; -import org.jboss.webbeans.test.AbstractTest; import org.jboss.webbeans.test.mock.MockWebBeanDiscovery; +import org.jboss.webbeans.test.unit.AbstractTest; import org.testng.annotations.Test; public class BoostrapTest extends AbstractTest Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Synchronous.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Synchronous.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Synchronous.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -0,0 +1,21 @@ +package org.jboss.webbeans.test.unit.bootstrap; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.webbeans.BindingType; + +@Target( { TYPE, METHOD, PARAMETER }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Synchronous +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Synchronous.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Tiger.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Tiger.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Tiger.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -4,8 +4,6 @@ import javax.ejb.Stateful; import javax.webbeans.Production; -import org.jboss.webbeans.test.annotations.Synchronous; - @Production @Stateful @Synchronous Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/context/PassivatingContextTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/context/PassivatingContextTest.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/context/PassivatingContextTest.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -8,7 +8,7 @@ import org.jboss.webbeans.MetaDataCache; import org.testng.annotations.Test; -public class PassivatingContextTest extends org.jboss.webbeans.test.AbstractTest +public class PassivatingContextTest extends org.jboss.webbeans.test.unit.AbstractTest { /** Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -5,11 +5,9 @@ import javax.webbeans.RequestScoped; import org.jboss.webbeans.model.StereotypeModel; -import org.jboss.webbeans.test.AbstractTest; -import org.jboss.webbeans.test.SpecVersion; +import org.jboss.webbeans.test.unit.AbstractTest; import org.testng.annotations.Test; -@SpecVersion("20081206") public class StereotypesTest extends AbstractTest { Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/DeferredEventNotificationTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/DeferredEventNotificationTest.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/DeferredEventNotificationTest.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -1,6 +1,8 @@ package org.jboss.webbeans.test.unit.event; +import java.lang.annotation.Annotation; import java.util.Arrays; +import java.util.List; import javax.webbeans.Observes; import javax.webbeans.Standard; @@ -9,7 +11,7 @@ import org.jboss.webbeans.introspector.AnnotatedMethod; import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl; import org.jboss.webbeans.introspector.jlr.AnnotatedMethodImpl; -import org.jboss.webbeans.test.AbstractTest; +import org.jboss.webbeans.test.unit.AbstractTest; import org.testng.annotations.Test; /** @@ -28,9 +30,9 @@ } @Override - protected void addStandardDeploymentTypesForTests() + protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() { - manager.setEnabledDeploymentTypes(Arrays.asList(Standard.class, AnotherDeploymentType.class)); + return Arrays.asList(Standard.class, AnotherDeploymentType.class); } public class AnObserver Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/Tuna.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/Tuna.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/Tuna.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -2,8 +2,6 @@ import javax.webbeans.RequestScoped; -import org.jboss.webbeans.test.annotations.AnotherDeploymentType; - @AnotherDeploymentType @RequestScoped class Tuna Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -6,13 +6,11 @@ import org.jboss.webbeans.bean.EnterpriseBean; import org.jboss.webbeans.bean.NewEnterpriseBean; import org.jboss.webbeans.introspector.AnnotatedItem; -import org.jboss.webbeans.test.AbstractTest; -import org.jboss.webbeans.test.SpecVersion; +import org.jboss.webbeans.test.unit.AbstractTest; import org.jboss.webbeans.util.Proxies.TypeInfo; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -@SpecVersion("20081222") public class NewEnterpriseBeanTest extends AbstractTest { private EnterpriseBean<WrappedEnterpriseBean> wrappedEnterpriseBean; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/NewSimpleBeanTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/NewSimpleBeanTest.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/NewSimpleBeanTest.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -5,12 +5,10 @@ import org.jboss.webbeans.bean.NewSimpleBean; import org.jboss.webbeans.bean.SimpleBean; import org.jboss.webbeans.introspector.AnnotatedItem; -import org.jboss.webbeans.test.AbstractTest; -import org.jboss.webbeans.test.SpecVersion; +import org.jboss.webbeans.test.unit.AbstractTest; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -@SpecVersion("20081222") public class NewSimpleBeanTest extends AbstractTest { private SimpleBean<WrappedSimpleBean> wrappedSimpleBean; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/ResolutionByTypeTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/ResolutionByTypeTest.java 2009-01-17 20:10:04 UTC (rev 1048) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/ResolutionByTypeTest.java 2009-01-17 20:11:52 UTC (rev 1049) @@ -10,7 +10,7 @@ import org.jboss.webbeans.introspector.AnnotatedField; import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl; import org.jboss.webbeans.introspector.jlr.AnnotatedFieldImpl; -import org.jboss.webbeans.test.AbstractTest; +import org.jboss.webbeans.test.unit.AbstractTest; import org.testng.annotations.Test; public class ResolutionByTypeTest extends AbstractTest