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 22:59:45 UTC
svn commit: r511635 - in
/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader:
ComponentLoader.java ReferenceLoader.java
Author: jmarino
Date: Sun Feb 25 13:59:44 2007
New Revision: 511635
URL: http://svn.apache.org/viewvc?view=rev&rev=511635
Log:
remove unnecessary system impl specialization; fixup code formatting
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.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=511635&r1=511634&r2=511635
==============================================================================
--- 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 Sun Feb 25 13:59:44 2007
@@ -74,7 +74,6 @@
import org.apache.tuscany.core.binding.local.LocalBindingDefinition;
import org.apache.tuscany.core.deployer.ChildDeploymentContext;
-import org.apache.tuscany.core.implementation.system.model.SystemImplementation;
import org.apache.tuscany.core.property.SimplePropertyObjectFactory;
/**
@@ -147,11 +146,7 @@
break;
case END_ELEMENT:
if (reader.getName().equals(COMPONENT)) {
- // hack to leave alone SystemImplementation
- if (!((Implementation) componentDefinition
- .getImplementation() instanceof SystemImplementation)) {
- populatePropertyValues(componentDefinition);
- }
+ populatePropertyValues(componentDefinition);
ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> type =
(ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>) componentDefinition
.getImplementation().getComponentType();
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java?view=diff&rev=511635&r1=511634&r2=511635
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java Sun Feb 25 13:59:44 2007
@@ -57,9 +57,7 @@
return REFERENCE;
}
- public ReferenceDefinition load(
- ModelObject object, XMLStreamReader reader,
- DeploymentContext deploymentContext)
+ public ReferenceDefinition load(ModelObject object, XMLStreamReader reader, DeploymentContext context)
throws XMLStreamException, LoaderException {
assert REFERENCE.equals(reader.getName());
String name = reader.getAttributeValue(null, "name");
@@ -67,11 +65,11 @@
Multiplicity multiplicity = StaxUtil.multiplicity(multiplicityVal, Multiplicity.ONE_ONE);
ReferenceDefinition referenceDefinition = new ReferenceDefinition();
referenceDefinition.setMultiplicity(multiplicity);
- referenceDefinition.setUri(deploymentContext.getComponentId().resolve('#' + name));
+ referenceDefinition.setUri(context.getComponentId().resolve('#' + name));
while (true) {
switch (reader.next()) {
case START_ELEMENT:
- ModelObject o = registry.load(null, reader, deploymentContext);
+ ModelObject o = registry.load(null, reader, context);
if (o instanceof ServiceContract) {
referenceDefinition.setServiceContract((ServiceContract) o);
} else if (o instanceof BindingDefinition) {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org