Fixes piranhacloud#3528 - Move from Piranha Naming to Manorrock Herri…

…ng (piranhacloud#3529)
mnriem · Sep 4, 2023 · c4b6023 · c4b6023
1 parent fb281c3
commit c4b6023
Show file tree

Hide file tree

Showing 35 changed files with 26 additions and 2,291 deletions.
diff --git a/dist/platform/src/main/java/cloud/piranha/dist/platform/PlatformPiranhaBuilder.java b/dist/platform/src/main/java/cloud/piranha/dist/platform/PlatformPiranhaBuilder.java
@@ -56,7 +56,7 @@ public class PlatformPiranhaBuilder {
     /**
      * Stores the InitialContext factory.
      */
-    private String initialContextFactory = "cloud.piranha.naming.thread.ThreadInitialContextFactory";
+    private String initialContextFactory = "com.manorrock.herring.thread.ThreadInitialContextFactory";
 
     /**
      * Stores the verbose flag.

diff --git a/dist/server/src/main/java/cloud/piranha/dist/server/ServerPiranhaBuilder.java b/dist/server/src/main/java/cloud/piranha/dist/server/ServerPiranhaBuilder.java
@@ -56,7 +56,7 @@ public class ServerPiranhaBuilder {
     /**
      * Stores the InitialContext factory.
      */
-    private String initialContextFactory = "cloud.piranha.naming.thread.ThreadInitialContextFactory";
+    private String initialContextFactory = "com.manorrock.herring.thread.ThreadInitialContextFactory";
 
     /**
      * Stores the verbose flag.

diff --git a/extension/naming-cdi/pom.xml b/extension/naming-cdi/pom.xml
@@ -23,15 +23,15 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>cloud.piranha.naming</groupId>
-            <artifactId>piranha-naming-impl</artifactId>
-            <version>${project.version}</version>
+            <groupId>com.manorrock.herring</groupId>
+            <artifactId>herring</artifactId>
+            <version>23.5.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>cloud.piranha.naming</groupId>
-            <artifactId>piranha-naming-thread</artifactId>
-            <version>${project.version}</version>
+            <groupId>com.manorrock.herring</groupId>
+            <artifactId>herring-thread</artifactId>
+            <version>23.5.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/...ng-cdi/src/main/java/cloud/piranha/extension/naming/cdi/DefaultInitialContextFactory.java b/...ng-cdi/src/main/java/cloud/piranha/extension/naming/cdi/DefaultInitialContextFactory.java
@@ -33,7 +33,7 @@
 import javax.naming.NamingException;
 import javax.naming.spi.InitialContextFactory;
 
-import cloud.piranha.naming.impl.DefaultInitialContext;
+import com.manorrock.herring.DefaultInitialContext;
 
 /**
  * The default InitialContextFactory.

diff --git a/extension/naming-cdi/src/main/java/cloud/piranha/extension/naming/cdi/NamingExtension.java b/extension/naming-cdi/src/main/java/cloud/piranha/extension/naming/cdi/NamingExtension.java
@@ -48,7 +48,7 @@
 
 import cloud.piranha.core.api.WebApplication;
 import cloud.piranha.core.api.WebApplicationExtension;
-import cloud.piranha.naming.impl.DefaultInitialContext;
+import com.manorrock.herring.DefaultInitialContext;
 import jakarta.annotation.Resource;
 import jakarta.enterprise.inject.spi.CDI;
 

diff --git a/...ng-cdi/src/main/java/cloud/piranha/extension/naming/cdi/NamingServletRequestListener.java b/...ng-cdi/src/main/java/cloud/piranha/extension/naming/cdi/NamingServletRequestListener.java
@@ -28,7 +28,7 @@
 package cloud.piranha.extension.naming.cdi;
 
 import cloud.piranha.core.api.WebApplication;
-import cloud.piranha.naming.thread.ThreadInitialContextFactory;
+import com.manorrock.herring.thread.ThreadInitialContextFactory;
 import jakarta.servlet.ServletRequestEvent;
 import jakarta.servlet.ServletRequestListener;
 import static java.lang.System.Logger.Level.DEBUG;

diff --git a/extension/naming-cdi/src/main/java/module-info.java b/extension/naming-cdi/src/main/java/module-info.java
@@ -37,8 +37,8 @@
     exports cloud.piranha.extension.naming.cdi;
     opens cloud.piranha.extension.naming.cdi;
     requires cloud.piranha.core.api;
-    requires transitive cloud.piranha.naming.impl;
-    requires transitive cloud.piranha.naming.thread;
+    requires transitive com.manorrock.herring;
+    requires transitive com.manorrock.herring.thread;
     requires jakarta.annotation;
     requires jakarta.cdi;
     requires transitive java.naming;

diff --git a/extension/naming/pom.xml b/extension/naming/pom.xml
@@ -23,15 +23,15 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>cloud.piranha.naming</groupId>
-            <artifactId>piranha-naming-impl</artifactId>
-            <version>${project.version}</version>
+            <groupId>com.manorrock.herring</groupId>
+            <artifactId>herring</artifactId>
+            <version>23.5.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>cloud.piranha.naming</groupId>
-            <artifactId>piranha-naming-thread</artifactId>
-            <version>${project.version}</version>
+            <groupId>com.manorrock.herring</groupId>
+            <artifactId>herring-thread</artifactId>
+            <version>23.5.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/extension/naming/src/main/java/cloud/piranha/extension/naming/NamingExtension.java b/extension/naming/src/main/java/cloud/piranha/extension/naming/NamingExtension.java
@@ -29,7 +29,7 @@
 
 import cloud.piranha.core.api.WebApplication;
 import cloud.piranha.core.api.WebApplicationExtension;
-import cloud.piranha.naming.impl.DefaultInitialContext;
+import com.manorrock.herring.DefaultInitialContext;
 import jakarta.annotation.Resource;
 import static java.lang.System.Logger.Level.DEBUG;
 import static java.lang.System.Logger.Level.WARNING;

diff --git a/...sion/naming/src/main/java/cloud/piranha/extension/naming/NamingInitialContextFactory.java b/...sion/naming/src/main/java/cloud/piranha/extension/naming/NamingInitialContextFactory.java
@@ -27,7 +27,7 @@
  */
 package cloud.piranha.extension.naming;
 
-import cloud.piranha.naming.impl.DefaultInitialContext;
+import com.manorrock.herring.DefaultInitialContext;
 import java.util.Hashtable;
 import javax.naming.Context;
 import javax.naming.NamingException;

diff --git a/...ion/naming/src/main/java/cloud/piranha/extension/naming/NamingServletRequestListener.java b/...ion/naming/src/main/java/cloud/piranha/extension/naming/NamingServletRequestListener.java
@@ -28,7 +28,7 @@
 package cloud.piranha.extension.naming;
 
 import cloud.piranha.core.api.WebApplication;
-import cloud.piranha.naming.thread.ThreadInitialContextFactory;
+import com.manorrock.herring.thread.ThreadInitialContextFactory;
 import jakarta.servlet.ServletRequestEvent;
 import jakarta.servlet.ServletRequestListener;
 import static java.lang.System.Logger.Level.DEBUG;

diff --git a/extension/naming/src/main/java/module-info.java b/extension/naming/src/main/java/module-info.java
@@ -36,8 +36,8 @@
     exports cloud.piranha.extension.naming;
     opens cloud.piranha.extension.naming;
     requires cloud.piranha.core.api;
-    requires transitive cloud.piranha.naming.impl;
-    requires transitive cloud.piranha.naming.thread;
+    requires transitive com.manorrock.herring;
+    requires transitive com.manorrock.herring.thread;
     requires jakarta.annotation;
     requires transitive java.naming;
 }
diff --git a/naming/impl/README.md b/naming/impl/README.md
diff --git a/naming/impl/pom.xml b/naming/impl/pom.xml
diff --git a/naming/impl/src/main/java/cloud/piranha/naming/impl/DefaultBindingNamingEnumeration.java b/naming/impl/src/main/java/cloud/piranha/naming/impl/DefaultBindingNamingEnumeration.java