updated example code and moved test code into the respective maven folder

Davidiusdadi · Davidiusdadi · commit f4e9b5159587 · 2012-12-09T18:16:45.000+01:00
diff --git a/src/main/example/ChatServer.java b/src/main/example/ChatServer.java
@@ -3,7 +3,7 @@
 import java.io.InputStreamReader;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
-import java.util.Set;
+import java.util.Collection;
 
 import org.java_websocket.WebSocket;
 import org.java_websocket.handshake.ClientHandshake;
@@ -61,6 +61,9 @@ public static void main( String[] args ) throws InterruptedException , IOExcepti
 	@Override
 	public void onError( WebSocket conn, Exception ex ) {
 		ex.printStackTrace();
+		if( websocket != null ) {
+			// some errors like port binding failed may not be assignable to a specific websocket
+		}
 	}
 
 	/**
@@ -72,7 +75,7 @@ public void onError( WebSocket conn, Exception ex ) {
 	 *             When socket related I/O errors occur.
 	 */
 	public void sendToAll( String text ) {
-		Set<WebSocket> con = connections();
+		Collection<WebSocket> con = connections();
 		synchronized ( con ) {
 			for( WebSocket c : con ) {
 				c.send( text );
diff --git a/src/main/example/SSLClientExample.java b/src/main/example/SSLClientExample.java
@@ -77,6 +77,7 @@ public static void main( String[] args ) throws Exception {
 		SSLContext sslContext = null;
 		sslContext = SSLContext.getInstance( "TLS" );
 		sslContext.init( kmf.getKeyManagers(), tmf.getTrustManagers(), null );
+		// sslContext.init( null, null, null ); // will use java's default key and trust store which is sufficient unless you deal with self-signed certificates
 
 		chatclient.setWebSocketFactory( new DefaultSSLWebSocketClientFactory( sslContext ) );
 
diff --git a/src/main/example/SSLServerExample.java b/src/main/example/SSLServerExample.java
@@ -21,7 +21,7 @@ public class SSLServerExample {
 	public static void main( String[] args ) throws Exception {
 		WebSocket.DEBUG = true;
 
-		ChatServer chatserver = new ChatServer( 8887 );
+		ChatServer chatserver = new ChatServer( 8887 ); // Firefox does allow multible ssl connection only via port 443 //tested on FF16
 
 		// load up the key store
 		String STORETYPE = "JKS";
diff --git a/src/test/java/AutobahnClientTest.java b/src/test/java/AutobahnClientTest.java
@@ -8,6 +8,8 @@
 import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.drafts.Draft;
 import org.java_websocket.drafts.Draft_17;
+import org.java_websocket.framing.FrameBuilder;
+import org.java_websocket.framing.Framedata;
 import org.java_websocket.handshake.ServerHandshake;
 
 public class AutobahnClientTest extends WebSocketClient {
@@ -120,7 +122,7 @@ public static void main( String[] args ) {
 			e.printStackTrace();
 			System.out.println( "URI should look like ws://localhost:8887 or wss://echo.websocket.org" );
 		} catch ( IOException e ) {
-			e.printStackTrace();
+			e.printStackTrace(); // for System.in reader
 		}
 		System.exit( 0 );
 	}
@@ -150,4 +152,11 @@ public void onClose( int code, String reason, boolean remote ) {
 		System.out.println( "Closed: " + code + " " + reason );
 	}
 
+	@Override
+	public void onWebsocketMessageFragment( WebSocket conn, Framedata frame ) {
+		FrameBuilder builder = (FrameBuilder) frame;
+		builder.setTransferemasked( true );
+		getConnection().sendFrame( frame );
+	}
+
 }
diff --git a/src/test/java/AutobahnServerTest.java b/src/test/java/AutobahnServerTest.java
@@ -6,6 +6,8 @@
 import org.java_websocket.WebSocket;
 import org.java_websocket.drafts.Draft;
 import org.java_websocket.drafts.Draft_17;
+import org.java_websocket.framing.FrameBuilder;
+import org.java_websocket.framing.Framedata;
 import org.java_websocket.handshake.ClientHandshake;
 import org.java_websocket.server.WebSocketServer;
 
@@ -47,6 +49,13 @@ public void onMessage( WebSocket conn, ByteBuffer blob ) {
 		conn.send( blob );
 	}
 
+	@Override
+	public void onWebsocketMessageFragment( WebSocket conn, Framedata frame ) {
+		FrameBuilder builder = (FrameBuilder) frame;
+		builder.setTransferemasked( false );
+		conn.sendFrame( frame );
+	}
+
 	public static void main( String[] args ) throws  UnknownHostException {
 		WebSocket.DEBUG = false;
 		int port;
