ADAP-148: merge from master

wenjunche · wenjunche · commit bb99ef583ab8 · 2019-03-27T16:49:50.000-04:00
diff --git a/release/docking.bat b/release/docking.bat
@@ -3,4 +3,4 @@ REM layout.html is a simple example of OpenFin window that uses Layout service.
 REM For this example to work, layout.html needs to be hosted by a web server and its URL needs to be configured with -Dcom.openfin.demo.layout.url
 REM To set RVM path, add  -Dcom.openfin.demo.layout.rvm=C:\Users\username\AppData\Local\OpenFin\OpenFinRVM.exe
 
-java -cp openfin-desktop-java-example-7.1.1.jar;openfin-desktop-java-adapter-7.1.1-SNAPSHOT.jar;openfin-snap-dock-1.0.0.1.jar;TableLayout-20050920.jar;jna-4.1.0.jar;jna-platform-4.1.0.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;websocket-api-9.3.12.v20160915.jar;websocket-client-9.3.12.v20160915.jar;websocket-common-9.3.12.v20160915.jar;jetty-io-9.3.12.v20160915.jar;jetty-util-9.3.12.v20160915.jar -Dcom.openfin.demo.layout.url=http://localhost:8008/layout.html -Dcom.openfin.demo.layout.rvm=C:\Users\username\AppData\Local\OpenFin\OpenFinRVM.exe com.openfin.desktop.demo.LayoutServiceDemo
+java -cp openfin-desktop-java-example-7.1.1.jar;openfin-desktop-java-adapter-7.1.1-SNAPSHOT.jar;TableLayout-20050920.jar;jna-4.1.0.jar;jna-platform-4.1.0.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;websocket-api-9.3.12.v20160915.jar;websocket-client-9.3.12.v20160915.jar;websocket-common-9.3.12.v20160915.jar;jetty-io-9.3.12.v20160915.jar;jetty-util-9.3.12.v20160915.jar -Dcom.openfin.demo.layout.url=http://localhost:8008/layout.html -Dcom.openfin.demo.layout.rvm=C:\Users\wenju\AppData\Local\OpenFin\OpenFinRVM.exe com.openfin.desktop.demo.LayoutServiceDemo
diff --git a/release/run.bat b/release/run.bat
@@ -1,2 +1,2 @@
-java -cp openfin-desktop-java-example-7.0.2.jar;openfin-desktop-java-adapter-7.0.2.jar;TableLayout-20050920.jar;jna-4.5.1.jar;jna-platform-4.5.1.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;websocket-api-9.3.12.v20160915.jar;websocket-client-9.3.12.v20160915.jar;websocket-common-9.3.12.v20160915.jar;jetty-io-9.3.12.v20160915.jar;jetty-util-9.3.12.v20160915.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.temp=%LocalAppData%\OpenFin\temp -Dcom.openfin.demo.version=stable com.openfin.desktop.demo.OpenFinDesktopDemo
+java -cp openfin-desktop-java-example-7.1.1.jar;openfin-desktop-java-adapter-7.1.1-SNAPSHOT.jar;TableLayout-20050920.jar;jna-4.5.1.jar;jna-platform-4.5.1.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;websocket-api-9.3.12.v20160915.jar;websocket-client-9.3.12.v20160915.jar;websocket-common-9.3.12.v20160915.jar;jetty-io-9.3.12.v20160915.jar;jetty-util-9.3.12.v20160915.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.temp=%LocalAppData%\OpenFin\temp -Dcom.openfin.demo.version=stable com.openfin.desktop.demo.OpenFinDesktopDemo
 
diff --git a/src/main/java/com/openfin/desktop/demo/LayoutFrame.java b/src/main/java/com/openfin/desktop/demo/LayoutFrame.java
@@ -11,7 +11,6 @@
 import com.openfin.desktop.win32.ExternalWindowObserver;
 import com.sun.jna.Native;
 import com.sun.jna.platform.win32.WinDef;
-
 import org.json.JSONArray;
 import org.json.JSONObject;
 
diff --git a/src/main/java/com/openfin/desktop/demo/LayoutServiceDemo.java b/src/main/java/com/openfin/desktop/demo/LayoutServiceDemo.java
@@ -25,8 +25,8 @@
 
 public class LayoutServiceDemo implements DesktopStateListener {
 
-	private final static String appUuid = "layoutServiceDemo";
-	private final static String javaConnectUuid = "layoutServiceDemoJava";
+	private final static String appUuid = "layoutServiceDemo-" + UUID.randomUUID();
+	private final static String javaConnectUuid = "layoutServiceDemoJava-" + UUID.randomUUID();
 
 	private DesktopConnection desktopConnection;
 	private CountDownLatch latch = new CountDownLatch(1);

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		-java -cp openfin-desktop-java-example-7.0.2.jar;openfin-desktop-java-adapter-7.0.2.jar;TableLayout-20050920.jar;jna-4.5.1.jar;jna-platform-4.5.1.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;websocket-api-9.3.12.v20160915.jar;websocket-client-9.3.12.v20160915.jar;websocket-common-9.3.12.v20160915.jar;jetty-io-9.3.12.v20160915.jar;jetty-util-9.3.12.v20160915.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.temp=%LocalAppData%\OpenFin\temp -Dcom.openfin.demo.version=stable com.openfin.desktop.demo.OpenFinDesktopDemo
	`1`	+java -cp openfin-desktop-java-example-7.1.1.jar;openfin-desktop-java-adapter-7.1.1-SNAPSHOT.jar;TableLayout-20050920.jar;jna-4.5.1.jar;jna-platform-4.5.1.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;websocket-api-9.3.12.v20160915.jar;websocket-client-9.3.12.v20160915.jar;websocket-common-9.3.12.v20160915.jar;jetty-io-9.3.12.v20160915.jar;jetty-util-9.3.12.v20160915.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.temp=%LocalAppData%\OpenFin\temp -Dcom.openfin.demo.version=stable com.openfin.desktop.demo.OpenFinDesktopDemo
`2`	`2`