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/07 17:19:42 UTC
svn commit: r504606 [4/5] - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/binding/local/
core/src/main/java/org/apache/tuscany/core/bootstrap/
core/src/main/java/org/apache/tuscany/core/builder/ core/src/main/java/or...
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/DuplicateRegistrationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/DuplicateRegistrationTestCase.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/DuplicateRegistrationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/DuplicateRegistrationTestCase.java Wed Feb 7 08:19:34 2007
@@ -46,8 +46,7 @@
List<Class<?>> interfaces = new ArrayList<Class<?>>();
interfaces.add(Source.class);
AtomicComponent component1 = EasyMock.createMock(AtomicComponent.class);
- EasyMock.expect(component1.getName()).andReturn("source").atLeastOnce();
- EasyMock.expect(component1.isSystem()).andReturn(true).atLeastOnce();
+ EasyMock.expect(component1.getUri()).andReturn(URI.create("source")).atLeastOnce();
component1.stop();
List<InboundWire> wires = TestUtils.createInboundWires(interfaces);
TestUtils.populateInboundWires(component1, wires);
@@ -55,8 +54,7 @@
EasyMock.replay(component1);
AtomicComponent component2 = EasyMock.createMock(AtomicComponent.class);
- EasyMock.expect(component2.getName()).andReturn("source").atLeastOnce();
- EasyMock.expect(component2.isSystem()).andReturn(true).atLeastOnce();
+ EasyMock.expect(component2.getUri()).andReturn(URI.create("source")).atLeastOnce();
component2.stop();
EasyMock.replay(component2);
@@ -75,16 +73,14 @@
services.add(Source.class);
CompositeComponent parent = new CompositeComponentImpl(URI.create("foo"), null, null, null);
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
- EasyMock.expect(component.getName()).andReturn("bar").atLeastOnce();
- EasyMock.expect(component.isSystem()).andReturn(true).atLeastOnce();
+ EasyMock.expect(component.getUri()).andReturn(URI.create("bar")).atLeastOnce();
List<InboundWire> wires = TestUtils.createInboundWires(services);
TestUtils.populateInboundWires(component, wires);
EasyMock.expect(component.getInboundWires()).andReturn(wires).atLeastOnce();
EasyMock.replay(component);
parent.register(component);
AtomicComponent component2 = EasyMock.createMock(AtomicComponent.class);
- EasyMock.expect(component2.getName()).andReturn("bar").atLeastOnce();
- EasyMock.expect(component2.isSystem()).andReturn(true).atLeastOnce();
+ EasyMock.expect(component2.getUri()).andReturn(URI.create("bar")).atLeastOnce();
EasyMock.replay(component2);
try {
parent.register(component2);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/JavaObjectRegistrationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/JavaObjectRegistrationTestCase.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/JavaObjectRegistrationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/JavaObjectRegistrationTestCase.java Wed Feb 7 08:19:34 2007
@@ -38,7 +38,7 @@
public void testRegistration() throws Exception {
MockComponent instance = new MockComponent();
composite.registerJavaObject("foo", MockComponent.class, instance);
- SCAObject child = composite.getSystemChild("foo");
+ SCAObject child = composite.getChild("foo");
assertTrue(child instanceof AtomicComponent);
MockComponent resolvedInstance = (MockComponent) ((AtomicComponent) child).getTargetInstance();
assertSame(instance, resolvedInstance);
@@ -55,17 +55,10 @@
}
}
- public void testSystemAutowireToObject() throws Exception {
+ public void testAutowireToObject() throws Exception {
MockComponent instance = new MockComponent();
composite.registerJavaObject("foo", MockComponent.class, instance);
- assertSame(instance, composite.resolveSystemAutowire(MockComponent.class).getTargetService());
- assertNull(composite.resolveSystemExternalAutowire(MockComponent.class));
- }
-
- public void testApplicationAutowireToObject() throws Exception {
- MockComponent instance = new MockComponent();
- composite.registerJavaObject("foo", MockComponent.class, instance);
- assertNull(composite.resolveAutowire(MockComponent.class));
+ assertNotNull(composite.resolveAutowire(MockComponent.class));
assertNull(composite.resolveExternalAutowire(MockComponent.class));
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/ReferenceImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/ReferenceImplTestCase.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/ReferenceImplTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/ReferenceImplTestCase.java Wed Feb 7 08:19:34 2007
@@ -54,10 +54,4 @@
EasyMock.verify(binding);
}
-
- public void testIsSystem() {
- Reference service = new ReferenceImpl(URI.create("ref"), null, null, true);
- assertTrue(service.isSystem());
- }
-
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/ServiceImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/ServiceImplTestCase.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/ServiceImplTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/ServiceImplTestCase.java Wed Feb 7 08:19:34 2007
@@ -55,9 +55,4 @@
}
- public void testIsSystem() {
- Service service = new ServiceImpl(URI.create("foo#bar"), null, null, null, true);
- assertTrue(service.isSystem());
- }
-
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/SystemComponentBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/SystemComponentBuilderTestCase.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/SystemComponentBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/SystemComponentBuilderTestCase.java Wed Feb 7 08:19:34 2007
@@ -71,7 +71,7 @@
impl.setComponentType(type);
impl.setImplementationClass(FooImpl.class);
ComponentDefinition<SystemImplementation> definition = new ComponentDefinition<SystemImplementation>(impl);
- definition.setName(URI.create("component"));
+ definition.setUri(URI.create("component"));
AtomicComponent component = builder.build(parent, definition, deploymentContext);
component.setScopeContainer(container);
component.start();
@@ -108,7 +108,7 @@
impl.setComponentType(type);
impl.setImplementationClass(FooImpl.class);
ComponentDefinition<SystemImplementation> definition = new ComponentDefinition<SystemImplementation>(impl);
- definition.setName(URI.create("component"));
+ definition.setUri(URI.create("component"));
PropertyValue<String> propVal = new PropertyValue<String>();
propVal.setName("prop");
propVal.setValueFactory(new SingletonObjectFactory<String>("value"));
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaBuilderPropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaBuilderPropertyTestCase.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaBuilderPropertyTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaBuilderPropertyTestCase.java Wed Feb 7 08:19:34 2007
@@ -64,7 +64,7 @@
type.setImplementationScope(Scope.STATELESS);
JavaImplementation impl = new JavaImplementation(Foo.class, type);
ComponentDefinition<JavaImplementation> definition = new ComponentDefinition<JavaImplementation>(impl);
- definition.setName(URI.create("component"));
+ definition.setUri(URI.create("component"));
PropertyValue propertyValue = new PropertyValue(property.getName(), property.getDefaultValueFactory());
definition.getPropertyValues().put(property.getName(), propertyValue);
AtomicComponent component = builder.build(parent, definition, deploymentContext);
@@ -86,7 +86,7 @@
type.setImplementationScope(Scope.STATELESS);
JavaImplementation impl = new JavaImplementation(Foo.class, type);
ComponentDefinition<JavaImplementation> definition = new ComponentDefinition<JavaImplementation>(impl);
- definition.setName(URI.create("component"));
+ definition.setUri(URI.create("component"));
ObjectFactory<Integer> defaultValueFactory = property.getDefaultValueFactory();
PropertyValue<Integer> propertyValue = new PropertyValue<Integer>(property.getName(), defaultValueFactory);
definition.getPropertyValues().put(property.getName(), propertyValue);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java Wed Feb 7 08:19:34 2007
@@ -108,7 +108,7 @@
type.setConstructorDefinition(new ConstructorDefinition<SourceImpl>(constructor));
JavaImplementation sourceImpl = new JavaImplementation(SourceImpl.class, type);
definition = new ComponentDefinition<JavaImplementation>(sourceImpl);
- definition.setName(URI.create("component"));
+ definition.setUri(URI.create("component"));
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java Wed Feb 7 08:19:34 2007
@@ -80,7 +80,7 @@
sourceType.setConstructorDefinition(new ConstructorDefinition<SourceImpl>(constructor));
JavaImplementation sourceImpl = new JavaImplementation(SourceImpl.class, sourceType);
ComponentDefinition<JavaImplementation> definition = new ComponentDefinition<JavaImplementation>(sourceImpl);
- definition.setName(URI.create("component"));
+ definition.setUri(URI.create("component"));
JavaComponentBuilder builder = new JavaComponentBuilder();
builder.setWireService(wireService);
JavaAtomicComponent component = (JavaAtomicComponent) builder.build(parent, definition, deploymentContext);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java Wed Feb 7 08:19:34 2007
@@ -63,7 +63,7 @@
EasyMock.replay(resourceWire);
CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
- EasyMock.expect(parent.resolveSystemAutowire(String.class)).andReturn(resourceWire);
+ EasyMock.expect(parent.resolveAutowire(String.class)).andReturn(resourceWire);
EasyMock.replay(parent);
JavaAtomicComponent component = (JavaAtomicComponent) builder.build(parent, definition, null);
Foo foo = (Foo) component.createInstance();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/ResourceInjectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/ResourceInjectionTestCase.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/ResourceInjectionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/ResourceInjectionTestCase.java Wed Feb 7 08:19:34 2007
@@ -55,7 +55,7 @@
EasyMock.replay(wire);
CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
- EasyMock.expect(parent.resolveSystemAutowire(EasyMock.eq(String.class))).andReturn(wire);
+ EasyMock.expect(parent.resolveAutowire(EasyMock.eq(String.class))).andReturn(wire);
EasyMock.replay(parent);
ResourceObjectFactory<String> factory = new ResourceObjectFactory<String>(String.class, false, parent, null);
component.addResourceFactory("bar", factory);
@@ -83,7 +83,7 @@
EasyMock.replay(wire);
CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
- EasyMock.expect(parent.resolveSystemAutowire(EasyMock.eq(String.class))).andReturn(wire);
+ EasyMock.expect(parent.resolveAutowire(EasyMock.eq(String.class))).andReturn(wire);
EasyMock.replay(parent);
ResourceObjectFactory<String> factory = new ResourceObjectFactory<String>(String.class, false, parent, null);
component.addResourceFactory("bar", factory);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java Wed Feb 7 08:19:34 2007
@@ -46,6 +46,8 @@
import junit.framework.TestCase;
import org.apache.tuscany.core.builder.ConnectorImpl;
+import org.apache.tuscany.core.component.ComponentManager;
+import org.apache.tuscany.core.component.ComponentManagerImpl;
import org.apache.tuscany.core.component.WorkContextImpl;
import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
@@ -72,6 +74,8 @@
private WireService wireService;
private WorkScheduler scheduler;
private WorkContext workContext;
+ private ComponentManager componentManager;
+ private Connector connector;
/**
* Verifies callback wires are built and callback invocations are handled properly
@@ -83,10 +87,8 @@
fooComponent.setScopeContainer(container);
wireService.createWires(fooComponent, targetDefinition);
container.register(fooComponent);
-
+ componentManager.register(fooComponent);
CompositeComponent parent = createMock(CompositeComponent.class);
- parent.getChild(isA(String.class));
- expectLastCall().andReturn(fooComponent).anyTimes();
replay(parent);
ComponentDefinition<JavaImplementation> sourceDefinition = createSource(URI.create("fooClient"));
@@ -95,8 +97,7 @@
clientComponent.setScopeContainer(container);
wireService.createWires(clientComponent, sourceDefinition);
container.register(clientComponent);
-
- Connector connector = new ConnectorImpl(new JDKWireService(), null, null, scheduler, workContext);
+ componentManager.register(clientComponent);
connector.connect(clientComponent);
FooClient client = (FooClient) clientComponent.getTargetInstance();
@@ -116,6 +117,7 @@
fooComponent.setScopeContainer(container);
wireService.createWires(fooComponent, targetDefinition);
container.register(fooComponent);
+ componentManager.register(fooComponent);
CompositeComponent parent = createMock(CompositeComponent.class);
parent.getChild(isA(String.class));
@@ -128,8 +130,7 @@
clientComponent.setScopeContainer(container);
wireService.createWires(clientComponent, sourceDefinition);
container.register(clientComponent);
-
- Connector connector = new ConnectorImpl(new JDKWireService(), null, null, scheduler, workContext);
+ componentManager.register(clientComponent);
connector.connect(clientComponent);
FooPlainClient client = (FooPlainClient) clientComponent.getTargetInstance();
@@ -152,6 +153,7 @@
fooComponent.setScopeContainer(container);
wireService.createWires(fooComponent, targetDefinition);
container.register(fooComponent);
+ componentManager.register(fooComponent);
CompositeComponent parent = createMock(CompositeComponent.class);
parent.getChild(isA(String.class));
@@ -165,13 +167,14 @@
clientComponent1.setScopeContainer(container);
wireService.createWires(clientComponent1, sourceDefinition1);
container.register(clientComponent1);
+ componentManager.register(clientComponent1);
JavaAtomicComponent clientComponent2 =
(JavaAtomicComponent) builder.build(parent, sourceDefinition2, context);
clientComponent2.setScopeContainer(container);
wireService.createWires(clientComponent2, sourceDefinition2);
container.register(clientComponent2);
+ componentManager.register(clientComponent2);
- Connector connector = new ConnectorImpl(new JDKWireService(), null, null, scheduler, workContext);
connector.connect(clientComponent1);
connector.connect(clientComponent2);
FooClient client1 = (FooClient) clientComponent1.getTargetInstance();
@@ -360,6 +363,8 @@
protected void setUp() throws Exception {
super.setUp();
+ componentManager = new ComponentManagerImpl();
+ connector = new ConnectorImpl(new JDKWireService(), null, componentManager, scheduler, workContext);
wireService = new JDKWireService();
container = new CompositeScopeContainer(null);
container.start();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java Wed Feb 7 08:19:34 2007
@@ -18,16 +18,13 @@
*/
package org.apache.tuscany.core.implementation.java.integration;
+import java.net.URI;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.FutureTask;
-import java.net.URI;
-import java.net.URISyntaxException;
-import org.apache.tuscany.spi.QualifiedName;
-import org.apache.tuscany.spi.builder.WiringException;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.WorkContext;
@@ -45,6 +42,8 @@
import junit.framework.TestCase;
import org.apache.tuscany.core.builder.ConnectorImpl;
+import org.apache.tuscany.core.component.ComponentManager;
+import org.apache.tuscany.core.component.ComponentManagerImpl;
import org.apache.tuscany.core.component.WorkContextImpl;
import org.apache.tuscany.core.component.event.ComponentStart;
import org.apache.tuscany.core.component.event.ComponentStop;
@@ -177,11 +176,11 @@
scope.stop();
}
- private OutboundWire getWire(ScopeContainer scope) throws NoSuchMethodException,
- InvalidServiceContractException, WiringException,
- URISyntaxException {
- ConnectorImpl connector = new ConnectorImpl();
+ private OutboundWire getWire(ScopeContainer scope) throws Exception {
+ ComponentManager componentManager = new ComponentManagerImpl();
+ ConnectorImpl connector = new ConnectorImpl(null, null, componentManager, null, null);
CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
+ EasyMock.replay(parent);
PojoConfiguration configuration = new PojoConfiguration();
configuration.setInstanceFactory(new PojoObjectFactory<TargetImpl>(TargetImpl.class.getConstructor()));
configuration.setParent(parent);
@@ -190,10 +189,11 @@
JavaAtomicComponent source = new JavaAtomicComponent(configuration);
source.setScopeContainer(scope);
- OutboundWire outboundWire = createOutboundWire(new QualifiedName("target/Target"), Target.class);
+ OutboundWire outboundWire = createOutboundWire("target#Target", Target.class);
outboundWire.setContainer(source);
source.addOutboundWire(outboundWire);
configuration.setName(new URI("target"));
+ componentManager.register(source);
JavaAtomicComponent target = new JavaAtomicComponent(configuration);
target.setScopeContainer(scope);
InboundWire targetWire = MockFactory.createInboundWire("Target", Target.class);
@@ -201,24 +201,22 @@
target.addInboundWire(targetWire);
InboundWire inboundWire = target.getInboundWire("Target");
inboundWire.setContainer(target);
+ componentManager.register(target);
- EasyMock.expect(parent.getChild("target")).andReturn(target);
- EasyMock.replay(parent);
connector.connect(source);
target.start();
return outboundWire;
}
- private static <T> OutboundWire createOutboundWire(QualifiedName targetName, Class<T> interfaze)
+ private static <T> OutboundWire createOutboundWire(String targetName, Class<T> interfaze)
throws InvalidServiceContractException {
OutboundWire wire = new OutboundWireImpl();
JavaServiceContract contract = new JavaServiceContract(interfaze);
contract.setInteractionScope(InteractionScope.NONCONVERSATIONAL);
wire.setServiceContract(contract);
- wire.setTargetName(targetName);
wire.addInvocationChains(createInvocationChains(interfaze));
- wire.setTargetUri(URI.create(targetName.getPartName() + "#" + targetName.getPortName()));
+ wire.setTargetUri(URI.create(targetName));
wire.setUri(URI.create("component#ref"));
return wire;
}
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=504606&r1=504605&r2=504606
==============================================================================
--- 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 Wed Feb 7 08:19:34 2007
@@ -26,7 +26,7 @@
*/
public class SystemComponentBuilderResourceTestCase extends TestCase {
- @SuppressWarnings("uncjecked")
+ @SuppressWarnings("unchecked")
public void testResourceInjection() throws Exception {
ScopeContainer container = EasyMock.createNiceMock(ScopeContainer.class);
DeploymentContext ctx = EasyMock.createNiceMock(DeploymentContext.class);
@@ -57,7 +57,7 @@
EasyMock.replay(wire);
CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
- EasyMock.expect(parent.resolveSystemAutowire(String.class)).andReturn(wire);
+ EasyMock.expect(parent.resolveAutowire(String.class)).andReturn(wire);
EasyMock.replay(parent);
AtomicComponent component = builder.build(parent, definition, ctx);
SystemComponentBuilderResourceTestCase.Foo foo =
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=504606&r1=504605&r2=504606
==============================================================================
--- 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 Wed Feb 7 08:19:34 2007
@@ -36,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.resolveSystemAutowire(EasyMock.eq(String.class))).andReturn(null);
+ EasyMock.expect(parent.resolveAutowire(EasyMock.eq(String.class))).andReturn(null);
EasyMock.replay(parent);
ResourceObjectFactory<String> factory = new ResourceObjectFactory<String>(String.class, false, parent, host);
assertEquals("foo", factory.getInstance());
@@ -61,7 +61,7 @@
EasyMock.expect(wire.getTargetService()).andReturn("foo");
EasyMock.replay(wire);
- EasyMock.expect(parent.resolveSystemAutowire(EasyMock.eq(String.class))).andReturn(wire);
+ EasyMock.expect(parent.resolveAutowire(EasyMock.eq(String.class))).andReturn(wire);
EasyMock.replay(parent);
ResourceObjectFactory<String> factory = new ResourceObjectFactory<String>(String.class, false, parent, null);
assertEquals("foo", factory.getInstance());
@@ -73,7 +73,7 @@
EasyMock.expect(component.getTargetInstance()).andReturn("foo");
EasyMock.replay(component);
CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
- EasyMock.expect(parent.getSystemChild(EasyMock.eq("bar"))).andReturn(component);
+ EasyMock.expect(parent.getChild(EasyMock.eq("bar"))).andReturn(component);
EasyMock.replay(parent);
ResourceObjectFactory<String> factory =
new ResourceObjectFactory<String>(String.class, "bar", false, parent, null);
@@ -91,7 +91,7 @@
EasyMock.replay(host);
CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
- EasyMock.expect(parent.resolveSystemAutowire(EasyMock.eq(String.class))).andReturn(null);
+ EasyMock.expect(parent.resolveAutowire(EasyMock.eq(String.class))).andReturn(null);
EasyMock.replay(parent);
ResourceObjectFactory<String> factory = new ResourceObjectFactory<String>(String.class, false, parent, host);
assertEquals("foo", factory.getInstance());
@@ -104,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.resolveSystemAutowire(EasyMock.eq(String.class))).andReturn(null);
+ EasyMock.expect(parent.resolveAutowire(EasyMock.eq(String.class))).andReturn(null);
EasyMock.replay(parent);
ResourceObjectFactory<String> factory = new ResourceObjectFactory<String>(String.class, true, parent, host);
assertNull(factory.getInstance());
@@ -122,7 +122,7 @@
EasyMock.replay(wire);
CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
- EasyMock.expect(parent.resolveSystemAutowire(EasyMock.eq(String.class))).andReturn(null);
+ EasyMock.expect(parent.resolveAutowire(EasyMock.eq(String.class))).andReturn(null);
EasyMock.replay(parent);
ResourceObjectFactory<String> factory = new ResourceObjectFactory<String>(String.class, false, parent, host);
try {
@@ -140,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.resolveSystemAutowire(EasyMock.eq(String.class))).andReturn(null);
+ EasyMock.expect(parent.resolveAutowire(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/conversation/ConversationIdleExpireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java Wed Feb 7 08:19:34 2007
@@ -26,7 +26,6 @@
import org.osoa.sca.annotations.Scope;
import org.apache.tuscany.spi.ObjectCreationException;
-import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.component.TargetNotFoundException;
import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.OutboundWire;
@@ -86,13 +85,12 @@
target = createMaxIdleTimeAtomicComponent();
// create source component mock
JavaAtomicComponent source = EasyMock.createMock(JavaAtomicComponent.class);
- EasyMock.expect(source.getName()).andReturn("source").atLeastOnce();
- EasyMock.expect(source.isSystem()).andReturn(false).atLeastOnce();
+ EasyMock.expect(source.getUri()).andReturn(URI.create("source")).atLeastOnce();
EasyMock.replay(source);
owire = MockFactory.createOutboundWire("foo", Foo.class);
owire.setContainer(source);
- owire.setTargetName(new QualifiedName("foo/bar"));
+ owire.setTargetUri(URI.create("foo#bar"));
InboundWire iwire = MockFactory.createInboundWire("foo", Foo.class);
iwire.setContainer(target);
connector.connect(owire, iwire, false);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java Wed Feb 7 08:19:34 2007
@@ -26,7 +26,6 @@
import org.osoa.sca.annotations.Scope;
import org.apache.tuscany.spi.ObjectCreationException;
-import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.component.TargetNotFoundException;
import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.OutboundWire;
@@ -86,13 +85,12 @@
target = createMaxIdleTimeAtomicComponent();
// create source component mock
JavaAtomicComponent source = EasyMock.createMock(JavaAtomicComponent.class);
- EasyMock.expect(source.getName()).andReturn("source").atLeastOnce();
- EasyMock.expect(source.isSystem()).andReturn(false).atLeastOnce();
+ EasyMock.expect(source.getUri()).andReturn(URI.create("source")).atLeastOnce();
EasyMock.replay(source);
owire = MockFactory.createOutboundWire("foo", Foo.class);
owire.setContainer(source);
- owire.setTargetName(new QualifiedName("foo/bar"));
+ owire.setTargetUri(URI.create("foo#bar"));
InboundWire iwire = MockFactory.createInboundWire("foo", Foo.class);
iwire.setContainer(target);
connector.connect(owire, iwire, false);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java Wed Feb 7 08:19:34 2007
@@ -26,7 +26,6 @@
import org.osoa.sca.annotations.Scope;
import org.apache.tuscany.spi.ObjectCreationException;
-import org.apache.tuscany.spi.QualifiedName;
import static org.apache.tuscany.spi.model.Scope.CONVERSATION;
import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.OutboundWire;
@@ -86,13 +85,12 @@
target = createAtomicComponent();
// create source component mock
JavaAtomicComponent source = EasyMock.createMock(JavaAtomicComponent.class);
- EasyMock.expect(source.getName()).andReturn("source").atLeastOnce();
- EasyMock.expect(source.isSystem()).andReturn(false).atLeastOnce();
+ EasyMock.expect(source.getUri()).andReturn(URI.create("source")).atLeastOnce();
EasyMock.replay(source);
owire = MockFactory.createOutboundWire("foo", Foo.class);
owire.setContainer(source);
- owire.setTargetName(new QualifiedName("foo/bar"));
+ owire.setTargetUri(URI.create("foo#bar"));
InboundWire iwire = MockFactory.createInboundWire("foo", Foo.class);
iwire.setContainer(target);
connector.connect(owire, iwire, false);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderPropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderPropertyTestCase.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderPropertyTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderPropertyTestCase.java Wed Feb 7 08:19:34 2007
@@ -62,7 +62,7 @@
impl.setComponentType(type);
impl.setImplementationClass(Foo.class);
ComponentDefinition<SystemImplementation> definition = new ComponentDefinition<SystemImplementation>(impl);
- definition.setName(URI.create("component"));
+ definition.setUri(URI.create("component"));
AtomicComponent component = builder.build(parent, definition, deploymentContext);
Foo foo = (Foo) component.createInstance();
assertEquals("foo", foo.getTest());
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java Wed Feb 7 08:19:34 2007
@@ -26,7 +26,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.idl.InvalidServiceContractException;
@@ -60,7 +59,7 @@
private static final WireService WIRE_SERVICE = new JDKWireService(new WorkContextImpl(), null);
private static final JavaInterfaceProcessorRegistry REGISTRY = new JavaInterfaceProcessorRegistryImpl();
- private static final ConnectorImpl CONNECTOR = new ConnectorImpl();
+ private static final ConnectorImpl CONNECTOR = new ConnectorImpl(null);
private MockFactory() {
}
@@ -132,7 +131,7 @@
OutboundWire outboundWire = createOutboundWire(targetName, sourceReferenceClass, sourceHeadInterceptor);
sourceComponent.addOutboundWire(outboundWire);
outboundWire.setContainer(sourceComponent);
- outboundWire.setTargetName(new QualifiedName(targetName + "/" + serviceName));
+ outboundWire.setTargetUri(URI.create(targetName + "#" + serviceName));
targetScope.register(targetComponent);
sourceScope.register(sourceComponent);
CONNECTOR.connect(outboundWire, inboundWire, false);
@@ -185,7 +184,7 @@
sourceComponent.setScopeContainer(sourceScope);
OutboundWire outboundWire = createOutboundWire(targetName, sourceReferenceClass, null);
outboundWire.setContainer(sourceComponent);
- outboundWire.setTargetName(new QualifiedName(targetName + "/" + serviceName));
+ outboundWire.setTargetUri(URI.create(targetName + "#" + serviceName));
List<OutboundWire> factories = new ArrayList<OutboundWire>();
factories.add(outboundWire);
sourceComponent.addOutboundWires(factories);
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=504606&r1=504605&r2=504606
==============================================================================
--- 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 Wed Feb 7 08:19:34 2007
@@ -32,22 +32,26 @@
import org.apache.tuscany.core.integration.mock.MockFactory;
import org.apache.tuscany.core.mock.component.Source;
import org.apache.tuscany.core.mock.component.SourceImpl;
-import org.apache.tuscany.core.mock.component.TargetImpl;
import org.apache.tuscany.core.mock.component.Target;
+import org.apache.tuscany.core.mock.component.TargetImpl;
/**
* @version $$Rev$$ $$Date$$
*/
public class ReferenceInjectionTestCase extends TestCase {
-
private Map<String, Member> members;
public void testProxiedReferenceInjection() throws Exception {
ScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
- Map<String, AtomicComponent> components =
- MockFactory.createWiredComponents("source", SourceImpl.class, scope,
- members, "target", Target.class, TargetImpl.class, scope);
+ Map<String, AtomicComponent> components = MockFactory.createWiredComponents("source",
+ SourceImpl.class,
+ scope,
+ members,
+ "target",
+ Target.class,
+ TargetImpl.class,
+ scope);
AtomicComponent sourceComponent = components.get("source");
Source source = (Source) sourceComponent.getTargetInstance();
Target target = source.getTarget();
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=504606&r1=504605&r2=504606
==============================================================================
--- 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 Wed Feb 7 08:19:34 2007
@@ -51,6 +51,7 @@
JavaImplementation impl = new JavaImplementation();
impl.setComponentType(type);
ComponentDefinition<?> definition = new ComponentDefinition<JavaImplementation>(impl);
+ definition.setUri(URI.create("component"));
XMLStreamReader reader = EasyMock.createMock(XMLStreamReader.class);
EasyMock.expect(reader.getAttributeValue(null, "name")).andReturn("reference");
EasyMock.expect(reader.getElementText()).andReturn("target");
@@ -59,7 +60,7 @@
ReferenceTarget target = definition.getReferenceTargets().get("reference");
assertEquals(1, target.getTargets().size());
URI uri = target.getTargets().get(0);
- assertEquals("target", uri.getPath());
+ assertEquals("component/target", uri.toString());
assertNull(uri.getFragment());
EasyMock.verify(reader);
}
@@ -73,16 +74,16 @@
JavaImplementation impl = new JavaImplementation();
impl.setComponentType(type);
ComponentDefinition<?> definition = new ComponentDefinition<JavaImplementation>(impl);
+ definition.setUri(URI.create("component"));
XMLStreamReader reader = EasyMock.createMock(XMLStreamReader.class);
EasyMock.expect(reader.getAttributeValue(null, "name")).andReturn("reference");
- EasyMock.expect(reader.getElementText()).andReturn("target#fragment");
+ EasyMock.expect(reader.getElementText()).andReturn("target/fragment");
EasyMock.replay(reader);
loader.loadReference(reader, null, definition);
ReferenceTarget target = definition.getReferenceTargets().get("reference");
assertEquals(1, target.getTargets().size());
URI uri = target.getTargets().get(0);
- assertEquals("target", uri.getPath());
- assertEquals("fragment", uri.getFragment());
+ assertEquals("component/target#fragment", uri.toString());
EasyMock.verify(reader);
}
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=504606&r1=504605&r2=504606
==============================================================================
--- 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 Wed Feb 7 08:19:34 2007
@@ -94,7 +94,7 @@
EasyMock.replay(mockRegistry);
DeploymentContext ctx = EasyMock.createNiceMock(DeploymentContext.class);
ComponentDefinition component = loader.load(parent, null, mockReader, ctx);
- assertEquals(FULL_NAME, component.getName().toString());
+ assertEquals(FULL_NAME, component.getUri().toString());
assertNull(component.getInitLevel());
}
@@ -127,7 +127,7 @@
EasyMock.replay(mockRegistry);
DeploymentContext ctx = EasyMock.createNiceMock(DeploymentContext.class);
ComponentDefinition component = loader.load(parent, null, mockReader, ctx);
- assertEquals(FULL_NAME, component.getName().toString());
+ assertEquals(FULL_NAME, component.getUri().toString());
assertEquals(Integer.valueOf(20), component.getInitLevel());
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderReferenceTestCase.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderReferenceTestCase.java Wed Feb 7 08:19:34 2007
@@ -57,7 +57,7 @@
EasyMock.replay(mockReader);
ServiceDefinition serviceDefinition = loader.load(parent, null, mockReader, null);
assertNotNull(serviceDefinition);
- assertEquals("target", serviceDefinition.getTarget().getPath());
+ assertEquals("parent/target", serviceDefinition.getTarget().getPath());
assertNull(serviceDefinition.getTarget().getFragment());
}
@@ -67,14 +67,13 @@
EasyMock.expect(mockReader.getAttributeValue(null, "name")).andReturn(name);
EasyMock.expect(mockReader.next()).andReturn(XMLStreamConstants.START_ELEMENT);
EasyMock.expect(mockReader.getName()).andReturn(REFERENCE);
- EasyMock.expect(mockReader.getElementText()).andReturn("target#fragment");
+ EasyMock.expect(mockReader.getElementText()).andReturn("target/fragment");
EasyMock.expect(mockReader.next()).andReturn(XMLStreamConstants.END_ELEMENT);
EasyMock.expect(mockReader.getName()).andReturn(SERVICE);
EasyMock.replay(mockReader);
ServiceDefinition serviceDefinition = loader.load(parent, null, mockReader, null);
assertNotNull(serviceDefinition);
- assertEquals("target", serviceDefinition.getTarget().getPath());
- assertEquals("fragment", serviceDefinition.getTarget().getFragment());
+ assertEquals("parent/target#fragment", serviceDefinition.getTarget().toString());
}
@@ -85,7 +84,7 @@
loader = new ServiceLoader(mockRegistry);
parent = EasyMock.createMock(CompositeComponent.class);
URI uri = URI.create(PARENT_NAME);
- EasyMock.expect(parent.getUri()).andReturn(uri);
+ EasyMock.expect(parent.getUri()).andReturn(uri).atLeastOnce();
EasyMock.replay(parent);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java Wed Feb 7 08:19:34 2007
@@ -163,7 +163,7 @@
deploymentContext = new RootDeploymentContext(null, null, null, null);
parent = EasyMock.createMock(CompositeComponent.class);
URI uri = URI.create(PARENT_NAME);
- EasyMock.expect(parent.getUri()).andReturn(uri);
+ EasyMock.expect(parent.getUri()).andReturn(uri).atLeastOnce();
EasyMock.replay(parent);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java Wed Feb 7 08:19:34 2007
@@ -27,7 +27,6 @@
import java.util.Map;
import javax.xml.namespace.QName;
-import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.component.AbstractSCAObject;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.Reference;
@@ -110,7 +109,6 @@
OutboundWire wire = wireService.createWire(target, definition).get(0);
assertEquals("#refName", wire.getUri().toString());
- assertEquals("bar", wire.getTargetName().toString());
assertFalse(wire.isAutowire());
assertEquals(1, wire.getInvocationChains().size());
assertEquals(contract, wire.getServiceContract());
@@ -188,9 +186,7 @@
public void testCreateReferenceBindingWire() throws Exception {
URI uri = new URI("foo");
ReferenceBinding binding = new MockReferenceBinding(uri);
- QualifiedName qName = new QualifiedName("target");
-
- wireService.createWires(binding, contract, qName);
+ wireService.createWires(binding, contract, URI.create("target"));
InboundWire inboundWire = binding.getInboundWire();
assertEquals(1, inboundWire.getInvocationChains().size());
@@ -199,7 +195,6 @@
assertEquals(binding, inboundWire.getContainer());
OutboundWire outboundWire = binding.getOutboundWire();
- assertEquals("target", outboundWire.getTargetName().toString());
assertEquals(1, outboundWire.getInvocationChains().size());
assertEquals(contract, outboundWire.getServiceContract());
assertEquals(binding, outboundWire.getContainer());
@@ -217,7 +212,6 @@
assertEquals(binding, inboundWire.getContainer());
assertEquals(uri, inboundWire.getUri());
OutboundWire outboundWire = binding.getOutboundWire();
- assertEquals("target", outboundWire.getTargetName().toString());
assertEquals(1, outboundWire.getInvocationChains().size());
assertEquals(contract, outboundWire.getServiceContract());
assertEquals(binding, outboundWire.getContainer());
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerSerializationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerSerializationTestCase.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerSerializationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerSerializationTestCase.java Wed Feb 7 08:19:34 2007
@@ -80,8 +80,8 @@
};
contract.setInterfaceClass(Foo.class);
contract.setInteractionScope(InteractionScope.NONCONVERSATIONAL);
- EasyMock.expect(container.getName()).andReturn("bar").atLeastOnce();
- EasyMock.replay(container);
+ EasyMock.expect(container.getUri()).andReturn(URI.create("bar")).atLeastOnce();
+
wire = EasyMock.createMock(OutboundWire.class);
Map<Operation<?>, OutboundInvocationChain> map = new HashMap<Operation<?>, OutboundInvocationChain>();
Operation<Object> operation = new Operation<Object>("invoke", null, null, null, false, null, NO_CONVERSATION);
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=504606&r1=504605&r2=504606
==============================================================================
--- 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 Wed Feb 7 08:19:34 2007
@@ -34,12 +34,12 @@
/**
* The name of the component that is the root of the application composite tree.
*/
- public static final URI TUSCANY_APPLICATION_ROOT = URI.create("tuscany.root.application");
+ public static final URI TUSCANY_APPLICATION_ROOT = URI.create("sca://tuscany.root.application");
/**
* The name of the component that is the root of the system composite tree.
*/
- public static final URI TUSCANY_SYSTEM_ROOT = URI.create("tuscany.root.system");
+ public static final URI TUSCANY_SYSTEM_ROOT = URI.create("sca://tuscany.root.system");
/**
* The name of the top-level component in the system composite tree.
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AbstractSCAObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AbstractSCAObject.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AbstractSCAObject.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AbstractSCAObject.java Wed Feb 7 08:19:34 2007
@@ -30,7 +30,6 @@
import org.apache.tuscany.spi.event.EventFilter;
import org.apache.tuscany.spi.event.RuntimeEventListener;
import org.apache.tuscany.spi.event.TrueFilter;
-import org.apache.tuscany.spi.util.UriHelper;
/**
* Functionality common to all <code>SCAObject<code> implementations
@@ -43,20 +42,14 @@
protected Map<EventFilter, List<RuntimeEventListener>> listeners;
protected final CompositeComponent parent;
protected final URI uri;
- private final String name;
private final Map<Object, Object> extensions = new HashMap<Object, Object>();
public AbstractSCAObject(URI uri, CompositeComponent parent) {
assert uri != null;
this.uri = uri;
- this.name = UriHelper.getBaseName(uri);
this.parent = parent;
}
- public String getName() {
- return name;
- }
-
public URI getUri() {
return uri;
}
@@ -118,14 +111,11 @@
}
public String toString() {
- return "[" + name + "] in state [" + super.toString() + ']';
+ return "[" + uri.toString() + "] in state [" + super.toString() + ']';
}
public Map<Object, Object> getExtensions() {
return extensions;
}
- public boolean isSystem() {
- return false;
- }
}
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=504606&r1=504605&r2=504606
==============================================================================
--- 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 Wed Feb 7 08:19:34 2007
@@ -79,6 +79,14 @@
InboundWire getInboundWire(String serviceName);
/**
+ * Returns the inbound wire associated with the given target name or null if not found. Targets can be services or
+ * references in the case of composites.
+ *
+ * @return the wire associated with the given service name or null if not found.
+ */
+ InboundWire getTargetWire(String targetName);
+
+ /**
* Returns a map of inbound wires.
*
* @return a map of inbound wires.
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=504606&r1=504605&r2=504606
==============================================================================
--- 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 Wed Feb 7 08:19:34 2007
@@ -19,7 +19,6 @@
package org.apache.tuscany.spi.component;
import java.util.List;
-import java.util.Collection;
import org.w3c.dom.Document;
@@ -60,22 +59,6 @@
void register(SCAObject object) throws ComponentRegistrationException;
/**
- * Returns the internal system wire associated with the given service name or null if not found
- *
- * @param serviceName the service name
- * @return the system wire or null if not found
- */
- InboundWire getInboundSystemWire(String serviceName);
-
- /**
- * Returns a map of inbound system wires.
- *
- * @return a map of inbound system wires.
- */
- Collection<InboundWire> getInboundSystemWires();
-
-
- /**
* Register a simple Java Object as a system component. This is primarily intended for use by bootstrap code to
* create the initial configuration components.
*
@@ -105,11 +88,6 @@
SCAObject getChild(String name);
/**
- * Returns the system child associated with a given name
- */
- SCAObject getSystemChild(String name);
-
- /**
* Invoked by child components to return an wire to a target based on matching type. Resolved targets may be
* serviceBindings or components in the parent or its ancestors, or references in a sibling component
*
@@ -120,16 +98,6 @@
InboundWire resolveAutowire(Class<?> instanceInterface) throws TargetResolutionException;
/**
- * Invoked by system child components to return a wire to a system target based on matching type. Resolved targets
- * may be system serviceBindings 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 one is not be found
- * @throws TargetResolutionException
- */
- InboundWire resolveSystemAutowire(Class<?> instanceInterface) throws TargetResolutionException;
-
- /**
* Invoked by a parent component to return an wire to a target in a child based on matching type. Resolved targets
* must be serviceBindings. 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
@@ -140,17 +108,5 @@
* @throws TargetResolutionException
*/
InboundWire resolveExternalAutowire(Class<?> instanceInterface) throws TargetResolutionException;
-
- /**
- * 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 serviceBindings. 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 one is not be found
- * @throws TargetResolutionException
- */
- InboundWire resolveSystemExternalAutowire(Class<?> instanceInterface) throws TargetResolutionException;
}
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=504606&r1=504605&r2=504606
==============================================================================
--- 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 Wed Feb 7 08:19:34 2007
@@ -40,12 +40,8 @@
URI getUri();
/**
- * Returns the artifact name
- */
- String getName();
-
- /**
* Returns the parent composite, or null if the artifact does not have one
+ * @deprecated
*/
CompositeComponent getParent();
@@ -53,13 +49,6 @@
* Returns the artifact scope
*/
Scope getScope();
-
- /**
- * Returns true if the artifact is a system artifact
- *
- * @return true if the artifact is a system artifact
- */
- boolean isSystem();
/**
* The extensions map contains other runtime context such as type systems for various databindings
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java Wed Feb 7 08:19:34 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.spi.component;
import java.util.LinkedList;
+import java.net.URI;
/**
* Implementations track information associated with a request as it is processed by the runtime
@@ -51,12 +52,12 @@
/**
* Returns the current chain of SCAObject addresses
*/
- LinkedList<Object> getCurrentCallbackRoutingChain();
+ LinkedList<URI> getCurrentCallbackRoutingChain();
/**
* Sets the current stack of SCAObject addresses
*/
- void setCurrentCallbackRoutingChain(LinkedList<Object> callbackRoutingChain);
+ void setCurrentCallbackRoutingChain(LinkedList<URI> callbackRoutingChain);
/**
* Returns the composite where a remote request came in
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AbstractComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AbstractComponentExtension.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AbstractComponentExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AbstractComponentExtension.java Wed Feb 7 08:19:34 2007
@@ -36,10 +36,8 @@
* @version Provides support for property accessors.
*/
public abstract class AbstractComponentExtension extends AbstractSCAObject implements Component {
- private final ComponentContext context;
-
protected ScopeContainer scopeContainer;
-
+ private final ComponentContext context;
private Map<String, PropertyValue<?>> defaultPropertyValues;
/**
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java?view=diff&rev=504606&r1=504605&r2=504606
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java Wed Feb 7 08:19:34 2007
@@ -162,6 +162,10 @@
}
}
+ public InboundWire getTargetWire(String targetName) {
+ return getInboundWire(targetName);
+ }
+
public Collection<InboundWire> getInboundWires() {
return Collections.unmodifiableCollection(serviceWires.values());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org