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/03 04:16:22 UTC
svn commit: r502853 [4/7] - 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/AutowireResolutionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireResolutionTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireResolutionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireResolutionTestCase.java Fri Feb 2 19:16:15 2007
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.core.implementation.composite;
+import java.net.URI;
+
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.wire.InboundWire;
@@ -39,7 +41,7 @@
public void testConstruction() {
CompositeComponent parent = createMock(CompositeComponent.class);
replay(parent);
- CompositeComponent component = new CompositeComponentImpl("test", parent, null, null);
+ CompositeComponent component = new CompositeComponentImpl(URI.create("test"), parent, null, null);
assertEquals("test", component.getName());
assertSame(parent, component.getParent());
verify(parent);
@@ -50,7 +52,7 @@
InboundWire wire = TestUtils.createInboundWire(Foo.class, parent);
EasyMock.expect(parent.resolveAutowire(eq(Foo.class))).andReturn(wire);
replay(parent);
- CompositeComponent component = new CompositeComponentImpl("test", parent, null, null);
+ CompositeComponent component = new CompositeComponentImpl(URI.create("test"), parent, null, null);
assertSame(wire, component.resolveAutowire(Foo.class));
verify(parent);
}
@@ -60,7 +62,7 @@
InboundWire wire = TestUtils.createInboundWire(Foo.class, parent);
EasyMock.expect(parent.resolveSystemAutowire(eq(Foo.class))).andReturn(wire);
replay(parent);
- CompositeComponent component = new CompositeComponentImpl("test", parent, null, null);
+ CompositeComponent component = new CompositeComponentImpl(URI.create("test"), parent, null, null);
assertSame(wire, component.resolveSystemAutowire(Foo.class));
verify(parent);
}
@@ -71,9 +73,9 @@
public void testNamespaceIsolationAutowire() throws Exception {
Foo foo = new Foo() {
};
- CompositeComponent parent = new CompositeComponentImpl("parent", null, null, null);
+ CompositeComponent parent = new CompositeComponentImpl(URI.create("parent"), null, null, null);
parent.registerJavaObject("foo", Foo.class, foo);
- CompositeComponent component = new CompositeComponentImpl("test", parent, null, null);
+ CompositeComponent component = new CompositeComponentImpl(URI.create("test"), parent, null, null);
assertNull(component.resolveAutowire(Foo.class));
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireTestCase.java Fri Feb 2 19:16:15 2007
@@ -18,6 +18,7 @@
*/
package org.apache.tuscany.core.implementation.composite;
+import java.net.URI;
import java.util.ArrayList;
import java.util.List;
@@ -44,7 +45,7 @@
* Tests autowiring to an system atomic component
*/
public void testSystemAtomicAutowire() throws Exception {
- CompositeComponent parent = new CompositeComponentImpl("parent", null, null, true);
+ CompositeComponent parent = new CompositeComponentImpl(URI.create("parent"), null, null, true);
parent.start();
List<Class<?>> interfaces = new ArrayList<Class<?>>();
interfaces.add(Source.class);
@@ -71,7 +72,7 @@
* Tests autowiring to an system atomic component
*/
public void testAtomicAutowire() throws Exception {
- CompositeComponent parent = new CompositeComponentImpl("parent", null, null, null);
+ CompositeComponent parent = new CompositeComponentImpl(URI.create("parent"), null, null, null);
parent.start();
List<Class<?>> interfaces = new ArrayList<Class<?>>();
@@ -101,7 +102,7 @@
* Tests autowiring to a system service
*/
public void testSystemServiceAutowire() throws Exception {
- CompositeComponent parent = new CompositeComponentImpl("parent", null, null, true);
+ CompositeComponent parent = new CompositeComponentImpl(URI.create("parent"), null, null, true);
parent.start();
ServiceBinding serviceBinding = EasyMock.createMock(ServiceBinding.class);
@@ -133,7 +134,7 @@
* Tests autowiring to a service
*/
public void testServiceAutowire() throws Exception {
- CompositeComponent parent = new CompositeComponentImpl("parent", null, null, true);
+ CompositeComponent parent = new CompositeComponentImpl(URI.create("parent"), null, null, true);
parent.start();
ServiceBinding serviceBinding = EasyMock.createMock(ServiceBinding.class);
@@ -166,7 +167,7 @@
* Tests autowiring to a system reference
*/
public void testSystemReferenceAutowire() throws Exception {
- CompositeComponent parent = new CompositeComponentImpl("parent", null, null, true);
+ CompositeComponent parent = new CompositeComponentImpl(URI.create("parent"), null, null, true);
parent.start();
ReferenceBinding binding = EasyMock.createMock(ReferenceBinding.class);
@@ -176,7 +177,7 @@
EasyMock.expect(binding.getInboundWire()).andReturn(wire).atLeastOnce();
EasyMock.replay(binding);
- Reference reference = new ReferenceImpl("foo", null, wire.getServiceContract(), true);
+ Reference reference = new ReferenceImpl(URI.create("foo"), null, wire.getServiceContract(), true);
reference.addReferenceBinding(binding);
parent.register(reference);
@@ -191,7 +192,7 @@
* Tests autowiring to a reference
*/
public void testReferenceAutowire() throws Exception {
- CompositeComponent parent = new CompositeComponentImpl("parent", null, null, true);
+ CompositeComponent parent = new CompositeComponentImpl(URI.create("parent"), null, null, true);
parent.start();
ReferenceBinding binding = EasyMock.createMock(ReferenceBinding.class);
@@ -201,7 +202,7 @@
EasyMock.expect(binding.getInboundWire()).andReturn(wire).atLeastOnce();
EasyMock.replay(binding);
- Reference reference = new ReferenceImpl("foo", null, wire.getServiceContract(), false);
+ Reference reference = new ReferenceImpl(URI.create("foo"), null, wire.getServiceContract(), false);
reference.addReferenceBinding(binding);
parent.register(reference);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java Fri Feb 2 19:16:15 2007
@@ -47,6 +47,7 @@
import org.apache.tuscany.core.binding.local.LocalBindingDefinition;
import org.apache.tuscany.core.builder.BuilderRegistryImpl;
import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
+import org.apache.tuscany.core.component.ComponentManagerImpl;
import org.apache.tuscany.core.deployer.RootDeploymentContext;
import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
import org.apache.tuscany.core.implementation.java.JavaComponentBuilder;
@@ -67,12 +68,14 @@
@SuppressWarnings("unchecked")
public void testBuild() throws Exception {
- CompositeComponent parent = new CompositeComponentImpl(null, null, null, null);
+ URI uri = URI.create("foo");
+ CompositeComponent parent = new CompositeComponentImpl(uri, null, null, null);
CompositeBuilder builder = new CompositeBuilder();
WireService wireService = new JDKWireService();
builder.setWireService(wireService);
- BuilderRegistryImpl builderRegistry = new BuilderRegistryImpl(null, wireService);
+ ComponentManagerImpl mgr = new ComponentManagerImpl();
+ BuilderRegistryImpl builderRegistry = new BuilderRegistryImpl(null, wireService, mgr);
JavaComponentBuilder jBuilder = new JavaComponentBuilder();
jBuilder.setWireService(wireService);
builderRegistry.register(JavaImplementation.class, jBuilder);
@@ -101,7 +104,10 @@
CompositeImplementation outerImpl = new CompositeImplementation();
outerImpl.setComponentType(outerType);
- return new ComponentDefinition<CompositeImplementation>(outerImpl);
+ ComponentDefinition def = new ComponentDefinition<CompositeImplementation>(outerImpl);
+ URI uri = URI.create("top");
+ def.setName(uri);
+ return def;
}
private ComponentDefinition<CompositeImplementation> createSourceComponentDef() throws Exception {
@@ -110,13 +116,13 @@
new CompositeComponentType<ServiceDefinition, ReferenceDefinition, JavaMappedProperty<?>>();
innerType.add(createInnerSourceComponentDef());
ReferenceDefinition reference = new ReferenceDefinition();
- reference.setName("TargetComponentRef");
+ reference.setUri(URI.create("#TargetComponentRef"));
JavaInterfaceProcessorRegistry registry = new JavaInterfaceProcessorRegistryImpl();
JavaServiceContract targetContract = registry.introspect(Target.class);
reference.setServiceContract(targetContract);
innerType.add(reference);
ServiceDefinition service = new ServiceDefinition();
- service.setName("InnerSourceService");
+ service.setUri(URI.create("#InnerSourceService"));
JavaServiceContract sourceContract = registry.introspect(Source.class);
service.setServiceContract(sourceContract);
service.setTarget(new URI("InnerSourceComponent"));
@@ -125,10 +131,11 @@
CompositeImplementation innerImpl = new CompositeImplementation();
innerImpl.setComponentType(innerType);
+ URI uri = URI.create("SourceComponent");
ComponentDefinition<CompositeImplementation> sourceComponentDefinition =
- new ComponentDefinition<CompositeImplementation>("SourceComponent", innerImpl);
+ new ComponentDefinition<CompositeImplementation>(uri, innerImpl);
ReferenceTarget refTarget = new ReferenceTarget();
- refTarget.setReferenceName("TargetComponentRef");
+ refTarget.setReferenceName(URI.create("#TargetComponentRef"));
refTarget.addTarget(new URI("TargetComponent"));
sourceComponentDefinition.add(refTarget);
@@ -141,7 +148,7 @@
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
sourceType.setImplementationScope(Scope.COMPOSITE);
JavaMappedReference reference = new JavaMappedReference();
- reference.setName("targetReference");
+ reference.setUri(URI.create("#targetReference"));
JavaInterfaceProcessorRegistry registry = new JavaInterfaceProcessorRegistryImpl();
ServiceContract<?> targetContract = registry.introspect(Target.class);
targetContract.setCallbackClass(OtherTarget.class);
@@ -153,17 +160,18 @@
ServiceContract<?> sourceContract = registry.introspect(Source.class);
JavaMappedService sourceServiceDefinition = new JavaMappedService();
- sourceServiceDefinition.setName("Source");
+ sourceServiceDefinition.setUri(URI.create("#Source"));
sourceServiceDefinition.setServiceContract(sourceContract);
sourceType.add(sourceServiceDefinition);
sourceType.setConstructorDefinition(new ConstructorDefinition<SourceImpl>(SourceImpl.class.getConstructor()));
JavaImplementation sourceImpl = new JavaImplementation(SourceImpl.class, sourceType);
+ URI uri = URI.create("InnerSourceComponent");
ComponentDefinition<JavaImplementation> innerSourceComponentDefinition =
- new ComponentDefinition<JavaImplementation>("InnerSourceComponent", sourceImpl);
+ new ComponentDefinition<JavaImplementation>(uri, sourceImpl);
ReferenceTarget refTarget = new ReferenceTarget();
- refTarget.setReferenceName("targetReference");
- refTarget.addTarget(new URI("TargetComponentRef"));
+ refTarget.setReferenceName(URI.create("#targetReference"));
+ refTarget.addTarget(new URI("#TargetComponentRef"));
innerSourceComponentDefinition.add(refTarget);
return innerSourceComponentDefinition;
@@ -181,14 +189,15 @@
targetContract.setCallbackName("OtherTarget");
JavaMappedService serviceDefinition = new JavaMappedService();
- serviceDefinition.setName("Target");
+ serviceDefinition.setUri(URI.create("Target"));
serviceDefinition.setServiceContract(targetContract);
serviceDefinition.setCallbackReferenceName("otherTarget");
targetType.add(serviceDefinition);
targetType.setConstructorDefinition(new ConstructorDefinition<TargetImpl>(TargetImpl.class.getConstructor()));
JavaImplementation targetImpl = new JavaImplementation(TargetImpl.class, targetType);
- return new ComponentDefinition<JavaImplementation>("TargetComponent", targetImpl);
+ URI uri = URI.create("TargetComponent");
+ return new ComponentDefinition<JavaImplementation>(uri, targetImpl);
}
protected void setUp() throws Exception {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java Fri Feb 2 19:16:15 2007
@@ -18,6 +18,7 @@
*/
package org.apache.tuscany.core.implementation.composite;
+import java.net.URI;
import java.util.Collections;
import org.apache.tuscany.spi.component.AtomicComponent;
@@ -33,7 +34,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.core.component.event.CompositeStart;
+import org.apache.tuscany.core.component.event.ComponentStart;
import org.apache.tuscany.core.implementation.TestUtils;
import org.easymock.EasyMock;
import static org.easymock.EasyMock.createMock;
@@ -49,12 +50,12 @@
private AtomicComponent component;
public void testGetScope() {
- CompositeComponent composite = new CompositeComponentImpl("parent", null, null, null);
+ CompositeComponent composite = new CompositeComponentImpl(URI.create("parent"), null, null, null);
Assert.assertEquals(Scope.SYSTEM, composite.getScope());
}
public void testReferencesServices() throws Exception {
- CompositeComponent composite = new CompositeComponentImpl("parent", null, null, null);
+ CompositeComponent composite = new CompositeComponentImpl(URI.create("parent"), null, null, null);
Service service = EasyMock.createMock(Service.class);
EasyMock.expect(service.getName()).andReturn("foo").atLeastOnce();
EasyMock.expect(service.isSystem()).andReturn(false).atLeastOnce();
@@ -66,14 +67,14 @@
}
public void testOnEvent() {
- CompositeComponent composite = new CompositeComponentImpl("parent", null, null, null);
+ CompositeComponent composite = new CompositeComponentImpl(URI.create("parent"), null, null, null);
Event event = new Event() {
public Object getSource() {
return null;
}
};
RuntimeEventListener listener = createMock(RuntimeEventListener.class);
- listener.onEvent(isA(CompositeStart.class));
+ listener.onEvent(isA(ComponentStart.class));
listener.onEvent(eq(event));
expectLastCall();
replay(listener);
@@ -83,7 +84,7 @@
}
public void testPrepare() throws Exception {
- CompositeComponent composite = new CompositeComponentImpl("parent", null, null, null);
+ CompositeComponent composite = new CompositeComponentImpl(URI.create("parent"), null, null, null);
composite.prepare();
}
@@ -98,7 +99,7 @@
expectLastCall().andReturn(name).anyTimes();
replay(binding);
- Reference reference = new ReferenceImpl(name, null, wire.getServiceContract());
+ Reference reference = new ReferenceImpl(URI.create(name), null, wire.getServiceContract());
reference.addReferenceBinding(binding);
return reference;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplSystemWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplSystemWireTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplSystemWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplSystemWireTestCase.java Fri Feb 2 19:16:15 2007
@@ -18,6 +18,7 @@
*/
package org.apache.tuscany.core.implementation.composite;
+import java.net.URI;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -28,7 +29,6 @@
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.PrepareException;
-import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.wire.InboundWire;
@@ -63,7 +63,7 @@
wires.add(outbound);
Map<String, List<OutboundWire>> wireMap = new HashMap<String, List<OutboundWire>>();
wireMap.put("ref", wires);
- CompositeComponent parent = new CompositeComponentImpl("foo", "foo", null, new ConnectorImpl(), null);
+ CompositeComponent parent = new CompositeComponentImpl(URI.create("foo"), null, new ConnectorImpl(), null);
AtomicComponent source = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(source.getScope()).andReturn(Scope.COMPOSITE).atLeastOnce();
EasyMock.expect(source.getName()).andReturn("source").atLeastOnce();
@@ -119,16 +119,16 @@
QualifiedName qName = new QualifiedName("target/bar");
OutboundWire outbound = EasyMock.createMock(OutboundWire.class);
EasyMock.expect(outbound.isAutowire()).andReturn(false);
- EasyMock.expect(outbound.getContainer()).andReturn(EasyMock.createNiceMock(SCAObject.class));
- EasyMock.expect(outbound.getReferenceName()).andReturn("foo");
+ EasyMock.expect(outbound.getUri()).andReturn(URI.create("foo"));
EasyMock.expect(outbound.getTargetName()).andReturn(qName).atLeastOnce();
+ EasyMock.expect(outbound.getTargetUri()).andReturn(URI.create("target#bar")).atLeastOnce();
EasyMock.replay(outbound);
List<OutboundWire> wires = new ArrayList<OutboundWire>();
wires.add(outbound);
Map<String, List<OutboundWire>> wireMap = new HashMap<String, List<OutboundWire>>();
wireMap.put("ref", wires);
- CompositeComponent parent = new CompositeComponentImpl("foo", "foo", null, new ConnectorImpl(), null);
+ CompositeComponent parent = new CompositeComponentImpl(URI.create("foo"), null, new ConnectorImpl(), null);
AtomicComponent source = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(source.getName()).andReturn("source").atLeastOnce();
List<InboundWire> inboundWires = new ArrayList<InboundWire>();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplTestCase.java Fri Feb 2 19:16:15 2007
@@ -20,6 +20,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.net.URI;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
@@ -34,15 +35,10 @@
*/
public class CompositeComponentImplTestCase extends TestCase {
- public void testSetUri() throws Exception {
- CompositeComponentImpl component = new CompositeComponentImpl("foo", "foo/bar", null, null, null);
- assertEquals("foo/bar", component.getURI());
- }
-
public void testRegisterSystemService() throws Exception {
List<Class<?>> services = new ArrayList<Class<?>>();
services.add(Foo.class);
- CompositeComponent parent = new CompositeComponentImpl("foo", "foo", null, null, null);
+ 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();
@@ -58,7 +54,7 @@
public void testRegister() throws Exception {
List<Class<?>> services = new ArrayList<Class<?>>();
services.add(Foo.class);
- CompositeComponent parent = new CompositeComponentImpl("foo", "foo", null, null, null);
+ 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(false).atLeastOnce();
@@ -77,7 +73,7 @@
public void testSystemServiceApplicationNamespaceIsolation() throws Exception {
List<Class<?>> services = new ArrayList<Class<?>>();
services.add(Foo.class);
- CompositeComponent parent = new CompositeComponentImpl("foo", "foo", null, null, null);
+ 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();
@@ -98,7 +94,7 @@
public void testSystemServiceLifecycle() throws Exception {
List<Class<?>> services = new ArrayList<Class<?>>();
services.add(Foo.class);
- CompositeComponent parent = new CompositeComponentImpl("foo", "foo", null, null, null);
+ CompositeComponent parent = new CompositeComponentImpl(URI.create("foo"), null, null, null);
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
component.start();
EasyMock.expect(component.getName()).andReturn("bar").atLeastOnce();
@@ -116,7 +112,7 @@
public void testComponentLifecycle() throws Exception {
List<Class<?>> services = new ArrayList<Class<?>>();
services.add(Foo.class);
- CompositeComponent parent = new CompositeComponentImpl("foo", "foo", null, null, null);
+ CompositeComponent parent = new CompositeComponentImpl(URI.create("foo"), null, null, null);
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
component.start();
EasyMock.expect(component.getName()).andReturn("bar").atLeastOnce();
@@ -134,7 +130,7 @@
public void testSystemAutowire() throws Exception {
List<Class<?>> services = new ArrayList<Class<?>>();
services.add(Foo.class);
- CompositeComponent parent = new CompositeComponentImpl("foo", "foo", null, null, null);
+ CompositeComponent parent = new CompositeComponentImpl(URI.create("foo"), null, null, null);
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
component.start();
EasyMock.expect(component.getName()).andReturn("bar").atLeastOnce();
@@ -155,7 +151,7 @@
public void testAutowire() throws Exception {
List<Class<?>> services = new ArrayList<Class<?>>();
services.add(Foo.class);
- CompositeComponent parent = new CompositeComponentImpl("foo", "foo", null, null, null);
+ CompositeComponent parent = new CompositeComponentImpl(URI.create("foo"), null, null, null);
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
component.start();
EasyMock.expect(component.getName()).andReturn("bar").atLeastOnce();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java Fri Feb 2 19:16:15 2007
@@ -20,6 +20,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.net.URI;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
@@ -38,7 +39,7 @@
public class CompositeComponentResolutionTestCase extends TestCase {
public void testSystemComponentResolution() throws Exception {
- CompositeComponent parent = new CompositeComponentImpl("foo", null, null, true);
+ CompositeComponent parent = new CompositeComponentImpl(URI.create("foo"), null, null, true);
parent.start();
List<Class<?>> interfaces = new ArrayList<Class<?>>();
interfaces.add(Source.class);
@@ -56,7 +57,7 @@
}
public void testComponentResolution() throws Exception {
- CompositeComponent parent = new CompositeComponentImpl("foo", null, null, null);
+ CompositeComponent parent = new CompositeComponentImpl(URI.create("foo"), null, null, null);
parent.start();
List<Class<?>> interfaces = new ArrayList<Class<?>>();
interfaces.add(Source.class);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLifecycleTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLifecycleTestCase.java Fri Feb 2 19:16:15 2007
@@ -20,6 +20,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.net.URI;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
@@ -36,7 +37,7 @@
public class CompositeLifecycleTestCase extends TestCase {
public void testLifecycle() throws Exception {
- CompositeComponent composite = new CompositeComponentImpl("foo", null, null, null);
+ CompositeComponent composite = new CompositeComponentImpl(URI.create("foo"), null, null, null);
composite.start();
assertNull(composite.getChild("nothtere"));
composite.stop();
@@ -61,7 +62,7 @@
EasyMock.replay(component);
- CompositeComponent composite = new CompositeComponentImpl("foo", null, null, null);
+ CompositeComponent composite = new CompositeComponentImpl(URI.create("foo"), null, null, null);
composite.start();
composite.register(component);
@@ -89,7 +90,7 @@
EasyMock.replay(component);
- CompositeComponent composite = new CompositeComponentImpl("foo", null, null, null);
+ CompositeComponent composite = new CompositeComponentImpl(URI.create("foo"), null, null, null);
composite.start();
composite.register(component);
@@ -102,8 +103,8 @@
}
public void testChildStoppedBeforeParent() throws Exception {
- CompositeComponent parent = new CompositeComponentImpl("parent", null, null, null);
- CompositeComponent child = new CompositeComponentImpl("child", null, null, null);
+ CompositeComponent parent = new CompositeComponentImpl(URI.create("parent"), null, null, null);
+ CompositeComponent child = new CompositeComponentImpl(URI.create("child"), null, null, null);
parent.register(child);
parent.start();
child.stop();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLoaderWireResolutionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLoaderWireResolutionTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLoaderWireResolutionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLoaderWireResolutionTestCase.java Fri Feb 2 19:16:15 2007
@@ -43,51 +43,6 @@
private CompositeComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> componentType;
private CompositeLoader compositeLoader = new CompositeLoader(null, null);
- public void setUp() throws Exception {
- componentType = new CompositeComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
- componentType.setName("TestComposite");
- //add a service to the composite
- ServiceDefinition serviceDefn = new ServiceDefinition("compositeService1", null, true);
- ServiceDefinition boundSvcDefn = new ServiceDefinition("boundSvc", null, true, null);
- ServiceDefinition boundSvcDefnWithTarget =
- new ServiceDefinition("boundSvcWithTarget", null, true);
- boundSvcDefnWithTarget.setTarget(new URI("orgTarget"));
- componentType.add(serviceDefn);
- componentType.add(boundSvcDefn);
- componentType.add(boundSvcDefnWithTarget);
-
- ReferenceDefinition compositeReference = new ReferenceDefinition("compositeReference", null);
- componentType.add(compositeReference);
-
- PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> pojoComponentType1 =
- new PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
- ServiceDefinition pojoSvc1 = new ServiceDefinition("pojoSvc1", null, false);
- pojoComponentType1.add(pojoSvc1);
- ReferenceDefinition pojoRef1 = new ReferenceDefinition("pojoRef1", null);
- pojoComponentType1.add(pojoRef1);
- JavaImplementation pojoImpl1 = new JavaImplementation(null, pojoComponentType1);
-
- ComponentDefinition<JavaImplementation> component1 =
- new ComponentDefinition<JavaImplementation>("Component1", pojoImpl1);
- componentType.add(component1);
-
- PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> pojoComponentType2 =
- new PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
- ServiceDefinition pojoSvc2 = new ServiceDefinition("pojoSvc2", null, false);
- pojoComponentType2.add(pojoSvc2);
- ServiceDefinition pojoSvc3 = new ServiceDefinition("pojoSvc3", null, false);
- pojoComponentType2.add(pojoSvc3);
- ReferenceDefinition pojoRef2 = new ReferenceDefinition("pojoRef2", null);
- pojoComponentType2.add(pojoRef2);
- ReferenceDefinition pojoRef3 = new ReferenceDefinition("pojoRef3", null);
- pojoComponentType2.add(pojoRef3);
- JavaImplementation pojoImpl2 = new JavaImplementation(null, pojoComponentType2);
-
- ComponentDefinition<JavaImplementation> component2 =
- new ComponentDefinition<JavaImplementation>("Component2", pojoImpl2);
- componentType.add(component2);
- }
-
public void testCompositeSvc2CompositeReferenceWire() throws Exception {
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("compositeService1"));
@@ -109,7 +64,7 @@
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("compositeService1"));
- wireDefn.setTarget(new URI("Component2/pojoSvc3"));
+ wireDefn.setTarget(new URI("Component2#pojoSvc3"));
componentType.add(wireDefn);
compositeLoader.resolveWires(componentType);
}
@@ -118,7 +73,7 @@
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("compositeService1"));
- wireDefn.setTarget(new URI("Component2/pojoSvc5"));
+ wireDefn.setTarget(new URI("Component2#pojoSvc5"));
componentType.add(wireDefn);
try {
compositeLoader.resolveWires(componentType);
@@ -145,7 +100,7 @@
public void testComponent2CompositeReferenceValid() throws Exception {
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
- wireDefn.setSource(new URI("Component1"));
+ wireDefn.setSource(new URI("Component1#pojoRef1"));
wireDefn.setTarget(new URI("compositeReference"));
componentType.add(wireDefn);
compositeLoader.resolveWires(componentType);
@@ -154,7 +109,7 @@
public void testComponent2CompositeReferenceQualifiedValid() throws Exception {
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
- wireDefn.setSource(new URI("Component2/pojoRef3"));
+ wireDefn.setSource(new URI("Component2#pojoRef3"));
wireDefn.setTarget(new URI("compositeReference"));
componentType.add(wireDefn);
compositeLoader.resolveWires(componentType);
@@ -176,10 +131,9 @@
}
public void testComponent2ComponentQualifedValid() throws Exception {
- //undefined source and targets
WireDefinition wireDefn = new WireDefinition();
- wireDefn.setSource(new URI("Component1"));
- wireDefn.setTarget(new URI("Component2/pojoSvc3"));
+ wireDefn.setSource(new URI("Component1#pojoRef1"));
+ wireDefn.setTarget(new URI("Component2#pojoSvc3"));
componentType.add(wireDefn);
compositeLoader.resolveWires(componentType);
}
@@ -222,4 +176,55 @@
// expected
}
}
+
+ public void setUp() throws Exception {
+ componentType = new CompositeComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
+ componentType.setName("TestComposite");
+ //add a service to the composite
+ ServiceDefinition serviceDefn = new ServiceDefinition(URI.create("#compositeService1"), null, true);
+ ServiceDefinition boundSvcDefn = new ServiceDefinition(URI.create("#boundSvc"), null, true, null);
+ ServiceDefinition boundSvcDefnWithTarget =
+ new ServiceDefinition(URI.create("#boundSvcWithTarget"), null, true);
+ boundSvcDefnWithTarget.setTarget(new URI("orgTarget"));
+ componentType.add(serviceDefn);
+ componentType.add(boundSvcDefn);
+ componentType.add(boundSvcDefnWithTarget);
+
+ ReferenceDefinition compositeReference = new ReferenceDefinition(URI.create("#compositeReference"), null);
+ componentType.add(compositeReference);
+
+ PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> pojoComponentType1 =
+ new PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
+ ServiceDefinition pojoSvc1 = new ServiceDefinition(URI.create("#pojoSvc1"), null, false);
+ pojoComponentType1.add(pojoSvc1);
+ ReferenceDefinition pojoRef1 = new ReferenceDefinition(URI.create("#pojoRef1"), null);
+ pojoComponentType1.add(pojoRef1);
+ JavaImplementation pojoImpl1 = new JavaImplementation(null, pojoComponentType1);
+
+ URI uri = URI.create("Component1");
+ ComponentDefinition<JavaImplementation> component1 =
+ new ComponentDefinition<JavaImplementation>(uri, pojoImpl1);
+ componentType.add(component1);
+
+ PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> pojoComponentType2 =
+ new PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
+ ServiceDefinition pojoSvc2 = new ServiceDefinition(URI.create("#pojoSvc2"), null, false);
+ pojoComponentType2.add(pojoSvc2);
+ ServiceDefinition pojoSvc3 = new ServiceDefinition(URI.create("#pojoSvc3"), null, false);
+ pojoComponentType2.add(pojoSvc3);
+ ReferenceDefinition pojoRef2 = new ReferenceDefinition(URI.create("#pojoRef2"), null);
+ pojoComponentType2.add(pojoRef2);
+ ReferenceDefinition pojoRef3 = new ReferenceDefinition(URI.create("#pojoRef3"), null);
+ pojoComponentType2.add(pojoRef3);
+ JavaImplementation pojoImpl2 = new JavaImplementation(null, pojoComponentType2);
+
+ URI uri2 = URI.create("Component2");
+ ComponentDefinition<JavaImplementation> component2 =
+ new ComponentDefinition<JavaImplementation>(uri2, pojoImpl2);
+ componentType.add(component2);
+ }
+
+
+
+
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositePropagationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositePropagationTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositePropagationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositePropagationTestCase.java Fri Feb 2 19:16:15 2007
@@ -20,6 +20,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.net.URI;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
@@ -80,9 +81,9 @@
protected void setUp() throws Exception {
super.setUp();
- parent = new CompositeComponentImpl("parent", null, null, null);
- CompositeComponent child1 = new CompositeComponentImpl("child1", parent, null, null);
- child2 = new CompositeComponentImpl("child2", child1, null, null);
+ parent = new CompositeComponentImpl(URI.create("parent"), null, null, null);
+ CompositeComponent child1 = new CompositeComponentImpl(URI.create("child1"), parent, null, null);
+ child2 = new CompositeComponentImpl(URI.create("child2"), child1, null, null);
child1.register(child2);
parent.register(child1);
}
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=502853&r1=502852&r2=502853
==============================================================================
--- 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 Fri Feb 2 19:16:15 2007
@@ -20,6 +20,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.net.URI;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
@@ -39,7 +40,7 @@
public class DuplicateRegistrationTestCase extends TestCase {
public void testDuplicateRegistration() throws Exception {
- CompositeComponent parent = new CompositeComponentImpl(null, null, null, null);
+ CompositeComponent parent = new CompositeComponentImpl(URI.create("parent"), null, null, null);
parent.start();
List<Class<?>> interfaces = new ArrayList<Class<?>>();
@@ -72,7 +73,7 @@
public void testDuplicateNameSystemService() throws Exception {
List<Class<?>> services = new ArrayList<Class<?>>();
services.add(Source.class);
- CompositeComponent parent = new CompositeComponentImpl("foo", "foo", null, null, null);
+ 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();
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=502853&r1=502852&r2=502853
==============================================================================
--- 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 Fri Feb 2 19:16:15 2007
@@ -18,14 +18,16 @@
*/
package org.apache.tuscany.core.implementation.composite;
+import java.net.URI;
+
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.DuplicateNameException;
import org.apache.tuscany.spi.component.SCAObject;
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.event.ComponentStart;
+import org.apache.tuscany.core.component.event.ComponentStop;
/**
* @version $Rev$ $Date$
@@ -69,13 +71,13 @@
protected void setUp() throws Exception {
super.setUp();
- composite = new CompositeComponentImpl(null, null, null, null);
+ composite = new CompositeComponentImpl(URI.create("component"), null, null, null);
composite.start();
- composite.publish(new CompositeStart(this, null));
+ composite.publish(new ComponentStart(this, null));
}
protected void tearDown() throws Exception {
- composite.publish(new CompositeStop(this, null));
+ composite.publish(new ComponentStop(this, null));
composite.stop();
super.tearDown();
}
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=502853&r1=502852&r2=502853
==============================================================================
--- 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 Fri Feb 2 19:16:15 2007
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.core.implementation.composite;
+import java.net.URI;
+
import org.apache.tuscany.spi.component.Reference;
import org.apache.tuscany.spi.component.ReferenceBinding;
@@ -34,7 +36,7 @@
binding.setReference(EasyMock.isA(Reference.class));
binding.start();
EasyMock.replay(binding);
- Reference reference = new ReferenceImpl(null, null, null);
+ Reference reference = new ReferenceImpl(URI.create("ref"), null, null);
reference.addReferenceBinding(binding);
reference.start();
EasyMock.verify(binding);
@@ -46,7 +48,7 @@
binding.setReference(EasyMock.isA(Reference.class));
binding.stop();
EasyMock.replay(binding);
- Reference reference = new ReferenceImpl(null, null, null);
+ Reference reference = new ReferenceImpl(URI.create("ref"), null, null);
reference.addReferenceBinding(binding);
reference.stop();
EasyMock.verify(binding);
@@ -54,7 +56,7 @@
}
public void testIsSystem() {
- Reference service = new ReferenceImpl(null, null, null, true);
+ 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=502853&r1=502852&r2=502853
==============================================================================
--- 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 Fri Feb 2 19:16:15 2007
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.core.implementation.composite;
+import java.net.URI;
+
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.component.ServiceBinding;
@@ -34,7 +36,7 @@
binding.setService(EasyMock.isA(Service.class));
binding.start();
EasyMock.replay(binding);
- Service service = new ServiceImpl(null, null, null);
+ Service service = new ServiceImpl(URI.create("foo#bar"), null, null);
service.addServiceBinding(binding);
service.start();
EasyMock.verify(binding);
@@ -46,7 +48,7 @@
binding.setService(EasyMock.isA(Service.class));
binding.stop();
EasyMock.replay(binding);
- Service service = new ServiceImpl(null, null, null);
+ Service service = new ServiceImpl(URI.create("foo#bar"), null, null);
service.addServiceBinding(binding);
service.stop();
EasyMock.verify(binding);
@@ -54,7 +56,7 @@
}
public void testIsSystem() {
- Service service = new ServiceImpl(null, null, null, null, true);
+ 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=502853&r1=502852&r2=502853
==============================================================================
--- 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 Fri Feb 2 19:16:15 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.core.implementation.composite;
import java.lang.reflect.Method;
+import java.net.URI;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
@@ -33,8 +34,8 @@
import org.apache.tuscany.spi.model.Scope;
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.event.ComponentStart;
+import org.apache.tuscany.core.component.event.ComponentStop;
import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
import org.apache.tuscany.core.implementation.system.builder.SystemComponentBuilder;
import org.apache.tuscany.core.implementation.system.model.SystemImplementation;
@@ -45,7 +46,6 @@
* @version $Rev$ $Date$
*/
public class SystemComponentBuilderTestCase extends TestCase {
-
CompositeComponent parent;
DeploymentContext deploymentContext;
SystemComponentBuilder builder = new SystemComponentBuilder();
@@ -71,13 +71,14 @@
impl.setComponentType(type);
impl.setImplementationClass(FooImpl.class);
ComponentDefinition<SystemImplementation> definition = new ComponentDefinition<SystemImplementation>(impl);
+ definition.setName(URI.create("component"));
AtomicComponent component = builder.build(parent, definition, deploymentContext);
component.setScopeContainer(container);
component.start();
- container.onEvent(new CompositeStart(this, null));
+ container.onEvent(new ComponentStart(this, null));
FooImpl foo = (FooImpl) component.getTargetInstance();
assertTrue(foo.initialized);
- container.onEvent(new CompositeStop(this, null));
+ container.onEvent(new ComponentStop(this, null));
assertTrue(foo.destroyed);
}
@@ -107,6 +108,7 @@
impl.setComponentType(type);
impl.setImplementationClass(FooImpl.class);
ComponentDefinition<SystemImplementation> definition = new ComponentDefinition<SystemImplementation>(impl);
+ definition.setName(URI.create("component"));
PropertyValue<String> propVal = new PropertyValue<String>();
propVal.setName("prop");
propVal.setValueFactory(new SingletonObjectFactory<String>("value"));
@@ -116,7 +118,7 @@
component.start();
FooImpl foo = (FooImpl) component.getTargetInstance();
assertEquals("value", foo.prop);
- container.onEvent(new CompositeStop(this, null));
+ container.onEvent(new ComponentStop(this, null));
}
protected void setUp() throws Exception {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/SystemSingletonAtomicComponentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/SystemSingletonAtomicComponentTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/SystemSingletonAtomicComponentTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/SystemSingletonAtomicComponentTestCase.java Fri Feb 2 19:16:15 2007
@@ -20,6 +20,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.net.URI;
import org.apache.tuscany.spi.component.TargetException;
@@ -33,7 +34,7 @@
public void testGetInstance() throws TargetException {
FooImpl foo = new FooImpl();
SystemSingletonAtomicComponent<Foo, FooImpl> component =
- new SystemSingletonAtomicComponent<Foo, FooImpl>("foo", null, Foo.class, foo);
+ new SystemSingletonAtomicComponent<Foo, FooImpl>(URI.create("foo"), null, Foo.class, foo);
assertEquals(foo, component.getTargetInstance());
}
@@ -43,7 +44,7 @@
services.add(Foo.class);
services.add(Bar.class);
SystemSingletonAtomicComponent<Foo, FooImpl> component =
- new SystemSingletonAtomicComponent<Foo, FooImpl>("foo", null, services, foo);
+ new SystemSingletonAtomicComponent<Foo, FooImpl>(URI.create("foo"), null, services, foo);
assertEquals(foo, component.getTargetInstance());
}
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=502853&r1=502852&r2=502853
==============================================================================
--- 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 Fri Feb 2 19:16:15 2007
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.core.implementation.java;
+import java.net.URI;
+
import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
@@ -62,6 +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"));
PropertyValue propertyValue = new PropertyValue(property.getName(), property.getDefaultValueFactory());
definition.getPropertyValues().put(property.getName(), propertyValue);
AtomicComponent component = builder.build(parent, definition, deploymentContext);
@@ -83,6 +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"));
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/JavaComponentBuilderConversationIDTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderConversationIDTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderConversationIDTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderConversationIDTestCase.java Fri Feb 2 19:16:15 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.core.implementation.java;
import java.lang.reflect.Field;
+import java.net.URI;
import org.apache.tuscany.core.component.WorkContextImpl;
import org.apache.tuscany.spi.component.CompositeComponent;
@@ -59,7 +60,8 @@
type.setConstructorDefinition(ctorDef);
JavaImplementation impl = new JavaImplementation(Foo.class, type);
- ComponentDefinition<JavaImplementation> definition = new ComponentDefinition<JavaImplementation>("foo", impl);
+ URI uri = URI.create("foo");
+ ComponentDefinition<JavaImplementation> definition = new ComponentDefinition<JavaImplementation>(uri, impl);
CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
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/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=502853&r1=502852&r2=502853
==============================================================================
--- 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 Fri Feb 2 19:16:15 2007
@@ -1,6 +1,7 @@
package org.apache.tuscany.core.implementation.java;
import java.lang.reflect.Constructor;
+import java.net.URI;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
@@ -73,7 +74,7 @@
protected void setUp() throws Exception {
super.setUp();
- parent = new CompositeComponentImpl(null, null, null, null);
+ parent = new CompositeComponentImpl(URI.create("parent"), null, null, null);
constructor = SourceImpl.class.getConstructor((Class[]) null);
createDeploymentContext();
createComponentDefinitionAndType();
@@ -96,17 +97,18 @@
type = new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
type.setImplementationScope(Scope.COMPOSITE);
JavaMappedReference reference = new JavaMappedReference();
- reference.setName("target");
+ reference.setUri(URI.create("#target"));
reference.setMember(SourceImpl.class.getMethod("setTarget", Target.class));
type.add(reference);
ServiceContract<?> contract = new JavaServiceContract(Source.class);
JavaMappedService serviceDefinition = new JavaMappedService();
- serviceDefinition.setName("Source");
+ serviceDefinition.setUri(URI.create("component#Source"));
serviceDefinition.setServiceContract(contract);
type.add(serviceDefinition);
type.setConstructorDefinition(new ConstructorDefinition<SourceImpl>(constructor));
JavaImplementation sourceImpl = new JavaImplementation(SourceImpl.class, type);
definition = new ComponentDefinition<JavaImplementation>(sourceImpl);
+ definition.setName(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=502853&r1=502852&r2=502853
==============================================================================
--- 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 Fri Feb 2 19:16:15 2007
@@ -22,6 +22,7 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import java.net.URI;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
@@ -64,23 +65,22 @@
private ScopeContainer scopeContainer;
public void testBuildReference() throws Exception {
-
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> sourceType =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
sourceType.setImplementationScope(Scope.COMPOSITE);
JavaMappedReference reference = new JavaMappedReference();
- reference.setName("target");
+ reference.setUri(URI.create("#target"));
reference.setMember(SourceImpl.class.getMethod("setTarget", Target.class));
sourceType.add(reference);
ServiceContract<?> contract = new JavaServiceContract(Source.class);
JavaMappedService serviceDefinition = new JavaMappedService();
- serviceDefinition.setName("Source");
+ serviceDefinition.setUri(URI.create("#Source"));
serviceDefinition.setServiceContract(contract);
sourceType.add(serviceDefinition);
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"));
JavaComponentBuilder builder = new JavaComponentBuilder();
builder.setWireService(wireService);
JavaAtomicComponent component = (JavaAtomicComponent) builder.build(parent, definition, deploymentContext);
@@ -97,7 +97,7 @@
protected void setUp() throws Exception {
super.setUp();
wireService = new JDKWireService();
- parent = new CompositeComponentImpl(null, null, null, null);
+ parent = new CompositeComponentImpl(URI.create("parent"), null, null, null);
constructor = SourceImpl.class.getConstructor((Class[]) null);
createDeploymentContext();
createWire();
@@ -135,7 +135,7 @@
SCAObject scaObject = EasyMock.createNiceMock(SCAObject.class);
Map<Operation<?>, OutboundInvocationChain> chains = Collections.emptyMap();
wire = EasyMock.createMock(OutboundWire.class);
- EasyMock.expect(wire.getReferenceName()).andReturn("target").atLeastOnce();
+ EasyMock.expect(wire.getUri()).andReturn(URI.create("#target")).atLeastOnce();
EasyMock.expect(wire.getInvocationChains()).andReturn(chains).atLeastOnce();
EasyMock.expect(wire.isOptimizable()).andReturn(false);
JavaServiceContract targetContract = new JavaServiceContract(Target.class);
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=502853&r1=502852&r2=502853
==============================================================================
--- 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 Fri Feb 2 19:16:15 2007
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.core.implementation.java;
+import java.net.URI;
+
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.ScopeRegistry;
@@ -54,7 +56,8 @@
type.setImplementationScope(Scope.STATELESS);
type.setConstructorDefinition(ctorDef);
JavaImplementation impl = new JavaImplementation(Foo.class, type);
- ComponentDefinition<JavaImplementation> definition = new ComponentDefinition<JavaImplementation>("foo", impl);
+ URI uri = URI.create("foo");
+ ComponentDefinition<JavaImplementation> definition = new ComponentDefinition<JavaImplementation>(uri, impl);
InboundWire resourceWire = EasyMock.createMock(InboundWire.class);
EasyMock.expect(resourceWire.getTargetService()).andReturn("result");
EasyMock.replay(resourceWire);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java Fri Feb 2 19:16:15 2007
@@ -21,6 +21,7 @@
import java.lang.reflect.Constructor;
import java.util.HashMap;
import java.util.Map;
+import java.net.URI;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.ScopeContainer;
@@ -56,7 +57,8 @@
OutboundWire wire = EasyMock.createMock(OutboundWire.class);
wire.getInvocationChains();
EasyMock.expectLastCall().andReturn(new HashMap<Operation<?>, OutboundInvocationChain>()).atLeastOnce();
- EasyMock.expect(wire.getReferenceName()).andReturn("target").atLeastOnce();
+ URI uri = URI.create("#target");
+ EasyMock.expect(wire.getUri()).andReturn(uri).atLeastOnce();
EasyMock.expect(wire.isOptimizable()).andReturn(false);
EasyMock.replay(wire);
WireService service = EasyMock.createMock(WireService.class);
@@ -71,7 +73,7 @@
}).atLeastOnce();
EasyMock.replay(service);
configuration.setWireService(service);
- configuration.setName("source");
+ configuration.setName(new URI("source"));
JavaAtomicComponent component = new JavaAtomicComponent(configuration);
component.setScopeContainer(scope);
component.addOutboundWire(wire);
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=502853&r1=502852&r2=502853
==============================================================================
--- 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 Fri Feb 2 19:16:15 2007
@@ -22,6 +22,7 @@
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
+import java.net.URI;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.ScopeContainer;
@@ -43,7 +44,7 @@
Constructor<Foo> ctor = Foo.class.getConstructor();
Field field = Foo.class.getDeclaredField("resource");
PojoConfiguration configuration = new PojoConfiguration();
- configuration.setName("component");
+ configuration.setName(new URI("component"));
configuration.setInstanceFactory(new PojoObjectFactory<Foo>(ctor));
configuration.addResourceSite("bar", field);
JavaAtomicComponent component = new JavaAtomicComponent(configuration);
@@ -69,7 +70,7 @@
ScopeContainer containter = EasyMock.createNiceMock(ScopeContainer.class);
Constructor<FooConstructor> ctor = FooConstructor.class.getConstructor(String.class);
PojoConfiguration configuration = new PojoConfiguration();
- configuration.setName("component");
+ configuration.setName(new URI("component"));
configuration.setInstanceFactory(new PojoObjectFactory<FooConstructor>(ctor));
List<String> ctorNames = new ArrayList<String>();
ctorNames.add("bar");
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=502853&r1=502852&r2=502853
==============================================================================
--- 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 Fri Feb 2 19:16:15 2007
@@ -89,14 +89,14 @@
expectLastCall().andReturn(fooComponent).anyTimes();
replay(parent);
- ComponentDefinition<JavaImplementation> sourceDefinition = createSource("fooClient");
+ ComponentDefinition<JavaImplementation> sourceDefinition = createSource(URI.create("fooClient"));
JavaAtomicComponent clientComponent =
(JavaAtomicComponent) builder.build(parent, sourceDefinition, context);
clientComponent.setScopeContainer(container);
wireService.createWires(clientComponent, sourceDefinition);
container.register(clientComponent);
- Connector connector = new ConnectorImpl(new JDKWireService(), null, scheduler, workContext);
+ Connector connector = new ConnectorImpl(new JDKWireService(), null, null, scheduler, workContext);
connector.connect(clientComponent);
FooClient client = (FooClient) clientComponent.getTargetInstance();
@@ -122,14 +122,14 @@
expectLastCall().andReturn(fooComponent).anyTimes();
replay(parent);
- ComponentDefinition<JavaImplementation> sourceDefinition = createPlainSource("fooPlainClient");
+ ComponentDefinition<JavaImplementation> sourceDefinition = createPlainSource(URI.create("fooPlainClient"));
JavaAtomicComponent clientComponent =
(JavaAtomicComponent) builder.build(parent, sourceDefinition, context);
clientComponent.setScopeContainer(container);
wireService.createWires(clientComponent, sourceDefinition);
container.register(clientComponent);
- Connector connector = new ConnectorImpl(new JDKWireService(), null, scheduler, workContext);
+ Connector connector = new ConnectorImpl(new JDKWireService(), null, null, scheduler, workContext);
connector.connect(clientComponent);
FooPlainClient client = (FooPlainClient) clientComponent.getTargetInstance();
@@ -158,8 +158,8 @@
expectLastCall().andReturn(fooComponent).anyTimes();
replay(parent);
- ComponentDefinition<JavaImplementation> sourceDefinition1 = createSource("fooCleint1");
- ComponentDefinition<JavaImplementation> sourceDefinition2 = createSource("fooCleint2");
+ ComponentDefinition<JavaImplementation> sourceDefinition1 = createSource(URI.create("fooCleint1"));
+ ComponentDefinition<JavaImplementation> sourceDefinition2 = createSource(URI.create("fooCleint2"));
JavaAtomicComponent clientComponent1 =
(JavaAtomicComponent) builder.build(parent, sourceDefinition1, context);
clientComponent1.setScopeContainer(container);
@@ -171,7 +171,7 @@
wireService.createWires(clientComponent2, sourceDefinition2);
container.register(clientComponent2);
- Connector connector = new ConnectorImpl(new JDKWireService(), null, scheduler, workContext);
+ Connector connector = new ConnectorImpl(new JDKWireService(), null, null, scheduler, workContext);
connector.connect(clientComponent1);
connector.connect(clientComponent2);
FooClient client1 = (FooClient) clientComponent1.getTargetInstance();
@@ -195,16 +195,16 @@
ServiceContract<?> contract = registry.introspect(Foo.class);
contract.setCallbackClass(FooCallback.class);
contract.setCallbackName("callback");
- JavaMappedService mappedService = new JavaMappedService("Foo", contract, false, "callback", method);
+ JavaMappedService mappedService = new JavaMappedService(URI.create("Foo"), contract, false, "callback", method);
type.getServices().put("Foo", mappedService);
JavaImplementation impl = new JavaImplementation(FooImpl.class, type);
impl.setComponentType(type);
impl.setImplementationClass(FooImpl.class);
- return new ComponentDefinition<JavaImplementation>("foo", impl);
+ return new ComponentDefinition<JavaImplementation>(URI.create("foo"), impl);
}
- private ComponentDefinition<JavaImplementation> createSource(String name)
+ private ComponentDefinition<JavaImplementation> createSource(URI name)
throws NoSuchMethodException, URISyntaxException, InvalidServiceContractException {
ConstructorDefinition<FooClient> ctorDef =
new ConstructorDefinition<FooClient>(FooClient.class.getConstructor());
@@ -217,10 +217,10 @@
ServiceContract<?> contract = registry.introspect(Foo.class);
contract.setCallbackClass(FooCallback.class);
contract.setCallbackName("callback");
- JavaMappedReference mappedReference = new JavaMappedReference("foo", contract, method);
+ JavaMappedReference mappedReference = new JavaMappedReference(URI.create(name + "#" + "foo"), contract, method);
type.getReferences().put("foo", mappedReference);
ReferenceTarget refTarget = new ReferenceTarget();
- refTarget.setReferenceName("foo");
+ refTarget.setReferenceName(URI.create(name + "#" + "foo"));
refTarget.getTargets().add(new URI("foo"));
JavaImplementation impl = new JavaImplementation(FooClient.class, type);
impl.setComponentType(type);
@@ -230,7 +230,7 @@
return def;
}
- private ComponentDefinition<JavaImplementation> createPlainSource(String name)
+ private ComponentDefinition<JavaImplementation> createPlainSource(URI name)
throws NoSuchMethodException, URISyntaxException, InvalidServiceContractException {
ConstructorDefinition<FooPlainClient> ctorDef =
new ConstructorDefinition<FooPlainClient>(FooPlainClient.class.getConstructor());
@@ -243,10 +243,10 @@
ServiceContract<?> contract = registry.introspect(Foo.class);
contract.setCallbackClass(FooCallback.class);
contract.setCallbackName("callback");
- JavaMappedReference mappedReference = new JavaMappedReference("foo", contract, method);
+ JavaMappedReference mappedReference = new JavaMappedReference(URI.create(name + "#" + "foo"), contract, method);
type.getReferences().put("foo", mappedReference);
ReferenceTarget refTarget = new ReferenceTarget();
- refTarget.setReferenceName("foo");
+ refTarget.setReferenceName(URI.create(name + "#" + "foo"));
refTarget.getTargets().add(new URI("foo"));
JavaImplementation impl = new JavaImplementation(FooPlainClient.class, type);
ComponentDefinition<JavaImplementation> def = new ComponentDefinition<JavaImplementation>(name, impl);
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=502853&r1=502852&r2=502853
==============================================================================
--- 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 Fri Feb 2 19:16:15 2007
@@ -23,6 +23,8 @@
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;
@@ -44,8 +46,8 @@
import junit.framework.TestCase;
import org.apache.tuscany.core.builder.ConnectorImpl;
import org.apache.tuscany.core.component.WorkContextImpl;
-import org.apache.tuscany.core.component.event.CompositeStart;
-import org.apache.tuscany.core.component.event.CompositeStop;
+import org.apache.tuscany.core.component.event.ComponentStart;
+import org.apache.tuscany.core.component.event.ComponentStop;
import org.apache.tuscany.core.component.event.HttpSessionEnd;
import org.apache.tuscany.core.component.event.HttpSessionStart;
import org.apache.tuscany.core.component.event.RequestEnd;
@@ -163,7 +165,7 @@
public void testToCompositeScope() throws Exception {
CompositeScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
- scope.onEvent(new CompositeStart(this, null));
+ scope.onEvent(new ComponentStart(this, null));
final OutboundWire wire = getWire(scope);
Target service = wireService.createProxy(Target.class, wire);
Target target = wireService.createProxy(Target.class, wire);
@@ -171,26 +173,27 @@
service.setString("foo");
assertEquals("foo", service.getString());
assertEquals("foo", target.getString());
- scope.onEvent(new CompositeStop(this, null));
+ scope.onEvent(new ComponentStop(this, null));
scope.stop();
}
private OutboundWire getWire(ScopeContainer scope) throws NoSuchMethodException,
- InvalidServiceContractException, WiringException {
+ InvalidServiceContractException, WiringException,
+ URISyntaxException {
ConnectorImpl connector = new ConnectorImpl();
CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
PojoConfiguration configuration = new PojoConfiguration();
configuration.setInstanceFactory(new PojoObjectFactory<TargetImpl>(TargetImpl.class.getConstructor()));
configuration.setParent(parent);
configuration.setWorkContext(workContext);
- configuration.setName("source");
+ configuration.setName(new URI("source"));
JavaAtomicComponent source = new JavaAtomicComponent(configuration);
source.setScopeContainer(scope);
OutboundWire outboundWire = createOutboundWire(new QualifiedName("target/Target"), Target.class);
outboundWire.setContainer(source);
source.addOutboundWire(outboundWire);
- configuration.setName("target");
+ configuration.setName(new URI("target"));
JavaAtomicComponent target = new JavaAtomicComponent(configuration);
target.setScopeContainer(scope);
InboundWire targetWire = MockFactory.createInboundWire("Target", Target.class);
@@ -215,6 +218,8 @@
wire.setServiceContract(contract);
wire.setTargetName(targetName);
wire.addInvocationChains(createInvocationChains(interfaze));
+ wire.setTargetUri(URI.create(targetName.getPartName() + "#" + targetName.getPortName()));
+ wire.setUri(URI.create("component#ref"));
return wire;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorReferenceTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorReferenceTestCase.java Fri Feb 2 19:16:15 2007
@@ -35,8 +35,7 @@
* @version $Rev$ $Date$
*/
public class ConstructorReferenceTestCase extends TestCase {
-
- ConstructorProcessor processor;
+ private ConstructorProcessor processor;
public void testReference() throws Exception {
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
@@ -45,7 +44,7 @@
processor.visitConstructor(null, ctor, type, null);
JavaMappedReference reference = type.getReferences().get("myRef");
assertTrue(reference.isRequired());
- assertEquals("myRef", reference.getName());
+ assertEquals("#myRef", reference.getUri().toString());
}
public void testTwoReferencesSameType() throws Exception {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicConstructorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicConstructorTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicConstructorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicConstructorTestCase.java Fri Feb 2 19:16:15 2007
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.core.implementation.processor;
+import java.net.URI;
+
import org.osoa.sca.annotations.Property;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Remotable;
@@ -63,7 +65,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
JavaMappedReference ref = new JavaMappedReference();
- ref.setName("foo");
+ ref.setUri(URI.create("#foo"));
ServiceContract contract = new JavaServiceContract(String.class);
ref.setServiceContract(contract);
type.getReferences().put("foo", ref);
@@ -85,7 +87,7 @@
type.getProperties().put("foo", prop);
JavaMappedReference ref = new JavaMappedReference();
- ref.setName("ref");
+ ref.setUri(URI.create("#ref"));
ServiceContract contract = new JavaServiceContract(Foo1.class);
ref.setServiceContract(contract);
type.getReferences().put("ref", ref);
@@ -114,12 +116,12 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
JavaMappedReference ref = new JavaMappedReference();
- ref.setName("ref");
+ ref.setUri(URI.create("#ref"));
ServiceContract contract = new JavaServiceContract(Foo1.class);
ref.setServiceContract(contract);
type.getReferences().put("ref", ref);
JavaMappedReference ref2 = new JavaMappedReference();
- ref2.setName("ref2");
+ ref2.setUri(URI.create("#ref2"));
ref2.setServiceContract(contract);
type.getReferences().put("ref2", ref2);
try {
@@ -261,18 +263,18 @@
}
public static class Foo7 {
- public Foo7(@Property(name = "myProp") String prop) {
+ public Foo7(@Property(name = "myProp")String prop) {
}
}
public static class Foo8 {
- public Foo8(@Reference(name = "myRef") String ref) {
+ public Foo8(@Reference(name = "myRef")String ref) {
}
}
public static class Foo9 {
- public Foo9(@Autowire(name = "myAutowire") String autowire) {
+ public Foo9(@Autowire(name = "myAutowire")String autowire) {
}
}
@@ -284,20 +286,20 @@
public Foo10(String prop) {
}
- public Foo10(@Property(name = "prop1") String prop1, @Property(name = "prop2") String prop2) {
+ public Foo10(@Property(name = "prop1")String prop1, @Property(name = "prop2")String prop2) {
}
}
public static class Foo11 {
- public Foo11(@Property(name = "prop1") String prop, @Baz String baz) {
+ public Foo11(@Property(name = "prop1")String prop, @Baz String baz) {
}
}
public static class Foo12 {
- public Foo12(@Property(name = "prop1") String prop, @Property(name = "prop2") String baz) {
+ public Foo12(@Property(name = "prop1")String prop, @Property(name = "prop2")String baz) {
}
}
@@ -322,8 +324,8 @@
public static final class Foo16 {
public Foo16(@Autowire String param1,
- @Property(name = "foo") String param2,
- @Reference(name = "bar") String param3) {
+ @Property(name = "foo")String param2,
+ @Reference(name = "bar")String param3) {
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org