Finishing keys refactor
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/dbe659d1 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/dbe659d1 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/dbe659d1 Branch: refs/heads/3.1.x-fixes Commit: dbe659d16f536944afaee85d76715558761936c6 Parents: 907fbb7 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Tue Jun 7 13:47:57 2016 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Tue Jun 7 13:48:41 2016 +0100 ---------------------------------------------------------------------- services/sts/sts-core/pom.xml | 7 +++++++ .../sts/claims/mapper/JexlIssueSamlClaimsTest.java | 2 +- .../apache/cxf/sts/operation/CancelSCTUnitTest.java | 2 +- .../cxf/sts/operation/IssueEncryptedUnitTest.java | 4 ++-- .../cxf/sts/operation/IssueJWTClaimsUnitTest.java | 2 +- .../sts/operation/IssueJWTOnbehalfofUnitTest.java | 2 +- .../cxf/sts/operation/IssueJWTRealmUnitTest.java | 2 +- .../apache/cxf/sts/operation/IssueJWTUnitTest.java | 2 +- .../cxf/sts/operation/IssueOnbehalfofUnitTest.java | 2 +- .../apache/cxf/sts/operation/IssueSCTUnitTest.java | 2 +- .../cxf/sts/operation/IssueSamlClaimsUnitTest.java | 2 +- .../cxf/sts/operation/IssueSamlRealmUnitTest.java | 2 +- .../apache/cxf/sts/operation/IssueSamlUnitTest.java | 4 ++-- .../apache/cxf/sts/operation/RenewSamlUnitTest.java | 2 +- .../operation/ValidateJWTTransformationTest.java | 2 +- .../cxf/sts/operation/ValidateJWTUnitTest.java | 2 +- .../cxf/sts/operation/ValidateSCTUnitTest.java | 2 +- .../cxf/sts/operation/ValidateSamlUnitTest.java | 2 +- .../ValidateTokenTransformationUnitTest.java | 2 +- .../operation/ValidateUsernameTokenUnitTest.java | 2 +- .../sts/operation/ValidateX509TokenUnitTest.java | 2 +- .../cxf/sts/request/RequestParserUnitTest.java | 2 +- .../cxf/sts/token/canceller/SCTCancellerTest.java | 2 +- .../cxf/sts/token/provider/JWTClaimsTest.java | 2 +- .../sts/token/provider/JWTProviderActAsTest.java | 2 +- .../sts/token/provider/JWTProviderLifetimeTest.java | 2 +- .../token/provider/JWTProviderOnBehalfOfTest.java | 2 +- .../token/provider/JWTTokenProviderRealmTest.java | 2 +- .../sts/token/provider/JWTTokenProviderTest.java | 4 ++-- .../cxf/sts/token/provider/SAMLClaimsTest.java | 2 +- .../sts/token/provider/SAMLProviderActAsTest.java | 2 +- .../sts/token/provider/SAMLProviderCustomTest.java | 2 +- .../sts/token/provider/SAMLProviderKeyTypeTest.java | 2 +- .../token/provider/SAMLProviderLifetimeTest.java | 2 +- .../token/provider/SAMLProviderOnBehalfOfTest.java | 2 +- .../sts/token/provider/SAMLProviderRealmTest.java | 2 +- .../cxf/sts/token/provider/SCTProviderTest.java | 2 +- .../token/renewer/SAMLTokenRenewerLifetimeTest.java | 2 +- .../sts/token/renewer/SAMLTokenRenewerPOPTest.java | 2 +- .../token/renewer/SAMLTokenRenewerRealmTest.java | 2 +- .../cxf/sts/token/renewer/SAMLTokenRenewerTest.java | 2 +- .../token/validator/JWTTokenValidatorRealmTest.java | 2 +- .../sts/token/validator/JWTTokenValidatorTest.java | 2 +- .../SAMLTokenValidatorCachedRealmTest.java | 2 +- .../validator/SAMLTokenValidatorRealmTest.java | 2 +- .../sts/token/validator/SAMLTokenValidatorTest.java | 2 +- .../cxf/sts/token/validator/SCTValidatorTest.java | 2 +- .../token/validator/UsernameTokenValidatorTest.java | 2 +- .../sts/token/validator/X509TokenValidatorTest.java | 2 +- .../sts/sts-core/src/test/resources/clientstore.jks | Bin 4559 -> 0 bytes .../sts-core/src/test/resources/servicestore.jks | Bin 3475 -> 0 bytes .../sts/sts-core/src/test/resources/stsstore.jks | Bin 4557 -> 0 bytes services/sts/systests/advanced/pom.xml | 7 +++++++ .../src/test/resources/clientKeystore.properties | 2 +- .../advanced/src/test/resources/clientstore.jks | Bin 4559 -> 0 bytes .../cxf/systest/sts/basic_auth/cxf-bad-client.xml | 2 +- .../cxf/systest/sts/basic_auth/cxf-client.xml | 2 +- .../cxf/systest/sts/basic_auth/cxf-service.xml | 6 +++--- .../cxf/systest/sts/basic_auth/stax-cxf-service.xml | 6 +++--- .../cxf/systest/sts/batch/cxf-client-unit.xml | 4 ++-- .../org/apache/cxf/systest/sts/batch/cxf-sts.xml | 4 ++-- .../apache/cxf/systest/sts/batch/stax-cxf-sts.xml | 4 ++-- .../systest/sts/binarysecuritytoken/cxf-service.xml | 4 ++-- .../sts/binarysecuritytoken/stax-cxf-service.xml | 4 ++-- .../cxf/systest/sts/caching/cxf-caching-service.xml | 8 ++++---- .../apache/cxf/systest/sts/caching/cxf-client.xml | 4 ++-- .../apache/cxf/systest/sts/caching/cxf-service.xml | 8 ++++---- .../cxf/systest/sts/claims/cxf-bad-client.xml | 4 ++-- .../cxf/systest/sts/claims/cxf-client-cbhandler.xml | 4 ++-- .../apache/cxf/systest/sts/claims/cxf-client.xml | 4 ++-- .../apache/cxf/systest/sts/claims/cxf-service.xml | 6 +++--- .../cxf/systest/sts/claims/stax-cxf-service.xml | 6 +++--- .../cxf/systest/sts/cross_domain/cxf-client.xml | 4 ++-- .../cxf/systest/sts/cross_domain/cxf-service.xml | 4 ++-- .../cxf/systest/sts/cross_domain/cxf-sts-saml1.xml | 4 ++-- .../cxf/systest/sts/cross_domain/cxf-sts-saml2.xml | 4 ++-- .../systest/sts/custom_onbehalfof/cxf-client.xml | 4 ++-- .../systest/sts/custom_onbehalfof/cxf-service.xml | 8 ++++---- .../cxf/systest/sts/custom_onbehalfof/cxf-sts.xml | 4 ++-- .../apache/cxf/systest/sts/deployment/cxf-sts.xml | 4 ++-- .../cxf/systest/sts/deployment/stax-cxf-sts.xml | 4 ++-- .../systest/sts/distributed_caching/cxf-client.xml | 4 ++-- .../systest/sts/distributed_caching/cxf-service.xml | 8 ++++---- .../systest/sts/distributed_caching/cxf-sts-1.xml | 4 ++-- .../systest/sts/distributed_caching/cxf-sts-2.xml | 4 ++-- .../org/apache/cxf/systest/sts/jwt/cxf-client.xml | 4 ++-- .../org/apache/cxf/systest/sts/jwt/cxf-service.xml | 4 ++-- .../sts/kerberos/cxf-intermediary-client.xml | 4 ++-- .../sts/kerberos/cxf-intermediary-jaxrs-client.xml | 4 ++-- .../cxf/systest/sts/kerberos/cxf-intermediary.xml | 6 +++--- .../apache/cxf/systest/sts/kerberos/cxf-service.xml | 2 +- .../apache/cxf/systest/sts/realms/cxf-client.xml | 4 ++-- .../apache/cxf/systest/sts/realms/cxf-service.xml | 8 ++++---- .../apache/cxf/systest/sts/realms/cxf-sts-saml1.xml | 4 ++-- .../apache/cxf/systest/sts/realms/cxf-sts-saml2.xml | 4 ++-- .../cxf/systest/sts/renew/cxf-client-unit.xml | 4 ++-- .../org/apache/cxf/systest/sts/renew/cxf-client.xml | 4 ++-- .../apache/cxf/systest/sts/renew/cxf-service.xml | 2 +- .../apache/cxf/systest/sts/renew/cxf-sts-pop.xml | 4 ++-- .../org/apache/cxf/systest/sts/renew/cxf-sts.xml | 4 ++-- .../apache/cxf/systest/sts/renew/stax-cxf-sts.xml | 4 ++-- .../cxf/systest/sts/secure_conv/cxf-client.xml | 4 ++-- .../cxf/systest/sts/secure_conv/cxf-service.xml | 8 ++++---- .../apache/cxf/systest/sts/secure_conv/cxf-sts.xml | 4 ++-- .../cxf/systest/sts/secure_conv/stax-cxf-sts.xml | 4 ++-- .../apache/cxf/systest/sts/soap12/cxf-client.xml | 4 ++-- .../apache/cxf/systest/sts/soap12/cxf-service.xml | 8 ++++---- .../cxf/systest/sts/soap12/stax-cxf-service.xml | 8 ++++---- .../cxf/systest/sts/transformation/cxf-client.xml | 2 +- .../cxf/systest/sts/transformation/cxf-service.xml | 6 +++--- .../systest/sts/usernametoken/cxf-bad-client.xml | 2 +- .../cxf/systest/sts/usernametoken/cxf-client.xml | 2 +- .../cxf/systest/sts/usernametoken/cxf-service.xml | 6 +++--- .../systest/sts/usernametoken/stax-cxf-service.xml | 6 +++--- .../src/test/resources/serviceKeystore.properties | 2 +- .../advanced/src/test/resources/servicestore.jks | Bin 3475 -> 0 bytes .../src/test/resources/stsKeystore.properties | 2 +- .../advanced/src/test/resources/stsstore.jks | Bin 4557 -> 0 bytes services/sts/systests/basic/pom.xml | 7 +++++++ .../cxf/systest/sts/issueunit/IssueUnitTest.java | 2 +- .../apache/cxf/systest/sts/rest/STSRESTTest.java | 2 +- .../sts/stsclient/STSTokenOutInterceptorTest.java | 2 +- .../sts/stsclient/STSTokenRetrieverTest.java | 2 +- .../src/test/resources/clientKeystore.properties | 2 +- .../basic/src/test/resources/clientstore.jks | Bin 4559 -> 0 bytes .../apache/cxf/systest/sts/bearer/cxf-client.xml | 4 ++-- .../apache/cxf/systest/sts/bearer/cxf-service.xml | 4 ++-- .../cxf/systest/sts/bearer/cxf-stax-service.xml | 4 ++-- .../cxf/systest/sts/bearer/cxf-unsigned-client.xml | 4 ++-- .../cxf/systest/sts/delegation/cxf-client.xml | 4 ++-- .../systest/sts/delegation/cxf-sts-transport.xml | 4 ++-- .../cxf/systest/sts/deployment/cxf-transport.xml | 4 ++-- .../systest/sts/deployment/stax-cxf-transport.xml | 4 ++-- .../intermediary_transformation/cxf-bad-client.xml | 2 +- .../sts/intermediary_transformation/cxf-client.xml | 2 +- .../cxf-intermediary-caching.xml | 6 +++--- .../cxf-intermediary.xml | 6 +++--- .../sts/intermediary_transformation/cxf-service.xml | 4 ++-- .../apache/cxf/systest/sts/issuer/cxf-client.xml | 4 ++-- .../apache/cxf/systest/sts/issuer/cxf-service.xml | 4 ++-- .../cxf/systest/sts/issuer/cxf-sts-transport.xml | 4 ++-- .../apache/cxf/systest/sts/issueunit/cxf-client.xml | 2 +- .../org/apache/cxf/systest/sts/jaas/cxf-client.xml | 4 ++-- .../org/apache/cxf/systest/sts/jaas/cxf-service.xml | 8 ++++---- .../apache/cxf/systest/sts/jaas/cxf-service2.xml | 4 ++-- .../apache/cxf/systest/sts/jaas/cxf-sts-client.xml | 4 ++-- .../org/apache/cxf/systest/sts/rest/cxf-client.xml | 4 ++-- .../apache/cxf/systest/sts/rest/cxf-rest-sts.xml | 4 ++-- .../cxf/systest/sts/sendervouches/cxf-client.xml | 2 +- .../systest/sts/sendervouches/cxf-intermediary.xml | 6 +++--- .../cxf/systest/sts/sendervouches/cxf-service.xml | 4 ++-- .../sts/sendervouches/cxf-stax-intermediary.xml | 6 +++--- .../systest/sts/sendervouches/cxf-stax-service.xml | 4 ++-- .../cxf/systest/sts/stsclient/cxf-client-name.xml | 4 ++-- .../systest/sts/stsclient/cxf-default-client.xml | 4 ++-- .../cxf/systest/sts/stsclient/cxf-service.xml | 4 ++-- .../apache/cxf/systest/sts/template/cxf-client.xml | 4 ++-- .../apache/cxf/systest/sts/template/cxf-service.xml | 4 ++-- .../cxf/systest/sts/template/cxf-stax-service.xml | 4 ++-- .../cxf/systest/sts/transport/cxf-bad-client.xml | 4 ++-- .../apache/cxf/systest/sts/transport/cxf-client.xml | 4 ++-- .../cxf/systest/sts/transport/cxf-service.xml | 4 ++-- .../cxf/systest/sts/transport/cxf-stax-service.xml | 4 ++-- .../cxf/systest/sts/username_actas/cxf-client.xml | 2 +- .../systest/sts/username_onbehalfof/cxf-client.xml | 2 +- .../src/test/resources/serviceKeystore.properties | 2 +- .../src/test/resources/serviceKeystore2.properties | 4 ++-- .../basic/src/test/resources/servicestore.jks | Bin 3475 -> 0 bytes .../basic/src/test/resources/stsKeystore.properties | 2 +- .../systests/basic/src/test/resources/stsstore.jks | Bin 4557 -> 0 bytes .../src/test/resources/clientKeystore.properties | 2 +- .../kerberos/src/test/resources/clientstore.jks | Bin 4559 -> 0 bytes .../cxf/systest/kerberos/wssec/kerberos/server.xml | 2 +- .../systest/kerberos/wssec/kerberos/sts-client.xml | 4 ++-- .../cxf/systest/kerberos/wssec/sts/cxf-sts.xml | 4 ++-- .../cxf/systest/kerberos/wssec/sts/stax-cxf-sts.xml | 4 ++-- .../src/test/resources/serviceKeystore.properties | 2 +- .../kerberos/src/test/resources/servicestore.jks | Bin 3475 -> 0 bytes .../src/test/resources/stsKeystore.properties | 2 +- systests/kerberos/src/test/resources/stsstore.jks | Bin 4557 -> 0 bytes testutils/src/test/resources/keys/clientstore.jks | Bin 0 -> 4559 bytes testutils/src/test/resources/keys/servicestore.jks | Bin 0 -> 3475 bytes testutils/src/test/resources/keys/stsstore.jks | Bin 0 -> 4557 bytes 183 files changed, 309 insertions(+), 288 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/pom.xml ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml index 45dca18..ca941b2 100644 --- a/services/sts/sts-core/pom.xml +++ b/services/sts/sts-core/pom.xml @@ -140,6 +140,13 @@ <version>${cxf.jexl.version}</version> <optional>true</optional> </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-testutils</artifactId> + <version>${project.version}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> </dependencies> <build> <plugins> http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java index a4c47ce..e302e27 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java @@ -286,7 +286,7 @@ public class JexlIssueSamlClaimsTest extends org.junit.Assert { Properties properties = new Properties(); properties.put("org.apache.ws.security.crypto.provider", "org.apache.ws.security.components.crypto.Merlin"); properties.put("org.apache.ws.security.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.ws.security.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.ws.security.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java index 04900ca..79be5bc 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java @@ -170,7 +170,7 @@ public class CancelSCTUnitTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java index f0ffb8b..20e4492 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java @@ -546,9 +546,9 @@ public class IssueEncryptedUnitTest extends org.junit.Assert { ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); if (unrestrictedPoliciesInstalled) { - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); } else { - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "restricted/stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "restricted/keys/stsstore.jks"); } return properties; http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java index 677b163..753318d 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java @@ -628,7 +628,7 @@ public class IssueJWTClaimsUnitTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java index ff5842d..86848dd 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java @@ -498,7 +498,7 @@ public class IssueJWTOnbehalfofUnitTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java index 34ee3b3..d59ecd8 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java @@ -452,7 +452,7 @@ public class IssueJWTRealmUnitTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java index eacf6bd..edd2290 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java @@ -193,7 +193,7 @@ public class IssueJWTUnitTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java index 273b7a7..b506c66 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java @@ -1320,7 +1320,7 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSCTUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSCTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSCTUnitTest.java index ef6b190..d3650be 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSCTUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSCTUnitTest.java @@ -335,7 +335,7 @@ public class IssueSCTUnitTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java index 411ed13..1519abf 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java @@ -811,7 +811,7 @@ public class IssueSamlClaimsUnitTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java index 88c7384..a7aca83 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java @@ -533,7 +533,7 @@ public class IssueSamlRealmUnitTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java index e4fc41d..96fe5c8 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java @@ -874,7 +874,7 @@ public class IssueSamlUnitTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "sspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "servicestore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/servicestore.jks"); data.setDecCrypto(CryptoFactory.getInstance(properties)); data.setCallbackHandler(new PasswordCallbackHandler()); @@ -1504,7 +1504,7 @@ public class IssueSamlUnitTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java index 96ca530..1725440 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java @@ -473,7 +473,7 @@ public class RenewSamlUnitTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java index cba7187..e4b8a11 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java @@ -464,7 +464,7 @@ public class ValidateJWTTransformationTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java index 8bc5efb..f89725f 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java @@ -169,7 +169,7 @@ public class ValidateJWTUnitTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java index 4ea8e97..82d2405 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java @@ -177,7 +177,7 @@ public class ValidateSCTUnitTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java index a39b437..2a6da59 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java @@ -229,7 +229,7 @@ public class ValidateSamlUnitTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java index d8ac35e..177f216 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java @@ -750,7 +750,7 @@ public class ValidateTokenTransformationUnitTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUsernameTokenUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUsernameTokenUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUsernameTokenUnitTest.java index de4cf4b..09f0ac6 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUsernameTokenUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUsernameTokenUnitTest.java @@ -213,7 +213,7 @@ public class ValidateUsernameTokenUnitTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateX509TokenUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateX509TokenUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateX509TokenUnitTest.java index 21c5114..6e14363 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateX509TokenUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateX509TokenUnitTest.java @@ -227,7 +227,7 @@ public class ValidateX509TokenUnitTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/request/RequestParserUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/request/RequestParserUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/request/RequestParserUnitTest.java index cbb7273..a804754 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/request/RequestParserUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/request/RequestParserUnitTest.java @@ -234,7 +234,7 @@ public class RequestParserUnitTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return CryptoFactory.getInstance(properties); } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/canceller/SCTCancellerTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/canceller/SCTCancellerTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/canceller/SCTCancellerTest.java index 3d221b6..b6427d7 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/canceller/SCTCancellerTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/canceller/SCTCancellerTest.java @@ -185,7 +185,7 @@ public class SCTCancellerTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTClaimsTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTClaimsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTClaimsTest.java index 1cf7dde..6e33ea4 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTClaimsTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTClaimsTest.java @@ -257,7 +257,7 @@ public class JWTClaimsTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java index 9d39600..8dc9999 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java @@ -184,7 +184,7 @@ public class JWTProviderActAsTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderLifetimeTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderLifetimeTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderLifetimeTest.java index a9a3df6..b58b045 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderLifetimeTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderLifetimeTest.java @@ -397,7 +397,7 @@ public class JWTProviderLifetimeTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java index 537f8d7..eb8a7f5 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java @@ -184,7 +184,7 @@ public class JWTProviderOnBehalfOfTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderRealmTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderRealmTest.java index 3e39b35..6a5cbaf 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderRealmTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderRealmTest.java @@ -144,7 +144,7 @@ public class JWTTokenProviderRealmTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java index 7fa13d0..a9e5491 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java @@ -385,7 +385,7 @@ public class JWTTokenProviderTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } @@ -396,7 +396,7 @@ public class JWTTokenProviderTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "sspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "servicestore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/servicestore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java index 9f9b0bc..4331149 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java @@ -445,7 +445,7 @@ public class SAMLClaimsTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java index d106933..96628b8 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java @@ -234,7 +234,7 @@ public class SAMLProviderActAsTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java index 7df9e7c..e8639f9 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java @@ -313,7 +313,7 @@ public class SAMLProviderCustomTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java index 4c3a01d..aaa4636 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java @@ -681,7 +681,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java index d39cd49..d3ea2d3 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java @@ -406,7 +406,7 @@ public class SAMLProviderLifetimeTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java index c5c0c13..331979f 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java @@ -237,7 +237,7 @@ public class SAMLProviderOnBehalfOfTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java index a4fe877..30e4766 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java @@ -211,7 +211,7 @@ public class SAMLProviderRealmTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SCTProviderTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SCTProviderTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SCTProviderTest.java index 9caa436..17bc3fa 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SCTProviderTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SCTProviderTest.java @@ -205,7 +205,7 @@ public class SCTProviderTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java index 1ee12c4..c56d61e 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java @@ -430,7 +430,7 @@ public class SAMLTokenRenewerLifetimeTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java index 321696a..140d342 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java @@ -349,7 +349,7 @@ public class SAMLTokenRenewerPOPTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java index c29fd95..dd3f5b3 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java @@ -350,7 +350,7 @@ public class SAMLTokenRenewerRealmTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java index c756b11..27643be 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java @@ -637,7 +637,7 @@ public class SAMLTokenRenewerTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java index 00cbfef..68141c3 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java @@ -247,7 +247,7 @@ public class JWTTokenValidatorRealmTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorTest.java index 6e031b1..9f299f1 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorTest.java @@ -395,7 +395,7 @@ public class JWTTokenValidatorTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java index 9c48cda..604954e 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java @@ -240,7 +240,7 @@ public class SAMLTokenValidatorCachedRealmTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java index 8e4b060..3667251 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java @@ -249,7 +249,7 @@ public class SAMLTokenValidatorRealmTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java index 3d80c40..c3aa337 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java @@ -639,7 +639,7 @@ public class SAMLTokenValidatorTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SCTValidatorTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SCTValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SCTValidatorTest.java index af90113..59aaca9 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SCTValidatorTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SCTValidatorTest.java @@ -195,7 +195,7 @@ public class SCTValidatorTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/UsernameTokenValidatorTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/UsernameTokenValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/UsernameTokenValidatorTest.java index 8812b4b..4759ee0 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/UsernameTokenValidatorTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/UsernameTokenValidatorTest.java @@ -269,7 +269,7 @@ public class UsernameTokenValidatorTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java index 9521e28..0ea2abc 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java @@ -172,7 +172,7 @@ public class X509TokenValidatorTest extends org.junit.Assert { "org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin" ); properties.put("org.apache.wss4j.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/resources/clientstore.jks ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/resources/clientstore.jks b/services/sts/sts-core/src/test/resources/clientstore.jks deleted file mode 100644 index f734f87..0000000 Binary files a/services/sts/sts-core/src/test/resources/clientstore.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/resources/servicestore.jks ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/resources/servicestore.jks b/services/sts/sts-core/src/test/resources/servicestore.jks deleted file mode 100644 index 999ee82..0000000 Binary files a/services/sts/sts-core/src/test/resources/servicestore.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/sts-core/src/test/resources/stsstore.jks ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/resources/stsstore.jks b/services/sts/sts-core/src/test/resources/stsstore.jks deleted file mode 100644 index 51f131f..0000000 Binary files a/services/sts/sts-core/src/test/resources/stsstore.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/systests/advanced/pom.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/pom.xml b/services/sts/systests/advanced/pom.xml index 21bf165..c083aa6 100644 --- a/services/sts/systests/advanced/pom.xml +++ b/services/sts/systests/advanced/pom.xml @@ -91,6 +91,13 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-testutils</artifactId> + <version>${project.version}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> + <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/systests/advanced/src/test/resources/clientKeystore.properties ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/clientKeystore.properties b/services/sts/systests/advanced/src/test/resources/clientKeystore.properties index 8ab391e..b76fb47 100644 --- a/services/sts/systests/advanced/src/test/resources/clientKeystore.properties +++ b/services/sts/systests/advanced/src/test/resources/clientKeystore.properties @@ -20,5 +20,5 @@ org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto. org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=cspass org.apache.ws.security.crypto.merlin.keystore.alias=myclientkey -org.apache.ws.security.crypto.merlin.keystore.file=clientstore.jks +org.apache.ws.security.crypto.merlin.keystore.file=keys/clientstore.jks http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/systests/advanced/src/test/resources/clientstore.jks ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/clientstore.jks b/services/sts/systests/advanced/src/test/resources/clientstore.jks deleted file mode 100644 index f734f87..0000000 Binary files a/services/sts/systests/advanced/src/test/resources/clientstore.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-bad-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-bad-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-bad-client.xml index 28a68d8..c2c9328 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-bad-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-bad-client.xml @@ -27,7 +27,7 @@ <http:conduit name="https://localhost:.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:trustManagers> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-client.xml index 4b411b9..7ea87f8 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-client.xml @@ -27,7 +27,7 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:trustManagers> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml index 1d53759..a8352ed 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml @@ -67,7 +67,7 @@ <httpj:engine port="${testutil.ports.basic_auth.Server}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="false" required="false"/> </httpj:tlsServerParameters> @@ -76,10 +76,10 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:trustManagers> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml index 9cfa22b..df7d1d6 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml @@ -69,7 +69,7 @@ <httpj:engine port="${testutil.ports.basic_auth.StaxServer}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="false" required="false"/> </httpj:tlsServerParameters> @@ -78,10 +78,10 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:trustManagers> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-client-unit.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-client-unit.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-client-unit.xml index 5abe27a..9af06b1 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-client-unit.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-client-unit.xml @@ -27,10 +27,10 @@ <http:conduit name="https://localhost:.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:trustManagers> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> <sec:keyManagers keyPassword="ckpass"> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-sts.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-sts.xml index 84fafa6..7c02364 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-sts.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-sts.xml @@ -104,10 +104,10 @@ <httpj:engine port="${testutil.ports.batch.STSServer}"> <httpj:tlsServerParameters> <sec:trustManagers> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> <sec:keyManagers keyPassword="stskpass"> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml index 377229d..c755bec 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml @@ -110,10 +110,10 @@ <httpj:engine port="${testutil.ports.batch.StaxSTSServer}"> <httpj:tlsServerParameters> <sec:trustManagers> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> <sec:keyManagers keyPassword="stskpass"> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml index 05cfa5b..814a623 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml @@ -53,10 +53,10 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:trustManagers> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/dbe659d1/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/stax-cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/stax-cxf-service.xml index dcfabb4..95b1f08 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/stax-cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/stax-cxf-service.xml @@ -55,10 +55,10 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:trustManagers> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> </http:conduit>
