Author: veithen Date: Mon Sep 10 19:17:08 2012 New Revision: 1383062 URL: http://svn.apache.org/viewvc?rev=1383062&view=rev Log: Merged r1338876 to the 1.6 branch to ensure that Rampart 1.6.x can be built with Axiom 1.2.14.
Modified: axis/axis2/java/rampart/branches/1_6/ (props changed) axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java Propchange: axis/axis2/java/rampart/branches/1_6/ ------------------------------------------------------------------------------ Merged /axis/axis2/java/rampart/trunk:r1338876 Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java?rev=1383062&r1=1383061&r2=1383062&view=diff ============================================================================== --- axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java (original) +++ axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java Mon Sep 10 19:17:08 2012 @@ -129,7 +129,7 @@ public class RampartTest extends TestCas if (i == 31) { OMNamespace omNamespace = OMAbstractFactory.getOMFactory().createOMNamespace( "http://sample.com", "myNs"); - SOAPHeaderBlock header = OMAbstractFactory.getSOAP12Factory() + SOAPHeaderBlock header = OMAbstractFactory.getSOAP11Factory() .createSOAPHeaderBlock("VitalHeader", omNamespace); header.addChild(AXIOMUtil.stringToOM("<foo>This is a sample Header</foo>")); serviceClient.addHeader(header);