ADAP-78: added example for setting fallback version

wenjunche · wenjunche · commit 80656fa4dc78 · 2017-07-04T21:09:22.000-04:00
diff --git a/RELEASENOTES-ADAPTER.md b/RELEASENOTES-ADAPTER.md
@@ -38,6 +38,10 @@
 * Improved support for window embedding
 * Replaced WebSocket library with org.eclipse.jetty.websocket
 
+# Version 5.44.5.1
+## New Features
+* Branch from Version 6.0.1.1 to support Java 1.6
+
 # Version 5.44.3.6
 
 * Fixed an issue with loop of re-connecting to Runtime
diff --git a/pom.xml b/pom.xml
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>co.openfin</groupId>
             <artifactId>openfin-desktop-java-adapter</artifactId>
-            <version>6.0.1.1-SNAPSHOT</version>
+            <version>5.44.5.2</version>
         </dependency>
         <dependency>
             <groupId>co.openfin</groupId>
@@ -93,7 +93,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.5</version>
+            <version>1.7.21</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -135,6 +135,10 @@
                 <configuration>
                     <archive>
                         <manifestFile>${basedir}/target/classes/META-INF/MANIFEST.MF</manifestFile>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <mainClass>com.openfin.desktop.demo.OpenFinDesktopDemo</mainClass>
+                        </manifest>
                     </archive>
                 </configuration>
                 <executions>
@@ -146,6 +150,25 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>
+                                ${project.build.directory}/
+                            </outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <!-- To run all tests:                          -->
             <!-- mvn -DskipTests=false -Dtest=AllTests test -->
             <plugin>
diff --git a/src/main/java/com/openfin/desktop/demo/OpenFinDesktopDemo.java b/src/main/java/com/openfin/desktop/demo/OpenFinDesktopDemo.java
@@ -124,6 +124,11 @@ private void initDesktopConnection() throws DesktopException {
             desktopVersion = "stable";
         }
         this.runtimeConfiguration.setRuntimeVersion(desktopVersion);
+
+        String fallBackVersion = java.lang.System.getProperty("com.openfin.demo.fallBackVersion");
+        if (fallBackVersion != null) {
+            this.runtimeConfiguration.setRuntimeFallbackVersion(fallBackVersion);
+        }
         String rvmArgs = java.lang.System.getProperty("com.openfin.demo.rvm.arguments");
         if (rvmArgs != null) {
             updateMessagePanel("Additional RVM arguments: " + rvmArgs);
@@ -522,7 +527,7 @@ public void onOutgoingMessage(String message) {
                 desktopConnection.connect(listener);
             } else {
                 updateMessagePanel("Connecting to version " + this.runtimeConfiguration.getRuntimeVersion());
-                desktopConnection.connect(this.runtimeConfiguration, listener, 10000);
+                desktopConnection.connect(this.runtimeConfiguration, listener, 10);
             }
         } catch (Exception ex) {
             ex.printStackTrace();
diff --git a/src/main/java/com/openfin/desktop/demo/PubSubTest.java b/src/main/java/com/openfin/desktop/demo/PubSubTest.java
