Removing virtual module [ssl-protonego]

+ This virtual module, rolled the ssl + protonego + (xml) into http2 & spdy modules instead.
2014-11-17 14:08:19 -07:00 · 2014-11-17 14:08:19 -07:00 · d4d6cfdfa7
parent 88900593de
commit d4d6cfdfa7
3 changed files with 6 additions and 13 deletions
--- a/jetty-distribution/src/main/resources/modules/ssl-protonego.mod
+++ b/jetty-distribution/src/main/resources/modules/ssl-protonego.mod
@ -1,11 +0,0 @@
-#
-# SSL Protocol Negotiation Module
-#
-
-[depend]
-ssl
-protonego
-
-[xml]
-etc/protonego-${protonego}.xml
-
--- a/jetty-http2/http2-server/src/main/config/modules/http2.mod
+++ b/jetty-http2/http2-server/src/main/config/modules/http2.mod
@ -3,12 +3,14 @@
 #

 [depend]
-ssl-protonego
+ssl
+protonego

 [lib]
 lib/http2/*.jar

 [xml]
+etc/protonego-${protonego}.xml
 etc/jetty-http2.xml

 [ini-template]
--- a/jetty-spdy/spdy-http-server/src/main/config/modules/spdy.mod
+++ b/jetty-spdy/spdy-http-server/src/main/config/modules/spdy.mod
@ -3,12 +3,14 @@
 #

 [depend]
-ssl-protonego
+ssl
+protonego

 [lib]
 lib/spdy/*.jar

 [xml]
+etc/protonego-${protonego}.xml
 etc/jetty-ssl.xml
 etc/jetty-spdy.xml