Modified: incubator/tuscany/branches/sca-java-1.0/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java?rev=576162&r1=576161&r2=576162&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.0/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java (original) +++ incubator/tuscany/branches/sca-java-1.0/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java Sun Sep 16 12:53:24 2007 @@ -195,9 +195,11 @@ SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); schema = schemaFactory.newSchema(ReallySmallRuntimeBuilder.class.getClassLoader().getResource("tuscany-sca.xsd")); } catch (Error e) { - //FIXME Log this + //FIXME Log this, some old JDKs don't support XMLSchema validation + //e.printStackTrace(); } catch (Exception e) { - //FIXME Log this + //FIXME Log this, some old JDKs don't support XMLSchema validation + //e.printStackTrace(); } // Create and register document processors for SCA assembly XML @@ -207,8 +209,10 @@ documentProcessors.addArtifactProcessor(new ConstrainingTypeDocumentProcessor(staxProcessor, inputFactory, schema)); // Create and register document processor for definitions.xml + //TODO No XMLSchema validation for definitions.xml for now + // as the XSD for it is not quite right yet SCADefinitionsDocumentProcessor definitionsDocumentProcessor = - new SCADefinitionsDocumentProcessor(staxProcessors, staxProcessor, xmlFactory, policyFactory, schema); + new SCADefinitionsDocumentProcessor(staxProcessors, staxProcessor, xmlFactory, policyFactory, null); documentProcessors.addArtifactProcessor(definitionsDocumentProcessor); ModelResolver domainModelResolver = definitionsDocumentProcessor.getDomainModelResolver();
Modified: incubator/tuscany/branches/sca-java-1.0/modules/sca-definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsDocumentProcessor.java URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/sca-definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsDocumentProcessor.java?rev=576162&r1=576161&r2=576162&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.0/modules/sca-definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsDocumentProcessor.java (original) +++ incubator/tuscany/branches/sca-java-1.0/modules/sca-definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsDocumentProcessor.java Sun Sep 16 12:53:24 2007 @@ -92,7 +92,7 @@ InputStream urlStream = null; try { urlStream = url.openStream(); - XMLStreamReader reader = inputFactory.createXMLStreamReader(urlStream); + XMLStreamReader reader = inputFactory.createXMLStreamReader(url.toString(), urlStream); reader = new ValidatingXMLStreamReader(reader, schema); reader.nextTag(); SCADefinitions scaDefns = (SCADefinitions)extensionProcessor.read(reader); Modified: incubator/tuscany/branches/sca-java-1.0/modules/sca-definitions/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/sca-definitions/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java?rev=576162&r1=576161&r2=576162&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.0/modules/sca-definitions/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java (original) +++ incubator/tuscany/branches/sca-java-1.0/modules/sca-definitions/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java Sun Sep 16 12:53:24 2007 @@ -24,12 +24,9 @@ import java.util.Hashtable; import java.util.Map; -import javax.xml.XMLConstants; import javax.xml.namespace.QName; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLOutputFactory; -import javax.xml.validation.Schema; -import javax.xml.validation.SchemaFactory; import junit.framework.TestCase; @@ -87,14 +84,11 @@ ExtensibleStAXArtifactProcessor staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance()); staxProcessors.addArtifactProcessor(new MockPolicyProcessor()); - SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); - Schema schema = schemaFactory.newSchema(getClass().getClassLoader().getResource("tuscany-sca.xsd")); - scaDefnDocProcessor = new SCADefinitionsDocumentProcessor(staxProcessors, staxProcessor, inputFactory, policyFactory, - schema); + null); URL url = getClass().getResource("test_definitions.xml"); URI uri = URI.create("test_definitions.xml"); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
