svn commit: r627970 - in /incubator/tuscany/java/sca: itest/ modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/ modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/

[slaws]

Author: slaws
Date: Fri Feb 15 00:11:24 2008
New Revision: 627970

URL: http://svn.apache.org/viewvc?rev=627970&view=rev
Log:
TUSCANY-2043
Fix XSD resolution so that inline schema in multiple WSDL with the same 
namespace are treated correctly. Fix the Axis2 provides so that recursion 
happens correctly for aggregated WSDL definitions. 

Modified:
    incubator/tuscany/java/sca/itest/pom.xml
    
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
    
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
    
incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDModelResolver.java

Modified: incubator/tuscany/java/sca/itest/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/pom.xml?rev=627970&r1=627969&r2=627970&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/pom.xml Fri Feb 15 00:11:24 2008
@@ -107,6 +107,7 @@
                 <module>wsdl</module>
                 <module>wsdlless</module>
                 <module>wsdl2java</module>
+                <module>wsdl-multiple</module>
                 <module>ws-void-args-return</module>
                 <module>transaction</module>
                 <module>bpel</module>

Modified: 
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java?rev=627970&r1=627969&r2=627970&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
 Fri Feb 15 00:11:24 2008
@@ -187,6 +187,11 @@
      * @return
      */
     private static Definition getDefinition(Definition definition, QName 
serviceName) {
+        
+        if (serviceName == null){
+            return definition;
+        }
+        
         if (definition == null) {
             return null;
         }
@@ -203,7 +208,7 @@
                 }
             }
         }
-        return definition;
+        return null;
     }
     
     /**

Modified: 
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java?rev=627970&r1=627969&r2=627970&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
 Fri Feb 15 00:11:24 2008
@@ -457,6 +457,11 @@
      * @return
      */
     private static Definition getDefinition(Definition definition, QName 
serviceName) {
+        
+        if (serviceName == null){
+            return definition;
+        }
+        
         if (definition == null) {
             return null;
         }
@@ -473,7 +478,7 @@
                 }
             }
         }
-        return definition;
+        return null;
     }
 
     /**

Modified: 
incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDModelResolver.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDModelResolver.java?rev=627970&r1=627969&r2=627970&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDModelResolver.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDModelResolver.java
 Fri Feb 15 00:11:24 2008
@@ -192,8 +192,8 @@
         aggregated.setUnresolved(false);
 
         // FIXME: [rfeng] This is hacky
-        definitions.clear();
-        definitions.add(aggregated);
+        //definitions.clear();
+        //definitions.add(aggregated);
         return aggregated;
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]