Author: ffang
Date: Fri Jun 10 09:19:30 2011
New Revision: 1134247
URL: http://svn.apache.org/viewvc?rev=1134247&view=rev
Log:
[SMXCOMP-887]<http:soap-consumer> config may fail to import xsd or wsdl files
in sub-directories
Added:
servicemix/components/trunk/bindings/servicemix-http/src/test/resources/org/apache/servicemix/http/import/
servicemix/components/trunk/bindings/servicemix-http/src/test/resources/org/apache/servicemix/http/import/HelloWorld-DOC-import.wsdl
- copied unchanged from r1134243,
servicemix/components/trunk/bindings/servicemix-http/src/test/resources/org/apache/servicemix/http/HelloWorld-DOC-import.wsdl
Removed:
servicemix/components/trunk/bindings/servicemix-http/src/test/resources/org/apache/servicemix/http/HelloWorld-DOC-import.wsdl
Modified:
servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/HttpConsumerEndpoint.java
servicemix/components/trunk/bindings/servicemix-http/src/test/resources/org/apache/servicemix/http/HelloWorld-DOC.wsdl
Modified:
servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/HttpConsumerEndpoint.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/HttpConsumerEndpoint.java?rev=1134247&r1=1134246&r2=1134247&view=diff
==============================================================================
---
servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/HttpConsumerEndpoint.java
(original)
+++
servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/HttpConsumerEndpoint.java
Fri Jun 10 09:19:30 2011
@@ -498,8 +498,8 @@ public class HttpConsumerEndpoint extend
return true;
}
String path = request.getPathInfo();
- if (path.lastIndexOf('/') >= 0) {
- path = path.substring(path.lastIndexOf('/') + 1);
+ if (path.indexOf('/') >= 0) {
+ path = path.substring(path.indexOf('/') + 1);
}
Object res;
if (rewriteSoapAddress && path.equals(MAIN_WSDL) && getResource(path)
instanceof Document) {
Modified:
servicemix/components/trunk/bindings/servicemix-http/src/test/resources/org/apache/servicemix/http/HelloWorld-DOC.wsdl
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/test/resources/org/apache/servicemix/http/HelloWorld-DOC.wsdl?rev=1134247&r1=1134246&r2=1134247&view=diff
==============================================================================
---
servicemix/components/trunk/bindings/servicemix-http/src/test/resources/org/apache/servicemix/http/HelloWorld-DOC.wsdl
(original)
+++
servicemix/components/trunk/bindings/servicemix-http/src/test/resources/org/apache/servicemix/http/HelloWorld-DOC.wsdl
Fri Jun 10 09:19:30 2011
@@ -24,7 +24,7 @@
xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/";
xmlns="http://schemas.xmlsoap.org/wsdl/";>
- <import location="HelloWorld-DOC-import.wsdl" namespace="uri:HelloWorld" />
+ <import location="import/HelloWorld-DOC-import.wsdl"
namespace="uri:HelloWorld" />
<binding name="HelloSoap11Binding" type="tns:HelloPortType">
<soap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http"/>
