cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1412972 - /cxf/branches/2.5.x-fixes/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java
Date Fri, 23 Nov 2012 17:00:52 GMT
Author: coheigea
Date: Fri Nov 23 17:00:52 2012
New Revision: 1412972

URL: http://svn.apache.org/viewvc?rev=1412972&view=rev
Log:
Merged revisions 1412954 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1412954 | coheigea | 2012-11-23 16:54:45 +0000 (Fri, 23 Nov 2012) | 10 lines

  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.5.x-fixes/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java

Modified: cxf/branches/2.5.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.5.x-fixes/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java?rev=1412972&r1=1412971&r2=1412972&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java
Fri Nov 23 17:00:52 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);
         



Mime
View raw message