Fixes #3648 - Move from OmniFaces Eleos to Eclipse Epicyro (#3649)

piranhacloud · Feb 4, 2024 · 3a3ad55 · 3a3ad55
1 parent e2e2766
commit 3a3ad55
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 51 deletions.
diff --git a/extension/eleos/pom.xml → extension/eclipse-epicyro/pom.xml b/extension/eleos/pom.xml → extension/eclipse-epicyro/pom.xml
@@ -9,16 +9,17 @@
         <version>24.2.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>piranha-extension-eleos</artifactId>
+    <artifactId>piranha-extension-eclipse-epicyro</artifactId>
     <packaging>jar</packaging>
 
-    <name>Piranha - Extension - OmniFaces Eleos</name>
+    <name>Piranha - Extension - Eclipse Epicyro</name>
 
     <dependencies>
         <!-- compile -->
         <dependency>
-            <groupId>org.omnifaces</groupId>
-            <artifactId>eleos</artifactId>
+            <groupId>org.glassfish.epicyro</groupId>
+            <artifactId>epicyro</artifactId>
+            <version>3.0.0</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>

diff --git a/...extension/eleos/AuthenticationFilter.java → ...tension/epicyro/AuthenticationFilter.java b/...extension/eleos/AuthenticationFilter.java → ...tension/epicyro/AuthenticationFilter.java
@@ -25,7 +25,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package cloud.piranha.extension.eleos;
+package cloud.piranha.extension.epicyro;
 
 import static cloud.piranha.core.api.SecurityManager.AuthenticateSource.PRE_REQUEST_CONTAINER;
 import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN;

diff --git a/...sion/eleos/AuthenticationInitializer.java → ...on/epicyro/AuthenticationInitializer.java b/...sion/eleos/AuthenticationInitializer.java → ...on/epicyro/AuthenticationInitializer.java
@@ -25,7 +25,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package cloud.piranha.extension.eleos;
+package cloud.piranha.extension.epicyro;
 
 import cloud.piranha.core.api.AuthenticatedIdentity;
 import cloud.piranha.core.api.SecurityManager;
@@ -49,15 +49,15 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import org.omnifaces.eleos.config.factory.ConfigParser;
-import org.omnifaces.eleos.config.factory.DefaultConfigFactory;
-import org.omnifaces.eleos.config.factory.DefaultConfigParser;
-import org.omnifaces.eleos.config.helper.Caller;
-import org.omnifaces.eleos.services.DefaultAuthenticationService;
-import org.omnifaces.eleos.services.InMemoryStore;
+import org.glassfish.epicyro.config.factory.ConfigParser;
+import org.glassfish.epicyro.config.factory.DefaultConfigFactory;
+import org.glassfish.epicyro.config.factory.DefaultConfigParser;
+import org.glassfish.epicyro.config.helper.Caller;
+import org.glassfish.epicyro.services.DefaultAuthenticationService;
+import org.glassfish.epicyro.services.InMemoryStore;
 
 /**
- * The Eleos initializer.
+ * The Epicyro initializer.
  *
  * @author Arjan Tijms
  * @author Manfred Riem (mriem@manorrock.com)
@@ -80,7 +80,7 @@ public class AuthenticationInitializer implements ServletContainerInitializer {
     public static final Logger LOGGER = System.getLogger(AuthenticationInitializer.class.getName());
 
     /**
-     * Initialize Eleos
+     * Initialize Epicyro.
      *
      * @param classes the classes.
      * @param servletContext the Servlet context.
@@ -89,7 +89,7 @@ public class AuthenticationInitializer implements ServletContainerInitializer {
     @Override
     public void onStartup(Set<Class<?>> classes, ServletContext servletContext) throws ServletException {
 
-        LOGGER.log(DEBUG, "Initializing Eleos");
+        LOGGER.log(DEBUG, "Initializing Epicyro");
 
         String appContextId = servletContext.getVirtualServerName() + " " + servletContext.getContextPath();
 

diff --git a/...sion/eleos/DoNothingServerAuthModule.java → ...on/epicyro/DoNothingServerAuthModule.java b/...sion/eleos/DoNothingServerAuthModule.java → ...on/epicyro/DoNothingServerAuthModule.java
@@ -25,7 +25,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package cloud.piranha.extension.eleos;
+package cloud.piranha.extension.epicyro;
 
 import static jakarta.security.auth.message.AuthStatus.SEND_SUCCESS;
 import static jakarta.security.auth.message.AuthStatus.SUCCESS;

diff --git a/...sion/eleos/src/main/java/module-info.java → ...se-epicyro/src/main/java/module-info.java b/...sion/eleos/src/main/java/module-info.java → ...se-epicyro/src/main/java/module-info.java
@@ -27,23 +27,21 @@
  */
 
 /**
- * This module delivers the OmniFaces Eleos integration extension.
+ * This module delivers the Eclipse Epicyro integration extension.
  *
  * <p>
- *  This extension integrates OmniFaces Eleos into Piranha. See 
- *  https://github.com/omnifaces/eleos for more information about its project.
+ *  This extension integrates Eclipse Epicyro into Piranha. See 
+ *  https://github.com/eclipse-ee4j/epicyro for more information about its project.
  * </p>
  *
  * @author Manfred Riem (mriem@manorrock.com)
  */
