459655 - Remove SPDY and NPN

+ Flattening protonego-* to alpn.mod + alpn-impl/alpn-${java.version}

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod

@@ -17,19 +17,27 @@
 # http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/
 
 [name]
-protonego-impl
+alpn
 
 [depend]
-protonego-impl/alpn-${java.version}
+alpn-impl/alpn-${java.version}
 
 [lib]
 lib/jetty-alpn-client-${jetty.version}.jar
 lib/jetty-alpn-server-${jetty.version}.jar
 
+[xml]
+etc/jetty-alpn.xml
+
 [files]
 lib/
 lib/alpn/
 
+[ini-template]
+# Configuration for ALPN
+# alpn.protocols=h2-14,http/1.1
+# alpn.defaultProtocol=http/1.1
+
 [license]
 ALPN is a hosted at github under the GPL v2 with ClassPath Exception.
 ALPN replaces/modifies OpenJDK classes in the java.sun.security.ssl package.

jetty-distribution/src/main/resources/modules/protonego.mod

@@ -1,17 +0,0 @@
-#
-# Protocol Negotiatin Selection Module
-#
-
-[depend]
-protonego-impl/${protonego}
-
-[ini-template]
-# Protocol Negotiation Implementation Selection
-#  choices are:
-#    'alpn' : in use by current HTTP/2 implementation.
-#  Note: java 1.8+ are ALPN only.
-protonego=alpn
-
-# Configuration for ALPN
-# alpn.protocols=h2-14,http/1.1
-# alpn.defaultProtocol=http/1.1

jetty-http2/http2-server/src/main/config/modules/http2.mod

@@ -4,13 +4,12 @@
 
 [depend]
 ssl
-protonego
+alpn
 
 [lib]
 lib/http2/*.jar
 
 [xml]
-etc/protonego-${protonego}.xml
 etc/jetty-http2.xml
 
 [ini-template]