Merge pull request kaazing#6 from nemigaservices/develop

nemigasrv · nemigasrv · commit b6361a22ae82 · 2016-05-19T11:58:37.000-07:00
Changed to WSS.
diff --git a/android/ws/ws-demo-echo/app/src/main/res/values/strings.xml b/android/ws/ws-demo-echo/app/src/main/res/values/strings.xml
@@ -5,7 +5,7 @@
     <string name="password_hint">Password</string>
     <string name="ok_label">OK</string>
     <string name="cancel_label">Cancel</string>
-    <string name="location_default">ws://sandbox.kaazing.net/echo</string>
+    <string name="location_default">wss://sandbox.kaazing.net/echo</string>
     <string name="disconnect_label">Disconnect</string>
     <string name="connect_label">Connect</string>
     <string name="message_default">Hello World!</string>
diff --git a/android/ws/ws-demo-echo/res/values/strings.xml b/android/ws/ws-demo-echo/res/values/strings.xml
@@ -5,7 +5,7 @@
     <string name="password_hint">Password</string>
     <string name="ok_label">OK</string>
     <string name="cancel_label">Cancel</string>
-    <string name="location_default">ws://echo.websocket.org/</string>
+    <string name="location_default">wss://echo.websocket.org/</string>
     <string name="disconnect_label">Disconnect</string>
     <string name="connect_label">Connect</string>
     <string name="message_default">Hello World!</string>
diff --git a/j2se/java-amqp-demo/README.md b/j2se/java-amqp-demo/README.md
@@ -13,3 +13,8 @@ gradle installDist
 ```bash
 build/install/java-amqp-demo/bin/java-amqp-demo
 ```
+or
+```
+build\install\java-amqp-demo\bin\java-amqp-demo.bat
+```
+
diff --git a/j2se/java-amqp-demo/src/main/java/com/kaazing/amqp/client/demo/JavaAmqpClientDemo.java b/j2se/java-amqp-demo/src/main/java/com/kaazing/amqp/client/demo/JavaAmqpClientDemo.java
@@ -205,7 +205,7 @@ public void sendMessage(String message) {
 	}
 
 	public static void main(String[] args) throws InterruptedException, URISyntaxException, IOException {
-		JavaAmqpClientDemo demo = new JavaAmqpClientDemo(new URI("ws://sandbox.kaazing.net/amqp091"), "guest", "guest");
+		JavaAmqpClientDemo demo = new JavaAmqpClientDemo(new URI("wss://sandbox.kaazing.net/amqp091"), "guest", "guest");
 		System.out.println("Kaazing Java AMQP Demo App. Copyright (C) 2016 Kaazing, Inc.");
 		System.out.println("Type the message to send or <exit> to stop.");
 		BufferedReader console = new BufferedReader(new InputStreamReader(System.in));
diff --git a/j2se/java-jms-demo/README.md b/j2se/java-jms-demo/README.md
@@ -13,3 +13,7 @@ gradle installDist
 ```bash
 build/install/java-jms-demo/bin/java-jms-demo
 ```
+or
+```
+build\install\java-jms-demo\bin\java-jms-demo.bat
+```
diff --git a/j2se/java-ws-demo/README.md b/j2se/java-ws-demo/README.md
@@ -1,6 +1,6 @@
 # J2SE Tutorial for WebSocket
 
-This tutorial contains Java/J2SE sample application for AMQP built using Kaazing Java WebSocket API
+This tutorial contains Java/J2SE sample application for WebSocket built using Kaazing Java WebSocket API
 
 ## Building and running the application
 __Note__: Make sure that you have Gradle 2.10 or higher installed.
@@ -13,3 +13,7 @@ gradle installDist
 ```bash
 build/install/java-ws-demo/bin/java-ws-demo
 ```
+or 
+```
+build\install\java-ws-demo\bin\java-ws-demo.bat
+```
diff --git a/j2se/java-ws-demo/src/main/java/com/kaazing/ws/client/demo/JavaWsClientDemo.java b/j2se/java-ws-demo/src/main/java/com/kaazing/ws/client/demo/JavaWsClientDemo.java
@@ -33,7 +33,8 @@ public void run() {
 					webSocket.connect();
 					final WebSocketMessageReader messageReader = webSocket.getMessageReader();
 					WebSocketMessageType type = null;
-
+					System.out.println("Connected to "+wsUrl);
+					System.out.println("Type the message to send or <exit> to stop.");
 					while ((type = messageReader.next()) != WebSocketMessageType.EOS) {
 						switch (type) {
 
@@ -68,8 +69,7 @@ public void sendMessage(String message) throws IOException {
 
 	public static void main(String[] args) throws InterruptedException, URISyntaxException, IOException, JMSException {
 		JavaWsClientDemo demo = new JavaWsClientDemo(new URI("wss://sandbox.kaazing.net/echo"));
-		System.out.println("Kaazing Java WebSocket	 Demo App. Copyright (C) 2016 Kaazing, Inc.");
-		System.out.println("Type the message to send or <exit> to stop.");
+		System.out.println("Kaazing Java WebSocket	 Demo App. Copyright (C) 2016 Kaazing, Inc.");		
 		BufferedReader console = new BufferedReader(new InputStreamReader(System.in));
 		while (true) {
 			String text = console.readLine();

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ public void sendMessage(String message) {`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`public static void main(String[] args) throws InterruptedException, URISyntaxException, IOException {`
`208`		`- JavaAmqpClientDemo demo = new JavaAmqpClientDemo(new URI("ws://sandbox.kaazing.net/amqp091"), "guest", "guest");`
	`208`	`+ JavaAmqpClientDemo demo = new JavaAmqpClientDemo(new URI("wss://sandbox.kaazing.net/amqp091"), "guest", "guest");`
`209`	`209`	`System.out.println("Kaazing Java AMQP Demo App. Copyright (C) 2016 Kaazing, Inc.");`
`210`	`210`	`System.out.println("Type the message to send or <exit> to stop.");`
`211`	`211`	`BufferedReader console = new BufferedReader(new InputStreamReader(System.in));`