diff options
Diffstat (limited to '')
3 files changed, 10 insertions, 10 deletions
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java index 8f8158776f..7d72e685cd 100644 --- a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java +++ b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java @@ -224,7 +224,7 @@ abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor { * @param reader */ protected void readTargets(Reference reference, XMLStreamReader reader) { - String value = reader.getAttributeValue(null, TARGET); + String value = getURIString(reader, TARGET); ComponentService target = null; if (value != null) { for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) { diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java index 3558b191cb..16874ff0d2 100644 --- a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java +++ b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java @@ -182,7 +182,7 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt composite = assemblyFactory.createComposite(); composite.setSpecVersion(Constants.SCA11_NS); - composite.setName(new QName(getString(reader, TARGET_NAMESPACE), getString(reader, NAME))); + composite.setName(new QName(getURIString(reader, TARGET_NAMESPACE), getString(reader, NAME))); if (!isSet(reader, TARGET_NAMESPACE)) { // spec says that a composite must have a namespace @@ -204,7 +204,7 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt // Read an <include> include = assemblyFactory.createComposite(); include.setName(getQName(reader, NAME)); - include.setURI(getString(reader, URI)); + include.setURI(getURIString(reader, URI)); include.setUnresolved(true); composite.getIncludes().add(include); @@ -294,7 +294,7 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt compositeReference.setName(getString(reader, NAME)); readMultiplicity(compositeReference, reader); readTargets(compositeReference, reader); - String promote = reader.getAttributeValue(null, Constants.PROMOTE); + String promote = getURIString(reader, Constants.PROMOTE); if (promote != null) { for (StringTokenizer tokens = new StringTokenizer(promote); tokens.hasMoreTokens();) { String refName = tokens.nextToken(); @@ -332,7 +332,7 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt // Read a <component><property> componentProperty = assemblyFactory.createComponentProperty(); property = componentProperty; - String source = getString(reader, SOURCE); + String source = getURIString(reader, SOURCE); if (source != null) { source = source.trim(); } @@ -361,7 +361,7 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt //throw ce; } } - componentProperty.setFile(getString(reader, FILE)); + componentProperty.setFile(getURIString(reader, FILE)); //handle extension attributes this.readExtendedAttributes(reader, @@ -411,7 +411,7 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt component.setAutowire(getBoolean(reader, AUTOWIRE)); } if (isSet(reader, URI)) { - component.setURI(getString(reader, URI)); + component.setURI(getURIString(reader, URI)); } //handle extension attributes @@ -426,12 +426,12 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt wire = assemblyFactory.createWire(); ComponentReference source = assemblyFactory.createComponentReference(); source.setUnresolved(true); - source.setName(getString(reader, SOURCE)); + source.setName(getURIString(reader, SOURCE)); wire.setSource(source); ComponentService target = assemblyFactory.createComponentService(); target.setUnresolved(true); - target.setName(getString(reader, TARGET)); + target.setName(getURIString(reader, TARGET)); wire.setTarget(target); // Read @replace 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 629c9e255f..006b80ee31 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 @@ -95,7 +95,7 @@ public class DefinitionsProcessor extends BaseStAXArtifactProcessor implements S name = reader.getName(); if (DEFINITIONS_QNAME.equals(name)) { definitions = definitionsFactory.createDefinitions(); - targetNamespace = reader.getAttributeValue(null, TARGET_NAMESPACE); + targetNamespace = getURIString(reader, TARGET_NAMESPACE); definitions.setTargetNamespace(targetNamespace); } else { Object extension = extensionProcessor.read(reader, context); |