Author: jsdelfino
Date: Tue May 9 21:35:37 2006
New Revision: 405637
URL: http://svn.apache.org/viewcvs?rev=405637&view=rev
Log:
import.wsdl and import.sdo do not require a namespace to be specified
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/assembly/tests/sca.module
incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/handler/sca.module
incubator/tuscany/java/sca/containers/container.java/src/test/resources/helloworld/sca.module
incubator/tuscany/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/sca.module
incubator/tuscany/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/sca.module
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/assembly/tests/sca.module
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/assembly/tests/sca.module?rev=405637&r1=405636&r2=405637&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/assembly/tests/sca.module
(original)
+++
incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/assembly/tests/sca.module
Tue May 9 21:35:37 2006
@@ -15,9 +15,11 @@
* limitations under the License.
-->
<module xmlns="http://www.osoa.org/xmlns/sca/0.9";
xmlns:v="http://www.osoa.org/xmlns/sca/values/0.9";
-
name="tuscany.binding.axis2.assembly.tests.bigbank.account">
+ <import.wsdl
wsdlLocation="org/apache/tuscany/binding/axis2/assembly/tests/bigbank/account/services/account/AccountService.wsdl"/>
+ <import.wsdl
wsdlLocation="org/apache/tuscany/binding/axis2/assembly/tests/bigbank/account/services/stockquote/StockQuoteWebService.wsdl"/>
+
<entryPoint name="AccountService">
<interface.java
interface="org.apache.tuscany.binding.axis2.assembly.tests.bigbank.account.services.account.AccountService"/>
<binding.ws
port="http://www.bigbank.com/AccountService/#AccountServiceSOAP"/>
@@ -54,13 +56,5 @@
<binding.ws port="http://webservice.stockquote#StockQuoteWebService"/>
</externalService>
- <import.wsdl
-
location="org/apache/tuscany/binding/axis2/assembly/tests/bigbank/account/services/account/AccountService.wsdl"
- namespace="http://www.bigbank.com/AccountService/"/>
-
- <import.wsdl
-
location="org/apache/tuscany/binding/axis2/assembly/tests/bigbank/account/services/stockquote/StockQuoteWebService.wsdl"
- namespace="http://webservice.stockquote"/>
-
</module>
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/handler/sca.module
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/handler/sca.module?rev=405637&r1=405636&r2=405637&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/handler/sca.module
(original)
+++
incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/handler/sca.module
Tue May 9 21:35:37 2006
@@ -17,6 +17,8 @@
<module xmlns="http://www.osoa.org/xmlns/sca/0.9";
xmlns:v="http://www.osoa.org/xmlns/sca/values/0.9";
name="org.apache.tuscany.binding.axis2.handler.helloworld">
+ <import.wsdl
wsdlLocation="org/apache/tuscany/binding/axis2/handler/helloworld.wsdl"/>
+
<component name="HelloWorldServiceComponent">
<implementation.java
class="org.apache.tuscany.binding.axis2.handler.HelloWorldServiceComponentImpl"/>
<references>
@@ -29,8 +31,4 @@
<binding.ws
port="http://helloworldaxis.samples.tuscany.apache.org#helloworld"/>
</externalService>
- <import.wsdl
-
location="org/apache/tuscany/binding/axis2/handler/helloworld.wsdl"
- namespace="http://helloworldaxis.samples.tuscany.apache.org"/>
-
</module>
Modified:
incubator/tuscany/java/sca/containers/container.java/src/test/resources/helloworld/sca.module
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/resources/helloworld/sca.module?rev=405637&r1=405636&r2=405637&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.java/src/test/resources/helloworld/sca.module
(original)
+++
incubator/tuscany/java/sca/containers/container.java/src/test/resources/helloworld/sca.module
Tue May 9 21:35:37 2006
@@ -23,7 +23,7 @@
</component>
<!--
- <import.wsdl namespace="http://www.example.org"; location="example.wsdl"/>
+ <import.wsdl wsdlLocation="example.wsdl"/>
<externalService name="external">
<interface.wsdl interface="http://www.example.org#HelloWorld"/>
Modified:
incubator/tuscany/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/sca.module
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/sca.module?rev=405637&r1=405636&r2=405637&view=diff
==============================================================================
---
incubator/tuscany/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/sca.module
(original)
+++
incubator/tuscany/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/sca.module
Tue May 9 21:35:37 2006
@@ -18,8 +18,8 @@
<module xmlns="http://www.osoa.org/xmlns/sca/0.9";
xmlns:v="http://www.osoa.org/xmlns/sca/values/0.9";
name="testModule">
- <import.wsdl location="wsdl/helloworld.wsdl"
namespace="http://helloworldaxis.samples.tuscany.apache.org"/>
<import.sdo wsdlLocation="wsdl/helloworld.wsdl"/>
+ <import.wsdl wsdlLocation="wsdl/helloworld.wsdl"/>
<entryPoint name="HelloWorldService">
<interface.wsdl
interface="http://helloworldaxis.samples.tuscany.apache.org#HelloWorldServiceImpl"/>
Modified:
incubator/tuscany/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/sca.module
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/sca.module?rev=405637&r1=405636&r2=405637&view=diff
==============================================================================
---
incubator/tuscany/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/sca.module
(original)
+++
incubator/tuscany/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/sca.module
Tue May 9 21:35:37 2006
@@ -18,8 +18,8 @@
<module xmlns="http://www.osoa.org/xmlns/sca/0.9";
xmlns:v="http://www.osoa.org/xmlns/sca/values/0.9";
name="testModule">
- <import.wsdl location="wsdl/helloworld.wsdl"
namespace="http://helloworldaxis.samples.tuscany.apache.org"/>
<import.sdo wsdlLocation="wsdl/helloworld.wsdl"/>
+ <import.wsdl wsdlLocation="wsdl/helloworld.wsdl"/>
<entryPoint name="HelloWorldService">
<interface.wsdl
interface="http://helloworldaxis.samples.tuscany.apache.org#HelloWorldServiceImpl"/>
