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/02/12 20:01:24 UTC
svn commit: r377217 - in /incubator/tuscany/java/sca:
container.java/src/main/java/org/apache/tuscany/container/java/builder/
container.java/src/test/java/org/apache/tuscany/container/java/mock/
container.java/src/test/java/org/apache/tuscany/container...
Author: jboynes
Date: Sun Feb 12 11:01:22 2006
New Revision: 377217
URL: http://svn.apache.org/viewcvs?rev=377217&view=rev
Log:
convert RuntimeConfigurationBuilder to a service interface (non-conversational)
this will now allow builders to be registers as normal service components rather than
as special members of the RuntimeContext
Modified:
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder.java
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder2.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockAggregateAssemblyFactory.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockSystemAssemblyFactory.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicHttpSessionScopeTestCase.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicModuleScopeTestCase.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicRequestScopeTestCase.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicStatelessScopeTestCase.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/HttpSessionScopeLifecycleTestCase.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ReferenceBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/RuntimeConfigurationBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/AssemblyVisitor.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/HierarchicalBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/TuscanyModuleContextBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/TuscanyModuleComponentContextImpl.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/ProxyFactoryBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentContextBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemExternalServiceBuilder.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemComponentContextBuilderTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/impl/AssemblyVisitorTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/TestBuilder.java
Modified: incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder.java?rev=377217&r1=377216&r2=377217&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder.java (original)
+++ incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder.java Sun Feb 12 11:01:22 2006
@@ -45,14 +45,6 @@
*/
public class JavaComponentContextBuilder implements RuntimeConfigurationBuilder<AggregateContext> {
- private String name;
-
- private final List<Injector> setters = new ArrayList();
-
- private AggregateContext parentContext;
-
- private AssemblyModelObject modelObject;
-
// ----------------------------------
// Constructors
// ----------------------------------
@@ -64,15 +56,7 @@
// Methods
// ----------------------------------
- public void setModelObject(AssemblyModelObject modelObject) {
- this.modelObject = modelObject;
- }
-
- public void setParentContext(AggregateContext context) {
- parentContext = context;
- }
-
- public void build() throws BuilderException {
+ public void build(AssemblyModelObject modelObject, AggregateContext parentContext) throws BuilderException {
if(!(modelObject instanceof SimpleComponent)){
return;
}
@@ -88,7 +72,7 @@
implClass = JavaIntrospectionHelper.loadClass(javaImpl.getClass_());
fields = JavaIntrospectionHelper.getAllFields(implClass);
methods = JavaIntrospectionHelper.getAllUniqueMethods(implClass);
- name = component.getName();
+ String name = component.getName();
Constructor ctr = implClass.getConstructor((Class[]) null);
List<Injector> injectors = new ArrayList();
Modified: incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder2.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder2.java?rev=377217&r1=377216&r2=377217&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder2.java (original)
+++ incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder2.java Sun Feb 12 11:01:22 2006
@@ -59,14 +59,6 @@
*/
public class JavaComponentContextBuilder2 implements RuntimeConfigurationBuilder<AggregateContext> {
- private String name;
-
- private final List<Injector> setters = new ArrayList();
-
- private AggregateContext parentContext;
-
- private AssemblyModelObject modelObject;
-
private ProxyFactoryFactory factory;
@Autowire
@@ -99,15 +91,7 @@
// Methods
// ----------------------------------
- public void setModelObject(AssemblyModelObject modelObject) {
- this.modelObject = modelObject;
- }
-
- public void setParentContext(AggregateContext context) {
- parentContext = context;
- }
-
- public void build() throws BuilderException {
+ public void build(AssemblyModelObject modelObject, AggregateContext parentContext) throws BuilderException {
if (!(modelObject instanceof SimpleComponent)) {
return;
}
@@ -123,7 +107,7 @@
implClass = JavaIntrospectionHelper.loadClass(javaImpl.getClass_());
fields = JavaIntrospectionHelper.getAllFields(implClass);
methods = JavaIntrospectionHelper.getAllUniqueMethods(implClass);
- name = component.getName();
+ String name = component.getName();
Constructor ctr = implClass.getConstructor((Class[]) null);
List<Injector> injectors = new ArrayList();
@@ -203,9 +187,7 @@
config.addTargetProxyFactory(service.getName(), proxyFactory);
configuredService.setProxyFactory(proxyFactory);
// invoke another builder to add interceptors, etc.
- referenceBuilder.setParentContext(parentContext);
- referenceBuilder.setModelObject(configuredService);
- referenceBuilder.build();
+ referenceBuilder.build(configuredService, parentContext);
// add tail interceptor
for (InvocationConfiguration iConfig : (Collection<InvocationConfiguration>) iConfigMap.values()) {
iConfig.addTargetInterceptor(new InvokerInterceptor());
@@ -238,9 +220,7 @@
config.addSourceProxyFactory(reference.getReference().getName(), proxyFactory);
reference.setProxyFactory(proxyFactory);
// invoke another builder to add interceptors, etc.
- referenceBuilder.setParentContext(parentContext);
- referenceBuilder.setModelObject(reference);
- referenceBuilder.build();
+ referenceBuilder.build(reference, parentContext);
Injector injector = createReferenceInjector(reference.getReference().getName(), proxyFactory, fields,
methods);
injectors.add(injector);
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockAggregateAssemblyFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockAggregateAssemblyFactory.java?rev=377217&r1=377216&r2=377217&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockAggregateAssemblyFactory.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockAggregateAssemblyFactory.java Sun Feb 12 11:01:22 2006
@@ -51,13 +51,9 @@
SessionScopeComponentImpl.class, ScopeEnum.SESSION_LITERAL);
SimpleComponent requestComponent = MockAssemblyFactory.createComponent("TestService3",
SessionScopeComponentImpl.class, ScopeEnum.REQUEST_LITERAL);
- builder.setParentContext(ctx);
- builder.setModelObject(component);
- builder.build();
- builder.setModelObject(sessionComponent);
- builder.build();
- builder.setModelObject(requestComponent);
- builder.build();
+ builder.build(component, ctx);
+ builder.build(sessionComponent, ctx);
+ builder.build(requestComponent, ctx);
List<ExtensibleModelObject> configs = new ArrayList();
configs.add(component);
configs.add(sessionComponent);
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockSystemAssemblyFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockSystemAssemblyFactory.java?rev=377217&r1=377216&r2=377217&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockSystemAssemblyFactory.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockSystemAssemblyFactory.java Sun Feb 12 11:01:22 2006
@@ -71,9 +71,7 @@
Component sc = createComponent(name, type, scope, aggregateContext);
SystemComponentContextBuilder builder = new SystemComponentContextBuilder();
- builder.setModelObject(sc);
- builder.setParentContext(aggregateContext);
- builder.build();
+ builder.build(sc, aggregateContext);
return sc;
}
@@ -117,9 +115,7 @@
EntryPoint ep = createEntryPoint(name, refName);
ep.getConfiguredReference().getConfiguredServices().get(0).setPart(component);
SystemEntryPointBuilder builder = new SystemEntryPointBuilder();
- builder.setModelObject(ep);
- builder.setParentContext(aggregateContext);
- builder.build();
+ builder.build(ep, aggregateContext);
return ep;
}
@@ -141,9 +137,7 @@
AggregateContext aggregateContext) {
ExternalService es = createExternalService(name, refName);
SystemExternalServiceBuilder builder = new SystemExternalServiceBuilder();
- builder.setModelObject(es);
- builder.setParentContext(aggregateContext);
- builder.build();
+ builder.build(es, aggregateContext);
return es;
}
@@ -167,16 +161,12 @@
AggregateContext moduleContext) {
SystemComponentContextBuilder componentBuilder = new SystemComponentContextBuilder();
for (Component component : module.getComponents()) {
- componentBuilder.setParentContext(moduleContext);
- componentBuilder.setModelObject(component);
- componentBuilder.build();
+ componentBuilder.build(component, moduleContext);
}
SystemEntryPointBuilder epBuilder = new SystemEntryPointBuilder();
for (EntryPoint ep : module.getEntryPoints()) {
- epBuilder.setParentContext(moduleContext);
- epBuilder.setModelObject(ep);
- epBuilder.build();
+ epBuilder.build(ep, moduleContext);
}
List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
for (Component component : module.getComponents()) {
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicHttpSessionScopeTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicHttpSessionScopeTestCase.java?rev=377217&r1=377216&r2=377217&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicHttpSessionScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicHttpSessionScopeTestCase.java Sun Feb 12 11:01:22 2006
@@ -208,21 +208,16 @@
JavaComponentContextBuilder builder = new JavaComponentContextBuilder();
private List<RuntimeConfiguration<InstanceContext>> createConfigurations() throws NoSuchMethodException, BuilderException {
- SimpleComponent component = MockAssemblyFactory.createComponent("TestService1", SessionScopeComponentImpl.class,
- ScopeEnum.SESSION_LITERAL);
- builder.setModelObject(component);
- builder.build();
+ SimpleComponent component = MockAssemblyFactory.createComponent("TestService1", SessionScopeComponentImpl.class, ScopeEnum.SESSION_LITERAL);
+ builder.build(component, null);
List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
configs.add((RuntimeConfiguration<InstanceContext>) component.getComponentImplementation().getRuntimeConfiguration());
return configs;
}
- private RuntimeConfiguration<InstanceContext> createConfiguration(String name) throws NoSuchMethodException,
- BuilderException {
- SimpleComponent component = MockAssemblyFactory.createComponent(name, SessionScopeInitDestroyComponent.class,
- ScopeEnum.SESSION_LITERAL);
- builder.setModelObject(component);
- builder.build();
+ private RuntimeConfiguration<InstanceContext> createConfiguration(String name) throws NoSuchMethodException, BuilderException {
+ SimpleComponent component = MockAssemblyFactory.createComponent(name, SessionScopeInitDestroyComponent.class, ScopeEnum.SESSION_LITERAL);
+ builder.build(component, null);
return (RuntimeConfiguration<InstanceContext>) component.getComponentImplementation().getRuntimeConfiguration();
}
}
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicModuleScopeTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicModuleScopeTestCase.java?rev=377217&r1=377216&r2=377217&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicModuleScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicModuleScopeTestCase.java Sun Feb 12 11:01:22 2006
@@ -108,12 +108,9 @@
JavaComponentContextBuilder builder = new JavaComponentContextBuilder();
- private List<RuntimeConfiguration<InstanceContext>> createConfigurations()
- throws NoSuchMethodException, BuilderException {
- SimpleComponent component = MockAssemblyFactory.createComponent("TestService1", ModuleScopeComponentImpl.class,
- ScopeEnum.MODULE_LITERAL);
- builder.setModelObject(component);
- builder.build();
+ private List<RuntimeConfiguration<InstanceContext>> createConfigurations() throws NoSuchMethodException, BuilderException {
+ SimpleComponent component = MockAssemblyFactory.createComponent("TestService1", ModuleScopeComponentImpl.class, ScopeEnum.MODULE_LITERAL);
+ builder.build(component, null);
List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
configs.add((RuntimeConfiguration<InstanceContext>) component.getComponentImplementation().getRuntimeConfiguration());
return configs;
@@ -123,8 +120,7 @@
throws NoSuchMethodException, BuilderException {
SimpleComponent component = MockAssemblyFactory.createComponent(name, ModuleScopeInitDestroyComponent.class,
ScopeEnum.MODULE_LITERAL);
- builder.setModelObject(component);
- builder.build();
+ builder.build(component, null);
return (RuntimeConfiguration<InstanceContext>) component.getComponentImplementation().getRuntimeConfiguration();
}
}
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicRequestScopeTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicRequestScopeTestCase.java?rev=377217&r1=377216&r2=377217&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicRequestScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicRequestScopeTestCase.java Sun Feb 12 11:01:22 2006
@@ -131,8 +131,7 @@
private List<RuntimeConfiguration<InstanceContext>> createConfigurations() throws NoSuchMethodException, BuilderException {
SimpleComponent component = MockAssemblyFactory.createComponent("TestService1", RequestScopeComponentImpl.class,
ScopeEnum.REQUEST_LITERAL);
- builder.setModelObject(component);
- builder.build();
+ builder.build(component, null);
List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
configs.add((RuntimeConfiguration<InstanceContext>) component.getComponentImplementation().getRuntimeConfiguration());
return configs;
@@ -142,8 +141,7 @@
BuilderException {
SimpleComponent component = MockAssemblyFactory.createComponent(name, RequestScopeComponentImpl.class,
ScopeEnum.REQUEST_LITERAL);
- builder.setModelObject(component);
- builder.build();
+ builder.build(component, null);
return (RuntimeConfiguration<InstanceContext>) component.getComponentImplementation().getRuntimeConfiguration();
}
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicStatelessScopeTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicStatelessScopeTestCase.java?rev=377217&r1=377216&r2=377217&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicStatelessScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicStatelessScopeTestCase.java Sun Feb 12 11:01:22 2006
@@ -108,8 +108,7 @@
throws NoSuchMethodException, BuilderException {
SimpleComponent component = MockAssemblyFactory.createComponent("TestService1", StatelessComponentImpl.class,
ScopeEnum.INSTANCE_LITERAL);
- builder.setModelObject(component);
- builder.build();
+ builder.build(component, null);
List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
configs.add((RuntimeConfiguration<InstanceContext>) component.getComponentImplementation().getRuntimeConfiguration());
return configs;
@@ -119,8 +118,7 @@
throws NoSuchMethodException, BuilderException {
SimpleComponent component = MockAssemblyFactory.createComponent(name, StatelessComponentImpl.class,
ScopeEnum.INSTANCE_LITERAL);
- builder.setModelObject(component);
- builder.build();
+ builder.build(component, null);
return (RuntimeConfiguration<InstanceContext>) component.getComponentImplementation().getRuntimeConfiguration();
}
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/HttpSessionScopeLifecycleTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/HttpSessionScopeLifecycleTestCase.java?rev=377217&r1=377216&r2=377217&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/HttpSessionScopeLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/HttpSessionScopeLifecycleTestCase.java Sun Feb 12 11:01:22 2006
@@ -133,8 +133,7 @@
ScopeEnum.SESSION_LITERAL);
List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
for (int i = 0; i < ca.length; i++) {
- builder.setModelObject(ca[i]);
- builder.build();
+ builder.build(ca[i], null);
configs.add((RuntimeConfiguration<InstanceContext>) ca[i].getComponentImplementation()
.getRuntimeConfiguration());
@@ -150,8 +149,7 @@
ca[2] = MockAssemblyFactory.createComponent("three", OrderedInitPojo.class, ScopeEnum.SESSION_LITERAL);
List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
for (int i = 0; i < ca.length; i++) {
- builder.setModelObject(ca[i]);
- builder.build();
+ builder.build(ca[i], null);
configs.add((RuntimeConfiguration<InstanceContext>) ca[i].getComponentImplementation()
.getRuntimeConfiguration());
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java?rev=377217&r1=377216&r2=377217&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java Sun Feb 12 11:01:22 2006
@@ -165,8 +165,7 @@
ScopeEnum.MODULE_LITERAL);
List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
for (int i = 0; i < ca.length; i++) {
- builder.setModelObject(ca[i]);
- builder.build();
+ builder.build(ca[i], null);
configs.add((RuntimeConfiguration<InstanceContext>) ca[i].getComponentImplementation()
.getRuntimeConfiguration());
@@ -183,8 +182,7 @@
ScopeEnum.MODULE_LITERAL);
List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
for (int i = 0; i < ca.length; i++) {
- builder.setModelObject(ca[i]);
- builder.build();
+ builder.build(ca[i], null);
configs.add((RuntimeConfiguration<InstanceContext>) ca[i].getComponentImplementation()
.getRuntimeConfiguration());
@@ -200,8 +198,7 @@
ca[2] = MockAssemblyFactory.createComponent("three", OrderedInitPojo.class, ScopeEnum.MODULE_LITERAL);
List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
for (int i = 0; i < ca.length; i++) {
- builder.setModelObject(ca[i]);
- builder.build();
+ builder.build(ca[i], null);
configs.add((RuntimeConfiguration<InstanceContext>) ca[i].getComponentImplementation()
.getRuntimeConfiguration());
@@ -217,8 +214,7 @@
ca[2] = MockAssemblyFactory.createComponent("three", OrderedEagerInitPojo.class, ScopeEnum.MODULE_LITERAL);
List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
for (int i = 0; i < ca.length; i++) {
- builder.setModelObject(ca[i]);
- builder.build();
+ builder.build(ca[i], null);
configs.add((RuntimeConfiguration<InstanceContext>) ca[i].getComponentImplementation()
.getRuntimeConfiguration());
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java?rev=377217&r1=377216&r2=377217&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java Sun Feb 12 11:01:22 2006
@@ -126,8 +126,7 @@
ScopeEnum.REQUEST_LITERAL);
List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
for (int i = 0; i < ca.length; i++) {
- builder.setModelObject(ca[i]);
- builder.build();
+ builder.build(ca[i], null);
configs.add((RuntimeConfiguration<InstanceContext>) ca[i].getComponentImplementation().getRuntimeConfiguration());
}
@@ -142,8 +141,7 @@
ca[2] = MockAssemblyFactory.createComponent("three", OrderedInitPojo.class, ScopeEnum.REQUEST_LITERAL);
List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
for (int i = 0; i < ca.length; i++) {
- builder.setModelObject(ca[i]);
- builder.build();
+ builder.build(ca[i], null);
configs.add((RuntimeConfiguration<InstanceContext>) ca[i].getComponentImplementation().getRuntimeConfiguration());
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ReferenceBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ReferenceBuilder.java?rev=377217&r1=377216&r2=377217&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ReferenceBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ReferenceBuilder.java Sun Feb 12 11:01:22 2006
@@ -13,17 +13,16 @@
*/
package org.apache.tuscany.core.builder;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Scope;
+
import org.apache.tuscany.core.context.AggregateContext;
import org.apache.tuscany.core.invocation.spi.ProxyFactory;
-import org.apache.tuscany.core.invocation.spi.ProxyFactoryFactory;
-import org.apache.tuscany.core.message.MessageFactory;
-import org.apache.tuscany.core.system.annotation.Autowire;
import org.apache.tuscany.core.runtime.RuntimeContext;
+import org.apache.tuscany.core.system.annotation.Autowire;
import org.apache.tuscany.model.assembly.AssemblyModelObject;
import org.apache.tuscany.model.assembly.ConfiguredReference;
import org.apache.tuscany.model.assembly.ConfiguredService;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
/**
* Builds the source and target sides of wires for a component
@@ -32,17 +31,8 @@
*/
@Scope("MODULE")
public class ReferenceBuilder implements RuntimeConfigurationBuilder<AggregateContext> {
-
- private ProxyFactoryFactory factory;
-
private RuntimeContext runtimeContext;
- private AggregateContext parentContext;
-
- private AssemblyModelObject modelObject;
-
- private MessageFactory msgFactory;
-
// ----------------------------------
// Constructors
// ----------------------------------
@@ -64,15 +54,7 @@
runtimeContext.addBuilder(this);
}
- public void setModelObject(AssemblyModelObject modelObject) {
- this.modelObject = modelObject;
- }
-
- public void setParentContext(AggregateContext context) {
- parentContext = context;
- }
-
- public void build() throws BuilderException {
+ public void build(AssemblyModelObject modelObject, AggregateContext context) throws BuilderException {
if (!(modelObject instanceof ConfiguredReference) && (!(modelObject instanceof ConfiguredService))) {
return; // FIXME support external service
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/RuntimeConfigurationBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/RuntimeConfigurationBuilder.java?rev=377217&r1=377216&r2=377217&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/RuntimeConfigurationBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/RuntimeConfigurationBuilder.java Sun Feb 12 11:01:22 2006
@@ -12,22 +12,14 @@
* @see RuntimeConfiguration
*/
public interface RuntimeConfigurationBuilder<Y extends Context> {
-
/**
- * Sets the logical configuration model node to visit
- */
- public void setModelObject(AssemblyModelObject object);
-
- /**
- * Sets the parent context of the context type the current builder produces
- */
- public void setParentContext(Y context);
-
- /**
- * Compiles the runtime configuration model and decorates the LCM with it
+ * Builds a runtime configuration for the supplied model object for registration
+ * under the supplied context.
*
+ * @param object the logical configuration model node
+ * @param context the context that will be the parent of the built context
* @throws BuilderException
*/
- public void build() throws BuilderException;
+ public void build(AssemblyModelObject object, Y context) throws BuilderException;
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/AssemblyVisitor.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/AssemblyVisitor.java?rev=377217&r1=377216&r2=377217&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/AssemblyVisitor.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/AssemblyVisitor.java Sun Feb 12 11:01:22 2006
@@ -54,9 +54,7 @@
*/
public boolean visit(AssemblyModelObject modelObject) {
for (RuntimeConfigurationBuilder builder : builders) {
- builder.setParentContext(parent);
- builder.setModelObject(modelObject);
- builder.build();
+ builder.build(modelObject, parent);
}
return true;
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/HierarchicalBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/HierarchicalBuilder.java?rev=377217&r1=377216&r2=377217&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/HierarchicalBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/HierarchicalBuilder.java Sun Feb 12 11:01:22 2006
@@ -27,11 +27,6 @@
* @version $Rev$ $Date$
*/
public class HierarchicalBuilder implements RuntimeConfigurationBuilder {
-
- private AssemblyModelObject modelObject;
-
- private Context context;
-
private List<RuntimeConfigurationBuilder> builders = new ArrayList();
public HierarchicalBuilder() {
@@ -41,19 +36,9 @@
builders.add(builder);
}
- public void setModelObject(AssemblyModelObject modelObject) {
- this.modelObject = modelObject;
- }
-
- public void setParentContext(Context context) {
- this.context = context;
- }
-
- public void build() throws BuilderException {
+ public void build(AssemblyModelObject object, Context context) throws BuilderException {
for (RuntimeConfigurationBuilder builder : builders) {
- builder.setParentContext(context);
- builder.setModelObject(modelObject);
- builder.build();
+ builder.build(object, context);
}
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/TuscanyModuleContextBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/TuscanyModuleContextBuilder.java?rev=377217&r1=377216&r2=377217&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/TuscanyModuleContextBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/TuscanyModuleContextBuilder.java Sun Feb 12 11:01:22 2006
@@ -5,7 +5,6 @@
import org.apache.tuscany.core.builder.BuilderException;
import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
-import org.apache.tuscany.core.context.Context;
import org.apache.tuscany.core.context.TuscanyModuleComponentContext;
import org.apache.tuscany.model.assembly.AssemblyModelObject;
import org.apache.tuscany.model.assembly.Component;
@@ -15,17 +14,11 @@
/**
* Generates runtime configurations for logical model artifacts contained in a module component such as a
* <code>SimpleComponent</code>
- *
+ *
* @version $Rev$ $Date$
*/
public class TuscanyModuleContextBuilder implements RuntimeConfigurationBuilder<TuscanyModuleComponentContext> {
-
- private AssemblyModelObject modelObject;
-
- private TuscanyModuleComponentContext moduleComponentContext;
-
- // a collection of builders that will visit the contained artifacts when the
- // logical model is walked
+ // a collection of builders that will visit the contained artifacts when the logical model is walked
private List<RuntimeConfigurationBuilder<TuscanyModuleComponentContext>> componentBuilders;
// ----------------------------------
@@ -45,18 +38,7 @@
// Methods
// ----------------------------------
- public void setModelObject(AssemblyModelObject modelObject) {
- this.modelObject = modelObject;
- }
-
- public void setParentContext(TuscanyModuleComponentContext context) {
- moduleComponentContext = context;
- for (RuntimeConfigurationBuilder<TuscanyModuleComponentContext> builder : componentBuilders) {
- builder.setParentContext(context);
- }
- }
-
- public void build() throws BuilderException {
+ public void build(AssemblyModelObject modelObject, TuscanyModuleComponentContext context) throws BuilderException {
if(!(modelObject instanceof ModuleComponent)){
return;
}
@@ -69,8 +51,7 @@
if (component instanceof SimpleComponent) {
try {
for (RuntimeConfigurationBuilder<TuscanyModuleComponentContext> builder : componentBuilders) {
- builder.setModelObject((SimpleComponent) component);
- builder.build();
+ builder.build(component, context);
}
} catch (BuilderException e) {
e.addContextName(component.getName());
@@ -80,6 +61,4 @@
}
}
}
-
-
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/TuscanyModuleComponentContextImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/TuscanyModuleComponentContextImpl.java?rev=377217&r1=377216&r2=377217&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/TuscanyModuleComponentContextImpl.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/TuscanyModuleComponentContextImpl.java Sun Feb 12 11:01:22 2006
@@ -172,9 +172,7 @@
.forName("org.apache.tuscany.container.java.builder.JavaComponentContextBuilder").newInstance();
componentBuilders.add(builder);
TuscanyModuleContextBuilder moduleContextBuilder = new TuscanyModuleContextBuilder(componentBuilders);
- moduleContextBuilder.setParentContext(this);
- moduleContextBuilder.setModelObject(moduleComponent);
- moduleContextBuilder.build();
+ moduleContextBuilder.build(moduleComponent, this);
// sort the components by scope
Collection serviceComponents = moduleComponent.getModuleImplementation().getComponents();
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/ProxyFactoryBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/ProxyFactoryBuilder.java?rev=377217&r1=377216&r2=377217&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/ProxyFactoryBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/ProxyFactoryBuilder.java Sun Feb 12 11:01:22 2006
@@ -125,30 +125,15 @@
}
}
- private AggregateContext parentContext;
-
- // scope containers of the parent context
- private Map<Integer, ScopeContext> scopeContexts;
-
- public void setParentContext(AggregateContext context) {
- assert (parentContext != null) : "Parent context was null";
- parentContext = context;
+ public void build(AssemblyModelObject model, AggregateContext parentContext) throws BuilderException {
if (!(parentContext instanceof ScopeAwareContext)) {
BuilderInitException e = new BuilderInitException("Parent context is not scope aware");
e.setIdentifier(parentContext.getName());
e.addContextName(name);
throw e;
}
- scopeContexts = ((ScopeAwareContext) parentContext).getScopeContexts();
- }
-
- private AssemblyModelObject model;
-
- public void setModelObject(AssemblyModelObject model) {
- this.model = model;
- }
+ Map<Integer, ScopeContext> scopeContexts = ((ScopeAwareContext) parentContext).getScopeContexts();
- public void build() throws BuilderException {
if (model instanceof Component) {
try {
Component component = (Component) model;
@@ -157,7 +142,7 @@
}
for (Iterator<ConfiguredService> i = component.getConfiguredServices().iterator(); i.hasNext();) {
ConfiguredService configuredService = i.next();
- ProxyFactory proxyFactory = buildProxyFactory(configuredService);
+ ProxyFactory proxyFactory = buildProxyFactory(scopeContexts, configuredService);
configuredService.setProxyFactory(proxyFactory);
}
@@ -165,7 +150,7 @@
ConfiguredReference configuredReference = i.next();
InterfaceType interfaceType = configuredReference.getReference().getInterfaceContract().getInterfaceType();
Class businessInterface = interfaceType.getInstanceClass();
- ProxyFactory proxyFactory = buildProxyFactory(configuredReference);
+ ProxyFactory proxyFactory = buildProxyFactory(scopeContexts, configuredReference);
configuredReference.setProxyFactory(proxyFactory);
}
} catch (ProxyException e) {
@@ -174,7 +159,7 @@
}
}
- private ProxyFactory buildProxyFactory(ConfiguredService configuredService) throws ProxyException {
+ private ProxyFactory buildProxyFactory(Map<Integer, ScopeContext> scopeContexts, ConfiguredService configuredService) throws ProxyException {
InterfaceType interfaceType = configuredService.getService().getInterfaceContract().getInterfaceType();
// Create Proxy configuration
@@ -199,7 +184,7 @@
return createProxyFactory(javaInterface, proxyConfiguration);
}
- private ProxyFactory buildProxyFactory(ConfiguredReference configuredReference) throws ProxyInitializationException {
+ private ProxyFactory buildProxyFactory(Map<Integer, ScopeContext> scopeContexts, ConfiguredReference configuredReference) throws ProxyInitializationException {
InterfaceType interfaceType = configuredReference.getReference().getInterfaceContract().getInterfaceType();
ConfiguredService configuredService = configuredReference.getConfiguredServices().get(0);
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentContextBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentContextBuilder.java?rev=377217&r1=377216&r2=377217&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentContextBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentContextBuilder.java Sun Feb 12 11:01:22 2006
@@ -66,13 +66,6 @@
* @version $Rev$ $Date$
*/
public class SystemComponentContextBuilder implements RuntimeConfigurationBuilder<AggregateContext> {
-
- private final List<Injector> setters = new ArrayList();
-
- private AssemblyModelObject modelObject;
-
- private AggregateContext parentContext;
-
// ----------------------------------
// Constructors
// ----------------------------------
@@ -84,15 +77,7 @@
// Methods
// ----------------------------------
- public void setModelObject(AssemblyModelObject modelObject) {
- this.modelObject = modelObject;
- }
-
- public void setParentContext(AggregateContext context) {
- parentContext = context;
- }
-
- public void build() throws BuilderException {
+ public void build(AssemblyModelObject modelObject, AggregateContext parentContext) throws BuilderException {
if (!(modelObject instanceof Component) || (modelObject instanceof ModuleComponent)) {
return;
}
@@ -129,7 +114,7 @@
// FIXME should return empty refs - does it?
if (configuredReferences != null) {
for (ConfiguredReference reference : configuredReferences) {
- Injector injector = createReferenceInjector(parentContext.getName(), component.getName(), reference,
+ Injector injector = createReferenceInjector(parentContext.getName(), component.getName(), parentContext, reference,
fields, methods);
injectors.add(injector);
}
@@ -333,8 +318,8 @@
/**
* Creates an <code>Injector</code> for service references
*/
- private Injector createReferenceInjector(String moduleName, String componentName, ConfiguredReference reference,
- Set<Field> fields, Set<Method> methods) throws NoAccessorException, BuilderConfigException {
+ private Injector createReferenceInjector(String moduleName, String componentName, AggregateContext parentContext, ConfiguredReference reference,
+ Set<Field> fields, Set<Method> methods) throws NoAccessorException, BuilderConfigException {
String refName = reference.getReference().getName();
List<ConfiguredService> services = reference.getConfiguredServices();
Class type;
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java?rev=377217&r1=377216&r2=377217&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java Sun Feb 12 11:01:22 2006
@@ -41,19 +41,7 @@
// Methods
// ----------------------------------
- private AssemblyModelObject modelObject;
-
- private AggregateContext context;
-
- public void setModelObject(AssemblyModelObject modelObject) {
- this.modelObject = modelObject;
- }
-
- public void setParentContext(AggregateContext context) {
- this.context = context;
- }
-
- public void build() throws BuilderException {
+ public void build(AssemblyModelObject modelObject, AggregateContext context) throws BuilderException {
if (!(modelObject instanceof EntryPoint)) {
return;
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemExternalServiceBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemExternalServiceBuilder.java?rev=377217&r1=377216&r2=377217&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemExternalServiceBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemExternalServiceBuilder.java Sun Feb 12 11:01:22 2006
@@ -30,11 +30,6 @@
* @version $Rev$ $Date$
*/
public class SystemExternalServiceBuilder implements RuntimeConfigurationBuilder<AggregateContext> {
-
- private AggregateContext context;
-
- private AssemblyModelObject modelObject;
-
// ----------------------------------
// Constructors
// ----------------------------------
@@ -46,15 +41,7 @@
// Methods
// ----------------------------------
- public void setModelObject(AssemblyModelObject modelObject) {
- this.modelObject = modelObject;
- }
-
- public void setParentContext(AggregateContext context) {
- this.context = context;
- }
-
- public void build() throws BuilderException {
+ public void build(AssemblyModelObject modelObject, AggregateContext context) throws BuilderException {
if (!(modelObject instanceof ExternalService)) {
return;
}
@@ -73,7 +60,7 @@
externalService.getConfiguredService().setRuntimeConfiguration(config);
} else if (externalService.getInterfaceContract().getInterfaceType() != null) {
// autowire
- Class claz = externalService.getInterfaceContract().getInterfaceType().getInstanceClass();
+ Class<?> claz = externalService.getInterfaceContract().getInterfaceType().getInstanceClass();
if (claz == null) {
BuilderException e = new BuilderConfigException("Interface type not specified");
e.setIdentifier(externalService.getName());
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemComponentContextBuilderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemComponentContextBuilderTestCase.java?rev=377217&r1=377216&r2=377217&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemComponentContextBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemComponentContextBuilderTestCase.java Sun Feb 12 11:01:22 2006
@@ -100,9 +100,7 @@
cProp.setProperty(prop);
component.getConfiguredProperties().add(cProp);
- builder.setParentContext(createContext());
- builder.setModelObject(component);
- builder.build();
+ builder.build(component, createContext());
RuntimeConfiguration config = (RuntimeConfiguration) component.getComponentImplementation().getRuntimeConfiguration();
Assert.assertNotNull(config);
InstanceContext ctx = (InstanceContext) config.createInstanceContext();
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/impl/AssemblyVisitorTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/impl/AssemblyVisitorTestCase.java?rev=377217&r1=377216&r2=377217&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/impl/AssemblyVisitorTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/impl/AssemblyVisitorTestCase.java Sun Feb 12 11:01:22 2006
@@ -80,17 +80,7 @@
}
private static class TestBuilder implements RuntimeConfigurationBuilder {
-
- private AssemblyModelObject model;
-
- public void setModelObject(AssemblyModelObject model) {
- this.model = model;
- }
-
- public void setParentContext(Context context) {
- }
-
- public void build() throws BuilderException {
+ public void build(AssemblyModelObject model, Context context) throws BuilderException {
if (model instanceof ConfiguredPort) {
((ConfiguredPort) model).setProxyFactory(MARKER);
}
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/TestBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/TestBuilder.java?rev=377217&r1=377216&r2=377217&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/TestBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/TestBuilder.java Sun Feb 12 11:01:22 2006
@@ -26,13 +26,7 @@
runtime.addBuilder(this);
}
- public void setModelObject(AssemblyModelObject object) {
- }
-
- public void setParentContext(AggregateContext context) {
- }
-
- public void build() throws BuilderException {
+ public void build(AssemblyModelObject object, AggregateContext context) throws BuilderException {
invoked = true;
}