diff --git a/pom.xml b/pom.xml index 665b7b78..f4d93bc0 100644 --- a/pom.xml +++ b/pom.xml @@ -1,268 +1,268 @@ - 4.0.0 - net.bootsfaces - BootsFacesWeb - 0.6.7 - BootsFacesWeb - war - Documentation page of BootsFaces - http://www.bootsfaces.net - - - GNU General Public License (GPL) version 3.0 - http://www.gnu.org/licenses/gpl-3.0.txt - - - - - BootsFaces Team - bootsfaces@thecoder4.eu - TheCoder4EU - http://www.thecoder4.eu/ - - - Stephan Rauh - webmaster1@beyondjava.de - BeyondJava.net - http://www.beyondjava.net - - - - scm:git:git@github.com:TheCoder4eu/BootsFacesWeb.git - scm:git:git@github.com:TheCoder4eu/BootsFacesWeb.git - git@github.com:TheCoder4eu/BootsFacesWeb.git - - - UTF-8 - 1.7 - 1.7 - 1.7 - 1.7 - - - - javax.el - javax.el-api - 3.0.0 - provided - - - javax.servlet - javax.servlet-api - 3.1.0 - provided - - - net.bootsfaces - bootsfaces - 0.6.7-SNAPSHOT - compile - - - de.beyondjava - angularFaces-core - 2.1.4 - - - - org.primefaces - primefaces - 5.1 - compile - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - 2.5.0 - - - net.sf.barcode4j - barcode4j-light - 2.0 - - - net.glxn - qrgen - 1.4 - - - com.google.zxing - core - 3.1.0 - - - com.google.zxing - javase - 3.1.0 - - - org.omnifaces - omnifaces - 1.10 - compile - - - - - Mojarra 2.2.10 - - true - - - - com.sun.faces - jsf-api - 2.2.11 - compile - - - com.sun.faces - jsf-impl - 2.2.11 - runtime - - - - - MyFaces 2.2.7 - - false - - - - org.apache.myfaces.core - myfaces-api - 2.2.7 - compile - - - org.apache.myfaces.core - myfaces-impl - 2.2.7 - runtime - - - - - Maven Central - - false - - - - com.sun.faces - jsf-api - 2.2.10 - provided - - - com.sun.faces - jsf-impl - 2.2.10 - provided - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - false - - 2.9.1 - - - attach-javadocs - - jar - - - - - - - - - - - - - web - META-INF/resources/bsf/css - - - - - maven-compiler-plugin - 3.1 - - - - - - - default-compile - - true - true - - ${maven.compiler.target} - ${maven.compiler.source} - - - - - default-testCompile - - true - true - - ${maven.compiler.testTarget} - ${maven.compiler.testSource} - - - - - - - org.apache.maven.plugins - maven-war-plugin - 2.5 - - - - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + net.bootsfaces + BootsFacesWeb + 0.6.7 + BootsFacesWeb + war + Documentation page of BootsFaces + http://www.bootsfaces.net + + + GNU General Public License (GPL) version 3.0 + http://www.gnu.org/licenses/gpl-3.0.txt + + + + + BootsFaces Team + bootsfaces@thecoder4.eu + TheCoder4EU + http://www.thecoder4.eu/ + + + Stephan Rauh + webmaster1@beyondjava.de + BeyondJava.net + http://www.beyondjava.net + + + + scm:git:git@github.com:TheCoder4eu/BootsFacesWeb.git + scm:git:git@github.com:TheCoder4eu/BootsFacesWeb.git + git@github.com:TheCoder4eu/BootsFacesWeb.git + + + UTF-8 + 1.7 + 1.7 + 1.7 + 1.7 + + + + javax.el + javax.el-api + 3.0.0 + provided + + + javax.servlet + javax.servlet-api + 3.1.0 + provided + + + net.bootsfaces + bootsfaces + 0.6.7-SNAPSHOT + compile + + + de.beyondjava + angularFaces-core + 2.1.4 + + + + org.primefaces + primefaces + 5.1 + compile + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + 2.5.0 + + + net.sf.barcode4j + barcode4j-light + 2.0 + + + net.glxn + qrgen + 1.4 + + + com.google.zxing + core + 3.1.0 + + + com.google.zxing + javase + 3.1.0 + + + org.omnifaces + omnifaces + 1.10 + compile + + + javax.enterprise + cdi-api + 1.2 + + + + + Mojarra 2.2.10 + + true + + + + com.sun.faces + jsf-api + 2.2.11 + compile + + + com.sun.faces + jsf-impl + 2.2.11 + runtime + + + + + MyFaces 2.2.7 + + false + + + + org.apache.myfaces.core + myfaces-api + 2.2.7 + compile + + + org.apache.myfaces.core + myfaces-impl + 2.2.7 + runtime + + + + + Maven Central + + false + + + + com.sun.faces + jsf-api + 2.2.10 + provided + + + com.sun.faces + jsf-impl + 2.2.10 + provided + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + false + + 2.9.1 + + + attach-javadocs + + jar + + + + + + + + + + + + + web + META-INF/resources/bsf/css + + + + + maven-compiler-plugin + 3.1 + + + + + + + default-compile + + true + true + + ${maven.compiler.target} + ${maven.compiler.source} + + + + + default-testCompile + + true + true + + ${maven.compiler.testTarget} + ${maven.compiler.testSource} + + + + + + + org.apache.maven.plugins + maven-war-plugin + 2.5 + + + + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + \ No newline at end of file diff --git a/src/main/java/net/bootsfaces/demo/BarcodeBean.java b/src/main/java/net/bootsfaces/demo/BarcodeBean.java index 821c9b8d..44ca80b9 100644 --- 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 index 4418a8bd..a9d54f29 100644 --- 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 index 606e3d7e..bd4b0417 100644 --- 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 index 46e50985..82c7f84a 100644 --- 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 index 43e0d3e4..e31ba4d2 100644 --- 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 index df3c6f0f..82c9630a 100644 --- 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 index 76f6e0c3..a0c31741 100644 --- 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 index 10c54ba8..d2964f50 100644 --- 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 index 0730a188..97a7e2d9 100644 --- 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 index fe107f79..c0dc33c8 100644 --- 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 index 669647ee..8fcce7d4 100644 --- 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 index d30d281a..8b8e2f2f 100644 --- 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 index f2b7cabe..9af44690 100644 --- 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 index 11e44d51..df8468e2 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -6,6 +6,11 @@ Development + + + clientSideMessages + false + diff --git a/src/main/webapp/applayout/navbartop.xhtml b/src/main/webapp/applayout/navbartop.xhtml index b250452b..57acbd9f 100644 --- a/src/main/webapp/applayout/navbartop.xhtml +++ b/src/main/webapp/applayout/navbartop.xhtml @@ -36,6 +36,7 @@ +