Fixes #3637 - Add Eclipse Expressly extension

extension/coreprofile/pom.xml

@@ -37,6 +37,12 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-eclipse-expressly</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-naming</artifactId>
@@ -60,11 +66,6 @@
             <artifactId>yasson</artifactId>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.expressly</groupId>
-            <artifactId>expressly</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.containers</groupId>
             <artifactId>jersey-container-servlet</artifactId>

extension/coreprofile/src/main/java/module-info.java

@@ -35,9 +35,9 @@
  * </p>
  * <ul>
  *  <li>Annotation Scanning</li>
+ *  <li>Eclipse Expressly (EL)</li>
  *  <li>Eclipse Parsson (JSON)</li>
  *  <li>Eclipse Yasson (JSON-B)</li>
- *  <li>Glassfish Expressly (EL)</li>
  *  <li>Glassfish Jersey (REST)</li>
  *  <li>Naming (JNDI)</li>
  *  <li>ServletContainerInitializer</li>
@@ -50,10 +50,10 @@
     requires cloud.piranha.core.api;
     requires cloud.piranha.extension.annotationscan;
     requires cloud.piranha.extension.annotationscan.classfile;
+    requires cloud.piranha.extension.expressly;
     requires cloud.piranha.extension.naming;
     requires cloud.piranha.extension.scinitializer;
     requires jakarta.ws.rs;
     requires org.eclipse.parsson;
     requires org.eclipse.yasson;
-    requires org.glassfish.expressly;
 }

extension/eclipse-expressly/pom.xml

@@ -0,0 +1,31 @@
+<?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-expressly</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Piranha - Extension - Eclipse Expressly</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>cloud.piranha.core</groupId>
+            <artifactId>piranha-core-api</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <!-- see https://github.com/eclipse-ee4j/expressly -->
+        <dependency>
+            <groupId>org.glassfish.expressly</groupId>
+            <artifactId>expressly</artifactId>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+</project>

extension/eclipse-expressly/src/main/java/cloud/piranha/extension/expressly/ExpresslyExtension.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.expressly;
+
+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 Expressly to Piranha.
+ *
+ * @author Manfred Riem (mriem@manorrock.com)
+ */
+public class ExpresslyExtension implements WebApplicationExtension {
+
+    /**
+     * Stores the logger.
+     */
+    private static final Logger LOGGER = System.getLogger(ExpresslyExtension.class.getName());
+
+    /**
+     * Configure the extension.
+     * 
+     * @param webApplication the web application.
+     */
+    @Override
+    public void configure(WebApplication webApplication) {
+        LOGGER.log(TRACE, "Initializing Expressly extension");
+    }
+}

extension/eclipse-expressly/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 Expressly integration extension.
+ *
+ * <p>
+ *  This extension integrates Eclipse Exressly into Piranha. See 
+ *  https://github.com/eclipse-ee4j/expressly for more information about its
+ *  project.
+ * </p>
+ * 
+ * @author Manfred Riem (mriem@manorrock.com)
+ */
+module cloud.piranha.extension.expressly {
+
+    requires cloud.piranha.core.api;
+    requires org.glassfish.expressly;
+}

extension/micro/pom.xml

@@ -34,6 +34,11 @@
             <artifactId>piranha-extension-apache-fileupload</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-eclipse-expressly</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-naming-cdi</artifactId>
@@ -231,21 +236,14 @@
             <artifactId>jakarta.faces</artifactId>
             <scope>runtime</scope>
         </dependency>
-        
+
         <!-- Jakarta WebSocket implementation -->
         <dependency>
             <groupId>org.glassfish.tyrus</groupId>
             <artifactId>tyrus-container-servlet</artifactId>
             <scope>runtime</scope>
         </dependency>
 
-        <!-- Jakarta Expression Language implementation -->
-        <dependency>
-            <groupId>org.glassfish.expressly</groupId>
-            <artifactId>expressly</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
         <!-- Jakarta Persistence implementation -->
         <dependency>
             <groupId>cloud.piranha.extension</groupId>

extension/micro/src/main/java/module-info.java

@@ -44,6 +44,7 @@
     requires cloud.piranha.extension.datasource;
     requires cloud.piranha.extension.eclipselink;
     requires cloud.piranha.extension.exousia;
