You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/03/14 17:57:42 UTC

svn commit: r385834 [3/4] - in /incubator/tuscany/java/sca: binding.axis/src/main/java/org/apache/tuscany/binding/axis/builder/ binding.axis/src/main/java/org/apache/tuscany/binding/axis/config/ binding.axis/src/main/resources/ binding.axis2/src/main/j...

Copied: incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSContextFactoryBuilderTestCase.java (from r385814, incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSComponentContextBuilderTestCase.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSContextFactoryBuilderTestCase.java?p2=incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSContextFactoryBuilderTestCase.java&p1=incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSComponentContextBuilderTestCase.java&r1=385814&r2=385834&rev=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSComponentContextBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSContextFactoryBuilderTestCase.java Tue Mar 14 08:57:08 2006
@@ -7,9 +7,9 @@
 
 import org.apache.tuscany.common.resource.impl.ResourceLoaderImpl;
 import org.apache.tuscany.container.js.assembly.mock.HelloWorldService;
-import org.apache.tuscany.container.js.config.JavaScriptComponentRuntimeConfiguration;
+import org.apache.tuscany.container.js.config.JavaScriptContextFactory;
 import org.apache.tuscany.container.js.mock.MockAssemblyFactory;
-import org.apache.tuscany.core.builder.RuntimeConfiguration;
+import org.apache.tuscany.core.builder.ContextFactory;
 import org.apache.tuscany.core.context.EventContext;
 import org.apache.tuscany.core.context.InstanceContext;
 import org.apache.tuscany.core.context.QualifiedName;
@@ -23,10 +23,10 @@
 import org.apache.tuscany.model.assembly.impl.AssemblyModelContextImpl;
 import org.apache.tuscany.model.scdl.loader.impl.SCDLAssemblyModelLoaderImpl;
 
-public class JSComponentContextBuilderTestCase extends TestCase {
+public class JSContextFactoryBuilderTestCase extends TestCase {
 
     public void testBasicInvocation() throws Exception {
-        JavaScriptComponentContextBuilder jsBuilder = new JavaScriptComponentContextBuilder();
+        JavaScriptContextFactoryBuilder jsBuilder = new JavaScriptContextFactoryBuilder();
         jsBuilder.setProxyFactoryFactory(new JDKProxyFactoryFactory());
         JavaScriptTargetWireBuilder jsWireBuilder = new JavaScriptTargetWireBuilder();
         SimpleComponent component = MockAssemblyFactory.createComponent("foo",
@@ -34,16 +34,16 @@
         component.initialize(new AssemblyModelContextImpl(new AssemblyFactoryImpl(), new SCDLAssemblyModelLoaderImpl(null), new ResourceLoaderImpl(Thread.currentThread().getContextClassLoader())));
         jsBuilder.build(component);
         ModuleScopeContext context = new ModuleScopeContext(new EventContextImpl());
-        RuntimeConfiguration<InstanceContext> config = (RuntimeConfiguration) component.getComponentImplementation()
-                .getRuntimeConfiguration();
-        context.registerConfiguration(config);
+        ContextFactory<InstanceContext> config = (ContextFactory) component.getComponentImplementation()
+                .getContextFactory();
+        context.registerFactory(config);
         context.start();
         context.onEvent(EventContext.MODULE_START, null);
         for (ProxyFactory proxyFactory : (Collection<ProxyFactory>) config.getTargetProxyFactories().values()) {
-            jsWireBuilder.completeTargetChain(proxyFactory, JavaScriptComponentRuntimeConfiguration.class, context);
+            jsWireBuilder.completeTargetChain(proxyFactory, JavaScriptContextFactory.class, context);
             proxyFactory.initialize();
         }
-        InstanceContext ctx = config.createInstanceContext();
+        InstanceContext ctx = config.createContext();
         HelloWorldService hello = (HelloWorldService) ctx.getInstance(new QualifiedName("foo/HelloWorldService"));
         Assert.assertNotNull(hello);
         Assert.assertEquals("Hello foo", hello.hello("foo"));

Modified: incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/MockHandlerBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/MockHandlerBuilder.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/MockHandlerBuilder.java (original)
+++ incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/MockHandlerBuilder.java Tue Mar 14 08:57:08 2006
@@ -14,7 +14,7 @@
 package org.apache.tuscany.container.js.builder;
 
 import org.apache.tuscany.core.builder.BuilderException;
-import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
+import org.apache.tuscany.core.builder.ContextFactoryBuilder;
 import org.apache.tuscany.core.invocation.InvocationConfiguration;
 import org.apache.tuscany.core.invocation.MessageHandler;
 import org.apache.tuscany.core.invocation.spi.ProxyFactory;
@@ -27,7 +27,7 @@
  * 
  * @version $Rev$ $Date$
  */
-public class MockHandlerBuilder implements RuntimeConfigurationBuilder {
+public class MockHandlerBuilder implements ContextFactoryBuilder {
 
     private MessageHandler handler;
 

Modified: incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/MockInterceptorBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/MockInterceptorBuilder.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/MockInterceptorBuilder.java (original)
+++ incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/MockInterceptorBuilder.java Tue Mar 14 08:57:08 2006
@@ -14,7 +14,7 @@
 package org.apache.tuscany.container.js.builder;
 
 import org.apache.tuscany.core.builder.BuilderException;
-import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
+import org.apache.tuscany.core.builder.ContextFactoryBuilder;
 import org.apache.tuscany.core.invocation.Interceptor;
 import org.apache.tuscany.core.invocation.InvocationConfiguration;
 import org.apache.tuscany.core.invocation.spi.ProxyFactory;
@@ -27,7 +27,7 @@
  * 
  * @version $Rev$ $Date$
  */
-public class MockInterceptorBuilder implements RuntimeConfigurationBuilder {
+public class MockInterceptorBuilder implements ContextFactoryBuilder {
 
     private Interceptor interceptor;
 

Modified: incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/integration/JSComponentContextTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/integration/JSComponentContextTestCase.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/integration/JSComponentContextTestCase.java (original)
+++ incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/integration/JSComponentContextTestCase.java Tue Mar 14 08:57:08 2006
@@ -20,13 +20,13 @@
 import junit.framework.TestCase;
 
 import org.apache.tuscany.container.js.assembly.mock.HelloWorldService;
-import org.apache.tuscany.container.js.builder.JavaScriptComponentContextBuilder;
+import org.apache.tuscany.container.js.builder.JavaScriptContextFactoryBuilder;
 import org.apache.tuscany.container.js.builder.JavaScriptTargetWireBuilder;
 import org.apache.tuscany.container.js.builder.MockInterceptorBuilder;
 import org.apache.tuscany.container.js.invocation.mock.MockSyncInterceptor;
 import org.apache.tuscany.container.js.mock.MockAssemblyFactory;
 import org.apache.tuscany.container.js.mock.MockModuleFactory;
-import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
+import org.apache.tuscany.core.builder.ContextFactoryBuilder;
 import org.apache.tuscany.core.builder.impl.DefaultWireBuilder;
 import org.apache.tuscany.core.builder.impl.HierarchicalBuilder;
 import org.apache.tuscany.core.context.AggregateContext;
@@ -37,7 +37,7 @@
 import org.apache.tuscany.core.message.impl.MessageFactoryImpl;
 import org.apache.tuscany.core.runtime.RuntimeContext;
 import org.apache.tuscany.core.runtime.RuntimeContextImpl;
-import org.apache.tuscany.core.system.builder.SystemComponentContextBuilder;
+import org.apache.tuscany.core.system.builder.SystemContextFactoryBuilder;
 import org.apache.tuscany.core.system.builder.SystemEntryPointBuilder;
 import org.apache.tuscany.core.system.builder.SystemExternalServiceBuilder;
 import org.apache.tuscany.model.assembly.Scope;
@@ -52,12 +52,12 @@
     public void testBasicInvocation() throws Exception {
         MessageFactory msgFactory = new MessageFactoryImpl();
 
-        List<RuntimeConfigurationBuilder> builders = new ArrayList();
-        builders.add((new SystemComponentContextBuilder()));
+        List<ContextFactoryBuilder> builders = new ArrayList();
+        builders.add((new SystemContextFactoryBuilder()));
         builders.add(new SystemEntryPointBuilder());
         builders.add(new SystemExternalServiceBuilder());
 
-        JavaScriptComponentContextBuilder javaBuilder = new JavaScriptComponentContextBuilder();
+        JavaScriptContextFactoryBuilder javaBuilder = new JavaScriptContextFactoryBuilder();
         javaBuilder.setMessageFactory(msgFactory);
         javaBuilder.setProxyFactoryFactory(new JDKProxyFactoryFactory());
 

Added: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java?rev=385834&view=auto
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java (added)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java Tue Mar 14 08:57:08 2006
@@ -0,0 +1,79 @@
+package org.apache.tuscany.core.builder;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.tuscany.core.context.AggregateContext;
+import org.apache.tuscany.core.context.Context;
+import org.apache.tuscany.core.invocation.spi.ProxyFactory;
+import org.apache.tuscany.model.assembly.Scope;
+
+/**
+ * Implementations create instances of {@link org.apache.tuscany.core.context.Context} based on a compiled
+ * configuration, such as a logical assembly model. For example, implementations of
+ * {@link org.apache.tuscany.core.builder.ContextFactoryBuilder} analyze an
+ * {@link org.apache.tuscany.model.assembly.AssemblyModelObject} to create implementations of
+ * <tt>ContextFactory</tt>.
+ * 
+ * @version $Rev: 385747 $ $Date: 2006-03-13 22:12:53 -0800 (Mon, 13 Mar 2006) $
+ */
+public interface ContextFactory<T extends Context> {
+
+    /**
+     * Creates an instance context based on the current runtime configuration
+     * 
+     * @return a new instance context
+     * @throws ContextCreationException if an error occurs creating the context
+     */
+    public T createContext() throws ContextCreationException;
+
+    /**
+     * Returns the scope identifier associated with the type of contexts produced by the current configuration
+     */
+    public Scope getScope();
+
+    /**
+     * Returns the name of the contexts produced by the current configuration
+     */
+    public String getName();
+
+    /**
+     * Adds a target-side proxy factory for the given service name to the configuration. Target-side proxy factories
+     * contain the invocation chains associated with the destination service of a wire and are responsible for
+     * generating proxies
+     */
+    public void addTargetProxyFactory(String serviceName, ProxyFactory factory);
+
+    /**
+     * Returns the target-side proxy factory associated with the given service name
+     */
+    public ProxyFactory getTargetProxyFactory(String serviceName);
+
+    /**
+     * Returns a collection of target-side proxy factories for the configuration keyed by service name
+     */
+    public Map<String, ProxyFactory> getTargetProxyFactories();
+
+    /**
+     * Adds a source-side proxy factory for the given reference. Source-side proxy factories contain the invocation
+     * chains for a reference in the component implementation associated with the instance context created by this
+     * configuration. Source-side proxy factories also produce proxies that are injected on a reference in a component
+     * implementation.
+     */
+    public void addSourceProxyFactory(String referenceName, ProxyFactory factory);
+
+    /**
+     * Returns a collection of source side-proxy factories for component references. There may 1..n proxy factories per
+     * reference.
+     */
+    public List<ProxyFactory> getSourceProxyFactories();
+
+    /**
+     * Called to signal to the configuration that its parent context has been activated and that it shoud perform any
+     * required initialization steps
+     * 
+     * @param parent the parent context's configuration
+     */
+    public void prepare(AggregateContext parent);
+
+}

Copied: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactoryBuilder.java (from r385814, 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/ContextFactoryBuilder.java?p2=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactoryBuilder.java&p1=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/RuntimeConfigurationBuilder.java&r1=385814&r2=385834&rev=385834&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/ContextFactoryBuilder.java Tue Mar 14 08:57:08 2006
@@ -5,32 +5,32 @@
 
 /**
  * Implementations perform the first phase of converting a logical model representing an assembly into a series of
- * runtime or executable artifacts. Specifically, <code>RuntimeConfigurationBuilder</code>s are responsible for
- * analyzing logical model elements and producing {@link RuntimeConfiguration}s that are used to generate executable
+ * runtime or executable artifacts. Specifically, <code>ContextFactoryBuilder</code>s are responsible for
+ * analyzing logical model elements and producing {@link ContextFactory}s that are used to generate executable
  * artifacts such as an {@link org.apache.tuscany.core.context.InstanceContext}. In the case of components, the
- * <code>RuntimeConfiguration</code> will typically contain configuration for instantiating implementation instances
+ * <code>ContextFactory</code> will typically contain configuration for instantiating implementation instances
  * with injected properties and references; invocation chains; and configuration necessary to build proxies to
  * implementation instances.
  * <p>
- * As the logical model is analyzed, <code>RuntimeConfigurationBuilder</code>s are guaranteed to be called first and
- * are expected to decorate the logical model with initial <code>RuntimeConfiguration</code>. Certain implementations
+ * As the logical model is analyzed, <code>ContextFactoryBuilder</code>s are guaranteed to be called first and
+ * are expected to decorate the logical model with initial <code>ContextFactory</code>. Certain implementations
  * may choose to delegate tasks to other builders. For example, a builder may handle component implementation types and
- * set up an initial <code>RuntimeConfiguration</code> based on introspected metadata specific to the type. It may
+ * set up an initial <code>ContextFactory</code> based on introspected metadata specific to the type. It may
  * then choose to delegate to other builders to handle construction of invocation chains based on policies specified in
  * the logical model. Delegation may be set up by implementing builders as system components and wiring them to other
  * builders. This allows the creation of builders that may modify invocation chains regardless of implementation type,
  * such as generic policy builders.
  * <p>
  * When this first phase is complete, a logical model will be decorated with essentially independent
- * <code>RuntimeConfiguration</code>s. The second phase uses {@link WireBuilder}s to analyze wires represented in
+ * <code>ContextFactory</code>s. The second phase uses {@link WireBuilder}s to analyze wires represented in
  * the logical model and "connect" the source and target invocation chains held in these
- * <code>RuntimeConfiguration</code>s to form a completed wire. <code>WireBuilder<code>s may use a similar delegation strategy and perform various optimizations.
+ * <code>ContextFactory</code>s to form a completed wire. <code>WireBuilder<code>s may use a similar delegation strategy and perform various optimizations.
  * 
  * @version $Rev$ $Date$
- * @see RuntimeConfiguration
+ * @see ContextFactory
  * @see org.apache.tuscany.core.builder.WireBuilder
  */
-public interface RuntimeConfigurationBuilder<Y extends Context> {
+public interface ContextFactoryBuilder<Y extends Context> {
 
     /**
      * Builds a runtime configuration for the supplied model object for registration under the supplied context.

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/WireBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/WireBuilder.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/WireBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/WireBuilder.java Tue Mar 14 08:57:08 2006
@@ -28,7 +28,7 @@
  * Wire builders may optimize the invocation chains based on certain characteristics of th wire, such as source and
  * target scopes.
  * 
- * @see org.apache.tuscany.core.builder.RuntimeConfigurationBuilder
+ * @see org.apache.tuscany.core.builder.ContextFactoryBuilder
  * @version $Rev$ $Date$
  */
 public interface WireBuilder {

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=385834&r1=385833&r2=385834&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 Tue Mar 14 08:57:08 2006
@@ -15,7 +15,7 @@
 
 import java.util.List;
 
-import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
+import org.apache.tuscany.core.builder.ContextFactoryBuilder;
 import org.apache.tuscany.model.assembly.AssemblyModelObject;
 import org.apache.tuscany.model.assembly.AssemblyModelVisitor;
 
@@ -26,7 +26,7 @@
  */
 public class AssemblyVisitor implements AssemblyModelVisitor {
 
-    List<RuntimeConfigurationBuilder> builders;
+    List<ContextFactoryBuilder> builders;
 
     /**
      * Constructs a visitor
@@ -34,7 +34,7 @@
      * @param parent the parent context for the object graph
      * @param builders the collection of builders for creating runtime configurations
      */
-    public AssemblyVisitor(List<RuntimeConfigurationBuilder> builders) {
+    public AssemblyVisitor(List<ContextFactoryBuilder> builders) {
         this.builders = builders;
     }
 
@@ -49,7 +49,7 @@
      * Callback when walking the graph
      */
     public boolean visit(AssemblyModelObject modelObject) {
-        for (RuntimeConfigurationBuilder builder : builders) {
+        for (ContextFactoryBuilder builder : builders) {
             builder.build(modelObject);
         }
         return true;

Copied: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/BaseExternalServiceContextFactory.java (from r385814, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/BaseExternalServiceRuntimeConfiguration.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/BaseExternalServiceContextFactory.java?p2=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/BaseExternalServiceContextFactory.java&p1=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/BaseExternalServiceRuntimeConfiguration.java&r1=385814&r2=385834&rev=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/BaseExternalServiceRuntimeConfiguration.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/BaseExternalServiceContextFactory.java Tue Mar 14 08:57:08 2006
@@ -20,7 +20,7 @@
 
 import org.apache.tuscany.core.builder.ContextCreationException;
 import org.apache.tuscany.core.builder.ObjectFactory;
-import org.apache.tuscany.core.builder.RuntimeConfiguration;
+import org.apache.tuscany.core.builder.ContextFactory;
 import org.apache.tuscany.core.context.AggregateContext;
 import org.apache.tuscany.core.context.ExternalServiceContext;
 import org.apache.tuscany.core.context.impl.ExternalServiceContextImpl;
@@ -36,7 +36,7 @@
  * 
  * @version $Rev$ $Date$
  */
-public abstract class BaseExternalServiceRuntimeConfiguration implements RuntimeConfiguration<ExternalServiceContext> {
+public abstract class BaseExternalServiceContextFactory implements ContextFactory<ExternalServiceContext> {
 
     private String name;
 
@@ -50,14 +50,14 @@
     
     private AggregateContext parentContext;
 
-    public BaseExternalServiceRuntimeConfiguration(String name, ObjectFactory objectFactory) {
+    public BaseExternalServiceContextFactory(String name, ObjectFactory objectFactory) {
         assert (name != null) : "Name was null";
         assert (objectFactory != null) : "Object factory was null";
         this.name = name;
         this.objectFactory = objectFactory;
     }
 
-    public ExternalServiceContext createInstanceContext() throws ContextCreationException {
+    public ExternalServiceContext createContext() throws ContextCreationException {
         return new ExternalServiceContextImpl(name, proxyFactory, objectFactory);
     }
 

Copied: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointContextFactory.java (from r385814, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointRuntimeConfiguration.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointContextFactory.java?p2=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointContextFactory.java&p1=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointRuntimeConfiguration.java&r1=385814&r2=385834&rev=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointRuntimeConfiguration.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointContextFactory.java Tue Mar 14 08:57:08 2006
@@ -19,7 +19,7 @@
 import java.util.Map;
 
 import org.apache.tuscany.core.builder.ContextCreationException;
-import org.apache.tuscany.core.builder.RuntimeConfiguration;
+import org.apache.tuscany.core.builder.ContextFactory;
 import org.apache.tuscany.core.context.AggregateContext;
 import org.apache.tuscany.core.context.EntryPointContext;
 import org.apache.tuscany.core.context.impl.EntryPointContextImpl;
@@ -32,7 +32,7 @@
  * 
  * @version $Rev$ $Date$
  */
-public abstract class EntryPointRuntimeConfiguration implements RuntimeConfiguration<EntryPointContext> {
+public abstract class EntryPointContextFactory implements ContextFactory<EntryPointContext> {
 
     private String name;
 
@@ -46,7 +46,7 @@
     
     private AggregateContext parentContext;
 
-    public EntryPointRuntimeConfiguration(String name, String referenceName, MessageFactory msgFactory) {
+    public EntryPointContextFactory(String name, String referenceName, MessageFactory msgFactory) {
         assert (name != null) : "Entry point name was null";
         assert (msgFactory != null) : "Message factory was null";
         this.name = name;
@@ -54,7 +54,7 @@
         this.msgFactory = msgFactory;
     }
 
-    public EntryPointContext createInstanceContext() throws ContextCreationException {
+    public EntryPointContext createContext() throws ContextCreationException {
         return new EntryPointContextImpl(name, proxyFactory, msgFactory);
     }
 

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=385834&r1=385833&r2=385834&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 Tue Mar 14 08:57:08 2006
@@ -18,7 +18,7 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.apache.tuscany.core.builder.BuilderException;
-import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
+import org.apache.tuscany.core.builder.ContextFactoryBuilder;
 import org.apache.tuscany.model.assembly.AssemblyModelObject;
 
 /**
@@ -26,19 +26,19 @@
  * 
  * @version $Rev$ $Date$
  */
-public class HierarchicalBuilder implements RuntimeConfigurationBuilder {
-    private List<RuntimeConfigurationBuilder> builders = new CopyOnWriteArrayList();
+public class HierarchicalBuilder implements ContextFactoryBuilder {
+    private List<ContextFactoryBuilder> builders = new CopyOnWriteArrayList();
     
-    private List<RuntimeConfigurationBuilder> readOnlyBuilders = Collections.unmodifiableList(builders); 
+    private List<ContextFactoryBuilder> readOnlyBuilders = Collections.unmodifiableList(builders); 
     
     public HierarchicalBuilder() {
     }
 
-    public void addBuilder(RuntimeConfigurationBuilder builder) {
+    public void addBuilder(ContextFactoryBuilder builder) {
         builders.add(builder);
     }
 
-    public void removeBuilder(RuntimeConfigurationBuilder builder){
+    public void removeBuilder(ContextFactoryBuilder builder){
         builders.remove(builder);
     }
     
@@ -47,7 +47,7 @@
     }
     
     public void build(AssemblyModelObject object) throws BuilderException {
-        for (RuntimeConfigurationBuilder builder : builders) {
+        for (ContextFactoryBuilder builder : builders) {
             builder.build(object);
         }
 

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java Tue Mar 14 08:57:08 2006
@@ -23,7 +23,7 @@
 
 import org.apache.tuscany.common.resource.ResourceLoader;
 import org.apache.tuscany.common.resource.impl.ResourceLoaderImpl;
-import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
+import org.apache.tuscany.core.builder.ContextFactoryBuilder;
 import org.apache.tuscany.core.config.ModuleComponentConfigurationLoader;
 import org.apache.tuscany.core.config.ConfigurationException;
 import org.apache.tuscany.core.config.impl.ModuleComponentConfigurationLoaderImpl;
@@ -32,7 +32,7 @@
 import org.apache.tuscany.core.context.AggregateContext;
 import org.apache.tuscany.core.context.EventContext;
 import org.apache.tuscany.core.system.assembly.impl.SystemAssemblyFactoryImpl;
-import org.apache.tuscany.core.system.builder.SystemComponentContextBuilder;
+import org.apache.tuscany.core.system.builder.SystemContextFactoryBuilder;
 import org.apache.tuscany.core.system.builder.SystemEntryPointBuilder;
 import org.apache.tuscany.core.system.builder.SystemExternalServiceBuilder;
 import org.apache.tuscany.core.system.loader.SystemSCDLModelLoader;
@@ -80,9 +80,9 @@
      *
      * @return a default list of configuration builders
      */
-    public static List<RuntimeConfigurationBuilder> getBuilders() {
-        List<RuntimeConfigurationBuilder> configBuilders = new ArrayList();
-        configBuilders.add((new SystemComponentContextBuilder()));
+    public static List<ContextFactoryBuilder> getBuilders() {
+        List<ContextFactoryBuilder> configBuilders = new ArrayList();
+        configBuilders.add((new SystemContextFactoryBuilder()));
         configBuilders.add(new SystemEntryPointBuilder());
         configBuilders.add(new SystemExternalServiceBuilder());
         return configBuilders;

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java Tue Mar 14 08:57:08 2006
@@ -24,7 +24,7 @@
 
 import org.apache.tuscany.common.monitor.MonitorFactory;
 import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
-import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
+import org.apache.tuscany.core.builder.ContextFactoryBuilder;
 import org.apache.tuscany.core.builder.impl.DefaultWireBuilder;
 import org.apache.tuscany.core.config.ConfigurationException;
 import org.apache.tuscany.core.config.ModuleComponentConfigurationLoader;
@@ -83,7 +83,7 @@
 
         // Create a runtime context and start it
         List<SCDLModelLoader> loaders = modelContext.getAssemblyLoader().getLoaders();
-        List<RuntimeConfigurationBuilder> configBuilders = BootstrapHelper.getBuilders();
+        List<ContextFactoryBuilder> configBuilders = BootstrapHelper.getBuilders();
         runtime = new RuntimeContextImpl(monitorFactory, loaders, configBuilders, new DefaultWireBuilder());
         runtime.start();
         monitor.started(runtime);

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ConfigurationContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ConfigurationContext.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ConfigurationContext.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ConfigurationContext.java Tue Mar 14 08:57:08 2006
@@ -37,13 +37,13 @@
     public void configure(Extensible model) throws ConfigurationException;
 
     /**
-     * Decorates the supplied model object with a {@link org.apache.tuscany.core.builder.RuntimeConfiguration} that can
+     * Decorates the supplied model object with a {@link org.apache.tuscany.core.builder.ContextFactory} that can
      * be used to create the runtime context corresponding to the model.
      * 
      * @param parent an AggregrateContext that will ultimately become the parent of the runtime context
      * @param model the model object that defines the configuration to be built
      * @throws BuilderConfigException
-     * @see org.apache.tuscany.core.builder.RuntimeConfiguration
+     * @see org.apache.tuscany.core.builder.ContextFactory
      */
     public void build(AggregateContext parent, Extensible model) throws BuilderConfigException;
 
@@ -52,7 +52,7 @@
      * 
      * @param sourceFactory the proxy factory that will be used to create the injected proxy for a reference
      * @param targetFactory the proxy factory that contains the invocation chains for the target side of the wire
-     * @param targetType the {@link org.apache.tuscany.core.builder.RuntimeConfiguration} implementation type for the
+     * @param targetType the {@link org.apache.tuscany.core.builder.ContextFactory} implementation type for the
      *        wire target
      * @param downScope whether the source is a shorter lived scope than the target. Used in optimization.
      * @param targetScopeContext the scope context of the target service

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeContext.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeContext.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeContext.java Tue Mar 14 08:57:08 2006
@@ -18,7 +18,7 @@
 
 import java.util.List;
 
-import org.apache.tuscany.core.builder.RuntimeConfiguration;
+import org.apache.tuscany.core.builder.ContextFactory;
 
 /**
  * Manages the lifecycle and visibility of <code>InstanceContext</code>s.
@@ -35,14 +35,14 @@
     public boolean isCacheable();
 
     /**
-     * Registers the runtime configurations used to construct instance contexts for the scope
+     * Registers the context factory used to construct instance contexts for the scope
      */
-    public void registerConfigurations(List<RuntimeConfiguration<InstanceContext>> configurations);
+    public void registerFactorys(List<ContextFactory<InstanceContext>> configurations);
 
     /**
-     * Adds a runtime configuration to the scope
+     * Adds a context factory to the scope
      */
-    public void registerConfiguration(RuntimeConfiguration<InstanceContext> configuration);
+    public void registerFactory(ContextFactory<InstanceContext> configuration);
 
     /**
      * Returns a context bound to the given name or null if the component does not exist. The returned context is bound

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractAggregateContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractAggregateContext.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractAggregateContext.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractAggregateContext.java Tue Mar 14 08:57:08 2006
@@ -19,7 +19,7 @@
 
 import org.apache.tuscany.common.monitor.MonitorFactory;
 import org.apache.tuscany.core.builder.BuilderConfigException;
-import org.apache.tuscany.core.builder.RuntimeConfiguration;
+import org.apache.tuscany.core.builder.ContextFactory;
 import org.apache.tuscany.core.config.ConfigurationException;
 import org.apache.tuscany.core.context.AbstractContext;
 import org.apache.tuscany.core.context.AggregateContext;
@@ -85,7 +85,7 @@
     // protected ModuleComponent moduleComponent;
     protected Module module;
 
-    protected Map<String, RuntimeConfiguration<InstanceContext>> configurations = new HashMap();
+    protected Map<String, ContextFactory<InstanceContext>> configurations = new HashMap();
 
     // Factory for scope contexts
     @Autowire(required = false)
@@ -147,15 +147,15 @@
                 lifecycleState = INITIALIZING;
                 initializeScopes();
 
-                Map<Scope, List<RuntimeConfiguration<SimpleComponentContext>>> configurationsByScope = new HashMap();
+                Map<Scope, List<ContextFactory<SimpleComponentContext>>> configurationsByScope = new HashMap();
                 if (configurations != null) {
-                    for (RuntimeConfiguration source : configurations.values()) {
+                    for (ContextFactory source : configurations.values()) {
                         // FIXME scopes are defined at the interface level
                         Scope sourceScope = source.getScope();
                         wireSource(source);
                         buildTarget(source);
                         scopeIndex.put(source.getName(), scopeContexts.get(sourceScope));
-                        List<RuntimeConfiguration<SimpleComponentContext>> list = configurationsByScope.get(sourceScope);
+                        List<ContextFactory<SimpleComponentContext>> list = configurationsByScope.get(sourceScope);
                         if (list == null) {
                             list = new ArrayList();
                             configurationsByScope.put(sourceScope, list);
@@ -175,7 +175,7 @@
                 for (Map.Entry entries : configurationsByScope.entrySet()) {
                     // register configurations with scope contexts
                     ScopeContext scope = scopeContexts.get(entries.getKey());
-                    scope.registerConfigurations((List<RuntimeConfiguration<InstanceContext>>) entries.getValue());
+                    scope.registerFactorys((List<ContextFactory<InstanceContext>>) entries.getValue());
                 }
                 initializeProxies();
                 for (ScopeContext scope : scopeContexts.values()) {
@@ -282,7 +282,7 @@
                 throw e;
             }
         }
-        RuntimeConfiguration<InstanceContext> configuration = null;
+        ContextFactory<InstanceContext> configuration = null;
         if (model instanceof Module) {
             // merge new module definition with the existing one
             Module oldModule = module;
@@ -296,7 +296,7 @@
                     e.addContextName(getName());
                     throw e;
                 }
-                configuration = (RuntimeConfiguration<InstanceContext>) componentImplementation.getRuntimeConfiguration();
+                configuration = (ContextFactory<InstanceContext>) componentImplementation.getContextFactory();
                 if (configuration == null) {
                     ConfigurationException e = new ConfigurationException("Runtime configuration not set");
                     e.addContextName(component.getName());
@@ -307,7 +307,7 @@
                 registerAutowire(component);
             }
             for (EntryPoint ep : newModule.getEntryPoints()) {
-                configuration = (RuntimeConfiguration<InstanceContext>) ep.getConfiguredReference().getRuntimeConfiguration();
+                configuration = (ContextFactory<InstanceContext>) ep.getConfiguredReference().getContextFactory();
                 if (configuration == null) {
                     ConfigurationException e = new ConfigurationException("Runtime configuration not set");
                     e.setIdentifier(ep.getName());
@@ -318,7 +318,7 @@
                 registerAutowire(ep);
             }
             for (ExternalService service : newModule.getExternalServices()) {
-                configuration = (RuntimeConfiguration<InstanceContext>) service.getConfiguredService().getRuntimeConfiguration();
+                configuration = (ContextFactory<InstanceContext>) service.getConfiguredService().getContextFactory();
                 if (configuration == null) {
                     ConfigurationException e = new ConfigurationException("Runtime configuration not set");
                     e.setIdentifier(service.getName());
@@ -330,8 +330,8 @@
             }
             if (lifecycleState == RUNNING) {
                 for (Component component : newModule.getComponents()) {
-                    RuntimeConfiguration<InstanceContext> config = (RuntimeConfiguration<InstanceContext>) component
-                            .getComponentImplementation().getRuntimeConfiguration();
+                    ContextFactory<InstanceContext> config = (ContextFactory<InstanceContext>) component
+                            .getComponentImplementation().getContextFactory();
                     wireSource(config);
                     buildTarget(config);
                     config.prepare(this);
@@ -353,8 +353,8 @@
 
                 }
                 for (EntryPoint ep : newModule.getEntryPoints()) {
-                    RuntimeConfiguration<InstanceContext> config = (RuntimeConfiguration<InstanceContext>) ep
-                            .getConfiguredReference().getRuntimeConfiguration();
+                    ContextFactory<InstanceContext> config = (ContextFactory<InstanceContext>) ep
+                            .getConfiguredReference().getContextFactory();
                     wireSource(config);
                     buildTarget(config);
                     config.prepare(this);
@@ -376,8 +376,8 @@
 
                 }
                 for (ExternalService es : newModule.getExternalServices()) {
-                    RuntimeConfiguration<InstanceContext> config = (RuntimeConfiguration<InstanceContext>) es
-                            .getConfiguredService().getRuntimeConfiguration();
+                    ContextFactory<InstanceContext> config = (ContextFactory<InstanceContext>) es
+                            .getConfiguredService().getContextFactory();
                     buildTarget(config);
                     config.prepare(this);
                     try {
@@ -407,16 +407,16 @@
             if (model instanceof Component) {
                 Component component = (Component) model;
                 module.getComponents().add(component);
-                configuration = (RuntimeConfiguration<InstanceContext>) component.getComponentImplementation()
-                        .getRuntimeConfiguration();
+                configuration = (ContextFactory<InstanceContext>) component.getComponentImplementation()
+                        .getContextFactory();
             } else if (model instanceof EntryPoint) {
                 EntryPoint ep = (EntryPoint) model;
                 module.getEntryPoints().add(ep);
-                configuration = (RuntimeConfiguration<InstanceContext>) ep.getConfiguredReference().getRuntimeConfiguration();
+                configuration = (ContextFactory<InstanceContext>) ep.getConfiguredReference().getContextFactory();
             } else if (model instanceof ExternalService) {
                 ExternalService service = (ExternalService) model;
                 module.getExternalServices().add(service);
-                configuration = (RuntimeConfiguration<InstanceContext>) service.getConfiguredService().getRuntimeConfiguration();
+                configuration = (ContextFactory<InstanceContext>) service.getConfiguredService().getContextFactory();
             } else {
                 BuilderConfigException e = new BuilderConfigException("Unknown model type");
                 e.setIdentifier(model.getClass().getName());
@@ -436,7 +436,7 @@
         }
     }
 
-    protected void registerConfiguration(RuntimeConfiguration<InstanceContext> configuration) throws ConfigurationException {
+    protected void registerConfiguration(ContextFactory<InstanceContext> configuration) throws ConfigurationException {
         configuration.prepare(this);
         if (lifecycleState == RUNNING) {
             if (scopeIndex.get(configuration.getName()) != null) {
@@ -450,7 +450,7 @@
                 e.addContextName(getName());
                 throw e;
             }
-            scope.registerConfiguration(configuration);
+            scope.registerFactory(configuration);
             scopeIndex.put(configuration.getName(), scope);
             configurations.put(configuration.getName(), configuration); // xcv
         } else {
@@ -582,12 +582,12 @@
     /**
      * Iterates through references and delegates to the configuration context to wire them to their targets
      */
-    protected void wireSource(RuntimeConfiguration source) {
+    protected void wireSource(ContextFactory source) {
         Scope sourceScope = source.getScope();
         if (source.getSourceProxyFactories() != null) {
             for (ProxyFactory sourceFactory : ((List<ProxyFactory>) source.getSourceProxyFactories())) {
                 QualifiedName targetName = sourceFactory.getProxyConfiguration().getTargetName();
-                RuntimeConfiguration target = configurations.get(targetName.getPartName());
+                ContextFactory target = configurations.get(targetName.getPartName());
                 if (target == null) {
                     ContextInitException e = new ContextInitException("Target not found");
                     e.setIdentifier(targetName.getPartName());
@@ -636,7 +636,7 @@
     /**
      * Signals to target side of reference configurations to initialize
      */
-    protected void buildTarget(RuntimeConfiguration target) {
+    protected void buildTarget(ContextFactory target) {
         if (target.getTargetProxyFactories() != null) {
             for (ProxyFactory targetFactory : ((Map<String, ProxyFactory>) target.getTargetProxyFactories()).values()) {
                 for (InvocationConfiguration iConfig : (Collection<InvocationConfiguration>) targetFactory
@@ -648,7 +648,7 @@
     }
 
     protected void initializeProxies() throws ProxyInitializationException {
-        for (RuntimeConfiguration config : configurations.values()) {
+        for (ContextFactory config : configurations.values()) {
             if (config.getSourceProxyFactories() != null) {
                 for (ProxyFactory sourceProxyFactory : (Collection<ProxyFactory>) config.getSourceProxyFactories()) {
                     sourceProxyFactory.initialize();

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeContext.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeContext.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeContext.java Tue Mar 14 08:57:08 2006
@@ -20,7 +20,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.tuscany.core.builder.RuntimeConfiguration;
+import org.apache.tuscany.core.builder.ContextFactory;
 import org.apache.tuscany.core.context.AbstractContext;
 import org.apache.tuscany.core.context.InstanceContext;
 import org.apache.tuscany.core.context.QualifiedName;
@@ -43,7 +43,7 @@
     // ----------------------------------
 
     // The collection of runtime configurations for the scope
-    protected Map<String, RuntimeConfiguration<InstanceContext>> runtimeConfigurations = new ConcurrentHashMap();
+    protected Map<String, ContextFactory<InstanceContext>> contextFactorys = new ConcurrentHashMap();
 
     // The event context the scope container is associated with
     protected EventContext eventContext;
@@ -72,9 +72,9 @@
     // Scope methods
     // ----------------------------------
 
-    public void registerConfigurations(List<RuntimeConfiguration<InstanceContext>> configurations) {
-        for (RuntimeConfiguration<InstanceContext> configuration : configurations) {
-            runtimeConfigurations.put(configuration.getName(), configuration);
+    public void registerFactorys(List<ContextFactory<InstanceContext>> configurations) {
+        for (ContextFactory<InstanceContext> configuration : configurations) {
+            contextFactorys.put(configuration.getName(), configuration);
         }
     }
 

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AggregateScopeContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AggregateScopeContext.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AggregateScopeContext.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AggregateScopeContext.java Tue Mar 14 08:57:08 2006
@@ -21,7 +21,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.tuscany.core.builder.RuntimeConfiguration;
+import org.apache.tuscany.core.builder.ContextFactory;
 import org.apache.tuscany.core.context.AbstractContext;
 import org.apache.tuscany.core.context.AggregateContext;
 import org.apache.tuscany.core.context.EventContext;
@@ -47,7 +47,7 @@
 
     private EventContext eventContext;
 
-    private List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
+    private List<ContextFactory<InstanceContext>> configs = new ArrayList();
 
     // Aggregate component contexts in this scope keyed by name
     private Map<String, AggregateContext> contexts = new ConcurrentHashMap();
@@ -70,8 +70,8 @@
     // ----------------------------------
 
     public void start() throws ScopeInitializationException {
-        for (RuntimeConfiguration<InstanceContext> configuration : configs) {
-            InstanceContext context = configuration.createInstanceContext();
+        for (ContextFactory<InstanceContext> configuration : configs) {
+            InstanceContext context = configuration.createContext();
             if (!(context instanceof AggregateContext)) {
                 ScopeInitializationException e = new ScopeInitializationException("Context not an aggregate type");
                 e.addContextName(context.getName());
@@ -94,15 +94,15 @@
     // Methods
     // ----------------------------------
 
-    public void registerConfigurations(List<RuntimeConfiguration<InstanceContext>> configurations) {
+    public void registerFactorys(List<ContextFactory<InstanceContext>> configurations) {
         this.configs = configurations;
     }
 
-    public void registerConfiguration(RuntimeConfiguration<InstanceContext> configuration) {
+    public void registerFactory(ContextFactory<InstanceContext> configuration) {
         assert (configuration != null) : "Configuration was null";
         configs.add(configuration);
         if (lifecycleState == RUNNING) {
-            InstanceContext context = configuration.createInstanceContext();
+            InstanceContext context = configuration.createContext();
             if (!(context instanceof AggregateContext)) {
                 ScopeInitializationException e = new ScopeInitializationException("Context not an aggregate type");
                 e.setIdentifier(context.getName());

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/HttpSessionScopeContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/HttpSessionScopeContext.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/HttpSessionScopeContext.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/HttpSessionScopeContext.java Tue Mar 14 08:57:08 2006
@@ -21,7 +21,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import org.apache.tuscany.core.builder.RuntimeConfiguration;
+import org.apache.tuscany.core.builder.ContextFactory;
 import org.apache.tuscany.core.context.Context;
 import org.apache.tuscany.core.context.CoreRuntimeException;
 import org.apache.tuscany.core.context.EventContext;
@@ -101,8 +101,8 @@
         return true;
     }
 
-    public void registerConfiguration(RuntimeConfiguration<InstanceContext> configuration) {
-        runtimeConfigurations.put(configuration.getName(), configuration);
+    public void registerFactory(ContextFactory<InstanceContext> configuration) {
+        contextFactorys.put(configuration.getName(), configuration);
     }
 
     public InstanceContext getContext(String ctxName) {
@@ -118,9 +118,9 @@
         InstanceContext ctx = ctxs.get(ctxName);
         if (ctx == null) {
             // the configuration was added after the session had started, so create a context now and start it
-            RuntimeConfiguration<InstanceContext> configuration = runtimeConfigurations.get(ctxName);
+            ContextFactory<InstanceContext> configuration = contextFactorys.get(ctxName);
             if (configuration != null) {
-                ctx = configuration.createInstanceContext();
+                ctx = configuration.createContext();
                 ctx.addContextListener(this);
                 ctx.start();
                 ctxs.put(ctx.getName(), ctx);
@@ -214,10 +214,10 @@
         if (m != null) {
             return m; // already created, return
         }
-        Map<String, InstanceContext> sessionContext = new ConcurrentHashMap(runtimeConfigurations.size());
-        for (RuntimeConfiguration<InstanceContext> config : runtimeConfigurations.values()) {
+        Map<String, InstanceContext> sessionContext = new ConcurrentHashMap(contextFactorys.size());
+        for (ContextFactory<InstanceContext> config : contextFactorys.values()) {
             InstanceContext context = null;
-            context = config.createInstanceContext();
+            context = config.createContext();
             context.addContextListener(this);
             context.start();
             sessionContext.put(context.getName(), context);

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/ModuleScopeContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/ModuleScopeContext.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/ModuleScopeContext.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/ModuleScopeContext.java Tue Mar 14 08:57:08 2006
@@ -21,7 +21,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import org.apache.tuscany.core.builder.RuntimeConfiguration;
+import org.apache.tuscany.core.builder.ContextFactory;
 import org.apache.tuscany.core.context.Context;
 import org.apache.tuscany.core.context.CoreRuntimeException;
 import org.apache.tuscany.core.context.EventContext;
@@ -96,10 +96,10 @@
         return true;
     }
 
-    public void registerConfiguration(RuntimeConfiguration<InstanceContext> configuration) {
-        runtimeConfigurations.put(configuration.getName(), configuration);
+    public void registerFactory(ContextFactory<InstanceContext> configuration) {
+        contextFactorys.put(configuration.getName(), configuration);
         if (lifecycleState == RUNNING) {
-            componentContexts.put(configuration.getName(), configuration.createInstanceContext());
+            componentContexts.put(configuration.getName(), configuration.createContext());
         }
     }
 
@@ -157,8 +157,8 @@
         if (componentContexts == null) {
             componentContexts = new ConcurrentHashMap();
             destroyableContexts = new ConcurrentLinkedQueue();
-            for (RuntimeConfiguration<InstanceContext> config : runtimeConfigurations.values()) {
-                InstanceContext context = config.createInstanceContext();
+            for (ContextFactory<InstanceContext> config : contextFactorys.values()) {
+                InstanceContext context = config.createContext();
                 context.addContextListener(this);
                 context.start();
                 componentContexts.put(context.getName(), context);

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java Tue Mar 14 08:57:08 2006
@@ -21,7 +21,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import org.apache.tuscany.core.builder.RuntimeConfiguration;
+import org.apache.tuscany.core.builder.ContextFactory;
 import org.apache.tuscany.core.context.InstanceContext;
 import org.apache.tuscany.core.context.Context;
 import org.apache.tuscany.core.context.LifecycleEventListener;
@@ -104,8 +104,8 @@
         return true;
     }
 
-    public void registerConfiguration(RuntimeConfiguration<InstanceContext> configuration) {
-        runtimeConfigurations.put(configuration.getName(), configuration);
+    public void registerFactory(ContextFactory<InstanceContext> configuration) {
+        contextFactorys.put(configuration.getName(), configuration);
     }
     
     public InstanceContext getContext(String ctxName) {
@@ -114,9 +114,9 @@
         InstanceContext ctx = contexts.get(ctxName);
         if (ctx == null){
             // check to see if the configuration was added after the request was started
-            RuntimeConfiguration<InstanceContext> configuration = runtimeConfigurations.get(ctxName);
+            ContextFactory<InstanceContext> configuration = contextFactorys.get(ctxName);
             if (configuration != null) {
-                ctx = configuration.createInstanceContext();
+                ctx = configuration.createContext();
                 ctx.addContextListener(this);
                 ctx.start();
                 contexts.put(ctx.getName(), ctx);
@@ -208,9 +208,9 @@
         if (contexts == null) {
             contexts = new ConcurrentHashMap();
             Queue shutdownQueue = new ConcurrentLinkedQueue();
-            for (RuntimeConfiguration<InstanceContext> config : runtimeConfigurations.values()) {
+            for (ContextFactory<InstanceContext> config : contextFactorys.values()) {
                 InstanceContext context = null;
-                context = config.createInstanceContext();
+                context = config.createContext();
                 context.addContextListener(this);
                 context.start();
                 contexts.put(context.getName(), context);

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/StatelessScopeContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/StatelessScopeContext.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/StatelessScopeContext.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/StatelessScopeContext.java Tue Mar 14 08:57:08 2006
@@ -19,7 +19,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.tuscany.core.builder.RuntimeConfiguration;
+import org.apache.tuscany.core.builder.ContextFactory;
 import org.apache.tuscany.core.context.InstanceContext;
 import org.apache.tuscany.core.context.Context;
 import org.apache.tuscany.core.context.LifecycleEventListener;
@@ -76,10 +76,10 @@
     // Methods
     // ----------------------------------
 
-    public void registerConfiguration(RuntimeConfiguration<InstanceContext> configuration) {
-        runtimeConfigurations.put(configuration.getName(), configuration);
+    public void registerFactory(ContextFactory<InstanceContext> configuration) {
+        contextFactorys.put(configuration.getName(), configuration);
         if (lifecycleState == RUNNING) {
-            contextMap.put(configuration.getName(), configuration.createInstanceContext());
+            contextMap.put(configuration.getName(), configuration.createContext());
         }
 
     }
@@ -129,10 +129,10 @@
         }
         if (contextMap == null) {
             contextMap = new ConcurrentHashMap();
-            for (RuntimeConfiguration<InstanceContext> config : runtimeConfigurations.values()) {
-                for (int i = 0; i < runtimeConfigurations.size(); i++) {
+            for (ContextFactory<InstanceContext> config : contextFactorys.values()) {
+                for (int i = 0; i < contextFactorys.size(); i++) {
                     InstanceContext context = null;
-                    context = config.createInstanceContext();
+                    context = config.createContext();
                     context.addContextListener(this);
                     context.start();
                     contextMap.put(context.getName(), context);

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=385834&r1=385833&r2=385834&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 Tue Mar 14 08:57:08 2006
@@ -14,7 +14,7 @@
 package org.apache.tuscany.core.runtime;
 
 import org.apache.tuscany.common.monitor.MonitorFactory;
-import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
+import org.apache.tuscany.core.builder.ContextFactoryBuilder;
 import org.apache.tuscany.core.builder.WireBuilder;
 import org.apache.tuscany.core.context.AggregateContext;
 import org.apache.tuscany.core.context.AutowireContext;
@@ -60,7 +60,7 @@
      * Adds a configuration builder to the runtime
      */
     @Deprecated
-    public void addBuilder(RuntimeConfigurationBuilder builder);
+    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=385834&r1=385833&r2=385834&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 Tue Mar 14 08:57:08 2006
@@ -20,7 +20,7 @@
 import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
 import org.apache.tuscany.core.builder.BuilderConfigException;
 import org.apache.tuscany.core.builder.HierarchicalWireBuilder;
-import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
+import org.apache.tuscany.core.builder.ContextFactoryBuilder;
 import org.apache.tuscany.core.builder.WireBuilder;
 import org.apache.tuscany.core.builder.impl.AssemblyVisitor;
 import org.apache.tuscany.core.builder.impl.DefaultWireBuilder;
@@ -55,7 +55,7 @@
  */
 public class RuntimeContextImpl extends AbstractContext implements RuntimeContext {
 
-    private final List<RuntimeConfigurationBuilder> builders;
+    private final List<ContextFactoryBuilder> builders;
 
     private final List<SCDLModelLoader> loaders;
 
@@ -86,7 +86,7 @@
      *        implementation will be used
      */
     public RuntimeContextImpl(MonitorFactory monitorFactory, List<SCDLModelLoader> loaders,
-            List<RuntimeConfigurationBuilder> builders, HierarchicalWireBuilder wireBuilder) {
+            List<ContextFactoryBuilder> builders, HierarchicalWireBuilder wireBuilder) {
         super(RUNTIME);
         this.monitorFactory = monitorFactory;
         this.builders = (builders == null) ? new ArrayList(1) : builders;
@@ -109,7 +109,7 @@
      *        implementation will be used
      */
     public RuntimeContextImpl(MonitorFactory monitorFactory, AggregateContext rootContext, SystemAggregateContext systemContext,
-            List<SCDLModelLoader> loaders, List<RuntimeConfigurationBuilder> builders, HierarchicalWireBuilder wireBuilder) {
+            List<SCDLModelLoader> loaders, List<ContextFactoryBuilder> builders, HierarchicalWireBuilder wireBuilder) {
         super(RUNTIME);
         this.rootContext = rootContext;
         this.systemContext = systemContext;
@@ -137,7 +137,7 @@
         lifecycleState = STOPPED;
     }
 
-    public void addBuilder(RuntimeConfigurationBuilder builder) {
+    public void addBuilder(ContextFactoryBuilder builder) {
         assert (builder != null) : "Builder was null";
         builders.add(builder);
     }

Copied: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java (from r385814, 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/SystemContextFactoryBuilder.java?p2=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java&p1=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentContextBuilder.java&r1=385814&r2=385834&rev=385834&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/SystemContextFactoryBuilder.java Tue Mar 14 08:57:08 2006
@@ -27,7 +27,7 @@
 import org.apache.tuscany.core.builder.ContextResolver;
 import org.apache.tuscany.core.builder.NoAccessorException;
 import org.apache.tuscany.core.builder.ObjectFactory;
-import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
+import org.apache.tuscany.core.builder.ContextFactoryBuilder;
 import org.apache.tuscany.core.builder.UnknownTypeException;
 import org.apache.tuscany.core.builder.impl.ArrayMultiplicityObjectFactory;
 import org.apache.tuscany.core.builder.impl.ListMultiplicityObjectFactory;
@@ -52,7 +52,7 @@
 import org.apache.tuscany.core.system.annotation.Autowire;
 import org.apache.tuscany.core.system.annotation.ParentContext;
 import org.apache.tuscany.core.system.assembly.SystemImplementation;
-import org.apache.tuscany.core.system.config.SystemComponentRuntimeConfiguration;
+import org.apache.tuscany.core.system.config.SystemContextFactory;
 import org.apache.tuscany.core.system.context.SystemAggregateContextImpl;
 import org.apache.tuscany.core.system.injection.AutowireObjectFactory;
 import org.apache.tuscany.model.assembly.AssemblyModelObject;
@@ -82,13 +82,13 @@
  * 
  * @version $Rev$ $Date$
  */
-public class SystemComponentContextBuilder implements RuntimeConfigurationBuilder<AggregateContext> {
+public class SystemContextFactoryBuilder implements ContextFactoryBuilder<AggregateContext> {
 
     // ----------------------------------
     // Constructors
     // ----------------------------------
 
-    public SystemComponentContextBuilder() {
+    public SystemContextFactoryBuilder() {
     }
 
     // ----------------------------------
@@ -105,7 +105,7 @@
         Scope scope = null;
         // Get the component implementation
         ComponentImplementation componentImplementation = component.getComponentImplementation();
-        if (componentImplementation instanceof SystemImplementation && componentImplementation.getRuntimeConfiguration() == null) {
+        if (componentImplementation instanceof SystemImplementation && componentImplementation.getContextFactory() == null) {
 
             // The component is a system component, implemented by a Java class
             SystemImplementation javaImpl = (SystemImplementation) componentImplementation;
@@ -156,13 +156,13 @@
         }
         Set<Field> fields;
         Set<Method> methods;
-        SystemComponentRuntimeConfiguration config = null;
+        SystemContextFactory config = null;
         try {
             fields = JavaIntrospectionHelper.getAllFields(implClass);
             methods = JavaIntrospectionHelper.getAllUniqueMethods(implClass);
             String name = component.getName();
             Constructor ctr = implClass.getConstructor((Class[]) null);
-            config = new SystemComponentRuntimeConfiguration(name, JavaIntrospectionHelper.getDefaultConstructor(implClass),
+            config = new SystemContextFactory(name, JavaIntrospectionHelper.getDefaultConstructor(implClass),
                     scope);
             ContextObjectFactory contextFactory = new ContextObjectFactory(config);
 
@@ -315,11 +315,7 @@
             config.setEagerInit(eagerInit);
             config.setInitInvoker(initInvoker);
             config.setDestroyInvoker(destroyInvoker);
-
-            // SystemComponentRuntimeConfiguration config = new SystemComponentRuntimeConfiguration(name,
-            // JavaIntrospectionHelper
-            // .getDefaultConstructor(implClass), injectors, eagerInit, initInvoker, destroyInvoker, scope);
-            componentImplementation.setRuntimeConfiguration(config);
+            componentImplementation.setContextFactory(config);
         } catch (BuilderConfigException e) {
             e.addContextName(component.getName());
             // e.addContextName(parentContext.getName());
@@ -331,7 +327,6 @@
         } catch (FactoryInitException e) {
             BuilderConfigException ce = new BuilderConfigException("Error building component", e);
             ce.addContextName(component.getName());
-            // ce.addContextName(parentContext.getName());
             throw ce;
         }
     }

Added: 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=385834&view=auto
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java (added)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java Tue Mar 14 08:57:08 2006
@@ -0,0 +1,77 @@
+/**
+ * 
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS"
+ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.apache.tuscany.core.system.builder;
+
+import org.apache.tuscany.core.builder.BuilderException;
+import org.apache.tuscany.core.builder.BuilderInitException;
+import org.apache.tuscany.core.builder.ContextFactoryBuilder;
+import org.apache.tuscany.core.context.AggregateContext;
+import org.apache.tuscany.core.injection.FactoryInitException;
+import org.apache.tuscany.core.system.assembly.SystemBinding;
+import org.apache.tuscany.core.system.config.SystemEntryPointContextFactory;
+import org.apache.tuscany.model.assembly.AssemblyModelObject;
+import org.apache.tuscany.model.assembly.ConfiguredService;
+import org.apache.tuscany.model.assembly.EntryPoint;
+
+/**
+ * Decorates the logical model with entry point context configuration builders
+ * 
+ * @version $Rev: 385747 $ $Date: 2006-03-13 22:12:53 -0800 (Mon, 13 Mar 2006) $
+ */
+public class SystemEntryPointBuilder implements ContextFactoryBuilder<AggregateContext> {
+
+    // ----------------------------------
+    // Constructors
+    // ----------------------------------
+
+    public SystemEntryPointBuilder() {
+    }
+
+    // ----------------------------------
+    // Methods
+    // ----------------------------------
+
+    public void build(AssemblyModelObject modelObject) throws BuilderException {
+        if (!(modelObject instanceof EntryPoint)) {
+            return;
+        }
+        EntryPoint entryPoint = (EntryPoint) modelObject;
+        if (!(entryPoint.getBindings().get(0) instanceof SystemBinding)
+                || entryPoint.getConfiguredReference().getContextFactory() != null) {
+            return;
+        }
+        try {
+            // Class type = entryPoint.getConfiguredReference().getReference().getServiceContract().getInterface();
+
+            String targetName = null;
+            ConfiguredService targetService = entryPoint.getConfiguredReference().getTargetConfiguredServices().get(0);
+            if (targetService.getAggregatePart() == null) {
+                // FIXME not correct
+                if (targetService.getService() == null) {
+                    BuilderInitException e = new BuilderInitException("No target service specified on ");
+                    e.setIdentifier(entryPoint.getName());
+                }
+                targetName = targetService.getService().getName();
+            } else {
+                targetName = targetService.getAggregatePart().getName();
+            }
+            SystemEntryPointContextFactory config = new SystemEntryPointContextFactory(entryPoint.getName(),
+                    targetName);
+            entryPoint.getConfiguredReference().setContextFactory(config);
+        } catch (FactoryInitException e) {
+            e.addContextName(entryPoint.getName());
+            throw e;
+        }
+    }
+}

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=385834&r1=385833&r2=385834&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 Tue Mar 14 08:57:08 2006
@@ -15,11 +15,11 @@
 
 import org.apache.tuscany.core.builder.BuilderConfigException;
 import org.apache.tuscany.core.builder.BuilderException;
-import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
+import org.apache.tuscany.core.builder.ContextFactoryBuilder;
 import org.apache.tuscany.core.context.AggregateContext;
 import org.apache.tuscany.core.injection.InterAggregateReferenceFactory;
 import org.apache.tuscany.core.system.assembly.SystemBinding;
-import org.apache.tuscany.core.system.config.SystemExternalServiceRuntimeConfiguration;
+import org.apache.tuscany.core.system.config.SystemExternalServiceContextFactory;
 import org.apache.tuscany.core.system.injection.AutowireObjectFactory;
 import org.apache.tuscany.model.assembly.AssemblyModelObject;
 import org.apache.tuscany.model.assembly.ExternalService;
@@ -29,7 +29,7 @@
  * 
  * @version $Rev$ $Date$
  */
-public class SystemExternalServiceBuilder implements RuntimeConfigurationBuilder<AggregateContext> {
+public class SystemExternalServiceBuilder implements ContextFactoryBuilder<AggregateContext> {
     // ----------------------------------
     // Constructors
     // ----------------------------------
@@ -47,7 +47,7 @@
         }
         ExternalService externalService = (ExternalService) modelObject;
         if (externalService.getConfiguredService() != null
-                && externalService.getConfiguredService().getRuntimeConfiguration() != null) {
+                && externalService.getConfiguredService().getContextFactory() != null) {
             return;
         } else if (externalService.getBindings() == null || externalService.getBindings().size() < 1
                 || !(externalService.getBindings().get(0) instanceof SystemBinding)) {
@@ -55,9 +55,9 @@
         }
         SystemBinding binding = (SystemBinding)externalService.getBindings().get(0);
         if (binding.getTargetName() != null) {
-            SystemExternalServiceRuntimeConfiguration config = new SystemExternalServiceRuntimeConfiguration(externalService
+            SystemExternalServiceContextFactory config = new SystemExternalServiceContextFactory(externalService
                     .getName(), new InterAggregateReferenceFactory(binding.getTargetName()));
-            externalService.getConfiguredService().setRuntimeConfiguration(config);
+            externalService.getConfiguredService().setContextFactory(config);
         } else if (externalService.getConfiguredService().getService().getServiceContract().getInterface() != null) {
             // autowire
             Class<?> claz = externalService.getConfiguredService().getService().getServiceContract().getInterface();
@@ -67,9 +67,9 @@
                 e.addContextName(externalService.getName());
                 throw e;
             }
-            SystemExternalServiceRuntimeConfiguration config = new SystemExternalServiceRuntimeConfiguration(externalService
+            SystemExternalServiceContextFactory config = new SystemExternalServiceContextFactory(externalService
                     .getName(), new AutowireObjectFactory(claz)); 
-            externalService.getConfiguredService().setRuntimeConfiguration(config);
+            externalService.getConfiguredService().setContextFactory(config);
         }
     }
 }

Copied: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java (from r385814, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemComponentRuntimeConfiguration.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java?p2=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java&p1=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemComponentRuntimeConfiguration.java&r1=385814&r2=385834&rev=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemComponentRuntimeConfiguration.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java Tue Mar 14 08:57:08 2006
@@ -6,7 +6,7 @@
 
 import org.apache.tuscany.core.builder.ContextCreationException;
 import org.apache.tuscany.core.builder.ContextResolver;
-import org.apache.tuscany.core.builder.RuntimeConfiguration;
+import org.apache.tuscany.core.builder.ContextFactory;
 import org.apache.tuscany.core.context.AggregateContext;
 import org.apache.tuscany.core.context.InstanceContext;
 import org.apache.tuscany.core.injection.EventInvoker;
@@ -17,11 +17,11 @@
 import org.apache.tuscany.model.assembly.Scope;
 
 /**
- * A RuntimeConfiguration that handles system component implementation types
+ * A ContextFactory that handles system component implementation types
  * 
  * @version $Rev$ $Date$
  */
-public class SystemComponentRuntimeConfiguration implements RuntimeConfiguration<InstanceContext>, ContextResolver {
+public class SystemContextFactory implements ContextFactory<InstanceContext>, ContextResolver {
 
     // the component name as configured in the hosting module
     private String name;
@@ -70,7 +70,7 @@
      *        <code>@Destroy</code>
      * @param scope the scope of the component implementation type
      */
-    public SystemComponentRuntimeConfiguration(String name, Constructor ctr, List<Injector> setters, boolean eagerInit,
+    public SystemContextFactory(String name, Constructor ctr, List<Injector> setters, boolean eagerInit,
             EventInvoker init, EventInvoker destroy, Scope scope) {
         assert (name != null) : "Name was null";
         assert (ctr != null) : "Constructor was null";
@@ -86,7 +86,7 @@
         stateless = (scope == Scope.INSTANCE);
     }
 
-    public SystemComponentRuntimeConfiguration(String name, Constructor ctr, Scope scope) {
+    public SystemContextFactory(String name, Constructor ctr, Scope scope) {
         this(name, ctr, null, false, null, null, scope);
     }
 
@@ -102,7 +102,7 @@
         return scope;
     }
 
-    public InstanceContext createInstanceContext() throws ContextCreationException {
+    public InstanceContext createContext() throws ContextCreationException {
         if (isAggregate) {
             // aggregate context types are themselves an instance context
             PojoObjectFactory objectFactory = new PojoObjectFactory(ctr, null, setters);

Copied: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointContextFactory.java (from r385814, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointRuntimeConfiguration.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointContextFactory.java?p2=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointContextFactory.java&p1=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointRuntimeConfiguration.java&r1=385814&r2=385834&rev=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointRuntimeConfiguration.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointContextFactory.java Tue Mar 14 08:57:08 2006
@@ -18,7 +18,7 @@
 
 import org.apache.tuscany.core.builder.ContextCreationException;
 import org.apache.tuscany.core.builder.ContextResolver;
-import org.apache.tuscany.core.builder.RuntimeConfiguration;
+import org.apache.tuscany.core.builder.ContextFactory;
 import org.apache.tuscany.core.context.AggregateContext;
 import org.apache.tuscany.core.context.EntryPointContext;
 import org.apache.tuscany.core.invocation.spi.ProxyFactory;
@@ -30,7 +30,7 @@
  * 
  * @version $Rev$ $Date$
  */
-public class SystemEntryPointRuntimeConfiguration implements RuntimeConfiguration<EntryPointContext>, ContextResolver {
+public class SystemEntryPointContextFactory implements ContextFactory<EntryPointContext>, ContextResolver {
 
     // the name of the entry point
     private String name;
@@ -43,7 +43,7 @@
     // Constructors
     // ----------------------------------
 
-    public SystemEntryPointRuntimeConfiguration(String name, String targetName) {
+    public SystemEntryPointContextFactory(String name, String targetName) {
         this.name = name;
         this.targetName = targetName;
     }
@@ -52,7 +52,7 @@
     // Methods
     // ----------------------------------
 
-    public EntryPointContext createInstanceContext() throws ContextCreationException {
+    public EntryPointContext createContext() throws ContextCreationException {
         return new SystemEntryPointContext(name, targetName, this);
     }
 

Copied: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceContextFactory.java (from r385814, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceRuntimeConfiguration.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceContextFactory.java?p2=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceContextFactory.java&p1=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceRuntimeConfiguration.java&r1=385814&r2=385834&rev=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceRuntimeConfiguration.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceContextFactory.java Tue Mar 14 08:57:08 2006
@@ -17,15 +17,14 @@
 import java.util.Map;
 
 import org.apache.tuscany.core.builder.ContextCreationException;
+import org.apache.tuscany.core.builder.ContextFactory;
 import org.apache.tuscany.core.builder.ContextResolver;
 import org.apache.tuscany.core.builder.ObjectFactory;
-import org.apache.tuscany.core.builder.RuntimeConfiguration;
 import org.apache.tuscany.core.context.AggregateContext;
 import org.apache.tuscany.core.context.ExternalServiceContext;
 import org.apache.tuscany.core.injection.InterAggregateReferenceFactory;
 import org.apache.tuscany.core.invocation.spi.ProxyFactory;
 import org.apache.tuscany.core.system.context.SystemExternalServiceContext;
-import org.apache.tuscany.core.system.injection.AutowireFactory;
 import org.apache.tuscany.core.system.injection.AutowireObjectFactory;
 import org.apache.tuscany.model.assembly.Scope;
 
@@ -37,7 +36,7 @@
  * 
  * @version $Rev$ $Date$
  */
-public class SystemExternalServiceRuntimeConfiguration implements RuntimeConfiguration<ExternalServiceContext>, ContextResolver {
+public class SystemExternalServiceContextFactory implements ContextFactory<ExternalServiceContext>, ContextResolver {
 
     // the name of the external service
     private String name;
@@ -52,7 +51,7 @@
     // Constructors
     // ----------------------------------
 
-    public SystemExternalServiceRuntimeConfiguration(String name, ObjectFactory factory) {
+    public SystemExternalServiceContextFactory(String name, ObjectFactory factory) {
         assert (name != null) : "Name was null";
         assert (factory != null) : "Object factory was null";
         this.name = name;
@@ -71,7 +70,7 @@
         return name;
     }
 
-    public ExternalServiceContext createInstanceContext() throws ContextCreationException {
+    public ExternalServiceContext createContext() throws ContextCreationException {
         return new SystemExternalServiceContext(name, factory);
     }