Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated property names: sslConfig -> sslContext.

This commit is contained in:
Simone Bordet 2015-05-26 18:03:11 +02:00
parent a6ff4da9b1
commit 3323a4e88d
8 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml
View File

@ -4,7 +4,7 @@
<!-- ============================================================= --> <!-- ============================================================= -->
<!-- Base SSL configuration --> <!-- Base SSL configuration -->
<!-- This configuration needs to be used together with 1 or more --> <!-- This configuration needs to be used together with 1 or more -->
<!-- of jetty-https.xml and/or jetty-http2.xml --> <!-- of jetty-https.xml and/or jetty-http2.xml -->
<!-- ============================================================= --> <!-- ============================================================= -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
@ -26,19 +26,19 @@
</New> </New>
</Arg> </Arg>
</Call> </Call>
<!-- ============================================================= --> <!-- ============================================================= -->
<!-- Create a TLS (SSL) Context Factory for later reuse --> <!-- Create a TLS (SSL) Context Factory for later reuse -->
<!-- ============================================================= --> <!-- ============================================================= -->
<New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory"> <New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
<Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslConfig.keyStorePath" default="etc/keystore"/></Set> <Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.keyStorePath" default="etc/keystore"/></Set>
<Set name="KeyStorePassword"><Property name="jetty.sslConfig.keyStorePassword" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set> <Set name="KeyStorePassword"><Property name="jetty.sslContext.keyStorePassword" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set>
<Set name="KeyManagerPassword"><Property name="jetty.sslConfig.keyManagerPassword" default="OBF:1u2u1wml1z7s1z7a1wnl1u2g"/></Set> <Set name="KeyManagerPassword"><Property name="jetty.sslContext.keyManagerPassword" default="OBF:1u2u1wml1z7s1z7a1wnl1u2g"/></Set>
<Set name="TrustStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslConfig.trustStorePath" default="etc/keystore"/></Set> <Set name="TrustStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.trustStorePath" default="etc/keystore"/></Set>
<Set name="TrustStorePassword"><Property name="jetty.sslConfig.trustStorePassword" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set> <Set name="TrustStorePassword"><Property name="jetty.sslContext.trustStorePassword" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set>
<Set name="EndpointIdentificationAlgorithm"></Set> <Set name="EndpointIdentificationAlgorithm"></Set>
<Set name="NeedClientAuth"><Property name="jetty.sslConfig.needClientAuth" default="false"/></Set> <Set name="NeedClientAuth"><Property name="jetty.sslContext.needClientAuth" default="false"/></Set>
<Set name="WantClientAuth"><Property name="jetty.sslConfig.wantClientAuth" default="false"/></Set> <Set name="WantClientAuth"><Property name="jetty.sslContext.wantClientAuth" default="false"/></Set>
<Set name="ExcludeCipherSuites"> <Set name="ExcludeCipherSuites">
<Array type="String"> <Array type="String">
<Item>SSL_RSA_WITH_DES_CBC_SHA</Item> <Item>SSL_RSA_WITH_DES_CBC_SHA</Item>
@ -51,7 +51,7 @@
</Array> </Array>
</Set> </Set>
</New> </New>
<!-- =========================================================== --> <!-- =========================================================== -->
<!-- Create a TLS specific HttpConfiguration based on the --> <!-- Create a TLS specific HttpConfiguration based on the -->
<!-- common HttpConfiguration defined in jetty.xml --> <!-- common HttpConfiguration defined in jetty.xml -->

10
jetty-start/src/test/resources/assert-home-with-http2.txt
View File

