[webbeans-commits] Webbeans SVN: r1631 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype and 12 other directories.

Sat Feb 21 20:56:59 EST 2009

Author: pete.muir at jboss.org
Date: 2009-02-21 20:56:59 -0500 (Sat, 21 Feb 2009)
New Revision: 1631

Added:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/Goat_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedAnimalDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedMammalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/ApplicationScopedHornedMammalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/Deer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/MultipleStereotypesWithMultipleScopeTypesTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/SessionScopedHornedMammalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/nonEmptyNamed/
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/nonEmptyNamed/FallowDeer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/nonEmptyNamed/NonEmptyNamedTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypeNotImplemented/
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypeNotImplemented/Animal.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypeNotImplemented/AnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypeNotImplemented/Chair_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypeNotImplemented/RequiredTypeNotImplementedTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/Animal.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/Antelope_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/Bovine.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/HornedMammalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/Mammal.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/RequiredTypesMergedTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/scopeNotSupported/
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/scopeNotSupported/Carp_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/scopeNotSupported/RequestScopedStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/scopeNotSupported/ScopeNotSupportedTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeploymentTypes/
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeploymentTypes/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeploymentTypes/Gazelle_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeploymentTypes/StereotypeWithTooManyDeploymentTypes_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeploymentTypes/TooManyDeploymentTypesTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyScopeTypes/
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyScopeTypes/Elk_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyScopeTypes/StereotypeWithTooManyScopeTypes_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyScopeTypes/TooManyScopeTypesTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/withBindingTypes/
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/withBindingTypes/Asynchronous.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/withBindingTypes/RoeDeer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/withBindingTypes/StereoTypeWithBindingTypesTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/withBindingTypes/StereotypeWithBindingTypes_Broken.java
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/stereotype/beans.xml
Removed:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Antelope_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Asynchronous.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Bovine.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Carp_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Chair_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Deer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Elk_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/FallowDeer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Gazelle_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Goat_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Mammal.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/RoeDeer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/SessionScopedHornedMammalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeWithBindingTypes_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeWithNonEmptyNamed_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeWithTooManyDeploymentTypes_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeWithTooManyScopeTypes_Broken.java
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/defintion/stereotype/
Modified:
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Goldfish.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java
Log:
@Artifactify

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
===================================================================

--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java	2009-02-22 01:03:51 UTC (rev 1630)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -288,7 +288,7 @@
       }
       else if (possibleScopeTypes.size() > 1)
       {
-         throw new DefinitionException("All stereotypes must specify the same scope OR a scope must be specified on the bean");
+         throw new DefinitionException("All stereotypes must specify the same scope OR a scope must be specified on " + getAnnotatedItem());
       }
       else
       {

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java	2009-02-22 01:03:51 UTC (rev 1630)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -205,7 +205,7 @@
          }
          else if (scopeTypes.size() > 1)
          {
-            throw new DefinitionException("At most one scope may be specified");
+            throw new DefinitionException("At most one scope may be specified on " + getAnnotatedItem());
          }
       }
 

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java	2009-02-22 01:03:51 UTC (rev 1630)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -122,5 +122,11 @@
    {
       return false;
    }
+   
+   @Override
+   protected void checkScopeAllowed()
+   {
+      // No-op
+   }
 
 }

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java	2009-02-22 01:03:51 UTC (rev 1630)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -124,4 +124,10 @@
       return false;
    }
    
