You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/06/27 21:48:36 UTC
svn commit: r551296 - in
/incubator/tuscany/java/sca/modules/assembly-xml/src:
main/java/org/apache/tuscany/sca/assembly/xml/
test/java/org/apache/tuscany/sca/assembly/xml/
Author: jsdelfino
Date: Wed Jun 27 12:48:35 2007
New Revision: 551296
URL: http://svn.apache.org/viewvc?view=rev&rev=551296
Log:
Initialize the URI field of Composite and ComponentType model objects
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java?view=diff&rev=551296&r1=551295&r2=551296
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java Wed Jun 27 12:48:35 2007
@@ -61,7 +61,9 @@
XMLStreamReader reader = inputFactory.createXMLStreamReader(urlStream);
reader.nextTag();
ComponentType componentType = (ComponentType)extensionProcessor.read(reader);
- componentType.setURI(url.toString());
+ if (componentType != null) {
+ componentType.setURI(uri.toString());
+ }
return componentType;
} catch (XMLStreamException e) {
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java?view=diff&rev=551296&r1=551295&r2=551296
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java Wed Jun 27 12:48:35 2007
@@ -61,6 +61,9 @@
XMLStreamReader reader = inputFactory.createXMLStreamReader(urlStream);
reader.nextTag();
Composite composite = (Composite)extensionProcessor.read(reader);
+ if (composite != null) {
+ composite.setURI(uri.toString());
+ }
return composite;
} catch (XMLStreamException e) {
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java?view=diff&rev=551296&r1=551295&r2=551296
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java Wed Jun 27 12:48:35 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.sca.assembly.xml;
+import java.net.URI;
import java.net.URL;
import javax.xml.stream.XMLInputFactory;
@@ -82,12 +83,14 @@
public void testResolveConstrainingType() throws Exception {
URL url = getClass().getResource("CalculatorComponent.constrainingType");
- ConstrainingType constrainingType = (ConstrainingType)documentProcessor.read(null, null, url);
+ URI uri = URI.create("CalculatorComponent.constrainingType");
+ ConstrainingType constrainingType = (ConstrainingType)documentProcessor.read(null, uri, url);
assertNotNull(constrainingType);
resolver.addModel(constrainingType);
url = getClass().getResource("TestAllCalculator.composite");
- Composite composite = (Composite)documentProcessor.read(null, null, url);
+ uri = URI.create("TestAllCalculator.constrainingType");
+ Composite composite = (Composite)documentProcessor.read(null, uri, url);
assertNotNull(composite);
documentProcessor.resolve(composite, resolver);
@@ -98,12 +101,14 @@
public void testResolveComposite() throws Exception {
URL url = getClass().getResource("Calculator.composite");
- Composite nestedComposite = (Composite)documentProcessor.read(null, null, url);
+ URI uri = URI.create("Calculator.composite");
+ Composite nestedComposite = (Composite)documentProcessor.read(null, uri, url);
assertNotNull(nestedComposite);
resolver.addModel(nestedComposite);
url = getClass().getResource("TestAllCalculator.composite");
- Composite composite = (Composite)documentProcessor.read(null, null, url);
+ uri = URI.create("TestAllCalculator.composite");
+ Composite composite = (Composite)documentProcessor.read(null, uri, url);
documentProcessor.resolve(composite, resolver);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org