atlas git commit: ATLAS-2860: Remove dependency on atlas-application.properties for AtlasClient.
Repository: atlas Updated Branches: refs/heads/branch-1.0 9e76ed2eb -> 042f5c2e7 ATLAS-2860: Remove dependency on atlas-application.properties for AtlasClient. Signed-off-by: Madhan Neethiraj (cherry picked from commit 6b953b59c4b1eb05ee4ddd2234b81cd98451ccc2) Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/042f5c2e Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/042f5c2e Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/042f5c2e Branch: refs/heads/branch-1.0 Commit: 042f5c2e7a6ab4b18ec0e114a9b324896e866e54 Parents: 9e76ed2 Author: Ashutosh Mestry Authored: Fri Sep 14 14:36:18 2018 -0700 Committer: Madhan Neethiraj Committed: Mon Sep 17 15:20:48 2018 -0700 -- .../java/org/apache/atlas/hbase/HBaseAtlasHookIT.java | 4 ++-- .../main/java/org/apache/atlas/AtlasBaseClient.java | 2 +- .../org/apache/atlas/security/SecureClientUtils.java | 7 +++ .../java/org/apache/atlas/ApplicationProperties.java | 14 -- 4 files changed, 18 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/atlas/blob/042f5c2e/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java -- diff --git a/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java b/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java index c0d0318..15bfbe3 100644 --- a/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java +++ b/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java @@ -148,7 +148,7 @@ public class HBaseAtlasHookIT { private void createAtlasClient() { try { org.apache.commons.configuration.Configuration configuration = ApplicationProperties.get(); -String[] atlasEndPoint = configuration.getStringArray(HBaseAtlasHook.ATTR_ATLAS_ENDPOINT); +String[] atlasEndPoint = configuration.getStringArray(HBaseAtlasHook.ATTR_ATLAS_ENDPOINT); configuration.setProperty("atlas.cluster.name", CLUSTER_NAME); @@ -163,7 +163,7 @@ public class HBaseAtlasHookIT { } if (AuthenticationUtil.isKerberosAuthenticationEnabled()) { -atlasClient = new AtlasClientV2(configuration, atlasEndPoint, null); +atlasClient = new AtlasClientV2(atlasEndPoint); } else { atlasClient = new AtlasClientV2(configuration, atlasEndPoint, new String[]{"admin", "admin"}); } http://git-wip-us.apache.org/repos/asf/atlas/blob/042f5c2e/client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java -- diff --git a/client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java b/client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java index 4464ade..7ca656d 100644 --- a/client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java +++ b/client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java @@ -258,7 +258,7 @@ public abstract class AtlasBaseClient { // to create a // configuration object, persist it, then subsequently pass in an empty configuration to SSLFactory try { -SecureClientUtils.persistSSLClientConfiguration(configuration); +SecureClientUtils.persistSSLClientConfiguration(configuration, System.getProperty("atlas.conf") ); } catch (Exception e) { LOG.info("Error processing client configuration.", e); } http://git-wip-us.apache.org/repos/asf/atlas/blob/042f5c2e/client/common/src/main/java/org/apache/atlas/security/SecureClientUtils.java -- diff --git a/client/common/src/main/java/org/apache/atlas/security/SecureClientUtils.java b/client/common/src/main/java/org/apache/atlas/security/SecureClientUtils.java index d5392b2..550ef5a 100644 --- a/client/common/src/main/java/org/apache/atlas/security/SecureClientUtils.java +++ b/client/common/src/main/java/org/apache/atlas/security/SecureClientUtils.java @@ -163,8 +163,7 @@ public class SecureClientUtils { connection.setReadTimeout(socketTimeout); } -private static File getSSLClientFile() throws AtlasException { -String confLocation = System.getProperty("atlas.conf"); +private static File getSSLClientFile(String confLocation) throws AtlasException { File sslDir; try { if (confLocation == null) { @@ -185,11 +184,11 @@ public class SecureClientUtils { return new File(sslDir, SecurityProperties.SSL_CLIENT_PROPERTIES); } -
atlas git commit: ATLAS-2860: Remove dependency on atlas-application.properties for AtlasClient.
Repository: atlas Updated Branches: refs/heads/master eae976187 -> 3176d1a1e ATLAS-2860: Remove dependency on atlas-application.properties for AtlasClient. Signed-off-by: Madhan Neethiraj (cherry picked from commit 6b953b59c4b1eb05ee4ddd2234b81cd98451ccc2) Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/3176d1a1 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/3176d1a1 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/3176d1a1 Branch: refs/heads/master Commit: 3176d1a1e4eab9916b7fa0498d8c5a99a7a1382d Parents: eae9761 Author: Ashutosh Mestry Authored: Fri Sep 14 14:36:18 2018 -0700 Committer: Madhan Neethiraj Committed: Mon Sep 17 14:57:35 2018 -0700 -- .../java/org/apache/atlas/hbase/HBaseAtlasHookIT.java | 4 ++-- .../main/java/org/apache/atlas/AtlasBaseClient.java | 2 +- .../org/apache/atlas/security/SecureClientUtils.java | 7 +++ .../java/org/apache/atlas/ApplicationProperties.java | 14 -- 4 files changed, 18 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/atlas/blob/3176d1a1/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java -- diff --git a/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java b/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java index c0d0318..15bfbe3 100644 --- a/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java +++ b/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java @@ -148,7 +148,7 @@ public class HBaseAtlasHookIT { private void createAtlasClient() { try { org.apache.commons.configuration.Configuration configuration = ApplicationProperties.get(); -String[] atlasEndPoint = configuration.getStringArray(HBaseAtlasHook.ATTR_ATLAS_ENDPOINT); +String[] atlasEndPoint = configuration.getStringArray(HBaseAtlasHook.ATTR_ATLAS_ENDPOINT); configuration.setProperty("atlas.cluster.name", CLUSTER_NAME); @@ -163,7 +163,7 @@ public class HBaseAtlasHookIT { } if (AuthenticationUtil.isKerberosAuthenticationEnabled()) { -atlasClient = new AtlasClientV2(configuration, atlasEndPoint, null); +atlasClient = new AtlasClientV2(atlasEndPoint); } else { atlasClient = new AtlasClientV2(configuration, atlasEndPoint, new String[]{"admin", "admin"}); } http://git-wip-us.apache.org/repos/asf/atlas/blob/3176d1a1/client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java -- diff --git a/client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java b/client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java index 4464ade..7ca656d 100644 --- a/client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java +++ b/client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java @@ -258,7 +258,7 @@ public abstract class AtlasBaseClient { // to create a // configuration object, persist it, then subsequently pass in an empty configuration to SSLFactory try { -SecureClientUtils.persistSSLClientConfiguration(configuration); +SecureClientUtils.persistSSLClientConfiguration(configuration, System.getProperty("atlas.conf") ); } catch (Exception e) { LOG.info("Error processing client configuration.", e); } http://git-wip-us.apache.org/repos/asf/atlas/blob/3176d1a1/client/common/src/main/java/org/apache/atlas/security/SecureClientUtils.java -- diff --git a/client/common/src/main/java/org/apache/atlas/security/SecureClientUtils.java b/client/common/src/main/java/org/apache/atlas/security/SecureClientUtils.java index d5392b2..550ef5a 100644 --- a/client/common/src/main/java/org/apache/atlas/security/SecureClientUtils.java +++ b/client/common/src/main/java/org/apache/atlas/security/SecureClientUtils.java @@ -163,8 +163,7 @@ public class SecureClientUtils { connection.setReadTimeout(socketTimeout); } -private static File getSSLClientFile() throws AtlasException { -String confLocation = System.getProperty("atlas.conf"); +private static File getSSLClientFile(String confLocation) throws AtlasException { File sslDir; try { if (confLocation == null) { @@ -185,11 +184,11 @@ public class SecureClientUtils { return new File(sslDir, SecurityProperties.SSL_CLIENT_PROPERTIES); } -public
atlas git commit: ATLAS-2860: Remove dependency on atlas-application.properties for AtlasClient.
Repository: atlas Updated Branches: refs/heads/branch-0.8 fb635ece9 -> 6b953b59c ATLAS-2860: Remove dependency on atlas-application.properties for AtlasClient. Signed-off-by: Madhan Neethiraj Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/6b953b59 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/6b953b59 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/6b953b59 Branch: refs/heads/branch-0.8 Commit: 6b953b59c4b1eb05ee4ddd2234b81cd98451ccc2 Parents: fb635ec Author: Ashutosh Mestry Authored: Fri Sep 14 14:36:18 2018 -0700 Committer: Madhan Neethiraj Committed: Mon Sep 17 14:40:14 2018 -0700 -- .../java/org/apache/atlas/hbase/HBaseAtlasHookIT.java | 4 ++-- .../main/java/org/apache/atlas/AtlasBaseClient.java | 2 +- .../org/apache/atlas/security/SecureClientUtils.java | 7 +++ .../java/org/apache/atlas/ApplicationProperties.java | 14 -- 4 files changed, 18 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/atlas/blob/6b953b59/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java -- diff --git a/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java b/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java index c0d0318..15bfbe3 100644 --- a/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java +++ b/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java @@ -148,7 +148,7 @@ public class HBaseAtlasHookIT { private void createAtlasClient() { try { org.apache.commons.configuration.Configuration configuration = ApplicationProperties.get(); -String[] atlasEndPoint = configuration.getStringArray(HBaseAtlasHook.ATTR_ATLAS_ENDPOINT); +String[] atlasEndPoint = configuration.getStringArray(HBaseAtlasHook.ATTR_ATLAS_ENDPOINT); configuration.setProperty("atlas.cluster.name", CLUSTER_NAME); @@ -163,7 +163,7 @@ public class HBaseAtlasHookIT { } if (AuthenticationUtil.isKerberosAuthenticationEnabled()) { -atlasClient = new AtlasClientV2(configuration, atlasEndPoint, null); +atlasClient = new AtlasClientV2(atlasEndPoint); } else { atlasClient = new AtlasClientV2(configuration, atlasEndPoint, new String[]{"admin", "admin"}); } http://git-wip-us.apache.org/repos/asf/atlas/blob/6b953b59/client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java -- diff --git a/client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java b/client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java index d6f767e..ad92191 100644 --- a/client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java +++ b/client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java @@ -272,7 +272,7 @@ public abstract class AtlasBaseClient { // to create a // configuration object, persist it, then subsequently pass in an empty configuration to SSLFactory try { -SecureClientUtils.persistSSLClientConfiguration(configuration); +SecureClientUtils.persistSSLClientConfiguration(configuration, System.getProperty("atlas.conf") ); } catch (Exception e) { LOG.info("Error processing client configuration.", e); } http://git-wip-us.apache.org/repos/asf/atlas/blob/6b953b59/client/common/src/main/java/org/apache/atlas/security/SecureClientUtils.java -- diff --git a/client/common/src/main/java/org/apache/atlas/security/SecureClientUtils.java b/client/common/src/main/java/org/apache/atlas/security/SecureClientUtils.java index d5392b2..550ef5a 100644 --- a/client/common/src/main/java/org/apache/atlas/security/SecureClientUtils.java +++ b/client/common/src/main/java/org/apache/atlas/security/SecureClientUtils.java @@ -163,8 +163,7 @@ public class SecureClientUtils { connection.setReadTimeout(socketTimeout); } -private static File getSSLClientFile() throws AtlasException { -String confLocation = System.getProperty("atlas.conf"); +private static File getSSLClientFile(String confLocation) throws AtlasException { File sslDir; try { if (confLocation == null) { @@ -185,11 +184,11 @@ public class SecureClientUtils { return new File(sslDir, SecurityProperties.SSL_CLIENT_PROPERTIES); } -public static void