cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject cxf git commit: Fixing some failing tests
Date Fri, 13 Nov 2015 15:07:05 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 79f590ee8 -> 67ac0ab27


Fixing some failing tests


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/67ac0ab2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/67ac0ab2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/67ac0ab2

Branch: refs/heads/master
Commit: 67ac0ab2732b4b974824796cf13d0ed42712b879
Parents: 79f590e
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Nov 13 15:06:55 2015 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Nov 13 15:06:55 2015 +0000

----------------------------------------------------------------------
 .../apache/cxf/sts/token/provider/JWTTokenProviderTest.java    | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/67ac0ab2/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 51ef210..c81f746 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
@@ -387,11 +387,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");
-        if (unrestrictedPoliciesInstalled) {
-            properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks");
-        } else {
-            properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "restricted/stsstore.jks");
-        }
+        properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "stsstore.jks");
         
         return properties;
     }


Mime
View raw message