Merge all changes from 1.5.2 branch into trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@830026 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 1 insertions, 2 deletions

diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/resources/imports/wsdl/helloworld.wsdl b/branches/sca-java-1.x/itest/wsdl/src/main/resources/imports/wsdl/helloworld.wsdl
index 1aa32179e6..90eeae3c8a 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/resources/imports/wsdl/helloworld.wsdl
+++ b/branches/sca-java-1.x/itest/wsdl/src/main/resources/imports/wsdl/helloworld.wsdl
@@ -26,7 +26,7 @@
                   xmlns:xsd="http://www.w3.org/2001/XMLSchema"

 	          name="helloworld">

 	          

-    <wsdl:import namespace="http://helloworld3" location="../../helloworld-import.wsdl"/>

+    <wsdl:import namespace="http://helloworld3" location="../../helloworld-import.wsdl" />

     

     <wsdl:binding name="HelloWorldSoapBinding" type="tns3:HelloWorld">

         <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>

diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/resources/imports/wsdl/helloworldws.composite b/branches/sca-java-1.x/itest/wsdl/src/main/resources/imports/wsdl/helloworldws.composite
index ff25a32e6a..1af51162ac 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/resources/imports/wsdl/helloworldws.composite
+++ b/branches/sca-java-1.x/itest/wsdl/src/main/resources/imports/wsdl/helloworldws.composite
@@ -24,7 +24,6 @@
 

     <component name="HelloWorldServiceComponent">

 	    <service name="HelloWorldService">

-	        <!--<interface.wsdl interface="http://helloworld3#wsdl.interface(HelloWorld)"  />-->

 	        <interface.java interface="helloworld.HelloWorldService"/>

 	        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" />

 	    </service>