+   @Override
+   protected void checkScopeAllowed()
+   {
+      // No-op
+   }
+   
 }

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Antelope_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Antelope_Broken.java	2009-02-22 01:03:51 UTC (rev 1630)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Antelope_Broken.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -1,8 +0,0 @@
-package org.jboss.jsr299.tck.unit.definition.stereotype;
-
- at HornedMammalStereotype
- at Bovine
-class Antelope_Broken implements Mammal
-{
-   
-}

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Asynchronous.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Asynchronous.java	2009-02-22 01:03:51 UTC (rev 1630)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Asynchronous.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -1,21 +0,0 @@
-package org.jboss.jsr299.tck.unit.definition.stereotype;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.BindingType;
-
- at Target( { TYPE, METHOD, PARAMETER })
- at Retention(RUNTIME)
- at Documented
- at BindingType
- at interface Asynchronous
-{
-
-}

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Bovine.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Bovine.java	2009-02-22 01:03:51 UTC (rev 1630)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Bovine.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -1,17 +0,0 @@
-package org.jboss.jsr299.tck.unit.definition.stereotype;
-
-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.annotation.Stereotype;
-
- at Stereotype(requiredTypes=Mammal.class)
- at Target( { TYPE })
- at Retention(RUNTIME)
- at interface Bovine
-{
-
-}

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Carp_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Carp_Broken.java	2009-02-22 01:03:51 UTC (rev 1630)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Carp_Broken.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -1,7 +0,0 @@
-package org.jboss.jsr299.tck.unit.definition.stereotype;
-
- at RequestScopedAnimalStereotype
-class Carp_Broken implements Animal
-{
-
-}

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Chair_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Chair_Broken.java	2009-02-22 01:03:51 UTC (rev 1630)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Chair_Broken.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -1,7 +0,0 @@
-package org.jboss.jsr299.tck.unit.definition.stereotype;
-
- at AnimalStereotype
-class Chair_Broken
-{
-
-}

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Deer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Deer_Broken.java	2009-02-22 01:03:51 UTC (rev 1630)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Deer_Broken.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -1,8 +0,0 @@
-package org.jboss.jsr299.tck.unit.definition.stereotype;
-
- at ApplicationScopedHornedMammalStereotype
- at SessionScopedHornedMammalStereotype
-public class Deer_Broken
-{
-
-}

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Elk_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Elk_Broken.java	2009-02-22 01:03:51 UTC (rev 1630)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Elk_Broken.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -1,7 +0,0 @@
-package org.jboss.jsr299.tck.unit.definition.stereotype;
-
- at StereotypeWithTooManyScopeTypes_Broken
-class Elk_Broken
-{
-   
-}

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/FallowDeer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/FallowDeer_Broken.java	2009-02-22 01:03:51 UTC (rev 1630)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/FallowDeer_Broken.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -1,7 +0,0 @@
-package org.jboss.jsr299.tck.unit.definition.stereotype;
-
- at StereotypeWithNonEmptyNamed_Broken
-class FallowDeer_Broken
-{
-   
-}

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Gazelle_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Gazelle_Broken.java	2009-02-22 01:03:51 UTC (rev 1630)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Gazelle_Broken.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -1,7 +0,0 @@
-package org.jboss.jsr299.tck.unit.definition.stereotype;
-
- at StereotypeWithTooManyDeploymentTypes_Broken
-class Gazelle_Broken
-{
-   
-}

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Goat_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Goat_Broken.java	2009-02-22 01:03:51 UTC (rev 1630)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Goat_Broken.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -1,8 +0,0 @@
-package org.jboss.jsr299.tck.unit.definition.stereotype;
-
- at HornedMammalStereotype
- at AnotherStereotype
-class Goat_Broken
-{
-   
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Goldfish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Goldfish.java	2009-02-22 01:03:51 UTC (rev 1630)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Goldfish.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -1,12 +1,10 @@
 package org.jboss.jsr299.tck.unit.definition.stereotype;
 
 import javax.context.RequestScoped;
-import javax.inject.Production;
 
 @RequestScopedAnimalStereotype
 @RequestScoped
- at Production
 class Goldfish implements Animal
 {
-
+   
 }

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Mammal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Mammal.java	2009-02-22 01:03:51 UTC (rev 1630)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Mammal.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -1,6 +0,0 @@
-package org.jboss.jsr299.tck.unit.definition.stereotype;
-
-interface Mammal
-{
-   
-}

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/RoeDeer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/RoeDeer_Broken.java	2009-02-22 01:03:51 UTC (rev 1630)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/RoeDeer_Broken.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -1,7 +0,0 @@
-package org.jboss.jsr299.tck.unit.definition.stereotype;
-
- at StereotypeWithBindingTypes_Broken
-class RoeDeer_Broken
-{
-   
-}

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/SessionScopedHornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/SessionScopedHornedMammalStereotype.java	2009-02-22 01:03:51 UTC (rev 1630)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/SessionScopedHornedMammalStereotype.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.unit.definition.stereotype;
-
-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.annotation.Stereotype;
-import javax.context.SessionScoped;
-
- at Stereotype
- at SessionScoped
- at Target( { TYPE })
- at Retention(RUNTIME)
- at HornedAnimalDeploymentType
- at interface SessionScopedHornedMammalStereotype
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java	2009-02-22 01:03:51 UTC (rev 1630)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -1,12 +1,11 @@
 package org.jboss.jsr299.tck.unit.definition.stereotype;
 
 import java.lang.annotation.Annotation;
-import java.util.List;
 
 import javax.context.ApplicationScoped;
 import javax.context.Dependent;
 import javax.context.RequestScoped;
-import javax.inject.DefinitionException;
+import javax.inject.AnnotationLiteral;
 import javax.inject.Production;
 import javax.inject.manager.Bean;
 
@@ -14,6 +13,7 @@
 import org.hibernate.tck.annotations.SpecAssertions;
 import org.jboss.jsr299.tck.AbstractDeclarativeTest;
 import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml;
 import org.testng.annotations.Test;
 
 /**
@@ -22,23 +22,19 @@
  * 
  */
 @Artifact
+ at BeansXml("beans.xml")
 public class StereotypeDefinitionTest extends AbstractDeclarativeTest
 {
+   
+   private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {};
 
-   @Override
-   protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
-   {
-      List<Class<? extends Annotation>> deploymentTypes = super.getStandardDeploymentTypes();
-      deploymentTypes.add(AnotherDeploymentType.class);
-      deploymentTypes.add(HornedAnimalDeploymentType.class);
-      return deploymentTypes;
-   }
-
    /**
     * TODO Difficult to test since all user defined stereotypes are not known
     * here
+    * 
+    * PLM - agreed, as the spec doesn't say what exception to throw. Probably this won't be tested
     */
-   @Test(groups = { "underInvestigation", "annotationDefinition" })
+   @Test(groups = { "stub", "annotationDefinition" })
    @SpecAssertion(section = "2.7.1", id = "aa")
    public void testHasCorrectTarget()
    {
@@ -48,8 +44,10 @@
    /**
     * TODO If the stereotype does not have a stereotype annotation, then it
     * isn't one and is difficult to test
+    * 
+    * PLM - just test that a stereotype which doesn't have the annotation isn't used as such
     */
-   @Test(groups = { "underInvestigation", "annotationDefinition" })
+   @Test(groups = { "stub", "annotationDefinition" })
    @SpecAssertion(section = "2.7.1", id = "b")
    public void testHasStereotypeAnnotation()
    {
@@ -63,8 +61,8 @@
    })
    public void testStereotypeWithScopeType()
    {
-      Bean<Moose> moose = createSimpleBean(Moose.class);
-      assert moose.getScopeType().equals(RequestScoped.class);
+      assert getCurrentManager().resolveByType(Moose.class).size() == 1; 
+      assert getCurrentManager().resolveByType(Moose.class).iterator().next().getScopeType().equals(RequestScoped.class);
    }
 
    @Test
@@ -74,17 +72,15 @@
    })
    public void testStereotypeWithoutScopeType()
    {
-      Bean<Reindeer> reindeer = createSimpleBean(Reindeer.class);
-      assert reindeer.getScopeType().equals(Dependent.class);
+      assert getCurrentManager().resolveByType(Reindeer.class).size() == 1; 
+      assert getCurrentManager().resolveByType(Reindeer.class).iterator().next().getScopeType().equals(Dependent.class);
    }
 
    @Test( groups = "broken" )
    @SpecAssertion(section = "2.7.1.2", id = "a")
    public void testStereotypeWithoutInterceptors()
    {
-      deployBeans(Goldfish.class);
-      Goldfish aGoldfish = getCurrentManager().getInstanceByType(Goldfish.class);
-      assert aGoldfish != null;
+      assert false;
    }
 
    @Test(groups = { "stub", "interceptors" })
