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/01/05 00:09:53 UTC
svn commit: r492806 - in /incubator/tuscany/java/sca/kernel/core/src:
main/java/org/apache/tuscany/core/launcher/CompositeContextImpl.java
test/java/org/apache/tuscany/core/launcher/CompositeContextImplTestCase.java
Author: jmarino
Date: Thu Jan 4 15:09:52 2007
New Revision: 492806
URL: http://svn.apache.org/viewvc?view=rev&rev=492806
Log:
fix for locating default services on composites from locateService()
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/CompositeContextImpl.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/launcher/CompositeContextImplTestCase.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/CompositeContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/CompositeContextImpl.java?view=diff&rev=492806&r1=492805&r2=492806
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/CompositeContextImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/CompositeContextImpl.java Thu Jan 4 15:09:52 2007
@@ -74,7 +74,7 @@
InboundWire wire;
if (child instanceof CompositeComponent) {
CompositeComponent childComposite = (CompositeComponent) child;
- child = childComposite.getChild(qName.getPortName());
+ child = childComposite.getService(qName.getPortName());
if (child == null) {
throw new ServiceRuntimeException("Service not found [" + serviceName + "]");
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/launcher/CompositeContextImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/launcher/CompositeContextImplTestCase.java?view=diff&rev=492806&r1=492805&r2=492806
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/launcher/CompositeContextImplTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/launcher/CompositeContextImplTestCase.java Thu Jan 4 15:09:52 2007
@@ -214,7 +214,7 @@
Service service = new ServiceImpl("Foo", null, null);
service.addServiceBinding(serviceBinding);
CompositeComponent child = EasyMock.createMock(CompositeComponent.class);
- EasyMock.expect(child.getChild("Bar")).andReturn(service);
+ EasyMock.expect(child.getService("Bar")).andReturn(service);
EasyMock.replay(child);
CompositeComponent composite = EasyMock.createMock(CompositeComponent.class);
EasyMock.expect(composite.getChild("Foo")).andReturn(child);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org