jetty-start / updating test case module files.

+ updated test modules are a copy of what is being used in the
  distribution right now.

16 files changed, 58 insertions, 4 deletions

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 beed91f347..6be72f6588 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 0e4de98b9e..fadd30c276 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<String> 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 8a8be8e57d..165a9e4140 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 1349723c15..327b770420 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 4fe98488a0..75fb89ce9f 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 0000000000..e69de29bb2
--- /dev/null
+++ b/jetty-start/src/test/resources/usecases/home/lib/websocket/javax-websocket-server-impl-TEST.jar
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 0000000000..e69de29bb2
--- /dev/null
+++ b/jetty-start/src/test/resources/usecases/home/lib/websocket/websocket-api-TEST.jar
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 0000000000..e69de29bb2
--- /dev/null
+++ b/jetty-start/src/test/resources/usecases/home/lib/websocket/websocket-client-TEST.jar
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 0000000000..e69de29bb2
--- /dev/null
+++ b/jetty-start/src/test/resources/usecases/home/lib/websocket/websocket-common-TEST.jar
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 0000000000..e69de29bb2
--- /dev/null
+++ b/jetty-start/src/test/resources/usecases/home/lib/websocket/websocket-server-TEST.jar
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 0000000000..e69de29bb2
--- /dev/null
+++ b/jetty-start/src/test/resources/usecases/home/lib/websocket/websocket-servlet-TEST.jar
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 0000000000..1ee750bfa6
--- /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 d0d6f0fa46..2a608c7487 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 0000000000..d24dddf44d
--- /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 0000000000..bca2feaccc
--- /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 e61ec33e18..a74a1072ac 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