Return-Path: 
 <commits-return-24069-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
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 75AE1DE03
	for <apmail-cxf-commits-archive@www.apache.org>;
 Fri, 21 Dec 2012 15:54:01 +0000 (UTC)
Received: (qmail 64282 invoked by uid 500); 21 Dec 2012 15:54:01 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 64235 invoked by uid 500); 21 Dec 2012 15:54:01 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 64228 invoked by uid 99); 21 Dec 2012 15:54:01 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Dec 2012 15:54:01 +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, 21 Dec 2012 15:54:00 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 118EF23888EA;
	Fri, 21 Dec 2012 15:53:40 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1424983 - in /cxf/trunk/systests/ws-security/src/test:
 java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
 resources/org/apache/cxf/systest/ws/x509/DoubleItOperations.wsdl
Date: Fri, 21 Dec 2012 15:53:39 -0000
To: commits@cxf.apache.org
From: coheigea@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20121221155340.118EF23888EA@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: coheigea
Date: Fri Dec 21 15:53:39 2012
New Revision: 1424983

URL: http://svn.apache.org/viewvc?rev=1424983&view=rev
Log:
[CXF-4716] - Updated test to reproduce the issue properly

Modified:
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItOperations.wsdl

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java?rev=1424983&r1=1424982&r2=1424983&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java Fri Dec 21 15:53:39 2012
@@ -20,6 +20,8 @@
 package org.apache.cxf.systest.ws.x509;
 
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.xml.namespace.QName;
 import javax.xml.ws.BindingProvider;
@@ -29,6 +31,8 @@ import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.headers.Header;
+import org.apache.cxf.jaxb.JAXBDataBinding;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
 import org.apache.cxf.systest.ws.ut.SecurityHeaderCacheInterceptor;
 import org.apache.cxf.systest.ws.x509.server.Intermediary;
@@ -609,6 +613,12 @@ public class X509TokenTest extends Abstr
                 service.getPort(portQName, DoubleItPortType2.class);
         updateAddressPort(x509Port, PORT);
         
+        List<Header> headers = new ArrayList<Header>();
+        Header dummyHeader = new Header(new QName("uri:org.apache.cxf", "dummy"), "dummy-header",
+                                        new JAXBDataBinding(String.class));
+        headers.add(dummyHeader);
+        ((BindingProvider)x509Port).getRequestContext().put(Header.HEADER_LIST, headers);
+        
         int response = x509Port.doubleIt(25);
         assertEquals(50, response);
         

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItOperations.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItOperations.wsdl?rev=1424983&r1=1424982&r2=1424983&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItOperations.wsdl (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItOperations.wsdl Fri Dec 21 15:53:39 2012
@@ -56,7 +56,7 @@
             </wsdl:input>
             <wsdl:output>
                 <soap:body use="literal" />
-                <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Output_Policy2"/>
+                <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Output_Policy"/>
             </wsdl:output>
         </wsdl:operation>
     </wsdl:binding>
@@ -113,9 +113,10 @@
    <wsp:Policy wsu:Id="DoubleItBinding_DoubleIt_Input_Policy2">
       <wsp:ExactlyOne>
          <wsp:All>
-            <sp:SignedParts>
+             <sp:EncryptedParts>
                <sp:Body/>
-            </sp:SignedParts>
+               <sp:Header Namespace="uri:org.apache.cxf" />
+            </sp:EncryptedParts>
          </wsp:All>
       </wsp:ExactlyOne>
    </wsp:Policy>
@@ -128,14 +129,5 @@
          </wsp:All>
       </wsp:ExactlyOne>
    </wsp:Policy>
-   <wsp:Policy wsu:Id="DoubleItBinding_DoubleIt_Output_Policy2">
-      <wsp:ExactlyOne>
-         <wsp:All>
-            <sp:SignedParts>
-               <sp:Body/>
-            </sp:SignedParts>
-         </wsp:All>
-      </wsp:ExactlyOne>
-   </wsp:Policy>
     
 </wsdl:definitions>