Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1F538BFB2 for ; Fri, 6 Jan 2012 11:15:17 +0000 (UTC) Received: (qmail 47813 invoked by uid 500); 6 Jan 2012 11:15:14 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 47338 invoked by uid 500); 6 Jan 2012 11:14:57 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 47319 invoked by uid 99); 6 Jan 2012 11:14:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jan 2012 11:14:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jan 2012 11:14:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 887172388900 for ; Fri, 6 Jan 2012 11:14:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1228085 - in /cxf/trunk/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/ Date: Fri, 06 Jan 2012 11:14:30 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120106111430.887172388900@eris.apache.org> Author: coheigea Date: Fri Jan 6 11:14:30 2012 New Revision: 1228085 URL: http://svn.apache.org/viewvc?rev=1228085&view=rev Log: [CXF-4010] - Fix for failing tests Modified: cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/service/StaticService.java cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java Modified: cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java?rev=1228085&r1=1228084&r2=1228085&view=diff ============================================================================== --- cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java (original) +++ cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java Fri Jan 6 11:14:30 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/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/service/StaticService.java URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/service/StaticService.java?rev=1228085&r1=1228084&r2=1228085&view=diff ============================================================================== --- cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/service/StaticService.java (original) +++ cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/service/StaticService.java Fri Jan 6 11:14:30 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/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java?rev=1228085&r1=1228084&r2=1228085&view=diff ============================================================================== --- cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java (original) +++ cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java Fri Jan 6 11:14:30 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");