Repository: incubator-atlas Updated Branches: refs/heads/master d9f2bf507 -> aafc06c4c
ATLAS-280 The url of jceks cause some test cases always fail under Windows(liutongfeng via sumasai) Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/aafc06c4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/aafc06c4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/aafc06c4 Branch: refs/heads/master Commit: aafc06c4c477158b6dfbf46c2d8c164a46ad85d5 Parents: d9f2bf5 Author: Suma Shivaprasad <[email protected]> Authored: Fri Nov 6 14:13:46 2015 +0530 Committer: Suma Shivaprasad <[email protected]> Committed: Fri Nov 6 14:13:46 2015 +0530 ---------------------------------------------------------------------- .../org/apache/atlas/util/CredentialProviderUtility.java | 2 +- .../java/org/apache/atlas/CredentialProviderUtilityIT.java | 8 ++++---- .../atlas/web/security/NegativeSSLAndKerberosTest.java | 2 +- .../org/apache/atlas/web/security/SSLAndKerberosTest.java | 2 +- .../src/test/java/org/apache/atlas/web/security/SSLTest.java | 2 +- .../atlas/web/service/SecureEmbeddedServerTestBase.java | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/aafc06c4/webapp/src/main/java/org/apache/atlas/util/CredentialProviderUtility.java ---------------------------------------------------------------------- diff --git a/webapp/src/main/java/org/apache/atlas/util/CredentialProviderUtility.java b/webapp/src/main/java/org/apache/atlas/util/CredentialProviderUtility.java index b714888..58cd318 100755 --- a/webapp/src/main/java/org/apache/atlas/util/CredentialProviderUtility.java +++ b/webapp/src/main/java/org/apache/atlas/util/CredentialProviderUtility.java @@ -148,7 +148,7 @@ public class CredentialProviderUtility { + "overwritten " + "(default is 'yes')\n", providerPath); } - String providerURI = JavaKeyStoreProvider.SCHEME_NAME + "://file" + providerPath; + String providerURI = JavaKeyStoreProvider.SCHEME_NAME + "://file/" + providerPath; Configuration conf = new Configuration(false); conf.set(CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH, providerURI); return CredentialProviderFactory.getProviders(conf).get(0); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/aafc06c4/webapp/src/test/java/org/apache/atlas/CredentialProviderUtilityIT.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/atlas/CredentialProviderUtilityIT.java b/webapp/src/test/java/org/apache/atlas/CredentialProviderUtilityIT.java index dcec28a..18b9a18 100755 --- a/webapp/src/test/java/org/apache/atlas/CredentialProviderUtilityIT.java +++ b/webapp/src/test/java/org/apache/atlas/CredentialProviderUtilityIT.java @@ -68,7 +68,7 @@ public class CredentialProviderUtilityIT { CredentialProviderUtility.main(new String[]{}); - String providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file" + testPath.toUri(); + String providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file/" + testPath.toUri(); Configuration conf = new Configuration(false); conf.set(CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH, providerUrl); @@ -130,7 +130,7 @@ public class CredentialProviderUtilityIT { CredentialProviderUtility.main(new String[]{}); - String providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file" + testPath.toUri(); + String providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file/" + testPath.toUri(); Configuration conf = new Configuration(false); conf.set(CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH, providerUrl); @@ -184,7 +184,7 @@ public class CredentialProviderUtilityIT { CredentialProviderUtility.main(new String[]{}); - String providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file" + testPath.toUri(); + String providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file/" + testPath.toUri(); Configuration conf = new Configuration(false); conf.set(CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH, providerUrl); @@ -250,7 +250,7 @@ public class CredentialProviderUtilityIT { CredentialProviderUtility.main(new String[]{}); - String providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file" + testPath.toUri(); + String providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file/" + testPath.toUri(); Configuration conf = new Configuration(false); conf.set(CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH, providerUrl); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/aafc06c4/webapp/src/test/java/org/apache/atlas/web/security/NegativeSSLAndKerberosTest.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/atlas/web/security/NegativeSSLAndKerberosTest.java b/webapp/src/test/java/org/apache/atlas/web/security/NegativeSSLAndKerberosTest.java index 87d7cac..1182fd3 100755 --- a/webapp/src/test/java/org/apache/atlas/web/security/NegativeSSLAndKerberosTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/security/NegativeSSLAndKerberosTest.java @@ -49,7 +49,7 @@ public class NegativeSSLAndKerberosTest extends BaseSSLAndKerberosTest { @BeforeClass public void setUp() throws Exception { jksPath = new Path(Files.createTempDirectory("tempproviders").toString(), "test.jks"); - providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file" + jksPath.toUri(); + providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file/" + jksPath.toUri(); String persistDir = TestUtils.getTempDirectory(); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/aafc06c4/webapp/src/test/java/org/apache/atlas/web/security/SSLAndKerberosTest.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/atlas/web/security/SSLAndKerberosTest.java b/webapp/src/test/java/org/apache/atlas/web/security/SSLAndKerberosTest.java index 6e48239..f402a20 100755 --- a/webapp/src/test/java/org/apache/atlas/web/security/SSLAndKerberosTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/security/SSLAndKerberosTest.java @@ -59,7 +59,7 @@ public class SSLAndKerberosTest extends BaseSSLAndKerberosTest { @BeforeClass public void setUp() throws Exception { jksPath = new Path(Files.createTempDirectory("tempproviders").toString(), "test.jks"); - providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file" + jksPath.toUri(); + providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file/" + jksPath.toUri(); String persistDir = TestUtils.getTempDirectory(); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/aafc06c4/webapp/src/test/java/org/apache/atlas/web/security/SSLTest.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/atlas/web/security/SSLTest.java b/webapp/src/test/java/org/apache/atlas/web/security/SSLTest.java index e5e2d64..9ee3b46 100755 --- a/webapp/src/test/java/org/apache/atlas/web/security/SSLTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/security/SSLTest.java @@ -66,7 +66,7 @@ public class SSLTest extends BaseSSLAndKerberosTest { @BeforeClass public void setUp() throws Exception { jksPath = new Path(Files.createTempDirectory("tempproviders").toString(), "test.jks"); - providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file" + jksPath.toUri(); + providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file/" + jksPath.toUri(); String persistDir = TestUtils.getTempDirectory(); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/aafc06c4/webapp/src/test/java/org/apache/atlas/web/service/SecureEmbeddedServerTestBase.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/atlas/web/service/SecureEmbeddedServerTestBase.java b/webapp/src/test/java/org/apache/atlas/web/service/SecureEmbeddedServerTestBase.java index c054f5e..b8b8181 100755 --- a/webapp/src/test/java/org/apache/atlas/web/service/SecureEmbeddedServerTestBase.java +++ b/webapp/src/test/java/org/apache/atlas/web/service/SecureEmbeddedServerTestBase.java @@ -91,7 +91,7 @@ public class SecureEmbeddedServerTestBase { @BeforeMethod public void setup() throws Exception { jksPath = new Path(Files.createTempDirectory("tempproviders").toString(), "test.jks"); - providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file" + jksPath.toUri(); + providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file/" + jksPath.toUri(); String baseUrl = "https://localhost:21443/";;
