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/25 02:13:27 UTC
svn commit: r511391 [2/3] - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/binding/local/
core/src/main/java/org/apache/tuscany/core/builder/
core/src/main/java/org/apache/tuscany/core/component/
core/src/main/java/or...
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java Sat Feb 24 17:13:22 2007
@@ -29,7 +29,7 @@
import org.osoa.sca.annotations.Constructor;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -60,7 +60,7 @@
return INCLUDE;
}
- public Include load(CompositeComponent parent, ModelObject object, XMLStreamReader reader,
+ public Include load(Component parent, ModelObject object, XMLStreamReader reader,
DeploymentContext deploymentContext)
throws XMLStreamException, LoaderException {
@@ -100,7 +100,7 @@
return include;
}
- protected CompositeComponentType loadFromSidefile(CompositeComponent parent,
+ protected CompositeComponentType loadFromSidefile(Component parent,
URL url,
DeploymentContext deploymentContext)
throws LoaderException {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java Sat Feb 24 17:13:22 2007
@@ -31,7 +31,7 @@
import org.osoa.sca.annotations.EagerInit;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.loader.ComponentTypeLoader;
import org.apache.tuscany.spi.loader.InvalidConfigurationException;
@@ -71,7 +71,7 @@
loaders.remove(element);
}
- public ModelObject load(CompositeComponent parent,
+ public ModelObject load(Component parent,
ModelObject object,
XMLStreamReader reader,
DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
@@ -84,7 +84,7 @@
return loader.load(parent, object, reader, deploymentContext);
}
- public <MO extends ModelObject> MO load(CompositeComponent parent,
+ public <MO extends ModelObject> MO load(Component parent,
ModelObject object,
URL url,
Class<MO> type,
@@ -144,7 +144,7 @@
}
@SuppressWarnings("unchecked")
- public <I extends Implementation<?>> void loadComponentType(CompositeComponent parent,
+ public <I extends Implementation<?>> void loadComponentType(Component parent,
I implementation,
DeploymentContext deploymentContext)
throws LoaderException {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PolicySetLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PolicySetLoader.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PolicySetLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PolicySetLoader.java Sat Feb 24 17:13:22 2007
@@ -30,7 +30,7 @@
import org.osoa.sca.annotations.Constructor;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderRegistry;
@@ -73,7 +73,7 @@
return POLICYSET;
}
- public PolicySet load(CompositeComponent parent, ModelObject object, XMLStreamReader reader,
+ public PolicySet load(Component parent, ModelObject object, XMLStreamReader reader,
DeploymentContext deploymentContext)
throws XMLStreamException {
assert POLICYSET.equals(reader.getName());
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java Sat Feb 24 17:13:22 2007
@@ -29,7 +29,7 @@
import org.osoa.sca.annotations.Constructor;
import org.w3c.dom.Document;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -69,7 +69,7 @@
return PROPERTY;
}
- public Property<?> load(CompositeComponent parent, ModelObject object, XMLStreamReader reader,
+ public Property<?> load(Component parent, ModelObject object, XMLStreamReader reader,
DeploymentContext ctx)
throws XMLStreamException, LoaderException {
assert PROPERTY.equals(reader.getName());
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java Sat Feb 24 17:13:22 2007
@@ -28,7 +28,7 @@
import org.osoa.sca.annotations.Constructor;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -58,7 +58,7 @@
return REFERENCE;
}
- public ReferenceDefinition load(CompositeComponent parent,
+ public ReferenceDefinition load(Component parent,
ModelObject object, XMLStreamReader reader,
DeploymentContext deploymentContext)
throws XMLStreamException, LoaderException {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java Sat Feb 24 17:13:22 2007
@@ -30,7 +30,7 @@
import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -59,7 +59,7 @@
return SERVICE;
}
- public ServiceDefinition load(CompositeComponent parent,
+ public ServiceDefinition load(Component parent,
ModelObject object,
XMLStreamReader reader,
DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java Sat Feb 24 17:13:22 2007
@@ -31,7 +31,7 @@
import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.InvalidWireException;
@@ -59,7 +59,7 @@
return WIRE;
}
- public WireDefinition load(CompositeComponent parent,
+ public WireDefinition load(Component parent,
ModelObject object,
XMLStreamReader reader,
DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java Sat Feb 24 17:13:22 2007
@@ -33,10 +33,10 @@
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.ComponentException;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.RegistrationException;
import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.deployer.Deployer;
+import org.apache.tuscany.spi.event.RuntimeEventListener;
import org.apache.tuscany.spi.idl.InvalidServiceContractException;
import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -58,8 +58,8 @@
import org.apache.tuscany.core.resolver.DefaultAutowireResolver;
import org.apache.tuscany.host.MonitorFactory;
import org.apache.tuscany.host.RuntimeInfo;
-import org.apache.tuscany.host.monitor.FormatterRegistry;
import org.apache.tuscany.host.management.ManagementService;
+import org.apache.tuscany.host.monitor.FormatterRegistry;
import org.apache.tuscany.host.runtime.InitializationException;
import org.apache.tuscany.host.runtime.TuscanyRuntime;
@@ -87,8 +87,8 @@
private ManagementService<?> managementService;
private ComponentManager componentManager;
- private CompositeComponent systemComponent;
- private CompositeComponent tuscanySystem;
+ private Component systemComponent;
+ private Component tuscanySystem;
private AutowireResolver resolver;
private JavaInterfaceProcessorRegistry interfaceProcessorRegistry;
@@ -193,8 +193,10 @@
for (Component component : components) {
component.start();
}
- CompositeComponent composite = (CompositeComponent) componentManager.getComponent(name);
- composite.onEvent(new ComponentStart(this, name));
+ Component composite = componentManager.getComponent(name);
+ if (composite instanceof RuntimeEventListener) {
+ ((RuntimeEventListener) composite).onEvent(new ComponentStart(this, name));
+ }
}
public void destroy() {
@@ -266,7 +268,7 @@
}
protected Collection<Component> deploySystemScdl(Deployer deployer,
- CompositeComponent parent,
+ Component parent,
URI name,
URL systemScdl,
ClassLoader systemClassLoader)
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/extension/AbstractExtensionDeployer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/extension/AbstractExtensionDeployer.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/extension/AbstractExtensionDeployer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/extension/AbstractExtensionDeployer.java Sat Feb 24 17:13:22 2007
@@ -23,7 +23,7 @@
import java.net.URL;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.Deployer;
/**
@@ -31,7 +31,7 @@
*/
public class AbstractExtensionDeployer {
protected Deployer deployer;
- protected CompositeComponent parent;
+ protected Component parent;
@Autowire
public void setDeployer(Deployer deployer) {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AtomicConnectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AtomicConnectorTestCase.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AtomicConnectorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AtomicConnectorTestCase.java Sat Feb 24 17:13:22 2007
@@ -22,11 +22,11 @@
import org.apache.tuscany.spi.builder.Connector;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Reference;
import org.apache.tuscany.spi.component.ReferenceBinding;
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.component.ServiceBinding;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
import org.apache.tuscany.spi.model.ComponentDefinition;
import org.apache.tuscany.spi.model.ComponentType;
@@ -120,7 +120,7 @@
Reference reference = new ReferenceImpl(TARGET, contract);
reference.addReferenceBinding(binding);
- CompositeComponent component = new CompositeComponentImpl(PARENT);
+ Component component = new CompositeComponentImpl(PARENT);
component.register(reference);
manager.register(component);
@@ -161,7 +161,7 @@
Service service = new ServiceImpl(TARGET, contract);
service.addServiceBinding(binding);
- CompositeComponent component = new CompositeComponentImpl(PARENT);
+ Component component = new CompositeComponentImpl(PARENT);
component.register(service);
manager.register(component);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryNoBindingsTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryNoBindingsTestCase.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryNoBindingsTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryNoBindingsTestCase.java Sat Feb 24 17:13:22 2007
@@ -20,15 +20,8 @@
import java.net.URI;
-import junit.framework.TestCase;
-import org.easymock.EasyMock;
-
-import org.apache.tuscany.core.binding.local.LocalBindingBuilder;
-import org.apache.tuscany.core.binding.local.LocalBindingDefinition;
-import org.apache.tuscany.core.binding.local.LocalReferenceBinding;
-import org.apache.tuscany.core.binding.local.LocalServiceBinding;
import org.apache.tuscany.spi.builder.BuilderRegistry;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.Reference;
import org.apache.tuscany.spi.component.ReferenceBinding;
import org.apache.tuscany.spi.component.Service;
@@ -38,12 +31,19 @@
import org.apache.tuscany.spi.model.ReferenceDefinition;
import org.apache.tuscany.spi.model.ServiceDefinition;
+import junit.framework.TestCase;
+import org.apache.tuscany.core.binding.local.LocalBindingBuilder;
+import org.apache.tuscany.core.binding.local.LocalBindingDefinition;
+import org.apache.tuscany.core.binding.local.LocalReferenceBinding;
+import org.apache.tuscany.core.binding.local.LocalServiceBinding;
+import org.easymock.EasyMock;
+
/**
* @version $Rev$ $Date$
*/
public class BuilderRegistryNoBindingsTestCase extends TestCase {
private DeploymentContext deploymentContext;
- private CompositeComponent parent;
+ private Component parent;
private BuilderRegistry registry;
public void testNoServiceBindings() throws Exception {
@@ -80,7 +80,7 @@
protected void setUp() throws Exception {
super.setUp();
deploymentContext = EasyMock.createMock(DeploymentContext.class);
- parent = EasyMock.createNiceMock(CompositeComponent.class);
+ parent = EasyMock.createNiceMock(Component.class);
registry = new BuilderRegistryImpl(null);
registry.register(LocalBindingDefinition.class, new LocalBindingBuilder());
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java Sat Feb 24 17:13:22 2007
@@ -27,7 +27,6 @@
import org.apache.tuscany.spi.builder.ComponentBuilder;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.Component;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Reference;
import org.apache.tuscany.spi.component.ReferenceBinding;
import org.apache.tuscany.spi.component.ScopeContainer;
@@ -58,7 +57,7 @@
private Map<URI, Component> components;
//private BuilderRegistryImpl registry;
- private CompositeComponent parent;
+ private Component parent;
@SuppressWarnings({"unchecked"})
public void testRegistration() throws Exception {
@@ -68,7 +67,7 @@
new ComponentDefinition<CompositeImplementation>(implementation);
componentDefinition.getImplementation().setComponentType(new CompositeComponentType());
- CompositeComponent component = EasyMock.createMock(CompositeComponent.class);
+ Component component = EasyMock.createMock(Component.class);
component.setDefaultPropertyValues(componentDefinition.getPropertyValues());
component.setScopeContainer(scopeContainer);
EasyMock.expect(component.getUri()).andReturn(componentId);
@@ -98,7 +97,7 @@
ServiceBinding binding = EasyMock.createNiceMock(ServiceBinding.class);
EasyMock.replay(binding);
BindingBuilder<MockBindingDefinition> builder = EasyMock.createMock(BindingBuilder.class);
- EasyMock.expect(builder.build(EasyMock.isA(CompositeComponent.class),
+ EasyMock.expect(builder.build(EasyMock.isA(Component.class),
EasyMock.isA(ServiceDefinition.class),
EasyMock.isA(MockBindingDefinition.class),
EasyMock.isA(DeploymentContext.class))).andReturn(binding).times(2);
@@ -118,7 +117,7 @@
ReferenceBinding binding = EasyMock.createNiceMock(ReferenceBinding.class);
EasyMock.replay(binding);
BindingBuilder<MockBindingDefinition> builder = EasyMock.createMock(BindingBuilder.class);
- EasyMock.expect(builder.build(EasyMock.isA(CompositeComponent.class),
+ EasyMock.expect(builder.build(EasyMock.isA(Component.class),
EasyMock.isA(ReferenceDefinition.class),
EasyMock.isA(MockBindingDefinition.class),
EasyMock.isA(DeploymentContext.class))).andReturn(binding).times(2);
@@ -142,7 +141,7 @@
AtomicComponent component = EasyMock.createNiceMock(AtomicComponent.class);
EasyMock.replay(component);
ComponentBuilder<FooImplementation> builder = EasyMock.createMock(ComponentBuilder.class);
- EasyMock.expect(builder.build(EasyMock.isA(CompositeComponent.class),
+ EasyMock.expect(builder.build(EasyMock.isA(Component.class),
EasyMock.isA(ComponentDefinition.class),
EasyMock.isA(DeploymentContext.class))).andReturn(component);
EasyMock.replay(builder);
@@ -165,13 +164,13 @@
protected void setUp() throws Exception {
super.setUp();
deploymentContext = EasyMock.createMock(DeploymentContext.class);
- parent = EasyMock.createNiceMock(CompositeComponent.class);
+ parent = EasyMock.createNiceMock(Component.class);
scopeContainer = EasyMock.createMock(ScopeContainer.class);
components = EasyMock.createMock(Map.class);
}
private class MockBuilder implements ComponentBuilder<CompositeImplementation> {
- public Component build(CompositeComponent parent,
+ public Component build(Component parent,
ComponentDefinition componentDefinition,
DeploymentContext deploymentContext) throws BuilderConfigException {
return null;
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ReferenceConnectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ReferenceConnectorTestCase.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ReferenceConnectorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ReferenceConnectorTestCase.java Sat Feb 24 17:13:22 2007
@@ -22,9 +22,9 @@
import org.apache.tuscany.spi.builder.WiringException;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Reference;
import org.apache.tuscany.spi.component.ReferenceBinding;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
import org.apache.tuscany.spi.model.BindingDefinition;
import org.apache.tuscany.spi.model.Operation;
@@ -68,7 +68,7 @@
Reference reference = new ReferenceImpl(SOURCE, contract);
reference.addReferenceBinding(binding);
- CompositeComponent component = new CompositeComponentImpl(PARENT);
+ Component component = new CompositeComponentImpl(PARENT);
component.register(reference);
manager.register(component);
@@ -104,7 +104,7 @@
Reference reference = new ReferenceImpl(SOURCE, contract);
reference.addReferenceBinding(binding);
- CompositeComponent component = new CompositeComponentImpl(PARENT);
+ Component component = new CompositeComponentImpl(PARENT);
component.register(reference);
ReferenceBinding refBinding = EasyMock.createMock(ReferenceBinding.class);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ServiceConnectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ServiceConnectorTestCase.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ServiceConnectorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ServiceConnectorTestCase.java Sat Feb 24 17:13:22 2007
@@ -22,11 +22,11 @@
import org.apache.tuscany.spi.builder.WiringException;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.component.ServiceBinding;
import org.apache.tuscany.spi.component.Reference;
import org.apache.tuscany.spi.component.ReferenceBinding;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
import org.apache.tuscany.spi.model.BindingDefinition;
import org.apache.tuscany.spi.model.Operation;
@@ -68,7 +68,7 @@
Service service = new ServiceImpl(SOURCE, contract);
service.addServiceBinding(binding);
- CompositeComponent component = new CompositeComponentImpl(PARENT);
+ Component component = new CompositeComponentImpl(PARENT);
component.register(service);
manager.register(component);
@@ -101,7 +101,7 @@
Service service = new ServiceImpl(SOURCE, contract);
service.addServiceBinding(binding);
- CompositeComponent component = new CompositeComponentImpl(PARENT);
+ Component component = new CompositeComponentImpl(PARENT);
component.register(service);
ReferenceBinding refBinding = EasyMock.createMock(ReferenceBinding.class);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java Sat Feb 24 17:13:22 2007
@@ -19,7 +19,7 @@
package org.apache.tuscany.core.component.scope;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.WorkContext;
import junit.framework.TestCase;
@@ -33,8 +33,8 @@
public void testRemoteComponent() throws Exception {
WorkContext ctx = new WorkContextImpl();
- CompositeComponent component = EasyMock.createNiceMock(CompositeComponent.class);
- CompositeComponent component2 = EasyMock.createNiceMock(CompositeComponent.class);
+ Component component = EasyMock.createNiceMock(Component.class);
+ Component component2 = EasyMock.createNiceMock(Component.class);
ctx.setRemoteComponent(component);
assertEquals(component, ctx.getRemoteComponent());
ctx.setRemoteComponent(component2);
@@ -141,7 +141,7 @@
public void testCurrentRemoteComponentDoesNotPropagateToChildThread() throws InterruptedException {
// NOTE should behaviour be to propagate?
WorkContext context = new WorkContextImpl();
- context.setRemoteComponent(EasyMock.createNiceMock(CompositeComponent.class));
+ context.setRemoteComponent(EasyMock.createNiceMock(Component.class));
TestCurrentRemoteComponentChildThread t = new TestCurrentRemoteComponentChildThread(context);
t.start();
t.join();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingInterceptorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingInterceptorTestCase.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingInterceptorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingInterceptorTestCase.java Sat Feb 24 17:13:22 2007
@@ -24,7 +24,6 @@
import java.util.Map;
import org.apache.tuscany.spi.component.Component;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.databinding.Mediator;
import org.apache.tuscany.spi.model.DataType;
import org.apache.tuscany.spi.model.Operation;
@@ -71,7 +70,7 @@
new DataType<DataType>("idl:output", Object.class, operation2.getOutputType());
Wire outboundWire = EasyMock.createMock(Wire.class);
- CompositeComponent composite = EasyMock.createMock(CompositeComponent.class);
+ Component composite = EasyMock.createMock(Component.class);
Component component = EasyMock.createMock(Component.class);
EasyMock.replay(outboundWire, composite, component);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorTestCase.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorTestCase.java Sat Feb 24 17:13:22 2007
@@ -27,7 +27,6 @@
import java.util.Map;
import org.apache.tuscany.spi.component.Component;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.databinding.Mediator;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.model.DataType;
@@ -58,7 +57,7 @@
Wire outboundWire = createMock(Wire.class);
Component component = createMock(Component.class);
- CompositeComponent composite = createMock(CompositeComponent.class);
+ Component composite = createMock(Component.class);
Map<Operation<?>, InvocationChain> outboundChains =
new HashMap<Operation<?>, InvocationChain>();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java Sat Feb 24 17:13:22 2007
@@ -26,7 +26,6 @@
import org.apache.tuscany.spi.builder.Connector;
import org.apache.tuscany.spi.component.Component;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -72,7 +71,7 @@
@SuppressWarnings("unchecked")
public void testBoot1Load() throws LoaderException {
- CompositeComponent parent = createNiceMock(CompositeComponent.class);
+ Component parent = createNiceMock(Component.class);
URI uri = URI.create("sca://parent");
EasyMock.expect(parent.getUri()).andReturn(uri).atLeastOnce();
EasyMock.replay(parent);
@@ -123,7 +122,7 @@
public void testBoot1Deployment() throws Exception {
URL scdl = BootstrapDeployerTestCase.class.getResource("boot1.scdl");
implementation.setScdlLocation(scdl);
- CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
+ Component parent = EasyMock.createMock(Component.class);
replay(parent);
// load the boot1 file using the bootstrap deployer
componentDefinition.setUri(URI.create("sca://parent/simple"));
@@ -135,7 +134,7 @@
public void testBoot2Deployment() throws Exception {
URL scdl = BootstrapDeployerTestCase.class.getResource("boot2.scdl");
implementation.setScdlLocation(scdl);
- CompositeComponent parent = createNiceMock(CompositeComponent.class);
+ Component parent = createNiceMock(Component.class);
replay(parent);
// load the boot2 file using the bootstrap deployer
componentDefinition.setUri(URI.create("newDeployer"));
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/IntrospectionRegistryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/IntrospectionRegistryTestCase.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/IntrospectionRegistryTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/IntrospectionRegistryTestCase.java Sat Feb 24 17:13:22 2007
@@ -18,11 +18,11 @@
*/
package org.apache.tuscany.core.implementation;
-import java.lang.reflect.Method;
-import java.lang.reflect.Field;
import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.implementation.java.ImplementationProcessor;
import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
@@ -59,32 +59,32 @@
public void testWalk() throws Exception {
IntrospectionRegistryImpl registry = new IntrospectionRegistryImpl(monitor);
ImplementationProcessor processor = EasyMock.createMock(ImplementationProcessor.class);
- processor.visitClass(EasyMock.isA(CompositeComponent.class),
+ processor.visitClass(EasyMock.isA(Component.class),
EasyMock.eq(Bar.class),
EasyMock.isA(PojoComponentType.class),
EasyMock.isA(DeploymentContext.class));
- processor.visitConstructor(EasyMock.isA(CompositeComponent.class),
+ processor.visitConstructor(EasyMock.isA(Component.class),
EasyMock.isA(Constructor.class),
EasyMock.isA(PojoComponentType.class),
EasyMock.isA(DeploymentContext.class));
- processor.visitMethod(EasyMock.isA(CompositeComponent.class),
+ processor.visitMethod(EasyMock.isA(Component.class),
EasyMock.isA(Method.class),
EasyMock.isA(PojoComponentType.class),
EasyMock.isA(DeploymentContext.class));
- processor.visitField(EasyMock.isA(CompositeComponent.class),
+ processor.visitField(EasyMock.isA(Component.class),
EasyMock.isA(Field.class),
EasyMock.isA(PojoComponentType.class),
EasyMock.isA(DeploymentContext.class));
- processor.visitSuperClass(EasyMock.isA(CompositeComponent.class),
+ processor.visitSuperClass(EasyMock.isA(Component.class),
EasyMock.isA(Class.class),
EasyMock.isA(PojoComponentType.class),
EasyMock.isA(DeploymentContext.class));
- processor.visitEnd(EasyMock.isA(CompositeComponent.class),
+ processor.visitEnd(EasyMock.isA(Component.class),
EasyMock.isA(Class.class),
EasyMock.isA(PojoComponentType.class),
EasyMock.isA(DeploymentContext.class));
- // mock.expects(once()).method("visitClass");
+ // mock.expects(once()).method("visitClass");
// mock.expects(once()).method("visitMethod");
// mock.expects(once()).method("visitField");
// mock.expects(once()).method("visitConstructor");
@@ -92,7 +92,7 @@
// mock.expects(once()).method("visitEnd");
EasyMock.replay(processor);
registry.registerProcessor(processor);
- registry.introspect(EasyMock.createNiceMock(CompositeComponent.class),
+ registry.introspect(EasyMock.createNiceMock(Component.class),
Bar.class,
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>(),
EasyMock.createNiceMock(DeploymentContext.class));
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=511391&r1=511390&r2=511391
==============================================================================
--- 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 Sat Feb 24 17:13:22 2007
@@ -23,7 +23,6 @@
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.Component;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.ScopeContainerMonitor;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
@@ -79,10 +78,10 @@
builderRegistry.register(LocalBindingDefinition.class, new LocalBindingBuilder());
builder.setBuilderRegistry(builderRegistry);
- CompositeComponent component =
- (CompositeComponent) builder.build(null, createTopComponentDef(), deploymentContext);
+ Component component =
+ builder.build(null, createTopComponentDef(), deploymentContext);
Map<URI, Component> components = deploymentContext.getComponents();
- CompositeComponent sourceComponent = (CompositeComponent) components.get(SOURCE_COMPONENT);
+ Component sourceComponent = components.get(SOURCE_COMPONENT);
assertNotNull(sourceComponent.getService("InnerSourceService"));
AtomicComponent innerSourceComponent = (AtomicComponent) components.get(INNER_SOURCE_COMPONENT);
assertNotNull(innerSourceComponent);
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=511391&r1=511390&r2=511391
==============================================================================
--- 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 Sat Feb 24 17:13:22 2007
@@ -20,7 +20,7 @@
import java.net.URI;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.Reference;
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.event.Event;
@@ -41,26 +41,26 @@
public class CompositeComponentImplTestCase extends TestCase {
public void testGetScope() {
- CompositeComponent composite = new CompositeComponentImpl(URI.create("parent"), null);
+ Component composite = new CompositeComponentImpl(URI.create("parent"), null);
Assert.assertEquals(Scope.SYSTEM, composite.getScope());
}
public void testRegisterService() throws Exception {
- CompositeComponent composite = new CompositeComponentImpl(URI.create("parent"), null);
+ Component composite = new CompositeComponentImpl(URI.create("parent"), null);
Service service = new ServiceImpl(URI.create("foo#service"), null);
composite.register(service);
assertNotNull(composite.getService("service"));
}
public void testRegisterReference() throws Exception {
- CompositeComponent composite = new CompositeComponentImpl(URI.create("parent"), null);
+ Component composite = new CompositeComponentImpl(URI.create("parent"), null);
Reference reference = new ReferenceImpl(URI.create("foo#reference"), null);
composite.register(reference);
assertNotNull(composite.getReference("reference"));
}
public void testOnEvent() {
- CompositeComponent composite = new CompositeComponentImpl(URI.create("parent"), null);
+ CompositeComponentImpl composite = new CompositeComponentImpl(URI.create("parent"), null);
Event event = new Event() {
public Object getSource() {
return null;
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=511391&r1=511390&r2=511391
==============================================================================
--- 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 Sat Feb 24 17:13:22 2007
@@ -20,10 +20,10 @@
import java.net.URI;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.DuplicateNameException;
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.component.Reference;
+import org.apache.tuscany.spi.component.Component;
import junit.framework.TestCase;
import org.easymock.EasyMock;
@@ -36,7 +36,7 @@
public class DuplicateRegistrationTestCase extends TestCase {
public void testDuplicateServiceRegistration() throws Exception {
- CompositeComponent parent = new CompositeComponentImpl(URI.create("parent"), null);
+ Component parent = new CompositeComponentImpl(URI.create("parent"), null);
parent.start();
Service service1 = EasyMock.createMock(Service.class);
@@ -60,7 +60,7 @@
}
public void testDuplicateReferenceRegistration() throws Exception {
- CompositeComponent parent = new CompositeComponentImpl(URI.create("parent"), null);
+ Component parent = new CompositeComponentImpl(URI.create("parent"), null);
parent.start();
Reference reference1 = EasyMock.createMock(Reference.class);
@@ -85,7 +85,7 @@
}
public void testDuplicateServiceReferenceRegistration() throws Exception {
- CompositeComponent parent = new CompositeComponentImpl(URI.create("parent"), null);
+ Component parent = new CompositeComponentImpl(URI.create("parent"), null);
parent.start();
Service service1 = EasyMock.createMock(Service.class);
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=511391&r1=511390&r2=511391
==============================================================================
--- 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 Sat Feb 24 17:13:22 2007
@@ -22,7 +22,7 @@
import java.net.URI;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.implementation.java.ConstructorDefinition;
import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
@@ -46,7 +46,7 @@
* @version $Rev$ $Date$
*/
public class SystemComponentBuilderTestCase extends TestCase {
- CompositeComponent parent;
+ Component parent;
DeploymentContext deploymentContext;
SystemComponentBuilder builder = new SystemComponentBuilder();
CompositeScopeContainer container;
@@ -123,7 +123,7 @@
protected void setUp() throws Exception {
super.setUp();
- parent = EasyMock.createNiceMock(CompositeComponent.class);
+ parent = EasyMock.createNiceMock(Component.class);
container = new CompositeScopeContainer(null);
container.start();
deploymentContext = EasyMock.createMock(DeploymentContext.class);
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=511391&r1=511390&r2=511391
==============================================================================
--- 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 Sat Feb 24 17:13:22 2007
@@ -22,7 +22,7 @@
import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.ScopeRegistry;
import org.apache.tuscany.spi.deployer.DeploymentContext;
@@ -46,7 +46,7 @@
*/
public class JavaBuilderPropertyTestCase extends TestCase {
private DeploymentContext deploymentContext;
- private CompositeComponent parent;
+ private Component parent;
private ScopeRegistry registry;
@SuppressWarnings("unchecked")
@@ -99,7 +99,7 @@
super.setUp();
deploymentContext = EasyMock.createMock(DeploymentContext.class);
EasyMock.replay(deploymentContext);
- parent = EasyMock.createNiceMock(CompositeComponent.class);
+ parent = EasyMock.createNiceMock(Component.class);
ScopeContainer mockContainer = EasyMock.createNiceMock(ScopeContainer.class);
EasyMock.replay(mockContainer);
registry = EasyMock.createMock(ScopeRegistry.class);
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=511391&r1=511390&r2=511391
==============================================================================
--- 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 Sat Feb 24 17:13:22 2007
@@ -21,8 +21,9 @@
import java.lang.reflect.Field;
import java.net.URI;
-import org.apache.tuscany.core.component.WorkContextImpl;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.osoa.sca.annotations.ConversationID;
+
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.ScopeRegistry;
import org.apache.tuscany.spi.component.WorkContext;
@@ -32,8 +33,8 @@
import org.apache.tuscany.spi.model.Scope;
import junit.framework.TestCase;
+import org.apache.tuscany.core.component.WorkContextImpl;
import org.easymock.EasyMock;
-import org.osoa.sca.annotations.ConversationID;
/**
* @version $Rev: 473859 $ $Date: 2006-11-11 22:31:55 -0500 (Sat, 11 Nov 2006) $
@@ -51,18 +52,18 @@
WorkContext workContext = new WorkContextImpl();
workContext.setIdentifier(Scope.CONVERSATION, "convID");
builder.setWorkContext(workContext);
-
+
ConstructorDefinition<Foo> ctorDef = new ConstructorDefinition<Foo>(Foo.class.getConstructor());
PojoComponentType type = new PojoComponentType();
Field field = Foo.class.getDeclaredField("conversationID");
type.setConversationIDMember(field);
type.setImplementationScope(Scope.STATELESS);
type.setConstructorDefinition(ctorDef);
-
+
JavaImplementation impl = new JavaImplementation(Foo.class, type);
URI uri = URI.create("foo");
ComponentDefinition<JavaImplementation> definition = new ComponentDefinition<JavaImplementation>(uri, impl);
- CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
+ Component parent = EasyMock.createMock(Component.class);
JavaAtomicComponent component = (JavaAtomicComponent) builder.build(parent, definition, null);
Foo foo = (Foo) component.createInstance();
assertEquals("convID", foo.conversationID);
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=511391&r1=511390&r2=511391
==============================================================================
--- 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 Sat Feb 24 17:13:22 2007
@@ -4,8 +4,8 @@
import java.net.URI;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.ScopeContainer;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.implementation.java.ConstructorDefinition;
@@ -32,7 +32,7 @@
public class JavaComponentBuilderMetadataTestCase extends TestCase {
private DeploymentContext deploymentContext;
private Constructor<SourceImpl> constructor;
- private CompositeComponent parent;
+ private Component parent;
private PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type;
private ComponentDefinition<JavaImplementation> definition;
private ScopeContainer scopeContainer;
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=511391&r1=511390&r2=511391
==============================================================================
--- 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 Sat Feb 24 17:13:22 2007
@@ -25,8 +25,8 @@
import java.util.Map;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.ScopeContainer;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.implementation.java.ConstructorDefinition;
@@ -58,7 +58,7 @@
private DeploymentContext deploymentContext;
private ProxyService proxyService;
private Constructor<SourceImpl> constructor;
- private CompositeComponent parent;
+ private Component parent;
private Wire wire;
private ScopeContainer scopeContainer;
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=511391&r1=511390&r2=511391
==============================================================================
--- 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 Sat Feb 24 17:13:22 2007
@@ -20,7 +20,7 @@
import java.net.URI;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.ScopeRegistry;
import org.apache.tuscany.spi.host.ResourceHost;
@@ -64,7 +64,7 @@
EasyMock.expect(resourceWire.getTargetInstance()).andReturn("result");
EasyMock.replay(resourceWire);
- CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
+ Component parent = EasyMock.createMock(Component.class);
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/JavaComponentTypeLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentTypeLoaderTestCase.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentTypeLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentTypeLoaderTestCase.java Sat Feb 24 17:13:22 2007
@@ -20,7 +20,7 @@
import java.net.URL;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.implementation.java.IntrospectionRegistry;
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
@@ -39,7 +39,7 @@
public void testPojoComponentTypeCreatedForIntrospection() throws Exception {
IntrospectionRegistry registry = EasyMock.createMock(IntrospectionRegistry.class);
registry.introspect(
- (CompositeComponent) EasyMock.isNull(),
+ (Component) EasyMock.isNull(),
(Class) EasyMock.isNull(),
EasyMock.isA(PojoComponentType.class),
(DeploymentContext) EasyMock.isNull());
@@ -58,7 +58,7 @@
public void testPojoComponentTypeCreatedForSideFileLoadAndReturned() throws Exception {
LoaderRegistry registry = EasyMock.createMock(LoaderRegistry.class);
registry.load(
- (CompositeComponent) EasyMock.isNull(),
+ (Component) EasyMock.isNull(),
EasyMock.isA(PojoComponentType.class),
(URL) EasyMock.isNull(),
EasyMock.eq(PojoComponentType.class),
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ContextProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ContextProcessorTestCase.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ContextProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ContextProcessorTestCase.java Sat Feb 24 17:13:22 2007
@@ -25,7 +25,7 @@
import org.osoa.sca.RequestContext;
import org.osoa.sca.annotations.Context;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
@@ -40,7 +40,7 @@
*/
public class ContextProcessorTestCase extends TestCase {
private ContextProcessor processor;
- private CompositeComponent composite;
+ private Component composite;
// FIXME: resurrect to test ComponentContext injection
/*
@@ -149,7 +149,7 @@
super.setUp();
processor = new ContextProcessor();
processor.setWorkContext(EasyMock.createNiceMock(WorkContext.class));
- composite = EasyMock.createNiceMock(CompositeComponent.class);
+ composite = EasyMock.createNiceMock(Component.class);
}
private class Foo {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ScopeProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ScopeProcessorTestCase.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ScopeProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ScopeProcessorTestCase.java Sat Feb 24 17:13:22 2007
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.core.implementation.processor;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
import org.apache.tuscany.spi.implementation.java.JavaMappedService;
@@ -34,7 +34,7 @@
*/
public class ScopeProcessorTestCase extends TestCase {
- CompositeComponent parent;
+ Component parent;
public void testCompositeScope() throws ProcessingException {
ScopeProcessor processor = new ScopeProcessor();
@@ -95,7 +95,7 @@
protected void setUp() throws Exception {
super.setUp();
- parent = EasyMock.createNiceMock(CompositeComponent.class);
+ parent = EasyMock.createNiceMock(Component.class);
}
@org.osoa.sca.annotations.Scope("COMPOSITE")
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=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderResourceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderResourceTestCase.java Sat Feb 24 17:13:22 2007
@@ -4,7 +4,7 @@
import java.net.URI;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.ScopeRegistry;
import org.apache.tuscany.spi.deployer.DeploymentContext;
@@ -60,7 +60,7 @@
EasyMock.expect(wire.getTargetInstance()).andReturn("result");
EasyMock.replay(wire);
- CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
+ Component parent = EasyMock.createMock(Component.class);
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/implementation/system/loader/SystemComponentTypeLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoaderTestCase.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoaderTestCase.java Sat Feb 24 17:13:22 2007
@@ -18,7 +18,8 @@
*/
package org.apache.tuscany.core.implementation.system.loader;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
+import org.apache.tuscany.spi.implementation.java.ImplementationProcessorService;
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import org.apache.tuscany.spi.implementation.java.ProcessingException;
import org.apache.tuscany.spi.model.Property;
@@ -31,7 +32,6 @@
import org.apache.tuscany.core.implementation.processor.ConstructorProcessor;
import org.apache.tuscany.core.implementation.processor.DestroyProcessor;
import org.apache.tuscany.core.implementation.processor.HeuristicPojoProcessor;
-import org.apache.tuscany.spi.implementation.java.ImplementationProcessorService;
import org.apache.tuscany.core.implementation.processor.ImplementationProcessorServiceImpl;
import org.apache.tuscany.core.implementation.processor.InitProcessor;
import org.apache.tuscany.core.implementation.processor.PropertyProcessor;
@@ -51,7 +51,7 @@
private SystemComponentTypeLoader loader;
public void testIntrospectUnannotatedClass() throws ProcessingException {
- CompositeComponent parent = EasyMock.createNiceMock(CompositeComponent.class);
+ Component parent = EasyMock.createNiceMock(Component.class);
SystemImplementation impl = new SystemImplementation(BasicInterfaceImpl.class);
PojoComponentType<?, ?, ?> componentType = loader.loadByIntrospection(parent, impl, null);
ServiceDefinition service = componentType.getServices().get(BasicInterface.class.getSimpleName());
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=511391&r1=511390&r2=511391
==============================================================================
--- 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 Sat Feb 24 17:13:22 2007
@@ -21,7 +21,7 @@
import java.net.URI;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.implementation.java.ConstructorDefinition;
import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
@@ -44,7 +44,7 @@
public class SystemBuilderPropertyTestCase extends TestCase {
DeploymentContext deploymentContext;
- CompositeComponent parent;
+ Component parent;
@SuppressWarnings("unchecked")
public void testPropertyHandling() throws Exception {
@@ -70,7 +70,7 @@
protected void setUp() throws Exception {
super.setUp();
deploymentContext = EasyMock.createMock(DeploymentContext.class);
- parent = EasyMock.createNiceMock(CompositeComponent.class);
+ parent = EasyMock.createNiceMock(Component.class);
}
private static class Foo {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java Sat Feb 24 17:13:22 2007
@@ -19,15 +19,15 @@
package org.apache.tuscany.core.loader;
import java.net.URI;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
import static org.osoa.sca.Constants.SCA_NS;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import org.apache.tuscany.spi.loader.LoaderRegistry;
@@ -50,7 +50,7 @@
private XMLStreamReader reader;
private ServiceDefinition service;
private ReferenceDefinition reference;
- private CompositeComponent parent;
+ private Component parent;
private DeploymentContext ctx;
public void testNoServiceBinding() throws Exception {
@@ -66,7 +66,7 @@
protected void setUp() throws Exception {
super.setUp();
URI componentId = URI.create("sca://localhost/parent/");
- parent = EasyMock.createMock(CompositeComponent.class);
+ parent = EasyMock.createMock(Component.class);
EasyMock.expect(parent.getUri()).andReturn(URI.create("parent"));
EasyMock.replay(parent);
service = new ServiceDefinition();
@@ -79,13 +79,13 @@
type.add(reference);
JavaImplementation impl = new JavaImplementation(null, type);
LoaderRegistry registry = EasyMock.createMock(LoaderRegistry.class);
- EasyMock.expect(registry.load(EasyMock.isA(CompositeComponent.class),
+ EasyMock.expect(registry.load(EasyMock.isA(Component.class),
(ModelObject) EasyMock.isNull(),
EasyMock.isA(XMLStreamReader.class),
- EasyMock.isA(DeploymentContext.class))).andReturn(impl);
- registry.loadComponentType(EasyMock.isA(CompositeComponent.class),
+ EasyMock.isA(DeploymentContext.class))).andReturn(impl);
+ registry.loadComponentType(EasyMock.isA(Component.class),
EasyMock.isA(Implementation.class),
- EasyMock.isA(DeploymentContext.class));
+ EasyMock.isA(DeploymentContext.class));
EasyMock.replay(registry);
loader = new ComponentLoader(registry, null);
reader = EasyMock.createMock(XMLStreamReader.class);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoReferenceTestCase.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoReferenceTestCase.java Sat Feb 24 17:13:22 2007
@@ -10,7 +10,7 @@
import static org.osoa.sca.Constants.SCA_NS;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -36,7 +36,7 @@
private static final String NAME = "testComponent";
private ComponentLoader loader;
private XMLStreamReader reader;
- private CompositeComponent parent;
+ private Component parent;
private DeploymentContext ctx;
/**
@@ -75,16 +75,16 @@
EasyMock.expect(reader.next()).andReturn(XMLStreamConstants.END_ELEMENT);
EasyMock.replay(reader);
LoaderRegistry mockRegistry = EasyMock.createMock(LoaderRegistry.class);
- mockRegistry.loadComponentType(EasyMock.isA(CompositeComponent.class),
+ mockRegistry.loadComponentType(EasyMock.isA(Component.class),
EasyMock.isA(Implementation.class),
EasyMock.isA(DeploymentContext.class));
- EasyMock.expect(mockRegistry.load(EasyMock.isA(CompositeComponent.class),
+ EasyMock.expect(mockRegistry.load(EasyMock.isA(Component.class),
(ModelObject) isNull(),
EasyMock.isA(XMLStreamReader.class),
EasyMock.isA(DeploymentContext.class))).andReturn(impl);
EasyMock.replay(mockRegistry);
loader = new ComponentLoader(mockRegistry, null);
- parent = EasyMock.createMock(CompositeComponent.class);
+ parent = EasyMock.createMock(Component.class);
EasyMock.expect(parent.getUri()).andReturn(URI.create("foo"));
EasyMock.replay(parent);
ctx = EasyMock.createMock(DeploymentContext.class);
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=511391&r1=511390&r2=511391
==============================================================================
--- 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 Sat Feb 24 17:13:22 2007
@@ -22,7 +22,7 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -118,7 +118,7 @@
super.setUp();
LoaderRegistry mockRegistry = EasyMock.createMock(LoaderRegistry.class);
loader = new ComponentLoader(mockRegistry, null);
- CompositeComponent parent = EasyMock.createNiceMock(CompositeComponent.class);
+ Component parent = EasyMock.createNiceMock(Component.class);
EasyMock.expect(parent.getUri()).andReturn(componentId).atLeastOnce();
EasyMock.replay(parent);
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=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java Sat Feb 24 17:13:22 2007
@@ -24,17 +24,9 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import junit.framework.TestCase;
-import org.easymock.EasyMock;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.isNull;
-import static org.easymock.EasyMock.replay;
-import org.easymock.IAnswer;
import static org.osoa.sca.Constants.SCA_NS;
-import org.apache.tuscany.core.implementation.java.JavaImplementation;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -48,6 +40,15 @@
import org.apache.tuscany.spi.model.ReferenceDefinition;
import org.apache.tuscany.spi.model.ServiceDefinition;
+import junit.framework.TestCase;
+import org.apache.tuscany.core.implementation.java.JavaImplementation;
+import org.easymock.EasyMock;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.isNull;
+import static org.easymock.EasyMock.replay;
+import org.easymock.IAnswer;
+
/**
* @version $Rev$ $Date$
*/
@@ -61,7 +62,7 @@
private LoaderRegistry mockRegistry;
private PropertyObjectFactory mockPropertyFactory;
private ComponentLoader loader;
- private CompositeComponent parent;
+ private Component parent;
private DeploymentContext ctx;
private URI componentId;
@@ -76,7 +77,7 @@
EasyMock.expect(mockReader.nextTag()).andReturn(0);
EasyMock.expect(mockReader.next()).andReturn(XMLStreamConstants.END_ELEMENT);
EasyMock.replay(mockReader);
- mockRegistry.loadComponentType(EasyMock.isA(CompositeComponent.class),
+ mockRegistry.loadComponentType(EasyMock.isA(Component.class),
EasyMock.isA(Implementation.class),
EasyMock.isA(DeploymentContext.class));
EasyMock.expectLastCall().andStubAnswer(new IAnswer<Object>() {
@@ -88,7 +89,7 @@
}
});
- EasyMock.expect(mockRegistry.load(EasyMock.isA(CompositeComponent.class),
+ EasyMock.expect(mockRegistry.load(EasyMock.isA(Component.class),
(ModelObject) isNull(),
EasyMock.eq(mockReader),
EasyMock.isA(DeploymentContext.class))).andReturn(impl);
@@ -108,7 +109,7 @@
EasyMock.expect(mockReader.next()).andReturn(XMLStreamConstants.END_ELEMENT);
EasyMock.replay(mockReader);
- mockRegistry.loadComponentType(EasyMock.isA(CompositeComponent.class),
+ mockRegistry.loadComponentType(EasyMock.isA(Component.class),
EasyMock.isA(Implementation.class),
EasyMock.isA(DeploymentContext.class));
@@ -120,7 +121,7 @@
return impl;
}
});
- EasyMock.expect(mockRegistry.load(EasyMock.isA(CompositeComponent.class),
+ EasyMock.expect(mockRegistry.load(EasyMock.isA(Component.class),
(ModelObject) isNull(),
EasyMock.eq(mockReader),
EasyMock.isA(DeploymentContext.class))).andReturn(impl);
@@ -163,11 +164,11 @@
EasyMock.expect(mockReader.next()).andReturn(XMLStreamConstants.START_ELEMENT);
EasyMock.expect(mockReader.getName()).andReturn(new QName("foo", "bar"));
EasyMock.replay(mockReader);
- mockRegistry.loadComponentType(EasyMock.isA(CompositeComponent.class),
+ mockRegistry.loadComponentType(EasyMock.isA(Component.class),
EasyMock.isA(Implementation.class),
EasyMock.isA(DeploymentContext.class));
- EasyMock.expect(mockRegistry.load(EasyMock.isA(CompositeComponent.class),
+ EasyMock.expect(mockRegistry.load(EasyMock.isA(Component.class),
(ModelObject) isNull(),
EasyMock.eq(mockReader),
EasyMock.isA(DeploymentContext.class))).andReturn(impl);
@@ -188,7 +189,7 @@
mockRegistry = EasyMock.createMock(LoaderRegistry.class);
mockPropertyFactory = EasyMock.createMock(PropertyObjectFactory.class);
loader = new ComponentLoader(mockRegistry, mockPropertyFactory);
- parent = EasyMock.createNiceMock(CompositeComponent.class);
+ parent = EasyMock.createNiceMock(Component.class);
URI uri = URI.create("foo");
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/ComponentTypeElementLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentTypeElementLoaderTestCase.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentTypeElementLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentTypeElementLoaderTestCase.java Sat Feb 24 17:13:22 2007
@@ -22,7 +22,7 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.namespace.QName;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.loader.LoaderRegistry;
import org.apache.tuscany.spi.model.ComponentType;
@@ -58,7 +58,7 @@
ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> type =
new ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
LoaderRegistry registry = EasyMock.createMock(LoaderRegistry.class);
- EasyMock.expect(registry.load((CompositeComponent) EasyMock.isNull(),
+ EasyMock.expect(registry.load((Component) EasyMock.isNull(),
EasyMock.isA(ComponentType.class),
EasyMock.isA(XMLStreamReader.class),
(DeploymentContext) EasyMock.isNull())).andReturn(type);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/IncludeLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/IncludeLoaderTestCase.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/IncludeLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/IncludeLoaderTestCase.java Sat Feb 24 17:13:22 2007
@@ -35,7 +35,7 @@
import static org.easymock.EasyMock.verify;
import org.osoa.sca.Constants;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
@@ -91,7 +91,7 @@
expect(context.getClassLoader()).andReturn(cl);
expect(context.getComponentId()).andReturn(componentId);
- expect(registry.load((CompositeComponent) isNull(),
+ expect(registry.load((Component) isNull(),
(ModelObject) isNull(),
eq(includeURL),
eq(CompositeComponentType.class),
@@ -117,7 +117,7 @@
expect(context.getClassLoader()).andReturn(cl);
expect(context.getComponentId()).andReturn(componentId);
- expect(registry.load((CompositeComponent) isNull(),
+ expect(registry.load((Component) isNull(),
(ModelObject) isNull(),
eq(includeURL),
eq(CompositeComponentType.class),
@@ -146,7 +146,7 @@
expect(context.getClassLoader()).andReturn(cl);
expect(context.getComponentId()).andReturn(componentId);
- expect(registry.load((CompositeComponent) isNull(),
+ expect(registry.load((Component) isNull(),
(ModelObject) isNull(),
eq(includeURL),
eq(CompositeComponentType.class),
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ReferenceLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ReferenceLoaderTestCase.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ReferenceLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ReferenceLoaderTestCase.java Sat Feb 24 17:13:22 2007
@@ -24,11 +24,9 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import junit.framework.TestCase;
-import org.easymock.EasyMock;
import org.osoa.sca.Constants;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
@@ -40,6 +38,9 @@
import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.model.ServiceDefinition;
+import junit.framework.TestCase;
+import org.easymock.EasyMock;
+
/**
* Verifies loading of a reference definition from an XML-based assembly
*
@@ -52,7 +53,7 @@
private ReferenceLoader loader;
private XMLStreamReader mockReader;
private LoaderRegistry mockRegistry;
- private CompositeComponent parent;
+ private Component parent;
private DeploymentContext ctx;
public void testWithNoInterface() throws LoaderException, XMLStreamException {
@@ -131,7 +132,7 @@
mockReader = EasyMock.createStrictMock(XMLStreamReader.class);
mockRegistry = EasyMock.createMock(LoaderRegistry.class);
loader = new ReferenceLoader(mockRegistry);
- parent = EasyMock.createMock(CompositeComponent.class);
+ parent = EasyMock.createMock(Component.class);
EasyMock.expect(parent.getUri()).andReturn(URI.create(COMPONENT_NAME));
EasyMock.replay(parent);
ctx = EasyMock.createMock(DeploymentContext.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org