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 OSGi test on 3.0.x.
Date Fri, 14 Aug 2015 10:31:16 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes c97245b8b -> 61b45ad5c


Fixing OSGi test on 3.0.x.


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

Branch: refs/heads/3.0.x-fixes
Commit: 61b45ad5c92bd9678baf2455918252359720bc0b
Parents: c97245b
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Aug 14 11:31:04 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Aug 14 11:31:04 2015 +0100

----------------------------------------------------------------------
 .../org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/61b45ad5/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java
b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java
index a720487..20f7c69 100644
--- a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java
+++ b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java
@@ -103,10 +103,14 @@ public class STSUnitTest extends BasicSTSIntegrationTest {
         properties.put(
             SecurityConstants.CALLBACK_HANDLER, new CommonCallbackHandler()
         );
+        
+        Crypto crypto = CryptoFactory.getInstance("clientKeystore.properties", 
+                                                  this.getClass().getClassLoader());
+        
         properties.put(SecurityConstants.SIGNATURE_USERNAME, "myclientkey");
-        properties.put(SecurityConstants.SIGNATURE_PROPERTIES, "clientKeystore.properties");
+        properties.put(SecurityConstants.SIGNATURE_CRYPTO, crypto);
         properties.put(SecurityConstants.ENCRYPT_USERNAME, "mystskey");
-        properties.put(SecurityConstants.ENCRYPT_PROPERTIES, "clientKeystore.properties");
+        properties.put(SecurityConstants.ENCRYPT_CRYPTO, crypto);
 
         stsClient.setProperties(properties);
         stsClient.setTokenType(tokenType);


Mime
View raw message