Browse Source

AMBARI-10379. Need to say JCE with JDK choice.(vbrodetskyi)

Vitaly Brodetskyi 10 years ago
parent
commit
cbdfbfca0c

+ 2 - 2
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

+ 1 - 1
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",