You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2011/10/05 09:22:58 UTC

svn commit: r1179072 - /tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java

Author: antelder
Date: Wed Oct  5 07:22:58 2011
New Revision: 1179072

URL: http://svn.apache.org/viewvc?rev=1179072&view=rev
Log:
Change back to use getSchemaDocument instead of getAllSchema()[0]. This was changed back in  r1043206 to try to make the Tuscany code compatible with diff version of xmlSchema but this can cause loops in xmlschema so go back to getSchemaDocument and require using the Tuscany level of xmlSchema

Modified:
    tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java

Modified: tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java?rev=1179072&r1=1179071&r2=1179072&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java Wed Oct  5 07:22:58 2011
@@ -738,8 +738,7 @@ public class ComponentBuilderImpl {
                         // create schema factory for XML schema
                         SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
                                       
-			// Equivalent to getSchema().getSchemaDocument(), but allows us to support older versions of XmlSchema
-                        Document schemaDom = xsdDefinition.getSchema().getAllSchemas()[0]; 
+                        Document schemaDom = xsdDefinition.getSchema().getSchemaDocument(); 
                         
                         String valueSchema = null; 
                         Schema schema = null;