Fixing jetty-osgi for new websocket artifacts

jetty-osgi/test-jetty-osgi/pom.xml

@@ -22,11 +22,6 @@
     <npn-version>1.1.0.v20120525</npn-version>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit-dep</artifactId>
-      <version>4.10</version>
-    </dependency>
     <!-- Pax Exam Dependencies -->
     <!-- OPS4J Swissbox Dependencies -->
     <dependency>
@@ -233,6 +228,18 @@
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.websocket</groupId>
+      <artifactId>websocket-api</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.websocket</groupId>
+      <artifactId>websocket-common</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-client</artifactId>
@@ -241,7 +248,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-core</artifactId>
+      <artifactId>websocket-servlet</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
@@ -251,6 +258,11 @@
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.drafts</groupId>
+      <artifactId>javax.websocket-api</artifactId>
+      <scope>runtime</scope>
+    </dependency>
     
     <dependency>
       <groupId>org.eclipse.jetty.spdy</groupId>
@@ -319,6 +331,11 @@
       <classifier>webbundle</classifier>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.toolchain</groupId>
+      <artifactId>jetty-test-helper</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/AbstractTestOSGi.java

@@ -103,7 +103,10 @@ public class AbstractTestOSGi
 			{
 				diagnoseNonActiveOrNonResolvedBundle(b);
 			}
-			Assert.assertTrue(b.getState() == Bundle.ACTIVE || b.getState() == Bundle.RESOLVED);
+			Assert.assertTrue("Bundle: " + b + " (state should be " + 
+			        "ACTIVE[" + Bundle.ACTIVE + "] or RESOLVED[" + Bundle.RESOLVED + "]" + 
+			        ", but was [" + b.getState() + "])", 
+			        (b.getState() == Bundle.ACTIVE) || (b.getState() == Bundle.RESOLVED));
 		}
 	}
 

jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootCore.java

@@ -86,10 +86,12 @@ public class TestJettyOSGiBootCore extends AbstractTestOSGi {
         res.add(mavenBundle().groupId( "org.eclipse.jetty" ).artifactId( "jetty-security" ).versionAsInProject().noStart());
         res.add(mavenBundle().groupId( "org.eclipse.jetty" ).artifactId( "jetty-servlets" ).versionAsInProject().noStart());
         res.add(mavenBundle().groupId( "org.eclipse.jetty" ).artifactId( "jetty-client" ).versionAsInProject().noStart());
-        res.add(mavenBundle().groupId( "org.eclipse.jetty.websocket" ).artifactId( "websocket-core" ).versionAsInProject().noStart());
+        res.add(mavenBundle().groupId( "org.eclipse.jetty.drafts" ).artifactId( "javax.websocket-api" ).versionAsInProject().noStart());
+        res.add(mavenBundle().groupId( "org.eclipse.jetty.websocket" ).artifactId( "websocket-api" ).versionAsInProject().noStart());
+        res.add(mavenBundle().groupId( "org.eclipse.jetty.websocket" ).artifactId( "websocket-common" ).versionAsInProject().noStart());
+        res.add(mavenBundle().groupId( "org.eclipse.jetty.websocket" ).artifactId( "websocket-servlet" ).versionAsInProject().noStart());
         res.add(mavenBundle().groupId( "org.eclipse.jetty.websocket" ).artifactId( "websocket-server" ).versionAsInProject().noStart());
-        //optional:
-        //res.add(mavenBundle().groupId( "org.eclipse.jetty.websocket" ).artifactId( "websocket-client" ).versionAsInProject().noStart());
+        res.add(mavenBundle().groupId( "org.eclipse.jetty.websocket" ).artifactId( "websocket-client" ).versionAsInProject().noStart());
         return res;
     }
      

jetty-websocket/websocket-api/pom.xml

@@ -17,8 +17,7 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty.drafts</groupId>
-      <artifactId>javax.net.websocket-api</artifactId>
-      <version>0.006.0.EDR-SNAPSHOT</version>
+      <artifactId>javax.websocket-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.toolchain</groupId>

jetty-websocket/websocket-common/pom.xml

@@ -18,8 +18,7 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty.drafts</groupId>
-      <artifactId>javax.net.websocket-api</artifactId>
-      <version>0.006.0.EDR-SNAPSHOT</version>
+      <artifactId>javax.websocket-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>

pom.xml

@@ -505,6 +505,13 @@
       </dependency>
         -->
 
+      <!-- Draft Deps -->
+      <dependency>
+        <groupId>org.eclipse.jetty.drafts</groupId>
+        <artifactId>javax.websocket-api</artifactId>
+        <version>0.0.006.draft</version>
+      </dependency>
+
       <!-- Old Deps -->
       <dependency>
         <groupId>org.apache.maven</groupId>