459681 Remove Glassfish JSP in favor of Apache JSP

+ Fixed names in apache-jsp and apache-jstl modules
+ Updated jetty-start tests to better represent new distribution
  structure.

apache-jsp/src/main/config/modules/apache-jsp.mod

@@ -3,7 +3,7 @@
 #
 
 [name]
-jsp-impl
+apache-jsp
 
 [lib]
 lib/apache-jsp/*.jar

apache-jstl/src/main/config/modules/apache-jstl.mod

@@ -2,7 +2,7 @@
 # Apache JSTL 
 #
 [name]
-jstl-impl
+apache-jstl
 
 [lib]
 lib/apache-jstl/*.jar

jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java

@@ -86,6 +86,8 @@ public class ModulesTest
         List<String> expected = new ArrayList<>();
         expected.add("alpn");
         expected.add("annotations");
+        expected.add("apache-jsp");
+        expected.add("apache-jstl");
         expected.add("cdi");
         expected.add("client");
         expected.add("continuation");
@@ -98,6 +100,7 @@ public class ModulesTest
         expected.add("home-base-warning");
         expected.add("http");
         expected.add("http2");
+        expected.add("http2c");
         expected.add("https");
         expected.add("ipaccess");
         expected.add("jaas");
@@ -229,8 +232,8 @@ public class ModulesTest
         expected.add("jvm");
         // transitive
         expected.add("ssl");
-        expected.add("jsp-impl");
-        expected.add("jstl-impl");
+        expected.add("apache-jsp");
+        expected.add("apache-jstl");
         expected.add("webapp");
         expected.add("deploy");
         expected.add("plus");
@@ -444,7 +447,7 @@ public class ModulesTest
 
         // Assert names are correct, and in the right order
         List<String> expectedNames = new ArrayList<>();
-        expectedNames.add("jsp-impl");
+        expectedNames.add("apache-jsp");
         expectedNames.add("server");
         expectedNames.add("http");
         expectedNames.add("jndi");
@@ -467,7 +470,7 @@ public class ModulesTest
 
         // Now work with the 'alt' selected
         List<String> expectedAlts = new ArrayList<>();
-        expectedAlts.add("jsp-impl");
+        expectedAlts.add("apache-jsp");
         expectedAlts.add("jsp");
         expectedAlts.add("websocket");
 

jetty-start/src/test/java/org/eclipse/jetty/start/TestBadUseCases.java

@@ -44,14 +44,6 @@ public class TestBadUseCases
     {
         List<Object[]> ret = new ArrayList<>();
         
-        ret.add(new Object[]{ "jsp", 
-                "Missing referenced dependency: jsp-impl/bad-jsp", 
-                new String[]{ "jsp-impl=bad" }});
-        
-        ret.add(new Object[]{ "jsp-bad", 
-                "Missing referenced dependency: jsp-impl/bad-jsp", 
-                null});
-
         ret.add(new Object[]{ "http2", 
                 "Missing referenced dependency: alpn-impl/alpn-1.7.0_01", 
                 new String[]{"java.version=1.7.0_01"}});

jetty-start/src/test/resources/dist-home/modules/apache-jsp.mod

@@ -3,7 +3,7 @@
 #
 
 [name]
-jsp-impl
+apache-jsp
 
 [lib]
 lib/apache-jsp/*.jar

jetty-start/src/test/resources/dist-home/modules/apache-jstl.mod

@@ -2,7 +2,7 @@
 # Apache JSTL 
 #
 [name]
-jstl-impl
+apache-jstl
 
 [lib]
 lib/apache-jstl/*.jar

jetty-start/src/test/resources/dist-home/modules/http2c.mod

@@ -0,0 +1,22 @@
+#
+# HTTP2 Clear Text Support Module
+#
+
+[depend]
+http
+
+[lib]
+lib/http2/*.jar
+
+[xml]
+etc/jetty-http2c.xml
+
+[ini-template]
+## HTTP2c Configuration
+
+# This module adds support for HTTP/2 clear text to the
+# HTTP/1 clear text connector (defined in jetty-http.xml)
+# The resulting connector will accept both HTTP/1 and HTTP/2
+# connections
+
+# http2.maxConcurrentStreams=1024

jetty-start/src/test/resources/dist-home/modules/jsp-impl/glassfish-jsp.mod

@@ -1,8 +0,0 @@
-#
-# Glassfish JSP Module
-#
-[name]
-jsp-impl
-
-[lib]
-lib/jsp/*.jar

jetty-start/src/test/resources/dist-home/modules/jsp-impl/glassfish-jstl.mod

@@ -1,6 +0,0 @@
-#
-# Glassfish JSTL
-[name]
-jstl-impl
-
-# This file is empty as glassfish jstl is provided by glassfish jsp

jetty-start/src/test/resources/dist-home/modules/jsp.mod

@@ -5,17 +5,5 @@
 [depend]
 servlet
 annotations
-jsp-impl/${jsp-impl}-jsp
+apache-jsp
 
-[ini-template]
-# JSP Configuration
-
-# Select JSP implementation, choices are
-#   glassfish : The reference implementation 
-#               default in jetty <= 9.1
-#   apache    : The apache version 
-#               default jetty >= 9.2
-jsp-impl=apache
-
-# To use a non-jdk compiler for JSP compilation when using glassfish uncomment next line
-# -Dorg.apache.jasper.compiler.disablejsr199=true

jetty-start/src/test/resources/dist-home/modules/jstl.mod

@@ -4,11 +4,5 @@
 
 [depend]
 jsp
-jsp-impl/${jsp-impl}-jstl
+apache-jstl
 
-[ini-template]
-# JSTL Configuration
-# The glassfish jsp-impl includes JSTL by default and this module
-# is not required to activate it.
-# The apache jsp-impl does not include JSTL by default and this module
-# is required to put JSTL on the container classpath

jetty-start/src/test/resources/usecases/jsp-bad/start.ini

@@ -1,9 +0,0 @@
-
---module=server
---module=http
---module=jsp
-
-# Intentionally set to "bad" for test case
-jsp-impl=bad
-
-jetty.port=9090

jetty-start/src/test/resources/usecases/jsp.assert.txt

@@ -31,7 +31,6 @@ LIB|${jetty.home}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.9.M3.jar
 # The Properties we expect (order is irrelevant)
 # (these are the properties we actually set in the configuration)
 PROP|jetty.port=9090
-PROP|jsp-impl=apache
 # (these are the ones set by default from jetty.home modules)
 PROP|http.timeout=30000
 PROP|jetty.delayDispatchUntilContent=false