diff --git a/jetty-spdy/spdy-http-server/src/main/config/modules/spdy.mod b/jetty-spdy/spdy-http-server/src/main/config/modules/spdy.mod index 7d0629f9245..cd45fad3a8e 100644 --- a/jetty-spdy/spdy-http-server/src/main/config/modules/spdy.mod +++ b/jetty-spdy/spdy-http-server/src/main/config/modules/spdy.mod @@ -1,5 +1,6 @@ -DEPEND=server,npn +DEPEND=server +DEPEND=npn LIB=lib/spdy/*.jar diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java b/jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java index ea29a32d60f..482a834fd12 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java @@ -57,9 +57,9 @@ public class TestUseCases } @Test - public void testWithModuleDownload() throws Exception + public void testWithSpdy() throws Exception { - assertUseCase("home","base.with.module.download","assert-with-module-download.txt"); + assertUseCase("home","base.enable.spdy","assert-enable-spdy.txt"); } @Test diff --git a/jetty-start/src/test/resources/usecases/assert-with-module-download.txt b/jetty-start/src/test/resources/usecases/assert-enable-spdy.txt similarity index 59% rename from jetty-start/src/test/resources/usecases/assert-with-module-download.txt rename to jetty-start/src/test/resources/usecases/assert-enable-spdy.txt index 890a0ad3c6f..5d9f2af9152 100644 --- a/jetty-start/src/test/resources/usecases/assert-with-module-download.txt +++ b/jetty-start/src/test/resources/usecases/assert-enable-spdy.txt @@ -2,6 +2,8 @@ XML|${jetty.home}/etc/jetty-jmx.xml XML|${jetty.home}/etc/jetty.xml XML|${jetty.home}/etc/jetty-http.xml +XML|${jetty.home}/etc/jetty-ssl.xml +XML|${jetty.home}/etc/jetty-spdy.xml # The LIBs we expect (order is irrelevant) LIB|${jetty.home}/lib/jetty-continuation-TEST.jar @@ -13,12 +15,22 @@ LIB|${jetty.home}/lib/jetty-server-TEST.jar LIB|${jetty.home}/lib/jetty-util-TEST.jar LIB|${jetty.home}/lib/jetty-xml-TEST.jar LIB|${jetty.home}/lib/servlet-api-3.1.jar +LIB|${jetty.home}/lib/spdy/spdy-client-TEST.jar +LIB|${jetty.home}/lib/spdy/spdy-http-server-TEST.jar +LIB|${jetty.home}/lib/spdy/spdy-http-common-TEST.jar +LIB|${jetty.home}/lib/spdy/spdy-server-TEST.jar +LIB|${jetty.home}/lib/spdy/spdy-core-TEST.jar # The Properties we expect (order is irrelevant) PROP|jetty.port=9090 +PROP|jetty.keystore=etc/keystore +PROP|jetty.keystore.password=friendly +PROP|jetty.keymanager.password=icecream +PROP|jetty.truststore=etc/keystore +PROP|jetty.truststore.password=sundae # The Downloads DOWNLOAD|http://repo1.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar:lib/npn/npn-boot-1.1.5.v20130313.jar # The Bootlib -BOOTLIB|-Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar \ No newline at end of file +BOOTLIB|-Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar diff --git a/jetty-start/src/test/resources/usecases/base.enable.spdy/start.ini b/jetty-start/src/test/resources/usecases/base.enable.spdy/start.ini new file mode 100644 index 00000000000..13fa5089f33 --- /dev/null +++ b/jetty-start/src/test/resources/usecases/base.enable.spdy/start.ini @@ -0,0 +1,12 @@ + +--module=server,http,jmx,spdy + +jetty.port=9090 + +# Some SSL keystore configuration +jetty.keystore=etc/keystore +jetty.keystore.password=friendly +jetty.keymanager.password=icecream +jetty.truststore=etc/keystore +jetty.truststore.password=sundae + diff --git a/jetty-start/src/test/resources/usecases/base.with.module.download/modules/npn.mod b/jetty-start/src/test/resources/usecases/base.with.module.download/modules/npn.mod deleted file mode 100644 index bca2feaccca..00000000000 --- a/jetty-start/src/test/resources/usecases/base.with.module.download/modules/npn.mod +++ /dev/null @@ -1,4 +0,0 @@ - -DOWNLOAD=http://repo1.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar:lib/npn/npn-boot-1.1.5.v20130313.jar - -BOOTLIB=-Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar \ No newline at end of file diff --git a/jetty-start/src/test/resources/usecases/base.with.module.download/start.ini b/jetty-start/src/test/resources/usecases/base.with.module.download/start.ini deleted file mode 100644 index f23d7b85836..00000000000 --- a/jetty-start/src/test/resources/usecases/base.with.module.download/start.ini +++ /dev/null @@ -1,4 +0,0 @@ - ---module=server,http,jmx,npn - -jetty.port=9090 diff --git a/jetty-start/src/test/resources/usecases/home/modules/spdy.mod b/jetty-start/src/test/resources/usecases/home/modules/spdy.mod index 1f3d5e99614..cd45fad3a8e 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/spdy.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/spdy.mod @@ -1,5 +1,6 @@ DEPEND=server +DEPEND=npn LIB=lib/spdy/*.jar