ADAP-63: adapter 6.0.0.2 upgrade

wenjunche · wenjunche · commit feb48bf5e7bf · 2016-12-08T14:22:26.000-05:00
diff --git a/RELEASENOTES-ADAPTER.md b/RELEASENOTES-ADAPTER.md
@@ -1,3 +1,10 @@
+# Version 6.0.0.2
+## New Features
+* added ApplicationOptions.put method.
+
+## Bug Fixes
+* Fixed an issue with websocket timeout
+
 # Version 6.0.0.1
 
 ## New Features
diff --git a/release/embed.bat b/release/embed.bat
@@ -1 +1 @@
-java -cp openfin-desktop-java-example-6.0.0.1.jar;openfin-desktop-java-adapter-6.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.embedWaitTime=1000 com.openfin.desktop.demo.WindowEmbedDemo
+java -cp openfin-desktop-java-example-6.0.0.1.jar;openfin-desktop-java-adapter-6.0.0.2.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.embedWaitTime=1000 com.openfin.desktop.demo.WindowEmbedDemo
diff --git a/release/junit.bat b/release/junit.bat
@@ -1 +1 @@
-java -cp openfin-desktop-java-example-6.0.0.1-tests.jar;openfin-desktop-java-adapter-6.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;junit-4.11.jar;hamcrest-core-1.3.jar;hamcrest-core-1.3.jar;hamcrest-library-1.1.jar;mockito-core-1.9.5.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.test.runtime.version=stable org.junit.runner.JUnitCore com.openfin.desktop.AllTests
+java -cp openfin-desktop-java-example-6.0.0.1-tests.jar;openfin-desktop-java-adapter-6.0.0.2.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;junit-4.11.jar;hamcrest-core-1.3.jar;hamcrest-core-1.3.jar;hamcrest-library-1.1.jar;mockito-core-1.9.5.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.test.runtime.version=stable org.junit.runner.JUnitCore com.openfin.desktop.AllTests
diff --git a/release/openfin-desktop-java-adapter-6.0.0.2.jar b/release/openfin-desktop-java-adapter-6.0.0.2.jar
diff --git a/release/run.bat b/release/run.bat
@@ -1 +1 @@
-java -cp openfin-desktop-java-example-6.0.0.1.jar;openfin-desktop-java-adapter-6.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 -Djava.util.logging.config.file=logging.properties -Dcom.openfin.temp=%LocalAppData%\OpenFin\temp  com.openfin.desktop.demo.OpenFinDesktopDemo
+java -cp openfin-desktop-java-example-6.0.0.1.jar;openfin-desktop-java-adapter-6.0.0.2.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 -Djava.util.logging.config.file=logging.properties -Dcom.openfin.temp=%LocalAppData%\OpenFin\temp  com.openfin.desktop.demo.OpenFinDesktopDemo

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-java -cp openfin-desktop-java-example-6.0.0.1.jar;openfin-desktop-java-adapter-6.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.embedWaitTime=1000 com.openfin.desktop.demo.WindowEmbedDemo`
	`1`	`+java -cp openfin-desktop-java-example-6.0.0.1.jar;openfin-desktop-java-adapter-6.0.0.2.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.embedWaitTime=1000 com.openfin.desktop.demo.WindowEmbedDemo`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-java -cp openfin-desktop-java-example-6.0.0.1-tests.jar;openfin-desktop-java-adapter-6.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;junit-4.11.jar;hamcrest-core-1.3.jar;hamcrest-core-1.3.jar;hamcrest-library-1.1.jar;mockito-core-1.9.5.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.test.runtime.version=stable org.junit.runner.JUnitCore com.openfin.desktop.AllTests
	`1`	+java -cp openfin-desktop-java-example-6.0.0.1-tests.jar;openfin-desktop-java-adapter-6.0.0.2.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;junit-4.11.jar;hamcrest-core-1.3.jar;hamcrest-core-1.3.jar;hamcrest-library-1.1.jar;mockito-core-1.9.5.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.test.runtime.version=stable org.junit.runner.JUnitCore com.openfin.desktop.AllTests