From 73147d2c8e6fcf46e819c8726f968839a6978961 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Tue, 9 Jun 2015 16:14:32 -0700
Subject: [PATCH] Revert "469341 jetty-startw template properties during
 --module enabling"

This reverts commit 6c2780b9cf6ea78fd638135635e2e67b8b9c3336.
---
 .../java/org/eclipse/jetty/start/StartArgs.java |  7 +++++++
 .../test/resources/assert-home-with-http2.txt   |  2 ++
 .../test/resources/usecases/http2.assert.txt    | 17 +++++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
index 6ad5b2bd794..6e52a5a42fb 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
@@ -1047,6 +1047,13 @@ public class StartArgs
 
     public void parseModule(Module module)
     {
+        if(module.hasDefaultConfig()) 
+        {
+            for(String line: module.getDefaultConfig())
+            {
+                parse(line,module.getFilesystemRef(),false);
+            }
+        }
     }
 
     public void resolveExtraXmls(BaseHome baseHome) throws IOException
diff --git a/jetty-start/src/test/resources/assert-home-with-http2.txt b/jetty-start/src/test/resources/assert-home-with-http2.txt
index bbb4bcba760..6c5cb095b78 100644
--- a/jetty-start/src/test/resources/assert-home-with-http2.txt
+++ b/jetty-start/src/test/resources/assert-home-with-http2.txt
@@ -59,6 +59,8 @@ PROP|java.version=1.7.0_60
 # PROP|jetty.sslContext.truststorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
 # PROP|jetty.ssl.port=8443
 # PROP|jetty.ssl.idleTimeout=30000
+# (these are the ones set by default from jetty.home modules)
+PROP|jetty.alpn.debug=false
 PROP|jetty.http.port=8080
 PROP|jetty.httpConfig.delayDispatchUntilContent=false
 PROP|jetty.server.dumpAfterStart=false
diff --git a/jetty-start/src/test/resources/usecases/http2.assert.txt b/jetty-start/src/test/resources/usecases/http2.assert.txt
index ec70292e183..a8a05d81d85 100644
--- a/jetty-start/src/test/resources/usecases/http2.assert.txt
+++ b/jetty-start/src/test/resources/usecases/http2.assert.txt
@@ -30,6 +30,23 @@ PROP|jetty.sslContext.keyStorePassword=friendly
 PROP|jetty.sslContext.keyManagerPassword=icecream
 PROP|jetty.sslContext.trustStorePath=etc/keystore
 PROP|jetty.sslContext.trustStorePassword=sundae
+# (these are the ones set by default from jetty.home modules)
+PROP|jetty.alpn.debug=false
+# PROP|jetty.httpConfig.securePort=8443
+# PROP|jetty.ssl.port=8443
+# PROP|jetty.ssl.idleTimeout=30000
+# PROP|jetty.http.idleTimeout=30000
+# PROP|jetty.httpConfig.delayDispatchUntilContent=false
+# PROP|jetty.server.dumpAfterStart=false
+# PROP|jetty.server.dumpBeforeStop=false
+# PROP|jetty.httpConfig.outputBufferSize=32768
+# PROP|jetty.httpConfig.requestHeaderSize=8192
+# PROP|jetty.httpConfig.responseHeaderSize=8192
+# PROP|jetty.httpConfig.sendDateHeader=false
+# PROP|jetty.httpConfig.sendServerVersion=true
+# PROP|jetty.threadPool.maxThreads=200
+# PROP|jetty.threadPool.minThreads=10
+# PROP|jetty.threadPool.idleTimeout=60000
 
 # The Downloads
 DOWNLOAD|maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar