From dfa209059b9ae8809faaa09730c644bb64a7e672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Jose=20Mero=C3=B1o=20S=C3=A1nchez?= Date: Mon, 13 Feb 2017 14:46:09 +0100 Subject: [PATCH 1/7] RichFaces update to last stable version in maven repo. --- kickroster-rich/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kickroster-rich/pom.xml b/kickroster-rich/pom.xml index 36119fb..d192331 100644 --- a/kickroster-rich/pom.xml +++ b/kickroster-rich/pom.xml @@ -48,7 +48,7 @@ - 4.3.0.Final + 4.3.7.Final From 43b270ebbb56710a4140e80e95db0bfe6beff3ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Jose=20Mero=C3=B1o=20S=C3=A1nchez?= Date: Mon, 13 Feb 2017 15:23:30 +0100 Subject: [PATCH 2/7] Update jsf versions. --- README.md | 4 +- .../src/main/java/demo/RosterBean.java | 5 ++ .../main/resources/demo/messages.properties | 2 +- .../resources/demo/messages_es.properties | 2 +- .../src/webapp/pages/pflist.xhtml | 2 +- .../src/webapp/pages/rflist.xhtml | 2 +- kickroster-prime/.gitignore | 1 + kickroster-prime/pom.xml | 74 +++++-------------- .../src/main/java/demo/RosterBean.java | 4 + .../main/resources/demo/messages.properties | 2 +- .../resources/demo/messages_es.properties | 2 +- kickroster-prime/src/webapp/pages/index.xhtml | 2 +- .../src/webapp/pages/lindex.xhtml | 2 +- .../src/main/java/demo/RosterBean.java | 4 + .../main/resources/demo/messages.properties | 2 +- .../resources/demo/messages_es.properties | 2 +- kickroster-rich/src/webapp/pages/index.xhtml | 2 +- kickroster-rich/src/webapp/pages/lindex.xhtml | 2 +- 18 files changed, 47 insertions(+), 69 deletions(-) diff --git a/README.md b/README.md index 0b3fcb4..91810a8 100644 --- a/README.md +++ b/README.md @@ -20,14 +20,14 @@ This a sample tool with JSF 1.2 technology using RichFaces (3.3.3.Final) and Pri KickRoster Prime ==================== -This a sample tool with JSF 2.0 technology using PrimeFaces (3.5). +This a sample tool with JSF 2.2 technology using PrimeFaces (6.0). ![](https://raw.githubusercontent.com/juanjmerono/sakai-jsf2/master/images/new-prime.jpg) KickRoster Rich ==================== -This a sample tool with JSF 2.0 technology using RichFaces (4.3.0.Final). +This a sample tool with JSF 2.1 technology using RichFaces (4.3.7.Final). ![](https://raw.githubusercontent.com/juanjmerono/sakai-jsf2/master/images/new-rich.jpg) diff --git a/kickroster-classic/src/main/java/demo/RosterBean.java b/kickroster-classic/src/main/java/demo/RosterBean.java index bd1d6a0..9a501d8 100644 --- a/kickroster-classic/src/main/java/demo/RosterBean.java +++ b/kickroster-classic/src/main/java/demo/RosterBean.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Set; +import javax.faces.context.FacesContext; import javax.faces.model.SelectItem; import org.apache.commons.logging.Log; @@ -46,6 +47,10 @@ public class RosterBean { public void setSiteService(SiteService siteService) { this.siteService = siteService; } public void setToolManager(ToolManager toolManager) { this.toolManager = toolManager; } + public String getVersion() { + return FacesContext.class.getPackage().getImplementationVersion(); + } + public List getDataModel() { List users = new ArrayList(); try { diff --git a/kickroster-classic/src/main/resources/demo/messages.properties b/kickroster-classic/src/main/resources/demo/messages.properties index 56195aa..07d7b81 100644 --- a/kickroster-classic/src/main/resources/demo/messages.properties +++ b/kickroster-classic/src/main/resources/demo/messages.properties @@ -1,4 +1,4 @@ -title=JSF 1.2 Tool +title=JSF mainTitle=Roster Application showPrime=Show with PrimeFaces showRich=Show with RichFaces diff --git a/kickroster-classic/src/main/resources/demo/messages_es.properties b/kickroster-classic/src/main/resources/demo/messages_es.properties index 4c76942..323a893 100644 --- a/kickroster-classic/src/main/resources/demo/messages_es.properties +++ b/kickroster-classic/src/main/resources/demo/messages_es.properties @@ -1,4 +1,4 @@ -title=JSF 1.2 Tool +title=JSF mainTitle=Aplicacion Orla showPrime=Mostrar con PrimeFaces showRich=Mostrar con RichFaces diff --git a/kickroster-classic/src/webapp/pages/pflist.xhtml b/kickroster-classic/src/webapp/pages/pflist.xhtml index baad695..9864224 100644 --- a/kickroster-classic/src/webapp/pages/pflist.xhtml +++ b/kickroster-classic/src/webapp/pages/pflist.xhtml @@ -5,7 +5,7 @@ xmlns:p="http://primefaces.prime.com.tr/ui" template="/templates/pftemplate.xhtml"> - + diff --git a/kickroster-classic/src/webapp/pages/rflist.xhtml b/kickroster-classic/src/webapp/pages/rflist.xhtml index bce8ae0..ca01bfd 100644 --- a/kickroster-classic/src/webapp/pages/rflist.xhtml +++ b/kickroster-classic/src/webapp/pages/rflist.xhtml @@ -5,7 +5,7 @@ xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich" template="/templates/rftemplate.xhtml"> - +