svn commit: r1072966 - /myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageProducer.java

[st...@apache.org]

Author: struberg
Date: Mon Feb 21 13:54:19 2011
New Revision: 1072966

URL: http://svn.apache.org/viewvc?rev=1072966&view=rev
Log:
EXTCDI-143 check java:comp/env/jsf/ProjectStage

Modified:
    myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageProducer.java

Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageProducer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageProducer.java?rev=1072966&r1=1072965&r2=1072966&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageProducer.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageProducer.java Mon Feb 21 13:54:19 2011
@@ -176,7 +176,8 @@ public class ProjectStageProducer implem
      */
     protected ProjectStage resolveProjectStage()
     {
-         //we have to use a string here
+        // we first try to resolve the JSF standard configuration settings.
+        // this is needed to comply with the JSF spec if JSF is used
         String stageName = CodiUtils.lookupFromEnvironment("javax.faces.PROJECT_STAGE", String.class);
 
         if (stageName == null)
@@ -186,9 +187,17 @@ public class ProjectStageProducer implem
 
         if (stageName == null)
         {
+            // oki, try to get it from JNDI
+            stageName = CodiUtils.lookupFromEnvironment("java:comp/env/jsf/ProjectStage", String.class);
+        }
+
+        // If JSF wasn't used we lookup the codi specific ProjectStage settings
+        if (stageName == null)
+        {
             stageName = CodiUtils.lookupFromEnvironment("ProjectStage", String.class);
         }
 
+
         if (stageName != null)
         {
             return ProjectStage.valueOf(stageName);