svn commit: r1396628 - in /cxf/branches/2.6.x-fixes: ./ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java

[ningjiang]

Author: ningjiang
Date: Wed Oct 10 15:02:43 2012
New Revision: 1396628

URL: http://svn.apache.org/viewvc?rev=1396628&view=rev
Log:
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.6.x-fixes/   (props changed)
    
cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1396595-1396621

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java?rev=1396628&r1=1396627&r2=1396628&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
 Wed Oct 10 15:02:43 2012
@@ -72,11 +72,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);