incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject [5/9] git commit: remove jce
Date Tue, 24 Sep 2013 12:06:31 GMT
remove jce


Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/efa87786
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/efa87786
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/efa87786

Branch: refs/heads/trunk
Commit: efa87786addeaf45866523bdb2b0d16f9408ebcc
Parents: 420f16b
Author: aBabiichuk <ababiichuk@cybervisiontech.com>
Authored: Sat Sep 7 01:24:23 2013 +0300
Committer: aBabiichuk <ababiichuk@cybervisiontech.com>
Committed: Tue Sep 24 14:26:58 2013 +0300

----------------------------------------------------------------------
 ambari-web/app/config.js                              |  1 -
 ambari-web/app/controllers/wizard/step8_controller.js |  3 ---
 ambari-web/app/data/HDP2/global_properties.js         | 14 --------------
 ambari-web/app/data/global_properties.js              | 14 --------------
 4 files changed, 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/efa87786/ambari-web/app/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js
index 7a141f9..96a4cdd 100644
--- a/ambari-web/app/config.js
+++ b/ambari-web/app/config.js
@@ -28,7 +28,6 @@ App.apiPrefix = '/api/v1';
 App.defaultStackVersion = 'HDP-2.0.5';
 App.defaultLocalStackVersion = 'HDPLocal-2.0.5';
 App.defaultJavaHome = '/usr/jdk/jdk1.6.0_31';
-App.defaultJCE = 'http://public-repo-1.hortonworks.com/ARTIFACTS/jce_policy-6.zip';
 App.timeout = 180000; // default AJAX timeout
 App.maxRetries = 3; // max number of retries for certain AJAX calls
 App.bgOperationsUpdateInterval = 6000;

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/efa87786/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index 3024a89..e4ed854 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -1390,9 +1390,6 @@ App.WizardStep8Controller = Em.Controller.extend({
       if (_globalSiteObj.name == 'java64_home') {
         globalSiteProperties['java64_home'] = ambariProperties['java.home'] ? ambariProperties['java.home']
: App.defaultJavaHome ;
       }
-      if (_globalSiteObj.name == 'jce_policy_url') {
-        globalSiteProperties['jce_policy_url'] = ambariProperties['jce_policy.url'] ? ambariProperties['jce_policy.url']
: App.defaultJCE ;
-      }
       this._recordHostOverrideFromObj(_globalSiteObj, 'global', 'version1', this);
     }, this);
     // we don't expose gmond_user to the user; it needs to be the same as gmetad_user

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/efa87786/ambari-web/app/data/HDP2/global_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/global_properties.js b/ambari-web/app/data/HDP2/global_properties.js
index 8f43d2d..3e35e2f 100644
--- a/ambari-web/app/data/HDP2/global_properties.js
+++ b/ambari-web/app/data/HDP2/global_properties.js
@@ -2056,20 +2056,6 @@ module.exports =
     },
     {
       "id": "puppet var",
-      "name": "jce_policy_url",
-      "displayName": "jce_policy_url",
-      "description": " ",
-      "defaultValue": " ",
-      "isRequired": true,
-      "isReconfigurable": false,
-      "displayType": "advanced",
-      "isVisible": false,
-      "domain": "global",
-      "serviceName": "MISC",
-      "belongsToService":[]
-    },
-    {
-      "id": "puppet var",
       "name": "run_dir",
       "displayName": "Hadoop run directory",
       "description": "",

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/efa87786/ambari-web/app/data/global_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/global_properties.js b/ambari-web/app/data/global_properties.js
index e8248b9..5b3e3fc 100644
--- a/ambari-web/app/data/global_properties.js
+++ b/ambari-web/app/data/global_properties.js
@@ -2369,20 +2369,6 @@ module.exports =
     },
     {
       "id": "puppet var",
-      "name": "jce_policy_url",
-      "displayName": "jce_policy_url",
-      "description": " ",
-      "defaultValue": " ",
-      "isRequired": true,
-      "isReconfigurable": false,
-      "displayType": "advanced",
-      "isVisible": false,
-      "domain": "global",
-      "serviceName": "MISC",
-      "belongsToService":[]
-    },
-    {
-      "id": "puppet var",
       "name": "run_dir",
       "displayName": "Hadoop run directory",
       "description": "",


Mime
View raw message