Making jetty-start test cases more aligned with real distro configuration

This commit is contained in:
Joakim Erdfelt 2015-02-19 16:23:40 -07:00
parent d6de16342f
commit 7bb3127ee1
4 changed files with 8 additions and 19 deletions

View File

@ -61,7 +61,6 @@ PROP|ssl.port=8443
PROP|ssl.timeout=30000
# (these are the ones set by default from jetty.home modules)
PROP|jetty.port=8080
PROP|jsp-impl=apache
PROP|http.timeout=30000
PROP|jetty.delayDispatchUntilContent=false
PROP|jetty.dump.start=false

View File

@ -50,7 +50,6 @@ LIB|${jetty.base}/lib/websocket/websocket-servlet-TEST.jar
# PROP|jetty.port=8080
# (these are the ones set by default from jetty.home modules)
PROP|jetty.port=8080
PROP|jsp-impl=apache
PROP|http.timeout=30000
PROP|jetty.delayDispatchUntilContent=false
PROP|jetty.dump.start=false

View File

@ -45,7 +45,6 @@ LIB|${jetty.base}/lib/websocket/websocket-servlet-TEST.jar
# (these are the properties we actually set in the configuration)
PROP|jetty.port=9090
# (these are the ones set by default from jetty.home modules)
PROP|jsp-impl=apache
PROP|http.timeout=30000
PROP|jetty.delayDispatchUntilContent=false
PROP|jetty.dump.start=false

View File

@ -20,6 +20,14 @@
# To disable the warning message, comment the following line
--module=home-base-warning
# ---------------------------------------
# Module: apache-jsp
--module=apache-jsp
# ---------------------------------------
# Module: apache-jstl
--module=apache-jstl
# ---------------------------------------
# Module: ext
--module=ext
@ -114,17 +122,6 @@ http.timeout=30000
# ---------------------------------------
# Module: jsp
--module=jsp
# JSP Configuration
# Select JSP implementation, choices are
# glassfish : The reference implementation
# default in jetty <= 9.1
# apache : The apache version
# default jetty >= 9.2
jsp-impl=apache
# To use a non-jdk compiler for JSP compilation when using glassfish uncomment next line
# -Dorg.apache.jasper.compiler.disablejsr199=true
# ---------------------------------------
# Module: websocket
@ -133,9 +130,4 @@ jsp-impl=apache
# ---------------------------------------
# Module: jstl
--module=jstl
# JSTL Configuration
# The glassfish jsp-impl includes JSTL by default and this module
# is not required to activate it.
# The apache jsp-impl does not include JSTL by default and this module
# is required to put JSTL on the container classpath