You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2007/03/20 02:20:39 UTC
svn commit: r520203 - in /incubator/tuscany/java/sca/kernel/core/src:
main/java/org/apache/tuscany/core/loader/
test/java/org/apache/tuscany/core/loader/
Author: jboynes
Date: Mon Mar 19 18:20:38 2007
New Revision: 520203
URL: http://svn.apache.org/viewvc?view=rev&rev=520203
Log:
add runtimeId attribute support to component loader
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoReferenceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java?view=diff&rev=520203&r1=520202&r2=520203
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java Mon Mar 19 18:20:38 2007
@@ -21,6 +21,7 @@
import java.lang.reflect.Type;
import java.net.URI;
import java.net.URL;
+import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -112,6 +113,17 @@
} else {
autowire = Boolean.parseBoolean(autowireAttr);
}
+ String runtimeAttr = reader.getAttributeValue(null, "runtimeId");
+ URI runtimeId;
+ if (runtimeAttr != null) {
+ try {
+ runtimeId = new URI(runtimeAttr);
+ } catch (URISyntaxException e) {
+ throw new InvalidValueException(runtimeAttr, "runtimeId", e);
+ }
+ } else {
+ runtimeId = null;
+ }
URI componentId = URI.create(context.getComponentId() + "/").resolve(name);
ClassLoader loader = context.getClassLoader();
@@ -124,6 +136,7 @@
ComponentDefinition<Implementation<?>> componentDefinition =
new ComponentDefinition<Implementation<?>>(componentId, impl);
componentDefinition.setAutowire(autowire);
+ componentDefinition.setRuntimeId(runtimeId);
if (initLevel != null) {
if (initLevel.length() == 0) {
componentDefinition.setInitLevel(0);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java?view=diff&rev=520203&r1=520202&r2=520203
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java Mon Mar 19 18:20:38 2007
@@ -88,6 +88,7 @@
EasyMock.expect(reader.getAttributeValue(null, "initLevel")).andReturn("0");
EasyMock.expect(reader.getAttributeValue((String) EasyMock.isNull(), EasyMock.eq("autowire")))
.andReturn(null);
+ EasyMock.expect(reader.getAttributeValue(null, "runtimeId")).andReturn(null);
EasyMock.expect(reader.nextTag()).andReturn(1);
EasyMock.replay(reader);
ctx = EasyMock.createMock(DeploymentContext.class);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoReferenceTestCase.java?view=diff&rev=520203&r1=520202&r2=520203
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoReferenceTestCase.java Mon Mar 19 18:20:38 2007
@@ -88,6 +88,7 @@
.andReturn("noreference");
EasyMock.expect(reader.getAttributeValue((String) EasyMock.isNull(), EasyMock.eq("autowire")))
.andReturn(null);
+ EasyMock.expect(reader.getAttributeValue(null, "runtimeId")).andReturn(null);
EasyMock.expect(reader.getAttributeValue(null, "target")).andReturn("text");
EasyMock.expect(reader.next()).andReturn(XMLStreamConstants.END_ELEMENT);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java?view=diff&rev=520203&r1=520202&r2=520203
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java Mon Mar 19 18:20:38 2007
@@ -74,6 +74,7 @@
.andReturn(null);
EasyMock.expect(mockReader.getAttributeValue((String) EasyMock.isNull(), EasyMock.eq("autowire")))
.andReturn(null);
+ EasyMock.expect(mockReader.getAttributeValue(null, "runtimeId")).andReturn(null);
EasyMock.expect(mockReader.getAttributeValue(EasyMock.isA(String.class), EasyMock.isA(String.class)))
.andReturn(null);
EasyMock.expect(mockReader.nextTag()).andReturn(0);
@@ -109,6 +110,7 @@
.andReturn(null);
EasyMock.expect(mockReader.getAttributeValue((String) EasyMock.isNull(), EasyMock.eq("autowire")))
.andReturn("true");
+ EasyMock.expect(mockReader.getAttributeValue(null, "runtimeId")).andReturn(null);
EasyMock.expect(mockReader.nextTag()).andReturn(0);
EasyMock.expect(mockReader.next()).andReturn(XMLStreamConstants.END_ELEMENT);
EasyMock.replay(mockReader);
@@ -144,6 +146,7 @@
.andReturn("20");
EasyMock.expect(mockReader.getAttributeValue((String) EasyMock.isNull(), EasyMock.eq("autowire")))
.andReturn(null);
+ EasyMock.expect(mockReader.getAttributeValue(null, "runtimeId")).andReturn(null);
EasyMock.expect(mockReader.nextTag()).andReturn(0);
EasyMock.expect(mockReader.next()).andReturn(XMLStreamConstants.END_ELEMENT);
EasyMock.replay(mockReader);
@@ -199,6 +202,7 @@
.andReturn(null);
EasyMock.expect(mockReader.getAttributeValue((String) EasyMock.isNull(), EasyMock.eq("autowire")))
.andReturn(null);
+ EasyMock.expect(mockReader.getAttributeValue(null, "runtimeId")).andReturn(null);
EasyMock.expect(mockReader.getAttributeValue(EasyMock.isA(String.class), EasyMock.isA(String.class)))
.andReturn(null);
EasyMock.expect(mockReader.nextTag()).andReturn(0);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org