From ae77d14cf9852f7a6b0633ad5648c7c9b2e4843c Mon Sep 17 00:00:00 2001
From: Olivier Lamy <oliver.lamy@gmail.com>
Date: Tue, 12 Jul 2022 20:19:29 +1000
Subject: [PATCH] add jetty-ee8-jndi (#8287)

* add jetty-ee8-jndi

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
---
 .../pom.xml                                   |  4 --
 jetty-ee8/jetty-ee8-bom/pom.xml               |  5 ++
 jetty-ee8/jetty-ee8-home/pom.xml              | 10 +--
 jetty-ee8/jetty-ee8-jndi/pom.xml              | 65 +++++++++++++++++++
 .../src/main/config/modules/ee8-jndi.mod      | 13 ++++
 jetty-ee8/pom.xml                             |  7 ++
 jetty-ee9/jetty-ee9-jndi/pom.xml              |  2 +-
 7 files changed, 96 insertions(+), 10 deletions(-)
 create mode 100644 jetty-ee8/jetty-ee8-jndi/pom.xml
 create mode 100644 jetty-ee8/jetty-ee8-jndi/src/main/config/modules/ee8-jndi.mod

diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml
index fefa6fe1fdd..e8af39f1370 100644
--- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml
+++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml
@@ -48,10 +48,6 @@
       <groupId>jakarta.websocket</groupId>
       <artifactId>jakarta.websocket-client-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>jakarta.websocket</groupId>
-      <artifactId>jakarta.websocket-client-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-core-client</artifactId>
diff --git a/jetty-ee8/jetty-ee8-bom/pom.xml b/jetty-ee8/jetty-ee8-bom/pom.xml
index fe6affe5e41..43290da2b18 100644
--- a/jetty-ee8/jetty-ee8-bom/pom.xml
+++ b/jetty-ee8/jetty-ee8-bom/pom.xml
@@ -108,6 +108,11 @@
         <artifactId>jetty-ee8-plus</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty.ee8</groupId>
+        <artifactId>jetty-ee8-jndi</artifactId>
+        <version>${project.version}</version>
+      </dependency>
 <!--      <dependency>-->
 <!--        <groupId>org.eclipse.jetty.ee8</groupId>-->
 <!--        <artifactId>jetty-ee8-proxy</artifactId>-->
diff --git a/jetty-ee8/jetty-ee8-home/pom.xml b/jetty-ee8/jetty-ee8-home/pom.xml
index 70cb5dcb18e..c57ba5a01ed 100644
--- a/jetty-ee8/jetty-ee8-home/pom.xml
+++ b/jetty-ee8/jetty-ee8-home/pom.xml
@@ -414,11 +414,11 @@
 <!--      <artifactId>jetty-ee8-jaspi</artifactId>-->
 <!--      <optional>true</optional>-->
 <!--    </dependency>-->
-<!--    <dependency>-->
-<!--      <groupId>org.eclipse.jetty.ee8</groupId>-->
-<!--      <artifactId>jetty-ee8-jndi</artifactId>-->
-<!--      <optional>true</optional>-->
-<!--    </dependency>-->
+    <dependency>
+      <groupId>org.eclipse.jetty.ee8</groupId>
+      <artifactId>jetty-ee8-jndi</artifactId>
+      <optional>true</optional>
+    </dependency>
     <!-- Demo ee8 Apps -->
 <!--    <dependency>-->
 <!--      <groupId>org.eclipse.jetty.ee8.demos</groupId>-->
diff --git a/jetty-ee8/jetty-ee8-jndi/pom.xml b/jetty-ee8/jetty-ee8-jndi/pom.xml
new file mode 100644
index 00000000000..34050a47805
--- /dev/null
+++ b/jetty-ee8/jetty-ee8-jndi/pom.xml
@@ -0,0 +1,65 @@
+<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/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.eclipse.jetty.ee8</groupId>
+    <artifactId>jetty-ee8</artifactId>
+    <version>12.0.0-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>jetty-ee8-jndi</artifactId>
+  <name>EE8 :: Jetty :: JNDI</name>
+  <description>EE8 JNDI factories</description>
+
+  <properties>
+    <ee9.module>jetty-ee9-jndi</ee9.module>
+    <bundle-symbolic-name>${project.groupId}.jndi</bundle-symbolic-name>
+    <spotbugs.onlyAnalyze>org.eclipse.jetty.ee8.jndi.*</spotbugs.onlyAnalyze>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Import-Package>${osgi.slf4j.import.packages},jakarta.mail.*;resolution:=optional,*</Import-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-jndi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.orbit</groupId>
+      <artifactId>javax.mail.glassfish</artifactId>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.eclipse.jetty.orbit</groupId>
+          <artifactId>javax.activation</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-slf4j-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.toolchain</groupId>
+      <artifactId>jetty-test-helper</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/jetty-ee8/jetty-ee8-jndi/src/main/config/modules/ee8-jndi.mod b/jetty-ee8/jetty-ee8-jndi/src/main/config/modules/ee8-jndi.mod
new file mode 100644
index 00000000000..186c4b746bb
--- /dev/null
+++ b/jetty-ee8/jetty-ee8-jndi/src/main/config/modules/ee8-jndi.mod
@@ -0,0 +1,13 @@
+# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+
+[description]
+Adds the Jetty EE8 JNDI reference factories
+
+[environment]
+ee8
+
+[depend]
+jndi
+
+[lib]
+lib/jetty-ee8-jndi-${jetty.version}.jar
diff --git a/jetty-ee8/pom.xml b/jetty-ee8/pom.xml
index 0fdbc5cba1a..d5ef008a2d7 100644
--- a/jetty-ee8/pom.xml
+++ b/jetty-ee8/pom.xml
@@ -16,6 +16,7 @@
     <jetty.servlet.api.version>4.0.6</jetty.servlet.api.version>
     <jakarta.transaction-api.version>1.3.3</jakarta.transaction-api.version>
     <jakarta.annotation.api.version>1.3.5</jakarta.annotation.api.version>
+    <javax.mail.glassfish.version>1.4.1.v201005082020</javax.mail.glassfish.version>
     <jakarta.websocket.api.version>1.1.2</jakarta.websocket.api.version>
     <!-- generated sources cannot follow exactly Jetty code style -->
     <checkstyle.skip>true</checkstyle.skip>
@@ -31,6 +32,7 @@
     <module>jetty-ee8-webapp</module>
     <module>jetty-ee8-jaas</module>
     <module>jetty-ee8-plus</module>
+    <module>jetty-ee8-jndi</module>
     <module>jetty-ee8-annotations</module>
     <module>jetty-ee8-websocket</module>
     <module>jetty-ee8-bom</module>
@@ -149,6 +151,11 @@
           <artifactId>jetty-javax-websocket-api</artifactId>
           <version>${jakarta.websocket.api.version}</version>
         </dependency>
+        <dependency>
+          <groupId>org.eclipse.jetty.orbit</groupId>
+          <artifactId>javax.mail.glassfish</artifactId>
+          <version>${javax.mail.glassfish.version}</version>
+        </dependency>
         <dependency>
           <groupId>org.eclipse.jetty.ee8</groupId>
           <artifactId>jetty-ee8-annotations</artifactId>
diff --git a/jetty-ee9/jetty-ee9-jndi/pom.xml b/jetty-ee9/jetty-ee9-jndi/pom.xml
index f1a02f42344..938c913ae66 100644
--- a/jetty-ee9/jetty-ee9-jndi/pom.xml
+++ b/jetty-ee9/jetty-ee9-jndi/pom.xml
@@ -8,7 +8,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-ee9-jndi</artifactId>
   <name>EE9 :: Jetty :: JNDI</name>
-  <description>EE10 JNDI factories</description>
+  <description>EE9 JNDI factories</description>
 
   <properties>
     <bundle-symbolic-name>${project.groupId}.jndi</bundle-symbolic-name>