@ -51,12 +51,12 @@ LIB|${jetty.base}/lib/servlet-api-3.1.jar
# The Properties we expect (order is irrelevant) # The Properties we expect (order is irrelevant)
# (these are the properties we actually set in the configuration) # (these are the properties we actually set in the configuration)
PROP|java.version=1.7.0_60 PROP|java.version=1.7.0_60
# PROP|jetty.sslConfig.keyManagerPassword=OBF:1u2u1wml1z7s1z7a1wnl1u2g # PROP|jetty.sslContext.keyManagerPassword=OBF:1u2u1wml1z7s1z7a1wnl1u2g
# PROP|jetty.sslConfig.keystorePath=etc/keystore # PROP|jetty.sslContext.keystorePath=etc/keystore
# PROP|jetty.sslConfig.keystorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 # PROP|jetty.sslContext.keystorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
# PROP|jetty.httpConfig.securePort=8443 # PROP|jetty.httpConfig.securePort=8443
# PROP|jetty.sslConfig.truststorePath=etc/keystore # PROP|jetty.sslContext.truststorePath=etc/keystore
# PROP|jetty.sslConfig.truststorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 # PROP|jetty.sslContext.truststorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
# PROP|jetty.ssl.port=8443 # PROP|jetty.ssl.port=8443
# PROP|jetty.ssl.idleTimeout=30000 # PROP|jetty.ssl.idleTimeout=30000
# (these are the ones set by default from jetty.home modules) # (these are the ones set by default from jetty.home modules)

14
jetty-start/src/test/resources/dist-home/modules/ssl.mod
View File

@ -41,25 +41,25 @@ http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/
### SslContextFactory Configuration ### SslContextFactory Configuration
## Keystore file path (relative to $jetty.base) ## Keystore file path (relative to $jetty.base)
# jetty.sslConfig.keystorePath=etc/keystore # jetty.sslContext.keystorePath=etc/keystore
## Truststore file path (relative to $jetty.base) ## 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 ## 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 ## See http://www.eclipse.org/jetty/documentation/current/configuring-security-secure-passwords.html
## Keystore password ## Keystore password
# jetty.sslConfig.keystorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 # jetty.sslContext.keystorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
## KeyManager password ## KeyManager password
# jetty.sslConfig.keyManagerPassword=OBF:1u2u1wml1z7s1z7a1wnl1u2g # jetty.sslContext.keyManagerPassword=OBF:1u2u1wml1z7s1z7a1wnl1u2g
## Truststore password ## Truststore password
# jetty.sslConfig.truststorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 # jetty.sslContext.truststorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
## whether client certificate authentication is required ## whether client certificate authentication is required
# jetty.sslConfig.needClientAuth=false # jetty.sslContext.needClientAuth=false
## Whether client certificate authentication is desired ## Whether client certificate authentication is desired
# jetty.sslConfig.wantClientAuth=false # jetty.sslContext.wantClientAuth=false

10
jetty-start/src/test/resources/usecases/assert-enable-spdy-bad-npn-version.txt
View File

@ -4,11 +4,11 @@
# The Properties we expect (order is irrelevant) # The Properties we expect (order is irrelevant)
PROP|jetty.http.port=9090 PROP|jetty.http.port=9090
PROP|jetty.sslConfig.keyStorePath=etc/keystore PROP|jetty.sslContext.keyStorePath=etc/keystore
PROP|jetty.sslConfig.keyStorePassword=friendly PROP|jetty.sslContext.keyStorePassword=friendly
PROP|jetty.sslConfig.keyManagerPassword=icecream PROP|jetty.sslContext.keyManagerPassword=icecream
PROP|jetty.sslConfig.trustStorePath=etc/keystore PROP|jetty.sslContext.trustStorePath=etc/keystore
PROP|jetty.sslConfig.trustStorePassword=sundae PROP|jetty.sslContext.trustStorePassword=sundae
PROP|java.version=1.7.0_01 PROP|java.version=1.7.0_01
# The Downloads # The Downloads

10
jetty-start/src/test/resources/usecases/assert-with-module-persistence.txt
View File

@ -34,11 +34,11 @@ LIB|${jetty.home}/lib/websocket/websocket-servlet-TEST.jar
# The Properties we expect (order is irrelevant) # The Properties we expect (order is irrelevant)
PROP|jetty.http.port=12345 PROP|jetty.http.port=12345
PROP|jetty.sslConfig.keyStorePath=etc/keystore PROP|jetty.sslContext.keyStorePath=etc/keystore
PROP|jetty.sslConfig.keyStorePassword=friendly PROP|jetty.sslContext.keyStorePassword=friendly
PROP|jetty.sslConfig.keyManagerPassword=icecream PROP|jetty.sslContext.keyManagerPassword=icecream
PROP|jetty.sslConfig.trustStorePath=etc/keystore PROP|jetty.sslContext.trustStorePath=etc/keystore
PROP|jetty.sslConfig.trustStorePassword=sundae PROP|jetty.sslContext.trustStorePassword=sundae
# JVM Args # JVM Args
# JVM|-Xms1024m # JVM|-Xms1024m

