You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2006/08/04 18:03:08 UTC
svn commit: r428763 - in /incubator/tuscany/java/sca:
containers/container.spring/src/main/java/org/apache/tuscany/container/spring/
containers/container.spring/src/test/java/org/apache/tuscany/container/spring/
core/src/main/java/org/apache/tuscany/co...
Author: jboynes
Date: Fri Aug 4 09:03:07 2006
New Revision: 428763
URL: http://svn.apache.org/viewvc?rev=428763&view=rev
Log:
Add a map to each composite type to contain its property values
Modified:
incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeBuilder.java
incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeComponent.java
incubator/tuscany/java/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/ReferenceInvocationTestCase.java
incubator/tuscany/java/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/ServiceInvocationTestCase.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultRuntime.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeComponent.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImpl.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemCompositeComponentImpl.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/AutowireResolutionTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/AutowireTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/CompositePropagationTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/DuplicateRegistrationTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemCompositeComponentResolutionTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemCompositeLifecycleTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemObjectRegistrationTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderWireTestCase.java
incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
incubator/tuscany/java/sca/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java
Modified: incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeBuilder.java?rev=428763&r1=428762&r2=428763&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeBuilder.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeBuilder.java Fri Aug 4 09:03:07 2006
@@ -35,7 +35,7 @@
SpringImplementation implementation = componentDefinition.getImplementation();
ConfigurableApplicationContext applicationContext = implementation.getApplicationContext();
SpringCompositeComponent component =
- new SpringCompositeComponent(name, applicationContext, parent);
+ new SpringCompositeComponent(name, applicationContext, parent, null);
CompositeComponentType<BoundServiceDefinition<? extends Binding>,
BoundReferenceDefinition<? extends Binding>,
? extends Property> componentType = implementation.getComponentType();
Modified: incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeComponent.java?rev=428763&r1=428762&r2=428763&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeComponent.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeComponent.java Fri Aug 4 09:03:07 2006
@@ -16,6 +16,7 @@
import org.springframework.context.MessageSourceResolvable;
import org.springframework.context.NoSuchMessageException;
import org.springframework.core.io.Resource;
+import org.w3c.dom.Document;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Reference;
@@ -40,11 +41,13 @@
* @param name the name of the SCA composite
* @param springContext the pre-instantiated Spring applicaiton context
* @param parent the SCA composite parent
+ * @param propertyValues the values of this composite's Properties
*/
public SpringCompositeComponent(String name,
ConfigurableApplicationContext springContext,
- CompositeComponent parent) {
- super(name, parent);
+ CompositeComponent parent,
+ Map<String, Document> propertyValues) {
+ super(name, parent, propertyValues);
SCAApplicationContext scaApplicationContext = new SCAApplicationContext();
springContext.setParent(scaApplicationContext);
this.springContext = springContext;
Modified: incubator/tuscany/java/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/ReferenceInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/ReferenceInvocationTestCase.java?rev=428763&r1=428762&r2=428763&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/ReferenceInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/ReferenceInvocationTestCase.java Fri Aug 4 09:03:07 2006
@@ -21,7 +21,7 @@
public void testInvocation() throws Exception {
ConfigurableApplicationContext ctx = createSpringContext();
- SpringCompositeComponent parent = new SpringCompositeComponent("spring", ctx, null);
+ SpringCompositeComponent parent = new SpringCompositeComponent("spring", ctx, null, null);
parent.start();
TestBean referenceTarget = new TestBeanImpl();
Mock mock = mock(Reference.class);
Modified: incubator/tuscany/java/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/ServiceInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/ServiceInvocationTestCase.java?rev=428763&r1=428762&r2=428763&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/ServiceInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/ServiceInvocationTestCase.java Fri Aug 4 09:03:07 2006
@@ -24,7 +24,7 @@
public class ServiceInvocationTestCase extends TestCase {
public void testInvocation() {
- SpringCompositeComponent context = new SpringCompositeComponent("parent", createSpringContext(), null);
+ SpringCompositeComponent context = new SpringCompositeComponent("parent", createSpringContext(), null, null);
InboundWire<TestBean> inboundWire = ArtifactFactory.createInboundWire("fooService", TestBean.class);
OutboundWire<TestBean> outboundWire = ArtifactFactory.createOutboundWire("fooService", TestBean.class);
ArtifactFactory.terminateWire(outboundWire);
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java?rev=428763&r1=428762&r2=428763&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java Fri Aug 4 09:03:07 2006
@@ -112,10 +112,10 @@
public RuntimeComponent<SystemCompositeComponent<?>> createRuntime() {
DefaultRuntime runtime = new DefaultRuntime();
SystemCompositeComponentImpl systemComponent =
- new SystemCompositeComponentImpl(ComponentNames.TUSCANY_SYSTEM, runtime, runtime);
+ new SystemCompositeComponentImpl(ComponentNames.TUSCANY_SYSTEM, runtime, runtime, null);
runtime.setSystemComponent(systemComponent);
CompositeComponent<?> rootComponent =
- new CompositeComponentImpl(ComponentNames.TUSCANY_ROOT, runtime, runtime);
+ new CompositeComponentImpl(ComponentNames.TUSCANY_ROOT, runtime, runtime, null);
runtime.setRootComponent(rootComponent);
return runtime;
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultRuntime.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultRuntime.java?rev=428763&r1=428762&r2=428763&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultRuntime.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultRuntime.java Fri Aug 4 09:03:07 2006
@@ -16,14 +16,18 @@
*/
package org.apache.tuscany.core.bootstrap;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.w3c.dom.Document;
+
+import org.apache.tuscany.core.implementation.system.component.SystemCompositeComponent;
+import org.apache.tuscany.core.implementation.system.component.SystemCompositeComponentImpl;
import org.apache.tuscany.spi.bootstrap.ComponentNames;
import org.apache.tuscany.spi.bootstrap.RuntimeComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.Deployer;
-import org.apache.tuscany.core.implementation.system.component.SystemCompositeComponent;
-import org.apache.tuscany.core.implementation.system.component.SystemCompositeComponentImpl;
-
/**
* The default implementation of the Tuscany runtime component
*
@@ -35,8 +39,19 @@
private CompositeComponent rootComponent;
private SystemCompositeComponent<?> systemComponent;
+ /**
+ * Initialize a default runtime with an empty set of Property values.
+ */
public DefaultRuntime() {
- super(ComponentNames.TUSCANY_RUNTIME, null, null);
+ this(new HashMap<String, Document>());
+ }
+
+ /**
+ * Initialize a runtime with the a set of properties
+ * @param runtimeProperties Property values for the runtime itself
+ */
+ public DefaultRuntime(Map<String, Document> runtimeProperties) {
+ super(ComponentNames.TUSCANY_RUNTIME, null, null, runtimeProperties);
}
protected void setRootComponent(CompositeComponent rootComponent) {
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeComponent.java?rev=428763&r1=428762&r2=428763&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeComponent.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeComponent.java Fri Aug 4 09:03:07 2006
@@ -7,6 +7,8 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import org.w3c.dom.Document;
+
import org.apache.tuscany.core.component.AutowireComponent;
import org.apache.tuscany.core.component.AutowireResolutionException;
import org.apache.tuscany.core.component.ComponentInitException;
@@ -56,11 +58,17 @@
protected ScopeContainer scopeContainer;
+ /**
+ * @param name the name of the SCA composite
+ * @param parent the SCA composite parent
+ * @param autowireContext the component that should be to resolve autowires
+ * @param propertyValues the values of this composite's Properties
+ */
public AbstractCompositeComponent(String name,
CompositeComponent parent,
- AutowireComponent autowireContext
- ) {
- super(name, parent);
+ AutowireComponent autowireContext,
+ Map<String, Document> propertyValues) {
+ super(name, parent, propertyValues);
this.autowireContext = autowireContext;
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBuilder.java?rev=428763&r1=428762&r2=428763&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBuilder.java Fri Aug 4 09:03:07 2006
@@ -92,7 +92,7 @@
}
String name = componentDefinition.getName();
- CompositeComponentImpl<?> context = new CompositeComponentImpl(name, parent, null);
+ CompositeComponentImpl<?> context = new CompositeComponentImpl(name, parent, null, null);
for (BoundReferenceDefinition<? extends Binding> referenceDefinition : allBoundReferences) {
context.register(builderRegistry.build(context, referenceDefinition, deploymentContext));
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImpl.java?rev=428763&r1=428762&r2=428763&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImpl.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImpl.java Fri Aug 4 09:03:07 2006
@@ -1,5 +1,9 @@
package org.apache.tuscany.core.implementation.composite;
+import java.util.Map;
+
+import org.w3c.dom.Document;
+
import org.apache.tuscany.core.component.AutowireComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
@@ -11,23 +15,28 @@
public class CompositeComponentImpl<T> extends AbstractCompositeComponent<T> {
private String uri;
- public CompositeComponentImpl(String name, CompositeComponent parent, AutowireComponent autowireContext) {
- super(name, parent, autowireContext);
+ public CompositeComponentImpl(String name,
+ CompositeComponent parent,
+ AutowireComponent autowireContext,
+ Map<String, Document> propertyValues) {
+ this(name, null, parent, autowireContext, propertyValues);
}
/**
* Constructor specifying name and URI.
*
- * @param name the name of this Component
- * @param uri the unique identifier for this component
- * @param parent this component's parent
+ * @param name the name of this Component
+ * @param uri the unique identifier for this component
+ * @param parent this component's parent
* @param autowireComponent the component that should be used to resolve autowired references
+ * @param propertyValues this composite's Property values
*/
public CompositeComponentImpl(String name,
String uri,
CompositeComponent parent,
- AutowireComponent autowireComponent) {
- super(name, parent, autowireComponent);
+ AutowireComponent autowireComponent,
+ Map<String, Document> propertyValues) {
+ super(name, parent, autowireComponent, propertyValues);
this.uri = uri;
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java?rev=428763&r1=428762&r2=428763&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java Fri Aug 4 09:03:07 2006
@@ -92,7 +92,7 @@
// create the composite component
String name = componentDefinition.getName();
AutowireComponent autowireContext = getAutowireContext(parent);
- SystemCompositeComponent<?> context = new SystemCompositeComponentImpl(name, parent, autowireContext);
+ SystemCompositeComponent<?> context = new SystemCompositeComponentImpl(name, parent, autowireContext, null);
for (ComponentDefinition<? extends Implementation> childComponentDefinition : allComponents) {
context.register(builderRegistry.build(context, childComponentDefinition, deploymentContext));
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemCompositeComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemCompositeComponentImpl.java?rev=428763&r1=428762&r2=428763&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemCompositeComponentImpl.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemCompositeComponentImpl.java Fri Aug 4 09:03:07 2006
@@ -1,5 +1,9 @@
package org.apache.tuscany.core.implementation.system.component;
+import java.util.Map;
+
+import org.w3c.dom.Document;
+
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.core.component.AutowireComponent;
@@ -16,8 +20,11 @@
public class SystemCompositeComponentImpl<S> extends AbstractCompositeComponent<S>
implements SystemCompositeComponent<S> {
- public SystemCompositeComponentImpl(String name, CompositeComponent parent, AutowireComponent autowireContext) {
- super(name, parent, autowireContext);
+ public SystemCompositeComponentImpl(String name,
+ CompositeComponent parent,
+ AutowireComponent autowireContext,
+ Map<String, Document> propertyValues) {
+ super(name, parent, autowireContext, propertyValues);
}
public <S, I extends S> void registerJavaObject(String name, Class<S> service, I instance)
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTestCase.java?rev=428763&r1=428762&r2=428763&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTestCase.java Fri Aug 4 09:03:07 2006
@@ -8,7 +8,7 @@
public class CompositeComponentTestCase extends TestCase {
public void testSetUri() throws Exception {
- CompositeComponentImpl<?> component = new CompositeComponentImpl("foo", "foo/bar", null, null);
+ CompositeComponentImpl<?> component = new CompositeComponentImpl("foo", "foo/bar", null, null, null);
assertEquals("foo/bar", component.getURI());
}
}
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderTestCase.java?rev=428763&r1=428762&r2=428763&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderTestCase.java Fri Aug 4 09:03:07 2006
@@ -34,7 +34,7 @@
@SuppressWarnings("unchecked")
public void testBuild() throws Exception {
- CompositeComponent parent = new CompositeComponentImpl(null, null, null);
+ CompositeComponent parent = new CompositeComponentImpl(null, null, null, null);
PojoComponentType sourceType = new PojoComponentType();
sourceType.setImplementationScope(Scope.MODULE);
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/AutowireResolutionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/AutowireResolutionTestCase.java?rev=428763&r1=428762&r2=428763&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/AutowireResolutionTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/AutowireResolutionTestCase.java Fri Aug 4 09:03:07 2006
@@ -55,7 +55,7 @@
autowire = mock(AutowireComponent.class);
context = new SystemCompositeComponentImpl("test",
(CompositeComponent) parent.proxy(),
- (AutowireComponent) autowire.proxy());
+ (AutowireComponent) autowire.proxy(), null);
}
public static interface Foo {
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/AutowireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/AutowireTestCase.java?rev=428763&r1=428762&r2=428763&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/AutowireTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/AutowireTestCase.java Fri Aug 4 09:03:07 2006
@@ -19,7 +19,7 @@
* @throws Exception
*/
public void testAtomicAutowire() throws Exception {
- SystemCompositeComponent<?> parent = new SystemCompositeComponentImpl("parent", null, null);
+ SystemCompositeComponent<?> parent = new SystemCompositeComponentImpl("parent", null, null, null);
parent.start();
List<Class<?>> interfaces = new ArrayList<Class<?>>();
@@ -44,7 +44,7 @@
* Tests autowiring to a service context which is wired to an atomic context.
*/
public void testServiceAutowire() throws Exception {
- SystemCompositeComponent<?> parent = new SystemCompositeComponentImpl("parent", null, null);
+ SystemCompositeComponent<?> parent = new SystemCompositeComponentImpl("parent", null, null, null);
parent.start();
List<Class<?>> interfaces = new ArrayList<Class<?>>();
@@ -77,7 +77,7 @@
* Tests autowiring to a reference
*/
public void testReferenceAutowire() throws Exception {
- SystemCompositeComponent<?> parent = new SystemCompositeComponentImpl("parent", null, null);
+ SystemCompositeComponent<?> parent = new SystemCompositeComponentImpl("parent", null, null, null);
parent.start();
Source refSource = new SourceImpl();
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/CompositePropagationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/CompositePropagationTestCase.java?rev=428763&r1=428762&r2=428763&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/CompositePropagationTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/CompositePropagationTestCase.java Fri Aug 4 09:03:07 2006
@@ -34,9 +34,9 @@
protected void setUp() throws Exception {
super.setUp();
- parent = new SystemCompositeComponentImpl("parent", null, null);
- child1 = new SystemCompositeComponentImpl("child1", parent, null);
- child2 = new SystemCompositeComponentImpl("child2", child1, null);
+ parent = new SystemCompositeComponentImpl("parent", null, null, null);
+ child1 = new SystemCompositeComponentImpl("child1", parent, null, null);
+ child2 = new SystemCompositeComponentImpl("child2", child1, null, null);
child1.register(child2);
parent.register(child1);
}
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/DuplicateRegistrationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/DuplicateRegistrationTestCase.java?rev=428763&r1=428762&r2=428763&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/DuplicateRegistrationTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/DuplicateRegistrationTestCase.java Fri Aug 4 09:03:07 2006
@@ -17,7 +17,7 @@
public class DuplicateRegistrationTestCase extends MockObjectTestCase {
public void testDuplicateRegistration() throws Exception {
- SystemCompositeComponent parent = new SystemCompositeComponentImpl(null, null, null);
+ SystemCompositeComponent parent = new SystemCompositeComponentImpl(null, null, null, null);
parent.start();
List<Class<?>> interfaces = new ArrayList<Class<?>>();
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemCompositeComponentResolutionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemCompositeComponentResolutionTestCase.java?rev=428763&r1=428762&r2=428763&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemCompositeComponentResolutionTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemCompositeComponentResolutionTestCase.java Fri Aug 4 09:03:07 2006
@@ -18,7 +18,7 @@
public class SystemCompositeComponentResolutionTestCase extends MockObjectTestCase {
public void testComponentResolution() throws NoSuchMethodException {
- SystemCompositeComponent parent = new SystemCompositeComponentImpl("foo", null, null);
+ SystemCompositeComponent parent = new SystemCompositeComponentImpl("foo", null, null, null);
parent.start();
List<Class<?>> interfaces = new ArrayList<Class<?>>();
interfaces.add(Source.class);
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemCompositeLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemCompositeLifecycleTestCase.java?rev=428763&r1=428762&r2=428763&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemCompositeLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemCompositeLifecycleTestCase.java Fri Aug 4 09:03:07 2006
@@ -16,7 +16,7 @@
public class SystemCompositeLifecycleTestCase extends MockObjectTestCase {
public void testLifecycle() throws Exception {
- SystemCompositeComponent composite = new SystemCompositeComponentImpl("foo", null, null);
+ SystemCompositeComponent composite = new SystemCompositeComponentImpl("foo", null, null, null);
composite.start();
assertNull(composite.getChild("nothtere"));
composite.stop();
@@ -37,7 +37,7 @@
mock.stubs().method("getServiceInterfaces").will(returnValue(interfaces));
SystemAtomicComponent context = (SystemAtomicComponent) mock.proxy();
- SystemCompositeComponent composite = new SystemCompositeComponentImpl("foo", null, null);
+ SystemCompositeComponent composite = new SystemCompositeComponentImpl("foo", null, null, null);
composite.start();
composite.register(context);
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemObjectRegistrationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemObjectRegistrationTestCase.java?rev=428763&r1=428762&r2=428763&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemObjectRegistrationTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemObjectRegistrationTestCase.java Fri Aug 4 09:03:07 2006
@@ -41,7 +41,7 @@
protected void setUp() throws Exception {
super.setUp();
- systemContext = new SystemCompositeComponentImpl(null, null, null);
+ systemContext = new SystemCompositeComponentImpl(null, null, null, null);
systemContext.start();
systemContext.publish(new CompositeStart(this, null));
}
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderWireTestCase.java?rev=428763&r1=428762&r2=428763&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderWireTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderWireTestCase.java Fri Aug 4 09:03:07 2006
@@ -47,7 +47,7 @@
Connector connector = new ConnectorImpl();
SystemComponentBuilder builder = new SystemComponentBuilder();
- SystemCompositeComponent parent = new SystemCompositeComponentImpl(null, null, null);
+ SystemCompositeComponent parent = new SystemCompositeComponentImpl(null, null, null, null);
ComponentDefinition<SystemImplementation> targetComponentDefinition = MockComponentFactory.createTarget();
ComponentDefinition<SystemImplementation> sourceComponentDefinition =
@@ -85,8 +85,8 @@
SystemComponentBuilder builder = new SystemComponentBuilder();
SystemBindingBuilder bindingBuilder = new SystemBindingBuilder();
- SystemCompositeComponent grandParent = new SystemCompositeComponentImpl("grandparent", null, null);
- SystemCompositeComponent parent = new SystemCompositeComponentImpl("parent", grandParent, grandParent);
+ SystemCompositeComponent grandParent = new SystemCompositeComponentImpl("grandparent", null, null, null);
+ SystemCompositeComponent parent = new SystemCompositeComponentImpl("parent", grandParent, grandParent, null);
// create a context in the grandparent that the reference will be autowired to
ComponentDefinition<SystemImplementation> targetComponentDefinition = MockComponentFactory.createTarget();
@@ -131,7 +131,7 @@
SystemComponentBuilder builder = new SystemComponentBuilder();
SystemBindingBuilder bindingBuilder = new SystemBindingBuilder();
- SystemCompositeComponent parent = new SystemCompositeComponentImpl(null, null, null);
+ SystemCompositeComponent parent = new SystemCompositeComponentImpl(null, null, null, null);
BoundServiceDefinition<SystemBinding> serviceDefinition = MockComponentFactory.createBoundService();
ComponentDefinition<SystemImplementation> componentDefinition = MockComponentFactory.createTarget();
Modified: incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java?rev=428763&r1=428762&r2=428763&view=diff
==============================================================================
--- incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java (original)
+++ incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java Fri Aug 4 09:03:07 2006
@@ -6,6 +6,8 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import org.w3c.dom.Document;
+
import org.apache.tuscany.spi.component.AbstractSCAObject;
import org.apache.tuscany.spi.component.ComponentNotFoundException;
import org.apache.tuscany.spi.component.CompositeComponent;
@@ -32,9 +34,11 @@
protected final Map<String, SCAObject> children = new ConcurrentHashMap<String, SCAObject>();
protected final List<Service> services = new ArrayList<Service>();
protected final List<Reference> references = new ArrayList<Reference>();
+ protected final Map<String, Document> propertyValues;
- protected CompositeComponentExtension(String name, CompositeComponent<?> parent) {
+ protected CompositeComponentExtension(String name, CompositeComponent<?> parent, Map<String, Document> propertyValues) {
super(name, parent);
+ this.propertyValues = propertyValues;
}
public Scope getScope() {
Modified: incubator/tuscany/java/sca/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java?rev=428763&r1=428762&r2=428763&view=diff
==============================================================================
--- incubator/tuscany/java/sca/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java Fri Aug 4 09:03:07 2006
@@ -193,7 +193,7 @@
private class Composite<T> extends CompositeComponentExtension<T> {
public Composite() {
- super(null, null);
+ super(null, null, null);
}
public void setScopeContainer(ScopeContainer scopeContainer) {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org