Author: jboynes
Date: Sun Apr 16 17:16:45 2006
New Revision: 394584
URL: http://svn.apache.org/viewcvs?rev=394584&view=rev
Log:
refactor to replace deprecated RuntimeContext.addBuilder() with use of a
registry obtained by autowire
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/ExternalWebServiceBuilder.java
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/builder/JSONRPCEntryPointConfigurationBuilder.java
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/TestBuilder.java
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/ExternalWebServiceBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/ExternalWebServiceBuilder.java?rev=394584&r1=394583&r2=394584&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/ExternalWebServiceBuilder.java
(original)
+++
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/ExternalWebServiceBuilder.java
Sun Apr 16 17:16:45 2006
@@ -14,7 +14,6 @@
package org.apache.tuscany.binding.axis2.builder;
import java.lang.reflect.Method;
-import java.util.Collection;
import java.util.Map;
import java.util.Set;
@@ -32,6 +31,7 @@
import org.apache.tuscany.core.builder.BuilderConfigException;
import org.apache.tuscany.core.builder.BuilderException;
import org.apache.tuscany.core.builder.ContextFactoryBuilder;
+import org.apache.tuscany.core.builder.ContextFactoryBuilderRegistry;
import org.apache.tuscany.core.config.JavaIntrospectionHelper;
import org.apache.tuscany.core.context.QualifiedName;
import org.apache.tuscany.core.injection.SingletonObjectFactory;
@@ -43,7 +43,6 @@
import org.apache.tuscany.core.wire.ProxyFactoryFactory;
import org.apache.tuscany.core.wire.WireTargetConfiguration;
import org.apache.tuscany.core.message.MessageFactory;
-import org.apache.tuscany.core.runtime.RuntimeContext;
import org.apache.tuscany.core.system.annotation.Autowire;
import org.apache.tuscany.model.assembly.AssemblyObject;
import org.apache.tuscany.model.assembly.ConfiguredService;
@@ -62,8 +61,7 @@
*/
@Scope("MODULE")
public class ExternalWebServiceBuilder implements ContextFactoryBuilder {
-
- private RuntimeContext runtimeContext;
+ private ContextFactoryBuilderRegistry builderRegistry;
private ProxyFactoryFactory proxyFactoryFactory;
@@ -76,15 +74,12 @@
@Init(eager = true)
public void init() {
- runtimeContext.addBuilder(this);
+ builderRegistry.register(this);
}
- /**
- * @param runtimeContext The runtimeContext to set.
- */
@Autowire
- public void setRuntimeContext(RuntimeContext runtimeContext) {
- this.runtimeContext = runtimeContext;
+ public void setBuilderRegistry(ContextFactoryBuilderRegistry
builderRegistry) {
+ this.builderRegistry = builderRegistry;
}
/**
@@ -150,7 +145,7 @@
policyBuilder.build(configuredService);
}
// add tail interceptor
- for (InvocationConfiguration iConfig :
(Collection<InvocationConfiguration>) iConfigMap.values()) {
+ for (InvocationConfiguration iConfig : iConfigMap.values()) {
iConfig.addTargetInterceptor(new InvokerInterceptor());
}
@@ -183,10 +178,7 @@
TypeHelper typeHelper =
externalService.getComposite().getAssemblyContext().getTypeHelper();
- ExternalWebServiceClient externalWebServiceClient = new
ExternalWebServiceClient(configurationContext, axisService, wsPortMetaData,
- typeHelper);
-
- return externalWebServiceClient;
+ return new ExternalWebServiceClient(configurationContext, axisService,
wsPortMetaData, typeHelper);
}
}
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java?rev=394584&r1=394583&r2=394584&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java
(original)
+++
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java
Sun Apr 16 17:16:45 2006
@@ -14,37 +14,37 @@
package org.apache.tuscany.binding.axis2.builder;
import java.lang.reflect.Method;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Scope;
+
import org.apache.tuscany.binding.axis2.assembly.WebServiceBinding;
import
org.apache.tuscany.binding.axis2.config.WebServiceEntryPointContextFactory;
import org.apache.tuscany.core.builder.BuilderException;
import org.apache.tuscany.core.builder.ContextFactoryBuilder;
+import org.apache.tuscany.core.builder.ContextFactoryBuilderRegistry;
import org.apache.tuscany.core.builder.impl.EntryPointContextFactory;
import org.apache.tuscany.core.config.JavaIntrospectionHelper;
import org.apache.tuscany.core.context.QualifiedName;
+import org.apache.tuscany.core.message.Message;
+import org.apache.tuscany.core.message.MessageFactory;
+import org.apache.tuscany.core.system.annotation.Autowire;
import org.apache.tuscany.core.wire.Interceptor;
import org.apache.tuscany.core.wire.InvocationConfiguration;
import org.apache.tuscany.core.wire.InvocationRuntimeException;
-import org.apache.tuscany.core.wire.WireConfiguration;
-import org.apache.tuscany.core.wire.TargetInvoker;
import org.apache.tuscany.core.wire.ProxyFactory;
import org.apache.tuscany.core.wire.ProxyFactoryFactory;
+import org.apache.tuscany.core.wire.TargetInvoker;
+import org.apache.tuscany.core.wire.WireConfiguration;
import org.apache.tuscany.core.wire.WireTargetConfiguration;
-import org.apache.tuscany.core.message.Message;
-import org.apache.tuscany.core.message.MessageFactory;
-import org.apache.tuscany.core.runtime.RuntimeContext;
-import org.apache.tuscany.core.system.annotation.Autowire;
import org.apache.tuscany.model.assembly.AssemblyObject;
import org.apache.tuscany.model.assembly.ConfiguredService;
import org.apache.tuscany.model.assembly.EntryPoint;
import org.apache.tuscany.model.assembly.Service;
import org.apache.tuscany.model.assembly.ServiceContract;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
/**
* Creates a <code>ContextFactoryBuilder</code> for an entry point configured
with the [EMAIL PROTECTED] WebServiceBinding}
@@ -53,8 +53,7 @@
*/
@Scope("MODULE")
public class WebServiceEntryPointBuilder implements ContextFactoryBuilder {
-
- private RuntimeContext runtimeContext;
+ private ContextFactoryBuilderRegistry builderRegistry;
private ProxyFactoryFactory proxyFactoryFactory;
@@ -67,15 +66,12 @@
@Init(eager = true)
public void init() {
- runtimeContext.addBuilder(this);
+ builderRegistry.register(this);
}
- /**
- * @param runtimeContext The runtimeContext to set.
- */
@Autowire
- public void setRuntimeContext(RuntimeContext runtimeContext) {
- this.runtimeContext = runtimeContext;
+ public void setBuilderRegistry(ContextFactoryBuilderRegistry
builderRegistry) {
+ this.builderRegistry = builderRegistry;
}
/**
@@ -128,7 +124,7 @@
InvocationConfiguration iConfig = new
InvocationConfiguration(method);
iConfigMap.put(method, iConfig);
}
- QualifiedName qName = new
QualifiedName(entryPoint.getConfiguredReference().getTargetConfiguredServices().get(0).getPart().getName()
+ "/" + service.getName());
+ QualifiedName qName = new
QualifiedName(entryPoint.getConfiguredReference().getTargetConfiguredServices().get(0).getPart().getName()
+ '/' + service.getName());
WireConfiguration wireConfiguration = new
WireTargetConfiguration(qName, iConfigMap,
serviceContract.getInterface().getClassLoader(), messageFactory);
proxyFactory.setBusinessInterface(serviceContract.getInterface());
proxyFactory.setProxyConfiguration(wireConfiguration);
@@ -139,7 +135,7 @@
policyBuilder.build(configuredService);
}
// add tail interceptor
- for (InvocationConfiguration iConfig :
(Collection<InvocationConfiguration>) iConfigMap.values()) {
+ for (InvocationConfiguration iConfig : iConfigMap.values()) {
iConfig.addTargetInterceptor(new EntryPointInvokerInterceptor());
}
entryPoint.setContextFactory(config);
@@ -148,7 +144,7 @@
//FIXME same as the InvokerInterceptor except that it doesn't throw an
exception in setNext
// For some reason another InvokerInterceptor is added after this one,
need Jim to look into it
// and figure out why.
- public class EntryPointInvokerInterceptor implements Interceptor {
+ public static class EntryPointInvokerInterceptor implements Interceptor {
public EntryPointInvokerInterceptor() {
}
Modified:
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/builder/JSONRPCEntryPointConfigurationBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/builder/JSONRPCEntryPointConfigurationBuilder.java?rev=394584&r1=394583&r2=394584&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/builder/JSONRPCEntryPointConfigurationBuilder.java
(original)
+++
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/builder/JSONRPCEntryPointConfigurationBuilder.java
Sun Apr 16 17:16:45 2006
@@ -17,6 +17,7 @@
import
org.apache.tuscany.binding.jsonrpc.config.JSONRPCEntryPointRuntimeConfiguration;
import org.apache.tuscany.core.builder.BuilderException;
import org.apache.tuscany.core.builder.ContextFactoryBuilder;
+import org.apache.tuscany.core.builder.ContextFactoryBuilderRegistry;
import org.apache.tuscany.core.builder.impl.EntryPointContextFactory;
import org.apache.tuscany.core.config.JavaIntrospectionHelper;
import org.apache.tuscany.core.context.QualifiedName;
@@ -27,7 +28,6 @@
import org.apache.tuscany.core.wire.ProxyFactoryFactory;
import org.apache.tuscany.core.wire.WireTargetConfiguration;
import org.apache.tuscany.core.message.MessageFactory;
-import org.apache.tuscany.core.runtime.RuntimeContext;
import org.apache.tuscany.core.system.annotation.Autowire;
import org.apache.tuscany.model.assembly.AssemblyObject;
import org.apache.tuscany.model.assembly.Service;
@@ -38,7 +38,6 @@
import org.osoa.sca.annotations.Scope;
import java.lang.reflect.Method;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -50,8 +49,7 @@
*/
@Scope("MODULE")
public class JSONRPCEntryPointConfigurationBuilder implements
ContextFactoryBuilder {
-
- private RuntimeContext runtimeContext;
+ private ContextFactoryBuilderRegistry builderRegistry;
private ProxyFactoryFactory proxyFactoryFactory;
@@ -64,16 +62,12 @@
@Init(eager = true)
public void init() {
- runtimeContext.addBuilder(this);
+ builderRegistry.register(this);
}
- /**
- * @param runtimeContext
- * The runtimeContext to set.
- */
@Autowire
- public void setRuntimeContext(RuntimeContext runtimeContext) {
- this.runtimeContext = runtimeContext;
+ public void setBuilderRegistry(ContextFactoryBuilderRegistry
builderRegistry) {
+ this.builderRegistry = builderRegistry;
}
/**
@@ -127,7 +121,7 @@
iConfigMap.put(method, iConfig);
}
QualifiedName qName = new
QualifiedName(entryPoint.getConfiguredReference().getTargetConfiguredServices().get(0).getPart().getName()
- + "/" + service.getName());
+ + '/' + service.getName());
WireConfiguration wireConfiguration = new
WireTargetConfiguration(qName, iConfigMap,
serviceContract.getInterface().getClassLoader(), messageFactory);
proxyFactory.setBusinessInterface(serviceContract.getInterface());
proxyFactory.setProxyConfiguration(wireConfiguration);
@@ -138,7 +132,7 @@
policyBuilder.build(configuredService);
}
// add tail interceptor
- for (InvocationConfiguration iConfig :
(Collection<InvocationConfiguration>) iConfigMap.values()) {
+ for (InvocationConfiguration iConfig : iConfigMap.values()) {
iConfig.addTargetInterceptor(new InvokerInterceptor());
}
entryPoint.setContextFactory(config);
Modified:
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java?rev=394584&r1=394583&r2=394584&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java
(original)
+++
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java
Sun Apr 16 17:16:45 2006
@@ -15,6 +15,7 @@
import org.apache.tuscany.core.builder.ContextFactoryBuilder;
import org.apache.tuscany.core.builder.NoAccessorException;
import org.apache.tuscany.core.builder.ObjectFactory;
+import org.apache.tuscany.core.builder.ContextFactoryBuilderRegistry;
import org.apache.tuscany.core.builder.impl.ArrayMultiplicityObjectFactory;
import org.apache.tuscany.core.builder.impl.HierarchicalBuilder;
import org.apache.tuscany.core.builder.impl.ListMultiplicityObjectFactory;
@@ -38,7 +39,6 @@
import org.apache.tuscany.core.wire.WireSourceConfiguration;
import org.apache.tuscany.core.wire.WireTargetConfiguration;
import org.apache.tuscany.core.message.MessageFactory;
-import org.apache.tuscany.core.runtime.RuntimeContext;
import org.apache.tuscany.core.system.annotation.Autowire;
import org.apache.tuscany.model.assembly.AssemblyObject;
import org.apache.tuscany.model.assembly.AtomicComponent;
@@ -67,8 +67,7 @@
*/
@org.osoa.sca.annotations.Scope("MODULE")
public class JavaContextFactoryBuilder implements ContextFactoryBuilder {
-
- private RuntimeContext runtimeContext;
+ private ContextFactoryBuilderRegistry builderRegistry;
private ProxyFactoryFactory proxyFactoryFactory;
@@ -88,15 +87,12 @@
@Init(eager = true)
public void init() {
- runtimeContext.addBuilder(this);
+ builderRegistry.register(this);
}
- /**
- * @param runtimeContext The runtimeContext to set.
- */
@Autowire
- public void setRuntimeContext(RuntimeContext runtimeContext) {
- this.runtimeContext = runtimeContext;
+ public void setBuilderRegistry(ContextFactoryBuilderRegistry
builderRegistry) {
+ this.builderRegistry = builderRegistry;
}
/**
Modified:
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java?rev=394584&r1=394583&r2=394584&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java
(original)
+++
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java
Sun Apr 16 17:16:45 2006
@@ -21,6 +21,7 @@
import org.apache.tuscany.core.builder.BuilderException;
import org.apache.tuscany.core.builder.ContextFactoryBuilder;
import org.apache.tuscany.core.builder.ObjectFactory;
+import org.apache.tuscany.core.builder.ContextFactoryBuilderRegistry;
import org.apache.tuscany.core.builder.impl.EntryPointContextFactory;
import org.apache.tuscany.core.builder.impl.HierarchicalBuilder;
import org.apache.tuscany.core.config.JavaIntrospectionHelper;
@@ -34,7 +35,6 @@
import org.apache.tuscany.core.wire.WireTargetConfiguration;
import org.apache.tuscany.core.wire.WireSourceConfiguration;
import org.apache.tuscany.core.message.MessageFactory;
-import org.apache.tuscany.core.runtime.RuntimeContext;
import org.apache.tuscany.core.system.annotation.Autowire;
import org.apache.tuscany.model.assembly.AssemblyObject;
import org.apache.tuscany.model.assembly.ConfiguredService;
@@ -53,9 +53,7 @@
*/
@Scope("MODULE")
public class FooBindingBuilder implements ContextFactoryBuilder {
-
- @Autowire
- private RuntimeContext runtimeContext;
+ private ContextFactoryBuilderRegistry builderRegistry;
private ProxyFactoryFactory proxyFactoryFactory;
@@ -69,15 +67,12 @@
@Init(eager = true)
public void init() {
- runtimeContext.addBuilder(this);
+ builderRegistry.register(this);
}
- /**
- * @param runtimeContext The runtimeContext to set.
- */
@Autowire
- public void setRuntimeContext(RuntimeContext runtimeContext) {
- this.runtimeContext = runtimeContext;
+ public void setBuilderRegistry(ContextFactoryBuilderRegistry
builderRegistry) {
+ this.builderRegistry = builderRegistry;
}
/**
@@ -125,7 +120,7 @@
InvocationConfiguration iConfig = new
InvocationConfiguration(method);
iConfigMap.put(method, iConfig);
}
- QualifiedName qName = new
QualifiedName(ep.getConfiguredReference().getTargetConfiguredServices().get(0).getPart().getName()
+ "/" + service.getName());
+ QualifiedName qName = new
QualifiedName(ep.getConfiguredReference().getTargetConfiguredServices().get(0).getPart().getName()
+ '/' + service.getName());
WireConfiguration wireConfiguration = new
WireSourceConfiguration("foo",qName, iConfigMap,
serviceContract.getInterface().getClassLoader(), messageFactory);
proxyFactory.setBusinessInterface(serviceContract.getInterface());
proxyFactory.setProxyConfiguration(wireConfiguration);
@@ -179,7 +174,7 @@
}
}
- private class FooClientFactory implements ObjectFactory {
+ private static class FooClientFactory implements ObjectFactory {
public Object getInstance() throws ObjectCreationException {
return new FooClient();
Modified:
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java?rev=394584&r1=394583&r2=394584&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java
(original)
+++
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java
Sun Apr 16 17:16:45 2006
@@ -27,6 +27,7 @@
import org.apache.tuscany.container.js.rhino.RhinoScript;
import org.apache.tuscany.core.builder.BuilderException;
import org.apache.tuscany.core.builder.ContextFactoryBuilder;
+import org.apache.tuscany.core.builder.ContextFactoryBuilderRegistry;
import org.apache.tuscany.core.context.QualifiedName;
import org.apache.tuscany.core.wire.InvocationConfiguration;
import org.apache.tuscany.core.wire.MethodHashMap;
@@ -37,7 +38,6 @@
import org.apache.tuscany.core.wire.WireSourceConfiguration;
import org.apache.tuscany.core.wire.WireTargetConfiguration;
import org.apache.tuscany.core.message.MessageFactory;
-import org.apache.tuscany.core.runtime.RuntimeContext;
import org.apache.tuscany.core.system.annotation.Autowire;
import org.apache.tuscany.model.assembly.AssemblyObject;
import org.apache.tuscany.model.assembly.AtomicComponent;
@@ -60,6 +60,7 @@
*/
@org.osoa.sca.annotations.Scope("MODULE")
public class JavaScriptContextFactoryBuilder implements ContextFactoryBuilder {
+ private ContextFactoryBuilderRegistry builderRegistry;
private ProxyFactoryFactory factory;
@@ -67,22 +68,17 @@
private ContextFactoryBuilder referenceBuilder;
- private RuntimeContext runtimeContext;
-
public JavaScriptContextFactoryBuilder() {
}
@Init(eager = true)
public void init() {
- runtimeContext.addBuilder(this);
+ builderRegistry.register(this);
}
- /**
- * @param runtimeContext The runtimeContext to set.
- */
@Autowire
- public void setRuntimeContext(RuntimeContext runtimeContext) {
- this.runtimeContext = runtimeContext;
+ public void setBuilderRegistry(ContextFactoryBuilderRegistry
builderRegistry) {
+ this.builderRegistry = builderRegistry;
}
/**
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContext.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContext.java?rev=394584&r1=394583&r2=394584&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContext.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContext.java
Sun Apr 16 17:16:45 2006
@@ -14,7 +14,6 @@
package org.apache.tuscany.core.runtime;
import org.apache.tuscany.common.monitor.MonitorFactory;
-import org.apache.tuscany.core.builder.ContextFactoryBuilder;
import org.apache.tuscany.core.builder.WireBuilder;
import org.apache.tuscany.core.context.CompositeContext;
import org.apache.tuscany.core.context.AutowireContext;
@@ -54,12 +53,6 @@
* @return the root of the system component tree
*/
public SystemCompositeContext getSystemContext();
-
- /**
- * Adds a configuration builder to the runtime
- */
- @Deprecated
- public void addBuilder(ContextFactoryBuilder builder);
/**
* Adds a wire builder to the runtime
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java?rev=394584&r1=394583&r2=394584&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java
Sun Apr 16 17:16:45 2006
@@ -39,9 +39,9 @@
import org.apache.tuscany.core.context.impl.AbstractContext;
import org.apache.tuscany.core.context.impl.CompositeContextImpl;
import org.apache.tuscany.core.context.impl.EventContextImpl;
-import org.apache.tuscany.core.wire.ProxyFactory;
import org.apache.tuscany.core.system.context.SystemCompositeContextImpl;
import org.apache.tuscany.core.system.context.SystemScopeStrategy;
+import org.apache.tuscany.core.wire.ProxyFactory;
import org.apache.tuscany.model.assembly.AssemblyObject;
import org.apache.tuscany.model.assembly.Composite;
import org.apache.tuscany.model.assembly.Extensible;
@@ -88,7 +88,7 @@
rootContext = new CompositeContextImpl(ROOT, this, this, new
RuntimeScopeStrategy(), new EventContextImpl(), this);
systemContext = new SystemCompositeContextImpl(SYSTEM, this, this, new
SystemScopeStrategy(), new EventContextImpl(), this);
- // bootstrap the builder regsitry
+ // bootstrap the builder registry
builderRegistry = new ContextFactoryBuilderRegistryImpl();
if (builders != null) {
for (ContextFactoryBuilder builder: builders) {
@@ -144,11 +144,6 @@
lifecycleState = STOPPED;
}
- public void addBuilder(ContextFactoryBuilder builder) {
- assert (builder != null) : "Builder was null";
- builderRegistry.register(builder);
- }
-
public void addBuilder(WireBuilder builder) {
assert (builder != null) : "Builder was null";
wireBuilder.addWireBuilder(builder);
@@ -242,6 +237,8 @@
return instanceInterface.cast(this);
} else if (RuntimeContext.class.equals(instanceInterface)) {
return instanceInterface.cast(this);
+ } else if
(ContextFactoryBuilderRegistry.class.equals(instanceInterface)) {
+ return instanceInterface.cast(builderRegistry);
} else {
// autowire to system components
return
instanceInterface.cast(getSystemContext().resolveExternalInstance(instanceInterface));
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=394584&r1=394583&r2=394584&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 Apr 16 17:16:45 2006
@@ -1,18 +1,17 @@
package org.apache.tuscany.core.system.context;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Scope;
+
import org.apache.tuscany.core.builder.BuilderException;
import org.apache.tuscany.core.builder.ContextFactoryBuilder;
-import org.apache.tuscany.core.runtime.RuntimeContext;
+import org.apache.tuscany.core.builder.ContextFactoryBuilderRegistry;
import org.apache.tuscany.core.system.annotation.Autowire;
import org.apache.tuscany.model.assembly.AssemblyObject;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
@Scope("MODULE")
public class TestBuilder implements ContextFactoryBuilder {
-
- @Autowire
- private RuntimeContext runtime;
+ private ContextFactoryBuilderRegistry builderRegistry;
private boolean invoked = false;
@@ -22,7 +21,12 @@
@Init(eager = true)
public void init() {
- runtime.addBuilder(this);
+ builderRegistry.register(this);
+ }
+
+ @Autowire
+ public void setBuilderRegistry(ContextFactoryBuilderRegistry
builderRegistry) {
+ this.builderRegistry = builderRegistry;
}
public void build(AssemblyObject object) throws BuilderException {
