Fixing imports

Arun Gupta · Arun Gupta · commit 407229f5bb3d · 2013-07-05T10:00:23.000-07:00
Former-commit-id: efdefcc5ba1bd436631d0542e688a6eeb0cb7dd3
diff --git a/samples/websocket/javase-client/pom.xml b/samples/websocket/javase-client/pom.xml
@@ -1,38 +1,37 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.javaee7.websocket</groupId>
         <artifactId>websocket-samples</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
-    <modelVersion>4.0.0</modelVersion>
-
     <groupId>org.javaee7.websocket</groupId>
     <artifactId>javase-client</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>${project.artifactId}</name>
-
+<!--
     <repositories>
         <repository>
             <id>java.net-promoted</id>
             <url>https://maven.java.net/content/groups/promoted/</url>
         </repository>
     </repositories>
+-->
     
     <dependencies>
         <dependency>
             <groupId>org.glassfish.tyrus</groupId>
             <artifactId>tyrus-client</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.1</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.tyrus</groupId>
             <artifactId>tyrus-container-grizzly</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.1</version>
         </dependency> 
     </dependencies>
     
diff --git a/samples/websocket/javase-client/src/main/java/org/javaee7/websocket/javase/client/Client.java b/samples/websocket/javase-client/src/main/java/org/javaee7/websocket/javase/client/Client.java
@@ -37,8 +37,9 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-package org.glassfish.javase.client;
+package org.javaee7.websocket.javase.client;
 
+import java.io.IOException;
 import java.net.URI;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -62,7 +63,7 @@ public static void main(String[] args) {
             System.out.println("Connecting to " + uri);
             container.connectToServer(MyClientEndpoint.class, URI.create(uri));
             messageLatch.await(100, TimeUnit.SECONDS); 
-        } catch (DeploymentException | InterruptedException ex) {
+        } catch (DeploymentException | InterruptedException | IOException ex) {
             Logger.getLogger(Client.class.getName()).log(Level.SEVERE, null, ex);
         }
     }
diff --git a/samples/websocket/javase-client/src/main/java/org/javaee7/websocket/javase/client/MyClientEndpoint.java b/samples/websocket/javase-client/src/main/java/org/javaee7/websocket/javase/client/MyClientEndpoint.java
@@ -37,41 +37,41 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-package org.glassfish.javase.client;
+package org.javaee7.websocket.javase.client;
 
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.websocket.ClientEndpoint;
+import javax.websocket.OnError;
+import javax.websocket.OnMessage;
+import javax.websocket.OnOpen;
 import javax.websocket.Session;
-import javax.websocket.WebSocketClient;
-import javax.websocket.WebSocketError;
-import javax.websocket.WebSocketMessage;
-import javax.websocket.WebSocketOpen;
 
 /**
  * @author Arun Gupta
  */
-@WebSocketClient
+@ClientEndpoint
 public class MyClientEndpoint {
-    @WebSocketOpen
+    @OnOpen
     public void onOpen(Session session) {
-        System.out.println("Connected to endpoint: " + session.getRemote());
+        System.out.println("Connected to endpoint: " + session.getBasicRemote());
         try {
             String name = "Duke";
             System.out.println("Sending message to endpoint: " + name);
-            session.getRemote().sendString(name);
+            session.getBasicRemote().sendText(name);
         } catch (IOException ex) {
             Logger.getLogger(MyClientEndpoint.class.getName()).log(Level.SEVERE, null, ex);
         }
     }
     
-    @WebSocketMessage
+    @OnMessage
     public void processMessage(String message) {
         System.out.println("Received message in client: " + message);
         Client.messageLatch.countDown();
     }
     
-    @WebSocketError
+    @OnError
     public void processError(Throwable t) {
         t.printStackTrace();
     }
