Author: jboynes
Date: Sun Sep 10 12:55:50 2006
New Revision: 441995

URL: http://svn.apache.org/viewvc?view=rev&rev=441995
Log:
add legacy M1 repo so we can get snapshots of webservices projects
hack XmlSchemaRegistryImpl to work with current XmlSchema SNAPSHOT

Modified:
    incubator/tuscany/java/pom/parent/pom.xml
    
incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/XMLSchemaRegistryImpl.java
    incubator/tuscany/java/sca/pom.xml

Modified: incubator/tuscany/java/pom/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/pom/parent/pom.xml?view=diff&rev=441995&r1=441994&r2=441995
==============================================================================
--- incubator/tuscany/java/pom/parent/pom.xml (original)
+++ incubator/tuscany/java/pom/parent/pom.xml Sun Sep 10 12:55:50 2006
@@ -50,6 +50,16 @@
         <url>http://issues.apache.org/jira/browse/TUSCANY</url>
     </issueManagement>
 
+    <repositories>
+        <!-- needed for Apache webServices artifacts -->
+        <repository>
+            <id>apache.m1</id>
+            <name>Apache Maven 1 Repository</name>
+            <url>http://people.apache.org/repository</url>
+            <layout>legacy</layout>
+        </repository>
+    </repositories>
+
     <pluginRepositories>
         <!-- needed for OSGi plugin -->
         <pluginRepository>

Modified: 
incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/XMLSchemaRegistryImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/XMLSchemaRegistryImpl.java?view=diff&rev=441995&r1=441994&r2=441995
==============================================================================
--- 
incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/XMLSchemaRegistryImpl.java
 (original)
+++ 
incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/XMLSchemaRegistryImpl.java
 Sun Sep 10 12:55:50 2006
@@ -87,8 +87,11 @@
     }
 
     public XmlSchema loadSchema(String namespace, URL location) throws 
IOException, XmlSchemaException {
-        XmlSchema schema = collection.getXmlSchema(location.toExternalForm());
-        if (schema == null) {
+        XmlSchema schema;
+        XmlSchema[] schemaList = 
collection.getXmlSchema(location.toExternalForm());
+        if (schemaList != null && schemaList.length > 0) {
+            schema = schemaList[0];
+        } else {
             InputStream is = location.openStream();
             schema = collection.read(new InputStreamReader(is), null);
             is.close();

Modified: incubator/tuscany/java/sca/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/pom.xml?view=diff&rev=441995&r1=441994&r2=441995
==============================================================================
--- incubator/tuscany/java/sca/pom.xml (original)
+++ incubator/tuscany/java/sca/pom.xml Sun Sep 10 12:55:50 2006
@@ -141,6 +141,14 @@
             <name>ibiblio</name>
             <url>http://www.ibiblio.org/maven2</url>
         </repository>
+
+        <!-- needed for Apache webServices artifacts -->
+        <repository>
+            <id>apache.m1</id>
+            <name>Apache Maven 1 Repository</name>
+            <url>http://people.apache.org/repository</url>
+            <layout>legacy</layout>
+        </repository>
     </repositories>
 
     <pluginRepositories>



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

Reply via email to