Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
atlas
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dataplatform
atlas
Commits
aafc06c4
Commit
aafc06c4
authored
Nov 06, 2015
by
Suma Shivaprasad
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-280 The url of jceks cause some test cases always fail under Windows(liutongfeng via sumasai)
parent
d9f2bf50
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
9 deletions
+9
-9
CredentialProviderUtility.java
...java/org/apache/atlas/util/CredentialProviderUtility.java
+1
-1
CredentialProviderUtilityIT.java
...st/java/org/apache/atlas/CredentialProviderUtilityIT.java
+4
-4
NegativeSSLAndKerberosTest.java
...apache/atlas/web/security/NegativeSSLAndKerberosTest.java
+1
-1
SSLAndKerberosTest.java
...ava/org/apache/atlas/web/security/SSLAndKerberosTest.java
+1
-1
SSLTest.java
.../src/test/java/org/apache/atlas/web/security/SSLTest.java
+1
-1
SecureEmbeddedServerTestBase.java
...pache/atlas/web/service/SecureEmbeddedServerTestBase.java
+1
-1
No files found.
webapp/src/main/java/org/apache/atlas/util/CredentialProviderUtility.java
View file @
aafc06c4
...
@@ -148,7 +148,7 @@ public class CredentialProviderUtility {
...
@@ -148,7 +148,7 @@ public class CredentialProviderUtility {
+
"overwritten "
+
"overwritten "
+
"(default is 'yes')\n"
,
providerPath
);
+
"(default is 'yes')\n"
,
providerPath
);
}
}
String
providerURI
=
JavaKeyStoreProvider
.
SCHEME_NAME
+
"://file"
+
providerPath
;
String
providerURI
=
JavaKeyStoreProvider
.
SCHEME_NAME
+
"://file
/
"
+
providerPath
;
Configuration
conf
=
new
Configuration
(
false
);
Configuration
conf
=
new
Configuration
(
false
);
conf
.
set
(
CredentialProviderFactory
.
CREDENTIAL_PROVIDER_PATH
,
providerURI
);
conf
.
set
(
CredentialProviderFactory
.
CREDENTIAL_PROVIDER_PATH
,
providerURI
);
return
CredentialProviderFactory
.
getProviders
(
conf
).
get
(
0
);
return
CredentialProviderFactory
.
getProviders
(
conf
).
get
(
0
);
...
...
webapp/src/test/java/org/apache/atlas/CredentialProviderUtilityIT.java
View file @
aafc06c4
...
@@ -68,7 +68,7 @@ public class CredentialProviderUtilityIT {
...
@@ -68,7 +68,7 @@ public class CredentialProviderUtilityIT {
CredentialProviderUtility
.
main
(
new
String
[]{});
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
);
Configuration
conf
=
new
Configuration
(
false
);
conf
.
set
(
CredentialProviderFactory
.
CREDENTIAL_PROVIDER_PATH
,
providerUrl
);
conf
.
set
(
CredentialProviderFactory
.
CREDENTIAL_PROVIDER_PATH
,
providerUrl
);
...
@@ -130,7 +130,7 @@ public class CredentialProviderUtilityIT {
...
@@ -130,7 +130,7 @@ public class CredentialProviderUtilityIT {
CredentialProviderUtility
.
main
(
new
String
[]{});
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
);
Configuration
conf
=
new
Configuration
(
false
);
conf
.
set
(
CredentialProviderFactory
.
CREDENTIAL_PROVIDER_PATH
,
providerUrl
);
conf
.
set
(
CredentialProviderFactory
.
CREDENTIAL_PROVIDER_PATH
,
providerUrl
);
...
@@ -184,7 +184,7 @@ public class CredentialProviderUtilityIT {
...
@@ -184,7 +184,7 @@ public class CredentialProviderUtilityIT {
CredentialProviderUtility
.
main
(
new
String
[]{});
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
);
Configuration
conf
=
new
Configuration
(
false
);
conf
.
set
(
CredentialProviderFactory
.
CREDENTIAL_PROVIDER_PATH
,
providerUrl
);
conf
.
set
(
CredentialProviderFactory
.
CREDENTIAL_PROVIDER_PATH
,
providerUrl
);
...
@@ -250,7 +250,7 @@ public class CredentialProviderUtilityIT {
...
@@ -250,7 +250,7 @@ public class CredentialProviderUtilityIT {
CredentialProviderUtility
.
main
(
new
String
[]{});
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
);
Configuration
conf
=
new
Configuration
(
false
);
conf
.
set
(
CredentialProviderFactory
.
CREDENTIAL_PROVIDER_PATH
,
providerUrl
);
conf
.
set
(
CredentialProviderFactory
.
CREDENTIAL_PROVIDER_PATH
,
providerUrl
);
...
...
webapp/src/test/java/org/apache/atlas/web/security/NegativeSSLAndKerberosTest.java
View file @
aafc06c4
...
@@ -49,7 +49,7 @@ public class NegativeSSLAndKerberosTest extends BaseSSLAndKerberosTest {
...
@@ -49,7 +49,7 @@ public class NegativeSSLAndKerberosTest extends BaseSSLAndKerberosTest {
@BeforeClass
@BeforeClass
public
void
setUp
()
throws
Exception
{
public
void
setUp
()
throws
Exception
{
jksPath
=
new
Path
(
Files
.
createTempDirectory
(
"tempproviders"
).
toString
(),
"test.jks"
);
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
();
String
persistDir
=
TestUtils
.
getTempDirectory
();
...
...
webapp/src/test/java/org/apache/atlas/web/security/SSLAndKerberosTest.java
View file @
aafc06c4
...
@@ -59,7 +59,7 @@ public class SSLAndKerberosTest extends BaseSSLAndKerberosTest {
...
@@ -59,7 +59,7 @@ public class SSLAndKerberosTest extends BaseSSLAndKerberosTest {
@BeforeClass
@BeforeClass
public
void
setUp
()
throws
Exception
{
public
void
setUp
()
throws
Exception
{
jksPath
=
new
Path
(
Files
.
createTempDirectory
(
"tempproviders"
).
toString
(),
"test.jks"
);
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
();
String
persistDir
=
TestUtils
.
getTempDirectory
();
...
...
webapp/src/test/java/org/apache/atlas/web/security/SSLTest.java
View file @
aafc06c4
...
@@ -66,7 +66,7 @@ public class SSLTest extends BaseSSLAndKerberosTest {
...
@@ -66,7 +66,7 @@ public class SSLTest extends BaseSSLAndKerberosTest {
@BeforeClass
@BeforeClass
public
void
setUp
()
throws
Exception
{
public
void
setUp
()
throws
Exception
{
jksPath
=
new
Path
(
Files
.
createTempDirectory
(
"tempproviders"
).
toString
(),
"test.jks"
);
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
();
String
persistDir
=
TestUtils
.
getTempDirectory
();
...
...
webapp/src/test/java/org/apache/atlas/web/service/SecureEmbeddedServerTestBase.java
View file @
aafc06c4
...
@@ -91,7 +91,7 @@ public class SecureEmbeddedServerTestBase {
...
@@ -91,7 +91,7 @@ public class SecureEmbeddedServerTestBase {
@BeforeMethod
@BeforeMethod
public
void
setup
()
throws
Exception
{
public
void
setup
()
throws
Exception
{
jksPath
=
new
Path
(
Files
.
createTempDirectory
(
"tempproviders"
).
toString
(),
"test.jks"
);
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/"
;
String
baseUrl
=
"https://localhost:21443/"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment