System Server Classes

jetty-core/jetty-ee/src/main/config/modules/ee-webapp.mod

@@ -0,0 +1,31 @@
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+
+[description]
+# tag::description[]
+This module provide common configuration of Java Servlet web applications over all environments.
+# end::description[]
+
+[xml]
+etc/jetty-ee-webapp.xml
+
+[lib]
+lib/jetty-ee-webapp-${jetty.version}.jar
+
+[ini-template]
+# tag::ini-template[]
+## Add to the server wide default jars and packages protected or hidden from webapps.
+## System classes are protected and cannot be overridden by a webapp.
+## Server classes are hidden and cannot be seen by a webapp
+## Lists of patterns are comma separated and may be either:
+##  + a qualified classname e.g. 'com.acme.Foo' 
+##  + a package name e.g. 'net.example.'
+##  + a jar file e.g. '${jetty.base.uri}/lib/dependency.jar' 
+##  + a directory of jars,resource or classes e.g. '${jetty.base.uri}/resources' 
+##  + A pattern preceded with a '-' is an exclusion, all other patterns are inclusions
+##
+## The +=, operator appends to a CSV list with a comma as needed.
+##
+#jetty.server.addSystemClasses+=,org.example.
+#jetty.server.addServerClasses+=,org.example.
+# end::ini-template[]
+

jetty-core/pom.xml

@@ -17,6 +17,7 @@
     <module>jetty-client</module>
     <module>jetty-demos</module>
     <module>jetty-deploy</module>
+    <module>jetty-ee</module>
     <module>jetty-fcgi</module>
     <module>jetty-http</module>
     <module>jetty-http-spi</module>
@@ -44,7 +45,6 @@
     <module>jetty-util-ajax</module>
     <module>jetty-websocket</module>
     <module>jetty-xml</module>
-    <module>jetty-ee</module>
   </modules>
 
   <!-- FIXME: Remove once Servlet API usage is totally removed from jetty-core -->

jetty-ee10/jetty-ee10-webapp/pom.xml

@@ -17,6 +17,10 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-ee</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-session</artifactId>
@@ -25,10 +29,6 @@
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-xml</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-ee</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.ee10</groupId>
       <artifactId>jetty-ee10-servlet</artifactId>

jetty-ee10/jetty-ee10-webapp/src/main/config/modules/ee10-webapp.mod

@@ -9,6 +9,7 @@ This module enables deployment of Java Servlet web applications.
 ee10
 
 [depend]
+ee-webapp
 ee10-servlet
 ee10-security
 
@@ -20,7 +21,7 @@ lib/jetty-ee10-webapp-${jetty.version}.jar
 
 [ini-template]
 # tag::ini-template[]
-## Add to the server wide default jars and packages protected or hidden from webapps.
+## Add to the environment wide default jars and packages protected or hidden from webapps.
 ## System classes are protected and cannot be overridden by a webapp.
 ## Server classes are hidden and cannot be seen by a webapp
 ## Lists of patterns are comma separated and may be either:

jetty-ee8/jetty-ee8-webapp/pom.xml

@@ -18,6 +18,10 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-ee</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-xml</artifactId>

jetty-ee8/jetty-ee8-webapp/src/main/config/modules/ee8-webapp.mod

@@ -8,6 +8,7 @@ Without this, only Jetty-specific handlers may be deployed.
 ee8
 
 [depend]
+ee-webapp
 ee8-servlet
 ee8-security
 
@@ -18,7 +19,7 @@ etc/jetty-ee8-webapp.xml
 lib/jetty-ee8-webapp-${jetty.version}.jar
 
 [ini-template]
-## Add to the server wide default jars and packages protected or hidden from webapps.
+## Add to the environment wide default jars and packages protected or hidden from webapps.
 ## System classes are protected and cannot be overridden by a webapp.
 ## Server classes are hidden and cannot be seen by a webapp
 ## Lists of patterns are comma separated and may be either:

jetty-ee9/jetty-ee9-webapp/pom.xml

@@ -19,11 +19,11 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-xml</artifactId>
+      <artifactId>jetty-ee</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-ee</artifactId>
+      <artifactId>jetty-xml</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.ee9</groupId>

jetty-ee9/jetty-ee9-webapp/src/main/config/modules/ee9-webapp.mod

@@ -8,6 +8,7 @@ Without this, only Jetty-specific handlers may be deployed.
 ee9
 
 [depend]
+ee-webapp
 ee9-servlet
 ee9-security
 
@@ -18,7 +19,7 @@ etc/jetty-ee9-webapp.xml
 lib/jetty-ee9-webapp-${jetty.version}.jar
 
 [ini-template]
-## Add to the server wide default jars and packages protected or hidden from webapps.
+## Add to the environment wide default jars and packages protected or hidden from webapps.
 ## System classes are protected and cannot be overridden by a webapp.
 ## Server classes are hidden and cannot be seen by a webapp
 ## Lists of patterns are comma separated and may be either:

jetty-home/pom.xml

@@ -39,6 +39,10 @@
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-deploy</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-ee</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-hazelcast</artifactId>