Merge branch 'develop' of https://github.com/openfin/java-example into develop

wenjunche · wenjunche · commit ea0bf3d3e62f · 2017-11-27T13:01:42.000-05:00
diff --git a/release/run.sh b/release/run.sh
@@ -0,0 +1,2 @@
+java -cp openfin-desktop-java-example-6.0.1.2.jar:openfin-desktop-java-adapter-6.0.1.3-SNAPSHOT.jar:TableLayout-20050920.jar:jna-4.2.2.jar:jna-platform-4.2.2.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.installer.location=/someDir/start.sh  -Dcom.openfin.demo.version=8.56.26.48 com.openfin.desktop.demo.OpenFinDesktopDemo
+

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+java -cp openfin-desktop-java-example-6.0.1.2.jar:openfin-desktop-java-adapter-6.0.1.3-SNAPSHOT.jar:TableLayout-20050920.jar:jna-4.2.2.jar:jna-platform-4.2.2.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.installer.location=/someDir/start.sh -Dcom.openfin.demo.version=8.56.26.48 com.openfin.desktop.demo.OpenFinDesktopDemo
	`2`	`+`