cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [2/2] git commit: Removing some code from last commit
Date Fri, 25 Jul 2014 13:24:31 GMT
Removing some code from last commit


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/390665f2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/390665f2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/390665f2

Branch: refs/heads/3.0.x-fixes
Commit: 390665f203c2ef3d2651cbd7e8cfd12d12420329
Parents: 43c9a1c
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Jul 25 14:05:02 2014 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Jul 25 14:05:35 2014 +0100

----------------------------------------------------------------------
 .../org/apache/cxf/systest/ws/x509/X509TokenTest.java | 14 +++++++-------
 .../ws-security/src/test/resources/logging.properties |  2 +-
 .../org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl  |  2 ++
 3 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/390665f2/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
index 7a1c59e..633116c 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
@@ -95,9 +95,9 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
     public static Collection<TestParam[]> data() {
        
         return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
-                                               // {new TestParam(PORT, true)},
-                                                //{new TestParam(STAX_PORT, false)},
-                                               // {new TestParam(STAX_PORT, true)},
+                                                {new TestParam(PORT, true)},
+                                                {new TestParam(STAX_PORT, false)},
+                                                {new TestParam(STAX_PORT, true)},
         });
     }
     
@@ -106,7 +106,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
         SecurityTestUtil.cleanup();
         stopAllServers();
     }
-/*
+
     @org.junit.Test
     public void testSymmetricErrorMessage() throws Exception {
 
@@ -362,7 +362,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
     }
-    */
+    
     @org.junit.Test
     public void testSymmetricThumbprintEndorsing() throws Exception {
 
@@ -387,7 +387,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
     }
-    /*
+    
     @org.junit.Test
     public void testSymmetricEndorsingEncrypted() throws Exception {
 
@@ -1379,5 +1379,5 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
     }
-    */
+    
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/390665f2/systests/ws-security/src/test/resources/logging.properties
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/logging.properties b/systests/ws-security/src/test/resources/logging.properties
index 2c78acd..b2e5a79 100644
--- a/systests/ws-security/src/test/resources/logging.properties
+++ b/systests/ws-security/src/test/resources/logging.properties
@@ -35,7 +35,7 @@
 # Note that these classes must be on the system classpath.
 # By default we only configure a ConsoleHandler, which will only
 # show messages at the INFO and above levels.
-handlers= java.util.logging.ConsoleHandler
+#handlers= java.util.logging.ConsoleHandler
 
 # To also add the FileHandler, use the following line instead.
 #handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler

http://git-wip-us.apache.org/repos/asf/cxf/blob/390665f2/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl
index a6ba8a8..2e170ff 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl
@@ -912,6 +912,7 @@
                                 <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
                                     <wsp:Policy>
                                         <sp:WssX509V3Token10/>
+                                        <sp:RequireDerivedKeys/>
                                         <sp:RequireThumbprintReference/>
                                     </wsp:Policy>
                                 </sp:X509Token>
@@ -923,6 +924,7 @@
                             </wsp:Policy>
                         </sp:Layout>
                         <sp:IncludeTimestamp/>
+                        <sp:EncryptSignature/>
                         <sp:OnlySignEntireHeadersAndBody/>
                         <sp:AlgorithmSuite>
                             <wsp:Policy>


Mime
View raw message