From 38aaf38f2d35bc48eec13e18234a05c5d4ad1c0f Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 26 Aug 2013 15:44:33 -0700 Subject: [PATCH] jetty-start / updating test case module files. + updated test modules are a copy of what is being used in the distribution right now. --- .../java/org/eclipse/jetty/start/ModuleTest.java | 2 +- .../java/org/eclipse/jetty/start/ModulesTest.java | 4 ++-- .../src/test/resources/assert-home-with-jvm.txt | 9 +++++++++ jetty-start/src/test/resources/assert-home.txt | 8 ++++++++ .../usecases/assert-with-module-persistence.txt | 8 ++++++++ .../javax-websocket-server-impl-TEST.jar | 0 .../home/lib/websocket/websocket-api-TEST.jar | 0 .../home/lib/websocket/websocket-client-TEST.jar | 0 .../home/lib/websocket/websocket-common-TEST.jar | 0 .../home/lib/websocket/websocket-server-TEST.jar | 0 .../home/lib/websocket/websocket-servlet-TEST.jar | 0 .../test/resources/usecases/home/modules/demo.mod | 15 +++++++++++++++ .../test/resources/usecases/home/modules/jaas.mod | 2 ++ .../test/resources/usecases/home/modules/jsp.mod | 8 ++++++++ .../test/resources/usecases/home/modules/npn.mod | 4 ++++ .../resources/usecases/home/modules/websocket.mod | 2 +- 16 files changed, 58 insertions(+), 4 deletions(-) create mode 100644 jetty-start/src/test/resources/usecases/home/lib/websocket/javax-websocket-server-impl-TEST.jar create mode 100644 jetty-start/src/test/resources/usecases/home/lib/websocket/websocket-api-TEST.jar create mode 100644 jetty-start/src/test/resources/usecases/home/lib/websocket/websocket-client-TEST.jar create mode 100644 jetty-start/src/test/resources/usecases/home/lib/websocket/websocket-common-TEST.jar create mode 100644 jetty-start/src/test/resources/usecases/home/lib/websocket/websocket-server-TEST.jar create mode 100644 jetty-start/src/test/resources/usecases/home/lib/websocket/websocket-servlet-TEST.jar create mode 100644 jetty-start/src/test/resources/usecases/home/modules/demo.mod create mode 100644 jetty-start/src/test/resources/usecases/home/modules/jsp.mod create mode 100644 jetty-start/src/test/resources/usecases/home/modules/npn.mod diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/ModuleTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/ModuleTest.java index beed91f3478..6be72f65889 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/ModuleTest.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/ModuleTest.java @@ -46,6 +46,6 @@ public class ModuleTest Assert.assertThat("Module Xmls Size",Module.getXmls().size(),is(1)); Assert.assertThat("Module Xmls",Module.getXmls(),contains("etc/jetty-websockets.xml")); Assert.assertThat("Module Options Size",Module.getLibs().size(),is(1)); - Assert.assertThat("Module Options",Module.getLibs(),contains("lib/websockets/*.jar")); + Assert.assertThat("Module Options",Module.getLibs(),contains("lib/websocket/*.jar")); } } diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java index 0e4de98b9e5..fadd30c2764 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java @@ -42,7 +42,7 @@ public class ModulesTest Modules modules = new Modules(); modules.registerAll(basehome); - Assert.assertThat("Module count",modules.count(),is(26)); + Assert.assertThat("Module count",modules.count(),is(29)); } @Test @@ -156,7 +156,7 @@ public class ModulesTest expectedLibs.add("lib/jetty-plus-${jetty.version}.jar"); expectedLibs.add("lib/jetty-annotations-${jetty.version}.jar"); expectedLibs.add("lib/annotations/*.jar"); - expectedLibs.add("lib/websockets/*.jar"); + expectedLibs.add("lib/websocket/*.jar"); List actualLibs = modules.normalizeLibs(active); Assert.assertThat("Resolved Libs: " + actualLibs,actualLibs,contains(expectedLibs.toArray())); 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 8a8be8e57d1..165a9e41409 100644 --- a/jetty-start/src/test/resources/assert-home-with-jvm.txt +++ b/jetty-start/src/test/resources/assert-home-with-jvm.txt @@ -25,6 +25,15 @@ LIB|${jetty.home}/lib/jetty-xml-TEST.jar LIB|${jetty.home}/lib/jndi/javax.activation-1.1.jar LIB|${jetty.home}/lib/jndi/javax.transaction-api-1.2.jar LIB|${jetty.home}/lib/servlet-api-3.1.jar +LIB|${jetty.home}/lib/websocket/javax.websocket-api-1.0.jar +LIB|${jetty.home}/lib/websocket/javax-websocket-client-impl-TEST.jar +LIB|${jetty.home}/lib/websocket/javax-websocket-server-impl-TEST.jar +LIB|${jetty.home}/lib/websocket/websocket-api-TEST.jar +LIB|${jetty.home}/lib/websocket/websocket-client-TEST.jar +LIB|${jetty.home}/lib/websocket/websocket-common-TEST.jar +LIB|${jetty.home}/lib/websocket/websocket-server-TEST.jar +LIB|${jetty.home}/lib/websocket/websocket-servlet-TEST.jar + # The Properties we expect (order is irrelevant) # PROP|jetty.port=9090 diff --git a/jetty-start/src/test/resources/assert-home.txt b/jetty-start/src/test/resources/assert-home.txt index 1349723c154..327b770420a 100644 --- a/jetty-start/src/test/resources/assert-home.txt +++ b/jetty-start/src/test/resources/assert-home.txt @@ -24,6 +24,14 @@ LIB|${jetty.home}/lib/jetty-xml-TEST.jar LIB|${jetty.home}/lib/jndi/javax.activation-1.1.jar LIB|${jetty.home}/lib/jndi/javax.transaction-api-1.2.jar LIB|${jetty.home}/lib/servlet-api-3.1.jar +LIB|${jetty.home}/lib/websocket/javax.websocket-api-1.0.jar +LIB|${jetty.home}/lib/websocket/javax-websocket-client-impl-TEST.jar +LIB|${jetty.home}/lib/websocket/javax-websocket-server-impl-TEST.jar +LIB|${jetty.home}/lib/websocket/websocket-api-TEST.jar +LIB|${jetty.home}/lib/websocket/websocket-client-TEST.jar +LIB|${jetty.home}/lib/websocket/websocket-common-TEST.jar +LIB|${jetty.home}/lib/websocket/websocket-server-TEST.jar +LIB|${jetty.home}/lib/websocket/websocket-servlet-TEST.jar # The Properties we expect (order is irrelevant) PROP|jetty.port=9090 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 4fe98488a02..75fb89ce9f0 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 @@ -23,6 +23,14 @@ LIB|${jetty.home}/lib/jetty-xml-TEST.jar LIB|${jetty.home}/lib/jndi/javax.activation-1.1.jar LIB|${jetty.home}/lib/jndi/javax.transaction-api-1.2.jar LIB|${jetty.home}/lib/servlet-api-3.1.jar +LIB|${jetty.home}/lib/websocket/javax.websocket-api-1.0.jar +LIB|${jetty.home}/lib/websocket/javax-websocket-client-impl-TEST.jar +LIB|${jetty.home}/lib/websocket/javax-websocket-server-impl-TEST.jar +LIB|${jetty.home}/lib/websocket/websocket-api-TEST.jar +LIB|${jetty.home}/lib/websocket/websocket-client-TEST.jar +LIB|${jetty.home}/lib/websocket/websocket-common-TEST.jar +LIB|${jetty.home}/lib/websocket/websocket-server-TEST.jar +LIB|${jetty.home}/lib/websocket/websocket-servlet-TEST.jar # The Properties we expect (order is irrelevant) PROP|jetty.port=12345 diff --git a/jetty-start/src/test/resources/usecases/home/lib/websocket/javax-websocket-server-impl-TEST.jar b/jetty-start/src/test/resources/usecases/home/lib/websocket/javax-websocket-server-impl-TEST.jar new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jetty-start/src/test/resources/usecases/home/lib/websocket/websocket-api-TEST.jar b/jetty-start/src/test/resources/usecases/home/lib/websocket/websocket-api-TEST.jar new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jetty-start/src/test/resources/usecases/home/lib/websocket/websocket-client-TEST.jar b/jetty-start/src/test/resources/usecases/home/lib/websocket/websocket-client-TEST.jar new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jetty-start/src/test/resources/usecases/home/lib/websocket/websocket-common-TEST.jar b/jetty-start/src/test/resources/usecases/home/lib/websocket/websocket-common-TEST.jar new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jetty-start/src/test/resources/usecases/home/lib/websocket/websocket-server-TEST.jar b/jetty-start/src/test/resources/usecases/home/lib/websocket/websocket-server-TEST.jar new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jetty-start/src/test/resources/usecases/home/lib/websocket/websocket-servlet-TEST.jar b/jetty-start/src/test/resources/usecases/home/lib/websocket/websocket-servlet-TEST.jar new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jetty-start/src/test/resources/usecases/home/modules/demo.mod b/jetty-start/src/test/resources/usecases/home/modules/demo.mod new file mode 100644 index 00000000000..1ee750bfa6d --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/demo.mod @@ -0,0 +1,15 @@ +# +# Jetty Demo Module +# + +DEPEND=jndi +DEPEND=jaas +DEPEND=rewrite +DEPEND=client +DEPEND=annotations +DEPEND=websocket + +LIB=demo/lib/*.jar + +demo/test-realm.xml +demo/jetty-demo.xml diff --git a/jetty-start/src/test/resources/usecases/home/modules/jaas.mod b/jetty-start/src/test/resources/usecases/home/modules/jaas.mod index d0d6f0fa463..2a608c74874 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/jaas.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/jaas.mod @@ -2,6 +2,8 @@ # JAAS Feature # +DEPEND=server + # JAAS jars LIB=lib/jetty-jaas-${jetty.version}.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/jsp.mod b/jetty-start/src/test/resources/usecases/home/modules/jsp.mod new file mode 100644 index 00000000000..d24dddf44d5 --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/jsp.mod @@ -0,0 +1,8 @@ +# +# Jetty Servlet Module +# + +DEPEND=servlet + +LIB=lib/jsp/*.jar + diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn.mod b/jetty-start/src/test/resources/usecases/home/modules/npn.mod new file mode 100644 index 00000000000..bca2feaccca --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/npn.mod @@ -0,0 +1,4 @@ + +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/home/modules/websocket.mod b/jetty-start/src/test/resources/usecases/home/modules/websocket.mod index e61ec33e184..a74a1072ac2 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/websocket.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/websocket.mod @@ -7,7 +7,7 @@ DEPEND=server DEPEND=annotations # WebSocket needs websocket jars (as defined in start.config) -LIB=lib/websockets/*.jar +LIB=lib/websocket/*.jar # WebSocket needs websocket configuration etc/jetty-websockets.xml