You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by me...@apache.org on 2007/03/21 03:24:51 UTC
svn commit: r520715 - in
/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core:
implementation/java/JavaPhysicalComponentGenerator.java
services/deployment/AssemblyServiceImpl.java
Author: meerajk
Date: Tue Mar 20 19:24:49 2007
New Revision: 520715
URL: http://svn.apache.org/viewvc?view=rev&rev=520715
Log:
fixed error in the generator
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentGenerator.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/AssemblyServiceImpl.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentGenerator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentGenerator.java?view=diff&rev=520715&r1=520714&r2=520715
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentGenerator.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentGenerator.java Tue Mar 20 19:24:49 2007
@@ -117,7 +117,7 @@
GeneratorContext context)
throws GenerationException {
JavaPhysicalWireSourceDefinition wireDefinition = new JavaPhysicalWireSourceDefinition();
- wireDefinition.setUri(definition.getUri());
+ wireDefinition.setUri(definition.getUri().resolve(serviceDefinition.getUri()));
wireDefinition.setOptimizable(optimizable);
return wireDefinition;
}
@@ -127,7 +127,7 @@
GeneratorContext context)
throws GenerationException {
JavaPhysicalWireTargetDefinition wireDefinition = new JavaPhysicalWireTargetDefinition();
- wireDefinition.setUri(definition.getUri());
+ wireDefinition.setUri(definition.getUri().resolve(serviceDefinition.getUri()));
return wireDefinition;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/AssemblyServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/AssemblyServiceImpl.java?view=diff&rev=520715&r1=520714&r2=520715
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/AssemblyServiceImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/AssemblyServiceImpl.java Tue Mar 20 19:24:49 2007
@@ -211,11 +211,11 @@
Implementation<?> targetImplementation = targetComponent.getImplementation();
ComponentType<?, ?, ?> targetType = targetImplementation.getComponentType();
ServiceDefinition serviceDefinition = null;
- if (serviceName == null) {
+ if (serviceName != null) {
serviceDefinition = targetType.getServices().get(serviceName);
} else if (targetType.getServices().size() == 1) {
// default service
- serviceDefinition = targetType.getServices().get(0);
+ serviceDefinition = targetType.getServices().values().iterator().next();
}
assert serviceDefinition != null;
generatorRegistry.generateWire(child,
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org