cleanup
git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/cdi/branches/branch_for_jsf_1_2@919970 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/project/stage/ProjectStage.java b/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/project/stage/ProjectStage.java
index 9e48237..180dbca 100644
--- a/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/project/stage/ProjectStage.java
+++ b/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/project/stage/ProjectStage.java
@@ -18,11 +18,11 @@
*/
package org.apache.myfaces.extensions.cdi.core.api.project.stage;
-import org.apache.myfaces.extensions.cdi.core.api.common.qualifier.Current;
-
import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.Typed;
import java.io.Serializable;
+@Typed()
public class ProjectStage implements Serializable
{
private static final long serialVersionUID = 8372440985154139133L;
@@ -42,7 +42,6 @@
}
@Produces
- @Current
public ProjectStage createProjectStage(ProjectStageResolver projectStageResolver)
{
return new ProjectStage(projectStageResolver.getCurrentProjectStageName());
diff --git a/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/common/qualifier/Current.java b/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/StringUtils.java
similarity index 64%
copy from core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/common/qualifier/Current.java
copy to core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/StringUtils.java
index 2045e2e..da6d585 100644
--- a/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/common/qualifier/Current.java
+++ b/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/StringUtils.java
@@ -16,20 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.cdi.core.api.common.qualifier;
+package org.apache.myfaces.extensions.cdi.core.api.util;
-import javax.inject.Qualifier;
-import java.lang.annotation.Documented;
-import static java.lang.annotation.ElementType.*;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-@Qualifier
-
-@Target({TYPE, METHOD, FIELD, PARAMETER})
-@Retention(RUNTIME)
-@Documented
-public @interface Current
+public class StringUtils
{
-}
\ No newline at end of file
+ public static boolean isEmpty(String string)
+ {
+ return string == null || "".equals(string);
+ }
+}
diff --git a/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/project/stage/ApplicationProjectStageResolver.java b/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/project/stage/ApplicationProjectStageResolver.java
index 6425e41..2676aca 100644
--- a/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/project/stage/ApplicationProjectStageResolver.java
+++ b/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/project/stage/ApplicationProjectStageResolver.java
@@ -23,6 +23,7 @@
import org.apache.myfaces.extensions.cdi.core.api.project.config.InitParameterNames;
import org.apache.myfaces.extensions.cdi.core.api.project.stage.ProjectStageResolver;
import org.apache.myfaces.extensions.cdi.core.api.project.stage.ProjectStage;
+import static org.apache.myfaces.extensions.cdi.core.api.util.StringUtils.*;
import javax.inject.Inject;
@@ -45,7 +46,7 @@
{
String result = this.configManager.getValue(InitParameterNames.APPLICATION_PROJECT_STAGE);
- if (result == null || "".equals(result))
+ if (isEmpty(result))
{
return ProjectStage.DEFAULT_STAGE;
}
diff --git a/examples/hello_myfaces-codi/src/main/java/org/apache/myfaces/blank/HelloCodiBean.java b/examples/hello_myfaces-codi/src/main/java/org/apache/myfaces/blank/listener/phase/FacesDemoBean.java
similarity index 91%
rename from examples/hello_myfaces-codi/src/main/java/org/apache/myfaces/blank/HelloCodiBean.java
rename to examples/hello_myfaces-codi/src/main/java/org/apache/myfaces/blank/listener/phase/FacesDemoBean.java
index 450c210..53d8b4a 100644
--- a/examples/hello_myfaces-codi/src/main/java/org/apache/myfaces/blank/HelloCodiBean.java
+++ b/examples/hello_myfaces-codi/src/main/java/org/apache/myfaces/blank/listener/phase/FacesDemoBean.java
@@ -16,14 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.blank;
+package org.apache.myfaces.blank.listener.phase;
import org.apache.myfaces.extensions.cdi.core.api.listener.phase.annotation.View;
-import org.apache.myfaces.extensions.cdi.javaee.jsf.api.listener.phase.PhaseId;
import org.apache.myfaces.extensions.cdi.javaee.jsf.api.listener.phase.JsfLifecyclePhaseInformation;
+import org.apache.myfaces.extensions.cdi.javaee.jsf.api.listener.phase.PhaseId;
import org.apache.myfaces.extensions.cdi.javaee.jsf.api.listener.phase.annotation.AfterPhase;
import org.apache.myfaces.extensions.cdi.javaee.jsf.api.listener.phase.annotation.BeforePhase;
-import org.apache.myfaces.extensions.cdi.javaee.jsf.api.project.stage.JsfProjectStage;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.Model;
@@ -33,12 +32,9 @@
import javax.inject.Inject;
@Model
-public class HelloCodiBean
+public class FacesDemoBean
{
@Inject
- private JsfProjectStage jsfProjectStage;
-
- @Inject
private FacesContext facesContext;
@Inject
@@ -100,13 +96,8 @@
return this.text;
}
- public String getProjectStageName()
- {
- return this.jsfProjectStage.toString();
- }
-
private void addGlobalMessage(String messageText)
{
this.facesContext.addMessage(null, new FacesMessage(messageText));
}
-}
+}
\ No newline at end of file
diff --git a/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/common/qualifier/Current.java b/examples/hello_myfaces-codi/src/main/java/org/apache/myfaces/blank/project/stage/ApplicationProjectStageDemoBean.java
similarity index 64%
rename from core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/common/qualifier/Current.java
rename to examples/hello_myfaces-codi/src/main/java/org/apache/myfaces/blank/project/stage/ApplicationProjectStageDemoBean.java
index 2045e2e..c5424a0 100644
--- a/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/common/qualifier/Current.java
+++ b/examples/hello_myfaces-codi/src/main/java/org/apache/myfaces/blank/project/stage/ApplicationProjectStageDemoBean.java
@@ -16,20 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.cdi.core.api.common.qualifier;
+package org.apache.myfaces.blank.project.stage;
-import javax.inject.Qualifier;
-import java.lang.annotation.Documented;
-import static java.lang.annotation.ElementType.*;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
+import org.apache.myfaces.extensions.cdi.core.api.project.stage.ProjectStage;
-@Qualifier
+import javax.enterprise.inject.Model;
+import javax.inject.Inject;
-@Target({TYPE, METHOD, FIELD, PARAMETER})
-@Retention(RUNTIME)
-@Documented
-public @interface Current
+@Model
+public class ApplicationProjectStageDemoBean
{
+ @Inject
+ private ProjectStage projectStage;
+
+ public String getProjectStageName()
+ {
+ return this.projectStage.toString();
+ }
}
\ No newline at end of file
diff --git a/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/common/qualifier/Current.java b/examples/hello_myfaces-codi/src/main/java/org/apache/myfaces/blank/project/stage/JsfProjectStageDemoBean.java
similarity index 64%
copy from core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/common/qualifier/Current.java
copy to examples/hello_myfaces-codi/src/main/java/org/apache/myfaces/blank/project/stage/JsfProjectStageDemoBean.java
index 2045e2e..5d44875 100644
--- a/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/common/qualifier/Current.java
+++ b/examples/hello_myfaces-codi/src/main/java/org/apache/myfaces/blank/project/stage/JsfProjectStageDemoBean.java
@@ -16,20 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.cdi.core.api.common.qualifier;
+package org.apache.myfaces.blank.project.stage;
-import javax.inject.Qualifier;
-import java.lang.annotation.Documented;
-import static java.lang.annotation.ElementType.*;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
+import org.apache.myfaces.extensions.cdi.javaee.jsf.api.project.stage.JsfProjectStage;
-@Qualifier
+import javax.enterprise.inject.Model;
+import javax.inject.Inject;
-@Target({TYPE, METHOD, FIELD, PARAMETER})
-@Retention(RUNTIME)
-@Documented
-public @interface Current
+@Model
+public class JsfProjectStageDemoBean
{
+ @Inject
+ private JsfProjectStage jsfProjectStage;
+
+ public String getProjectStageName()
+ {
+ return this.jsfProjectStage.toString();
+ }
}
\ No newline at end of file
diff --git a/examples/hello_myfaces-codi/src/main/webapp/helloMyFacesCodi.jsp b/examples/hello_myfaces-codi/src/main/webapp/helloMyFacesCodi.jsp
index 6a39d08..a782839 100644
--- a/examples/hello_myfaces-codi/src/main/webapp/helloMyFacesCodi.jsp
+++ b/examples/hello_myfaces-codi/src/main/webapp/helloMyFacesCodi.jsp
@@ -26,10 +26,13 @@
<h:form id="mainForm">
<h:panelGrid columns="2">
<h:outputLabel for="txtInfo" value="Bean-value:"/>
- <h:outputText id="txtInfo" value="#{helloCodiBean.text}"/>
+ <h:outputText id="txtInfo" value="#{facesDemoBean.text}"/>
- <h:outputLabel for="txtProjctStage" value="Project stage:"/>
- <h:outputText id="txtProjctStage" value="#{helloCodiBean.projectStageName}"/>
+ <h:outputLabel for="txtAppProjctStage" value="App-Project stage:"/>
+ <h:outputText id="txtAppProjctStage" value="#{applicationProjectStageDemoBean.projectStageName}"/>
+
+ <h:outputLabel for="txtJsfProjctStage" value="Jsf-Project stage:"/>
+ <h:outputText id="txtJsfProjctStage" value="#{jsfProjectStageDemoBean.projectStageName}"/>
<h:commandButton value="send"/>
</h:panelGrid>
diff --git a/jee-modules/jsf-module/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/project/stage/JsfProjectStageBuilder.java b/jee-modules/jsf-module/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/project/stage/JsfProjectStageBuilder.java
index 215ab93..484b3ff 100644
--- a/jee-modules/jsf-module/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/project/stage/JsfProjectStageBuilder.java
+++ b/jee-modules/jsf-module/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/project/stage/JsfProjectStageBuilder.java
@@ -18,7 +18,6 @@
*/
package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.project.stage;
-import org.apache.myfaces.extensions.cdi.core.api.common.qualifier.Current;
import org.apache.myfaces.extensions.cdi.core.api.project.stage.ProjectStage;
import org.apache.myfaces.extensions.cdi.javaee.jsf.api.project.stage.JsfProjectStage;
@@ -43,7 +42,7 @@
}
@Produces
- public JsfProjectStage createJsfProjectStage(@Current ProjectStage projectStage)
+ public JsfProjectStage createJsfProjectStage(ProjectStage projectStage)
{
return new JsfProjectStageBuilder(projectStage);
}
