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/01/06 12:15:28 UTC
svn commit: r1228087 - in /cxf/branches/2.5.x-fixes/services/sts:
sts-core/src/main/java/org/apache/cxf/sts/operation/
sts-core/src/main/java/org/apache/cxf/sts/service/
systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/
Author: coheigea
Date: Fri Jan 6 11:15:27 2012
New Revision: 1228087
URL: http://svn.apache.org/viewvc?rev=1228087&view=rev
Log:
[CXF-4010] - Fix for failing tests
Modified:
cxf/branches/2.5.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
cxf/branches/2.5.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/service/StaticService.java
cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java
Modified: cxf/branches/2.5.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java?rev=1228087&r1=1228086&r2=1228087&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java (original)
+++ cxf/branches/2.5.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java Fri Jan 6 11:15:27 2012
@@ -446,7 +446,11 @@ public abstract class AbstractOperation
if (services != null) {
for (ServiceMBean service : services) {
if (service.isAddressInEndpoints(address)) {
- encryptionProperties = service.getEncryptionProperties();
+ EncryptionProperties svcEncryptionProperties =
+ service.getEncryptionProperties();
+ if (svcEncryptionProperties != null) {
+ encryptionProperties = svcEncryptionProperties;
+ }
if (tokenRequirements.getTokenType() == null) {
String tokenType = service.getTokenType();
tokenRequirements.setTokenType(tokenType);
Modified: cxf/branches/2.5.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/service/StaticService.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/service/StaticService.java?rev=1228087&r1=1228086&r2=1228087&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/service/StaticService.java (original)
+++ cxf/branches/2.5.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/service/StaticService.java Fri Jan 6 11:15:27 2012
@@ -113,9 +113,6 @@ public class StaticService implements Se
* Get the EncryptionProperties to be used to encrypt tokens issued for this service
*/
public EncryptionProperties getEncryptionProperties() {
- if (encryptionProperties == null) {
- return new EncryptionProperties();
- }
return encryptionProperties;
}
Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java?rev=1228087&r1=1228086&r2=1228087&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java (original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java Fri Jan 6 11:15:27 2012
@@ -131,7 +131,7 @@ public class SecurityContextTokenUnitTes
stsClient.setProperties(properties);
stsClient.setSecureConv(true);
stsClient.setRequiresEntropy(enableEntropy);
- stsClient.setKeySize(192);
+ stsClient.setKeySize(128);
stsClient.setAddressingNamespace("http://www.w3.org/2005/08/addressing");
return stsClient.requestSecurityToken("http://localhost:8081/doubleit/services/doubleitsymmetric");