piranhacloud · mnriem · Feb 4, 2024 · Feb 4, 2024
diff --git a/extension/eclipse-epicyro/pom.xml b/extension/eclipse-epicyro/pom.xml
@@ -2,18 +2,14 @@
 
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
-
  <parent>
  <groupId>cloud.piranha.extension</groupId>
  <artifactId>project</artifactId>
  <version>24.2.0-SNAPSHOT</version>
  </parent>
-
  <artifactId>piranha-extension-eclipse-epicyro</artifactId>
  <packaging>jar</packaging>
-
  <name>Piranha - Extension - Eclipse Epicyro</name>
-
  <dependencies>
  <!-- compile -->
  <dependency>

diff --git a/extension/eclipse-exousia/pom.xml b/extension/eclipse-exousia/pom.xml
@@ -2,18 +2,14 @@
 
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
-
  <parent>
  <groupId>cloud.piranha.extension</groupId>
  <artifactId>project</artifactId>
  <version>24.2.0-SNAPSHOT</version>
  </parent>
-
  <artifactId>piranha-extension-eclipse-exousia</artifactId>
  <packaging>jar</packaging>
-
  <name>Piranha - Extension - Eclipse Exousia</name>
-
  <dependencies>
  <!-- compile -->
  <dependency>

diff --git a/extension/eclipse-mojarra/pom.xml b/extension/eclipse-mojarra/pom.xml
@@ -0,0 +1,33 @@
+<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>cloud.piranha.extension</groupId>
+ <artifactId>project</artifactId>
+ <version>24.2.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>piranha-extension-eclipse-mojarra</artifactId>
+ <packaging>jar</packaging>
+ <name>Piranha - Extension - Eclipse Mojarra</name>
+ <dependencies>
+ <dependency>
+ <groupId>cloud.piranha.core</groupId>
+ <artifactId>piranha-core-api</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>cloud.piranha.extension</groupId>
+ <artifactId>piranha-extension-scinitializer</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <!-- see https://github.com/eclipse-ee4j/mojarra -->
+ <dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.faces</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/...nsion/eclipse-mojarra/src/main/java/cloud/piranha/extension/mojarra/MojarraExtension.java b/...nsion/eclipse-mojarra/src/main/java/cloud/piranha/extension/mojarra/MojarraExtension.java
@@ -0,0 +1,56 @@
+/*
+ * 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 cloud.piranha.extension.mojarra;
+
+import cloud.piranha.core.api.WebApplication;
+import cloud.piranha.core.api.WebApplicationExtension;
+import java.lang.System.Logger;
+import static java.lang.System.Logger.Level.TRACE;
+
+/**
+ * The extension that delivers Eclipse Mojarra to Piranha.
+ *
+ * @author Manfred Riem (mriem@manorrock.com)
+ */
+public class MojarraExtension implements WebApplicationExtension {
+
+ /**
+ * Stores the logger.
+ */
+ private static final Logger LOGGER = System.getLogger(MojarraExtension.class.getName());
+
+ /**
+ * Configure the extension.
+ * 
+ * @param webApplication the web application.
+ */
+ @Override
+ public void configure(WebApplication webApplication) {
+ LOGGER.log(TRACE, "Configuring Mojarra extension");
+ }
+}
diff --git a/extension/eclipse-mojarra/src/main/java/module-info.java b/extension/eclipse-mojarra/src/main/java/module-info.java
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+/**
+ * This module delivers the Eclipse Mojarra integration extension.
+ *
+ * <p>
+ * This extension integrates Eclipse Mojarra into Piranha. See 
+ * https://github.com/eclipse-ee4j/mojarra for more information about its
+ * project.
+ * </p>
+ * 
+ * @author Manfred Riem (mriem@manorrock.com)
+ */
+module cloud.piranha.extension.mojarra {
+
+ requires cloud.piranha.core.api;
+ requires cloud.piranha.extension.scinitializer;
+}
diff --git a/extension/eclipse-soteria/pom.xml b/extension/eclipse-soteria/pom.xml
@@ -2,18 +2,14 @@
 
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
-
  <parent>
  <groupId>cloud.piranha.extension</groupId>
  <artifactId>project</artifactId>
  <version>24.2.0-SNAPSHOT</version>
  </parent>
-
  <artifactId>piranha-extension-eclipse-soteria</artifactId>
  <packaging>jar</packaging>
-
  <name>Piranha - Extension - Eclipse Soteria</name>
-
  <dependencies>
  <!-- compile -->
  <dependency>

diff --git a/extension/micro/pom.xml b/extension/micro/pom.xml
@@ -39,6 +39,11 @@
  <artifactId>piranha-extension-eclipse-expressly</artifactId>
  <version>${project.version}</version>
  </dependency>
+ <dependency>
+ <groupId>cloud.piranha.extension</groupId>
+ <artifactId>piranha-extension-eclipse-mojarra</artifactId>
+ <version>${project.version}</version>
+ </dependency>
  <dependency>
  <groupId>cloud.piranha.extension</groupId>
  <artifactId>piranha-extension-eclipse-soteria</artifactId>
@@ -226,13 +231,6 @@
  <artifactId>angus-activation</artifactId>
  </dependency>
 
-
- <!-- Jakarta Faces implementation -->
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>jakarta.faces</artifactId>
- <scope>runtime</scope>
- </dependency>
 
  <!-- Jakarta WebSocket implementation -->
  <dependency>

