svn commit: r405635 - /incubator/tuscany/java/sca/databinding/sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java

[jsdelfino]

Author: jsdelfino
Date: Tue May  9 21:34:05 2006
New Revision: 405635

URL: http://svn.apache.org/viewcvs?rev=405635&view=rev
Log:
Fix for TUSCANY-319 - added schemaLocation attribute to import.sdo

Modified:
    
incubator/tuscany/java/sca/databinding/sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java

Modified: 
incubator/tuscany/java/sca/databinding/sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/databinding/sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java?rev=405635&r1=405634&r2=405635&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/databinding/sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java
 (original)
+++ 
incubator/tuscany/java/sca/databinding/sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java
 Tue May  9 21:34:05 2006
@@ -52,7 +52,7 @@
     public AssemblyObject load(XMLStreamReader reader, LoaderContext 
loaderContext) throws XMLStreamException, ConfigurationLoadException {
         assert IMPORT_SDO.equals(reader.getName());
         importFactory(reader, loaderContext);
-        importWSDL(reader, loaderContext);
+        importWSDLOrXSD(reader, loaderContext);
         StAXUtil.skipToEndElement(reader);
         return null;
     }
@@ -76,11 +76,13 @@
     }
 
     @SuppressWarnings("deprecation")
-    private void importWSDL(XMLStreamReader reader, LoaderContext 
loaderContext) throws ConfigurationLoadException {
-        String wsdLLocation = reader.getAttributeValue(null, "wsdlLocation");
-        if (wsdLLocation != null) {
+    private void importWSDLOrXSD(XMLStreamReader reader, LoaderContext 
loaderContext) throws ConfigurationLoadException {
+        String location = reader.getAttributeValue(null, "wsdlLocation");
+        if (location == null)
+            location = reader.getAttributeValue(null, "schemaLocation");
+        if (location != null) {
             ResourceLoader resourceLoader = loaderContext.getResourceLoader();
-            URL wsdlURL = resourceLoader.getResource(wsdLLocation);
+            URL wsdlURL = resourceLoader.getResource(location);
             ClassLoader oldCL = Thread.currentThread().getContextClassLoader();
             try {
 //                
Thread.currentThread().setContextClassLoader(resourceLoader.getClassLoader());
@@ -94,7 +96,7 @@
                 }
             } catch (IOException e) {
                 SidefileLoadException sfe = new 
SidefileLoadException(e.getMessage());
-                sfe.setResourceURI(wsdLLocation);
+                sfe.setResourceURI(location);
                 throw sfe;
             } finally {
                 Thread.currentThread().setContextClassLoader(oldCL);