Merge pull request #1 from juanjmerono/jsfupdate

Jsfupdate
juanjmerono · Feb 13, 2017 · 63fb74e · 63fb74e
2 parents b934b75 + eb0aa9e
commit 63fb74e
Show file tree

Hide file tree

Showing 43 changed files with 677 additions and 94 deletions.
diff --git a/README.md b/README.md
@@ -17,22 +17,35 @@ This a sample tool with JSF 1.2 technology using RichFaces (3.3.3.Final) and Pri
 ![](https://raw.githubusercontent.com/juanjmerono/sakai-jsf2/master/images/classic-rich.jpg)
 ![](https://raw.githubusercontent.com/juanjmerono/sakai-jsf2/master/images/classic-prime.jpg)
 
+For testing retrocompatibility.
+
+KickRoster Ice (beta)
+======================
+
+This a sample tool with JSF 2.2 technology using IceFaces (4.1.1).
+
+![](https://raw.githubusercontent.com/juanjmerono/sakai-jsf2/master/images/new-ice.jpg)
+
+Warning: This is under development, IceFaces seems to be not compatible with Sakai so far.
+
 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)
 
+RichFaces EOL https://developer.jboss.org/wiki/RichFacesEnd-Of-LifeQuestionsAnswers
 
 Future Work
 ==============
 
-Upgrading JSF libraries to a more recent ones.
+- Create a more ambitious application, using the most powerful features of latest versions of jsf.
+
diff --git a/images/classic-prime.jpg b/images/classic-prime.jpg
diff --git a/images/classic-rich.jpg b/images/classic-rich.jpg
diff --git a/images/new-ice.jpg b/images/new-ice.jpg
diff --git a/images/new-prime.jpg b/images/new-prime.jpg
diff --git a/images/new-rich.jpg b/images/new-rich.jpg
diff --git a/kickroster-classic/pom.xml b/kickroster-classic/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<name>Sakai JSF1.2 TOOL</name>
+	<name>Sakai JSF1.2 TOOL RichFaces and PrimeFaces</name>
 	<groupId>org.sakaiproject.jsfext</groupId>
 	<artifactId>kickroster-classic</artifactId>
 	<version>1.0</version>

diff --git a/kickroster-classic/src/main/java/demo/RosterBean.java b/kickroster-classic/src/main/java/demo/RosterBean.java
@@ -7,13 +7,14 @@
 import java.util.List;
 import java.util.Set;
 
+import javax.faces.context.FacesContext;
 import javax.faces.model.SelectItem;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.richfaces.VersionBean;
 import org.richfaces.model.selection.Selection;
 import org.sakaiproject.authz.api.Member;
-import org.sakaiproject.exception.IdUnusedException;
 import org.sakaiproject.site.api.Group;
 import org.sakaiproject.site.api.Site;
 import org.sakaiproject.site.api.SiteService;
@@ -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() + " RichFaces: " + VersionBean._version._versionInfo + " PrimeFaces: 1.1";
+	}
+
 	public List<Participant> getDataModel() {
 		List<Participant> users = new ArrayList<Participant>();
 		try {

diff --git 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
@@ -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
@@ -5,7 +5,7 @@
 	xmlns:p="http://primefaces.prime.com.tr/ui"
 	template="/templates/pftemplate.xhtml">
 
-	<ui:define name="pageHeader"><h:outputText value="#{msgs.title}"/></ui:define>
+	<ui:define name="pageHeader"><h:outputText value="#{msgs.title}: #{rosterBean.version}"/></ui:define>
 
 	<ui:define name="body">
 		<h:outputText value="#{msgs.mainTitle}"/>

diff --git 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">
 
-	<ui:define name="pageHeader"><h:outputText value="#{msgs.title}"/></ui:define>
+	<ui:define name="pageHeader"><h:outputText value="#{msgs.title}: #{rosterBean.version}"/></ui:define>
 
 	<ui:define name="body">
 		<script type="text/javascript">

diff --git a/kickroster-ice/.gitignore b/kickroster-ice/.gitignore
@@ -0,0 +1,6 @@
+/target/
+/.metadata/
+/.settings/
+/.classpath
+/.project
+/target/
diff --git a/kickroster-ice/pom.xml b/kickroster-ice/pom.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<name>Sakai JSF2.2 TOOL IceFaces</name>
+	<groupId>org.sakaiproject.jsfext</groupId>
+	<artifactId>kickroster-ice</artifactId>
+	<version>1.0</version>
+	<organization>
+		<name>Universidad de Murcia</name>
+		<url>http://www.um.es/</url>
+	</organization>
+	<inceptionYear>2010</inceptionYear>
+	<description>JSF2.2 Web Application</description>
+	<packaging>war</packaging>
+
+	<!-- the base is parent -->
+	<parent>
+		<groupId>org.sakaiproject</groupId>
+		<artifactId>master</artifactId>
+		<version>12-SNAPSHOT</version>
+		<relativePath>../master/pom.xml</relativePath>
+	</parent>
+
+	<properties>
+		<org.mojarra.version>2.2.14</org.mojarra.version>
+		<org.icefaces.version>4.1.1</org.icefaces.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.sakaiproject.kernel</groupId>
+			<artifactId>sakai-kernel-util</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-codec</groupId>
+					<artifactId>commons-codec</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.sakaiproject.kernel</groupId>
+			<artifactId>sakai-kernel-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.sakaiproject.kernel</groupId>
+			<artifactId>sakai-component-manager</artifactId>
+		</dependency>
+		<!-- Faces Implementation -->
+		<dependency>
+			<groupId>org.glassfish</groupId>
+			<artifactId>javax.faces</artifactId>
+			<version>${org.mojarra.version}</version>
+		</dependency>
+		<!-- Icefaces Version -->
+		<dependency>
+		    <groupId>org.icefaces</groupId>
+		    <artifactId>icefaces</artifactId>
+		    <version>${org.icefaces.version}</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.icefaces</groupId>
+		    <artifactId>icefaces-ace</artifactId>
+		    <version>${org.icefaces.version}</version>
+		</dependency>
+			<!-- Sakai JSF -->
+			<dependency>
+				<groupId>org.sakaiproject.jsf</groupId>
+				<artifactId>jsf-app</artifactId>
+				<version>${sakai.version}</version>
+				<classifier>jsf2</classifier>
+				<exclusions>
+					<exclusion>
+						<groupId>javax.faces</groupId>
+						<artifactId>javax.faces-api</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>javax.faces</groupId>
+						<artifactId>jsf-api</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>javax.faces</groupId>
+						<artifactId>jsf-impl</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<dependency>
+				<groupId>org.sakaiproject.jsf</groupId>
+				<artifactId>jsf-tool</artifactId>
+				<version>${sakai.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>commons-codec</groupId>
+						<artifactId>commons-codec</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<dependency>
+				<groupId>org.sakaiproject.jsf</groupId>
+				<artifactId>jsf-widgets-sun-depend</artifactId>
+				<version>${sakai.version}</version>
+				<type>pom</type>
+				<exclusions>
+					<exclusion>
+						<groupId>javax.faces</groupId>
+						<artifactId>jsf-api</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>javax.faces</groupId>
+						<artifactId>jsf-impl</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+		</dependencies>
+
+	<build>
+		<finalName>kickroster-ice</finalName>
+		<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+		<resources>
+			<resource>
+				<directory>${basedir}/src/main/bundle</directory>
+				<includes>
+					<include>**/*.properties</include>
+				</includes>
+			</resource>
+			<resource>
+				<directory>${basedir}/src/main/resources</directory>
+				<includes>
+					<include>**/*.*</include>
+				</includes>
+			</resource>
+		</resources>
+	</build>
+
+</project>