diff --git a/extension/pom.xml b/extension/pom.xml
@@ -25,6 +25,7 @@
  <module>eclipse-epicyro</module>
  <module>eclipse-exousia</module>
  <module>eclipse-expressly</module>
+ <module>eclipse-mojarra</module>
  <module>eclipse-soteria</module>
  <module>eclipse-wasp</module>
  <module>eclipselink</module>

diff --git a/extension/webprofile/pom.xml b/extension/webprofile/pom.xml
@@ -56,6 +56,12 @@
  <version>${project.version}</version>
  <scope>compile</scope>
  </dependency>
+ <dependency>
+ <groupId>cloud.piranha.extension</groupId>
+ <artifactId>piranha-extension-eclipse-mojarra</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
  <dependency>
  <groupId>cloud.piranha.extension</groupId>
  <artifactId>piranha-extension-eclipse-wasp</artifactId>
@@ -134,11 +140,6 @@
  <artifactId>jakarta.annotation-api</artifactId>
  <scope>runtime</scope>
  </dependency>
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>jakarta.faces</artifactId>
- <scope>runtime</scope>
- </dependency>
  <dependency>
  <groupId>org.glassfish.jersey.containers</groupId>
  <artifactId>jersey-container-servlet</artifactId>

diff --git a/test/debug/pom.xml b/test/debug/pom.xml
@@ -81,6 +81,11 @@
  <artifactId>piranha-extension-eclipse-expressly</artifactId>
  <version>${project.version}</version>
  </dependency>
+ <dependency>
+ <groupId>cloud.piranha.extension</groupId>
+ <artifactId>piranha-extension-eclipse-mojarra</artifactId>
+ <version>${project.version}</version>
+ </dependency>
  <dependency>
  <groupId>cloud.piranha.extension</groupId>
  <artifactId>piranha-extension-eclipse-soteria</artifactId>
@@ -462,40 +467,18 @@
  <artifactId>jakarta.servlet.jsp.jstl</artifactId>
  </dependency>
 
- <!-- Eclipse Mojarra -->
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>jakarta.faces</artifactId>
- </dependency>
-
  <!-- Eclipse Parsson -->
  <dependency>
  <groupId>org.eclipse.parsson</groupId>
  <artifactId>parsson</artifactId>
  </dependency>
 
- <!-- Eclipse Soteria -->
- <dependency>
- <groupId>org.glassfish.soteria</groupId>
- <artifactId>soteria.spi.bean.decorator.weld</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish.soteria</groupId>
- <artifactId>jakarta.security.enterprise</artifactId>
- </dependency>
-
  <!-- Eclipse Tyrus -->
  <dependency>
  <groupId>org.glassfish.tyrus</groupId>
  <artifactId>tyrus-container-servlet</artifactId>
  </dependency>
 
- <!-- Eclipse WaSP -->
- <dependency>
- <groupId>org.glassfish.wasp</groupId>
- <artifactId>wasp</artifactId>
- </dependency>
-
  <!-- Eclipse Yasson -->
  <dependency>
  <groupId>org.eclipse</groupId>

diff --git a/test/embedded/eclipselink/pom.xml b/test/embedded/eclipselink/pom.xml
@@ -48,6 +48,24 @@
  <version>${project.version}</version>
  <scope>test</scope>
  </dependency>
+ <dependency>
+ <groupId>cloud.piranha.extension</groupId>
+ <artifactId>piranha-extension-eclipse-expressly</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cloud.piranha.extension</groupId>
+ <artifactId>piranha-extension-eclipse-mojarra</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cloud.piranha.extension</groupId>
+ <artifactId>piranha-extension-eclipse-wasp</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
  <dependency>
  <groupId>cloud.piranha.extension</groupId>
  <artifactId>piranha-extension-naming</artifactId>
@@ -96,21 +114,6 @@
  <groupId>org.eclipse.persistence</groupId>
  <artifactId>org.eclipse.persistence.json</artifactId>
  </dependency>
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>jakarta.faces</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.glassfish.expressly</groupId>
- <artifactId>expressly</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.glassfish.wasp</groupId>
- <artifactId>wasp</artifactId>
- <scope>test</scope>
- </dependency>
  <dependency>
  <groupId>org.junit.jupiter</groupId>
  <artifactId>junit-jupiter-api</artifactId>

diff --git a/test/embedded/hazelcast/pom.xml b/test/embedded/hazelcast/pom.xml
@@ -31,6 +31,24 @@
  <version>${project.version}</version>
  <scope>test</scope>
  </dependency>
+ <dependency>
+ <groupId>cloud.piranha.extension</groupId>
+ <artifactId>piranha-extension-eclipse-expressly</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cloud.piranha.extension</groupId>
+ <artifactId>piranha-extension-eclipse-mojarra</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cloud.piranha.extension</groupId>
+ <artifactId>piranha-extension-eclipse-wasp</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
  <dependency>
  <groupId>cloud.piranha.extension</groupId>
  <artifactId>piranha-extension-hazelcast</artifactId>
@@ -76,21 +94,6 @@
  <artifactId>junit-jupiter-api</artifactId>
  <scope>test</scope>
  </dependency>
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>jakarta.faces</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.glassfish.expressly</groupId>
- <artifactId>expressly</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.glassfish.wasp</groupId>
- <artifactId>wasp</artifactId>
- <scope>test</scope>
- </dependency>
  <dependency>
  <groupId>org.glassfish.web</groupId>
  <artifactId>jakarta.servlet.jsp.jstl</artifactId>