You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2012/11/23 17:54:46 UTC
svn commit: r1412954 -
/cxf/branches/2.6.x-fixes/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java
Author: coheigea
Date: Fri Nov 23 16:54:45 2012
New Revision: 1412954
URL: http://svn.apache.org/viewvc?rev=1412954&view=rev
Log:
Merged revisions 1412949 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1412949 | coheigea | 2012-11-23 16:45:24 +0000 (Fri, 23 Nov 2012) | 2 lines
Fixing failing tests with restricted security policies
........
Modified:
cxf/branches/2.6.x-fixes/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java
Modified: cxf/branches/2.6.x-fixes/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java?rev=1412954&r1=1412953&r2=1412954&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java (original)
+++ cxf/branches/2.6.x-fixes/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java Fri Nov 23 16:54:45 2012
@@ -195,7 +195,7 @@ public class IssueEncryptedUnitTest exte
service.setEndpoints(Collections.singletonList("http://dummy-service.com/dummy"));
EncryptionProperties encryptionProperties = new EncryptionProperties();
encryptionProperties.setEncryptionName("myservicekey");
- encryptionProperties.setEncryptionAlgorithm(WSConstants.TRIPLE_DES);
+ encryptionProperties.setEncryptionAlgorithm(WSConstants.AES_128);
service.setEncryptionProperties(encryptionProperties);
issueOperation.setServices(Collections.singletonList(service));
@@ -274,7 +274,7 @@ public class IssueEncryptedUnitTest exte
request.getAny().add(createAppliesToElement("http://dummy-service.com/dummy"));
JAXBElement<String> encryptionAlgorithmType =
new JAXBElement<String>(
- QNameConstants.ENCRYPTION_ALGORITHM, String.class, WSConstants.TRIPLE_DES
+ QNameConstants.ENCRYPTION_ALGORITHM, String.class, WSConstants.AES_128
);
request.getAny().add(encryptionAlgorithmType);