@@ -94,37 +90,6 @@
       assert false;
    }
 
-   @Test(expectedExceptions = DefinitionException.class)
-   @SpecAssertion(section = "2.7.1.1", id = "a")
-   public void testStereotypeWithTooManyScopeTypes()
-   {
-      deployBeans(Elk_Broken.class);
-   }
-
-   @Test(expectedExceptions = DefinitionException.class)
-   @SpecAssertion(section = "2.7.1.1", id = "b")
-   public void testStereotypeWithTooManyDeploymentTypes()
-   {
-      deployBeans(Gazelle_Broken.class);
-   }
-
-   @Test(expectedExceptions = DefinitionException.class)
-   @SpecAssertions({
-      @SpecAssertion(section = "2.7.1.3", id = "a"),
-      @SpecAssertion(section = "2.6.3", id = "e")
-   })
-   public void testStereotypeWithNonEmptyNamed()
-   {
-      deployBeans(FallowDeer_Broken.class);
-   }
-
-   @Test(expectedExceptions = DefinitionException.class)
-   @SpecAssertion(section = "2.7.1", id = "d")
-   public void testStereotypeWithBindingTypes()
-   {
-      deployBeans(RoeDeer_Broken.class);
-   }
-
    @Test
    @SpecAssertions({ 
       @SpecAssertion(section = "2.7.2", id = "e"), 
@@ -133,7 +98,8 @@
       })
    public void testMultipleStereotypes()
    {
-      Bean<HighlandCow> highlandCow = createSimpleBean(HighlandCow.class);
+      assert getCurrentManager().resolveByType(HighlandCow.class, TAME_LITERAL).size() == 1; 
+      Bean<HighlandCow> highlandCow = getCurrentManager().resolveByType(HighlandCow.class, TAME_LITERAL).iterator().next();
       assert highlandCow.getName() == null;
       assert highlandCow.getBindings().iterator().next().annotationType().equals(Tame.class);
       assert highlandCow.getScopeType().equals(RequestScoped.class);
@@ -145,55 +111,14 @@
       @SpecAssertion(section = "2.7.4", id = "c") })
    public void testMultipleStereotypesMergesScopes()
    {
-      Bean<Springbok> springbok = createSimpleBean(Springbok.class);
-      assert springbok.getScopeType().equals(ApplicationScoped.class);
+      assert getCurrentManager().resolveByType(Springbok.class).size() == 1; 
+      assert getCurrentManager().resolveByType(Springbok.class).iterator().next().getScopeType().equals(ApplicationScoped.class);
    }
 
