improved protonego module structure to avoid ini files of parameterized modules

6 files changed, 35 insertions, 19 deletions

diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/etc/protonego-alpn.xml b/jetty-alpn/jetty-alpn-server/src/main/config/etc/protonego-alpn.xml
new file mode 100644
index 0000000000..293de040bc
--- /dev/null
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/etc/protonego-alpn.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
+
+<Configure id="protonego" class="org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory">
+    <Arg name="protocols">
+	<Array type="String">
+	    <Item>spdy/3</Item>
+	    <Item>spdy/2</Item>
+	    <Item>http/1.1</Item>
+	</Array>
+    </Arg>
+   
+    <Set name="defaultProtocol">http/1.1</Set>
+
+</Configure>
+
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego/alpn-1.7.0_40.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_40.mod
index 1629449998..09cda68e9e 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego/alpn-1.7.0_40.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_40.mod
@@ -4,6 +4,5 @@ protonego-boot
 [files]
 http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0/alpn-boot-7.0.0.jar:lib/alpn/alpn-boot-7.0.0.jar
 
-[ini-template]
---exec
+[exec]
 -Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.jar
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego/alpn-1.7.0_45.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_45.mod
index 1629449998..09cda68e9e 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego/alpn-1.7.0_45.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_45.mod
@@ -4,6 +4,5 @@ protonego-boot
 [files]
 http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0/alpn-boot-7.0.0.jar:lib/alpn/alpn-boot-7.0.0.jar
 
-[ini-template]
---exec
+[exec]
 -Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.jar
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego/alpn-1.7.0_51.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_51.mod
index 1629449998..09cda68e9e 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego/alpn-1.7.0_51.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_51.mod
@@ -4,6 +4,5 @@ protonego-boot
 [files]
 http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0/alpn-boot-7.0.0.jar:lib/alpn/alpn-boot-7.0.0.jar
 
-[ini-template]
---exec
+[exec]
 -Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.jar
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego/alpn-1.8.0.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0.mod
index 79471c6f79..b738281cb9 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego/alpn-1.8.0.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0.mod
@@ -4,6 +4,5 @@ protonego-boot
 [files]
 http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.0.0/alpn-boot-8.0.0.jar:lib/alpn/alpn-boot-8.0.0.jar
 
-[ini-template]
---exec
+[exec]
 -Xbootclasspath/p:lib/alpn/alpn-boot-8.0.0.jar
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego/alpn.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn.mod
index 59c67709ee..0e399f05cb 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego/alpn.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn.mod
@@ -1,14 +1,3 @@
-[name]
-protonego
-
-[depend]
-protonego/alpn-${java.version}
-
-[files]
-lib/
-lib/alpn/
-
-[ini-template]
 # ALPN is provided via a -Xbootclasspath that modifies the secure connections
 # in java to support the ALPN layer needed for SPDY (and eventually HTTP/2)
 #
@@ -28,5 +17,20 @@ lib/alpn/
 # All versions of alpn-boot can be found at
 # http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/
 
+[name]
+protonego-impl
+
+[depend]
+protonego-impl/alpn-${java.version}
+
+[lib]
+lib/jetty-alpn-client-${jetty.version}.jar
+lib/jetty-alpn-server-${jetty.version}.jar
 
+[xml]
+etc/protonego-alpn.xml
+
+[files]
+lib/
+lib/alpn/