issue #2 reverted @nAmed because CDI is not activated in the project

TheCoder4eu · May 30, 2015 · 1bed5b6 · 1bed5b6
1 parent c6894b2
commit 1bed5b6
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 43 deletions.
diff --git a/pom.xml b/pom.xml
@@ -62,14 +62,14 @@
 		<dependency>
 			<groupId>de.beyondjava</groupId>
 			<artifactId>angularFaces-core</artifactId>
-			<version>2.1.4</version>
+			<version>2.1.5</version>
 		</dependency>
 		<!-- coming soon: <dependency> <groupId>de.beyondjava</groupId> <artifactId>angularFaces-widgets</artifactId> 
 			<version>2.2.0-SNAPSHOT</version> </dependency> -->
 		<dependency>
 			<groupId>org.primefaces</groupId>
 			<artifactId>primefaces</artifactId>
-			<version>5.1</version>
+			<version>5.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -103,11 +103,6 @@
 			<version>1.10</version>
 			<scope>compile</scope>
 		</dependency>
-		<dependency>
-			<groupId>javax.enterprise</groupId>
-			<artifactId>cdi-api</artifactId>
-			<version>1.2</version>
-		</dependency>
 	</dependencies>
 	<profiles>
 		<profile>

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.view.ViewScoped;
-import javax.inject.Named;
 
 /**
  * This bean is used by the PrimeFaces barcode demo.
  * @author Stephan Rauh, http://www.beyondjava.net
  */
 @ViewScoped
-@Named
+@ManagedBean
 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,15 @@
 
 package net.bootsfaces.demo;
 
-import javax.inject.Named;
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.RequestScoped;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
 /** A simple bean for demo purposes. */
-@javax.enterprise.context.RequestScoped
-@Named
+@RequestScoped
+@ManagedBean
 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
@@ -7,15 +7,15 @@
 import java.io.Serializable;
 import java.util.Calendar;
 
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.RequestScoped;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 
 /**
  * @author Stephan Rauh, http://www.beyondjava.net
  */
-@Named
+@ManagedBean
 @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
@@ -6,14 +6,14 @@
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.RequestScoped;
 
 /**
  *
  * @author TheCoder4eu
  */
-@Named
+@ManagedBean
 @RequestScoped
 public class DateBean implements Serializable {
 	private static final long serialVersionUID = -7642332089180105956L;

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

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

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

diff --git a/src/main/java/net/bootsfaces/demo/PollDemoBean.java b/src/main/java/net/bootsfaces/demo/PollDemoBean.java
@@ -2,12 +2,12 @@
 
 import java.util.Date;
 
-import javax.enterprise.context.RequestScoped;
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.RequestScoped;
 import javax.faces.event.ActionEvent;
-import javax.inject.Named;
 
 @RequestScoped
-@Named
+@ManagedBean
 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,13 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.inject.Named;
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.RequestScoped;
 import javax.validation.constraints.NotNull;
 
 /** A simple bean for demo purposes. */
-@javax.enterprise.context.RequestScoped
-@Named
+@RequestScoped
+@ManagedBean
 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.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.RequestScoped;
 
 /** A simple bean for demo purposes. */
 @RequestScoped
-@Named
+@ManagedBean
 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
@@ -6,14 +6,14 @@
 
 import java.io.Serializable;
 
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.RequestScoped;
 
 /**
  *
  * @author TheCoder4eu
  */
-@Named
+@ManagedBean
 @RequestScoped
 public class TestBean implements Serializable {
 	private static final long serialVersionUID = -332002335165889800L;

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.event.ComponentSystemEvent;
 import javax.faces.view.ViewScoped;
-import javax.inject.Named;
 
-@Named
+@ManagedBean
 @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
@@ -4,13 +4,13 @@
 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;
 
-@Named
+@ManagedBean
 public class CalendarView {
 
     private Date date1;