Revert "469341 jetty-startw template properties during --module enabling"

This reverts commit 6c2780b9cf.
This commit is contained in:
Joakim Erdfelt 2015-06-09 16:14:32 -07:00
parent 5ae9614d11
commit 73147d2c8e
3 changed files with 26 additions and 0 deletions

View File

@ -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

View File

@ -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

View File

@ -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