diff options
| author | Joakim Erdfelt | 2015-08-06 00:03:31 +0000 |
|---|---|---|
| committer | Joakim Erdfelt | 2015-08-06 00:08:40 +0000 |
| commit | d02a5c3c8bbf3fe05b262125358677847b303688 (patch) | |
| tree | 71252fea96a7094e6bdd181aa8779dded57745d3 /jetty-start/src/test/resources | |
| parent | 7fd7c914e5074c77678bf8bffecd01c0182104c6 (diff) | |
| download | org.eclipse.jetty.project-d02a5c3c8bbf3fe05b262125358677847b303688.tar.gz org.eclipse.jetty.project-d02a5c3c8bbf3fe05b262125358677847b303688.tar.xz org.eclipse.jetty.project-d02a5c3c8bbf3fe05b262125358677847b303688.zip | |
474361 - Handle JVM version extensions like -internal
+ Refreshed Version.java to handle parsing alternate syntaxes
+ Introduced Version.toShortString() for the non-suffixed versions
+ Using updated Version obj in StartArgs.setProperty("java.version")
to allow both normal System property access and arbitrary property
setting on command line to work in a consistent fashion.
Diffstat (limited to 'jetty-start/src/test/resources')
3 files changed, 3 insertions, 3 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 3d8973b252..f02d1649c7 100644 --- a/jetty-start/src/test/resources/assert-home-with-http2.txt +++ b/jetty-start/src/test/resources/assert-home-with-http2.txt @@ -53,7 +53,7 @@ LIB|${jetty.base}/lib/jetty-jndi-9.3.jar # The Properties we expect (order is irrelevant) # (these are the properties we actually set in the configuration) -PROP|java.version=1.8.0_31 +# PROP|java.version=1.8.0_31 PROP|jetty.http.port=8080 PROP|jetty.httpConfig.delayDispatchUntilContent=false PROP|jetty.server.dumpAfterStart=false diff --git a/jetty-start/src/test/resources/usecases/agent-properties.assert.txt b/jetty-start/src/test/resources/usecases/agent-properties.assert.txt index 5707b4ce40..664fec8381 100644 --- a/jetty-start/src/test/resources/usecases/agent-properties.assert.txt +++ b/jetty-start/src/test/resources/usecases/agent-properties.assert.txt @@ -17,7 +17,7 @@ LIB|${jetty.base}/lib/agent-jdk-1.6.jar # The Properties we expect (order is irrelevant) # (this is the property we actually set in jetty.base) PROP|jetty.http.port=9090 -PROP|java.vm.specification.version=1.6 +# PROP|java.vm.specification.version=1.6 # (these are the ones set by default from jetty.home modules) # PROP|jetty.http.idleTimeout=30000 # PROP|jetty.httpConfig.delayDispatchUntilContent=false diff --git a/jetty-start/src/test/resources/usecases/http2.assert.txt b/jetty-start/src/test/resources/usecases/http2.assert.txt index da7e6208cc..d5baccccbb 100644 --- a/jetty-start/src/test/resources/usecases/http2.assert.txt +++ b/jetty-start/src/test/resources/usecases/http2.assert.txt @@ -25,7 +25,7 @@ LIB|${jetty.home}/lib/http2/http2-server-9.3.jar # The Properties we expect (order is irrelevant) # (this is the property we actually set in jetty.base) PROP|jetty.http.port=9090 -PROP|java.version=1.8.0_31 +#PROP|java.version=1.8.0_31 PROP|jetty.sslContext.keyStorePath=etc/keystore PROP|jetty.sslContext.keyStorePassword=friendly PROP|jetty.sslContext.keyManagerPassword=icecream |