From 3e33552da0eaa898a0d8773e7f22862985f8be63 Mon Sep 17 00:00:00 2001 From: beckerdo Date: Wed, 4 Mar 2009 15:44:36 +0000 Subject: TUSCANY-2897 JMSBinding model should be QNames not Strings git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@750052 13f79535-47bb-0310-9956-ffa450edef68 --- .../tuscany/sca/definitions/xml/SCADefinitionsProcessor.java | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'branches/sca-java-1.x/modules/definitions-xml/src/main/java/org/apache') diff --git a/branches/sca-java-1.x/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java b/branches/sca-java-1.x/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java index b87d890866..0bea894854 100644 --- a/branches/sca-java-1.x/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java +++ b/branches/sca-java-1.x/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java @@ -32,6 +32,7 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; import org.apache.tuscany.sca.assembly.Binding; +import org.apache.tuscany.sca.assembly.DefinitionElement; import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; @@ -123,6 +124,8 @@ public class SCADefinitionsProcessor extends BaseStAXArtifactProcessor implement definitions.getPolicySets().add(policySet); } else if ( extension instanceof Binding ) { Binding binding = (Binding)extension; + if (binding instanceof DefinitionElement) + ((DefinitionElement)binding).setTargetNamespace(targetNamespace); definitions.getBindings().add(binding); } else if ( extension instanceof IntentAttachPointType ) { IntentAttachPointType type = (IntentAttachPointType)extension; @@ -217,6 +220,10 @@ public class SCADefinitionsProcessor extends BaseStAXArtifactProcessor implement resolver.addModel(implType); } + for (Object binding : scaDefns.getBindings() ) { + resolver.addModel(binding); + } + // now resolve everything to ensure that any references between // artifacts are satisfied -- cgit v1.2.3