diff options
author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2008-10-30 13:10:19 +0000 |
---|---|---|
committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2008-10-30 13:10:19 +0000 |
commit | 47fdbd622dc107617a0e5bbd85d21f9249d17ed3 (patch) | |
tree | 3a1733846621cede38b013ae73374498d925769a /branches/sca-java-1.3.3/itest/validation/src/test/java/domain/CustomCompositeBuilder.java | |
parent | 7a28ba7f5ff5dbe521e4b62011c4353685516a31 (diff) |
TUSCANY-2631 - Make the contribution processor more fault tolerant. Apply Ram's patches (and a few other changes). Doesn't do everything asked for in the JIRA but a step in the right direction
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@709156 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.3.3/itest/validation/src/test/java/domain/CustomCompositeBuilder.java')
-rw-r--r-- | branches/sca-java-1.3.3/itest/validation/src/test/java/domain/CustomCompositeBuilder.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/branches/sca-java-1.3.3/itest/validation/src/test/java/domain/CustomCompositeBuilder.java b/branches/sca-java-1.3.3/itest/validation/src/test/java/domain/CustomCompositeBuilder.java index dc82e55cd0..ba00114c88 100644 --- a/branches/sca-java-1.3.3/itest/validation/src/test/java/domain/CustomCompositeBuilder.java +++ b/branches/sca-java-1.3.3/itest/validation/src/test/java/domain/CustomCompositeBuilder.java @@ -38,11 +38,14 @@ import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl; import org.apache.tuscany.sca.contribution.Contribution; import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; +import org.apache.tuscany.sca.contribution.processor.DefaultValidatingXMLInputFactory; +import org.apache.tuscany.sca.contribution.processor.DefaultValidationSchemaExtensionPoint; import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint; +import org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint; import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; @@ -111,7 +114,13 @@ public class CustomCompositeBuilder { // Get XML input/output factories modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class); XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class); - outputFactory = modelFactories.getFactory(XMLOutputFactory.class); + outputFactory = modelFactories.getFactory(XMLOutputFactory.class); + + // create the validating input factory out here just so that the + // monitor can be passed in + ValidationSchemaExtensionPoint schemas = new DefaultValidationSchemaExtensionPoint(); + XMLInputFactory validatingInputFactory = new DefaultValidatingXMLInputFactory(inputFactory, schemas, monitor); + modelFactories.addFactory(validatingInputFactory); // Get contribution workspace and assembly model factories workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); |