svn commit: r786291 - in /incubator/openwebbeans/trunk/webbeans-impl/src: main/java/org/apache/webbeans/util/ test/java/org/apache/webbeans/test/component/decorator/broken/ test/java/org/apache/webbeans/test/component/decorator/clean/

[ge...@apache.org]

Author: gerdogdu
Date: Thu Jun 18 21:21:26 2009
New Revision: 786291

URL: http://svn.apache.org/viewvc?rev=786291&view=rev
Log:
Update for @Any

Modified:
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/broken/PaymentDecorator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/LargeTransactionDecorator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/ServiceDecorator.java

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=786291&r1=786290&r2=786291&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Thu Jun 18 21:21:26 2009
@@ -1410,7 +1410,15 @@
 
         return beans;
     }
-
+    
+    /**
+     * Stereotype runtime requirements are dropped from the specification.
+     * 
+     * @param component
+     * @param anns
+     * @param errorMessage
+     * @deprecated
+     */
     public static void checkSteroTypeRequirements(Component<?> component, Annotation[] anns, String errorMessage)
     {
         Set<Class<? extends Annotation>> allSupportedScopes = new HashSet<Class<? extends Annotation>>();

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/broken/PaymentDecorator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/broken/PaymentDecorator.java?rev=786291&r1=786290&r2=786291&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/broken/PaymentDecorator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/broken/PaymentDecorator.java Thu Jun 18 21:21:26 2009
@@ -16,6 +16,7 @@
 import javax.decorator.Decorates;
 import javax.decorator.Decorator;
 import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Any;
 
 import org.apache.webbeans.test.annotation.binding.Check;
 import org.apache.webbeans.test.component.IPayment;
@@ -24,8 +25,7 @@
 @RequestScoped
 public class PaymentDecorator implements IPayment
 {
-    @Decorates
-    @Check(type = "CHECK")
+    @Decorates @Any @Check(type = "CHECK")
     IPayment delegate;
 
     public String pay()

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/LargeTransactionDecorator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/LargeTransactionDecorator.java?rev=786291&r1=786290&r2=786291&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/LargeTransactionDecorator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/LargeTransactionDecorator.java Thu Jun 18 21:21:26 2009
@@ -18,14 +18,14 @@
 import javax.decorator.Decorates;
 import javax.decorator.Decorator;
 import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Any;
 import javax.enterprise.inject.Current;
 
 @Decorator
 @RequestScoped
 public abstract class LargeTransactionDecorator implements Account
 {
-    @Decorates
-    @Current
+    @Decorates @Any @Current
     Account account;
 
     BigDecimal depositeAmount = null;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/ServiceDecorator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/ServiceDecorator.java?rev=786291&r1=786290&r2=786291&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/ServiceDecorator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/ServiceDecorator.java Thu Jun 18 21:21:26 2009
@@ -16,6 +16,7 @@
 import javax.decorator.Decorates;
 import javax.decorator.Decorator;
 import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Any;
 import javax.enterprise.inject.Current;
 import javax.enterprise.inject.Named;
 
@@ -28,8 +29,7 @@
 @Current
 public abstract class ServiceDecorator implements IService
 {
-    @Decorates
-    @Binding1
+    @Decorates @Any @Binding1
     IService delegate;
 
     private String delegateAttr = null;