Update Exampres for BootsFaces 2.0.0, Bumb Gradle Wrapper to v8.5. Fi…

…x Maven Build to run the examples in a runnable Jar. Update README.
TheCoder4eu · Jan 7, 2024 · e494287 · e494287
1 parent 3714704
commit e494287
Show file tree

Hide file tree

Showing 17 changed files with 95 additions and 77 deletions.
diff --git a/README.md b/README.md
@@ -1,2 +1,15 @@
 # BootsFaces-examples
 Examples for the BootsFaces Project
+
+Build the WAR with Gradle
+=========================
+./gradlew clean war
+
+
+To build and run Bootable Jar
+=============================
+
+* To build: `mvn package`
+* To run: `mvn wildfly-jar:run`
+* Access the application: `http://127.0.0.1:8080/
+
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 Riccardo Massera (TheCoder4.Eu)
+ * Copyright 2014-2024 Riccardo Massera (TheCoder4.Eu)
  *
  * This file is part of BootsFaces.
  *
@@ -22,15 +22,15 @@ plugins {
     id 'war'
 }
 
-//apply plugin: 'java'
-//apply plugin: 'war'
-
 // BootsFaces Library Version to use in the Build
-ext.BootsFacesVersion = '1.6.0-SNAPSHOT'
+ext.BootsFacesVersion = '2.0.0-SNAPSHOT'
 
-sourceCompatibility = '1.8'
-targetCompatibility = '1.8'
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
+}
 
 repositories {
     mavenLocal()
@@ -49,19 +49,10 @@ dependencies {
     // They have been removed and superseded by implementation in Gradle 7.0+. 
     // see https://docs.gradle.org/6.8.3/userguide/java_plugin.html
     //testCompile group: 'junit', name: 'junit', version: '4.10'
-    //providedCompile 'javax.enterprise:cdi-api:1.2'
-    implementation 'javax.enterprise:cdi-api:1.2'
-    implementation 'javax.servlet:servlet-api:3.+'
-    implementation 'com.sun.faces:jsf-api:2.2.+'
-    implementation 'com.sun.faces:jsf-impl:2.2.+'
-    implementation 'org.glassfish.web:el-impl:2.2'
-    implementation 'javax.validation:validation-api:1.0.0.GA'
-
+    implementation 'jakarta.platform:jakarta.jakartaee-web-api:10.0.0'
     implementation "net.bootsfaces:bootsfaces:${BootsFacesVersion}" 
-    //compile "net.bootsfaces:bootsfaces:${BootsFacesVersion}" //1.5.0-SNAPSHOT"
 }
 war {
    archiveFileName = 'Examples.war'
-   //archiveName = 'Examples.war' // Removed in Gradle 7.0+
    //classpath fileTree(dir: 'bsflib', include: '*') // adds a file-set to the WEB-INF/lib dir.
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/pom.xml b/pom.xml
@@ -5,49 +5,63 @@
 
     <groupId>net.bootsfaces</groupId>
     <artifactId>bsfexamples</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <name>BootsFaces Examples bootable jar</name>
 
     <properties>
-        <version.bootable.jar>2.0.1.Final</version.bootable.jar>
-        <version.wildfly>21.0.0.Final</version.wildfly>
+        <version.bootable.jar>10.0.0.Final</version.bootable.jar>
+        <version.wildfly>30.0.1.Final</version.wildfly>
         <plugin.fork.embedded>true</plugin.fork.embedded>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <failOnMissingWebXml>false</failOnMissingWebXml>
-        <version.microprofile.bom>${version.wildfly}</version.microprofile.bom>
-        <version.server.bom>${version.wildfly}</version.server.bom>
+	<failOnMissingWebXml>false</failOnMissingWebXml>
+	<version.org.jboss.shrinkwrap.shrinkwrap>1.2.6</version.org.jboss.shrinkwrap.shrinkwrap>
+        <!-- version.microprofile.bom>${version.wildfly}</version.microprofile.bom>
+        <version.server.bom>${version.wildfly}</version.server.bom -->
     </properties>
 
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>jakarta.platform</groupId>
                 <artifactId>jakarta.jakartaee-api</artifactId>
-                <version>8.0.0</version>
+                <version>10.0.0</version>
                 <scope>provided</scope>
-            </dependency>
+	    </dependency>
 
-            <!-- importing the jakartaee8-with-tools BOM adds specs and other useful artifacts as managed dependencies -->
+	    <dependency>
+                <groupId>org.jboss.shrinkwrap</groupId>
+                <artifactId>shrinkwrap-api</artifactId>
+                <version>${version.org.jboss.shrinkwrap.shrinkwrap}</version>
+	    </dependency>
+
+            <dependency>
+                <groupId>org.jboss.shrinkwrap</groupId>
+                <artifactId>shrinkwrap-impl-base</artifactId>
+                <version>${version.org.jboss.shrinkwrap.shrinkwrap}</version>
+	    </dependency>
+
+
+            <!-- OBSOLETE importing the jakartaee8-with-tools BOM adds specs and other useful artifacts as managed dependencies 
             <dependency>
                 <groupId>org.wildfly.bom</groupId>
-                <artifactId>wildfly-jakartaee8</artifactId>
+                <artifactId>wildfly-jakartaee10</artifactId>
                 <version>${version.server.bom}</version>
                 <type>pom</type>
                 <scope>import</scope>
-            </dependency>
+	    </dependency> -->
         </dependencies>
     </dependencyManagement>
 
     <dependencies>
         <dependency>
                 <groupId>net.bootsfaces</groupId>
                 <artifactId>bootsfaces</artifactId>
-                <version>1.5.0</version>
+                <version>2.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>jakarta.platform</groupId>

diff --git a/src/main/java/net/bootsfaces/demo/CarBean.java b/src/main/java/net/bootsfaces/demo/CarBean.java
@@ -18,15 +18,15 @@
 package net.bootsfaces.demo;
 
 import java.io.Serializable;
-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;
+import jakarta.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 /** A simple bean for demo purposes. */
 @RequestScoped
-@ManagedBean
+ @Named
 public class CarBean implements Serializable {
 	@NotNull
 	private String brand=null;

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.faces.bean.ManagedBean;
-import javax.faces.bean.RequestScoped;
+import jakarta.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
 
 /**
  *
  * @author TheCoder4eu
  */
-@ManagedBean
+ @Named
 @RequestScoped
 public class DateBean implements Serializable {
 	private static final long serialVersionUID = -7642332089180105956L;

diff --git a/src/main/java/net/bootsfaces/demo/DefaultValuesBean.java b/src/main/java/net/bootsfaces/demo/DefaultValuesBean.java
@@ -2,10 +2,10 @@
 
 import java.io.Serializable;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.SessionScoped;
+import jakarta.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
 
-@ManagedBean
+ @Named
 @SessionScoped
 public class DefaultValuesBean implements Serializable {
 	private static final long serialVersionUID = 1L;

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

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

diff --git a/src/main/java/net/bootsfaces/demo/NavLinkBean.java b/src/main/java/net/bootsfaces/demo/NavLinkBean.java
@@ -2,11 +2,11 @@
 
 import java.io.Serializable;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import jakarta.inject.Named;
+import jakarta.faces.view.ViewScoped;
 
 @ViewScoped
-@ManagedBean
+ @Named
 public class NavLinkBean implements Serializable {
 	private static final long serialVersionUID = 1L;
 

diff --git a/src/main/java/net/bootsfaces/demo/TestBean.java b/src/main/java/net/bootsfaces/demo/TestBean.java
@@ -6,15 +6,15 @@
 
 import java.io.Serializable;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.SessionScoped;
-import javax.faces.event.ActionEvent;
+import jakarta.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.event.ActionEvent;
 
 /**
  *
  * @author TheCoder4eu
  */
-@ManagedBean
+ @Named
 @SessionScoped
 public class TestBean implements Serializable {
 	private static final long serialVersionUID = -332002335165889800L;

diff --git a/src/main/java/net/bootsfaces/demo/UserBean.java b/src/main/java/net/bootsfaces/demo/UserBean.java
@@ -1,10 +1,10 @@
 package net.bootsfaces.demo;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.RequestScoped;
-import javax.validation.constraints.Size;
+import jakarta.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.validation.constraints.Size;
 
-@ManagedBean
+ @Named
 @RequestScoped
 public class UserBean {
 	@Size(min=1, max=10)

diff --git a/src/main/java/net/bootsfaces/examples/VersionsBean.java b/src/main/java/net/bootsfaces/examples/VersionsBean.java
@@ -1,15 +1,15 @@
 package net.bootsfaces.examples;
 
-import javax.faces.bean.ApplicationScoped;
-import javax.faces.bean.ManagedBean;
-import javax.faces.context.FacesContext;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
+import jakarta.faces.context.FacesContext;
 
 import net.bootsfaces.listeners.AddResourcesListener;
 
 /**
  * ManagedBean which holds the version numbers of used frameworks.
  */
-@ManagedBean(name="versions")
+@Named(value = "versions")
 @ApplicationScoped
 public class VersionsBean {
 	private final static String bsfVersion,

diff --git a/src/main/java/net/bootsfaces/themes/Theme.java b/src/main/java/net/bootsfaces/themes/Theme.java
@@ -2,10 +2,10 @@
 
 import java.io.Serializable;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.SessionScoped;
+import jakarta.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
 
-@ManagedBean
+ @Named
 @SessionScoped
 public class Theme implements Serializable {
 	private static final long serialVersionUID = 1L;

diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
     <context-param>
-        <param-name>javax.faces.PROJECT_STAGE</param-name>
+        <param-name>jakarta.faces.PROJECT_STAGE</param-name>
         <param-value>Production</param-value>
     </context-param>
 
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet-mapping>

diff --git a/src/main/webapp/applayout/navbarbottom.xhtml b/src/main/webapp/applayout/navbarbottom.xhtml
@@ -5,8 +5,8 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:b="http://bootsfaces.net/ui">
 
-    <b:navBar brand="&copy;2013-2018 TheCoder4Eu" brandHref="http://www.thecoder4.eu/" fixed="bottom">
-        <p class="navbar-text pull-right"><a href="https://showcase.bootsfaces.net/privacy.jsf">Privacy</a> - <h:outputText value="BootsFaces #{versions.bsfVersion} on Mojarra 2.2.12, PrimeFaces 5.3, AngularFaces 2.1.10 and OmniFaces 1.11" /></p>
+    <b:navBar brand="&copy;2013-2024 TheCoder4Eu" brandHref="http://www.thecoder4.eu/" fixed="bottom">
+        <p class="navbar-text pull-right"><a href="https://showcase.bootsfaces.net/privacy.jsf">Privacy</a> - <h:outputText value="BootsFaces #{versions.bsfVersion} running with Jakarta 10 and JSF 4.0" /></p>
         <!-- p class="navbar-text pull-right"><h:outputText value="BootsFaces v1.0.1-OSP on Mojarra 2.2.12, PrimeFaces 5.3, AngularFaces 2.1.10 and OmniFaces 1.11" /></p -->
     </b:navBar>
 </ui:fragment>
diff --git a/src/main/webapp/applayout/pageTemplate.xhtml b/src/main/webapp/applayout/pageTemplate.xhtml
@@ -65,7 +65,7 @@
         <script>
         if ($.blockUI) {
           $.blockUI.defaults.overlayCSS.opacity=0;
-          $.blockUI.defaults.message='<h1><img src="../javax.faces.resource/images/waitcursor.gif.jsf?ln=bsf" /></h1>';
+          $.blockUI.defaults.message='<h1><img src="../jakarta.faces.resource/images/waitcursor.gif.jsf?ln=bsf" /></h1>';
         }
         </script>         
         <ui:insert name="nbtop">