atlas-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From venkat...@apache.org
Subject [49/58] [abbrv] incubator-atlas git commit: ATLAS-2 keystore and certificate passwords need to be switched
Date Tue, 16 Jun 2015 23:05:23 GMT
ATLAS-2 keystore and certificate passwords need to be switched


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

Branch: refs/heads/master
Commit: 0e18270bdeb1ca32d6ec0a9211841d1a19feebc4
Parents: 2fbe8d9
Author: Jon Maron <jmaron@hortonworks.com>
Authored: Sun Jun 14 13:23:35 2015 -0400
Committer: Jon Maron <jmaron@hortonworks.com>
Committed: Sun Jun 14 13:51:58 2015 -0400

----------------------------------------------------------------------
 src/test/python/scripts/TestMetadata.py                          | 2 +-
 .../java/org/apache/atlas/web/service/SecureEmbeddedServer.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/0e18270b/src/test/python/scripts/TestMetadata.py
----------------------------------------------------------------------
diff --git a/src/test/python/scripts/TestMetadata.py b/src/test/python/scripts/TestMetadata.py
index b24b1c1..0efe96a 100644
--- a/src/test/python/scripts/TestMetadata.py
+++ b/src/test/python/scripts/TestMetadata.py
@@ -50,7 +50,7 @@ class TestMetadata(unittest.TestCase):
         'org.apache.atlas.Main',
         ['-app', 'metadata_home/server/webapp/atlas'],
         'metadata_home/conf:metadata_home/server/webapp/atlas/WEB-INF/classes:metadata_home/server/webapp/atlas/WEB-INF/lib\\*:metadata_home/libext\\*',
-        ['-Datlas.log.dir=metadata_home/logs', '-Datlas.log.file=application.log', '-0Datlas.home=metadata_home',
'-Datlas.conf=metadata_home/conf', '-Xmx1024m'], 'metadata_home/logs')
+        ['-Datlas.log.dir=metadata_home/logs', '-Datlas.log.file=application.log', '-Datlas.home=metadata_home',
'-Datlas.conf=metadata_home/conf', '-Xmx1024m'], 'metadata_home/logs')
     else:
       java_mock.assert_called_with(
         'org.apache.atlas.Main',

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/0e18270b/webapp/src/main/java/org/apache/atlas/web/service/SecureEmbeddedServer.java
----------------------------------------------------------------------
diff --git a/webapp/src/main/java/org/apache/atlas/web/service/SecureEmbeddedServer.java b/webapp/src/main/java/org/apache/atlas/web/service/SecureEmbeddedServer.java
index 63862a9..174dafb 100755
--- a/webapp/src/main/java/org/apache/atlas/web/service/SecureEmbeddedServer.java
+++ b/webapp/src/main/java/org/apache/atlas/web/service/SecureEmbeddedServer.java
@@ -59,11 +59,11 @@ public class SecureEmbeddedServer extends EmbeddedServer {
         connector.setHost("0.0.0.0");
         connector.setKeystore(config.getString(KEYSTORE_FILE_KEY,
                 System.getProperty(KEYSTORE_FILE_KEY, DEFAULT_KEYSTORE_FILE_LOCATION)));
-        connector.setKeyPassword(getPassword(config, KEYSTORE_PASSWORD_KEY));
+        connector.setKeyPassword(getPassword(config, SERVER_CERT_PASSWORD_KEY));
         connector.setTruststore(config.getString(TRUSTSTORE_FILE_KEY,
                 System.getProperty(TRUSTSTORE_FILE_KEY, DEFATULT_TRUSTORE_FILE_LOCATION)));
         connector.setTrustPassword(getPassword(config, TRUSTSTORE_PASSWORD_KEY));
-        connector.setPassword(getPassword(config, SERVER_CERT_PASSWORD_KEY));
+        connector.setPassword(getPassword(config, KEYSTORE_PASSWORD_KEY));
         connector.setWantClientAuth(config.getBoolean(CLIENT_AUTH_KEY, Boolean.getBoolean(CLIENT_AUTH_KEY)));
         return connector;
     }


Mime
View raw message