Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2015-02-19 23:23:40 +0000
committerJoakim Erdfelt2015-02-19 23:23:40 +0000
commit7bb3127ee1aa9bfa994dec3369e63d60ddbda5ef (patch)
treed094ea341dc2bd852f16355d531f8ae3653a346c /jetty-start
parentd6de16342f26a5a998ace474b0fdc4b4ac1ac0f8 (diff)
downloadorg.eclipse.jetty.project-7bb3127ee1aa9bfa994dec3369e63d60ddbda5ef.tar.gz
org.eclipse.jetty.project-7bb3127ee1aa9bfa994dec3369e63d60ddbda5ef.tar.xz
org.eclipse.jetty.project-7bb3127ee1aa9bfa994dec3369e63d60ddbda5ef.zip
Making jetty-start test cases more aligned with real distro configuration
Diffstat (limited to 'jetty-start')
-rw-r--r--jetty-start/src/test/resources/assert-home-with-http2.txt1
-rw-r--r--jetty-start/src/test/resources/assert-home-with-jvm.txt1
-rw-r--r--jetty-start/src/test/resources/assert-home.txt1
-rw-r--r--jetty-start/src/test/resources/dist-home/start.ini24
4 files changed, 8 insertions, 19 deletions
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 1d47e654da..b852b13650 100644
--- a/jetty-start/src/test/resources/assert-home-with-http2.txt
+++ b/jetty-start/src/test/resources/assert-home-with-http2.txt
@@ -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
diff --git a/jetty-start/src/test/resources/assert-home-with-jvm.txt b/jetty-start/src/test/resources/assert-home-with-jvm.txt
index c52eede451..c8b69bd4c6 100644
--- a/jetty-start/src/test/resources/assert-home-with-jvm.txt
+++ b/jetty-start/src/test/resources/assert-home-with-jvm.txt
@@ -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
diff --git a/jetty-start/src/test/resources/assert-home.txt b/jetty-start/src/test/resources/assert-home.txt
index 11ffedba7f..3abc8000e0 100644
--- a/jetty-start/src/test/resources/assert-home.txt
+++ b/jetty-start/src/test/resources/assert-home.txt
@@ -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
diff --git a/jetty-start/src/test/resources/dist-home/start.ini b/jetty-start/src/test/resources/dist-home/start.ini
index c2748d0e21..141836874d 100644
--- a/jetty-start/src/test/resources/dist-home/start.ini
+++ b/jetty-start/src/test/resources/dist-home/start.ini
@@ -21,6 +21,14 @@
--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

Back to the top