Issue #2 use CDI annotations instead of soon-to-be-deprecated JSF ann…

…otations
TheCoder4eu · May 30, 2015 · c6894b2 · c6894b2
1 parent 224ab68
commit c6894b2
Show file tree

Hide file tree

Showing 16 changed files with 321 additions and 314 deletions.
diff --git a/pom.xml b/pom.xml
diff --git a/src/main/java/net/bootsfaces/demo/BarcodeBean.java b/src/main/java/net/bootsfaces/demo/BarcodeBean.java
@@ -16,15 +16,15 @@
  */
 package net.bootsfaces.demo;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.faces.view.ViewScoped;
+import javax.inject.Named;
 
 /**
  * This bean is used by the PrimeFaces barcode demo.
  * @author Stephan Rauh, http://www.beyondjava.net
  */
 @ViewScoped
-@ManagedBean
+@Named
 public class BarcodeBean {
 	private String code39 = "1234567890128";
 	private String protocol = "http://";

diff --git a/src/main/java/net/bootsfaces/demo/CarBean.java b/src/main/java/net/bootsfaces/demo/CarBean.java
@@ -17,14 +17,14 @@
 
 package net.bootsfaces.demo;
 
-import javax.faces.bean.ManagedBean;
+import javax.inject.Named;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
 /** A simple bean for demo purposes. */
-@javax.faces.bean.RequestScoped
-@ManagedBean
+@javax.enterprise.context.RequestScoped
+@Named
 public class CarBean {
 	@NotNull
 	private String brand=null;

diff --git a/src/main/java/net/bootsfaces/demo/ClockBean.java b/src/main/java/net/bootsfaces/demo/ClockBean.java
@@ -6,18 +6,16 @@
 
 import java.io.Serializable;
 import java.util.Calendar;
-import java.util.Date;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
-import javax.validation.constraints.Size;
 
 /**
  * @author Stephan Rauh, http://www.beyondjava.net
  */
-@ManagedBean
+@Named
 @RequestScoped
 public class ClockBean implements Serializable {
 	private static final long serialVersionUID = 5497787734011747081L;

diff --git a/src/main/java/net/bootsfaces/demo/DateBean.java b/src/main/java/net/bootsfaces/demo/DateBean.java
@@ -5,17 +5,19 @@
 
 import java.io.Serializable;
 import java.util.Date;
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.RequestScoped;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
 
 /**
  *
  * @author TheCoder4eu
  */
-@ManagedBean(name = "dateBean")
+@Named
 @RequestScoped
 public class DateBean implements Serializable {
-    private Date adate;
+	private static final long serialVersionUID = -7642332089180105956L;
+	private Date adate;
     private Date bdate;
     private Date cdate;
     private Date ddate;

diff --git a/src/main/java/net/bootsfaces/demo/InformBean.java b/src/main/java/net/bootsfaces/demo/InformBean.java
@@ -5,17 +5,19 @@
  */
 
 import java.io.Serializable;
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.RequestScoped;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
 
 /**
  *
  * @author TheCoder4eu
  */
-@ManagedBean
+@Named
 @RequestScoped
 public class InformBean implements Serializable {
-    private String firstname;
+	private static final long serialVersionUID = 3776366707374123185L;
+	private String firstname;
     private String familyname;
 
     public String getFirstname() {

diff --git a/src/main/java/net/bootsfaces/demo/ItemBean.java b/src/main/java/net/bootsfaces/demo/ItemBean.java
@@ -1,20 +1,15 @@
 package net.bootsfaces.demo;
 
-/**
- * Managed Bean for Items
- * @author Thecoder4.eu
- */
-
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 import javax.faces.model.ArrayDataModel;
 import javax.faces.model.DataModel;
+import javax.inject.Named;
 
 /**
  * Data Model Bean for Items
  * @author Thecoder4.eu
  */
-@ManagedBean
+@Named
 @RequestScoped
 public class ItemBean {
 

diff --git a/src/main/java/net/bootsfaces/demo/LoremIpsumBean.java b/src/main/java/net/bootsfaces/demo/LoremIpsumBean.java
@@ -6,16 +6,17 @@
  */
 
 import java.util.StringTokenizer;
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.RequestScoped;
+
+import javax.enterprise.context.RequestScoped;
 import javax.faces.model.ArrayDataModel;
 import javax.faces.model.DataModel;
+import javax.inject.Named;
 
 /**
  * Data Model Bean for Items
  * @author Thecoder4.eu
  */
-@ManagedBean
+@Named
 @RequestScoped
 public class LoremIpsumBean {
 

diff --git a/src/main/java/net/bootsfaces/demo/PollDemoBean.java b/src/main/java/net/bootsfaces/demo/PollDemoBean.java
@@ -3,11 +3,11 @@
 import java.util.Date;
 
 import javax.enterprise.context.RequestScoped;
-import javax.faces.bean.ManagedBean;
 import javax.faces.event.ActionEvent;
+import javax.inject.Named;
 
 @RequestScoped
-@ManagedBean
+@Named
 public class PollDemoBean {
 
 	private int counter=0;

diff --git a/src/main/java/net/bootsfaces/demo/SemaphoreBean.java b/src/main/java/net/bootsfaces/demo/SemaphoreBean.java
@@ -22,12 +22,12 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.faces.bean.ManagedBean;
+import javax.inject.Named;
 import javax.validation.constraints.NotNull;
 
 /** A simple bean for demo purposes. */
-@javax.faces.bean.RequestScoped
-@ManagedBean
+@javax.enterprise.context.RequestScoped
+@Named
 public class SemaphoreBean {
 	@NotNull
 	private String color = null;

diff --git a/src/main/java/net/bootsfaces/demo/SettingsBean.java b/src/main/java/net/bootsfaces/demo/SettingsBean.java
@@ -17,12 +17,12 @@
 
 package net.bootsfaces.demo;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
 
 /** A simple bean for demo purposes. */
 @RequestScoped
-@ManagedBean
+@Named
 public class SettingsBean {
 	private int value1;
 	private int value2;

diff --git a/src/main/java/net/bootsfaces/demo/TestBean.java b/src/main/java/net/bootsfaces/demo/TestBean.java
@@ -5,17 +5,19 @@
  */
 
 import java.io.Serializable;
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.RequestScoped;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
 
 /**
  *
  * @author TheCoder4eu
  */
-@ManagedBean(name = "testBean")
+@Named
 @RequestScoped
 public class TestBean implements Serializable {
-    private int val1=78;
+	private static final long serialVersionUID = -332002335165889800L;
+	private int val1=78;
     private int val2=87;
     private int val3=34;
     private int val4=43;

diff --git a/src/main/java/net/bootsfaces/issues/issue78/SoccerTeamBean.java b/src/main/java/net/bootsfaces/issues/issue78/SoccerTeamBean.java
@@ -4,11 +4,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
 import javax.faces.event.ComponentSystemEvent;
+import javax.faces.view.ViewScoped;
+import javax.inject.Named;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class SoccerTeamBean implements Serializable {
     private static final long serialVersionUID = 1L;

diff --git a/src/main/java/org/primefaces/showcase/view/input/CalendarView.java b/src/main/java/org/primefaces/showcase/view/input/CalendarView.java
@@ -2,14 +2,15 @@
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+
 import javax.faces.application.FacesMessage;
-import javax.faces.bean.ManagedBean;
 import javax.faces.context.FacesContext;
-
+import javax.inject.Named;
+
 import org.primefaces.context.RequestContext;
 import org.primefaces.event.SelectEvent;
 
-@ManagedBean
+@Named
 public class CalendarView {
 
     private Date date1;

diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
@@ -6,6 +6,11 @@
         <!--param-value>Production</param-value -->
         <param-value>Development</param-value>
     </context-param>
+    <!-- deactivate the magic of AngularFaces which would prevent us from rendering BootsFaces messages -->
+    <context-param>
+    	<param-name>clientSideMessages</param-name>
+    	<param-value>false</param-value>
+    </context-param>
     <!-- The BootsFaces_USETHEME context-param controls the loading of the bootstrap-theme.css -->
     <!-- The default is false, when set to true the bootstrap-theme.css will be loaded -->
     <context-param>

diff --git a/src/main/webapp/applayout/navbartop.xhtml b/src/main/webapp/applayout/navbartop.xhtml
@@ -36,6 +36,7 @@
                 <b:navLink value="Check box" outcome="/forms/checkBox" />
                 <b:navLink value="Combobox (SelectOneMenu)" outcome="/forms/selectOneMenu" />
                 <b:navLink value="Poll" outcome="/forms/poll" iconAwesome="refresh" />
+                <b:navLink value="Messages" outcome="/forms/messages" iconAwesome="refresh" />
             </b:dropMenu>
             <b:dropMenu value="Bootstrap Widgets">
                 <b:navLink value="Alerts" outcome="/bootstrap/alerts" icon="warning-sign" />