svn commit: r958775 - in /myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api: manager/BeanManagerProvider.java projectstage/ProjectStage.java

[st...@apache.org]

Author: struberg
Date: Mon Jun 28 22:59:25 2010
New Revision: 958775

URL: http://svn.apache.org/viewvc?rev=958775&view=rev
Log:
EXTCDI-25 fix AmbiguousResolutionException in ProjectStage

Modified:
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/manager/BeanManagerProvider.java
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/ProjectStage.java

Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/manager/BeanManagerProvider.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/manager/BeanManagerProvider.java?rev=958775&r1=958774&r2=958775&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/manager/BeanManagerProvider.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/manager/BeanManagerProvider.java Mon Jun 28 22:59:25 2010
@@ -34,8 +34,6 @@ import javax.enterprise.inject.spi.Exten
  * <pre>
  * BeanManager bm = BeanManagerProvider.getInstance().getBeanManager();
  * </pre>
- *
- * <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
  */
 public class BeanManagerProvider implements Extension
 {

Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/ProjectStage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/ProjectStage.java?rev=958775&r1=958774&r2=958775&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/ProjectStage.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/ProjectStage.java Mon Jun 28 22:59:25 2010
@@ -18,6 +18,7 @@
  */
 package org.apache.myfaces.extensions.cdi.core.api.projectstage;
 
+import javax.enterprise.inject.Typed;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -91,8 +92,8 @@ import java.util.logging.Logger;
    if (myOwnPs.equals(MyOwnProjectStage.MyOwnProjectStage)) ... 
  * </pre>
  *
- * <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
  */
+@Typed()
 public abstract class ProjectStage implements Serializable
 {
     private static final long serialVersionUID = 1L;
@@ -182,32 +183,38 @@ public abstract class ProjectStage imple
     }
 
 
+    @Typed()
     public static final class CUnitTest extends ProjectStage
     {
     };
     public static final CUnitTest UnitTest = new CUnitTest();
 
 
+    @Typed()
     public static final class CDevelopment extends ProjectStage
     {
     };
     public static final CDevelopment Development = new CDevelopment();
 
+    @Typed()
     public static final class CSystemTest extends ProjectStage
     {
     };
     public static final CSystemTest SystemTest = new CSystemTest();
 
+    @Typed()
     public static final class CIntegrationTest extends ProjectStage
     {
     };
     public static final CIntegrationTest IntegrationTest = new CIntegrationTest();
 
+    @Typed()
     public static final class CStaging extends ProjectStage
     {
     };
     public static final CStaging Staging = new CStaging();
 
+    @Typed()
     public static final class CProduction extends ProjectStage
     {
     };