svn commit: r561209 - in /incubator/cxf/trunk: rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/ systests/src/test/java/org/apache/cxf/systest/ws/security/

[dkulp]

Author: dkulp
Date: Mon Jul 30 18:56:19 2007
New Revision: 561209

URL: http://svn.apache.org/viewvc?view=rev&rev=561209
Log:
Fix the security test for CXF-790.  (Thanks Fred!)

Modified:
    
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
    
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java
    
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/security/client.xml
    
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/security/server.xml

Modified: 
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java?view=diff&rev=561209&r1=561208&r2=561209
==============================================================================
--- 
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
 (original)
+++ 
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
 Mon Jul 30 18:56:19 2007
@@ -151,6 +151,8 @@
                         nd.getLocalName()),
                                                    obj,
                                                    dataBinding);
+                shead.setDirection(SoapHeader.Direction.DIRECTION_IN);
+                
                 String mu = 
hel.getAttributeNS(message.getVersion().getNamespace(),
                         message.getVersion().getAttrNameMustUnderstand());
                 String act = 
hel.getAttributeNS(message.getVersion().getNamespace(),

Modified: 
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java?view=diff&rev=561209&r1=561208&r2=561209
==============================================================================
--- 
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java
 (original)
+++ 
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java
 Mon Jul 30 18:56:19 2007
@@ -25,7 +25,6 @@
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.hello_world_soap_http.Greeter;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -57,7 +56,6 @@
     }
     
     @Test
-    @Ignore
     public void testTimestampSignEncrypt() {
         BusFactory.setDefaultBus(
             new SpringBusFactory().createBus(

Modified: 
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/security/client.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/security/client.xml?view=diff&rev=561209&r1=561208&r2=561209
==============================================================================
--- 
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/security/client.xml
 (original)
+++ 
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/security/client.xml
 Mon Jul 30 18:56:19 2007
@@ -78,7 +78,7 @@
         id="TimestampSignEncrypt_Response">
         <constructor-arg>
             <map>
-                <entry key="action" value="Signature Encrypt Timestamp"/>
+                <entry key="action" value="Timestamp Signature Encrypt"/>
                 <entry key="signaturePropFile" 
value="org/apache/cxf/systest/ws/security/bob.properties"/>
                 <entry key="decryptionPropFile" 
value="org/apache/cxf/systest/ws/security/alice.properties"/>
                 <entry key="passwordCallbackClass" 
value="org.apache.cxf.systest.ws.security.KeystorePasswordCallback"/>

Modified: 
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/security/server.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/security/server.xml?view=diff&rev=561209&r1=561208&r2=561209
==============================================================================
--- 
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/security/server.xml
 (original)
+++ 
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/security/server.xml
 Mon Jul 30 18:56:19 2007
@@ -44,7 +44,7 @@
         id="TimestampSignEncrypt_Response">
         <constructor-arg>
             <map>
-                <entry key="action" value="Signature Encrypt"/>
+                <entry key="action" value="Timestamp Signature Encrypt"/>
                 <entry key="user" value="Bob"/>
                 <entry key="signaturePropFile" 
value="org/apache/cxf/systest/ws/security/bob.properties"/>
                 <entry key="encryptionPropFile" 
value="org/apache/cxf/systest/ws/security/alice.properties"/>