cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1458830 - /cxf/branches/2.5.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java
Date Wed, 20 Mar 2013 13:55:39 GMT
Author: coheigea
Date: Wed Mar 20 13:55:39 2013
New Revision: 1458830

URL: http://svn.apache.org/r1458830
Log:
Merged revisions 1458827 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1458827 | coheigea | 2013-03-20 13:51:28 +0000 (Wed, 20 Mar 2013) | 18 lines

  Merged revisions 1458809 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

  ........
    r1458809 | coheigea | 2013-03-20 12:48:24 +0000 (Wed, 20 Mar 2013) | 10 lines

    Merged revisions 1458787 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk

    ........
      r1458787 | coheigea | 2013-03-20 12:24:30 +0000 (Wed, 20 Mar 2013) | 2 lines

      Reverting accidental change

    ........

  ........

........

Modified:
    cxf/branches/2.5.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java

Modified: cxf/branches/2.5.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java?rev=1458830&r1=1458829&r2=1458830&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java
Wed Mar 20 13:55:39 2013
@@ -100,6 +100,7 @@ public class SamlTokenTest extends Abstr
     
     /**
      * 2.3.1.2 (WSS1.0) SAML1.1 Assertion (Sender Vouches) over SSL
+     */
     @org.junit.Test
     public void testTLSSenderVouches() throws Exception {
 
@@ -125,6 +126,7 @@ public class SamlTokenTest extends Abstr
     
     /**
      * 2.3.1.3 (WSS1.0) SAML1.1 Assertion (HK) over SSL
+     */
     @org.junit.Test
     public void testTLSHOKSignedEndorsing() throws Exception {
 
@@ -150,6 +152,7 @@ public class SamlTokenTest extends Abstr
     
     /**
      * 2.3.1.4 (WSS1.0) SAML1.1 Sender Vouches with X.509 Certificates, Sign, Optional Encrypt
+     */
     @org.junit.Test
     public void testAsymmetricSigned() throws Exception {
 
@@ -175,6 +178,7 @@ public class SamlTokenTest extends Abstr
     
     /**
      * 2.3.1.5 (WSS1.0) SAML1.1 Holder of Key, Sign, Optional Encrypt
+     */
     @org.junit.Test
     public void testAsymmetricInitiator() throws Exception {
 
@@ -201,6 +205,7 @@ public class SamlTokenTest extends Abstr
     
     /**
      * 2.3.2.1 (WSS1.1) SAML 2.0 Bearer
+     */
     @org.junit.Test
     public void testAsymmetricSaml2Bearer() throws Exception {
 
@@ -226,6 +231,7 @@ public class SamlTokenTest extends Abstr
     
     /**
      * 2.3.2.2 (WSS1.1) SAML2.0 Sender Vouches over SSL
+     */
     @org.junit.Test
     public void testTLSSenderVouchesSaml2() throws Exception {
 
@@ -251,6 +257,7 @@ public class SamlTokenTest extends Abstr
     
     /**
      * 2.3.2.3 (WSS1.1) SAML2.0 HoK over SSL
+     */
     @org.junit.Test
     public void testTLSHOKSignedEndorsingSaml2() throws Exception {
 
@@ -276,6 +283,7 @@ public class SamlTokenTest extends Abstr
     
     /**
      * 2.3.2.4 (WSS1.1) SAML1.1/2.0 Sender Vouches with X.509 Certificate, Sign, Encrypt
+     */
     @org.junit.Test
     public void testSymmetricSV() throws Exception {
 
@@ -301,6 +309,7 @@ public class SamlTokenTest extends Abstr
     
     /**
      * 2.3.2.5 (WSS1.1) SAML1.1/2.0 Holder of Key, Sign, Encrypt
+     */
     @org.junit.Test
     public void testSymmetricIssuedToken() throws Exception {
 
@@ -324,7 +333,6 @@ public class SamlTokenTest extends Abstr
         ((java.io.Closeable)samlPort).close();
         bus.shutdown(true);
     }
-    */
     
     private static void updateSTSPort(BindingProvider p, String port) {
         STSClient stsClient = (STSClient)p.getRequestContext().get(SecurityConstants.STS_CLIENT);



Mime
View raw message