JBDS-4423 Fuse Installer final touches after rebase

redhat-developer-tooling · Jul 14, 2017 · 3309d10 · 3309d10
1 parent 26a2ffe
commit 3309d10
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 31 deletions.
diff --git a/browser/model/cdk.js b/browser/model/cdk.js
@@ -102,7 +102,6 @@ class CDKInstall extends InstallableItem {
     Logger.info(this.keyName + ' - Set PATH environment variable to \'' + env[Platform.PATH] + '\'');
     return env;
   }
-}
 
   isConfigurationValid() {
     let cygwin = this.installerDataSvc.getInstallable('cygwin');

diff --git a/browser/model/hyperv.js b/browser/model/hyperv.js
@@ -54,7 +54,6 @@ class HypervInstall extends InstallableItem {
       return true;
     }
   }
-}
 
   isDisabled() {
     return true;

diff --git a/browser/model/jbosseap.js b/browser/model/jbosseap.js
@@ -111,7 +111,6 @@ class JbosseapInstall extends InstallableItem {
       && this.isConfigured()
       || this.isSkipped();
   }
-
 }
 
 function fromJson({ installerDataSvc, targetFolderName, downloadUrl, fileName, sha256sum}) {

diff --git a/browser/services/componentLoader.js b/browser/services/componentLoader.js
@@ -71,30 +71,6 @@ class ComponentLoader {
     }
   }
 
-  buildBaseOrder() {
-    let baseOrder = {
-      root: []
-    };
-    let requirements = JSON.parse(JSON.stringify(require('../../requirements.json')));
-    for (let key in requirements) {
-      let item = requirements[key];
-      if( item.bundle !== 'tools') {
-        if(baseOrder[key] == undefined) {
-          baseOrder[key] = [];
-        }
-        if(item.installAfter == undefined) {
-          baseOrder.root.push(key);
-        } else {
-          if (baseOrder[item.installAfter] == undefined) {
-            baseOrder[item.installAfter] = [];
-          }
-          baseOrder[item.installAfter].push(key);
-        }
-      }
-    }
-    return baseOrder;
-  }
-
   buildBaseOrder() {
     let baseOrder = {
       root: []

diff --git a/requirements.json b/requirements.json
@@ -7,7 +7,6 @@
     "installable": true,
     "detectable": false,
     "targetFolderName": "cdk",
-    "installAfter": "cygwin",
     "platform": {
       "win32": {
         "bundle": "yes",
@@ -18,7 +17,6 @@
         "version": "3.0.0.GA",
         "requires": ["cygwin","hyperv||virtualbox"],
         "installAfter": "cygwin"
-        "requires": "cygwin,hyperv||virtualbox"
       },
       "darwin": {
         "bundle": "yes",
@@ -97,7 +95,7 @@
     "additionalLocation": "",
     "additionalIus": "com.jboss.devstudio.fuse.feature.feature.group",
     "useDownload": false,
-    "requires": "devstudio"
+    "requires": ["devstudio"]
   },
   "jbosseap": {
     "name": "Red Hat JBoss Enterprise Application Platform",

diff --git a/test/unit/services/componentLoader-test.js b/test/unit/services/componentLoader-test.js
@@ -55,7 +55,8 @@ describe('Component Loader', function() {
       fileName: 'devstudio.jar',
       sha256sum: 'devstudioSHA',
       version: '10.4.0',
-      installAfter: 'jdk'
+      installAfter: 'devstudio',
+      requires : ['devstudio']
     },
     'cygwin': {
       name: 'cygwin',