10
jetty-start/src/test/resources/usecases/http2.assert.txt
View File

@ -25,11 +25,11 @@ LIB|${jetty.home}/lib/http2/http2-server-TEST.jar
# (this is the property we actually set in jetty.base) # (this is the property we actually set in jetty.base)
PROP|jetty.http.port=9090 PROP|jetty.http.port=9090
PROP|java.version=1.7.0_60 PROP|java.version=1.7.0_60
PROP|jetty.sslConfig.keyStorePath=etc/keystore PROP|jetty.sslContext.keyStorePath=etc/keystore
PROP|jetty.sslConfig.keyStorePassword=friendly PROP|jetty.sslContext.keyStorePassword=friendly
PROP|jetty.sslConfig.keyManagerPassword=icecream PROP|jetty.sslContext.keyManagerPassword=icecream
PROP|jetty.sslConfig.trustStorePath=etc/keystore PROP|jetty.sslContext.trustStorePath=etc/keystore
PROP|jetty.sslConfig.trustStorePassword=sundae PROP|jetty.sslContext.trustStorePassword=sundae
# (these are the ones set by default from jetty.home modules) # (these are the ones set by default from jetty.home modules)
PROP|jetty.alpn.debug=false PROP|jetty.alpn.debug=false
# PROP|jetty.httpConfig.securePort=8443 # PROP|jetty.httpConfig.securePort=8443

10
jetty-start/src/test/resources/usecases/http2/start.ini
View File

@ -4,9 +4,9 @@
jetty.http.port=9090 jetty.http.port=9090
# Some SSL keystore configuration # Some SSL keystore configuration
jetty.sslConfig.keyStorePath=etc/keystore jetty.sslContext.keyStorePath=etc/keystore
jetty.sslConfig.keyStorePassword=friendly jetty.sslContext.keyStorePassword=friendly
jetty.sslConfig.keyManagerPassword=icecream jetty.sslContext.keyManagerPassword=icecream
jetty.sslConfig.trustStorePath=etc/keystore jetty.sslContext.trustStorePath=etc/keystore
jetty.sslConfig.trustStorePassword=sundae jetty.sslContext.trustStorePassword=sundae

10
tests/test-integration/src/test/resources/ssl.xml
View File

@ -1,9 +1,9 @@
<Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory"> <Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
<Set name="KeyStorePath"><Property name="jetty.home" default="." />/<Property name="jetty.sslConfig.keyStorePath" default="keystore"/></Set> <Set name="KeyStorePath"><Property name="jetty.home" default="." />/<Property name="jetty.sslContext.keyStorePath" default="keystore"/></Set>
<Set name="KeyStorePassword"><Property name="jetty.sslConfig.keyStorePassword" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set> <Set name="KeyStorePassword"><Property name="jetty.sslContext.keyStorePassword" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set>
<Set name="KeyManagerPassword"><Property name="jetty.sslConfig.keyManagerPassword" default="OBF:1u2u1wml1z7s1z7a1wnl1u2g"/></Set> <Set name="KeyManagerPassword"><Property name="jetty.sslContext.keyManagerPassword" default="OBF:1u2u1wml1z7s1z7a1wnl1u2g"/></Set>
<Set name="TrustStorePath"><Property name="jetty.home" default="." />/<Property name="jetty.sslConfig.trustStorePath" default="keystore"/></Set> <Set name="TrustStorePath"><Property name="jetty.home" default="." />/<Property name="jetty.sslContext.trustStorePath" default="keystore"/></Set>
<Set name="TrustStorePassword"><Property name="jetty.sslConfig.trustStorePassword" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set> <Set name="TrustStorePassword"><Property name="jetty.sslContext.trustStorePassword" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set>
<Set name="EndpointIdentificationAlgorithm"></Set> <Set name="EndpointIdentificationAlgorithm"></Set>
<Set name="ExcludeCipherSuites"> <Set name="ExcludeCipherSuites">
<Array type="String"> <Array type="String">