cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1458287 - in /cxf/branches/2.7.x-fixes: services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/ systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/ systests/ws-security-examples/...
Date Tue, 19 Mar 2013 14:02:30 GMT
Author: coheigea
Date: Tue Mar 19 14:02:29 2013
New Revision: 1458287

URL: http://svn.apache.org/r1458287
Log:
Merged revisions 1458275 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1458275 | coheigea | 2013-03-19 13:41:01 +0000 (Tue, 19 Mar 2013) | 2 lines

  @Ignoring one of the caching tests that fails on Jenkins all the time

........

Modified:
    cxf/branches/2.7.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java
    cxf/branches/2.7.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlCallbackHandler.java
    cxf/branches/2.7.x-fixes/systests/ws-security-examples/src/test/resources/logging.properties

Modified: cxf/branches/2.7.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java?rev=1458287&r1=1458286&r2=1458287&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java
(original)
+++ cxf/branches/2.7.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java
Tue Mar 19 14:02:29 2013
@@ -74,7 +74,9 @@ public class CachingTest extends Abstrac
         stopAllServers();
     }
 
+    // @Ignore'd due to continually failing on Jenkins build
     @org.junit.Test
+    @org.junit.Ignore
     public void testSTSClientCaching() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();

Modified: cxf/branches/2.7.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlCallbackHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlCallbackHandler.java?rev=1458287&r1=1458286&r2=1458287&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlCallbackHandler.java
(original)
+++ cxf/branches/2.7.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlCallbackHandler.java
Tue Mar 19 14:02:29 2013
@@ -44,7 +44,7 @@ import org.opensaml.common.SAMLVersion;
  * A CallbackHandler instance that is used by the STS to mock up a SAML Attribute Assertion.
  */
 public class SamlCallbackHandler implements CallbackHandler {
-    private String confirmationMethod = SAML2Constants.CONF_BEARER;
+    private String confirmationMethod;
     private boolean saml2;
     
     public SamlCallbackHandler() {
@@ -70,12 +70,19 @@ public class SamlCallbackHandler impleme
                 String subjectName = "uid=sts-client,o=mock-sts.com";
                 String subjectQualifier = "www.mock-sts.com";
                 
+                String subjectConfMethod = confirmationMethod;
+                if (subjectConfMethod == null && !saml2) {
+                    subjectConfMethod = SAML1Constants.CONF_BEARER;
+                } else if (subjectConfMethod == null && saml2) {
+                    subjectConfMethod = SAML2Constants.CONF_BEARER;
+                }
+                
                 SubjectBean subjectBean = 
                     new SubjectBean(
-                        subjectName, subjectQualifier, confirmationMethod
+                        subjectName, subjectQualifier, subjectConfMethod
                     );
-                if (SAML2Constants.CONF_HOLDER_KEY.equals(confirmationMethod)
-                    || SAML1Constants.CONF_HOLDER_KEY.equals(confirmationMethod)) {
+                if (SAML2Constants.CONF_HOLDER_KEY.equals(subjectConfMethod)
+                    || SAML1Constants.CONF_HOLDER_KEY.equals(subjectConfMethod)) {
                     try {
                         KeyInfoBean keyInfo = createKeyInfo();
                         subjectBean.setKeyInfo(keyInfo);

Modified: cxf/branches/2.7.x-fixes/systests/ws-security-examples/src/test/resources/logging.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-security-examples/src/test/resources/logging.properties?rev=1458287&r1=1458286&r2=1458287&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/ws-security-examples/src/test/resources/logging.properties
(original)
+++ cxf/branches/2.7.x-fixes/systests/ws-security-examples/src/test/resources/logging.properties
Tue Mar 19 14:02:29 2013
@@ -46,7 +46,7 @@ handlers= java.util.logging.ConsoleHandl
 # can be overriden by a facility specific level
 # Note that the ConsoleHandler also has a separate level
 # setting to limit messages printed to the console.
-.level= WARNING
+.level= INFO
 
 ############################################################
 # Handler specific properties.
@@ -60,7 +60,7 @@ java.util.logging.FileHandler.count = 1
 java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter
 
 # Limit the message that are printed on the console to INFO and above.
-java.util.logging.ConsoleHandler.level = SEVERE
+java.util.logging.ConsoleHandler.level = INFO
 java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
 
 



Mime
View raw message