ADAP-50: added setRdmUrl and setAssetesUrl

Wenjun Che · Wenjun Che · commit 74e02d38de0e · 2016-03-01T15:36:30.000-05:00
diff --git a/pom.xml b/pom.xml
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>co.openfin</groupId>
             <artifactId>openfin-desktop-java-adapter</artifactId>
-            <version>5.44.2.3</version>
+            <version>5.44.2.4</version>
         </dependency>
         <dependency>
             <groupId>tablelayout</groupId>
diff --git a/src/main/java/com/openfin/desktop/demo/OpenFinDesktopDemo.java b/src/main/java/com/openfin/desktop/demo/OpenFinDesktopDemo.java
@@ -33,8 +33,11 @@
  *  2. to specify version of OpenFin Runtime
  *      -Dcom.openfin.demo.version=5.44.8.56
  *
- *  3. to specify arguments to be passed to RVM installer
- *      -Dcom.openfin.demo.rvm.arguments="--assetsUrl=https://myServer/release --rvm-config=https://myServer/rvm.json"
+ *  3. to specify RDM URL
+ *      -Dcom.openfin.demo.rdmURL=rdm_url
+ *
+ *  4. to specify URL of RVM&Runtime URL
+ *      -Dcom.openfin.demo.assetsURL=assets_url
  *
  *  4. to connect to a port of a running instance of OpenFin Runtime (this is a deprecated use of OpenFin API
  *      -Dcom.openfin.demo.port=9000
@@ -107,6 +110,8 @@ private void initDesktopConnection() throws DesktopException {
         if (securityRealm != null) {
             this.desktopConnection.setRuntimeSecurityRealm(securityRealm);
         }
+        this.desktopConnection.setRdmUrl(java.lang.System.getProperty("com.openfin.demo.rdmURL"));
+        this.desktopConnection.setRuntimeAssetsUrl(java.lang.System.getProperty("com.openfin.demo.assetsURL"));
         this.desktopConnection.setAdditionalRuntimeArguments("--v=1");  // enable additional logging
     }
 

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,11 @@`
`33`	`33`	`* 2. to specify version of OpenFin Runtime`
`34`	`34`	`* -Dcom.openfin.demo.version=5.44.8.56`
`35`	`35`	`*`
`36`		`- * 3. to specify arguments to be passed to RVM installer`
`37`		`- * -Dcom.openfin.demo.rvm.arguments="--assetsUrl=https://myServer/release --rvm-config=https://myServer/rvm.json"`
	`36`	`+ * 3. to specify RDM URL`
	`37`	`+ * -Dcom.openfin.demo.rdmURL=rdm_url`
	`38`	`+ *`
	`39`	`+ * 4. to specify URL of RVM&Runtime URL`
	`40`	`+ * -Dcom.openfin.demo.assetsURL=assets_url`
`38`	`41`	`*`
`39`	`42`	`* 4. to connect to a port of a running instance of OpenFin Runtime (this is a deprecated use of OpenFin API`
`40`	`43`	`* -Dcom.openfin.demo.port=9000`
`@@ -107,6 +110,8 @@ private void initDesktopConnection() throws DesktopException {`
`107`	`110`	`if (securityRealm != null) {`
`108`	`111`	`this.desktopConnection.setRuntimeSecurityRealm(securityRealm);`
`109`	`112`	`}`
	`113`	`+ this.desktopConnection.setRdmUrl(java.lang.System.getProperty("com.openfin.demo.rdmURL"));`
	`114`	`+ this.desktopConnection.setRuntimeAssetsUrl(java.lang.System.getProperty("com.openfin.demo.assetsURL"));`
`110`	`115`	`this.desktopConnection.setAdditionalRuntimeArguments("--v=1"); // enable additional logging`
`111`	`116`	`}`
`112`	`117`