svn commit: r405636 - /incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ImportWSDLLoader.java

[js...@apache.org]

Author: jsdelfino
Date: Tue May  9 21:35:11 2006
New Revision: 405636

URL: http://svn.apache.org/viewcvs?rev=405636&view=rev
Log:
Fix related to TUSCANY-319 - added wsdlLocation attribute to import.wsdl to be consistent with import.sdo

Modified:
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ImportWSDLLoader.java

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ImportWSDLLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ImportWSDLLoader.java?rev=405636&r1=405635&r2=405636&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ImportWSDLLoader.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ImportWSDLLoader.java Tue May  9 21:35:11 2006
@@ -16,8 +16,11 @@
  */
 package org.apache.tuscany.core.loader.assembly;
 
+import static org.apache.tuscany.core.loader.assembly.AssemblyConstants.IMPORT_WSDL;
+
 import java.io.IOException;
 import java.net.URL;
+
 import javax.wsdl.Definition;
 import javax.wsdl.WSDLException;
 import javax.xml.namespace.QName;
@@ -31,7 +34,6 @@
 import org.apache.tuscany.core.loader.LoaderContext;
 import org.apache.tuscany.core.loader.StAXUtil;
 import org.apache.tuscany.core.loader.WSDLDefinitionRegistry;
-import static org.apache.tuscany.core.loader.assembly.AssemblyConstants.IMPORT_WSDL;
 import org.apache.tuscany.core.system.annotation.Autowire;
 import org.apache.tuscany.model.assembly.ImportWSDL;
 import org.osoa.sca.annotations.Scope;
@@ -58,6 +60,8 @@
         assert AssemblyConstants.IMPORT_WSDL.equals(reader.getName());
         String namespace = reader.getAttributeValue(null, "namespace");
         String location = reader.getAttributeValue(null, "location");
+        if (location == null)
+            location = reader.getAttributeValue(null, "wsdlLocation");
         ImportWSDL importWSDL = factory.createImportWSDL(location, namespace);
 
         Definition definition = loadDefinition(namespace, location, loaderContext.getResourceLoader());