svn commit: r406566 - in /incubator/tuscany/java/sca/bindings/binding.celtix/src: main/java/org/apache/tuscany/binding/celtix/assembly/impl/ main/java/org/apache/tuscany/binding/celtix/loader/ test/java/org/apache/tuscany/binding/celtix/assembly/

[js...@apache.org]

Author: jsdelfino
Date: Mon May 15 00:17:41 2006
New Revision: 406566

URL: http://svn.apache.org/viewcvs?rev=406566&view=rev
Log:
Fix for TUSCANY-217, pass ResourceLoader to WSDLDefinitionRegistry, this is a workaround later we'll need to have app scoped system services

Modified:
    incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/assembly/impl/WebServiceBindingImpl.java
    incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/loader/TuscanyWSDLManager.java
    incubator/tuscany/java/sca/bindings/binding.celtix/src/test/java/org/apache/tuscany/binding/celtix/assembly/WebServiceAssemblyFactoryTestCase.java

Modified: incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/assembly/impl/WebServiceBindingImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/assembly/impl/WebServiceBindingImpl.java?rev=406566&r1=406565&r2=406566&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/assembly/impl/WebServiceBindingImpl.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/assembly/impl/WebServiceBindingImpl.java Mon May 15 00:17:41 2006
@@ -128,7 +128,8 @@
             String portName = portURI.substring(h + 1);
 
             // Load the WSDL definitions for the given namespace
-            List<Definition> definitions = wsdlRegistry.getDefinitionsForNamespace(portNamespace);
+            //FIXME pass the current application resource loader
+            List<Definition> definitions = wsdlRegistry.getDefinitionsForNamespace(portNamespace, null);
             if (definitions == null) {
                 throw new IllegalArgumentException("Cannot find WSDL definition for " + portNamespace);
             }

Modified: incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/loader/TuscanyWSDLManager.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/loader/TuscanyWSDLManager.java?rev=406566&r1=406565&r2=406566&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/loader/TuscanyWSDLManager.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/loader/TuscanyWSDLManager.java Mon May 15 00:17:41 2006
@@ -18,6 +18,7 @@
 
 import java.io.IOException;
 import java.net.URL;
+
 import javax.wsdl.Definition;
 import javax.wsdl.WSDLException;
 import javax.wsdl.extensions.ExtensionRegistry;
@@ -48,7 +49,8 @@
 
     public Definition getDefinition(URL url) throws WSDLException {
         try {
-            return wsdlDefinitionRegistry.loadDefinition(null, url);
+            //FIXME pass the current ResourceLoader 
+            return wsdlDefinitionRegistry.loadDefinition(null, url, null);
         } catch (IOException e) {
             throw new WSDLException(WSDLException.CONFIGURATION_ERROR, e.getMessage());
         }
@@ -58,7 +60,8 @@
         try {
             //The namespace is the wsdl targetNamesapce, it is only used
             //when the wsdl is created into cache. we are ok here to set it to null.
-            return wsdlDefinitionRegistry.loadDefinition(null, new URL(url));
+            //FIXME pass the current ResourceLoader
+            return wsdlDefinitionRegistry.loadDefinition(null, new URL(url), null);
         } catch (IOException e) {
             throw new WSDLException(WSDLException.CONFIGURATION_ERROR, e.getMessage());
         }

Modified: incubator/tuscany/java/sca/bindings/binding.celtix/src/test/java/org/apache/tuscany/binding/celtix/assembly/WebServiceAssemblyFactoryTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.celtix/src/test/java/org/apache/tuscany/binding/celtix/assembly/WebServiceAssemblyFactoryTestCase.java?rev=406566&r1=406565&r2=406566&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.celtix/src/test/java/org/apache/tuscany/binding/celtix/assembly/WebServiceAssemblyFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.celtix/src/test/java/org/apache/tuscany/binding/celtix/assembly/WebServiceAssemblyFactoryTestCase.java Mon May 15 00:17:41 2006
@@ -39,7 +39,8 @@
                             List<Definition> wsdlList) {
         EasyMock.reset(new Object[] {reg});
         
-        reg.getDefinitionsForNamespace("http://objectweb.org/hello_world_soap_http");
+        //FIXME pass the current ResourceLoader
+        reg.getDefinitionsForNamespace("http://objectweb.org/hello_world_soap_http", null);
         EasyMock.expectLastCall().andReturn(wsdlList);
         
         EasyMock.replay(new Object[] {reg});