-   @Test(expectedExceptions = DefinitionException.class)
-   @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"), 
-      @SpecAssertion(section = "2.7.4", id = "c") })
-   public void testMultipleStereotypesMergesRequiredTypes()
-   {
-      deployBeans(Antelope_Broken.class);
-   }
-
-   @Test(expectedExceptions = DefinitionException.class)
-   @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"), 
-      @SpecAssertion(section = "2.7.4", id = "c") })
-   public void testMultipleStereotypesWithMultipleDeploymentTypes()
-   {
-      deployBeans(Goat_Broken.class);
-   }
-
-   @Test(expectedExceptions = DefinitionException.class)
-   @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"), 
-      @SpecAssertion(section = "2.7.4", id = "c") })
-   public void testMultipleStereotypesWithMultipleScopeTypes()
-   {
-      deployBeans(Deer_Broken.class);
-   }
-
    @Test(groups = { "stub", "webbeansxml" })
    @SpecAssertion(section = "2.7.3", id = "a")
    public void testStereotypeDeclaredInXmlIgnoresJavaStereotypes()
    {
-      // Map<Class<? extends Annotation>, Annotation> cooXmlAnnotations = new
-      // HashMap<Class<? extends Annotation>, Annotation>();
-      // cooXmlAnnotations.put(HornedMammalStereotype.class, new
-      // HornedMamalStereotypeAnnotationLiteral());
-      // AnnotatedClass<HighlandCow> cooXmlAnnotatedItem = new
-      // SimpleAnnotatedClass<HighlandCow>(HighlandCow.class,
-      // cooXmlAnnotations);
-
-      /*
-       * SimpleBean<HighlandCow> coo = createSimpleBean(HighlandCow.class,
-       * cooXmlAnnotatedItem); assert
-       * coo.getDeploymentType().equals(HornedAnimalDeploymentType.class);
-       * assert coo.getScopeType().equals(RequestScoped.class); assert
-       * coo.getMergedStereotypes().getRequiredTypes().size() == 1; assert
-       * coo.getMergedStereotypes().getRequiredTypes().contains(Animal.class);
-       * assert coo.getMergedStereotypes().getSupportedScopes().size() == 0;
-       */
       assert false;
    }
 
@@ -201,21 +126,6 @@
    @SpecAssertion(section = "2.7.3", id = "a")
    public void testStereotypeDeclaredInXmlIgnoresJavaBindingTypes()
    {
-      // Map<Class<? extends Annotation>, Annotation> cooXmlAnnotations = new
-      // HashMap<Class<? extends Annotation>, Annotation>();
-      // cooXmlAnnotations.put(HornedMammalStereotype.class, new
-      // HornedMamalStereotypeAnnotationLiteral());
-      // cooXmlAnnotations.put(Synchronous.class, new
-      // SynchronousAnnotationLiteral());
-      // AnnotatedClass<HighlandCow> cooXmlAnnotatedItem = new
-      // SimpleAnnotatedClass<HighlandCow>(HighlandCow.class,
-      // cooXmlAnnotations);
-
-      /*
-       * SimpleBean<HighlandCow> coo = createSimpleBean(HighlandCow.class,
-       * cooXmlAnnotatedItem); assert coo.getBindingTypes().size() == 1; assert
-       * coo.getBindingTypes().contains(new SynchronousAnnotationLiteral());
-       */
       assert false;
 
    }
@@ -225,45 +135,33 @@
       @SpecAssertion(section = "2.7.4", id = "a") })
    public void testRequiredTypeIsImplemented()
    {
-      assert createSimpleBean(HighlandCow.class).getTypes().contains(Animal.class);
+      assert getCurrentManager().resolveByType(HighlandCow.class, TAME_LITERAL).size() == 1; 
+      assert getCurrentManager().resolveByType(HighlandCow.class, TAME_LITERAL).iterator().next().getTypes().contains(Animal.class);
    }
 
-   @Test(expectedExceptions = DefinitionException.class)
-   @SpecAssertions( { @SpecAssertion(section = "2.7.1.4", id = "b"), 
-      @SpecAssertion(section = "2.7.4", id = "a") })
-   public void testRequiredTypeIsNotImplemented()
-   {
-      deployBeans(Chair_Broken.class);
-   }
-
    @Test
    @SpecAssertions( { @SpecAssertion(section = "2.7.1.4", id = "a"), 
       @SpecAssertion(section = "2.7.4", id = "b") })
    public void testScopeIsSupported()
    {
-      assert createSimpleBean(Goldfish.class).getScopeType().equals(RequestScoped.class);
+      assert getCurrentManager().resolveByType(Goldfish.class).size() == 1; 
+      assert getCurrentManager().resolveByType(Goldfish.class).iterator().next().getScopeType().equals(RequestScoped.class);
    }
 
