You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2008/07/25 02:10:13 UTC
svn commit: r679623 - in /tuscany/branches/sca-java-1.3:
itest/wsdl/src/main/resources/wsdl/
modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/
Author: nash
Date: Thu Jul 24 17:10:13 2008
New Revision: 679623
URL: http://svn.apache.org/viewvc?rev=679623&view=rev
Log:
Fix TUSCANY-2481
Added:
tuscany/branches/sca-java-1.3/itest/wsdl/src/main/resources/wsdl/Hello.xsd
Modified:
tuscany/branches/sca-java-1.3/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
tuscany/branches/sca-java-1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
Added: tuscany/branches/sca-java-1.3/itest/wsdl/src/main/resources/wsdl/Hello.xsd
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/wsdl/src/main/resources/wsdl/Hello.xsd?rev=679623&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/wsdl/src/main/resources/wsdl/Hello.xsd (added)
+++ tuscany/branches/sca-java-1.3/itest/wsdl/src/main/resources/wsdl/Hello.xsd Thu Jul 24 17:10:13 2008
@@ -0,0 +1,20 @@
+
+ <schema elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
+
+ <element name="getGreetings">
+ <complexType>
+ <sequence>
+ <element name="name" type="xsd:string"/>
+ </sequence>
+ </complexType>
+ </element>
+
+ <element name="getGreetingsResponse">
+ <complexType>
+ <sequence>
+ <element name="getGreetingsReturn" type="xsd:string"/>
+ </sequence>
+ </complexType>
+ </element>
+
+ </schema>
Modified: tuscany/branches/sca-java-1.3/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl?rev=679623&r1=679622&r2=679623&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl (original)
+++ tuscany/branches/sca-java-1.3/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl Thu Jul 24 17:10:13 2008
@@ -21,24 +21,8 @@
name="helloworld">
<wsdl:types>
- <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
-
- <element name="getGreetings">
- <complexType>
- <sequence>
- <element name="name" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="getGreetingsResponse">
- <complexType>
- <sequence>
- <element name="getGreetingsReturn" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
-
+ <schema xmlns="http://www.w3.org/2001/XMLSchema">
+ <import namespace="http://helloworld" schemaLocation="Hello.xsd"/>
</schema>
</wsdl:types>
Modified: tuscany/branches/sca-java-1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java?rev=679623&r1=679622&r2=679623&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java (original)
+++ tuscany/branches/sca-java-1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java Thu Jul 24 17:10:13 2008
@@ -520,8 +520,10 @@
private void addSchemas(WSDLDefinition wsdlDef, AxisService axisService) {
for (XSDefinition xsDef : wsdlDef.getXmlSchemas()) {
- axisService.addSchema(xsDef.getSchema());
- updateSchemaRefs(xsDef.getSchema(), axisService.getName());
+ if (xsDef.getSchema() != null) {
+ axisService.addSchema(xsDef.getSchema());
+ updateSchemaRefs(xsDef.getSchema(), axisService.getName());
+ }
}
for (WSDLDefinition impDef : wsdlDef.getImportedDefinitions()) {
addSchemas(impDef, axisService);