Author: ningjiang Date: Thu Oct 11 08:32:34 2012 New Revision: 1396946 URL: http://svn.apache.org/viewvc?rev=1396946&view=rev Log: Merged revisions 1396645 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................ r1396645 | ningjiang | 2012-10-10 23:32:00 +0800 (Wed, 10 Oct 2012) | 20 lines Merged revisions 1396628 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ................ r1396628 | ningjiang | 2012-10-10 23:02:43 +0800 (Wed, 10 Oct 2012) | 13 lines Merged revisions 1396595,1396621 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1396595 | ningjiang | 2012-10-10 21:37:39 +0800 (Wed, 10 Oct 2012) | 1 line CXF-4554 clean up the active namespace of SoapTransportFactory ........ r1396621 | ningjiang | 2012-10-10 22:43:11 +0800 (Wed, 10 Oct 2012) | 1 line CXF-4554 Fixed the CS error ........ ................ ................ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/branches/2.5.x-fixes:r1396645 Merged /cxf/trunk:r1396595-1396621 Merged /cxf/branches/2.6.x-fixes:r1396628 Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java?rev=1396946&r1=1396945&r2=1396946&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java (original) +++ cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java Thu Oct 11 08:32:34 2012 @@ -73,11 +73,10 @@ public class SoapTransportFactory extend "http://schemas.xmlsoap.org/soap/";, "http://schemas.xmlsoap.org/wsdl/soap/";, "http://schemas.xmlsoap.org/wsdl/soap12/";, - "http://schemas.xmlsoap.org/soap/http/";, + "http://schemas.xmlsoap.org/soap/http";, "http://schemas.xmlsoap.org/wsdl/soap/http";, "http://www.w3.org/2010/soapjms/";, - "http://www.w3.org/2003/05/soap/bindings/HTTP/";, - "http://schemas.xmlsoap.org/soap/http";); + "http://www.w3.org/2003/05/soap/bindings/HTTP/";); public SoapTransportFactory() { super(DEFAULT_NAMESPACES, null);
