You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2007/02/25 04:45:24 UTC
svn commit: r511437 - in /incubator/tuscany/java/sca/kernel/core/src:
main/java/org/apache/tuscany/core/loader/
test/java/org/apache/tuscany/core/loader/
Author: jmarino
Date: Sat Feb 24 19:45:23 2007
New Revision: 511437
URL: http://svn.apache.org/viewvc?view=rev&rev=511437
Log:
cosmetic cleanup
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/ComponentLoaderRefTestCase.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=511437&r1=511436&r2=511437
==============================================================================
--- 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 Sat Feb 24 19:45:23 2007
@@ -20,6 +20,7 @@
import java.lang.reflect.Type;
import java.net.URI;
+import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -103,19 +104,16 @@
}
@SuppressWarnings("unchecked")
- public ComponentDefinition<?> load(
- ModelObject object,
- XMLStreamReader reader,
- DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
+ public ComponentDefinition<?> load(ModelObject object, XMLStreamReader reader, DeploymentContext context)
+ throws XMLStreamException, LoaderException {
assert COMPONENT.equals(reader.getName());
String name = reader.getAttributeValue(null, "name");
String initLevel = reader.getAttributeValue(null, "initLevel");
- URI componentId = URI.create(deploymentContext.getComponentId() + "/").resolve(name);
- DeploymentContext childContext = new ChildDeploymentContext(deploymentContext,
- deploymentContext.getClassLoader(),
- deploymentContext.getScdlLocation(),
- componentId);
+ URI componentId = URI.create(context.getComponentId() + "/").resolve(name);
+ ClassLoader loader = context.getClassLoader();
+ URL location = context.getScdlLocation();
+ DeploymentContext childContext = new ChildDeploymentContext(context, loader, location, componentId);
Implementation<?> impl = loadImplementation(reader, childContext);
registry.loadComponentType(impl, childContext);
@@ -139,9 +137,9 @@
case START_ELEMENT:
QName qname = reader.getName();
if (PROPERTY.equals(qname)) {
- loadProperty(reader, childContext, componentDefinition);
+ loadProperty(reader, componentDefinition, childContext);
} else if (REFERENCE.equals(qname)) {
- loadReference(reader, childContext, componentDefinition);
+ loadReference(reader, componentDefinition, childContext);
} else {
throw new UnrecognizedElementException(qname);
}
@@ -185,12 +183,10 @@
}
@SuppressWarnings("unchecked")
- protected void loadProperty(XMLStreamReader reader,
- DeploymentContext deploymentContext,
- ComponentDefinition<?> componentDefinition) throws XMLStreamException,
- LoaderException {
+ protected void loadProperty(XMLStreamReader reader, ComponentDefinition<?> definition, DeploymentContext context)
+ throws XMLStreamException, LoaderException {
String name = reader.getAttributeValue(null, PROPERTY_NAME_ATTR);
- Implementation<?> implementation = componentDefinition.getImplementation();
+ Implementation<?> implementation = definition.getImplementation();
ComponentType<?, ?, ?> componentType = implementation.getComponentType();
Property<Type> property = (Property<Type>) componentType.getProperties().get(name);
if (property == null) {
@@ -217,13 +213,12 @@
ObjectFactory<Type> objectFactory = propertyFactory.createObjectFactory(property, propertyValue);
// propertyValue.setValueFactory(new SimplePropertyObjectFactory(property, propertyValue.getValue()));
propertyValue.setValueFactory(objectFactory);
- componentDefinition.add(propertyValue);
+ definition.add(propertyValue);
}
protected void loadReference(XMLStreamReader reader,
- DeploymentContext deploymentContext,
- ComponentDefinition<?> componentDefinition) throws XMLStreamException,
- LoaderException {
+ ComponentDefinition<?> componentDefinition,
+ DeploymentContext context) throws XMLStreamException, LoaderException {
String name = reader.getAttributeValue(null, "name");
if (name == null) {
throw new InvalidReferenceException("No name specified");
@@ -231,10 +226,10 @@
String target = reader.getAttributeValue(null, "target");
if (target == null) {
- // TODO fix xcv
+ // TODO fix JFM
throw new InvalidReferenceException("No target specified", name);
}
- URI componentId = deploymentContext.getComponentId();
+ URI componentId = context.getComponentId();
StringTokenizer tokenizer = new StringTokenizer(target);
List<URI> uris = new ArrayList<URI>();
while (tokenizer.hasMoreTokens()) {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderRefTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderRefTestCase.java?view=diff&rev=511437&r1=511436&r2=511437
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderRefTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderRefTestCase.java Sat Feb 24 19:45:23 2007
@@ -59,7 +59,7 @@
EasyMock.expect(reader.getAttributeValue(null, "name")).andReturn("reference");
EasyMock.expect(reader.getAttributeValue(null, "target")).andReturn("target");
EasyMock.replay(reader);
- loader.loadReference(reader, context, definition);
+ loader.loadReference(reader, definition, context);
ReferenceTarget target = definition.getReferenceTargets().get("reference");
assertEquals(1, target.getTargets().size());
URI uri = target.getTargets().get(0);
@@ -82,7 +82,7 @@
EasyMock.expect(reader.getAttributeValue(null, "name")).andReturn("reference");
EasyMock.expect(reader.getAttributeValue(null, "target")).andReturn("target/fragment");
EasyMock.replay(reader);
- loader.loadReference(reader, context, definition);
+ loader.loadReference(reader, definition, context);
ReferenceTarget target = definition.getReferenceTargets().get("reference");
assertEquals(1, target.getTargets().size());
URI uri = target.getTargets().get(0);
@@ -104,7 +104,7 @@
EasyMock.expect(reader.getAttributeValue(null, "name")).andReturn("reference");
EasyMock.expect(reader.getAttributeValue(null, "target")).andReturn("target1/fragment1 target2/fragment2");
EasyMock.replay(reader);
- loader.loadReference(reader, context, definition);
+ loader.loadReference(reader, definition, context);
ReferenceTarget target = definition.getReferenceTargets().get("reference");
assertEquals(2, target.getTargets().size());
URI uri1 = target.getTargets().get(0);
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=511437&r1=511436&r2=511437
==============================================================================
--- 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 Sat Feb 24 19:45:23 2007
@@ -147,7 +147,7 @@
expect(reader.getAttributeValue(null, "file")).andReturn(null);
expect(reader.next()).andReturn(XMLStreamConstants.END_ELEMENT);
replay(reader);
- loader.loadProperty(reader, null, defn);
+ loader.loadProperty(reader, defn, null);
assertEquals("$source", defn.getPropertyValues().get("name").getSource());
EasyMock.verify(reader);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org