Author: dkulp
Date: Tue Sep 7 18:40:43 2010
New Revision: 993461
URL: http://svn.apache.org/viewvc?rev=993461&view=rev
Log:
Merged revisions 992120 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r992120 | dkulp | 2010-09-02 17:25:19 -0400 (Thu, 02 Sep 2010) | 1 line
[CXF-2942] Fix type of collection for transportIds
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml?rev=993461&r1=993460&r2=993461&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml
(original)
+++
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml
Tue Sep 7 18:40:43 2010
@@ -27,14 +27,14 @@ http://www.springframework.org/schema/be
id="org.apache.cxf.transport.servlet.ServletTransportFactory">
<property name="bus" ref="cxf"/>
<property name="transportIds">
- <set>
+ <list>
<value>http://cxf.apache.org/bindings/xformat</value>
<value>http://schemas.xmlsoap.org/soap/http</value>
<value>http://schemas.xmlsoap.org/wsdl/http/</value>
<value>http://schemas.xmlsoap.org/wsdl/soap/http</value>
<value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value>
<value>http://cxf.apache.org/transports/http/configuration</value>
- </set>
+ </list>
</property>
</bean>
</beans>