You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/04/28 00:58:43 UTC

svn commit: r533250 - in /incubator/tuscany/java/sca/modules: assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/ assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ contribution-impl/src/main/java/org/apache/tuscany/contribution/servic...

Author: lresende
Date: Fri Apr 27 15:58:42 2007
New Revision: 533250

URL: http://svn.apache.org/viewvc?view=rev&rev=533250
Log:
Adding contributionURL and ArtifactURI to artifactProcessorExtension.read

Modified:
    incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/ComponentTypeDocumentProcessor.java
    incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/CompositeDocumentProcessor.java
    incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/ConstrainingTypeDocumentProcessor.java
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadDocumentTestCase.java
    incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionServiceImpl.java
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/URLArtifactProcessorExtension.java
    incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
    incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/XSDDocumentProcessor.java
    incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/introspect/DefaultWSDLInterfaceIntrospectorTestCase.java
    incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/introspect/WSDLOperationTestCase.java
    incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
    incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLTestCase.java

Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/ComponentTypeDocumentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/ComponentTypeDocumentProcessor.java?view=diff&rev=533250&r1=533249&r2=533250
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/ComponentTypeDocumentProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/ComponentTypeDocumentProcessor.java Fri Apr 27 15:58:42 2007
@@ -21,6 +21,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
 import java.net.URL;
 
 import javax.xml.stream.XMLInputFactory;
@@ -67,7 +68,7 @@
         this(new DefaultAssemblyFactory(), new DefaultPolicyFactory(), staxProcessor, XMLInputFactory.newInstance());
     }
     
