Repository: incubator-atlas Updated Branches: refs/heads/master 2febe216d -> 09693bfbe
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/09693bfb Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/09693bfb Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/09693bfb Branch: refs/heads/master Commit: 09693bfbeb2e4761e2ec149c346a268e363fa6d3 Parents: 2febe21 Author: Jon Maron <[email protected]> Authored: Sun Jun 14 13:23:35 2015 -0400 Committer: Jon Maron <[email protected]> Committed: Sun Jun 14 13:23:35 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/09693bfb/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/09693bfb/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; }
