diff options
| author | Greg Wilkins | 2015-06-04 03:31:35 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2015-06-04 03:43:14 +0000 |
| commit | 6c2780b9cf6ea78fd638135635e2e67b8b9c3336 (patch) | |
| tree | 7747ae67f9a1dae2bac65894bd0f30ffee4b27e0 /jetty-start/src | |
| parent | e0161ab23472abcc17df04b327e944e4a5af7d82 (diff) | |
| download | org.eclipse.jetty.project-6c2780b9cf6ea78fd638135635e2e67b8b9c3336.tar.gz org.eclipse.jetty.project-6c2780b9cf6ea78fd638135635e2e67b8b9c3336.tar.xz org.eclipse.jetty.project-6c2780b9cf6ea78fd638135635e2e67b8b9c3336.zip | |
469341 jetty-startw template properties during --module enabling
Diffstat (limited to 'jetty-start/src')
3 files changed, 0 insertions, 26 deletions
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 6e52a5a42f..6ad5b2bd79 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,13 +1047,6 @@ 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 6c5cb095b7..bbb4bcba76 100644 --- a/jetty-start/src/test/resources/assert-home-with-http2.txt +++ b/jetty-start/src/test/resources/assert-home-with-http2.txt @@ -59,8 +59,6 @@ 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 a8a05d81d8..ec70292e18 100644 --- a/jetty-start/src/test/resources/usecases/http2.assert.txt +++ b/jetty-start/src/test/resources/usecases/http2.assert.txt @@ -30,23 +30,6 @@ 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 |