Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'jetty-start/src/test/resources/dist-home/modules')
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_40.mod (renamed from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_40.mod)2
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_45.mod (renamed from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_45.mod)2
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_51.mod (renamed from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_51.mod)2
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_55.mod (renamed from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_55.mod)2
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_60.mod (renamed from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_60.mod)2
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_65.mod (renamed from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_65.mod)2
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_67.mod (renamed from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_67.mod)2
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_71.mod (renamed from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_71.mod)2
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_72.mod (renamed from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_72.mod)2
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_75.mod (renamed from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_75.mod)2
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_76.mod (renamed from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_76.mod)2
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0.mod (renamed from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0.mod)2
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_05.mod (renamed from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_05.mod)2
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_11.mod (renamed from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_11.mod)2
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_20.mod (renamed from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_20.mod)2
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_25.mod (renamed from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_25.mod)2
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_31.mod (renamed from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_31.mod)2
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn.mod (renamed from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn.mod)20
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/http2.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/protonego.mod16
20 files changed, 32 insertions, 41 deletions
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_40.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_40.mod
index 0907aa14e2..a1002a48cc 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_40.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_40.mod
@@ -1,5 +1,5 @@
[name]
-protonego-boot
+alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_45.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_45.mod
index 0907aa14e2..a1002a48cc 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_45.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_45.mod
@@ -1,5 +1,5 @@
[name]
-protonego-boot
+alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_51.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_51.mod
index 0907aa14e2..a1002a48cc 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_51.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_51.mod
@@ -1,5 +1,5 @@
[name]
-protonego-boot
+alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_55.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_55.mod
index 0907aa14e2..a1002a48cc 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_55.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_55.mod
@@ -1,5 +1,5 @@
[name]
-protonego-boot
+alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_60.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_60.mod
index 0907aa14e2..a1002a48cc 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_60.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_60.mod
@@ -1,5 +1,5 @@
[name]
-protonego-boot
+alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_65.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_65.mod
index 0907aa14e2..a1002a48cc 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_65.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_65.mod
@@ -1,5 +1,5 @@
[name]
-protonego-boot
+alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_67.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_67.mod
index 0907aa14e2..a1002a48cc 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_67.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_67.mod
@@ -1,5 +1,5 @@
[name]
-protonego-boot
+alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_71.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_71.mod
index 3c143b9560..a554324494 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_71.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_71.mod
@@ -1,5 +1,5 @@
[name]
-protonego-boot
+alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.2.v20141202|lib/alpn/alpn-boot-7.1.2.v20141202.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_72.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_72.mod
index 3c143b9560..a554324494 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_72.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_72.mod
@@ -1,5 +1,5 @@
[name]
-protonego-boot
+alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.2.v20141202|lib/alpn/alpn-boot-7.1.2.v20141202.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_75.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_75.mod
index 4538b43079..3f6f912c6d 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_75.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_75.mod
@@ -1,5 +1,5 @@
[name]
-protonego-boot
+alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.3.v20150130|lib/alpn/alpn-boot-7.1.3.v20150130.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_76.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_76.mod
index 4538b43079..3f6f912c6d 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_76.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_76.mod
@@ -1,5 +1,5 @@
[name]
-protonego-boot
+alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.3.v20150130|lib/alpn/alpn-boot-7.1.3.v20150130.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0.mod
index 3f119b1df0..cb91b4c2fd 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0.mod
@@ -1,5 +1,5 @@
[name]
-protonego-boot
+alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/8.1.0.v20141016|lib/alpn/alpn-boot-8.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_05.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_05.mod
index 3f119b1df0..cb91b4c2fd 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_05.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_05.mod
@@ -1,5 +1,5 @@
[name]
-protonego-boot
+alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/8.1.0.v20141016|lib/alpn/alpn-boot-8.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_11.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_11.mod
index 3f119b1df0..cb91b4c2fd 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_11.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_11.mod
@@ -1,5 +1,5 @@
[name]
-protonego-boot
+alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/8.1.0.v20141016|lib/alpn/alpn-boot-8.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_20.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_20.mod
index 3f119b1df0..cb91b4c2fd 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_20.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_20.mod
@@ -1,5 +1,5 @@
[name]
-protonego-boot
+alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/8.1.0.v20141016|lib/alpn/alpn-boot-8.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_25.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_25.mod
index 9791e631bc..6d6d75efa4 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_25.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_25.mod
@@ -1,5 +1,5 @@
[name]
-protonego-boot
+alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/8.1.2.v20141202|lib/alpn/alpn-boot-8.1.2.v20141202.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_31.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_31.mod
index 1f8b44ee35..e52bd23c1c 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_31.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_31.mod
@@ -1,5 +1,5 @@
[name]
-protonego-boot
+alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/8.1.3.v20150130|lib/alpn/alpn-boot-8.1.3.v20150130.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn.mod b/jetty-start/src/test/resources/dist-home/modules/alpn.mod
index 502c50603c..2a6a1785ec 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn.mod
@@ -1,11 +1,10 @@
# ALPN is provided via a -Xbootclasspath that modifies the secure connections
-# in java to support the ALPN layer needed for HTTP/2
+# in java to support the ALPN layer needed for HTTP/2.
#
# This modification has a tight dependency on specific recent updates of
-# Java 1.7 and Java 1.8
-# (Java versions prior to 1.7u40 are not supported)
+# Java 1.7 and Java 1.8 (Java versions prior to 1.7u40 are not supported).
#
-# The alpn protonego module will use an appropriate alpn-boot jar for your
+# The alpn module will use an appropriate alpn-boot jar for your
# specific version of Java.
#
# IMPORTANT: Versions of Java that exist after this module was created are
@@ -18,19 +17,28 @@
# http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/
[name]
-protonego-impl
+alpn
[depend]
-protonego-impl/alpn-${java.version}
+ssl
+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.
diff --git a/jetty-start/src/test/resources/dist-home/modules/http2.mod b/jetty-start/src/test/resources/dist-home/modules/http2.mod
index b8aed5c512..2be7e7e524 100644
--- a/jetty-start/src/test/resources/dist-home/modules/http2.mod
+++ b/jetty-start/src/test/resources/dist-home/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]
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego.mod b/jetty-start/src/test/resources/dist-home/modules/protonego.mod
deleted file mode 100644
index 818692bf9a..0000000000
--- a/jetty-start/src/test/resources/dist-home/modules/protonego.mod
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Protocol Negotiatin Selection Module
-#
-
-[depend]
-protonego-impl/${protonego}
-
-[ini-template]
-# Protocol Negotiation Implementation Selection
-# Always set to 'alpn'
-protonego=alpn
-
-# Configuration for ALPN
-# alpn.protocols=h2-14,http/1.1
-# alpn.defaultProtocol=http/1.1
-

Back to the top