+    requires cloud.piranha.extension.expressly;
     requires cloud.piranha.extension.naming.cdi;
     requires cloud.piranha.extension.policy;
     requires cloud.piranha.extension.scinitializer;

extension/microprofile/pom.xml

@@ -60,11 +60,6 @@
             <artifactId>yasson</artifactId>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.expressly</groupId>
-            <artifactId>expressly</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.containers</groupId>
             <artifactId>jersey-container-servlet</artifactId>

extension/platform/pom.xml

@@ -38,6 +38,12 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-eclipse-expressly</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-naming</artifactId>
@@ -61,11 +67,6 @@
             <artifactId>yasson</artifactId>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.expressly</groupId>
-            <artifactId>expressly</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.containers</groupId>
             <artifactId>jersey-container-servlet</artifactId>

extension/platform/src/main/java/module-info.java

@@ -35,9 +35,9 @@
  * </p>
  * <ul>
  *  <li>Annotation Scanning</li>
+ *  <li>Eclipse Expressly (EL)</li>
  *  <li>Eclipse Parsson (JSON)</li>
  *  <li>Eclipse Yasson (JSON-B)</li>
- *  <li>Glassfish Expressly (EL)</li>
  *  <li>Glassfish Jersey (REST)</li>
  *  <li>Naming (JNDI)</li>
  *  <li>ServletContainerInitializer</li>
@@ -50,10 +50,10 @@
     requires cloud.piranha.core.api;
     requires cloud.piranha.extension.annotationscan;
     requires cloud.piranha.extension.annotationscan.classfile;
+    requires cloud.piranha.extension.expressly;
     requires cloud.piranha.extension.naming;
     requires cloud.piranha.extension.scinitializer;
     requires jakarta.ws.rs;
     requires org.eclipse.parsson;
     requires org.eclipse.yasson;
-    requires org.glassfish.expressly;
 }

extension/pom.xml

@@ -22,6 +22,7 @@
         <module>bytesstreamhandler</module>
         <module>coreprofile</module>
         <module>default-datasource</module>
+        <module>eclipse-expressly</module>
         <module>eclipselink</module>
         <module>eleos</module>
         <module>exousia</module>

extension/servlet/pom.xml

@@ -44,6 +44,12 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-eclipse-expressly</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-naming</artifactId>
@@ -104,11 +110,6 @@
             <artifactId>jakarta.annotation-api</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.expressly</groupId>
-            <artifactId>expressly</artifactId>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>org.glassfish.tyrus</groupId>
             <artifactId>tyrus-container-servlet</artifactId>

extension/servlet/src/main/java/module-info.java

@@ -55,6 +55,7 @@
     requires cloud.piranha.extension.annotationscan;
     requires cloud.piranha.extension.annotationscan.classfile;
     requires cloud.piranha.extension.apache.fileupload;
+    requires cloud.piranha.extension.expressly;
     requires cloud.piranha.extension.naming;
     requires cloud.piranha.extension.policy;
     requires cloud.piranha.extension.scinitializer;

extension/webprofile/pom.xml

@@ -50,6 +50,12 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-eclipse-expressly</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-eclipselink</artifactId>
@@ -133,11 +139,6 @@
             <artifactId>jakarta.faces</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.expressly</groupId>
-            <artifactId>expressly</artifactId>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.containers</groupId>
             <artifactId>jersey-container-servlet</artifactId>

extension/webprofile/src/main/java/module-info.java

@@ -37,6 +37,7 @@
  *  <li>Annotation Scanning</li>
  *  <li>Apache Commons File Upload (Multipart)</li>
  *  <li>Default DataSource</li>
+ *  <li>Eclipse Expressly (EL)</li>
  *  <li>Naming (JNDI)</li>
  *  <li>Java Policy</li>
  *  <li>ServletContainerInitializer</li>
@@ -57,6 +58,7 @@
     requires cloud.piranha.extension.annotationscan;
     requires cloud.piranha.extension.annotationscan.classfile;
     requires cloud.piranha.extension.apache.fileupload;
+    requires cloud.piranha.extension.expressly;
     requires cloud.piranha.extension.datasource;
     requires cloud.piranha.extension.eclipselink;
     requires cloud.piranha.extension.naming;