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 [2/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...

Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/context/MultiplicityTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/context/MultiplicityTestCase.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/context/MultiplicityTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/context/MultiplicityTestCase.java Tue Mar 14 08:57:08 2006
@@ -19,13 +19,13 @@
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder;
+import org.apache.tuscany.container.java.builder.JavaContextFactoryBuilder;
 import org.apache.tuscany.container.java.builder.JavaTargetWireBuilder;
 import org.apache.tuscany.container.java.mock.MockConfigContext;
 import org.apache.tuscany.container.java.mock.MockFactory;
 import org.apache.tuscany.container.java.mock.components.Source;
 import org.apache.tuscany.container.java.mock.components.Target;
-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.EventContext;
@@ -62,8 +62,8 @@
     private AggregateContext createContext() {
         AggregateContextImpl context = new AggregateContextImpl();
         context.setName("system.context");
-        List<RuntimeConfigurationBuilder>builders = MockFactory.createSystemBuilders();
-        builders.add(new JavaComponentContextBuilder(new JDKProxyFactoryFactory(), new MessageFactoryImpl()));
+        List<ContextFactoryBuilder>builders = MockFactory.createSystemBuilders();
+        builders.add(new JavaContextFactoryBuilder(new JDKProxyFactoryFactory(), new MessageFactoryImpl()));
         List<WireBuilder> wireBuilders = new ArrayList();
         wireBuilders.add(new JavaTargetWireBuilder());
         context.setConfigurationContext(new MockConfigContext(builders,wireBuilders));

Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java Tue Mar 14 08:57:08 2006
@@ -19,7 +19,7 @@
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder;
+import org.apache.tuscany.container.java.builder.JavaContextFactoryBuilder;
 import org.apache.tuscany.container.java.builder.JavaTargetWireBuilder;
 import org.apache.tuscany.container.java.builder.MockHandlerBuilder;
 import org.apache.tuscany.container.java.builder.MockInterceptorBuilder;
@@ -27,7 +27,7 @@
 import org.apache.tuscany.container.java.invocation.mock.MockSyncInterceptor;
 import org.apache.tuscany.container.java.mock.MockFactory;
 import org.apache.tuscany.container.java.mock.components.GenericComponent;
-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.context.AggregateContext;
 import org.apache.tuscany.core.context.EventContext;
@@ -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;
 
@@ -63,14 +63,14 @@
     public void testRefWithSourceInterceptor() 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());
 
         ProxyFactoryFactory proxyFactoryFactory =new JDKProxyFactoryFactory();
         
-        JavaComponentContextBuilder javaBuilder = new JavaComponentContextBuilder();
+        JavaContextFactoryBuilder javaBuilder = new JavaContextFactoryBuilder();
         javaBuilder.setMessageFactory(msgFactory);
         javaBuilder.setProxyFactoryFactory(proxyFactoryFactory);
 
@@ -104,12 +104,12 @@
     public void testRefWithSourceInterceptorHandler() 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());
 
-        JavaComponentContextBuilder javaBuilder = new JavaComponentContextBuilder();
+        JavaContextFactoryBuilder javaBuilder = new JavaContextFactoryBuilder();
         javaBuilder.setMessageFactory(msgFactory);
         javaBuilder.setProxyFactoryFactory(new JDKProxyFactoryFactory());
 
@@ -150,12 +150,12 @@
     public void testRefWithTargetInterceptorHandler() 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());
 
-        JavaComponentContextBuilder javaBuilder = new JavaComponentContextBuilder();
+        JavaContextFactoryBuilder javaBuilder = new JavaContextFactoryBuilder();
         javaBuilder.setMessageFactory(msgFactory);
         javaBuilder.setProxyFactoryFactory(new JDKProxyFactoryFactory());
 
@@ -197,12 +197,12 @@
     public void testRefWithTargetInterceptor() 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());
 
-        JavaComponentContextBuilder javaBuilder = new JavaComponentContextBuilder();
+        JavaContextFactoryBuilder javaBuilder = new JavaContextFactoryBuilder();
         javaBuilder.setMessageFactory(msgFactory);
         javaBuilder.setProxyFactoryFactory(new JDKProxyFactoryFactory());
 

Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockConfigContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockConfigContext.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockConfigContext.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockConfigContext.java Tue Mar 14 08:57:08 2006
@@ -17,7 +17,7 @@
 import java.util.List;
 
 import org.apache.tuscany.core.builder.BuilderConfigException;
