Fixes #4010 - Update Piranha Servlet - Create a Faces application gui…

…de (#4020)
piranhacloud · Sep 27, 2024 · cd51533 · cd51533
1 parent 7d5aeeb
commit cd51533
Show file tree

Hide file tree

Showing 10 changed files with 283 additions and 13 deletions.
diff --git a/docs/src/site/markdown/servlet/create_a_faces_application.md b/docs/src/site/markdown/servlet/create_a_faces_application.md
@@ -31,18 +31,18 @@ create the ```pom.xml``` file with the content as below.
     <artifactId>faces</artifactId>
     <version>24.10.0-SNAPSHOT</version>
     <packaging>war</packaging>
-    <name>Piranha Servlet - Jakarta Faces application</name>
+    <name>Create a Jakarta Faces application</name>
     <properties>
-        <java.version>17</java.version>
-        <junit.version>5.10.0-M1</junit.version>
-        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
-        <maven-failsafe-plugin.version>3.0.0</maven-failsafe-plugin.version>
-        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
-        <mojarra.version>4.0.2</mojarra.version>
+        <java.version>21</java.version>
+        <junit.version>5.11.0</junit.version>
+        <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
+        <maven-failsafe-plugin.version>3.5.0</maven-failsafe-plugin.version>
+        <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
+        <mojarra.version>4.0.7</mojarra.version>
         <piranha.distribution>servlet</piranha.distribution>
-        <piranha.version>23.6.0</piranha.version>
+        <piranha.version>24.9.0</piranha.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <weld.version>5.1.0.Final</weld.version>
+        <weld.version>5.1.3.Final</weld.version>
     </properties>
     <dependencies>
         <dependency>
@@ -59,7 +59,7 @@ create the ```pom.xml``` file with the content as below.
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-weld</artifactId>
+            <artifactId>piranha-extension-redhat-weld</artifactId>
             <version>${piranha.version}</version>
             <scope>runtime</scope>
         </dependency>
@@ -86,7 +86,7 @@ create the ```pom.xml``` file with the content as below.
         <finalName>faces</finalName>
         <plugins>
             <plugin>
-                <groupId>cloud.piranha.maven.plugins</groupId>
+                <groupId>cloud.piranha.maven</groupId>
                 <artifactId>piranha-maven-plugin</artifactId>
                 <version>${piranha.version}</version>
                 <executions>

diff --git a/test/micro/helloworld/pom.xml b/test/micro/helloworld/pom.xml
@@ -23,7 +23,7 @@
         <artifactId>project</artifactId>
         <version>24.10.0-SNAPSHOT</version>
     </parent>
-    <groupId>cloud.piranha.guides.micro</groupId>
+    <groupId>cloud.piranha.test.micro</groupId>
     <artifactId>helloworld</artifactId>
     <version>24.10.0-SNAPSHOT</version>
     <packaging>war</packaging>

diff --git a/test/server/helloworld/pom.xml b/test/server/helloworld/pom.xml
@@ -20,7 +20,7 @@
         <artifactId>project</artifactId>
         <version>24.10.0-SNAPSHOT</version>
     </parent>
-    <groupId>cloud.piranha.guides.server</groupId>
+    <groupId>cloud.piranha.test.server</groupId>
     <artifactId>helloworld</artifactId>
     <version>24.10.0-SNAPSHOT</version>
     <packaging>war</packaging>

diff --git a/test/servlet/faces/pom.xml b/test/servlet/faces/pom.xml
@@ -0,0 +1,139 @@
+<?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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <!--
+
+    WARNING - Do not remove the versions in the properties section as this
+    particular project is used as a basis for the guide content at 
+    docs/src/site/markdown/servlet/create_a_faces_application.md.
+  
+    When updating the guide do the following:
+
+    1. Drop the parent part below
+    2. Change the name of the project to read 'Create a Jakarta Faces application'
+    3. Change the version to the latest released version of Piranha
+
+    -->
+    <parent>
+        <groupId>cloud.piranha.test.servlet</groupId>
+        <artifactId>project</artifactId>
+        <version>24.10.0-SNAPSHOT</version>
+    </parent>
+    <groupId>cloud.piranha.test.servlet</groupId>
+    <artifactId>faces</artifactId>
+    <version>24.10.0-SNAPSHOT</version>
+    <packaging>war</packaging>
+    <name>Piranha - Test - Servlet - Jakarta Faces application</name>
+    <properties>
+        <java.version>21</java.version>
+        <junit.version>5.11.0</junit.version>
+        <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
+        <maven-failsafe-plugin.version>3.5.0</maven-failsafe-plugin.version>
+        <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
+        <mojarra.version>4.0.7</mojarra.version>
+        <piranha.distribution>servlet</piranha.distribution>
+        <piranha.version>24.9.0</piranha.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <weld.version>5.1.3.Final</weld.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>jakarta.faces</artifactId>
+            <version>${mojarra.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.weld.servlet</groupId>
+            <artifactId>weld-servlet-shaded</artifactId>
+            <version>${weld.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-redhat-weld</artifactId>
+            <version>${piranha.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <finalName>faces</finalName>
+        <plugins>
+            <plugin>
+                <groupId>cloud.piranha.maven</groupId>
+                <artifactId>piranha-maven-plugin</artifactId>
+                <version>${piranha.version}</version>
+                <executions>
+                    <execution>
+                        <id>pre-integration-test</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>start</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>post-integration-test</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <distribution>servlet</distribution>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <release>${java.version}</release>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>${maven-failsafe-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>${maven-war-plugin.version}</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/test/servlet/faces/src/main/java/hello/HelloBean.java b/test/servlet/faces/src/main/java/hello/HelloBean.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2002-2024 Manorrock.com. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *   3. Neither the name of the copyright holder nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+package hello;
+
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
+
+@Named(value = "helloBean")
+@RequestScoped
+public class HelloBean {
+
+    /**
+     * Stores the hello string.
+     */
+    private String hello = "Hello from Jakarta Faces!";
+
+    /**
+     * Get the hello string.
+     * 
+     * @return the hello string.
+     */
+    public String getHello() {
+        return hello;
+    }
+
+    /**
+     * Set the hello string.
+     * 
+     * @param hello the hello string.
+     */
+    public void setHello(String hello) {
+        this.hello = hello;
+    }
+}
diff --git a/test/servlet/faces/src/main/webapp/WEB-INF/beans.xml b/test/servlet/faces/src/main/webapp/WEB-INF/beans.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans 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/beans_2_0.xsd"
+       bean-discovery-mode="all">
+</beans>
diff --git a/test/servlet/faces/src/main/webapp/WEB-INF/web.xml b/test/servlet/faces/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+    <servlet>
+        <servlet-name>Faces Servlet</servlet-name>
+        <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>Faces Servlet</servlet-name>
+        <url-pattern>*.xhtml</url-pattern>
+    </servlet-mapping>
+</web-app>
diff --git a/test/servlet/faces/src/main/webapp/hellofaces.xhtml b/test/servlet/faces/src/main/webapp/hellofaces.xhtml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html lang="en"
+      xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:f="jakarta.faces.core"
+      xmlns:h="jakarta.faces.html"
+      xmlns:pt="jakarta.faces.passthrough">
+    <h:head>
+        <title>Jakarta Faces application</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    </h:head>
+    <h:body>
+        <div>Jakarta Faces application</div>
+        <h:form>
+                <h:outputText value="#{helloBean.hello}"/>
+            <br/>
+        </h:form>
+    </h:body>
+</html>
diff --git a/test/servlet/faces/src/test/java/hello/HelloIT.java b/test/servlet/faces/src/test/java/hello/HelloIT.java
@@ -0,0 +1,28 @@
+package hello;
+
+import java.net.URI;
+import java.net.http.HttpClient;
+import static java.net.http.HttpClient.Redirect.ALWAYS;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.time.Duration;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+
+public class HelloIT {
+
+    @Test
+    public void testHelloFacesXhtml() throws Exception {
+        HttpClient client = HttpClient
+                .newBuilder()
+                .connectTimeout(Duration.ofSeconds(60))
+                .followRedirects(ALWAYS)
+                .build();
+        HttpRequest request = HttpRequest
+                .newBuilder(new URI("http://localhost:8080/faces/hellofaces.xhtml"))
+                .build();
+        HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
+        assertTrue(response.body().contains("Hello from Jakarta Faces!"));
+    }
+}
diff --git a/test/servlet/pom.xml b/test/servlet/pom.xml
@@ -16,6 +16,7 @@
     <name>Piranha - Test - Servlet - Project</name>
 
     <modules>
+        <module>faces</module>
         <module>hello</module>
     </modules>
 </project>