From 3323a4e88d03239f1ef941746cea5f4475f35dba Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Tue, 26 May 2015 18:03:11 +0200 Subject: [PATCH] Updated property names: sslConfig -> sslContext. --- .../src/test/config/etc/jetty-ssl.xml | 20 +++++++++---------- .../test/resources/assert-home-with-http2.txt | 10 +++++----- .../test/resources/dist-home/modules/ssl.mod | 14 ++++++------- .../assert-enable-spdy-bad-npn-version.txt | 10 +++++----- .../assert-with-module-persistence.txt | 10 +++++----- .../test/resources/usecases/http2.assert.txt | 10 +++++----- .../test/resources/usecases/http2/start.ini | 10 +++++----- .../src/test/resources/ssl.xml | 10 +++++----- 8 files changed, 47 insertions(+), 47 deletions(-) diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml index a7b0f0746b5..f82386e1e78 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml @@ -4,7 +4,7 @@ - + @@ -26,19 +26,19 @@ - + - / - - - / - + / + + + / + - - + + SSL_RSA_WITH_DES_CBC_SHA @@ -51,7 +51,7 @@ - + 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 527e91f8d30..6c5cb095b78 100644 --- a/jetty-start/src/test/resources/assert-home-with-http2.txt +++ b/jetty-start/src/test/resources/assert-home-with-http2.txt @@ -51,12 +51,12 @@ LIB|${jetty.base}/lib/servlet-api-3.1.jar # The Properties we expect (order is irrelevant) # (these are the properties we actually set in the configuration) PROP|java.version=1.7.0_60 -# PROP|jetty.sslConfig.keyManagerPassword=OBF:1u2u1wml1z7s1z7a1wnl1u2g -# PROP|jetty.sslConfig.keystorePath=etc/keystore -# PROP|jetty.sslConfig.keystorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 +# PROP|jetty.sslContext.keyManagerPassword=OBF:1u2u1wml1z7s1z7a1wnl1u2g +# PROP|jetty.sslContext.keystorePath=etc/keystore +# PROP|jetty.sslContext.keystorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 # PROP|jetty.httpConfig.securePort=8443 -# PROP|jetty.sslConfig.truststorePath=etc/keystore -# PROP|jetty.sslConfig.truststorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 +# PROP|jetty.sslContext.truststorePath=etc/keystore +# 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) diff --git a/jetty-start/src/test/resources/dist-home/modules/ssl.mod b/jetty-start/src/test/resources/dist-home/modules/ssl.mod index 44b4e24ac66..7893e17359b 100644 --- a/jetty-start/src/test/resources/dist-home/modules/ssl.mod +++ b/jetty-start/src/test/resources/dist-home/modules/ssl.mod @@ -41,25 +41,25 @@ http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/ ### SslContextFactory Configuration ## Keystore file path (relative to $jetty.base) -# jetty.sslConfig.keystorePath=etc/keystore +# jetty.sslContext.keystorePath=etc/keystore ## Truststore file path (relative to $jetty.base) -# jetty.sslConfig.truststorePath +# jetty.sslContext.truststorePath ## Note that OBF passwords are not secure, just protected from casual observation ## See http://www.eclipse.org/jetty/documentation/current/configuring-security-secure-passwords.html ## Keystore password -# jetty.sslConfig.keystorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 +# jetty.sslContext.keystorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 ## KeyManager password -# jetty.sslConfig.keyManagerPassword=OBF:1u2u1wml1z7s1z7a1wnl1u2g +# jetty.sslContext.keyManagerPassword=OBF:1u2u1wml1z7s1z7a1wnl1u2g ## Truststore password -# jetty.sslConfig.truststorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 +# jetty.sslContext.truststorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 ## whether client certificate authentication is required -# jetty.sslConfig.needClientAuth=false +# jetty.sslContext.needClientAuth=false ## Whether client certificate authentication is desired -# jetty.sslConfig.wantClientAuth=false +# jetty.sslContext.wantClientAuth=false diff --git a/jetty-start/src/test/resources/usecases/assert-enable-spdy-bad-npn-version.txt b/jetty-start/src/test/resources/usecases/assert-enable-spdy-bad-npn-version.txt index 76a5b5c3b2c..75384a894e1 100644 --- a/jetty-start/src/test/resources/usecases/assert-enable-spdy-bad-npn-version.txt +++ b/jetty-start/src/test/resources/usecases/assert-enable-spdy-bad-npn-version.txt @@ -4,11 +4,11 @@ # The Properties we expect (order is irrelevant) PROP|jetty.http.port=9090 -PROP|jetty.sslConfig.keyStorePath=etc/keystore -PROP|jetty.sslConfig.keyStorePassword=friendly -PROP|jetty.sslConfig.keyManagerPassword=icecream -PROP|jetty.sslConfig.trustStorePath=etc/keystore -PROP|jetty.sslConfig.trustStorePassword=sundae +PROP|jetty.sslContext.keyStorePath=etc/keystore +PROP|jetty.sslContext.keyStorePassword=friendly +PROP|jetty.sslContext.keyManagerPassword=icecream +PROP|jetty.sslContext.trustStorePath=etc/keystore +PROP|jetty.sslContext.trustStorePassword=sundae PROP|java.version=1.7.0_01 # The Downloads diff --git a/jetty-start/src/test/resources/usecases/assert-with-module-persistence.txt b/jetty-start/src/test/resources/usecases/assert-with-module-persistence.txt index c72fa647d89..a3ecd0700c1 100644 --- a/jetty-start/src/test/resources/usecases/assert-with-module-persistence.txt +++ b/jetty-start/src/test/resources/usecases/assert-with-module-persistence.txt @@ -34,11 +34,11 @@ LIB|${jetty.home}/lib/websocket/websocket-servlet-TEST.jar # The Properties we expect (order is irrelevant) PROP|jetty.http.port=12345 -PROP|jetty.sslConfig.keyStorePath=etc/keystore -PROP|jetty.sslConfig.keyStorePassword=friendly -PROP|jetty.sslConfig.keyManagerPassword=icecream -PROP|jetty.sslConfig.trustStorePath=etc/keystore -PROP|jetty.sslConfig.trustStorePassword=sundae +PROP|jetty.sslContext.keyStorePath=etc/keystore +PROP|jetty.sslContext.keyStorePassword=friendly +PROP|jetty.sslContext.keyManagerPassword=icecream +PROP|jetty.sslContext.trustStorePath=etc/keystore +PROP|jetty.sslContext.trustStorePassword=sundae # JVM Args # JVM|-Xms1024m diff --git a/jetty-start/src/test/resources/usecases/http2.assert.txt b/jetty-start/src/test/resources/usecases/http2.assert.txt index ed4b8d1f2c2..a8a05d81d85 100644 --- a/jetty-start/src/test/resources/usecases/http2.assert.txt +++ b/jetty-start/src/test/resources/usecases/http2.assert.txt @@ -25,11 +25,11 @@ LIB|${jetty.home}/lib/http2/http2-server-TEST.jar # (this is the property we actually set in jetty.base) PROP|jetty.http.port=9090 PROP|java.version=1.7.0_60 -PROP|jetty.sslConfig.keyStorePath=etc/keystore -PROP|jetty.sslConfig.keyStorePassword=friendly -PROP|jetty.sslConfig.keyManagerPassword=icecream -PROP|jetty.sslConfig.trustStorePath=etc/keystore -PROP|jetty.sslConfig.trustStorePassword=sundae +PROP|jetty.sslContext.keyStorePath=etc/keystore +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 diff --git a/jetty-start/src/test/resources/usecases/http2/start.ini b/jetty-start/src/test/resources/usecases/http2/start.ini index efd563084e4..96a9c589d1a 100644 --- a/jetty-start/src/test/resources/usecases/http2/start.ini +++ b/jetty-start/src/test/resources/usecases/http2/start.ini @@ -4,9 +4,9 @@ jetty.http.port=9090 # Some SSL keystore configuration -jetty.sslConfig.keyStorePath=etc/keystore -jetty.sslConfig.keyStorePassword=friendly -jetty.sslConfig.keyManagerPassword=icecream -jetty.sslConfig.trustStorePath=etc/keystore -jetty.sslConfig.trustStorePassword=sundae +jetty.sslContext.keyStorePath=etc/keystore +jetty.sslContext.keyStorePassword=friendly +jetty.sslContext.keyManagerPassword=icecream +jetty.sslContext.trustStorePath=etc/keystore +jetty.sslContext.trustStorePassword=sundae diff --git a/tests/test-integration/src/test/resources/ssl.xml b/tests/test-integration/src/test/resources/ssl.xml index 25ed42c431e..eecff79a0c1 100644 --- a/tests/test-integration/src/test/resources/ssl.xml +++ b/tests/test-integration/src/test/resources/ssl.xml @@ -1,9 +1,9 @@ - / - - - / - + / + + + / +