-module cloud.piranha.extension.eleos {
+module cloud.piranha.extension.epicyro {
 
-    exports cloud.piranha.extension.eleos;
-
-    opens cloud.piranha.extension.eleos;
-
+    exports cloud.piranha.extension.epicyro;
+    opens cloud.piranha.extension.epicyro;
     requires cloud.piranha.core.api;
     requires cloud.piranha.core.impl;
     requires jakarta.security.auth.message;
-    requires transitive org.glassfish.eleos;
+    requires transitive org.glassfish.epicyro;
 }
diff --git a/extension/pom.xml b/extension/pom.xml
@@ -22,12 +22,12 @@
         <module>bytesstreamhandler</module>
         <module>coreprofile</module>
         <module>default-datasource</module>
+        <module>eclipse-epicyro</module>
         <module>eclipse-exousia</module>
         <module>eclipse-expressly</module>
         <module>eclipse-soteria</module>
         <module>eclipse-wasp</module>
         <module>eclipselink</module>
-        <module>eleos</module>
         <module>hazelcast</module>
         <module>micro</module>
         <module>microprofile</module>

diff --git a/...src/main/java/cloud/piranha/extension/security/jakarta/JakartaSecurityAllInitializer.java b/...src/main/java/cloud/piranha/extension/security/jakarta/JakartaSecurityAllInitializer.java
@@ -35,7 +35,7 @@
 import org.glassfish.exousia.modules.def.DefaultPolicy;
 import org.glassfish.exousia.modules.def.DefaultPolicyConfigurationFactory;
 
-import cloud.piranha.extension.eleos.AuthenticationInitializer;
+import cloud.piranha.extension.epicyro.AuthenticationInitializer;
 import cloud.piranha.extension.exousia.AuthorizationInitializer;
 import cloud.piranha.extension.exousia.AuthorizationPreInitializer;
 import cloud.piranha.extension.soteria.SoteriaInitializer;

diff --git a/extension/security-jakarta/src/main/java/module-info.java b/extension/security-jakarta/src/main/java/module-info.java
@@ -34,15 +34,12 @@
 module cloud.piranha.extension.security.jakarta {
 
     exports cloud.piranha.extension.security.jakarta;
-
     opens cloud.piranha.extension.security.jakarta;
-
     requires cloud.piranha.core.api;
     requires cloud.piranha.core.impl;
-    requires cloud.piranha.extension.eleos;
+    requires cloud.piranha.extension.epicyro;
     requires cloud.piranha.extension.security.servlet;
     requires transitive cloud.piranha.extension.soteria;
     requires cloud.piranha.extension.weld;
     requires java.naming;
-    requires org.glassfish.eleos;
 }
diff --git a/extension/security-servlet/pom.xml b/extension/security-servlet/pom.xml
@@ -24,13 +24,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-exousia</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eleos</artifactId>
+            <artifactId>piranha-extension-eclipse-epicyro</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
             <exclusions>
@@ -40,6 +34,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-eclipse-exousia</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
         <!-- test -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>

diff --git a/...src/main/java/cloud/piranha/extension/security/servlet/ServletSecurityAllInitializer.java b/...src/main/java/cloud/piranha/extension/security/servlet/ServletSecurityAllInitializer.java
@@ -35,7 +35,7 @@
 import org.glassfish.exousia.modules.def.DefaultPolicy;
 import org.glassfish.exousia.modules.def.DefaultPolicyConfigurationFactory;
 
-import cloud.piranha.extension.eleos.AuthenticationInitializer;
+import cloud.piranha.extension.epicyro.AuthenticationInitializer;
 import cloud.piranha.extension.exousia.AuthorizationInitializer;
 import cloud.piranha.extension.exousia.AuthorizationPostInitializer;
 import cloud.piranha.extension.exousia.AuthorizationPreInitializer;

diff --git a/...ervlet/src/main/java/cloud/piranha/extension/security/servlet/ServletSecurityManager.java b/...ervlet/src/main/java/cloud/piranha/extension/security/servlet/ServletSecurityManager.java
@@ -27,7 +27,7 @@
  */
 package cloud.piranha.extension.security.servlet;
 
-import static cloud.piranha.extension.eleos.AuthenticationInitializer.AUTH_SERVICE;
+import static cloud.piranha.extension.epicyro.AuthenticationInitializer.AUTH_SERVICE;
 import static cloud.piranha.extension.exousia.AuthorizationPreInitializer.AUTHZ_SERVICE;
 import static cloud.piranha.core.api.SecurityManager.AuthenticateSource.MID_REQUEST_USER;
 import static cloud.piranha.core.impl.DefaultAuthenticatedIdentity.getCurrentSubject;
@@ -40,8 +40,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.glassfish.exousia.AuthorizationService;
-import org.omnifaces.eleos.config.helper.Caller;
-import org.omnifaces.eleos.services.DefaultAuthenticationService;
 
 import cloud.piranha.core.api.AuthenticatedIdentity;
 import cloud.piranha.core.api.SecurityManager;
@@ -54,6 +52,8 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
+import org.glassfish.epicyro.config.helper.Caller;
+import org.glassfish.epicyro.services.DefaultAuthenticationService;
 
 /**
  * SecurityManager implementation that uses Servlet Security semantics.

diff --git a/extension/security-servlet/src/main/java/module-info.java b/extension/security-servlet/src/main/java/module-info.java
@@ -38,8 +38,7 @@
     opens cloud.piranha.extension.security.servlet;
     requires cloud.piranha.core.api;
     requires cloud.piranha.core.impl;
-    requires cloud.piranha.extension.eleos;
+    requires cloud.piranha.extension.epicyro;
     requires transitive cloud.piranha.extension.exousia;
     requires java.naming;
-    requires org.glassfish.eleos;
 }
diff --git a/test/debug/pom.xml b/test/debug/pom.xml
@@ -68,32 +68,30 @@
 
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-exousia</artifactId>
+            <artifactId>piranha-extension-eclipse-epicyro</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-expressly</artifactId>
+            <artifactId>piranha-extension-eclipse-exousia</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-soteria</artifactId>
+            <artifactId>piranha-extension-eclipse-expressly</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-wasp</artifactId>
+            <artifactId>piranha-extension-eclipse-soteria</artifactId>
             <version>${project.version}</version>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eleos</artifactId>
+            <artifactId>piranha-extension-eclipse-wasp</artifactId>
             <version>${project.version}</version>
         </dependency>
 
-
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-hazelcast</artifactId>