-    public ComponentType read(URL url) throws ContributionReadException {
+    public ComponentType read(URL contributionURL, URI uri, URL url) throws ContributionReadException {
         InputStream urlStream = null;
         try {
             urlStream = url.openStream();

Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/CompositeDocumentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/CompositeDocumentProcessor.java?view=diff&rev=533250&r1=533249&r2=533250
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/CompositeDocumentProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/CompositeDocumentProcessor.java Fri Apr 27 15:58:42 2007
@@ -21,6 +21,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
 import java.net.URL;
 
 import javax.xml.stream.XMLInputFactory;
@@ -67,7 +68,7 @@
         this(new DefaultAssemblyFactory(), new DefaultPolicyFactory(), staxProcessor, XMLInputFactory.newInstance());
     }
 
-    public Composite read(URL url) throws ContributionReadException {
+    public Composite read(URL contributionURL, URI uri, URL url) throws ContributionReadException {
         InputStream urlStream = null;
         try {
             urlStream = url.openStream();

Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/ConstrainingTypeDocumentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/ConstrainingTypeDocumentProcessor.java?view=diff&rev=533250&r1=533249&r2=533250
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/ConstrainingTypeDocumentProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/ConstrainingTypeDocumentProcessor.java Fri Apr 27 15:58:42 2007
@@ -21,6 +21,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
 import java.net.URL;
 
 import javax.xml.stream.XMLInputFactory;
@@ -67,7 +68,7 @@
         this(new DefaultAssemblyFactory(), new DefaultPolicyFactory(), staxProcessor, XMLInputFactory.newInstance());
     }
 
-    public ConstrainingType read(URL url) throws ContributionReadException {
+    public ConstrainingType read(URL contributionURL, URI uri, URL url) throws ContributionReadException {
         InputStream urlStream = null;
         try {
             urlStream = url.openStream();

Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadDocumentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadDocumentTestCase.java?view=diff&rev=533250&r1=533249&r2=533250
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadDocumentTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadDocumentTestCase.java Fri Apr 27 15:58:42 2007
@@ -64,12 +64,12 @@
     public void testResolveConstrainingType() throws Exception {
         
         URL url = getClass().getResource("CalculatorComponent.constrainingType");
-        ConstrainingType constrainingType = (ConstrainingType)documentProcessors.read(url);
+        ConstrainingType constrainingType = (ConstrainingType)documentProcessors.read(null, null, url);
         assertNotNull(constrainingType);
         resolver.add(constrainingType);
 
         url = getClass().getResource("TestAllCalculator.composite");
-        Composite composite = (Composite)documentProcessors.read(url);
+        Composite composite = (Composite)documentProcessors.read(null, null, url);
         assertNotNull(composite);
         
         documentProcessors.resolve(composite, resolver);
@@ -80,12 +80,12 @@
 
     public void testResolveComposite() throws Exception {
         URL url = getClass().getResource("Calculator.composite");
-        Composite nestedComposite = (Composite)documentProcessors.read(url);
+        Composite nestedComposite = (Composite)documentProcessors.read(null, null, url);
         assertNotNull(nestedComposite);
         resolver.add(nestedComposite);
 
         url = getClass().getResource("TestAllCalculator.composite");
-        Composite composite = (Composite)documentProcessors.read(url);
+        Composite composite = (Composite)documentProcessors.read(null, null, url);
         
         documentProcessors.resolve(composite, resolver);
         

Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionServiceImpl.java?view=diff&rev=533250&r1=533249&r2=533250
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionServiceImpl.java Fri Apr 27 15:58:42 2007
@@ -268,9 +268,10 @@
 
     private void processReadPhase(Contribution contribution, List<URI> artifacts) throws ContributionException,
         MalformedURLException {
+        URL contributionURL = contribution.getLocation(); 
         for (URI a : artifacts) {
             URL artifactURL = packageProcessor.getArtifactURL(contribution.getLocation(), a);
-            Object model = this.artifactProcessor.read(artifactURL);
+            Object model = this.artifactProcessor.read(contributionURL, a, artifactURL);
             
             if (model != null) {
                 artifactResolver.add(model);

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java?view=diff&rev=533250&r1=533249&r2=533250
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java Fri Apr 27 15:58:42 2007
@@ -18,6 +18,7 @@
  */
 package org.apache.tuscany.contribution.processor;
 
+import java.net.URI;
 import java.net.URL;
 
 import org.apache.tuscany.contribution.resolver.ArtifactResolver;
@@ -45,11 +46,11 @@
     public DefaultURLArtifactProcessorExtensionPoint() {
     }
 
-    public Object read(URL source) throws ContributionReadException {
+    public Object read(URL contributionURL, URI sourceURI, URL sourceURL) throws ContributionReadException {
         URLArtifactProcessorExtension<Object> processor = null;
         
         // Delegate to the processor associated with file extension
-        String extension = source.getFile();
+        String extension = sourceURL.getFile();
         int extensionStart = extension.lastIndexOf('.');
         //handle files without extension (e.g NOTICE)
         if(extensionStart > 0){
@@ -59,7 +60,7 @@
         if (processor == null) {
             return null;
         }
-        return processor.read(source);
+        return processor.read(contributionURL, sourceURI, sourceURL);
     }
 
     public void write(Object model, URL outputSource) throws ContributionWriteException {
@@ -97,13 +98,13 @@
         }
     }
     
-    public <MO> MO read(URL url, Class<MO> type) throws ContributionReadException {
-        Object mo = read(url);
+    public <MO> MO read(URL contributionURL, URI artifactURI, URL artifactUrl, Class<MO> type) throws ContributionReadException {
+        Object mo = read(contributionURL, artifactURI, artifactUrl);
         if (type.isInstance(mo)) {
             return type.cast(mo);
         } else {
             UnrecognizedElementException e = new UnrecognizedElementException(null);
-            e.setResourceURI(url.toString());
+            e.setResourceURI(artifactURI.toString());
             throw e;
         }
     }

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/URLArtifactProcessorExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/URLArtifactProcessorExtension.java?view=diff&rev=533250&r1=533249&r2=533250
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/URLArtifactProcessorExtension.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/URLArtifactProcessorExtension.java Fri Apr 27 15:58:42 2007
@@ -19,6 +19,7 @@
 
 package org.apache.tuscany.contribution.processor;
 
+import java.net.URI;
 import java.net.URL;
 
 import org.apache.tuscany.contribution.service.ContributionReadException;
@@ -32,12 +33,14 @@
 public interface URLArtifactProcessorExtension<M> extends ArtifactProcessorExtension<M> {
 
     /**
-     * Reads a model from an input source. Examples of input sources are: a URI, a
-     * DOM node, an XML reader.
-     * @param source
+     * Reads a model from an input source. Examples of input 
+     * sources are: a URI, a DOM node, an XML reader.
+     * @param contributionURL
+     * @param artifactURI
+     * @param artifactURL
      * @return a model representation of the input.
      */
-    M read(URL inputSource) throws ContributionReadException;
+    M read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException;
     
     /**
      * Writes a model to an ouput source. Examples of output sources are: a URI, a

Modified: incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLDocumentProcessor.java?view=diff&rev=533250&r1=533249&r2=533250
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLDocumentProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLDocumentProcessor.java Fri Apr 27 15:58:42 2007
@@ -21,6 +21,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
 import java.net.URL;
 
 import javax.wsdl.Definition;
@@ -134,16 +135,16 @@
         this(new DefaultWSDLFactory(), null);
     }
 
-    public WSDLDefinition read(URL url) throws ContributionReadException {
+    public WSDLDefinition read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException {
         try {
 
             // Read a WSDL document
-            InputStream is = url.openStream();
+            InputStream is = artifactURL.openStream();
             WSDLReader reader = wsdlFactory.newWSDLReader();
             reader.setFeature("javax.wsdl.verbose", false);
             reader.setExtensionRegistry(wsdlExtensionRegistry);
 
-            WSDLLocatorImpl locator = new WSDLLocatorImpl(url, is);
+            WSDLLocatorImpl locator = new WSDLLocatorImpl(artifactURL, is);
             Definition definition = reader.readWSDL(locator);
             
             WSDLDefinition wsdlDefinition = factory.createWSDLDefinition();

Modified: incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/XSDDocumentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/XSDDocumentProcessor.java?view=diff&rev=533250&r1=533249&r2=533250
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/XSDDocumentProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/XSDDocumentProcessor.java Fri Apr 27 15:58:42 2007
@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.net.URI;
 import java.net.URL;
 
 import org.apache.tuscany.contribution.processor.URLArtifactProcessorExtension;
@@ -72,11 +73,11 @@
         this(new DefaultWSDLFactory());
     }
 
-    public XSDefinition read(URL url) throws ContributionReadException {
+    public XSDefinition read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException {
         try {
 
             // Read an XSD document
-            InputStream is = url.openStream();
+            InputStream is = artifactURL.openStream();
             try {
     
                 XmlSchemaCollection collection = new XmlSchemaCollection();

Modified: incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/introspect/DefaultWSDLInterfaceIntrospectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/introspect/DefaultWSDLInterfaceIntrospectorTestCase.java?view=diff&rev=533250&r1=533249&r2=533250
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/introspect/DefaultWSDLInterfaceIntrospectorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/introspect/DefaultWSDLInterfaceIntrospectorTestCase.java Fri Apr 27 15:58:42 2007
@@ -19,6 +19,7 @@
 
 package org.apache.tuscany.interfacedef.wsdl.introspect;
 
+import java.net.URI;
 import java.net.URL;
 import java.util.List;
 
@@ -57,7 +58,7 @@
         registry = new WSDLDocumentProcessor();
         resolver = new DefaultArtifactResolver(getClass().getClassLoader());
         URL url = getClass().getResource("../xml/stockquote.wsdl");
-        definition = registry.read(url);
+        definition = registry.read(null, new URI("stockquote.wsdl"), url);
         portType = definition.getDefinition().getPortType(PORTTYPE_NAME);
     }
 

Modified: incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/introspect/WSDLOperationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/introspect/WSDLOperationTestCase.java?view=diff&rev=533250&r1=533249&r2=533250
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/introspect/WSDLOperationTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/introspect/WSDLOperationTestCase.java Fri Apr 27 15:58:42 2007
@@ -19,6 +19,7 @@
 
 package org.apache.tuscany.interfacedef.wsdl.introspect;
 
+import java.net.URI;
 import java.net.URL;
 import java.util.List;
 
@@ -57,7 +58,7 @@
 
     public final void testWrappedOperation() throws Exception {
         URL url = getClass().getResource("../xml/stockquote.wsdl");
-        WSDLDefinition definition = processor.read(url);
+        WSDLDefinition definition = processor.read(null, new URI("stockquote.wsdl"), url);
         PortType portType = definition.getDefinition().getPortType(PORTTYPE_NAME);
         Operation operation = portType.getOperation("getLastTradePrice", null, null);
 
@@ -85,7 +86,7 @@
 
     public final void testUnwrappedOperation() throws Exception {
         URL url = getClass().getResource("../xml/unwrapped-stockquote.wsdl");
-        WSDLDefinition definition = processor.read(url);
+        WSDLDefinition definition = processor.read(null, new URI("unwrapped-stockquote.wsdl"), url);
         PortType portType = definition.getDefinition().getPortType(PORTTYPE_NAME);
 
         Operation operation = portType.getOperation("getLastTradePrice1", null, null);
@@ -101,7 +102,7 @@
 
     public final void testInvalidWSDL() throws Exception {
         URL url = getClass().getResource("../xml/invalid-stockquote.wsdl");
-        WSDLDefinition definition = processor.read(url);
+        WSDLDefinition definition = processor.read(null, new URI("invalid-stockquote.wsdl"), url);
         PortType portType = definition.getDefinition().getPortType(PORTTYPE_NAME);
 
         Operation operation = portType.getOperation("getLastTradePrice", null, null);

Modified: incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java?view=diff&rev=533250&r1=533249&r2=533250
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java Fri Apr 27 15:58:42 2007
@@ -19,6 +19,7 @@
 
 package org.apache.tuscany.interfacedef.wsdl.introspect;
 
+import java.net.URI;
 import java.net.URL;
 
 import javax.wsdl.Operation;
@@ -53,7 +54,7 @@
 
     public final void testWrappedOperation() throws Exception {
         URL url = getClass().getResource("../xml/stockquote.wsdl");
-        WSDLDefinition definition = registry.read( url);
+        WSDLDefinition definition = registry.read(null, new URI("stockquote.wsdl"), url);
         PortType portType = definition.getDefinition().getPortType(PORTTYPE_NAME);
         Operation operation = portType.getOperation("getLastTradePrice", null, null);
         WSDLOperation op = new WSDLOperation(operation, definition.getInlinedSchemas(), "org.w3c.dom.Node", resolver);
@@ -64,7 +65,7 @@
 
     public final void testUnwrappedOperation() throws Exception {
         URL url = getClass().getResource("../xml/unwrapped-stockquote.wsdl");
-        WSDLDefinition definition = registry.read( url);
+        WSDLDefinition definition = registry.read(null, new URI("unwrapped-stockquote.wsdl"), url);
         PortType portType = definition.getDefinition().getPortType(PORTTYPE_NAME);
         Operation operation = portType.getOperation("getLastTradePrice1", null, null);
         WSDLOperation op = new WSDLOperation(operation, definition.getInlinedSchemas(), "org.w3c.dom.Node", resolver);

Modified: incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLTestCase.java?view=diff&rev=533250&r1=533249&r2=533250
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLTestCase.java Fri Apr 27 15:58:42 2007
@@ -19,6 +19,7 @@
 
 package org.apache.tuscany.interfacedef.wsdl.xml;
 
+import java.net.URI;
 import java.net.URL;
 
 import javax.xml.stream.XMLInputFactory;
@@ -53,7 +54,7 @@
 
     public void testReadWSDLDocument() throws Exception {
         URL url = getClass().getResource("example.wsdl");
-        WSDLDefinition definition = documentProcessors.read(url, WSDLDefinition.class);
+        WSDLDefinition definition = documentProcessors.read(null, new URI("example.wsdl"), url, WSDLDefinition.class);
         assertNotNull(definition);
         assertNotNull(definition.getDefinition());
         assertEquals(definition.getNamespace(), "http://www.example.org");



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org