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 2006/12/23 13:14:11 UTC
svn commit: r489888 [4/6] - in /incubator/tuscany/java/sca:
kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/
kernel/core/src/main/java/org/apache/tuscany/core/builder/
kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ kerne...
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceCallbackTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceCallbackTestCase.java?view=diff&rev=489888&r1=489887&r2=489888
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceCallbackTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceCallbackTestCase.java Sat Dec 23 04:14:05 2006
@@ -46,7 +46,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
processor.visitClass(null, FooImpl.class, type, null);
- JavaMappedService service = type.getServices().get("ServiceCallbackTestCase$Foo");
+ JavaMappedService service = type.getServices().get(Foo.class.getName());
assertNotNull(service);
Method method = FooImpl.class.getMethod("setCallback", FooCallback.class);
processor.visitMethod(null, method, type, null);
@@ -57,7 +57,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
processor.visitClass(null, FooImpl.class, type, null);
- JavaMappedService service = type.getServices().get("ServiceCallbackTestCase$Foo");
+ JavaMappedService service = type.getServices().get(Foo.class.getName());
assertNotNull(service);
Field field = FooImpl.class.getDeclaredField("callback");
processor.visitField(null, field, type, null);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceProcessorTestCase.java?view=diff&rev=489888&r1=489887&r2=489888
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceProcessorTestCase.java Sat Dec 23 04:14:05 2006
@@ -35,25 +35,24 @@
* @version $Rev$ $Date$
*/
public class ServiceProcessorTestCase extends TestCase {
-
private ServiceProcessor processor;
private PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type;
public void testMultipleInterfaces() throws Exception {
processor.visitClass(null, FooMultiple.class, type, null);
assertEquals(2, type.getServices().size());
- JavaMappedService service = type.getServices().get("ServiceProcessorTestCase$Baz");
+ JavaMappedService service = type.getServices().get(Baz.class.getName());
ServiceContract contract = service.getServiceContract();
assertEquals(Baz.class, contract.getInterfaceClass());
assertEquals(Bar.class, contract.getCallbackClass());
assertEquals("ServiceProcessorTestCase$Bar", contract.getCallbackName());
- assertNotNull(type.getServices().get("ServiceProcessorTestCase$Bar"));
+ assertNotNull(type.getServices().get(Bar.class.getName()));
}
public void testSingleInterfaces() throws Exception {
processor.visitClass(null, FooSingle.class, type, null);
assertEquals(1, type.getServices().size());
- assertNotNull(type.getServices().get("ServiceProcessorTestCase$Baz"));
+ assertNotNull(type.getServices().get(Baz.class.getName()));
}
public void testMultipleNoService() throws Exception {
@@ -64,7 +63,7 @@
public void testRemotableNoService() throws Exception {
processor.visitClass(null, FooRemotableNoService.class, type, null);
assertEquals(1, type.getServices().size());
- JavaMappedService service = type.getServices().get("ServiceProcessorTestCase$BazRemotable");
+ JavaMappedService service = type.getServices().get(BazRemotable.class.getName());
ServiceContract contract = service.getServiceContract();
assertEquals(BazRemotable.class, contract.getInterfaceClass());
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilderTestCase.java?view=diff&rev=489888&r1=489887&r2=489888
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilderTestCase.java Sat Dec 23 04:14:05 2006
@@ -21,8 +21,8 @@
import java.net.URI;
import org.apache.tuscany.spi.builder.BuilderRegistry;
+import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.SystemAtomicComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.model.BoundServiceDefinition;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -39,7 +39,7 @@
public void testBuild() throws Exception {
SystemBindingBuilder builder = new SystemBindingBuilder();
- SystemAtomicComponent componet = EasyMock.createMock(SystemAtomicComponent.class);
+ AtomicComponent componet = EasyMock.createMock(AtomicComponent.class);
EasyMock.replay(componet);
CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
EasyMock.expect(parent.getSystemChild("foo")).andReturn(componet);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderResourceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderResourceTestCase.java?view=diff&rev=489888&r1=489887&r2=489888
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderResourceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderResourceTestCase.java Sat Dec 23 04:14:05 2006
@@ -3,7 +3,7 @@
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.ScopeRegistry;
-import org.apache.tuscany.spi.component.SystemAtomicComponent;
+import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.implementation.java.ConstructorDefinition;
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
@@ -13,6 +13,7 @@
import org.apache.tuscany.spi.model.ReferenceDefinition;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.model.ServiceDefinition;
+import org.apache.tuscany.spi.wire.InboundWire;
import junit.framework.TestCase;
import org.apache.tuscany.core.implementation.system.model.SystemImplementation;
@@ -48,10 +49,15 @@
impl.setComponentType(type);
ComponentDefinition<SystemImplementation> definition =
new ComponentDefinition<SystemImplementation>("foo", impl);
+
+ InboundWire wire = EasyMock.createMock(InboundWire.class);
+ EasyMock.expect(wire.getTargetService()).andReturn("result");
+ EasyMock.replay(wire);
+
CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
- EasyMock.expect(parent.resolveSystemInstance(String.class)).andReturn("result");
+ EasyMock.expect(parent.resolveSystemAutowire(String.class)).andReturn(wire);
EasyMock.replay(parent);
- SystemAtomicComponent component = (SystemAtomicComponent) builder.build(parent, definition, ctx);
+ AtomicComponent component = builder.build(parent, definition, ctx);
SystemComponentBuilderResourceTestCase.Foo foo =
(SystemComponentBuilderResourceTestCase.Foo) component.createInstance();
assertEquals("result", foo.resource);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java?view=diff&rev=489888&r1=489887&r2=489888
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java Sat Dec 23 04:14:05 2006
@@ -19,13 +19,10 @@
package org.apache.tuscany.core.implementation.system.builder;
import java.lang.reflect.Method;
-import java.net.URI;
-import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.implementation.java.ConstructorDefinition;
import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
@@ -33,17 +30,13 @@
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import org.apache.tuscany.spi.model.ComponentDefinition;
import org.apache.tuscany.spi.model.PropertyValue;
-import org.apache.tuscany.spi.model.ReferenceTarget;
import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.wire.OutboundWire;
import junit.framework.TestCase;
import org.apache.tuscany.core.component.event.CompositeStart;
import org.apache.tuscany.core.component.event.CompositeStop;
import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
import org.apache.tuscany.core.implementation.system.model.SystemImplementation;
-import org.apache.tuscany.core.implementation.system.wire.SystemInboundWire;
import org.apache.tuscany.core.injection.SingletonObjectFactory;
import org.easymock.EasyMock;
@@ -80,7 +73,7 @@
AtomicComponent component = builder.build(parent, definition, deploymentContext);
component.start();
container.onEvent(new CompositeStart(this, null));
- FooImpl foo = (FooImpl) component.getServiceInstance();
+ FooImpl foo = (FooImpl) component.getTargetInstance();
assertTrue(foo.initialized);
container.onEvent(new CompositeStop(this, null));
assertTrue(foo.destroyed);
@@ -118,118 +111,11 @@
definition.add(propVal);
AtomicComponent component = builder.build(parent, definition, deploymentContext);
component.start();
- FooImpl foo = (FooImpl) component.getServiceInstance();
+ FooImpl foo = (FooImpl) component.getTargetInstance();
assertEquals("value", foo.prop);
container.onEvent(new CompositeStop(this, null));
}
- /**
- * Verifies references are built properly
- */
- public void testRefBuild() throws Exception {
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
- new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
- type.setImplementationScope(Scope.COMPOSITE);
- JavaMappedReference mappedReference = new JavaMappedReference();
- mappedReference.setName("ref");
- Method refMethod = FooImpl.class.getMethod("setRef", Foo.class);
- refMethod.setAccessible(true);
- mappedReference.setMember(refMethod);
- ServiceContract contract = new JavaServiceContract(Foo.class);
- mappedReference.setServiceContract(contract);
- type.add(mappedReference);
- ConstructorDefinition<FooImpl> ctorDef = new ConstructorDefinition<FooImpl>(FooImpl.class.getConstructor());
- type.setConstructorDefinition(ctorDef);
- SystemImplementation impl = new SystemImplementation();
- impl.setComponentType(type);
- impl.setImplementationClass(FooImpl.class);
- ComponentDefinition<SystemImplementation> definition = new ComponentDefinition<SystemImplementation>(impl);
- ReferenceTarget target = new ReferenceTarget();
- target.setReferenceName("ref");
- target.addTarget(new URI("foo"));
- definition.add(target);
- AtomicComponent component = builder.build(parent, definition, deploymentContext);
- OutboundWire wire = component.getOutboundWires().get("ref").get(0);
- SystemInboundWire inbound = EasyMock.createMock(SystemInboundWire.class);
- FooImpl targetFoo = new FooImpl();
- EasyMock.expect(inbound.getTargetService()).andReturn(targetFoo);
- EasyMock.replay(inbound);
- wire.setTargetWire(inbound);
- component.start();
- FooImpl foo = (FooImpl) component.getServiceInstance();
- assertNotNull(foo.ref);
- container.onEvent(new CompositeStop(this, null));
- EasyMock.verify(inbound);
- }
-
- /**
- * Verifies autowires are built properly
- */
- public void testAutowireBuild() throws Exception {
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
- new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
- type.setImplementationScope(Scope.COMPOSITE);
- JavaMappedReference mappedReference = new JavaMappedReference();
- mappedReference.setName("ref");
- mappedReference.setAutowire(true);
- Method refMethod = FooImpl.class.getMethod("setRef", Foo.class);
- refMethod.setAccessible(true);
- mappedReference.setMember(refMethod);
- ServiceContract contract = new JavaServiceContract(Foo.class);
- mappedReference.setServiceContract(contract);
- type.add(mappedReference);
- ConstructorDefinition<FooImpl> ctorDef = new ConstructorDefinition<FooImpl>(FooImpl.class.getConstructor());
- type.setConstructorDefinition(ctorDef);
- SystemImplementation impl = new SystemImplementation();
- impl.setComponentType(type);
- impl.setImplementationClass(FooImpl.class);
- ComponentDefinition<SystemImplementation> definition = new ComponentDefinition<SystemImplementation>(impl);
- CompositeComponent parent = EasyMock.createNiceMock(CompositeComponent.class);
- FooImpl targetFoo = new FooImpl();
- EasyMock.expect(parent.resolveSystemInstance(EasyMock.eq(Foo.class))).andReturn(targetFoo);
- EasyMock.replay(parent);
- AtomicComponent component = builder.build(parent, definition, deploymentContext);
- component.start();
- FooImpl foo = (FooImpl) component.getServiceInstance();
- assertNotNull(foo.ref);
- container.onEvent(new CompositeStop(this, null));
- EasyMock.verify(parent);
- }
-
- /**
- * Verifies constructor-based autowiring
- */
- public void testAutowireConstructorBuild() throws Exception {
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
- new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
- type.setImplementationScope(Scope.COMPOSITE);
- ConstructorDefinition<FooImpl2> ctorDef =
- new ConstructorDefinition<FooImpl2>(FooImpl2.class.getConstructor(Foo.class));
- ctorDef.getInjectionNames().add("ref");
- type.setConstructorDefinition(ctorDef);
- SystemImplementation impl = new SystemImplementation();
- impl.setComponentType(type);
- impl.setImplementationClass(FooImpl2.class);
- JavaMappedReference mappedReference = new JavaMappedReference();
- mappedReference.setName("ref");
- mappedReference.setAutowire(true);
- ServiceContract contract = new JavaServiceContract(Foo.class);
- mappedReference.setServiceContract(contract);
- type.add(mappedReference);
- ComponentDefinition<SystemImplementation> definition = new ComponentDefinition<SystemImplementation>(impl);
- CompositeComponent parent = EasyMock.createNiceMock(CompositeComponent.class);
- FooImpl targetFoo = new FooImpl();
- EasyMock.expect(parent.resolveSystemInstance(EasyMock.eq(Foo.class))).andReturn(targetFoo);
- EasyMock.replay(parent);
- AtomicComponent component = builder.build(parent, definition, deploymentContext);
- component.start();
- container.onEvent(new CompositeStart(this, null));
- FooImpl2 foo = (FooImpl2) component.getServiceInstance();
- assertNotNull(foo.getRef());
- container.onEvent(new CompositeStop(this, null));
- EasyMock.verify(parent);
- }
-
protected void setUp() throws Exception {
super.setUp();
parent = EasyMock.createNiceMock(CompositeComponent.class);
@@ -288,16 +174,4 @@
}
}
- private static class FooImpl2 implements Foo {
- private Foo ref;
-
- public FooImpl2(@Autowire Foo ref) {
- this.ref = ref;
- }
-
- public Foo getRef() {
- return ref;
- }
-
- }
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentTestCase.java?view=diff&rev=489888&r1=489887&r2=489888
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentTestCase.java Sat Dec 23 04:14:05 2006
@@ -18,9 +18,10 @@
*/
package org.apache.tuscany.core.implementation.system.component;
+import org.apache.tuscany.spi.wire.OutboundWire;
+
import junit.framework.TestCase;
import org.apache.tuscany.core.implementation.PojoConfiguration;
-import org.apache.tuscany.core.implementation.system.wire.SystemOutboundWire;
import org.apache.tuscany.core.injection.EventInvoker;
import org.apache.tuscany.core.injection.MethodEventInvoker;
import org.apache.tuscany.core.injection.PojoObjectFactory;
@@ -75,7 +76,7 @@
SystemAtomicComponentImpl component = new SystemAtomicComponentImpl(configuration);
component.addPropertyFactory("foo", new SingletonObjectFactory<String>("baz"));
Foo target = new Foo();
- SystemOutboundWire wire = EasyMock.createMock(SystemOutboundWire.class);
+ OutboundWire wire = EasyMock.createMock(OutboundWire.class);
EasyMock.expect(wire.getTargetService()).andReturn(target);
EasyMock.expect(wire.getReferenceName()).andReturn("ref").anyTimes();
EasyMock.replay(wire);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java?view=diff&rev=489888&r1=489887&r2=489888
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java Sat Dec 23 04:14:05 2006
@@ -18,15 +18,12 @@
*/
package org.apache.tuscany.core.implementation.system.component;
-import org.apache.tuscany.spi.QualifiedName;
-import org.apache.tuscany.spi.component.SystemAtomicComponent;
+import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.wire.OutboundWire;
import junit.framework.TestCase;
import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
import org.apache.tuscany.core.implementation.PojoConfiguration;
-import org.apache.tuscany.core.implementation.system.wire.SystemInboundWire;
-import org.apache.tuscany.core.implementation.system.wire.SystemOutboundWireImpl;
import org.apache.tuscany.core.injection.PojoObjectFactory;
import org.apache.tuscany.core.mock.component.Source;
import org.apache.tuscany.core.mock.component.SourceImpl;
@@ -45,24 +42,20 @@
CompositeScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
Target target = new TargetImpl();
- SystemInboundWire inboundWire = EasyMock.createMock(SystemInboundWire.class);
- EasyMock.expect(inboundWire.getTargetService()).andReturn(target);
- EasyMock.replay(inboundWire);
-
PojoConfiguration configuration = new PojoConfiguration();
configuration.setScopeContainer(scope);
configuration.addReferenceSite("setTarget", SourceImpl.class.getMethod("setTarget", Target.class));
configuration.addServiceInterface(Source.class);
configuration.setInstanceFactory(new PojoObjectFactory<SourceImpl>(SourceImpl.class.getConstructor()));
configuration.setName("source");
- SystemAtomicComponent component = new SystemAtomicComponentImpl(configuration);
- QualifiedName qName = new QualifiedName("service");
- OutboundWire outboundWire = new SystemOutboundWireImpl("setTarget", qName, Target.class);
- outboundWire.setTargetWire(inboundWire);
+ AtomicComponent component = new SystemAtomicComponentImpl(configuration);
+ OutboundWire outboundWire = EasyMock.createMock(OutboundWire.class);
+ EasyMock.expect(outboundWire.getReferenceName()).andReturn("setTarget").atLeastOnce();
+ EasyMock.expect(outboundWire.getTargetService()).andReturn(target);
+ EasyMock.replay(outboundWire);
component.addOutboundWire(outboundWire);
component.start();
- assertSame(((Source) component.getServiceInstance()).getTarget(), target);
- // wires should pass back direct ref
- EasyMock.verify(inboundWire);
+ assertSame(((Source) component.getTargetInstance()).getTarget(), target);
+ EasyMock.verify(outboundWire);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemServiceComponentWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemServiceComponentWireTestCase.java?view=diff&rev=489888&r1=489887&r2=489888
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemServiceComponentWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemServiceComponentWireTestCase.java Sat Dec 23 04:14:05 2006
@@ -18,13 +18,14 @@
*/
package org.apache.tuscany.core.implementation.system.component;
+import org.apache.tuscany.spi.idl.java.JavaServiceContract;
+import org.apache.tuscany.spi.wire.InboundWire;
+import org.apache.tuscany.spi.wire.OutboundWire;
+
import junit.framework.TestCase;
-import org.apache.tuscany.core.implementation.system.wire.SystemInboundWire;
-import org.apache.tuscany.core.implementation.system.wire.SystemInboundWireImpl;
-import org.apache.tuscany.core.implementation.system.wire.SystemOutboundWire;
import org.apache.tuscany.core.mock.component.Target;
import org.apache.tuscany.core.mock.component.TargetImpl;
-import org.apache.tuscany.spi.idl.java.JavaServiceContract;
+import org.apache.tuscany.core.wire.InboundWireImpl;
import org.easymock.EasyMock;
/**
@@ -34,17 +35,18 @@
*/
public class SystemServiceComponentWireTestCase extends TestCase {
- public void testServiceContext() throws Exception {
+ public void testService() throws Exception {
Target target = new TargetImpl();
- SystemOutboundWire outboundWire = EasyMock.createMock(SystemOutboundWire.class);
+ OutboundWire outboundWire = EasyMock.createMock(OutboundWire.class);
EasyMock.expect(outboundWire.getTargetService()).andReturn(target);
EasyMock.replay(outboundWire);
- SystemInboundWire wire = new SystemInboundWireImpl("Target", Target.class);
- SystemService serviceContext = new SystemServiceImpl("service", null, new JavaServiceContract());
- serviceContext.setInboundWire(wire);
- serviceContext.setOutboundWire(outboundWire);
+ InboundWire wire = new InboundWireImpl();
+ wire.setServiceContract(new JavaServiceContract(Target.class));
+ SystemService service = new SystemServiceImpl("service", null, new JavaServiceContract());
+ service.setInboundWire(wire);
+ service.setOutboundWire(outboundWire);
wire.setTargetWire(outboundWire);
- assertSame(target, serviceContext.getServiceInstance());
+ assertSame(target, service.getInboundWire().getTargetService());
EasyMock.verify(outboundWire);
}
}
Copied: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/WireObjectFactoryTestCase.java (from r489552, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemWireObjectFactoryTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/WireObjectFactoryTestCase.java?view=diff&rev=489888&p1=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemWireObjectFactoryTestCase.java&r1=489552&p2=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/WireObjectFactoryTestCase.java&r2=489888
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemWireObjectFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/WireObjectFactoryTestCase.java Sat Dec 23 04:14:05 2006
@@ -18,21 +18,22 @@
*/
package org.apache.tuscany.core.implementation.system.component;
+import org.apache.tuscany.spi.wire.OutboundWire;
+
import junit.framework.TestCase;
-import org.apache.tuscany.core.implementation.system.wire.SystemOutboundWire;
import org.easymock.EasyMock;
/**
* @version $Rev$ $Date$
*/
-public class SystemWireObjectFactoryTestCase extends TestCase {
+public class WireObjectFactoryTestCase extends TestCase {
public void testGetInstance() throws Exception {
Foo foo = new Foo();
- SystemOutboundWire wire = EasyMock.createMock(SystemOutboundWire.class);
+ OutboundWire wire = EasyMock.createMock(OutboundWire.class);
EasyMock.expect(wire.getTargetService()).andReturn(foo);
EasyMock.replay(wire);
- SystemWireObjectFactory factory = new SystemWireObjectFactory(wire);
+ WireObjectFactory factory = new WireObjectFactory(wire);
assertEquals(foo, factory.getInstance());
EasyMock.verify(wire);
}
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/WireObjectFactoryTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/WireObjectFactoryTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoaderTestCase.java?view=diff&rev=489888&r1=489887&r2=489888
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoaderTestCase.java Sat Dec 23 04:14:05 2006
@@ -54,7 +54,7 @@
CompositeComponent parent = EasyMock.createNiceMock(CompositeComponent.class);
SystemImplementation impl = new SystemImplementation(BasicInterfaceImpl.class);
PojoComponentType<?, ?, ?> componentType = loader.loadByIntrospection(parent, impl, null);
- ServiceDefinition service = componentType.getServices().get("BasicInterface");
+ ServiceDefinition service = componentType.getServices().get(BasicInterface.class.getName());
assertEquals(BasicInterface.class, service.getServiceContract().getInterfaceClass());
Property<?> property = componentType.getProperties().get("publicProperty");
assertEquals(String.class, property.getJavaType());
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/injection/ResourceObjectFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/injection/ResourceObjectFactoryTestCase.java?view=diff&rev=489888&r1=489887&r2=489888
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/injection/ResourceObjectFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/injection/ResourceObjectFactoryTestCase.java Sat Dec 23 04:14:05 2006
@@ -21,6 +21,7 @@
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.host.ResourceHost;
+import org.apache.tuscany.spi.wire.InboundWire;
import junit.framework.TestCase;
import org.easymock.EasyMock;
@@ -35,7 +36,7 @@
EasyMock.expect(host.resolveResource(EasyMock.eq(String.class))).andReturn("foo");
EasyMock.replay(host);
CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
- EasyMock.expect(parent.resolveSystemInstance(EasyMock.eq(String.class))).andReturn(null);
+ EasyMock.expect(parent.resolveSystemAutowire(EasyMock.eq(String.class))).andReturn(null);
EasyMock.replay(parent);
ResourceObjectFactory<String> factory = new ResourceObjectFactory<String>(String.class, false, parent, host);
assertEquals("foo", factory.getInstance());
@@ -56,7 +57,11 @@
public void testResolveFromParentByType() throws Exception {
CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
- EasyMock.expect(parent.resolveSystemInstance(EasyMock.eq(String.class))).andReturn("foo");
+ InboundWire wire = EasyMock.createMock(InboundWire.class);
+ EasyMock.expect(wire.getTargetService()).andReturn("foo");
+ EasyMock.replay(wire);
+
+ EasyMock.expect(parent.resolveSystemAutowire(EasyMock.eq(String.class))).andReturn(wire);
EasyMock.replay(parent);
ResourceObjectFactory<String> factory = new ResourceObjectFactory<String>(String.class, false, parent, null);
assertEquals("foo", factory.getInstance());
@@ -65,7 +70,7 @@
public void testResolveFromParentByName() throws Exception {
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
- EasyMock.expect(component.getServiceInstance()).andReturn("foo");
+ EasyMock.expect(component.getTargetInstance()).andReturn("foo");
EasyMock.replay(component);
CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
EasyMock.expect(parent.getSystemChild(EasyMock.eq("bar"))).andReturn(component);
@@ -84,8 +89,9 @@
ResourceHost host = EasyMock.createMock(ResourceHost.class);
EasyMock.expect(host.resolveResource(EasyMock.eq(String.class))).andReturn("foo");
EasyMock.replay(host);
+
CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
- EasyMock.expect(parent.resolveSystemInstance(EasyMock.eq(String.class))).andReturn(null);
+ EasyMock.expect(parent.resolveSystemAutowire(EasyMock.eq(String.class))).andReturn(null);
EasyMock.replay(parent);
ResourceObjectFactory<String> factory = new ResourceObjectFactory<String>(String.class, false, parent, host);
assertEquals("foo", factory.getInstance());
@@ -98,7 +104,7 @@
EasyMock.expect(host.resolveResource(EasyMock.eq(String.class))).andReturn(null);
EasyMock.replay(host);
CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
- EasyMock.expect(parent.resolveSystemInstance(EasyMock.eq(String.class))).andReturn(null);
+ EasyMock.expect(parent.resolveSystemAutowire(EasyMock.eq(String.class))).andReturn(null);
EasyMock.replay(parent);
ResourceObjectFactory<String> factory = new ResourceObjectFactory<String>(String.class, true, parent, host);
assertNull(factory.getInstance());
@@ -110,8 +116,13 @@
ResourceHost host = EasyMock.createMock(ResourceHost.class);
EasyMock.expect(host.resolveResource(EasyMock.eq(String.class))).andReturn(null);
EasyMock.replay(host);
+
+ InboundWire wire = EasyMock.createMock(InboundWire.class);
+ EasyMock.expect(wire.getTargetService()).andReturn(null);
+ EasyMock.replay(wire);
+
CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
- EasyMock.expect(parent.resolveSystemInstance(EasyMock.eq(String.class))).andReturn(null);
+ EasyMock.expect(parent.resolveSystemAutowire(EasyMock.eq(String.class))).andReturn(null);
EasyMock.replay(parent);
ResourceObjectFactory<String> factory = new ResourceObjectFactory<String>(String.class, false, parent, host);
try {
@@ -129,7 +140,7 @@
EasyMock.expect(host.resolveResource(EasyMock.eq(String.class))).andReturn(null);
EasyMock.replay(host);
CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
- EasyMock.expect(parent.resolveSystemInstance(EasyMock.eq(String.class))).andReturn(null);
+ EasyMock.expect(parent.resolveSystemAutowire(EasyMock.eq(String.class))).andReturn(null);
EasyMock.replay(parent);
ResourceObjectFactory<String> factory = new ResourceObjectFactory<String>(String.class, true, parent, host);
assertNull(factory.getInstance());
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/scope/ScopeReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/scope/ScopeReferenceTestCase.java?view=diff&rev=489888&r1=489887&r2=489888
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/scope/ScopeReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/scope/ScopeReferenceTestCase.java Sat Dec 23 04:14:05 2006
@@ -73,8 +73,8 @@
scope.onEvent(new CompositeStart(this, null));
AtomicComponent sourceComponent = contexts.get("source");
AtomicComponent targetComponent = contexts.get("target");
- Source source = (Source) sourceComponent.getServiceInstance();
- Target target = (Target) targetComponent.getServiceInstance();
+ Source source = (Source) sourceComponent.getTargetInstance();
+ Target target = (Target) targetComponent.getTargetInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -102,8 +102,8 @@
sessionScope.onEvent(new HttpSessionStart(this, session1));
AtomicComponent sourceComponent = contexts.get("source");
AtomicComponent targetComponent = contexts.get("target");
- Source source = (Source) sourceComponent.getServiceInstance();
- Target target = (Target) targetComponent.getServiceInstance();
+ Source source = (Source) sourceComponent.getTargetInstance();
+ Target target = (Target) targetComponent.getTargetInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -117,7 +117,7 @@
ctx.setIdentifier(Scope.SESSION, session2);
sessionScope.onEvent(new HttpSessionStart(this, session2));
- Target target2 = (Target) targetComponent.getServiceInstance();
+ Target target2 = (Target) targetComponent.getTargetInstance();
assertFalse("foo".equals(target2.getString()));
assertFalse("foo".equals(source.getTarget().getString()));
@@ -149,8 +149,8 @@
AtomicComponent sourceComponent = contexts.get("source");
final AtomicComponent targetComponent = contexts.get("target");
- final Source source = (Source) sourceComponent.getServiceInstance();
- Target target = (Target) targetComponent.getServiceInstance();
+ final Source source = (Source) sourceComponent.getTargetInstance();
+ Target target = (Target) targetComponent.getTargetInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -164,7 +164,7 @@
requestScope.onEvent(new RequestStart(this));
Target target2 = null;
try {
- target2 = (Target) targetComponent.getServiceInstance();
+ target2 = (Target) targetComponent.getTargetInstance();
} catch (TargetException e) {
fail(e.getMessage());
}
@@ -201,14 +201,14 @@
AtomicComponent sourceComponent = contexts.get("source");
AtomicComponent targetComponent = contexts.get("target");
- Source source = (Source) sourceComponent.getServiceInstance();
- Target target = (Target) targetComponent.getServiceInstance();
+ Source source = (Source) sourceComponent.getTargetInstance();
+ Target target = (Target) targetComponent.getTargetInstance();
assertTrue(Proxy.isProxyClass(source.getTarget().getClass()));
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
assertFalse("foo".equals(source.getTarget().getString()));
- Target target2 = (Target) targetComponent.getServiceInstance();
+ Target target2 = (Target) targetComponent.getTargetInstance();
assertFalse("foo".equals(target2.getString()));
source.getTarget().setString("bar");
assertFalse("bar".equals(source.getTarget().getString()));
@@ -234,8 +234,8 @@
sessionScope.onEvent(new HttpSessionStart(this, session1));
AtomicComponent sourceComponent = contexts.get("source");
AtomicComponent targetComponent = contexts.get("target");
- Source source = (Source) sourceComponent.getServiceInstance();
- Target target = (Target) targetComponent.getServiceInstance();
+ Source source = (Source) sourceComponent.getTargetInstance();
+ Target target = (Target) targetComponent.getTargetInstance();
source.getTarget().setString("foo");
source.getTarget().setString("foo");
assertEquals("foo", target.getString());
@@ -248,9 +248,9 @@
ctx.setIdentifier(Scope.SESSION, session2);
sessionScope.onEvent(new HttpSessionStart(this, session2));
- Source source2 = (Source) sourceComponent.getServiceInstance();
+ Source source2 = (Source) sourceComponent.getTargetInstance();
assertNotNull(source2);
- Target target2 = (Target) targetComponent.getServiceInstance();
+ Target target2 = (Target) targetComponent.getTargetInstance();
assertNotNull(target2);
assertNull(target2.getString());
@@ -282,8 +282,8 @@
sessionScope.onEvent(new HttpSessionStart(this, session1));
AtomicComponent sourceComponent = contexts.get("source");
AtomicComponent targetComponent = contexts.get("target");
- Source source = (Source) sourceComponent.getServiceInstance();
- Target target = (Target) targetComponent.getServiceInstance();
+ Source source = (Source) sourceComponent.getTargetInstance();
+ Target target = (Target) targetComponent.getTargetInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -297,8 +297,8 @@
ctx.setIdentifier(Scope.SESSION, session2);
sessionScope.onEvent(new HttpSessionStart(this, session2));
- Target target2 = (Target) targetComponent.getServiceInstance();
- Source source2 = (Source) sourceComponent.getServiceInstance();
+ Target target2 = (Target) targetComponent.getTargetInstance();
+ Source source2 = (Source) sourceComponent.getTargetInstance();
assertEquals("foo", target2.getString());
assertEquals("foo", source2.getTarget().getString());
source2.getTarget().setString("baz");
@@ -329,8 +329,8 @@
requestScope.onEvent(new RequestStart(this));
AtomicComponent sourceComponent = contexts.get("source");
final AtomicComponent targetComponent = contexts.get("target");
- final Source source = (Source) sourceComponent.getServiceInstance();
- Target target = (Target) targetComponent.getServiceInstance();
+ final Source source = (Source) sourceComponent.getTargetInstance();
+ Target target = (Target) targetComponent.getTargetInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -344,7 +344,7 @@
requestScope.onEvent(new RequestStart(this));
Target target2 = null;
try {
- target2 = (Target) targetComponent.getServiceInstance();
+ target2 = (Target) targetComponent.getTargetInstance();
} catch (TargetException e) {
fail(e.getMessage());
}
@@ -386,14 +386,14 @@
AtomicComponent sourceComponent = contexts.get("source");
AtomicComponent targetComponent = contexts.get("target");
- Source source = (Source) sourceComponent.getServiceInstance();
- Target target = (Target) targetComponent.getServiceInstance();
+ Source source = (Source) sourceComponent.getTargetInstance();
+ Target target = (Target) targetComponent.getTargetInstance();
assertTrue(Proxy.isProxyClass(source.getTarget().getClass()));
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
assertFalse("foo".equals(source.getTarget().getString()));
- Target target2 = (Target) targetComponent.getServiceInstance();
+ Target target2 = (Target) targetComponent.getTargetInstance();
assertFalse("foo".equals(target2.getString()));
source.getTarget().setString("bar");
assertFalse("bar".equals(source.getTarget().getString()));
@@ -418,8 +418,8 @@
final AtomicComponent sourceComponent = contexts.get("source");
final AtomicComponent targetComponent = contexts.get("target");
- Source source = (Source) sourceComponent.getServiceInstance();
- Target target = (Target) targetComponent.getServiceInstance();
+ Source source = (Source) sourceComponent.getTargetInstance();
+ Target target = (Target) targetComponent.getTargetInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -434,8 +434,8 @@
Source source2 = null;
Target target2 = null;
try {
- source2 = (Source) sourceComponent.getServiceInstance();
- target2 = (Target) targetComponent.getServiceInstance();
+ source2 = (Source) sourceComponent.getTargetInstance();
+ target2 = (Target) targetComponent.getTargetInstance();
} catch (TargetException e) {
fail(e.getMessage());
}
@@ -470,8 +470,8 @@
final AtomicComponent sourceComponent = contexts.get("source");
final AtomicComponent targetComponent = contexts.get("target");
- Source source = (Source) sourceComponent.getServiceInstance();
- Target target = (Target) targetComponent.getServiceInstance();
+ Source source = (Source) sourceComponent.getTargetInstance();
+ Target target = (Target) targetComponent.getTargetInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -486,8 +486,8 @@
Source source2 = null;
Target target2 = null;
try {
- source2 = (Source) sourceComponent.getServiceInstance();
- target2 = (Target) targetComponent.getServiceInstance();
+ source2 = (Source) sourceComponent.getTargetInstance();
+ target2 = (Target) targetComponent.getTargetInstance();
} catch (TargetException e) {
fail(e.getMessage());
}
@@ -528,8 +528,8 @@
final AtomicComponent sourceComponent = contexts.get("source");
final AtomicComponent targetComponent = contexts.get("target");
requestScope.onEvent(new RequestStart(this));
- Source source = (Source) sourceComponent.getServiceInstance();
- Target target = (Target) targetComponent.getServiceInstance();
+ Source source = (Source) sourceComponent.getTargetInstance();
+ Target target = (Target) targetComponent.getTargetInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -544,8 +544,8 @@
Source source2 = null;
Target target2 = null;
try {
- source2 = (Source) sourceComponent.getServiceInstance();
- target2 = (Target) targetComponent.getServiceInstance();
+ source2 = (Source) sourceComponent.getTargetInstance();
+ target2 = (Target) targetComponent.getTargetInstance();
} catch (TargetException e) {
fail(e.getMessage());
}
@@ -585,14 +585,14 @@
AtomicComponent sourceComponent = contexts.get("source");
AtomicComponent targetComponent = contexts.get("target");
requestScope.onEvent(new RequestStart(this));
- Source source = (Source) sourceComponent.getServiceInstance();
- Target target = (Target) targetComponent.getServiceInstance();
+ Source source = (Source) sourceComponent.getTargetInstance();
+ Target target = (Target) targetComponent.getTargetInstance();
assertTrue(Proxy.isProxyClass(source.getTarget().getClass()));
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
assertFalse("foo".equals(source.getTarget().getString()));
- Target target2 = (Target) targetComponent.getServiceInstance();
+ Target target2 = (Target) targetComponent.getTargetInstance();
assertFalse("foo".equals(target2.getString()));
source.getTarget().setString("bar");
assertFalse("bar".equals(source.getTarget().getString()));
@@ -615,14 +615,14 @@
AtomicComponent sourceComponent = contexts.get("source");
AtomicComponent targetComponent = contexts.get("target");
- Source source = (Source) sourceComponent.getServiceInstance();
- Target target = (Target) targetComponent.getServiceInstance();
+ Source source = (Source) sourceComponent.getTargetInstance();
+ Target target = (Target) targetComponent.getTargetInstance();
assertTrue(Proxy.isProxyClass(source.getTarget().getClass()));
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
assertFalse("foo".equals(source.getTarget().getString()));
- Target target2 = (Target) targetComponent.getServiceInstance();
+ Target target2 = (Target) targetComponent.getTargetInstance();
assertFalse("foo".equals(target2.getString()));
source.getTarget().setString("bar");
assertFalse("bar".equals(source.getTarget().getString()));
@@ -644,8 +644,8 @@
requestScope.onEvent(new RequestStart(this));
AtomicComponent sourceComponent = contexts.get("source");
final AtomicComponent targetComponent = contexts.get("target");
- final Source source = (Source) sourceComponent.getServiceInstance();
- Target target = (Target) targetComponent.getServiceInstance();
+ final Source source = (Source) sourceComponent.getTargetInstance();
+ Target target = (Target) targetComponent.getTargetInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -659,7 +659,7 @@
requestScope.onEvent(new RequestStart(this));
Target target2 = null;
try {
- target2 = (Target) targetComponent.getServiceInstance();
+ target2 = (Target) targetComponent.getTargetInstance();
} catch (TargetException e) {
fail(e.getMessage());
}
@@ -694,8 +694,8 @@
sessionScope.onEvent(new HttpSessionStart(this, session1));
AtomicComponent sourceComponent = contexts.get("source");
AtomicComponent targetComponent = contexts.get("target");
- Source source = (Source) sourceComponent.getServiceInstance();
- Target target = (Target) targetComponent.getServiceInstance();
+ Source source = (Source) sourceComponent.getTargetInstance();
+ Target target = (Target) targetComponent.getTargetInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -709,7 +709,7 @@
ctx.setIdentifier(Scope.SESSION, session2);
sessionScope.onEvent(new HttpSessionStart(this, session2));
- Target target2 = (Target) targetComponent.getServiceInstance();
+ Target target2 = (Target) targetComponent.getTargetInstance();
assertFalse("foo".equals(target2.getString()));
assertFalse("foo".equals(source.getTarget().getString()));
@@ -739,8 +739,8 @@
compositeScope.onEvent(new CompositeStart(this, null));
AtomicComponent sourceComponent = contexts.get("source");
AtomicComponent targetComponent = contexts.get("target");
- Source source = (Source) sourceComponent.getServiceInstance();
- Target target = (Target) targetComponent.getServiceInstance();
+ Source source = (Source) sourceComponent.getTargetInstance();
+ Target target = (Target) targetComponent.getTargetInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -752,7 +752,7 @@
ctx.setIdentifier(Scope.SESSION, session2);
compositeScope.onEvent(new HttpSessionStart(this, session2));
- Target target2 = (Target) targetComponent.getServiceInstance();
+ Target target2 = (Target) targetComponent.getTargetInstance();
assertEquals("foo", target2.getString());
assertEquals("foo", source.getTarget().getString());
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/DifferentInterfaceWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/DifferentInterfaceWireTestCase.java?view=diff&rev=489888&r1=489887&r2=489888
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/DifferentInterfaceWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/DifferentInterfaceWireTestCase.java Sat Dec 23 04:14:05 2006
@@ -67,7 +67,7 @@
scope,
null);
AtomicComponent sourceComponent = contexts.get("source");
- Source source = (Source) sourceComponent.getServiceInstance();
+ Source source = (Source) sourceComponent.getTargetInstance();
Target target = source.getTarget();
assertTrue(Proxy.isProxyClass(target.getClass()));
assertNotNull(target);
@@ -91,7 +91,7 @@
members,
scope);
AtomicComponent sourceComponent = components.get("source");
- Source source = (Source) sourceComponent.getServiceInstance();
+ Source source = (Source) sourceComponent.getTargetInstance();
List<Target> targets = source.getTargets();
assertEquals(1, targets.size());
Target target = targets.get(0);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/ReferenceInjectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/ReferenceInjectionTestCase.java?view=diff&rev=489888&r1=489887&r2=489888
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/ReferenceInjectionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/ReferenceInjectionTestCase.java Sat Dec 23 04:14:05 2006
@@ -49,7 +49,7 @@
MockFactory.createWiredComponents("source", SourceImpl.class, scope,
members, "target", Target.class, TargetImpl.class, scope);
AtomicComponent sourceComponent = components.get("source");
- Source source = (Source) sourceComponent.getServiceInstance();
+ Source source = (Source) sourceComponent.getTargetInstance();
Target target = source.getTarget();
assertTrue(Proxy.isProxyClass(target.getClass()));
Added: 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=auto&rev=489888
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/launcher/CompositeContextImplTestCase.java (added)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/launcher/CompositeContextImplTestCase.java Sat Dec 23 04:14:05 2006
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.core.launcher;
+
+import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Reference;
+import org.apache.tuscany.spi.component.Service;
+import org.apache.tuscany.spi.wire.InboundWire;
+import org.apache.tuscany.spi.wire.WireService;
+
+import junit.framework.TestCase;
+import org.easymock.EasyMock;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class CompositeContextImplTestCase extends TestCase {
+
+ public void testAtomicLocate() throws Exception {
+ InboundWire wire = EasyMock.createMock(InboundWire.class);
+ EasyMock.replay(wire);
+ AtomicComponent child = EasyMock.createMock(AtomicComponent.class);
+ EasyMock.expect(child.getInboundWire(FooService.class.getName())).andReturn(wire);
+ EasyMock.replay(child);
+ CompositeComponent composite = EasyMock.createMock(CompositeComponent.class);
+ EasyMock.expect(composite.getChild("Foo")).andReturn(child);
+ EasyMock.replay(composite);
+
+ WireService service = EasyMock.createMock(WireService.class);
+ EasyMock.expect(service.createProxy(EasyMock.eq(FooService.class), EasyMock.eq(wire)))
+ .andReturn(new FooService() {
+ });
+ EasyMock.replay(service);
+ CompositeContextImpl context = new CompositeContextImpl(composite, service);
+ context.locateService(FooService.class, "Foo");
+ EasyMock.verify(service);
+ EasyMock.verify(composite);
+ EasyMock.verify(wire);
+ EasyMock.verify(child);
+ }
+
+ public void testServiceLocate() throws Exception {
+ InboundWire wire = EasyMock.createMock(InboundWire.class);
+ EasyMock.replay(wire);
+ Service child = EasyMock.createMock(Service.class);
+ EasyMock.expect(child.getInboundWire()).andReturn(wire);
+ EasyMock.replay(child);
+ CompositeComponent composite = EasyMock.createMock(CompositeComponent.class);
+ EasyMock.expect(composite.getChild("Foo")).andReturn(child);
+ EasyMock.replay(composite);
+
+ WireService service = EasyMock.createMock(WireService.class);
+ EasyMock.expect(service.createProxy(EasyMock.eq(FooService.class), EasyMock.eq(wire)))
+ .andReturn(new FooService() {
+ });
+ EasyMock.replay(service);
+ CompositeContextImpl context = new CompositeContextImpl(composite, service);
+ context.locateService(FooService.class, "Foo");
+ EasyMock.verify(service);
+ EasyMock.verify(composite);
+ EasyMock.verify(wire);
+ EasyMock.verify(child);
+ }
+
+ public void testReferenceLocate() throws Exception {
+ InboundWire wire = EasyMock.createMock(InboundWire.class);
+ EasyMock.replay(wire);
+ Reference child = EasyMock.createMock(Reference.class);
+ EasyMock.expect(child.getInboundWire()).andReturn(wire);
+ EasyMock.replay(child);
+ CompositeComponent composite = EasyMock.createMock(CompositeComponent.class);
+ EasyMock.expect(composite.getChild("Foo")).andReturn(child);
+ EasyMock.replay(composite);
+
+ WireService service = EasyMock.createMock(WireService.class);
+ EasyMock.expect(service.createProxy(EasyMock.eq(FooService.class), EasyMock.eq(wire)))
+ .andReturn(new FooService() {
+ });
+ EasyMock.replay(service);
+ CompositeContextImpl context = new CompositeContextImpl(composite, service);
+ context.locateService(FooService.class, "Foo");
+ EasyMock.verify(service);
+ EasyMock.verify(composite);
+ EasyMock.verify(wire);
+ EasyMock.verify(child);
+ }
+
+ private class FooService {
+
+ }
+
+}
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/launcher/CompositeContextImplTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/launcher/CompositeContextImplTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
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=489888&r1=489887&r2=489888
==============================================================================
--- 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 Dec 23 04:14:05 2006
@@ -46,6 +46,7 @@
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.isNull;
import static org.easymock.EasyMock.replay;
+import org.easymock.IAnswer;
/**
* @version $Rev$ $Date$
@@ -74,6 +75,14 @@
mockRegistry.loadComponentType(EasyMock.isA(CompositeComponent.class),
EasyMock.isA(Implementation.class),
EasyMock.isA(DeploymentContext.class));
+ EasyMock.expectLastCall().andStubAnswer(new IAnswer<Object>() {
+ @SuppressWarnings("unchecked")
+ public Object answer() throws Throwable {
+ Implementation impl = (Implementation) EasyMock.getCurrentArguments()[1];
+ impl.setComponentType(new PojoComponentType());
+ return impl;
+ }
+ });
EasyMock.expect(mockRegistry.load(EasyMock.isA(CompositeComponent.class),
(ModelObject) isNull(),
@@ -100,6 +109,15 @@
mockRegistry.loadComponentType(EasyMock.isA(CompositeComponent.class),
EasyMock.isA(Implementation.class),
EasyMock.isA(DeploymentContext.class));
+
+ EasyMock.expectLastCall().andStubAnswer(new IAnswer<Object>() {
+ @SuppressWarnings("unchecked")
+ public Object answer() throws Throwable {
+ Implementation impl = (Implementation) EasyMock.getCurrentArguments()[1];
+ impl.setComponentType(new PojoComponentType());
+ return impl;
+ }
+ });
EasyMock.expect(mockRegistry.load(EasyMock.isA(CompositeComponent.class),
(ModelObject) isNull(),
EasyMock.eq(mockReader),
Modified: incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/InitializationException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/InitializationException.java?view=diff&rev=489888&r1=489887&r2=489888
==============================================================================
--- incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/InitializationException.java (original)
+++ incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/InitializationException.java Sat Dec 23 04:14:05 2006
@@ -27,6 +27,10 @@
*/
public class InitializationException extends TuscanyException {
+ public InitializationException(String message) {
+ super(message);
+ }
+
public InitializationException(Throwable cause) {
super(cause);
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/bootstrap/ComponentNames.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/bootstrap/ComponentNames.java?view=diff&rev=489888&r1=489887&r2=489888
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/bootstrap/ComponentNames.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/bootstrap/ComponentNames.java Sat Dec 23 04:14:05 2006
@@ -47,7 +47,12 @@
/**
* The name of the component that contains the deployer.
*/
- public static final String TUSCANY_DEPLOYER = "tuscany.deployer";
+ public static final String TUSCANY_DEPLOYER = "deployer";
+
+ /**
+ * The name of the component that contains the deployer.
+ */
+ public static final String TUSCANY_WIRE_SERVICE = "wireService";
private ComponentNames() {
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AtomicComponent.java?view=diff&rev=489888&r1=489887&r2=489888
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AtomicComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AtomicComponent.java Sat Dec 23 04:14:05 2006
@@ -86,4 +86,13 @@
*/
void removeInstance() throws ComponentException;
+ /**
+ * Returns the target instance associated with the component. A target instance is the actual object a request is
+ * dispatched to sans wire chain.
+ *
+ * @throws TargetResolutionException
+ *
+ */
+ Object getTargetInstance() throws TargetResolutionException;
+
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java?view=diff&rev=489888&r1=489887&r2=489888
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java Sat Dec 23 04:14:05 2006
@@ -83,12 +83,4 @@
TargetInvoker createTargetInvoker(String targetName, Operation operation, InboundWire callbackWire)
throws TargetInvokerCreationException;
- /**
- * Returns a service associated with the given name
- *
- * @throws TargetResolutionException if an error occurs retrieving the service instance
- */
- Object getServiceInstance(String name) throws TargetResolutionException;
-
-
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java?view=diff&rev=489888&r1=489887&r2=489888
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java Sat Dec 23 04:14:05 2006
@@ -23,6 +23,7 @@
import org.w3c.dom.Document;
import org.apache.tuscany.spi.event.RuntimeEventListener;
+import org.apache.tuscany.spi.wire.InboundWire;
/**
* The runtime instantiation of an SCA composite component. Composites may contain child components, offer services, and
@@ -121,27 +122,6 @@
Service getSystemService(String name);
/**
- * Returns a system service associated with the given name
- *
- * @throws TargetResolutionException if an error occurs retrieving the service instance
- */
- Object getSystemServiceInstance(String name) throws TargetResolutionException;
-
- /**
- * Returns the service instance for associated with the child registered for the given name
- *
- * @throws TargetResolutionException
- */
- <T> T locateService(Class<T> serviceInterface, String serviceName) throws TargetResolutionException;
-
- /**
- * Returns the system service instance for associated with the child registered for the given name
- *
- * @throws TargetResolutionException
- */
- <T> T locateSystemService(Class<T> serviceInterface, String serviceName) throws TargetResolutionException;
-
- /**
* Returns the references contained by the composite
*/
List<Reference> getReferences();
@@ -150,49 +130,49 @@
* Returns the system references contained by the composite
*/
List<Reference> getSystemReferences();
-
+
/**
- * Invoked by child components to return an an autowire target. Resolved targets may be services or components in
- * the parent or its ancestors, or references in a sibling component
+ * Invoked by child components to return an wire to a target based on matching type. Resolved targets may be
+ * services or components in the parent or its ancestors, or references in a sibling component
*
* @param instanceInterface the type of service being requested
- * @return a reference to the requested service or null if none can be found
+ * @return a reference to the requested service or null if one is not be found
* @throws TargetResolutionException
*/
- <T> T resolveInstance(Class<T> instanceInterface) throws TargetResolutionException;
+ InboundWire resolveAutowire(Class<?> instanceInterface) throws TargetResolutionException;
/**
- * Invoked by system child components to return an an autowire target. Resolved targets may be system services or
- * components in the parent or its ancestors, or references in a sibling component
+ * Invoked by system child components to return a wire to a system target based on matching type. Resolved targets
+ * may be system services or components in the parent or its ancestors, or references in a sibling component
*
* @param instanceInterface the type of service being requested
- * @return a reference to the requested service or null if none can be found
+ * @return a reference to the requested service or null if one is not be found
* @throws TargetResolutionException
*/
- <T> T resolveSystemInstance(Class<T> instanceInterface) throws TargetResolutionException;
+ InboundWire resolveSystemAutowire(Class<?> instanceInterface) throws TargetResolutionException;
/**
- * Invoked by a parent component to return an autowire target in a child. Resolved targets must be services. For
- * example, given a parent P and two siblings, A and B, A would request an autowire by invoking {@link
- * #resolveInstance(Class<T>)} on P, which in turn could invoke the present method on B in order to resolve a
- * target.
+ * Invoked by a parent component to return an wire to a target in a child based on matching type. Resolved targets
+ * must be services. For example, given a parent P and two siblings, A and B, A would request an autowire by
+ * invoking {@link #resolveAutowire(Class<?>)} on P, which in turn could invoke the present method on B in order to
+ * resolve a target.
*
* @param instanceInterface the type of service being requested
- * @return a reference to the requested service or null if none can be found
+ * @return a reference to the requested service or null if one is not be found
* @throws TargetResolutionException
*/
- <T> T resolveExternalInstance(Class<T> instanceInterface) throws TargetResolutionException;
+ InboundWire resolveExternalAutowire(Class<?> instanceInterface) throws TargetResolutionException;
/**
- * Invoked by a parent component to return a system autowire target in a child. Resolved targets must be system
- * services. For example, given a parent P and two siblings, A and B, A would request an autowire by invoking {@link
- * #resolveInstance(Class<T>)} on P, which in turn could invoke the present method on B in order to resolve a
- * target.
+ * Invoked by a parent component to return a wire to a system target in a child based on matching type. Resolved
+ * targets must be system services. For example, given a parent P and two siblings, A and B, A would request an
+ * autowire by invoking {@link #resolveAutowire(Class<?>)} on P, which in turn could invoke the present method on B
+ * in order to resolve a target.
*
* @param instanceInterface the type of service being requested
- * @return a reference to the requested service or null if none can be found
+ * @return a reference to the requested service or null if one is not be found
* @throws TargetResolutionException
*/
- <T> T resolveSystemExternalInstance(Class<T> instanceInterface) throws TargetResolutionException;
+ InboundWire resolveSystemExternalAutowire(Class<?> instanceInterface) throws TargetResolutionException;
}
Added: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/InvalidAutowireInterface.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/InvalidAutowireInterface.java?view=auto&rev=489888
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/InvalidAutowireInterface.java (added)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/InvalidAutowireInterface.java Sat Dec 23 04:14:05 2006
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.spi.component;
+
+/**
+ * Thrown when an invalid interface is specified during autowire registration
+ *
+ * @version $Rev$ $Date$
+ */
+public class InvalidAutowireInterface extends ComponentRegistrationException {
+
+ public InvalidAutowireInterface(String message, String identifier) {
+ super(message, identifier);
+ }
+}
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/InvalidAutowireInterface.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/InvalidAutowireInterface.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/SCAObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/SCAObject.java?view=diff&rev=489888&r1=489887&r2=489888
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/SCAObject.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/SCAObject.java Sat Dec 23 04:14:05 2006
@@ -66,13 +66,6 @@
Map<Object, Object> getExtensions();
/**
- * Returns an instance associated with the default service
- *
- * @throws TargetResolutionException if an error occurs resolving the instance
- */
- Object getServiceInstance() throws TargetResolutionException;
-
- /**
* Called to signal that the composite should perform any required steps prior to registration with its parent such
* as wiring of its children
*/
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Service.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Service.java?view=diff&rev=489888&r1=489887&r2=489888
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Service.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Service.java Sat Dec 23 04:14:05 2006
@@ -39,7 +39,6 @@
*/
ServiceContract<?> getBindingServiceContract();
-
/**
* Set the ServiceContract for the binding. This contract will be used for the inbound wire. If not set, it will be
* the same as the ServideContract from the interface.
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org