Issue #1597

Reinstate changes after incorrect merge from jetty-9.4.x branch.

jetty-jndi/src/main/assembly/config.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly>
-  <id>config</id>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <formats>
-    <format>jar</format>
-  </formats>
-  <dependencySets>
-    <dependencySet>
-      <scope>provided</scope>
-      <outputDirectory>lib/mail</outputDirectory>
-      <includes>
-        <include>org.eclipse.jetty.orbit:javax.mail.glassfish</include>
-      </includes>
-    </dependencySet>
-  </dependencySets>
-  <fileSets>
-    <fileSet>
-      <directory>src/main/jndi-config</directory>
-      <outputDirectory></outputDirectory>
-      <includes>
-        <include>**</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
-

jetty-jndi/src/main/config/modules/jndi.mod

@@ -3,7 +3,6 @@ Adds the Jetty JNDI implementation to the classpath.
 
 [depend]
 server
-mail
 
 [lib]
 lib/jetty-jndi-${jetty.version}.jar

jetty-jndi/src/main/jndi-config/modules/mail.mod

@@ -1,8 +0,0 @@
-[description]
-Adds the javax.mail implementation to the classpath.
-
-[provides]
-mail
-
-[lib]
-lib/mail/*.jar

jetty-plus/src/main/assembly/config.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly>
-  <id>config</id>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <formats>
-    <format>jar</format>
-  </formats>
-  <dependencySets>
-    <dependencySet>
-      <scope>provided</scope>
-      <outputDirectory>lib/transactions</outputDirectory>
-      <includes>
-        <include>javax.transaction:javax.transaction-api</include>
-      </includes>
-    </dependencySet>
-  </dependencySets>
-  <fileSets>
-    <fileSet>
-      <directory>src/main/plus-config</directory>
-      <outputDirectory></outputDirectory>
-      <includes>
-        <include>**</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
-

jetty-plus/src/main/config/modules/plus.mod

@@ -7,7 +7,6 @@ server
 security
 jndi
 webapp
-transactions
 
 [lib]
 lib/jetty-plus-${jetty.version}.jar

jetty-plus/src/main/plus-config/modules/transactions.mod

@@ -1,8 +0,0 @@
-[description]
-Puts javax.transaction api on the classpath  
-
-[provides]
-transactions
-
-[lib]
-lib/transactions/*.jar