-   @Test(expectedExceptions = DefinitionException.class)
-   @SpecAssertions( { @SpecAssertion(section = "2.7.1.4", id = "a"), 
-      @SpecAssertion(section = "2.7.4", id = "b") })
-   public void testScopeIsNotSupported()
-   {
-      createSimpleBean(Carp_Broken.class);
-   }
-
    @Test
    @SpecAssertion(section = "4.1", id = "a")
    public void testStereotypeDeclaredInheritedIsInherited() throws Exception
    {
-      assert createSimpleBean(BorderCollie.class).getScopeType().equals(RequestScoped.class);
+      assert getCurrentManager().resolveByType(BorderCollie.class).size() == 1; 
+      assert getCurrentManager().resolveByType(BorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class);
    }
 
    @Test
    @SpecAssertion(section = "4.1", id = "a")
    public void testStereotypeNotDeclaredInheritedIsNotInherited()
    {
-      assert createSimpleBean(ShetlandPony.class).getDeploymentType().equals(Production.class);
+      assert getCurrentManager().resolveByType(ShetlandPony.class).size() == 1; 
+      assert getCurrentManager().resolveByType(ShetlandPony.class).iterator().next().getDeploymentType().equals(Production.class);
    }
 
 }

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeWithBindingTypes_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeWithBindingTypes_Broken.java	2009-02-22 01:03:51 UTC (rev 1630)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeWithBindingTypes_Broken.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -1,18 +0,0 @@
-package org.jboss.jsr299.tck.unit.definition.stereotype;
-
-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.annotation.Stereotype;
-
- at Stereotype
- at Target( { TYPE })
- at Retention(RUNTIME)
- at Asynchronous
- at interface StereotypeWithBindingTypes_Broken
-{
-
-}

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeWithNonEmptyNamed_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeWithNonEmptyNamed_Broken.java	2009-02-22 01:03:51 UTC (rev 1630)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeWithNonEmptyNamed_Broken.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -1,19 +0,0 @@
-package org.jboss.jsr299.tck.unit.definition.stereotype;
-
-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.annotation.Named;
-import javax.annotation.Stereotype;
-
- at Stereotype
- at Target( { TYPE })
- at Retention(RUNTIME)
- at Named("foo")
- at interface StereotypeWithNonEmptyNamed_Broken
-{
-
-}

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeWithTooManyDeploymentTypes_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeWithTooManyDeploymentTypes_Broken.java	2009-02-22 01:03:51 UTC (rev 1630)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeWithTooManyDeploymentTypes_Broken.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.unit.definition.stereotype;
-
-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.annotation.Stereotype;
-import javax.inject.Production;
-
- at Stereotype
- at Target( { TYPE })
- at Retention(RUNTIME)
- at Production
- at AnotherDeploymentType
- at interface StereotypeWithTooManyDeploymentTypes_Broken
-{
-
-}

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeWithTooManyScopeTypes_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeWithTooManyScopeTypes_Broken.java	2009-02-22 01:03:51 UTC (rev 1630)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeWithTooManyScopeTypes_Broken.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -1,21 +0,0 @@
-package org.jboss.jsr299.tck.unit.definition.stereotype;
-
-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.annotation.Stereotype;
-import javax.context.ApplicationScoped;
-import javax.context.RequestScoped;
-
- at Stereotype
- at Target( { TYPE })
- at Retention(RUNTIME)
- at ApplicationScoped
- at RequestScoped
- at interface StereotypeWithTooManyScopeTypes_Broken
-{
-
-}

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherDeploymentType.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherDeploymentType.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.DeploymentType;
+
+ at Target( { TYPE, METHOD })
+ at Retention(RUNTIME)
+ at Documented
+ at DeploymentType
+ at interface AnotherDeploymentType
+{
+
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherDeploymentType.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherStereotype.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherStereotype.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes;
+
+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.annotation.Stereotype;
+
+ at Stereotype
+ at Target( { TYPE, METHOD, FIELD })
+ at Retention(RUNTIME)
+ at AnotherDeploymentType
+ at interface AnotherStereotype
+{
+
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherStereotype.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/Goat_Broken.java (from rev 1628, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Goat_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/Goat_Broken.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/Goat_Broken.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes;
+
+
+ at HornedMammalStereotype
+ at AnotherStereotype
+class Goat_Broken
+{
+   
+}

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedAnimalDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedAnimalDeploymentType.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedAnimalDeploymentType.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.DeploymentType;
+
+ at Target( { TYPE, METHOD })
+ at Retention(RUNTIME)
+ at Documented
+ at DeploymentType
+ at interface HornedAnimalDeploymentType
+{
+
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedAnimalDeploymentType.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedMammalStereotype.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedMammalStereotype.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,18 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes;
+
+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.annotation.Stereotype;
+
+ at Stereotype
+ at Target( { TYPE })
+ at Retention(RUNTIME)
+ at HornedAnimalDeploymentType
+ at interface HornedMammalStereotype
+{
+
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedMammalStereotype.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,26 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+
+ at Artifact
+ at ExpectedDeploymentException(DefinitionException.class)
+public class MultipleStereotypesWithMultipleDeploymentTypesTest extends AbstractDeclarativeTest
+{
+   
+   @Test(groups="underInvestigation")
+   @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"), 
+      @SpecAssertion(section = "2.7.4", id = "c") })
+   public void testMultipleStereotypesWithMultipleDeploymentTypes()
+   {
+      assert false;
+   }
+   
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/ApplicationScopedHornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/ApplicationScopedHornedMammalStereotype.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/ApplicationScopedHornedMammalStereotype.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,19 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.multipleStereotypesWithMultipleScopeTypes;
+
+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.annotation.Stereotype;
+import javax.context.ApplicationScoped;
+
+ at ApplicationScoped
+ at Stereotype
+ at Target( { TYPE })
+ at Retention(RUNTIME)
+ at interface ApplicationScopedHornedMammalStereotype
+{
+
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/ApplicationScopedHornedMammalStereotype.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/Deer_Broken.java (from rev 1628, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Deer_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/Deer_Broken.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/Deer_Broken.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.multipleStereotypesWithMultipleScopeTypes;
+
+
+ at ApplicationScopedHornedMammalStereotype
+ at SessionScopedHornedMammalStereotype
+public class Deer_Broken
+{
+
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/Deer_Broken.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/MultipleStereotypesWithMultipleScopeTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/MultipleStereotypesWithMultipleScopeTypesTest.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/MultipleStereotypesWithMultipleScopeTypesTest.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,26 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.multipleStereotypesWithMultipleScopeTypes;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at ExpectedDeploymentException(DefinitionException.class)
+public class MultipleStereotypesWithMultipleScopeTypesTest extends AbstractDeclarativeTest
+{
+
+   @Test
+   @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"), 
+      @SpecAssertion(section = "2.7.4", id = "c") })
+   public void testMultipleStereotypesWithMultipleScopeTypes()
+   {
+      assert false;
+   }
+   
+}
+


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/MultipleStereotypesWithMultipleScopeTypesTest.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/SessionScopedHornedMammalStereotype.java (from rev 1628, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/SessionScopedHornedMammalStereotype.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/SessionScopedHornedMammalStereotype.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/SessionScopedHornedMammalStereotype.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,19 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.multipleStereotypesWithMultipleScopeTypes;
+
+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.annotation.Stereotype;
+import javax.context.SessionScoped;
+
+ at Stereotype
+ at SessionScoped
+ at Target( { TYPE })
+ at Retention(RUNTIME)
+ at interface SessionScopedHornedMammalStereotype
+{
+
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/SessionScopedHornedMammalStereotype.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/nonEmptyNamed/FallowDeer_Broken.java (from rev 1628, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/FallowDeer_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/nonEmptyNamed/FallowDeer_Broken.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/nonEmptyNamed/FallowDeer_Broken.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.nonEmptyNamed;
+
+
+ at StereotypeWithNonEmptyNamed_Broken
+class FallowDeer_Broken
+{
+   
+}

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/nonEmptyNamed/NonEmptyNamedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/nonEmptyNamed/NonEmptyNamedTest.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/nonEmptyNamed/NonEmptyNamedTest.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,28 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.nonEmptyNamed;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at ExpectedDeploymentException(DefinitionException.class)
+public class NonEmptyNamedTest extends AbstractDeclarativeTest
+{
+   
+
+   @Test
+   @SpecAssertions({
+      @SpecAssertion(section = "2.7.1.3", id = "a"),
+      @SpecAssertion(section = "2.6.3", id = "e")
+   })
+   public void testStereotypeWithNonEmptyNamed()
+   {
+      assert false;
+   }
+   
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/nonEmptyNamed/NonEmptyNamedTest.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java (from rev 1628, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeWithNonEmptyNamed_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,19 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.nonEmptyNamed;
+
+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.annotation.Named;
+import javax.annotation.Stereotype;
+
+ at Stereotype
+ at Target( { TYPE })
+ at Retention(RUNTIME)
+ at Named("foo")
+ at interface StereotypeWithNonEmptyNamed_Broken
+{
+
+}

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypeNotImplemented/Animal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypeNotImplemented/Animal.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypeNotImplemented/Animal.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.requiredTypeNotImplemented;
+
+interface Animal
+{
+
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypeNotImplemented/Animal.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypeNotImplemented/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypeNotImplemented/AnimalStereotype.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypeNotImplemented/AnimalStereotype.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,23 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.requiredTypeNotImplemented;
+
+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.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.annotation.Stereotype;
+import javax.context.RequestScoped;
+
+ at Stereotype(requiredTypes=Animal.class)
+ at Target( { TYPE, METHOD, FIELD })
+ at Retention(RUNTIME)
+ at RequestScoped
+ at Inherited
+ at interface AnimalStereotype
+{
+
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypeNotImplemented/AnimalStereotype.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypeNotImplemented/Chair_Broken.java (from rev 1628, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Chair_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypeNotImplemented/Chair_Broken.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypeNotImplemented/Chair_Broken.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.requiredTypeNotImplemented;
+
+
+ at AnimalStereotype
+class Chair_Broken
+{
+
+}

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypeNotImplemented/RequiredTypeNotImplementedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypeNotImplemented/RequiredTypeNotImplementedTest.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypeNotImplemented/RequiredTypeNotImplementedTest.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,25 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.requiredTypeNotImplemented;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at ExpectedDeploymentException(DefinitionException.class)
+public class RequiredTypeNotImplementedTest extends AbstractDeclarativeTest
+{
+ 
+   @Test
+   @SpecAssertions( { @SpecAssertion(section = "2.7.1.4", id = "b"), 
+      @SpecAssertion(section = "2.7.4", id = "a") })
+   public void testRequiredTypeIsNotImplemented()
+   {
+      assert false;
+   }
+   
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypeNotImplemented/RequiredTypeNotImplementedTest.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/Animal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/Animal.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/Animal.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.requiredTypesMerged;
+
+interface Animal
+{
+
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/Animal.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/Antelope_Broken.java (from rev 1628, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Antelope_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/Antelope_Broken.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/Antelope_Broken.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.requiredTypesMerged;
+
+
+ at HornedMammalStereotype
+ at Bovine
+class Antelope_Broken implements Mammal
+{
+   
+}

Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/Bovine.java (from rev 1628, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Bovine.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/Bovine.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/Bovine.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,18 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.requiredTypesMerged;
+
+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.annotation.Stereotype;
+
+
+ at Stereotype(requiredTypes=Mammal.class)
+ at Target( { TYPE })
+ at Retention(RUNTIME)
+ at interface Bovine
+{
+
+}

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/HornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/HornedMammalStereotype.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/HornedMammalStereotype.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,17 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.requiredTypesMerged;
+
+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.annotation.Stereotype;
+
+ at Stereotype(requiredTypes=Animal.class)
+ at Target( { TYPE })
+ at Retention(RUNTIME)
+ at interface HornedMammalStereotype
+{
+
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/HornedMammalStereotype.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/Mammal.java (from rev 1628, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Mammal.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/Mammal.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/Mammal.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.requiredTypesMerged;
+
+interface Mammal
+{
+   
+}

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/RequiredTypesMergedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/RequiredTypesMergedTest.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/RequiredTypesMergedTest.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,25 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.requiredTypesMerged;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at ExpectedDeploymentException(DefinitionException.class)
+public class RequiredTypesMergedTest extends AbstractDeclarativeTest
+{
+   
+   @Test
+   @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"), 
+      @SpecAssertion(section = "2.7.4", id = "c") })
+   public void testMultipleStereotypesMergesRequiredTypes()
+   {
+      assert false;
+   }
+   
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/RequiredTypesMergedTest.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/scopeNotSupported/Carp_Broken.java (from rev 1628, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Carp_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/scopeNotSupported/Carp_Broken.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/scopeNotSupported/Carp_Broken.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.scopeNotSupported;
+
+
+ at RequestScopedStereotype
+class Carp_Broken
+{
+
+}

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/scopeNotSupported/RequestScopedStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/scopeNotSupported/RequestScopedStereotype.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/scopeNotSupported/RequestScopedStereotype.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,18 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.scopeNotSupported;
+
+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.annotation.Stereotype;
+import javax.context.RequestScoped;
+
+ at Stereotype(supportedScopes=RequestScoped.class)
+ at Target( { TYPE })
+ at Retention(RUNTIME)
+ at interface RequestScopedStereotype
+{
+
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/scopeNotSupported/RequestScopedStereotype.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/scopeNotSupported/ScopeNotSupportedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/scopeNotSupported/ScopeNotSupportedTest.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/scopeNotSupported/ScopeNotSupportedTest.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,26 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.scopeNotSupported;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at ExpectedDeploymentException(DefinitionException.class)
+public class ScopeNotSupportedTest extends AbstractDeclarativeTest
+{
+   
+
+   @Test
+   @SpecAssertions( { @SpecAssertion(section = "2.7.1.4", id = "a"), 
+      @SpecAssertion(section = "2.7.4", id = "b") })
+   public void testScopeIsNotSupported()
+   {
+      assert false;
+   }
+   
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/scopeNotSupported/ScopeNotSupportedTest.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java	2009-02-22 01:03:51 UTC (rev 1630)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -20,10 +20,10 @@
 public class TooManyDeployElementsTest
 {
    
-   @Test @SpecAssertion(section = "2.5.5", id = "e")
+   @Test(groups="underInvestigation") @SpecAssertion(section = "2.5.5", id = "e")
    public void testTooManyDeployElements()
    {
-      
+      assert false;
    }
    
 }

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeploymentTypes/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeploymentTypes/AnotherDeploymentType.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeploymentTypes/AnotherDeploymentType.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.tooManyDeploymentTypes;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.DeploymentType;
+
+ at Target( { TYPE, METHOD })
+ at Retention(RUNTIME)
+ at Documented
+ at DeploymentType
+ at interface AnotherDeploymentType
+{
+
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeploymentTypes/AnotherDeploymentType.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeploymentTypes/Gazelle_Broken.java (from rev 1628, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Gazelle_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeploymentTypes/Gazelle_Broken.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeploymentTypes/Gazelle_Broken.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.tooManyDeploymentTypes;
+
+
+ at StereotypeWithTooManyDeploymentTypes_Broken
+class Gazelle_Broken
+{
+   
+}

Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeploymentTypes/StereotypeWithTooManyDeploymentTypes_Broken.java (from rev 1628, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeWithTooManyDeploymentTypes_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeploymentTypes/StereotypeWithTooManyDeploymentTypes_Broken.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeploymentTypes/StereotypeWithTooManyDeploymentTypes_Broken.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.tooManyDeploymentTypes;
+
+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.annotation.Stereotype;
+import javax.inject.Production;
+
+ at Stereotype
+ at Target( { TYPE })
+ at Retention(RUNTIME)
+ at Production
+ at AnotherDeploymentType
+ at interface StereotypeWithTooManyDeploymentTypes_Broken
+{
+
+}

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeploymentTypes/TooManyDeploymentTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeploymentTypes/TooManyDeploymentTypesTest.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeploymentTypes/TooManyDeploymentTypesTest.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,24 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.tooManyDeploymentTypes;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at ExpectedDeploymentException(DefinitionException.class)
+public class TooManyDeploymentTypesTest extends AbstractDeclarativeTest
+{
+   
+
+   @Test
+   @SpecAssertion(section = "2.7.1.1", id = "b")
+   public void testStereotypeWithTooManyDeploymentTypes()
+   {
+      assert false;
+   }
+   
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeploymentTypes/TooManyDeploymentTypesTest.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyScopeTypes/Elk_Broken.java (from rev 1628, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Elk_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyScopeTypes/Elk_Broken.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyScopeTypes/Elk_Broken.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.tooManyScopeTypes;
+
+
+ at StereotypeWithTooManyScopeTypes_Broken
+class Elk_Broken
+{
+   
+}

Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyScopeTypes/StereotypeWithTooManyScopeTypes_Broken.java (from rev 1628, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeWithTooManyScopeTypes_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyScopeTypes/StereotypeWithTooManyScopeTypes_Broken.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyScopeTypes/StereotypeWithTooManyScopeTypes_Broken.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.tooManyScopeTypes;
+
+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.annotation.Stereotype;
+import javax.context.ApplicationScoped;
+import javax.context.RequestScoped;
+
+ at Stereotype
+ at Target( { TYPE })
+ at Retention(RUNTIME)
+ at ApplicationScoped
+ at RequestScoped
+ at interface StereotypeWithTooManyScopeTypes_Broken
+{
+
+}

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyScopeTypes/TooManyScopeTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyScopeTypes/TooManyScopeTypesTest.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyScopeTypes/TooManyScopeTypesTest.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,24 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.tooManyScopeTypes;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at ExpectedDeploymentException(DefinitionException.class)
+public class TooManyScopeTypesTest extends AbstractDeclarativeTest
+{
+   
+
+   @Test
+   @SpecAssertion(section = "2.7.1.1", id = "a")
+   public void testStereotypeWithTooManyScopeTypes()
+   {
+      assert false;
+   }
+   
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyScopeTypes/TooManyScopeTypesTest.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/withBindingTypes/Asynchronous.java (from rev 1628, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Asynchronous.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/withBindingTypes/Asynchronous.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/withBindingTypes/Asynchronous.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.withBindingTypes;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.BindingType;
+
+ at Target( { TYPE, METHOD, PARAMETER })
+ at Retention(RUNTIME)
+ at Documented
+ at BindingType
+ at interface Asynchronous
+{
+
+}

Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/withBindingTypes/RoeDeer_Broken.java (from rev 1628, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/RoeDeer_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/withBindingTypes/RoeDeer_Broken.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/withBindingTypes/RoeDeer_Broken.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.withBindingTypes;
+
+
+ at StereotypeWithBindingTypes_Broken
+class RoeDeer_Broken
+{
+   
+}

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/withBindingTypes/StereoTypeWithBindingTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/withBindingTypes/StereoTypeWithBindingTypesTest.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/withBindingTypes/StereoTypeWithBindingTypesTest.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,24 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.withBindingTypes;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at ExpectedDeploymentException(DefinitionException.class)
+public class StereoTypeWithBindingTypesTest extends AbstractDeclarativeTest
+{
+   
+
+   @Test
+   @SpecAssertion(section = "2.7.1", id = "d")
+   public void testStereotypeWithBindingTypes()
+   {
+      assert false;
+   }
+   
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/withBindingTypes/StereoTypeWithBindingTypesTest.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/withBindingTypes/StereotypeWithBindingTypes_Broken.java (from rev 1628, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeWithBindingTypes_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/withBindingTypes/StereotypeWithBindingTypes_Broken.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/withBindingTypes/StereotypeWithBindingTypes_Broken.java	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,19 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.withBindingTypes;
+
+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.annotation.Stereotype;
+
+
+ at Stereotype
+ at Target( { TYPE })
+ at Retention(RUNTIME)
+ at Asynchronous
+ at interface StereotypeWithBindingTypes_Broken
+{
+
+}

Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/stereotype/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/stereotype/beans.xml	                        (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/stereotype/beans.xml	2009-02-22 01:56:59 UTC (rev 1631)
@@ -0,0 +1,9 @@
+<Beans xmlns="urn:java:ee"
+       xmlns:test="urn:java:org.jboss.jsr299.tck.unit.definition.stereotype"> 
+   <Deploy>
+      <Standard />
+      <Production />
+      <test:AnotherDeploymentType />
+      <test:HornedAnimalDeploymentType />
+   </Deploy>
+</Beans>


Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/stereotype/beans.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain


