You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2007/05/24 08:11:41 UTC
svn commit: r541195 - in /incubator/cxf/trunk:
rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/
rt/transports/http/src/main/resources/META-INF/cxf/
systests/src/test/java/org/apache/cxf/systest/servlet/
Author: ningjiang
Date: Wed May 23 23:11:40 2007
New Revision: 541195
URL: http://svn.apache.org/viewvc?view=rev&rev=541195
Log:
[CXF-664]
Removed the namespace of "http://schemas.xmlsoap.org/wsdl/soap/" from ServletTransportFactory transportIds.
Because it not belong to http transport and adding it will cause the SOAPTransportFactory not working for building EndpointInfo when ?wsdl is called.
Modified:
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/SpringServletTest.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/restful_service.xml
Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java?view=diff&rev=541195&r1=541194&r2=541195
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java (original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java Wed May 23 23:11:40 2007
@@ -221,8 +221,7 @@
registerTransport(factory, "http://www.w3.org/2003/05/soap/bindings/HTTP/");
registerTransport(factory, "http://schemas.xmlsoap.org/wsdl/http/");
registerTransport(factory, "http://cxf.apache.org/transports/http/configuration");
- registerTransport(factory, "http://cxf.apache.org/bindings/xformat");
- registerTransport(factory, "http://schemas.xmlsoap.org/wsdl/soap/");
+ registerTransport(factory, "http://cxf.apache.org/bindings/xformat");
}
public void destroy() {
Modified: incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml?view=diff&rev=541195&r1=541194&r2=541195
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml (original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml Wed May 23 23:11:40 2007
@@ -32,8 +32,7 @@
<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>
- <value>http://schemas.xmlsoap.org/wsdl/soap/</value>
+ <value>http://cxf.apache.org/transports/http/configuration</value>
</set>
</property>
</bean>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java?view=diff&rev=541195&r1=541194&r2=541195
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java Wed May 23 23:11:40 2007
@@ -102,6 +102,9 @@
assertEquals("text/xml", res.getContentType());
assertTrue("the wsdl should contain the opertion greetMe",
res.getText().contains("<wsdl:operation name=\"greetMe\">"));
+ assertTrue("the soap address should changed",
+ res.getText().contains("<soap:address location=\"http://localhost/services/greeter\""));
+
}
@Test
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/SpringServletTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/SpringServletTest.java?view=diff&rev=541195&r1=541194&r2=541195
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/SpringServletTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/SpringServletTest.java Wed May 23 23:11:40 2007
@@ -111,6 +111,10 @@
assertEquals("text/xml", res.getContentType());
assertTrue("the wsdl should contain the opertion greetMe",
res.getText().contains("<wsdl:operation name=\"greetMe\">"));
+ assertTrue("the soap address should changed",
+ res.getText().contains("<soap:address location=\"http://localhost/services/Greeter"));
+
+
}
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/restful_service.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/restful_service.xml?view=diff&rev=541195&r1=541194&r2=541195
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/restful_service.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/restful_service.xml Wed May 23 23:11:40 2007
@@ -42,6 +42,7 @@
<property name="address" value="/services/restful"/>
<property name="bus" ref="cxf"/>
<property name="bindingId" value="http://apache.org/cxf/binding/http"/>
+ <property name="transportId" value="http://schemas.xmlsoap.org/wsdl/soap/http"/>
<property name="serviceFactory" ref="JaxWsServiceFactoryBean"/>
</bean>