-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;
@@ -35,11 +35,11 @@
  */
 public class MockConfigContext implements ConfigurationContext {
 
-    private List<RuntimeConfigurationBuilder> builders;
+    private List<ContextFactoryBuilder> builders;
 
     private DefaultWireBuilder wireBuilder = new DefaultWireBuilder();
     
-    public MockConfigContext(List<RuntimeConfigurationBuilder> builders, List<WireBuilder> wireBuilders) {
+    public MockConfigContext(List<ContextFactoryBuilder> builders, List<WireBuilder> wireBuilders) {
         this.builders = (builders == null) ? new ArrayList(1) : builders;
         if (wireBuilders != null){
             for (WireBuilder builder : wireBuilders) {

Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java Tue Mar 14 08:57:08 2006
@@ -29,7 +29,7 @@
 import org.apache.tuscany.container.java.assembly.impl.JavaAssemblyFactoryImpl;
 import org.apache.tuscany.container.java.assembly.mock.HelloWorldImpl;
 import org.apache.tuscany.container.java.assembly.mock.HelloWorldService;
-import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder;
+import org.apache.tuscany.container.java.builder.JavaContextFactoryBuilder;
 import org.apache.tuscany.container.java.builder.JavaTargetWireBuilder;
 import org.apache.tuscany.container.java.context.JavaComponentContext;
 import org.apache.tuscany.container.java.mock.binding.foo.FooBinding;
@@ -45,8 +45,8 @@
 import org.apache.tuscany.container.java.mock.components.Target;
 import org.apache.tuscany.container.java.mock.components.TargetImpl;
 import org.apache.tuscany.core.builder.BuilderException;
-import org.apache.tuscany.core.builder.RuntimeConfiguration;
-import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
+import org.apache.tuscany.core.builder.ContextFactory;
+import org.apache.tuscany.core.builder.ContextFactoryBuilder;
 import org.apache.tuscany.core.builder.WireBuilder;
 import org.apache.tuscany.core.config.ConfigurationException;
 import org.apache.tuscany.core.config.JavaIntrospectionHelper;
@@ -68,7 +68,7 @@
 import org.apache.tuscany.core.system.assembly.SystemBinding;
 import org.apache.tuscany.core.system.assembly.SystemImplementation;
 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.context.SystemAggregateContextImpl;
@@ -623,9 +623,9 @@
     /**
      * Returns a collection of bootstrap configuration builders
      */
-    public static List<RuntimeConfigurationBuilder> createSystemBuilders() {
-        List<RuntimeConfigurationBuilder> builders = new ArrayList();
-        builders.add((new SystemComponentContextBuilder()));
+    public static List<ContextFactoryBuilder> createSystemBuilders() {
+        List<ContextFactoryBuilder> builders = new ArrayList();
+        builders.add((new SystemContextFactoryBuilder()));
         builders.add(new SystemEntryPointBuilder());
         builders.add(new SystemExternalServiceBuilder());
         return builders;
@@ -637,15 +637,15 @@
      * @param name             the name of the component
      * @param aggregateContext the containing aggregate context
      * @throws BuilderException
-     * @see RuntimeConfiguration
+     * @see ContextFactory
      */
-    public static RuntimeConfiguration<InstanceContext> createAggregateConfiguration(String name,
+    public static ContextFactory<InstanceContext> createAggregateConfiguration(String name,
                                                                                      AggregateContext aggregateContext) throws BuilderException {
 
         Component sc = createAggregateComponent(name);
-        SystemComponentContextBuilder builder = new SystemComponentContextBuilder();
+        SystemContextFactoryBuilder builder = new SystemContextFactoryBuilder();
         builder.build(sc);
-        return (RuntimeConfiguration<InstanceContext>) sc.getComponentImplementation().getRuntimeConfiguration();
+        return (ContextFactory<InstanceContext>) sc.getComponentImplementation().getContextFactory();
     }
 
     /**
@@ -719,7 +719,7 @@
         runtime.start();
         runtime.getSystemContext().registerModelObject(createSystemAggregateComponent(SYSTEM_CHILD));
         SystemAggregateContext ctx = (SystemAggregateContext) runtime.getSystemContext().getContext(SYSTEM_CHILD);
-        ctx.registerModelObject(systemFactory.createSystemComponent(JAVA_BUILDER, RuntimeConfigurationBuilder.class, JavaComponentContextBuilder.class, Scope.MODULE));
+        ctx.registerModelObject(systemFactory.createSystemComponent(JAVA_BUILDER, ContextFactoryBuilder.class, JavaContextFactoryBuilder.class, Scope.MODULE));
         ctx.registerModelObject(systemFactory.createSystemComponent(JAVA_WIRE_BUILDER, WireBuilder.class, JavaTargetWireBuilder.class, Scope.MODULE));
         ctx.fireEvent(EventContext.MODULE_START, null);
         return runtime;
@@ -732,9 +732,9 @@
      */
     public static RuntimeContext registerFooBinding(RuntimeContext runtime) throws ConfigurationException {
         AggregateContext child = (AggregateContext) runtime.getSystemContext().getContext(MockFactory.SYSTEM_CHILD);
-        JavaComponentContextBuilder javaBuilder = (JavaComponentContextBuilder) child.getContext(MockFactory.JAVA_BUILDER)
+        JavaContextFactoryBuilder javaBuilder = (JavaContextFactoryBuilder) child.getContext(MockFactory.JAVA_BUILDER)
                 .getInstance(null);
-        child.registerModelObject(systemFactory.createSystemComponent(FOO_BUILDER, RuntimeConfigurationBuilder.class, FooBindingBuilder.class, Scope.MODULE));
+        child.registerModelObject(systemFactory.createSystemComponent(FOO_BUILDER, ContextFactoryBuilder.class, FooBindingBuilder.class, Scope.MODULE));
         child.registerModelObject(systemFactory.createSystemComponent(FOO_WIRE_BUILDER, WireBuilder.class, FooBindingWireBuilder.class, Scope.MODULE));
         // since the child context is already started, we need to manually retrieve the components to init them
         Assert.assertNotNull(child.getContext(FOO_BUILDER).getInstance(null));

Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockScopeContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockScopeContext.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockScopeContext.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockScopeContext.java Tue Mar 14 08:57:08 2006
@@ -21,7 +21,7 @@
 import java.util.Map;
 
 import org.apache.tuscany.container.java.invocation.mock.SimpleTargetImpl;
-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.EventException;
 import org.apache.tuscany.core.context.QualifiedName;
@@ -98,10 +98,10 @@
     }
 
 
-    public void registerConfigurations(List<RuntimeConfiguration<InstanceContext>> configurations) {
+    public void registerFactorys(List<ContextFactory<InstanceContext>> configurations) {
     } 
 
-    public void registerConfiguration(RuntimeConfiguration<InstanceContext> configuration) {
+    public void registerFactory(ContextFactory<InstanceContext> configuration) {
     } 
     
     public int getLifecycleState(){

Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBinding.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBinding.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBinding.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBinding.java Tue Mar 14 08:57:08 2006
@@ -47,11 +47,11 @@
 
     private Object config;
 
-    public void setRuntimeConfiguration(Object configuration) {
+    public void setContextFactory(Object configuration) {
         config = configuration;
     }
 
-    public Object getRuntimeConfiguration() {
+    public Object getContextFactory() {
         System.out.println("retting");
         return config;
     }

Modified: incubator/tuscany/java/sca/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/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java Tue Mar 14 08:57:08 2006
@@ -21,8 +21,8 @@
 
 import org.apache.tuscany.core.builder.BuilderException;
 import org.apache.tuscany.core.builder.ObjectFactory;
-import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
-import org.apache.tuscany.core.builder.impl.EntryPointRuntimeConfiguration;
+import org.apache.tuscany.core.builder.ContextFactoryBuilder;
+import org.apache.tuscany.core.builder.impl.EntryPointContextFactory;
 import org.apache.tuscany.core.builder.impl.HierarchicalBuilder;
 import org.apache.tuscany.core.config.JavaIntrospectionHelper;
 import org.apache.tuscany.core.context.QualifiedName;
@@ -45,13 +45,13 @@
 import org.osoa.sca.annotations.Scope;
 
 /**
- * Creates a <code>RuntimeConfigurationBuilder</code> for an entry point or external service configured with the
+ * Creates a <code>ContextFactoryBuilder</code> for an entry point or external service configured with the
  * {@link FooBinding}
  * 
  * @version $Rev$ $Date$
  */
 @Scope("MODULE")
-public class FooBindingBuilder implements RuntimeConfigurationBuilder {
+public class FooBindingBuilder implements ContextFactoryBuilder {
 
     @Autowire
     private RuntimeContext runtimeContext;
@@ -102,7 +102,7 @@
      * reference builder may be hierarchical, containing other child reference builders that operate on specific
      * metadata used to construct and invocation chain.
      */
-    public void addPolicyBuilder(RuntimeConfigurationBuilder builder) {
+    public void addPolicyBuilder(ContextFactoryBuilder builder) {
         policyBuilder.addBuilder(builder);
     }
 
@@ -112,7 +112,7 @@
             if (ep.getBindings().size() < 1 || !(ep.getBindings().get(0) instanceof FooBinding)) {
                 return;
             }
-            EntryPointRuntimeConfiguration config = new FooEntryPointRuntimeConfiguration(ep.getName(), ep.getConfiguredService()
+            EntryPointContextFactory config = new FooEntryPointContextFactory(ep.getName(), ep.getConfiguredService()
                     .getService().getName(), messageFactory);
 
             ConfiguredService configuredService = ep.getConfiguredService();
@@ -139,7 +139,7 @@
             for (InvocationConfiguration iConfig : (Collection<InvocationConfiguration>) iConfigMap.values()) {
                 iConfig.addTargetInterceptor(new InvokerInterceptor());
             }
-            ep.getConfiguredReference().setRuntimeConfiguration(config);
+            ep.getConfiguredReference().setContextFactory(config);
 
         } else if (object instanceof ExternalService) {
             ExternalService es = (ExternalService) object;
@@ -147,7 +147,7 @@
                 return;
             }
 
-            FooExternalServiceRuntimeConfiguration config = new FooExternalServiceRuntimeConfiguration(es.getName(),
+            FooExternalServiceContextFactory config = new FooExternalServiceContextFactory(es.getName(),
                     new FooClientFactory());
 
             ConfiguredService configuredService = es.getConfiguredService();
@@ -175,7 +175,7 @@
                 iConfig.addTargetInterceptor(new InvokerInterceptor());
             }
 
-            es.getConfiguredService().setRuntimeConfiguration(config);
+            es.getConfiguredService().setContextFactory(config);
         } else {
             return;
 

Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingWireBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingWireBuilder.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingWireBuilder.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingWireBuilder.java Tue Mar 14 08:57:08 2006
@@ -30,7 +30,7 @@
 
     public void connect(ProxyFactory sourceFactory, ProxyFactory targetFactory, Class targetType, boolean downScope,
             ScopeContext targetScopeContext) throws BuilderConfigException {
-        if (!FooExternalServiceRuntimeConfiguration.class.isAssignableFrom(targetType)) {
+        if (!FooExternalServiceContextFactory.class.isAssignableFrom(targetType)) {
             return;
         }
         for (InvocationConfiguration sourceInvocationConfig : sourceFactory.getProxyConfiguration().getInvocationConfigurations()

Copied: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooEntryPointContextFactory.java (from r385814, incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooEntryPointRuntimeConfiguration.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooEntryPointContextFactory.java?p2=incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooEntryPointContextFactory.java&p1=incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooEntryPointRuntimeConfiguration.java&r1=385814&r2=385834&rev=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooEntryPointRuntimeConfiguration.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooEntryPointContextFactory.java Tue Mar 14 08:57:08 2006
@@ -13,7 +13,7 @@
  */
 package org.apache.tuscany.container.java.mock.binding.foo;
 
-import org.apache.tuscany.core.builder.impl.EntryPointRuntimeConfiguration;
+import org.apache.tuscany.core.builder.impl.EntryPointContextFactory;
 import org.apache.tuscany.core.message.MessageFactory;
 
 /**
@@ -21,9 +21,9 @@
  * 
  * @version $Rev$ $Date$
  */
-public class FooEntryPointRuntimeConfiguration extends EntryPointRuntimeConfiguration {
+public class FooEntryPointContextFactory extends EntryPointContextFactory {
 
-    public FooEntryPointRuntimeConfiguration(String name, String serviceName, MessageFactory msgFactory) {
+    public FooEntryPointContextFactory(String name, String serviceName, MessageFactory msgFactory) {
         super(name, serviceName, msgFactory);
     }
 

Copied: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooExternalServiceContextFactory.java (from r385814, incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooExternalServiceRuntimeConfiguration.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooExternalServiceContextFactory.java?p2=incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooExternalServiceContextFactory.java&p1=incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooExternalServiceRuntimeConfiguration.java&r1=385814&r2=385834&rev=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooExternalServiceRuntimeConfiguration.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooExternalServiceContextFactory.java Tue Mar 14 08:57:08 2006
@@ -14,7 +14,7 @@
 package org.apache.tuscany.container.java.mock.binding.foo;
 
 import org.apache.tuscany.core.builder.ObjectFactory;
-import org.apache.tuscany.core.builder.impl.BaseExternalServiceRuntimeConfiguration;
+import org.apache.tuscany.core.builder.impl.BaseExternalServiceContextFactory;
 
 /**
  * Creates instances of {@link org.apache.tuscany.core.context.ExternalServiceContext} configured with the appropriate
@@ -23,9 +23,9 @@
  * 
  * @version $Rev$ $Date$
  */
-public class FooExternalServiceRuntimeConfiguration extends BaseExternalServiceRuntimeConfiguration {
+public class FooExternalServiceContextFactory extends BaseExternalServiceContextFactory {
 
-    public FooExternalServiceRuntimeConfiguration(String name, ObjectFactory objectFactory) {
+    public FooExternalServiceContextFactory(String name, ObjectFactory objectFactory) {
         super(name, objectFactory);
     }
 

Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/AggregateScopeTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/AggregateScopeTestCase.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/AggregateScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/AggregateScopeTestCase.java Tue Mar 14 08:57:08 2006
@@ -19,7 +19,7 @@
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder;
+import org.apache.tuscany.container.java.builder.JavaContextFactoryBuilder;
 import org.apache.tuscany.container.java.mock.MockFactory;
 import org.apache.tuscany.container.java.mock.components.GenericComponent;
 import org.apache.tuscany.container.java.mock.components.ModuleScopeComponentImpl;
@@ -51,7 +51,7 @@
         AggregateContext moduleComponentCtx = new AggregateContextImpl();
         moduleComponentCtx.setName("testMC");
         AggregateScopeContext scopeContainer = new AggregateScopeContext(ctx);
-        scopeContainer.registerConfiguration(MockFactory.createAggregateConfiguration("AggregateComponent", moduleComponentCtx));
+        scopeContainer.registerFactory(MockFactory.createAggregateConfiguration("AggregateComponent", moduleComponentCtx));
         scopeContainer.start();
         AggregateContext child = (AggregateContext) scopeContainer.getContext("AggregateComponent");
         List<Extensible> models = createAssembly(moduleComponentCtx);
@@ -103,7 +103,7 @@
         AggregateContext moduleComponentCtx = new AggregateContextImpl();
         moduleComponentCtx.setName("testMC");
         AggregateScopeContext scopeContainer = new AggregateScopeContext(ctx);
-        scopeContainer.registerConfiguration(MockFactory.createAggregateConfiguration("AggregateComponent", moduleComponentCtx));
+        scopeContainer.registerFactory(MockFactory.createAggregateConfiguration("AggregateComponent", moduleComponentCtx));
         scopeContainer.start();
         AggregateContext child = (AggregateContext) scopeContainer.getContext("AggregateComponent");
         List<Extensible> parts = createAssembly(moduleComponentCtx);
@@ -125,7 +125,7 @@
         AggregateContext moduleComponentCtx = new AggregateContextImpl();
         moduleComponentCtx.setName("testMC");
         AggregateScopeContext scopeContainer = new AggregateScopeContext(ctx);
-        scopeContainer.registerConfiguration(MockFactory.createAggregateConfiguration("AggregateComponent", moduleComponentCtx));
+        scopeContainer.registerFactory(MockFactory.createAggregateConfiguration("AggregateComponent", moduleComponentCtx));
         scopeContainer.start();
         scopeContainer.onEvent(EventContext.MODULE_START, null);
         QualifiedName name = new QualifiedName("AggregateComponent/TestService1");
@@ -145,7 +145,7 @@
         scopeContainer.start();
 
         scopeContainer.onEvent(EventContext.MODULE_START, null);
-        scopeContainer.registerConfiguration(MockFactory.createAggregateConfiguration("AggregateComponent", moduleComponentCtx));
+        scopeContainer.registerFactory(MockFactory.createAggregateConfiguration("AggregateComponent", moduleComponentCtx));
         QualifiedName name = new QualifiedName("AggregateComponent/TestService1");
         AggregateContext componentCtx = (AggregateContext) scopeContainer.getContext("AggregateComponent");
         scopeContainer.onEvent(EventContext.MODULE_STOP, null);
@@ -159,7 +159,7 @@
      * @param ctx the parent module context
      */
     private List<Extensible> createAssembly(AggregateContext ctx) throws BuilderException {
-        JavaComponentContextBuilder builder = new JavaComponentContextBuilder();
+        JavaContextFactoryBuilder builder = new JavaContextFactoryBuilder();
         SimpleComponent component = MockFactory.createComponent("TestService1", ModuleScopeComponentImpl.class, Scope.MODULE);
         SimpleComponent sessionComponent = MockFactory.createComponent("TestService2", SessionScopeComponentImpl.class,
                 Scope.SESSION);

Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicHttpSessionScopeTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicHttpSessionScopeTestCase.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicHttpSessionScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicHttpSessionScopeTestCase.java Tue Mar 14 08:57:08 2006
@@ -22,13 +22,13 @@
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder;
+import org.apache.tuscany.container.java.builder.JavaContextFactoryBuilder;
 import org.apache.tuscany.container.java.mock.MockFactory;
 import org.apache.tuscany.container.java.mock.components.SessionScopeComponent;
 import org.apache.tuscany.container.java.mock.components.SessionScopeComponentImpl;
 import org.apache.tuscany.container.java.mock.components.SessionScopeInitDestroyComponent;
 import org.apache.tuscany.core.builder.BuilderException;
-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.impl.EventContextImpl;
@@ -49,7 +49,7 @@
     public void testInstanceManagement() throws Exception {
         EventContext ctx = new EventContextImpl();
         HttpSessionScopeContext scope = new HttpSessionScopeContext(ctx);
-        scope.registerConfigurations(createConfigurations());
+        scope.registerFactorys(createConfigurations());
         scope.start();
         Object session = new Object();
         Object session2 = new Object();
@@ -85,7 +85,7 @@
     public void testSetNullComponents() throws Exception {
         EventContext ctx = new EventContextImpl();
         HttpSessionScopeContext scope = new HttpSessionScopeContext(ctx);
-        scope.registerConfigurations(new ArrayList<RuntimeConfiguration<InstanceContext>>());
+        scope.registerFactorys(new ArrayList<ContextFactory<InstanceContext>>());
         scope.start();
         scope.stop();
     }
@@ -93,7 +93,7 @@
     public void testGetContextByKey() throws Exception {
         EventContext ctx = new EventContextImpl();
         HttpSessionScopeContext scope = new HttpSessionScopeContext(ctx);
-        scope.registerConfigurations(createConfigurations());
+        scope.registerFactorys(createConfigurations());
         scope.start();
         Object session = new Object();
         Object session2 = new Object();
@@ -126,10 +126,10 @@
     public void testRegisterContextBeforeSession() throws Exception {
         EventContext ctx = new EventContextImpl();
         HttpSessionScopeContext scope = new HttpSessionScopeContext(ctx);
-        scope.registerConfigurations(createConfigurations());
+        scope.registerFactorys(createConfigurations());
         scope.start();
         Object session = new Object();
-        scope.registerConfiguration(createConfiguration("NewTestService"));
+        scope.registerFactory(createConfiguration("NewTestService"));
 
         // first request
         ctx.setIdentifier(EventContext.HTTP_SESSION, session);
@@ -164,7 +164,7 @@
     public void testRegisterContextAfterSession() throws Exception {
         EventContext ctx = new EventContextImpl();
         HttpSessionScopeContext scope = new HttpSessionScopeContext(ctx);
-        scope.registerConfigurations(createConfigurations());
+        scope.registerFactorys(createConfigurations());
         scope.start();
         Object session = new Object();
 
@@ -174,7 +174,7 @@
         Assert.assertNotNull(comp1);
         ctx.clearIdentifier(EventContext.HTTP_SESSION);
 
-        scope.registerConfiguration(createConfiguration("NewTestService"));
+        scope.registerFactory(createConfiguration("NewTestService"));
 
         // second request
         ctx.setIdentifier(EventContext.HTTP_SESSION, session);
@@ -205,19 +205,19 @@
     // ----------------------------------
     // Private methods
     // ----------------------------------
-    JavaComponentContextBuilder builder = new JavaComponentContextBuilder();
+    JavaContextFactoryBuilder builder = new JavaContextFactoryBuilder();
 
-    private List<RuntimeConfiguration<InstanceContext>> createConfigurations() throws NoSuchMethodException, BuilderException {
+    private List<ContextFactory<InstanceContext>> createConfigurations() throws NoSuchMethodException, BuilderException {
         SimpleComponent component = MockFactory.createComponent("TestService1", SessionScopeComponentImpl.class, Scope.SESSION);
         builder.build(component);
-        List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
-        configs.add((RuntimeConfiguration<InstanceContext>) component.getComponentImplementation().getRuntimeConfiguration());
+        List<ContextFactory<InstanceContext>> configs = new ArrayList();
+        configs.add((ContextFactory<InstanceContext>) component.getComponentImplementation().getContextFactory());
         return configs;
     }
 
-    private RuntimeConfiguration<InstanceContext> createConfiguration(String name) throws NoSuchMethodException, BuilderException {
+    private ContextFactory<InstanceContext> createConfiguration(String name) throws NoSuchMethodException, BuilderException {
         SimpleComponent component = MockFactory.createComponent(name, SessionScopeInitDestroyComponent.class, Scope.SESSION);
         builder.build(component);
-        return (RuntimeConfiguration<InstanceContext>) component.getComponentImplementation().getRuntimeConfiguration();
+        return (ContextFactory<InstanceContext>) component.getComponentImplementation().getContextFactory();
     }
 }

Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicModuleScopeTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicModuleScopeTestCase.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicModuleScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicModuleScopeTestCase.java Tue Mar 14 08:57:08 2006
@@ -22,12 +22,12 @@
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder;
+import org.apache.tuscany.container.java.builder.JavaContextFactoryBuilder;
 import org.apache.tuscany.container.java.mock.MockFactory;
 import org.apache.tuscany.container.java.mock.components.ModuleScopeComponentImpl;
 import org.apache.tuscany.container.java.mock.components.ModuleScopeInitDestroyComponent;
 import org.apache.tuscany.core.builder.BuilderException;
-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.impl.EventContextImpl;
@@ -48,7 +48,7 @@
     public void testInstanceManagement() throws Exception {
         EventContext ctx = new EventContextImpl();
         ModuleScopeContext scope = new ModuleScopeContext(ctx);
-        scope.registerConfigurations(createConfigurations());
+        scope.registerFactorys(createConfigurations());
         scope.start();
         // first request
         scope.onEvent(EventContext.MODULE_START, null);
@@ -65,7 +65,7 @@
     public void testSetNullComponents() throws Exception {
         EventContext ctx = new EventContextImpl();
         ModuleScopeContext scope = new ModuleScopeContext(ctx);
-        scope.registerConfigurations(createConfigurations());
+        scope.registerFactorys(createConfigurations());
         scope.start();
         scope.onEvent(EventContext.MODULE_START, null);
         scope.onEvent(EventContext.MODULE_STOP, null);
@@ -75,9 +75,9 @@
     public void testRegisterContextBeforeStart() throws Exception {
         EventContext ctx = new EventContextImpl();
         ModuleScopeContext scope = new ModuleScopeContext(ctx);
-        scope.registerConfigurations(createConfigurations());
+        scope.registerFactorys(createConfigurations());
         scope.start();
-        scope.registerConfiguration(createConfiguration("NewTestService"));
+        scope.registerFactory(createConfiguration("NewTestService"));
         scope.onEvent(EventContext.MODULE_START,null);
         ModuleScopeInitDestroyComponent comp2 = (ModuleScopeInitDestroyComponent) scope.getContext("NewTestService").getInstance(null);
         Assert.assertNotNull(comp2);
@@ -91,9 +91,9 @@
         EventContext ctx = new EventContextImpl();
         ModuleScopeContext scope = new ModuleScopeContext(ctx);
         scope.start();
-        scope.registerConfiguration(createConfiguration("NewTestService"));
+        scope.registerFactory(createConfiguration("NewTestService"));
         scope.onEvent(EventContext.MODULE_START,null);
-        scope.registerConfigurations(createConfigurations());
+        scope.registerFactorys(createConfigurations());
         ModuleScopeInitDestroyComponent comp2 = (ModuleScopeInitDestroyComponent) scope.getContext("NewTestService").getInstance(null);
         Assert.assertNotNull(comp2);
         Assert.assertTrue(comp2.isInitialized());
@@ -106,21 +106,21 @@
     // Private methods
     // ----------------------------------
 
-    JavaComponentContextBuilder builder = new JavaComponentContextBuilder();
+    JavaContextFactoryBuilder builder = new JavaContextFactoryBuilder();
 
-    private List<RuntimeConfiguration<InstanceContext>> createConfigurations() throws NoSuchMethodException, BuilderException {
+    private List<ContextFactory<InstanceContext>> createConfigurations() throws NoSuchMethodException, BuilderException {
         SimpleComponent component = MockFactory.createComponent("TestService1", ModuleScopeComponentImpl.class, Scope.MODULE);
         builder.build(component);
-        List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
-        configs.add((RuntimeConfiguration<InstanceContext>) component.getComponentImplementation().getRuntimeConfiguration());
+        List<ContextFactory<InstanceContext>> configs = new ArrayList();
+        configs.add((ContextFactory<InstanceContext>) component.getComponentImplementation().getContextFactory());
         return configs;
     }
 
-    private RuntimeConfiguration<InstanceContext> createConfiguration(String name)
+    private ContextFactory<InstanceContext> createConfiguration(String name)
             throws NoSuchMethodException, BuilderException {
         SimpleComponent component = MockFactory.createComponent(name, ModuleScopeInitDestroyComponent.class,
                 Scope.MODULE);
         builder.build(component);
-        return (RuntimeConfiguration<InstanceContext>) component.getComponentImplementation().getRuntimeConfiguration();
+        return (ContextFactory<InstanceContext>) component.getComponentImplementation().getContextFactory();
     }
 }

Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicRequestScopeTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicRequestScopeTestCase.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicRequestScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicRequestScopeTestCase.java Tue Mar 14 08:57:08 2006
@@ -22,12 +22,12 @@
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder;
+import org.apache.tuscany.container.java.builder.JavaContextFactoryBuilder;
 import org.apache.tuscany.container.java.mock.MockFactory;
 import org.apache.tuscany.container.java.mock.components.RequestScopeComponent;
 import org.apache.tuscany.container.java.mock.components.RequestScopeComponentImpl;
 import org.apache.tuscany.core.builder.BuilderException;
-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.impl.EventContextImpl;
@@ -48,7 +48,7 @@
     public void testInstanceManagement() throws Exception {
         EventContext ctx = new EventContextImpl();
         RequestScopeContext scope = new RequestScopeContext(ctx);
-        scope.registerConfigurations(createConfigurations());
+        scope.registerFactorys(createConfigurations());
         scope.start();
 
         // first request
@@ -68,8 +68,8 @@
     public void testRegisterContextBeforeRequest() throws Exception {
         EventContext ctx = new EventContextImpl();
         RequestScopeContext scope = new RequestScopeContext(ctx);
-        scope.registerConfigurations(createConfigurations());
-        scope.registerConfiguration(createConfiguration("NewTestService"));
+        scope.registerFactorys(createConfigurations());
+        scope.registerFactory(createConfiguration("NewTestService"));
         scope.start();
         RequestScopeComponent comp1 = (RequestScopeComponent) scope.getContext("TestService1").getInstance(null);
         Assert.assertNotNull(comp1);
@@ -82,11 +82,11 @@
     public void testRegisterContextAfterRequest() throws Exception {
         EventContext ctx = new EventContextImpl();
         RequestScopeContext scope = new RequestScopeContext(ctx);
-        scope.registerConfigurations(createConfigurations());
+        scope.registerFactorys(createConfigurations());
         scope.start();
         RequestScopeComponent comp1 = (RequestScopeComponent) scope.getContext("TestService1").getInstance(null);
         Assert.assertNotNull(comp1);
-        scope.registerConfiguration(createConfiguration("NewTestService"));
+        scope.registerFactory(createConfiguration("NewTestService"));
         RequestScopeComponent comp2 = (RequestScopeComponent) scope.getContext("NewTestService").getInstance(null);
         Assert.assertNotNull(comp2);
         scope.onEvent(EventContext.REQUEST_END, null);
@@ -99,7 +99,7 @@
     public void testSetNullComponents() throws Exception {
         EventContext ctx = new EventContextImpl();
         RequestScopeContext scope = new RequestScopeContext(ctx);
-        scope.registerConfigurations(createConfigurations());
+        scope.registerFactorys(createConfigurations());
         scope.start();
         scope.stop();
     }
@@ -107,7 +107,7 @@
     public void testGetComponentByKey() throws Exception {
         EventContext ctx = new EventContextImpl();
         RequestScopeContext scope = new RequestScopeContext(ctx);
-        scope.registerConfigurations(createConfigurations());
+        scope.registerFactorys(createConfigurations());
         scope.start();
 
         RequestScopeComponentImpl comp1 = (RequestScopeComponentImpl) scope.getContext("TestService1").getInstance(null);
@@ -126,23 +126,23 @@
     // Private methods
     // ----------------------------------
 
-    JavaComponentContextBuilder builder = new JavaComponentContextBuilder();
+    JavaContextFactoryBuilder builder = new JavaContextFactoryBuilder();
 
-    private List<RuntimeConfiguration<InstanceContext>> createConfigurations() throws NoSuchMethodException, BuilderException {
+    private List<ContextFactory<InstanceContext>> createConfigurations() throws NoSuchMethodException, BuilderException {
         SimpleComponent component = MockFactory.createComponent("TestService1", RequestScopeComponentImpl.class,
                 Scope.REQUEST);
         builder.build(component);
-        List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
-        configs.add((RuntimeConfiguration<InstanceContext>) component.getComponentImplementation().getRuntimeConfiguration());
+        List<ContextFactory<InstanceContext>> configs = new ArrayList();
+        configs.add((ContextFactory<InstanceContext>) component.getComponentImplementation().getContextFactory());
         return configs;
     }
 
-    private RuntimeConfiguration<InstanceContext> createConfiguration(String name) throws NoSuchMethodException,
+    private ContextFactory<InstanceContext> createConfiguration(String name) throws NoSuchMethodException,
             BuilderException {
         SimpleComponent component = MockFactory.createComponent(name, RequestScopeComponentImpl.class,
                 Scope.REQUEST);
         builder.build(component);
-        return (RuntimeConfiguration<InstanceContext>) component.getComponentImplementation().getRuntimeConfiguration();
+        return (ContextFactory<InstanceContext>) component.getComponentImplementation().getContextFactory();
     }
 
 }

Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicStatelessScopeTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicStatelessScopeTestCase.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicStatelessScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicStatelessScopeTestCase.java Tue Mar 14 08:57:08 2006
@@ -22,12 +22,12 @@
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder;
+import org.apache.tuscany.container.java.builder.JavaContextFactoryBuilder;
 import org.apache.tuscany.container.java.mock.MockFactory;
 import org.apache.tuscany.container.java.mock.components.StatelessComponent;
 import org.apache.tuscany.container.java.mock.components.StatelessComponentImpl;
 import org.apache.tuscany.core.builder.BuilderException;
-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.impl.EventContextImpl;
@@ -48,7 +48,7 @@
     public void testInstanceManagement() throws Exception {
         EventContext ctx = new EventContextImpl();
         StatelessScopeContext scope = new StatelessScopeContext(ctx);
-        scope.registerConfigurations(createConfigurations());
+        scope.registerFactorys(createConfigurations());
         scope.start();
         // first request
         StatelessComponentImpl comp1 = (StatelessComponentImpl) scope.getContext("TestService1").getInstance(null);
@@ -63,8 +63,8 @@
     public void testRegisterContextBeforeRequest() throws Exception {
         EventContext ctx = new EventContextImpl();
         StatelessScopeContext scope = new StatelessScopeContext(ctx);
-        scope.registerConfigurations(createConfigurations());
-        scope.registerConfiguration(createConfiguration("NewTestService"));
+        scope.registerFactorys(createConfigurations());
+        scope.registerFactory(createConfiguration("NewTestService"));
         scope.start();
         StatelessComponent comp1 = (StatelessComponent) scope.getContext("TestService1").getInstance(null);
         Assert.assertNotNull(comp1);
@@ -76,11 +76,11 @@
     public void testRegisterContextAfterRequest() throws Exception {
         EventContext ctx = new EventContextImpl();
         StatelessScopeContext scope = new StatelessScopeContext(ctx);
-        scope.registerConfigurations(createConfigurations());
+        scope.registerFactorys(createConfigurations());
         scope.start();
         StatelessComponent comp1 = (StatelessComponent) scope.getContext("TestService1").getInstance(null);
         Assert.assertNotNull(comp1);
-        scope.registerConfiguration(createConfiguration("NewTestService"));
+        scope.registerFactory(createConfiguration("NewTestService"));
         StatelessComponent comp2 = (StatelessComponent) scope.getContext("NewTestService").getInstance(null);
         Assert.assertNotNull(comp2);
         scope.stop();
@@ -93,7 +93,7 @@
     public void testSetNullComponents() throws Exception {
         EventContext ctx = new EventContextImpl();
         StatelessScopeContext scope = new StatelessScopeContext(ctx);
-        scope.registerConfigurations(createConfigurations());
+        scope.registerFactorys(createConfigurations());
         scope.start();
         scope.stop();
     }
@@ -102,24 +102,24 @@
     // Private methods
     // ----------------------------------
 
-    JavaComponentContextBuilder builder = new JavaComponentContextBuilder();
+    JavaContextFactoryBuilder builder = new JavaContextFactoryBuilder();
 
-    private List<RuntimeConfiguration<InstanceContext>> createConfigurations()
+    private List<ContextFactory<InstanceContext>> createConfigurations()
             throws NoSuchMethodException, BuilderException {
         SimpleComponent component = MockFactory.createComponent("TestService1", StatelessComponentImpl.class,
                 Scope.INSTANCE);
         builder.build(component);
-        List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
-        configs.add((RuntimeConfiguration<InstanceContext>) component.getComponentImplementation().getRuntimeConfiguration());
+        List<ContextFactory<InstanceContext>> configs = new ArrayList();
+        configs.add((ContextFactory<InstanceContext>) component.getComponentImplementation().getContextFactory());
         return configs;
     }
 
-    private RuntimeConfiguration<InstanceContext> createConfiguration(String name)
+    private ContextFactory<InstanceContext> createConfiguration(String name)
             throws NoSuchMethodException, BuilderException {
         SimpleComponent component = MockFactory.createComponent(name, StatelessComponentImpl.class,
                 Scope.INSTANCE);
         builder.build(component);
-        return (RuntimeConfiguration<InstanceContext>) component.getComponentImplementation().getRuntimeConfiguration();
+        return (ContextFactory<InstanceContext>) component.getComponentImplementation().getContextFactory();
     }
 
 }

Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/HttpSessionScopeLifecycleTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/HttpSessionScopeLifecycleTestCase.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/HttpSessionScopeLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/HttpSessionScopeLifecycleTestCase.java Tue Mar 14 08:57:08 2006
@@ -22,13 +22,13 @@
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder;
+import org.apache.tuscany.container.java.builder.JavaContextFactoryBuilder;
 import org.apache.tuscany.container.java.mock.MockFactory;
 import org.apache.tuscany.container.java.mock.components.SessionScopeDestroyOnlyComponent;
 import org.apache.tuscany.container.java.mock.components.SessionScopeInitDestroyComponent;
 import org.apache.tuscany.container.java.mock.components.SessionScopeInitOnlyComponent;
 import org.apache.tuscany.core.builder.BuilderException;
-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.impl.EventContextImpl;
@@ -49,7 +49,7 @@
     public void testInitDestroy() throws Exception {
         EventContext ctx = new EventContextImpl();
         HttpSessionScopeContext scope = new HttpSessionScopeContext(ctx);
-        scope.registerConfigurations(createComponents());
+        scope.registerFactorys(createComponents());
         scope.start();
         Object session = new Object();
         Object session2 = new Object();
@@ -86,7 +86,7 @@
     public void testDestroyOrder() throws Exception {
         EventContext ctx = new EventContextImpl();
         HttpSessionScopeContext scope = new HttpSessionScopeContext(ctx);
-        scope.registerConfigurations(createOrderedInitComponents());
+        scope.registerFactorys(createOrderedInitComponents());
         scope.start();
         Object session = new Object();
         Object session2 = new Object();
@@ -121,34 +121,34 @@
     // Private methods
     // ----------------------------------
 
-    JavaComponentContextBuilder builder = new JavaComponentContextBuilder();
+    JavaContextFactoryBuilder builder = new JavaContextFactoryBuilder();
 
-    private List<RuntimeConfiguration<InstanceContext>> createComponents() throws NoSuchMethodException, BuilderException {
+    private List<ContextFactory<InstanceContext>> createComponents() throws NoSuchMethodException, BuilderException {
         SimpleComponent[] ca = new SimpleComponent[3];
         ca[0] = MockFactory.createComponent("TestServiceInitDestroy", SessionScopeInitDestroyComponent.class,
                 Scope.SESSION);
         ca[1] = MockFactory.createComponent("TestServiceInitOnly", SessionScopeInitOnlyComponent.class, Scope.SESSION);
         ca[2] = MockFactory.createComponent("TestServiceDestroyOnly", SessionScopeDestroyOnlyComponent.class,
                 Scope.SESSION);
-        List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
+        List<ContextFactory<InstanceContext>> configs = new ArrayList();
         for (int i = 0; i < ca.length; i++) {
             builder.build(ca[i]);
-            configs.add((RuntimeConfiguration<InstanceContext>) ca[i].getComponentImplementation().getRuntimeConfiguration());
+            configs.add((ContextFactory<InstanceContext>) ca[i].getComponentImplementation().getContextFactory());
 
         }
         return configs;
     }
 
-    private List<RuntimeConfiguration<InstanceContext>> createOrderedInitComponents() throws NoSuchMethodException,
+    private List<ContextFactory<InstanceContext>> createOrderedInitComponents() throws NoSuchMethodException,
             BuilderException {
         SimpleComponent[] ca = new SimpleComponent[3];
         ca[0] = MockFactory.createComponent("one", OrderedInitPojo.class, Scope.SESSION);
         ca[1] = MockFactory.createComponent("two", OrderedInitPojo.class, Scope.SESSION);
         ca[2] = MockFactory.createComponent("three", OrderedInitPojo.class, Scope.SESSION);
-        List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
+        List<ContextFactory<InstanceContext>> configs = new ArrayList();
         for (int i = 0; i < ca.length; i++) {
             builder.build(ca[i]);
-            configs.add((RuntimeConfiguration<InstanceContext>) ca[i].getComponentImplementation().getRuntimeConfiguration());
+            configs.add((ContextFactory<InstanceContext>) ca[i].getComponentImplementation().getContextFactory());
 
         }
         return configs;

Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java Tue Mar 14 08:57:08 2006
@@ -22,7 +22,7 @@
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder;
+import org.apache.tuscany.container.java.builder.JavaContextFactoryBuilder;
 import org.apache.tuscany.container.java.mock.MockFactory;
 import org.apache.tuscany.container.java.mock.components.ModuleScopeDestroyOnlyComponent;
 import org.apache.tuscany.container.java.mock.components.ModuleScopeEagerInitComponent;
@@ -30,7 +30,7 @@
 import org.apache.tuscany.container.java.mock.components.ModuleScopeInitDestroyComponent;
 import org.apache.tuscany.container.java.mock.components.ModuleScopeInitOnlyComponent;
 import org.apache.tuscany.core.builder.BuilderException;
-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.impl.EventContextImpl;
@@ -48,7 +48,7 @@
     public void testInitDestroy() throws Exception {
         EventContext ctx = new EventContextImpl();
         ModuleScopeContext scope = new ModuleScopeContext(ctx);
-        scope.registerConfigurations(createComponents());
+        scope.registerFactorys(createComponents());
         scope.start();
         scope.onEvent(EventContext.MODULE_START, null);
         ModuleScopeInitDestroyComponent initDestroy = (ModuleScopeInitDestroyComponent) scope.getContext(
@@ -78,7 +78,7 @@
     public void testEagerInit() throws Exception {
         EventContext ctx = new EventContextImpl();
         ModuleScopeContext scope = new ModuleScopeContext(ctx);
-        scope.registerConfigurations(createEagerInitComponents());
+        scope.registerFactorys(createEagerInitComponents());
         scope.start();
         scope.onEvent(EventContext.MODULE_START, null);
         ModuleScopeEagerInitDestroyComponent initDestroy = (ModuleScopeEagerInitDestroyComponent) scope.getContext(
@@ -104,7 +104,7 @@
     public void testDestroyOrder() throws Exception {
         EventContext ctx = new EventContextImpl();
         ModuleScopeContext scope = new ModuleScopeContext(ctx);
-        scope.registerConfigurations(createOrderedInitComponents());
+        scope.registerFactorys(createOrderedInitComponents());
         scope.start();
         scope.onEvent(EventContext.MODULE_START, null);
         OrderedInitPojo one = (OrderedInitPojo) scope.getContext("one").getInstance(null);
@@ -131,7 +131,7 @@
     public void testEagerInitDestroyOrder() throws Exception {
         EventContext ctx = new EventContextImpl();
         ModuleScopeContext scope = new ModuleScopeContext(ctx);
-        scope.registerConfigurations(createOrderedEagerInitComponents());
+        scope.registerFactorys(createOrderedEagerInitComponents());
         scope.start();
         scope.onEvent(EventContext.MODULE_START, null);
         OrderedEagerInitPojo one = (OrderedEagerInitPojo) scope.getContext("one").getInstance(null);
@@ -153,9 +153,9 @@
     // Private methods
     // ----------------------------------
 
-    JavaComponentContextBuilder builder = new JavaComponentContextBuilder();
+    JavaContextFactoryBuilder builder = new JavaContextFactoryBuilder();
 
-    private List<RuntimeConfiguration<InstanceContext>> createComponents() throws NoSuchMethodException, BuilderException {
+    private List<ContextFactory<InstanceContext>> createComponents() throws NoSuchMethodException, BuilderException {
         SimpleComponent[] ca = new SimpleComponent[3];
         ca[0] = MockFactory.createComponent("TestServiceInitDestroy", ModuleScopeInitDestroyComponent.class,
                 Scope.MODULE);
@@ -163,60 +163,60 @@
                 Scope.MODULE);
         ca[2] = MockFactory.createComponent("TestServiceDestroyOnly", ModuleScopeDestroyOnlyComponent.class,
                 Scope.MODULE);
-        List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
+        List<ContextFactory<InstanceContext>> configs = new ArrayList();
         for (int i = 0; i < ca.length; i++) {
             builder.build(ca[i]);
-            configs.add((RuntimeConfiguration<InstanceContext>) ca[i].getComponentImplementation()
-                    .getRuntimeConfiguration());
+            configs.add((ContextFactory<InstanceContext>) ca[i].getComponentImplementation()
+                    .getContextFactory());
 
         }
         return configs;
     }
 
-    private List<RuntimeConfiguration<InstanceContext>> createEagerInitComponents() throws NoSuchMethodException,
+    private List<ContextFactory<InstanceContext>> createEagerInitComponents() throws NoSuchMethodException,
             BuilderException {
         SimpleComponent[] ca = new SimpleComponent[2];
         ca[0] = MockFactory.createComponent("TestServiceEagerInitDestroy", ModuleScopeEagerInitDestroyComponent.class,
                 Scope.MODULE);
         ca[1] = MockFactory.createComponent("TestServiceEagerInit", ModuleScopeEagerInitComponent.class,
                 Scope.MODULE);
-        List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
+        List<ContextFactory<InstanceContext>> configs = new ArrayList();
         for (int i = 0; i < ca.length; i++) {
             builder.build(ca[i]);
-            configs.add((RuntimeConfiguration<InstanceContext>) ca[i].getComponentImplementation()
-                    .getRuntimeConfiguration());
+            configs.add((ContextFactory<InstanceContext>) ca[i].getComponentImplementation()
+                    .getContextFactory());
 
         }
         return configs;
     }
 
-    private List<RuntimeConfiguration<InstanceContext>> createOrderedInitComponents() throws NoSuchMethodException,
+    private List<ContextFactory<InstanceContext>> createOrderedInitComponents() throws NoSuchMethodException,
             BuilderException {
         SimpleComponent[] ca = new SimpleComponent[3];
         ca[0] = MockFactory.createComponent("one", OrderedInitPojo.class, Scope.MODULE);
         ca[1] = MockFactory.createComponent("two", OrderedInitPojo.class, Scope.MODULE);
         ca[2] = MockFactory.createComponent("three", OrderedInitPojo.class, Scope.MODULE);
-        List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
+        List<ContextFactory<InstanceContext>> configs = new ArrayList();
         for (int i = 0; i < ca.length; i++) {
             builder.build(ca[i]);
-            configs.add((RuntimeConfiguration<InstanceContext>) ca[i].getComponentImplementation()
-                    .getRuntimeConfiguration());
+            configs.add((ContextFactory<InstanceContext>) ca[i].getComponentImplementation()
+                    .getContextFactory());
 
         }
         return configs;
     }
 
-    private List<RuntimeConfiguration<InstanceContext>> createOrderedEagerInitComponents() throws NoSuchMethodException,
+    private List<ContextFactory<InstanceContext>> createOrderedEagerInitComponents() throws NoSuchMethodException,
             BuilderException {
         SimpleComponent[] ca = new SimpleComponent[3];
         ca[0] = MockFactory.createComponent("one", OrderedEagerInitPojo.class, Scope.MODULE);
         ca[1] = MockFactory.createComponent("two", OrderedEagerInitPojo.class, Scope.MODULE);
         ca[2] = MockFactory.createComponent("three", OrderedEagerInitPojo.class, Scope.MODULE);
-        List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
+        List<ContextFactory<InstanceContext>> configs = new ArrayList();
         for (int i = 0; i < ca.length; i++) {
             builder.build(ca[i]);
-            configs.add((RuntimeConfiguration<InstanceContext>) ca[i].getComponentImplementation()
-                    .getRuntimeConfiguration());
+            configs.add((ContextFactory<InstanceContext>) ca[i].getComponentImplementation()
+                    .getContextFactory());
 
         }
         return configs;

Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java Tue Mar 14 08:57:08 2006
@@ -22,13 +22,13 @@
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.tuscany.container.java.builder.JavaComponentContextBuilder;
+import org.apache.tuscany.container.java.builder.JavaContextFactoryBuilder;
 import org.apache.tuscany.container.java.mock.MockFactory;
 import org.apache.tuscany.container.java.mock.components.SessionScopeDestroyOnlyComponent;
 import org.apache.tuscany.container.java.mock.components.SessionScopeInitDestroyComponent;
 import org.apache.tuscany.container.java.mock.components.SessionScopeInitOnlyComponent;
 import org.apache.tuscany.core.builder.BuilderException;
-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.impl.EventContextImpl;
@@ -49,7 +49,7 @@
     public void testInitDestroy() throws Exception {
         EventContext ctx = new EventContextImpl();
         RequestScopeContext scope = new RequestScopeContext(ctx);
-        scope.registerConfigurations(createComponents());
+        scope.registerFactorys(createComponents());
         scope.start();
         SessionScopeInitDestroyComponent initDestroy = (SessionScopeInitDestroyComponent) scope.getContext(
                 "TestServiceInitDestroy").getInstance(null);
@@ -80,7 +80,7 @@
     public void testDestroyOrder() throws Exception {
         EventContext ctx = new EventContextImpl();
         RequestScopeContext scope = new RequestScopeContext(ctx);
-        scope.registerConfigurations(createOrderedInitComponents());
+        scope.registerFactorys(createOrderedInitComponents());
         scope.start();
         // request start
         OrderedInitPojo one = (OrderedInitPojo) scope.getContext("one").getInstance(null);
@@ -109,9 +109,9 @@
     // Private methods
     // ----------------------------------
 
-    JavaComponentContextBuilder builder = new JavaComponentContextBuilder();
+    JavaContextFactoryBuilder builder = new JavaContextFactoryBuilder();
 
-    private List<RuntimeConfiguration<InstanceContext>> createComponents() throws NoSuchMethodException, BuilderException {
+    private List<ContextFactory<InstanceContext>> createComponents() throws NoSuchMethodException, BuilderException {
         SimpleComponent[] ca = new SimpleComponent[3];
         ca[0] = MockFactory.createComponent("TestServiceInitDestroy", SessionScopeInitDestroyComponent.class,
                 Scope.REQUEST);
@@ -119,25 +119,25 @@
                 Scope.REQUEST);
         ca[2] = MockFactory.createComponent("TestServiceDestroyOnly", SessionScopeDestroyOnlyComponent.class,
                 Scope.REQUEST);
-        List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
+        List<ContextFactory<InstanceContext>> configs = new ArrayList();
         for (int i = 0; i < ca.length; i++) {
             builder.build(ca[i]);
-            configs.add((RuntimeConfiguration<InstanceContext>) ca[i].getComponentImplementation().getRuntimeConfiguration());
+            configs.add((ContextFactory<InstanceContext>) ca[i].getComponentImplementation().getContextFactory());
 
         }
         return configs;
     }
 
-    private List<RuntimeConfiguration<InstanceContext>> createOrderedInitComponents() throws NoSuchMethodException,
+    private List<ContextFactory<InstanceContext>> createOrderedInitComponents() throws NoSuchMethodException,
             BuilderException {
         SimpleComponent[] ca = new SimpleComponent[3];
         ca[0] = MockFactory.createComponent("one", OrderedInitPojo.class, Scope.REQUEST);
         ca[1] = MockFactory.createComponent("two", OrderedInitPojo.class, Scope.REQUEST);
         ca[2] = MockFactory.createComponent("three", OrderedInitPojo.class, Scope.REQUEST);
-        List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
+        List<ContextFactory<InstanceContext>> configs = new ArrayList();
         for (int i = 0; i < ca.length; i++) {
             builder.build(ca[i]);
-            configs.add((RuntimeConfiguration<InstanceContext>) ca[i].getComponentImplementation().getRuntimeConfiguration());
+            configs.add((ContextFactory<InstanceContext>) ca[i].getComponentImplementation().getContextFactory());
 
         }
         return configs;

Copied: incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java (from r385814, incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptComponentContextBuilder.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java?p2=incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java&p1=incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptComponentContextBuilder.java&r1=385814&r2=385834&rev=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptComponentContextBuilder.java (original)
+++ incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java Tue Mar 14 08:57:08 2006
@@ -24,11 +24,11 @@
 
 import org.apache.tuscany.container.js.assembly.JavaScriptImplementation;
 import org.apache.tuscany.container.js.assembly.impl.JavaScriptImplementationImpl;
-import org.apache.tuscany.container.js.config.JavaScriptComponentRuntimeConfiguration;
+import org.apache.tuscany.container.js.config.JavaScriptContextFactory;
 import org.apache.tuscany.container.js.rhino.RhinoScript;
 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.context.QualifiedName;
 import org.apache.tuscany.core.invocation.InvocationConfiguration;
@@ -53,23 +53,23 @@
 import org.osoa.sca.annotations.Init;
 
 /**
- * Builds {@link org.apache.tuscany.container.js.config.JavaScriptComponentRuntimeConfiguration}s from a JavaScript
+ * Builds {@link org.apache.tuscany.container.js.config.JavaScriptContextFactory}s from a JavaScript
  * component type
  * 
  * @version $Rev$ $Date$
  */
 @org.osoa.sca.annotations.Scope("MODULE")
-public class JavaScriptComponentContextBuilder implements RuntimeConfigurationBuilder<AggregateContext> {
+public class JavaScriptContextFactoryBuilder implements ContextFactoryBuilder<AggregateContext> {
 
     private ProxyFactoryFactory factory;
 
     private MessageFactory msgFactory;
 
-    private RuntimeConfigurationBuilder referenceBuilder;
+    private ContextFactoryBuilder referenceBuilder;
 
     private RuntimeContext runtimeContext;
 
-    public JavaScriptComponentContextBuilder() {
+    public JavaScriptContextFactoryBuilder() {
     }
 
     @Init(eager = true)
@@ -108,7 +108,7 @@
      * 
      * @see org.apache.tuscany.core.builder.impl.HierarchicalBuilder
      */
-    public void setReferenceBuilder(RuntimeConfigurationBuilder builder) {
+    public void setReferenceBuilder(ContextFactoryBuilder builder) {
         this.referenceBuilder = builder;
     }
 
@@ -147,18 +147,18 @@
         
         RhinoScript invoker = new RhinoScript(component.getName(), script, properties, cl);
 
-        JavaScriptComponentRuntimeConfiguration config = new JavaScriptComponentRuntimeConfiguration(component.getName(),
+        JavaScriptContextFactory config = new JavaScriptContextFactory(component.getName(),
 		        scope, services, properties, invoker);
 
 		addTargetInvocationChains(component, config);
 		addComponentReferences(component, config);
-		component.getComponentImplementation().setRuntimeConfiguration(config);
+		component.getComponentImplementation().setContextFactory(config);
 	}
 
     /**
      * Add target-side invocation chains for each service offered by the implementation
      */
-	private void addTargetInvocationChains(SimpleComponent component, JavaScriptComponentRuntimeConfiguration config) {
+	private void addTargetInvocationChains(SimpleComponent component, JavaScriptContextFactory config) {
 		for (ConfiguredService configuredService : component.getConfiguredServices()) {
 		    Service service = configuredService.getService();
 		    ServiceContract contract = service.getServiceContract();
@@ -187,7 +187,7 @@
 		}
 	}
 
-	private void addComponentReferences(SimpleComponent component, JavaScriptComponentRuntimeConfiguration config) {
+	private void addComponentReferences(SimpleComponent component, JavaScriptContextFactory config) {
 		Map<String, ConfiguredReference> configuredReferences = component.getConfiguredReferences();
 		if (configuredReferences != null) {
 		    for (ConfiguredReference reference : configuredReferences.values()) {

Modified: incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptTargetWireBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptTargetWireBuilder.java?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptTargetWireBuilder.java (original)
+++ incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptTargetWireBuilder.java Tue Mar 14 08:57:08 2006
@@ -18,7 +18,7 @@
 
 import java.lang.reflect.Method;
 
-import org.apache.tuscany.container.js.config.JavaScriptComponentRuntimeConfiguration;
+import org.apache.tuscany.container.js.config.JavaScriptContextFactory;
 import org.apache.tuscany.container.js.rhino.RhinoTargetInvoker;
 import org.apache.tuscany.core.builder.BuilderConfigException;
 import org.apache.tuscany.core.builder.WireBuilder;
@@ -56,7 +56,7 @@
 
     public void connect(ProxyFactory sourceFactory, ProxyFactory targetFactory, Class targetType, boolean downScope,
             ScopeContext targetScopeContext) throws BuilderConfigException {
-        if (!(JavaScriptComponentRuntimeConfiguration.class.isAssignableFrom(targetType))) {
+        if (!(JavaScriptContextFactory.class.isAssignableFrom(targetType))) {
             return;
         }
         for (InvocationConfiguration sourceInvocationConfig : sourceFactory.getProxyConfiguration().getInvocationConfigurations()
@@ -76,7 +76,7 @@
 
     public void completeTargetChain(ProxyFactory targetFactory, Class targetType, ScopeContext targetScopeContext)
             throws BuilderConfigException {
-        if (!(JavaScriptComponentRuntimeConfiguration.class.isAssignableFrom(targetType))) {
+        if (!(JavaScriptContextFactory.class.isAssignableFrom(targetType))) {
             return;
         }
         for (InvocationConfiguration targetInvocationConfig : targetFactory.getProxyConfiguration().getInvocationConfigurations()

Copied: incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/config/JavaScriptContextFactory.java (from r385814, incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/config/JavaScriptComponentRuntimeConfiguration.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/config/JavaScriptContextFactory.java?p2=incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/config/JavaScriptContextFactory.java&p1=incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/config/JavaScriptComponentRuntimeConfiguration.java&r1=385814&r2=385834&rev=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/config/JavaScriptComponentRuntimeConfiguration.java (original)
+++ incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/config/JavaScriptContextFactory.java Tue Mar 14 08:57:08 2006
@@ -24,7 +24,7 @@
 import org.apache.tuscany.container.js.context.JavaScriptComponentContext;
 import org.apache.tuscany.container.js.rhino.RhinoScript;
 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.SimpleComponentContext;
 import org.apache.tuscany.core.invocation.spi.ProxyFactory;
@@ -35,7 +35,7 @@
  * 
  * @version $Rev$ $Date$
  */
-public class JavaScriptComponentRuntimeConfiguration implements RuntimeConfiguration<SimpleComponentContext> {
+public class JavaScriptContextFactory implements ContextFactory<SimpleComponentContext> {
 
     private Scope scope;
 
@@ -49,7 +49,7 @@
 
     private AggregateContext parentContext;
     
-    public JavaScriptComponentRuntimeConfiguration(String name, Scope scope, Map<String, Class> services,
+    public JavaScriptContextFactory(String name, Scope scope, Map<String, Class> services,
             Map<String, Object> properties, RhinoScript invoker) {
         this.name = name;
         this.scope = scope;
@@ -58,7 +58,7 @@
         this.invoker = invoker;
     }
 
-    public SimpleComponentContext createInstanceContext() throws ContextCreationException {
+    public SimpleComponentContext createContext() throws ContextCreationException {
         return new JavaScriptComponentContext(name, services, properties, sourceProxyFactories, targetProxyFactories, invoker
                 .copy());
     }

Modified: incubator/tuscany/java/sca/container.js/src/main/resources/system.fragment
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/main/resources/system.fragment?rev=385834&r1=385833&r2=385834&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/main/resources/system.fragment (original)
+++ incubator/tuscany/java/sca/container.js/src/main/resources/system.fragment Tue Mar 14 08:57:08 2006
@@ -18,8 +18,8 @@
         xmlns:system="http://org.apache.tuscany/xmlns/system/0.9"
 		name="org.apache.tuscany.container.js">
 
-    <component name="org.apache.tuscany.container.js.builder.JavaScriptComponentContextBuilder">
-        <system:implementation.system class="org.apache.tuscany.container.js.builder.JavaScriptComponentContextBuilder"/>
+    <component name="org.apache.tuscany.container.js.builder.JavaScriptContextFactoryBuilder">
+        <system:implementation.system class="org.apache.tuscany.container.js.builder.JavaScriptContextFactoryBuilder"/>
     </component>
 
     <component name="org.apache.tuscany.container.js.loader.JavaScriptSCDLModelLoader">