You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2015/04/10 10:38:15 UTC
ambari git commit: AMBARI-10379. Need to say JCE with JDK
choice.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/trunk e989ec0e5 -> cbdfbfca0
AMBARI-10379. Need to say JCE with JDK choice.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cbdfbfca
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cbdfbfca
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cbdfbfca
Branch: refs/heads/trunk
Commit: cbdfbfca0c936c6ec7dfe1155b14cf5b5bc17ac1
Parents: e989ec0
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Wed Apr 8 23:26:24 2015 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Wed Apr 8 23:26:24 2015 +0300
----------------------------------------------------------------------
ambari-server/conf/unix/ambari.properties | 4 ++--
ambari-server/src/main/python/ambari_server/serverSetup.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/cbdfbfca/ambari-server/conf/unix/ambari.properties
----------------------------------------------------------------------
diff --git a/ambari-server/conf/unix/ambari.properties b/ambari-server/conf/unix/ambari.properties
index eee3bb2..eade91b 100644
--- a/ambari-server/conf/unix/ambari.properties
+++ b/ambari-server/conf/unix/ambari.properties
@@ -24,14 +24,14 @@ shared.resources.dir = /usr/lib/ambari-server/lib/ambari_commons/resources
custom.action.definitions = /var/lib/ambari-server/resources/custom_action_definitions
java.releases=jdk1.8,jdk1.7
-jdk1.7.desc=Oracle JDK 1.7 (deprecated)
+jdk1.7.desc=Oracle JDK 1.7 + Java Cryptography Extension (JCE) Policy Files 7 (deprecated)
jdk1.7.url=http://public-repo-1.hortonworks.com/ARTIFACTS/jdk-7u67-linux-x64.tar.gz
jdk1.7.dest-file=jdk-7u67-linux-x64.tar.gz
jdk1.7.jcpol-url=http://public-repo-1.hortonworks.com/ARTIFACTS/UnlimitedJCEPolicyJDK7.zip
jdk1.7.jcpol-file=UnlimitedJCEPolicyJDK7.zip
jdk1.7.home=/usr/jdk64/
jdk1.7.re=(jdk.*)/jre
-jdk1.8.desc=Oracle JDK 1.8
+jdk1.8.desc=Oracle JDK 1.8 + Java Cryptography Extension (JCE) Policy Files 8
jdk1.8.url=http://public-repo-1.hortonworks.com/ARTIFACTS/jdk-8u40-linux-x64.tar.gz
jdk1.8.dest-file=jdk-8u40-linux-x64.tar.gz
jdk1.8.jcpol-url=http://public-repo-1.hortonworks.com/ARTIFACTS/jce_policy-8.zip
http://git-wip-us.apache.org/repos/asf/ambari/blob/cbdfbfca/ambari-server/src/main/python/ambari_server/serverSetup.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari_server/serverSetup.py b/ambari-server/src/main/python/ambari_server/serverSetup.py
index 5c51423..4f700ed 100644
--- a/ambari-server/src/main/python/ambari_server/serverSetup.py
+++ b/ambari-server/src/main/python/ambari_server/serverSetup.py
@@ -644,7 +644,7 @@ class JDKSetupLinux(JDKSetup):
def __init__(self):
super(JDKSetupLinux, self).__init__()
self.JDK_DEFAULT_CONFIGS = [
- JDKRelease("jdk1.8", "Oracle JDK 1.8",
+ JDKRelease("jdk1.8", "Oracle JDK 1.8 + Java Cryptography Extension (JCE) Policy Files 8",
"http://public-repo-1.hortonworks.com/ARTIFACTS/jdk-8u40-linux-x64.tar.gz", "jdk-8u40-linux-x64.tar.gz",
"http://public-repo-1.hortonworks.com/ARTIFACTS/jce_policy-8.zip", "jce_policy-8.zip",
"/usr/jdk64/jdk1.8.0_40",