From d52a8a5ded179ce7c16c29f98fae699644daa0f7 Mon Sep 17 00:00:00 2001 From: slaws Date: Wed, 25 Nov 2009 15:36:08 +0000 Subject: For POL_5001 test to see if there are extensions to handle implementation types that have been specified git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@884150 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/definitions/xml/DefinitionsProcessor.java | 26 +++++++++++++++++++++- .../definitions-xml-validation-messages.properties | 4 +++- 2 files changed, 28 insertions(+), 2 deletions(-) (limited to 'sca-java-2.x') diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java index b545e62469..d28d51a956 100644 --- a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java +++ b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java @@ -38,10 +38,13 @@ import org.apache.tuscany.sca.contribution.processor.ContributionResolveExceptio import org.apache.tuscany.sca.contribution.processor.ContributionWriteException; import org.apache.tuscany.sca.contribution.processor.ProcessorContext; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; +import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; import org.apache.tuscany.sca.core.FactoryExtensionPoint; +import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.definitions.Definitions; import org.apache.tuscany.sca.definitions.DefinitionsFactory; +import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.policy.BindingType; import org.apache.tuscany.sca.policy.ImplementationType; import org.apache.tuscany.sca.policy.Intent; @@ -53,6 +56,8 @@ import org.apache.tuscany.sca.policy.PolicySet; * @version $Rev$ $Date$ */ public class DefinitionsProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor { + private ExtensionPointRegistry registry; + private StAXArtifactProcessorExtensionPoint processors; private StAXArtifactProcessor extensionProcessor; private DefinitionsFactory definitionsFactory; @@ -64,10 +69,14 @@ public class DefinitionsProcessor extends BaseStAXArtifactProcessor implements S public static final String TARGET_NAMESPACE = "targetNamespace"; public static final String NAME = "name"; - public DefinitionsProcessor(FactoryExtensionPoint factoryExtensionPoint, + public DefinitionsProcessor(ExtensionPointRegistry registry, StAXArtifactProcessor extensionProcessor) { + this.registry = registry; this.extensionProcessor = extensionProcessor; + this.processors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class); + FactoryExtensionPoint factoryExtensionPoint = registry.getExtensionPoint(FactoryExtensionPoint.class); this.definitionsFactory = factoryExtensionPoint.getFactory(DefinitionsFactory.class); + } public Definitions read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, XMLStreamException { @@ -159,6 +168,7 @@ public class DefinitionsProcessor extends BaseStAXArtifactProcessor implements S } public void resolve(Definitions scaDefns, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException { + // start by adding all of the top level artifacts into the resolver as there // are many cross artifact references in a definitions file and we don't want // to be dependent on the order things appear @@ -212,10 +222,24 @@ public class DefinitionsProcessor extends BaseStAXArtifactProcessor implements S for (BindingType bindingType : scaDefns.getBindingTypes()) { extensionProcessor.resolve(bindingType, resolver, context); + if (processors.getProcessor(bindingType.getType()) == null){ + Monitor.error(context.getMonitor(), + this, + "org.apache.tuscany.sca.definitions.xml.definitions-xml-validation-messages", + "BindingTypeNotFound", + bindingType.getType().toString()); + } } for (ImplementationType implementationType : scaDefns.getImplementationTypes()) { extensionProcessor.resolve(implementationType, resolver, context); + if (processors.getProcessor(implementationType.getType()) == null){ + Monitor.error(context.getMonitor(), + this, + "org.apache.tuscany.sca.definitions.xml.definitions-xml-validation-messages", + "ImplementationTypeNotFound", + implementationType.getType().toString()); + } } } diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/definitions/xml/definitions-xml-validation-messages.properties b/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/definitions/xml/definitions-xml-validation-messages.properties index 857887ec3f..de27c0bd31 100644 --- a/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/definitions/xml/definitions-xml-validation-messages.properties +++ b/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/definitions/xml/definitions-xml-validation-messages.properties @@ -19,4 +19,6 @@ # # ContributionReadException = ContributionReadException occured due to : -PrivilegedActionException = Privileged Action Exception occured due to FilePermission in security policy file: \ No newline at end of file +PrivilegedActionException = Privileged Action Exception occured due to FilePermission in security policy file: +ImplementationTypeNotFound = [POL50001] An extension to support the implementation type {0} can't be found in the domain +BindingTypeNotFound = An extension to support the binding type {0} can't be found in the domain \ No newline at end of file -- cgit v1.2.3