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/04/07 08:32:43 UTC
svn commit: r392199 [1/4] - in /incubator/tuscany/java/sca:
bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/
bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/
bindings/binding.jsonrpc/src/main/...
Author: jmarino
Date: Thu Apr 6 23:32:29 2006
New Revision: 392199
URL: http://svn.apache.org/viewcvs?rev=392199&view=rev
Log:
rename aggregate to composite; simple to atomic
Added:
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/CompositeScopeTestCase.java (contents, props changed)
- copied, changed from r392189, incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/AggregateScopeTestCase.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/AtomicContext.java (contents, props changed)
- copied, changed from r392190, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/SimpleComponentContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/CompositeContext.java (contents, props changed)
- copied, changed from r392190, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/AggregateContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/SystemCompositeContext.java (contents, props changed)
- copied, changed from r392189, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/SystemAggregateContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java (contents, props changed)
- copied, changed from r392190, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractAggregateContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/CompositeContextImpl.java (contents, props changed)
- copied, changed from r392190, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AggregateContextImpl.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/CompositeScopeContext.java (contents, props changed)
- copied, changed from r392190, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AggregateScopeContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/injection/InterCompositeReferenceFactory.java
- copied, changed from r392190, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/injection/InterAggregateReferenceFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContextImpl.java (contents, props changed)
- copied, changed from r392190, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAggregateContextImpl.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/AbstractCompositeHierarchyTests.java (contents, props changed)
- copied, changed from r392189, incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/AbstractAggregateHierarchyTests.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/CompositeContextRegisterTestCase.java (contents, props changed)
- copied, changed from r392189, incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/AggregateComponentContextRegisterTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/CompositeHierarchyTestCase.java (contents, props changed)
- copied, changed from r392189, incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/AggregateHierarchyTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/integration/IntraCompositeWireIntegrationTestCase.java
- copied, changed from r392189, incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/integration/IntraAggregateWireIntegrationTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/CompositeNestingTestCase.java
- copied, changed from r392189, incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/AggregateNestingTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraCompositeWireTestCase.java
- copied, changed from r392189, incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraAggregateWireTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeComponentContextTestCase.java (contents, props changed)
- copied, changed from r392189, incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateComponentContextTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeContextRegisterTestCase.java (contents, props changed)
- copied, changed from r392189, incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateComponentContextRegisterTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeHierarchyTestCase.java (contents, props changed)
- copied, changed from r392189, incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateHierarchyTestCase.java
Removed:
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/AggregateScopeTestCase.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/AggregateContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/SimpleComponentContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/SystemAggregateContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractAggregateContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AggregateContextImpl.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AggregateScopeContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/injection/InterAggregateReferenceFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAggregateContextImpl.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/AbstractAggregateHierarchyTests.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/AggregateComponentContextRegisterTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/AggregateHierarchyTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/integration/IntraAggregateWireIntegrationTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/AggregateNestingTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraAggregateWireTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateComponentContextRegisterTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateComponentContextTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateHierarchyTestCase.java
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointServlet.java
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/handler/JSONRPCEntryPointServlet.java
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/config/JavaContextFactory.java
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaComponentContext.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/BadPojoTestCase.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/DifferentInterfaceWireTestCase.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/MultiplicityTestCase.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/PojoLifecycleTestCase.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/PojoTestCase.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaIntegrationTestCase.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaRuntimeBootstrapTestCase.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/EntryPointToJavaTestCase.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/JavaToExternalServiceTestCase.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/ScopeReferenceTestCase.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockScopeContext.java
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/config/JavaScriptContextFactory.java
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/context/JavaScriptComponentContext.java
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/rhino/RhinoTargetInvoker.java
incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/integration/JSComponentContextTestCase.java
incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/mock/MockAssemblyFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextResolver.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/BaseExternalServiceContextFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointContextFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/AutowireContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/Context.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/EntryPointContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeAwareContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/DefaultScopeStrategy.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/HttpSessionScopeContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/ModuleScopeContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/webapp/HTTPSessionExpirationListener.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/webapp/TuscanyRequestFilter.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/webapp/TuscanyWebAppRuntime.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/injection/ContextObjectFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/injection/NonProxiedTargetFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/NullProxyFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeScopeStrategy.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemExternalServiceBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointContextFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceContextFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemComponentContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemScopeStrategy.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/injection/AutowireObjectFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/TuscanyRequestFilter.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/TuscanyServletListener.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/mock/MockScopeContext.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/MockFactory.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/SystemBootstrapTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemComponentImpl.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilderTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/AutowireTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemObjectRegistrationTestCase.java
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyValve.java
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/WebAppLifecycleListener.java
incubator/tuscany/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TestServlet.java
Modified: incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java?rev=392199&r1=392198&r2=392199&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java Thu Apr 6 23:32:29 2006
@@ -25,7 +25,6 @@
import org.apache.tuscany.core.builder.ContextFactoryBuilder;
import org.apache.tuscany.core.builder.impl.EntryPointContextFactory;
import org.apache.tuscany.core.config.JavaIntrospectionHelper;
-import org.apache.tuscany.core.context.AggregateContext;
import org.apache.tuscany.core.context.QualifiedName;
import org.apache.tuscany.core.invocation.Interceptor;
import org.apache.tuscany.core.invocation.InvocationConfiguration;
Modified: incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointServlet.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointServlet.java?rev=392199&r1=392198&r2=392199&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointServlet.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointServlet.java Thu Apr 6 23:32:29 2006
@@ -46,7 +46,7 @@
import org.apache.tuscany.binding.axis2.assembly.WebServiceBinding;
import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.common.resource.impl.ResourceLoaderImpl;
-import org.apache.tuscany.core.context.AggregateContext;
+import org.apache.tuscany.core.context.CompositeContext;
import org.apache.tuscany.core.context.EntryPointContext;
import org.apache.tuscany.core.context.Context;
import org.apache.tuscany.model.assembly.Binding;
@@ -96,7 +96,7 @@
ServletContext servletContext = config.getServletContext();
- AggregateContext moduleContext = (AggregateContext) servletContext.getAttribute("org.apache.tuscany.core.webapp.ModuleComponentContext");
+ CompositeContext moduleContext = (CompositeContext) servletContext.getAttribute("org.apache.tuscany.core.webapp.ModuleComponentContext");
Module module = (Module) moduleContext.getAggregate();
@@ -168,7 +168,7 @@
if (axis2xmlFile.exists())
return; // do nothing if there.
- AggregateContext moduleContext = (AggregateContext) config.getServletContext().getAttribute("org.apache.tuscany.core.webapp.ModuleComponentContext");
+ CompositeContext moduleContext = (CompositeContext) config.getServletContext().getAttribute("org.apache.tuscany.core.webapp.ModuleComponentContext");
Module module = (Module) moduleContext.getAggregate();
Modified: incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/handler/JSONRPCEntryPointServlet.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/handler/JSONRPCEntryPointServlet.java?rev=392199&r1=392198&r2=392199&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/handler/JSONRPCEntryPointServlet.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/handler/JSONRPCEntryPointServlet.java Thu Apr 6 23:32:29 2006
@@ -33,7 +33,7 @@
import javax.servlet.http.HttpSession;
import org.apache.tuscany.binding.jsonrpc.assembly.JSONRPCBinding;
-import org.apache.tuscany.core.context.AggregateContext;
+import org.apache.tuscany.core.context.CompositeContext;
import org.apache.tuscany.core.context.EntryPointContext;
import org.apache.tuscany.model.assembly.Binding;
import org.apache.tuscany.model.assembly.EntryPoint;
@@ -97,7 +97,7 @@
private void initTuscany(ServletConfig config) {
ServletContext servletContext = config.getServletContext();
- AggregateContext moduleContext = (AggregateContext) servletContext.getAttribute("org.apache.tuscany.core.webapp.ModuleComponentContext");
+ CompositeContext moduleContext = (CompositeContext) servletContext.getAttribute("org.apache.tuscany.core.webapp.ModuleComponentContext");
Module module = (Module) moduleContext.getAggregate();
Map<String, Object> entryPoints = new HashMap<String, Object>();
@@ -124,7 +124,7 @@
return false;
}
- private Object createProxy(AggregateContext moduleContext, EntryPoint entryPoint, String entryPointName) {
+ private Object createProxy(CompositeContext moduleContext, EntryPoint entryPoint, String entryPointName) {
final EntryPointContext entryPointContext = (EntryPointContext) moduleContext.getContext(entryPointName);
InvocationHandler ih = new InvocationHandler() {
public Object invoke(Object o, Method method, Object[] args) throws Throwable {
Modified: incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/config/JavaContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/config/JavaContextFactory.java?rev=392199&r1=392198&r2=392199&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/config/JavaContextFactory.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/config/JavaContextFactory.java Thu Apr 6 23:32:29 2006
@@ -23,8 +23,8 @@
import org.apache.tuscany.core.builder.ContextCreationException;
import org.apache.tuscany.core.builder.ContextResolver;
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.context.CompositeContext;
+import org.apache.tuscany.core.context.AtomicContext;
import org.apache.tuscany.core.injection.EventInvoker;
import org.apache.tuscany.core.injection.Injector;
import org.apache.tuscany.core.injection.PojoObjectFactory;
@@ -36,13 +36,13 @@
*
* @version $Rev$ $Date$
*/
-public class JavaContextFactory implements ContextFactory<SimpleComponentContext>, ContextResolver {
+public class JavaContextFactory implements ContextFactory<AtomicContext>, ContextResolver {
// the component name as configured in the hosting module
private String name;
// the parent context of the component
- private AggregateContext parentContext;
+ private CompositeContext parentContext;
// the implementation type constructor
private Constructor<Object> ctr;
@@ -97,7 +97,7 @@
return scope;
}
- public SimpleComponentContext createContext() throws ContextCreationException {
+ public AtomicContext createContext() throws ContextCreationException {
PojoObjectFactory<?> objectFactory = new PojoObjectFactory<Object>(ctr, null, setters);
return new JavaComponentContext(name, objectFactory, eagerInit, init, destroy, stateless);
}
@@ -142,11 +142,11 @@
destroy = invoker;
}
- public void prepare(AggregateContext parent) {
+ public void prepare(CompositeContext parent) {
parentContext = parent;
}
- public AggregateContext getCurrentContext() {
+ public CompositeContext getCurrentContext() {
return parentContext;
}
Modified: incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaComponentContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaComponentContext.java?rev=392199&r1=392198&r2=392199&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaComponentContext.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaComponentContext.java Thu Apr 6 23:32:29 2006
@@ -27,7 +27,7 @@
*
* @version $Rev$ $Date$
*/
-public class JavaComponentContext extends AbstractContext implements SimpleComponentContext {
+public class JavaComponentContext extends AbstractContext implements AtomicContext {
private boolean eagerInit;
Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/BadPojoTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/BadPojoTestCase.java?rev=392199&r1=392198&r2=392199&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/BadPojoTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/BadPojoTestCase.java Thu Apr 6 23:32:29 2006
@@ -21,8 +21,8 @@
import org.apache.tuscany.container.java.mock.MockFactory;
import org.apache.tuscany.container.java.mock.components.BadContextPojo;
import org.apache.tuscany.container.java.mock.components.BadNamePojo;
-import org.apache.tuscany.core.context.AggregateContext;
-import org.apache.tuscany.core.context.impl.AggregateContextImpl;
+import org.apache.tuscany.core.context.CompositeContext;
+import org.apache.tuscany.core.context.impl.CompositeContextImpl;
import org.apache.tuscany.model.assembly.Scope;
public class BadPojoTestCase extends TestCase {
@@ -34,7 +34,7 @@
* "@ComponentName" is generated
*/
public void testBadNameType() throws Exception {
- AggregateContext mc = new AggregateContextImpl();
+ CompositeContext mc = new CompositeContextImpl();
mc.setName("mc");
try {
JavaComponentContext context = MockFactory.createPojoContext("BadNamePojo", BadNamePojo.class,
@@ -54,7 +54,7 @@
* "@Context" is generated
*/
public void testContextType() throws Exception {
- AggregateContext mc = new AggregateContextImpl();
+ CompositeContext mc = new CompositeContextImpl();
mc.setName("mc");
try {
JavaComponentContext context = MockFactory.createPojoContext("BadContextPojo", BadContextPojo.class,
Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/DifferentInterfaceWireTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/DifferentInterfaceWireTestCase.java?rev=392199&r1=392198&r2=392199&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/DifferentInterfaceWireTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/DifferentInterfaceWireTestCase.java Thu Apr 6 23:32:29 2006
@@ -28,10 +28,10 @@
import org.apache.tuscany.container.java.mock.components.Target;
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.CompositeContext;
import org.apache.tuscany.core.context.EventContext;
-import org.apache.tuscany.core.context.SimpleComponentContext;
-import org.apache.tuscany.core.context.impl.AggregateContextImpl;
+import org.apache.tuscany.core.context.AtomicContext;
+import org.apache.tuscany.core.context.impl.CompositeContextImpl;
import org.apache.tuscany.core.invocation.jdk.JDKProxyFactoryFactory;
import org.apache.tuscany.core.message.impl.MessageFactoryImpl;
import org.apache.tuscany.model.assembly.Scope;
@@ -45,13 +45,13 @@
public void testMultiplicity() throws Exception {
- AggregateContext context = createContext();
+ CompositeContext context = createContext();
context.start();
context.registerModelObject(MockFactory.createModuleWithWiredComponentsOfDifferentInterface(Scope.MODULE, Scope.MODULE));
context.fireEvent(EventContext.MODULE_START, null);
- Source source = (Source) ((SimpleComponentContext) context.getContext("source")).getImplementationInstance();
+ Source source = (Source) ((AtomicContext) context.getContext("source")).getImplementationInstance();
Assert.assertNotNull(source);
- OtherTarget target = (OtherTarget) ((SimpleComponentContext)context.getContext("target")).getImplementationInstance();
+ OtherTarget target = (OtherTarget) ((AtomicContext)context.getContext("target")).getImplementationInstance();
Assert.assertNotNull(target);
// test setter injection
List<Target> targets = source.getTargets();
@@ -64,8 +64,8 @@
Assert.assertEquals("foo",target.getString());
}
- private AggregateContext createContext() {
- AggregateContextImpl context = new AggregateContextImpl();
+ private CompositeContext createContext() {
+ CompositeContextImpl context = new CompositeContextImpl();
context.setName("system.context");
List<ContextFactoryBuilder>builders = MockFactory.createSystemBuilders();
builders.add(new JavaContextFactoryBuilder(new JDKProxyFactoryFactory(), new MessageFactoryImpl()));
Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/MultiplicityTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/MultiplicityTestCase.java?rev=392199&r1=392198&r2=392199&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/MultiplicityTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/MultiplicityTestCase.java Thu Apr 6 23:32:29 2006
@@ -27,10 +27,10 @@
import org.apache.tuscany.container.java.mock.components.Target;
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.CompositeContext;
import org.apache.tuscany.core.context.EventContext;
-import org.apache.tuscany.core.context.SimpleComponentContext;
-import org.apache.tuscany.core.context.impl.AggregateContextImpl;
+import org.apache.tuscany.core.context.AtomicContext;
+import org.apache.tuscany.core.context.impl.CompositeContextImpl;
import org.apache.tuscany.core.invocation.jdk.JDKProxyFactoryFactory;
import org.apache.tuscany.core.message.impl.MessageFactoryImpl;
import org.apache.tuscany.model.assembly.Scope;
@@ -43,13 +43,13 @@
public class MultiplicityTestCase extends TestCase {
public void testMultiplicity() throws Exception {
- AggregateContext context = createContext();
+ CompositeContext context = createContext();
context.start();
context.registerModelObject(MockFactory.createModuleWithWiredComponents(Scope.MODULE, Scope.MODULE));
context.fireEvent(EventContext.MODULE_START, null);
- Source source = (Source) ((SimpleComponentContext) context.getContext("source")).getImplementationInstance();
+ Source source = (Source) ((AtomicContext) context.getContext("source")).getImplementationInstance();
Assert.assertNotNull(source);
- Target target = (Target) ((SimpleComponentContext)context.getContext("target")).getImplementationInstance();
+ Target target = (Target) ((AtomicContext)context.getContext("target")).getImplementationInstance();
Assert.assertNotNull(target);
// test setter injection
List<Target> targets = source.getTargets();
@@ -60,8 +60,8 @@
Assert.assertEquals(1, targets.size());
}
- private AggregateContext createContext() {
- AggregateContextImpl context = new AggregateContextImpl();
+ private CompositeContext createContext() {
+ CompositeContextImpl context = new CompositeContextImpl();
context.setName("system.context");
List<ContextFactoryBuilder>builders = MockFactory.createSystemBuilders();
builders.add(new JavaContextFactoryBuilder(new JDKProxyFactoryFactory(), new MessageFactoryImpl()));
Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/PojoLifecycleTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/PojoLifecycleTestCase.java?rev=392199&r1=392198&r2=392199&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/PojoLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/PojoLifecycleTestCase.java Thu Apr 6 23:32:29 2006
@@ -21,8 +21,8 @@
import org.apache.tuscany.container.java.mock.MockFactory;
import org.apache.tuscany.container.java.mock.components.ModuleScopeInitOnlyComponent;
-import org.apache.tuscany.core.context.AggregateContext;
-import org.apache.tuscany.core.context.impl.AggregateContextImpl;
+import org.apache.tuscany.core.context.CompositeContext;
+import org.apache.tuscany.core.context.impl.CompositeContextImpl;
import org.apache.tuscany.model.assembly.Scope;
/**
@@ -33,7 +33,7 @@
public class PojoLifecycleTestCase extends TestCase {
public void testComponentNameSet() throws Exception {
- AggregateContext mc = new AggregateContextImpl();
+ CompositeContext mc = new CompositeContextImpl();
mc.setName("mc");
JavaComponentContext context = MockFactory.createPojoContext("TestServiceInit",
ModuleScopeInitOnlyComponent.class, Scope.MODULE, mc);
@@ -45,7 +45,7 @@
}
public void testModuleContextSet() throws Exception {
- AggregateContext mc = new AggregateContextImpl();
+ CompositeContext mc = new CompositeContextImpl();
mc.setName("mc");
JavaComponentContext context = MockFactory.createPojoContext("TestServiceInit",
ModuleScopeInitOnlyComponent.class, Scope.MODULE, mc);
@@ -57,7 +57,7 @@
}
public void testInit() throws Exception {
- AggregateContext mc = new AggregateContextImpl();
+ CompositeContext mc = new CompositeContextImpl();
mc.setName("mc");
JavaComponentContext context = MockFactory.createPojoContext("TestServiceInit",
ModuleScopeInitOnlyComponent.class, Scope.MODULE, mc);
Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/PojoTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/PojoTestCase.java?rev=392199&r1=392198&r2=392199&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/PojoTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/PojoTestCase.java Thu Apr 6 23:32:29 2006
@@ -27,8 +27,8 @@
import org.apache.tuscany.container.java.mock.components.SessionScopeComponentImpl;
import org.apache.tuscany.container.java.mock.components.StatelessComponentImpl;
import org.apache.tuscany.core.config.JavaIntrospectionHelper;
-import org.apache.tuscany.core.context.AggregateContext;
-import org.apache.tuscany.core.context.impl.AggregateContextImpl;
+import org.apache.tuscany.core.context.CompositeContext;
+import org.apache.tuscany.core.context.impl.CompositeContextImpl;
import org.apache.tuscany.core.injection.PojoObjectFactory;
/**
@@ -39,7 +39,7 @@
JavaAssemblyFactory factory = new JavaAssemblyFactoryImpl();
public void testGetModuleInstance() throws Exception {
- AggregateContext mc = new AggregateContextImpl();
+ CompositeContext mc = new CompositeContextImpl();
mc.setName("mc");
JavaComponentContext c = new JavaComponentContext("foo", new PojoObjectFactory<ModuleScopeComponentImpl>(JavaIntrospectionHelper
.getDefaultConstructor(ModuleScopeComponentImpl.class), null, null), false, null, null, false);
@@ -52,7 +52,7 @@
}
public void testGetSessionInstance() throws Exception {
- AggregateContext mc = new AggregateContextImpl();
+ CompositeContext mc = new CompositeContextImpl();
mc.setName("mc");
JavaComponentContext c = new JavaComponentContext("foo", new PojoObjectFactory<SessionScopeComponentImpl>(JavaIntrospectionHelper
.getDefaultConstructor(SessionScopeComponentImpl.class), null, null), false, null, null, false);
@@ -65,7 +65,7 @@
}
public void testGetRequestInstance() throws Exception {
- AggregateContext mc = new AggregateContextImpl();
+ CompositeContext mc = new CompositeContextImpl();
mc.setName("mc");
JavaComponentContext c = new JavaComponentContext("foo", new PojoObjectFactory<RequestScopeComponentImpl>(JavaIntrospectionHelper
.getDefaultConstructor(RequestScopeComponentImpl.class), null, null), false, null, null, false);
@@ -78,7 +78,7 @@
}
public void testGetStatelessInstance() throws Exception {
- AggregateContext mc = new AggregateContextImpl();
+ CompositeContext mc = new CompositeContextImpl();
mc.setName("fooContext");
JavaComponentContext c = new JavaComponentContext("foo", new PojoObjectFactory<StatelessComponentImpl>(JavaIntrospectionHelper
.getDefaultConstructor(StatelessComponentImpl.class), null, null), false, null, null, true);
Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java?rev=392199&r1=392198&r2=392199&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java Thu Apr 6 23:32:29 2006
@@ -29,9 +29,8 @@
import org.apache.tuscany.container.java.mock.components.GenericComponent;
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.CompositeContext;
import org.apache.tuscany.core.context.EventContext;
-import org.apache.tuscany.core.context.QualifiedName;
import org.apache.tuscany.core.invocation.jdk.JDKProxyFactoryFactory;
import org.apache.tuscany.core.invocation.spi.ProxyFactoryFactory;
import org.apache.tuscany.core.message.MessageFactory;
@@ -43,7 +42,7 @@
import org.apache.tuscany.core.system.builder.SystemExternalServiceBuilder;
/**
- * Verifies that the aggregate context implementation and java component builders construct references properly
+ * Verifies that the composite context implementation and java component builders construct references properly
*
* @version $Rev$ $Date$
*/
@@ -88,8 +87,8 @@
runtime.addBuilder(new JavaTargetWireBuilder());
runtime.start();
runtime.getRootContext().registerModelObject(
- MockFactory.createAggregateComponent("test.module"));
- AggregateContext child = (AggregateContext) runtime.getRootContext().getContext("test.module");
+ MockFactory.createCompositeComponent("test.module"));
+ CompositeContext child = (CompositeContext) runtime.getRootContext().getContext("test.module");
child.registerModelObject(MockFactory.createModule());
child.fireEvent(EventContext.MODULE_START, null);
GenericComponent source = (GenericComponent) child.getContext("source").getInstance(null);
@@ -132,8 +131,8 @@
runtime.addBuilder(new JavaTargetWireBuilder());
runtime.start();
runtime.getRootContext().registerModelObject(
- MockFactory.createAggregateComponent("test.module"));
- AggregateContext child = (AggregateContext) runtime.getRootContext().getContext("test.module");
+ MockFactory.createCompositeComponent("test.module"));
+ CompositeContext child = (CompositeContext) runtime.getRootContext().getContext("test.module");
child.registerModelObject(MockFactory.createModule());
child.fireEvent(EventContext.MODULE_START, null);
GenericComponent source = (GenericComponent) child.getContext("source").getInstance(null);
@@ -179,8 +178,8 @@
runtime.addBuilder(new JavaTargetWireBuilder());
runtime.start();
runtime.getRootContext().registerModelObject(
- MockFactory.createAggregateComponent("test.module"));
- AggregateContext child = (AggregateContext) runtime.getRootContext().getContext("test.module");
+ MockFactory.createCompositeComponent("test.module"));
+ CompositeContext child = (CompositeContext) runtime.getRootContext().getContext("test.module");
child.registerModelObject(MockFactory.createModule());
child.fireEvent(EventContext.MODULE_START, null);
GenericComponent source = (GenericComponent) child.getContext("source").getInstance(null);
@@ -223,8 +222,8 @@
runtime.start();
runtime.getRootContext().registerModelObject(
- MockFactory.createAggregateComponent("test.module"));
- AggregateContext child = (AggregateContext) runtime.getRootContext().getContext("test.module");
+ MockFactory.createCompositeComponent("test.module"));
+ CompositeContext child = (CompositeContext) runtime.getRootContext().getContext("test.module");
child.registerModelObject(MockFactory.createModule());
child.fireEvent(EventContext.MODULE_START, null);
GenericComponent source = (GenericComponent) child.getContext("source").getInstance(null);
Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaIntegrationTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaIntegrationTestCase.java?rev=392199&r1=392198&r2=392199&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaIntegrationTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaIntegrationTestCase.java Thu Apr 6 23:32:29 2006
@@ -52,9 +52,6 @@
// Create and bootstrap an empty Tuscany runtime
this.runtime = new RuntimeContextImpl();
this.runtime.start();
-
-// Component component = MockSystemAssemblyFactory.createComponent(RuntimeContext.SYSTEM, SystemAggregateContextImpl.class.getName(), ContextConstants.AGGREGATE_SCOPE_ENUM);
-// runtime.registerModelObject(component);
}
protected void tearDown() throws Exception {
Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaRuntimeBootstrapTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaRuntimeBootstrapTestCase.java?rev=392199&r1=392198&r2=392199&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaRuntimeBootstrapTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaRuntimeBootstrapTestCase.java Thu Apr 6 23:32:29 2006
@@ -15,7 +15,7 @@
import org.apache.tuscany.container.java.mock.MockFactory;
import org.apache.tuscany.container.java.mock.components.GenericComponent;
-import org.apache.tuscany.core.context.AggregateContext;
+import org.apache.tuscany.core.context.CompositeContext;
import org.apache.tuscany.core.context.EventContext;
import org.apache.tuscany.core.context.Context;
import org.apache.tuscany.core.runtime.RuntimeContext;
@@ -37,8 +37,8 @@
RuntimeContext runtime = MockFactory.createJavaRuntime();
Context ctx = runtime.getSystemContext().getContext(MockFactory.SYSTEM_CHILD);
Assert.assertNotNull(ctx);
- runtime.getRootContext().registerModelObject(MockFactory.createAggregateComponent("test"));
- AggregateContext testCtx = (AggregateContext) runtime.getRootContext().getContext("test");
+ runtime.getRootContext().registerModelObject(MockFactory.createCompositeComponent("test"));
+ CompositeContext testCtx = (CompositeContext) runtime.getRootContext().getContext("test");
Assert.assertNotNull(testCtx);
testCtx.registerModelObject(MockFactory.createModule());
testCtx.fireEvent(EventContext.MODULE_START,null);
Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/EntryPointToJavaTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/EntryPointToJavaTestCase.java?rev=392199&r1=392198&r2=392199&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/EntryPointToJavaTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/EntryPointToJavaTestCase.java Thu Apr 6 23:32:29 2006
@@ -24,7 +24,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.binding.foo.FooBindingBuilder;
-import org.apache.tuscany.core.context.AggregateContext;
+import org.apache.tuscany.core.context.CompositeContext;
import org.apache.tuscany.core.context.EntryPointContext;
import org.apache.tuscany.core.context.EventContext;
import org.apache.tuscany.core.runtime.RuntimeContext;
@@ -48,13 +48,13 @@
*/
public void testEPtoJavaModuleScopeInvoke() throws Throwable {
RuntimeContext runtime = MockFactory.registerFooBinding(MockFactory.createJavaRuntime());
- FooBindingBuilder builder = (FooBindingBuilder) ((AggregateContext) runtime.getSystemContext().getContext(MockFactory.SYSTEM_CHILD))
+ FooBindingBuilder builder = (FooBindingBuilder) ((CompositeContext) runtime.getSystemContext().getContext(MockFactory.SYSTEM_CHILD))
.getContext(MockFactory.FOO_BUILDER).getInstance(null);
MockSyncInterceptor mockInterceptor = new MockSyncInterceptor();
MockInterceptorBuilder interceptorBuilder = new MockInterceptorBuilder(mockInterceptor, false);
builder.addPolicyBuilder(interceptorBuilder);
- runtime.getRootContext().registerModelObject(MockFactory.createAggregateComponent("test.module"));
- AggregateContext child = (AggregateContext) runtime.getRootContext().getContext("test.module");
+ runtime.getRootContext().registerModelObject(MockFactory.createCompositeComponent("test.module"));
+ CompositeContext child = (CompositeContext) runtime.getRootContext().getContext("test.module");
child.registerModelObject(MockFactory.createModuleWithEntryPoint(Scope.MODULE));
child.fireEvent(EventContext.MODULE_START, null);
child.fireEvent(EventContext.REQUEST_START, null);
@@ -89,13 +89,13 @@
*/
public void testEPtoJavaSessionScopeInvoke() throws Throwable {
RuntimeContext runtime = MockFactory.registerFooBinding(MockFactory.createJavaRuntime());
- FooBindingBuilder builder = (FooBindingBuilder) ((AggregateContext) runtime.getSystemContext().getContext(MockFactory.SYSTEM_CHILD))
+ FooBindingBuilder builder = (FooBindingBuilder) ((CompositeContext) runtime.getSystemContext().getContext(MockFactory.SYSTEM_CHILD))
.getContext(MockFactory.FOO_BUILDER).getInstance(null);
MockSyncInterceptor mockInterceptor = new MockSyncInterceptor();
MockInterceptorBuilder interceptorBuilder = new MockInterceptorBuilder(mockInterceptor, false);
builder.addPolicyBuilder(interceptorBuilder);
- runtime.getRootContext().registerModelObject(MockFactory.createAggregateComponent("test.module"));
- AggregateContext child = (AggregateContext) runtime.getRootContext().getContext("test.module");
+ runtime.getRootContext().registerModelObject(MockFactory.createCompositeComponent("test.module"));
+ CompositeContext child = (CompositeContext) runtime.getRootContext().getContext("test.module");
child.registerModelObject(MockFactory.createModuleWithEntryPoint(Scope.SESSION));
child.fireEvent(EventContext.MODULE_START, null);
@@ -163,13 +163,13 @@
*/
public void testEPtoJavaStatelessInvoke() throws Throwable {
RuntimeContext runtime = MockFactory.registerFooBinding(MockFactory.createJavaRuntime());
- FooBindingBuilder builder = (FooBindingBuilder) ((AggregateContext) runtime.getSystemContext().getContext(MockFactory.SYSTEM_CHILD))
+ FooBindingBuilder builder = (FooBindingBuilder) ((CompositeContext) runtime.getSystemContext().getContext(MockFactory.SYSTEM_CHILD))
.getContext(MockFactory.FOO_BUILDER).getInstance(null);
MockSyncInterceptor mockInterceptor = new MockSyncInterceptor();
MockInterceptorBuilder interceptorBuilder = new MockInterceptorBuilder(mockInterceptor, false);
builder.addPolicyBuilder(interceptorBuilder);
- runtime.getRootContext().registerModelObject(MockFactory.createAggregateComponent("test.module"));
- AggregateContext child = (AggregateContext) runtime.getRootContext().getContext("test.module");
+ runtime.getRootContext().registerModelObject(MockFactory.createCompositeComponent("test.module"));
+ CompositeContext child = (CompositeContext) runtime.getRootContext().getContext("test.module");
child.registerModelObject(MockFactory.createModuleWithEntryPoint(Scope.INSTANCE));
child.fireEvent(EventContext.MODULE_START, null);
child.fireEvent(EventContext.REQUEST_START, null);
@@ -201,13 +201,13 @@
public void testEPtoJavaRequestInvoke() throws Throwable {
RuntimeContext runtime = MockFactory.registerFooBinding(MockFactory.createJavaRuntime());
- FooBindingBuilder builder = (FooBindingBuilder) ((AggregateContext) runtime.getSystemContext().getContext(MockFactory.SYSTEM_CHILD))
+ FooBindingBuilder builder = (FooBindingBuilder) ((CompositeContext) runtime.getSystemContext().getContext(MockFactory.SYSTEM_CHILD))
.getContext(MockFactory.FOO_BUILDER).getInstance(null);
MockSyncInterceptor mockInterceptor = new MockSyncInterceptor();
MockInterceptorBuilder interceptorBuilder = new MockInterceptorBuilder(mockInterceptor, false);
builder.addPolicyBuilder(interceptorBuilder);
- runtime.getRootContext().registerModelObject(MockFactory.createAggregateComponent("test.module"));
- AggregateContext child = (AggregateContext) runtime.getRootContext().getContext("test.module");
+ runtime.getRootContext().registerModelObject(MockFactory.createCompositeComponent("test.module"));
+ CompositeContext child = (CompositeContext) runtime.getRootContext().getContext("test.module");
child.registerModelObject(MockFactory.createModuleWithEntryPoint(Scope.REQUEST));
child.fireEvent(EventContext.MODULE_START, null);
child.fireEvent(EventContext.REQUEST_START, null);
Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/JavaToExternalServiceTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/JavaToExternalServiceTestCase.java?rev=392199&r1=392198&r2=392199&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/JavaToExternalServiceTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/JavaToExternalServiceTestCase.java Thu Apr 6 23:32:29 2006
@@ -21,9 +21,8 @@
import org.apache.tuscany.container.java.invocation.mock.MockSyncInterceptor;
import org.apache.tuscany.container.java.mock.MockFactory;
import org.apache.tuscany.container.java.mock.binding.foo.FooBindingBuilder;
-import org.apache.tuscany.core.context.AggregateContext;
+import org.apache.tuscany.core.context.CompositeContext;
import org.apache.tuscany.core.context.EventContext;
-import org.apache.tuscany.core.context.QualifiedName;
import org.apache.tuscany.core.runtime.RuntimeContext;
/**
@@ -41,13 +40,13 @@
*/
public void testJavaToESInvoke() throws Exception {
RuntimeContext runtime = MockFactory.registerFooBinding(MockFactory.createJavaRuntime());
- FooBindingBuilder builder = (FooBindingBuilder) ((AggregateContext) runtime.getSystemContext().getContext(
+ FooBindingBuilder builder = (FooBindingBuilder) ((CompositeContext) runtime.getSystemContext().getContext(
MockFactory.SYSTEM_CHILD)).getContext(MockFactory.FOO_BUILDER).getInstance(null);
MockSyncInterceptor mockInterceptor = new MockSyncInterceptor();
MockInterceptorBuilder interceptorBuilder = new MockInterceptorBuilder(mockInterceptor, false);
builder.addPolicyBuilder(interceptorBuilder);
- runtime.getRootContext().registerModelObject(MockFactory.createAggregateComponent("test.module"));
- AggregateContext child = (AggregateContext) runtime.getRootContext().getContext("test.module");
+ runtime.getRootContext().registerModelObject(MockFactory.createCompositeComponent("test.module"));
+ CompositeContext child = (CompositeContext) runtime.getRootContext().getContext("test.module");
child.registerModelObject(MockFactory.createModuleWithExternalService());
child.fireEvent(EventContext.MODULE_START, null);
HelloWorldService source = (HelloWorldService) child.getContext("source").getInstance(null);
Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/ScopeReferenceTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/ScopeReferenceTestCase.java?rev=392199&r1=392198&r2=392199&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/ScopeReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/ScopeReferenceTestCase.java Thu Apr 6 23:32:29 2006
@@ -15,7 +15,7 @@
import org.apache.tuscany.container.java.mock.MockFactory;
import org.apache.tuscany.container.java.mock.components.GenericComponent;
-import org.apache.tuscany.core.context.AggregateContext;
+import org.apache.tuscany.core.context.CompositeContext;
import org.apache.tuscany.core.context.EventContext;
import org.apache.tuscany.core.context.Context;
import org.apache.tuscany.core.runtime.RuntimeContext;
@@ -38,8 +38,8 @@
RuntimeContext runtime = MockFactory.createJavaRuntime();
Context ctx = runtime.getSystemContext().getContext("tuscany.system.child");
Assert.assertNotNull(ctx);
- runtime.getRootContext().registerModelObject(MockFactory.createAggregateComponent("test"));
- AggregateContext testCtx = (AggregateContext) runtime.getRootContext().getContext("test");
+ runtime.getRootContext().registerModelObject(MockFactory.createCompositeComponent("test"));
+ CompositeContext testCtx = (CompositeContext) runtime.getRootContext().getContext("test");
Assert.assertNotNull(testCtx);
testCtx.registerModelObject(MockFactory.createModule());
testCtx.fireEvent(EventContext.MODULE_START,null);
@@ -57,8 +57,8 @@
RuntimeContext runtime = MockFactory.createJavaRuntime();
Context ctx = runtime.getSystemContext().getContext("tuscany.system.child");
Assert.assertNotNull(ctx);
- runtime.getRootContext().registerModelObject(MockFactory.createAggregateComponent("test"));
- AggregateContext testCtx = (AggregateContext) runtime.getRootContext().getContext("test");
+ runtime.getRootContext().registerModelObject(MockFactory.createCompositeComponent("test"));
+ CompositeContext testCtx = (CompositeContext) runtime.getRootContext().getContext("test");
Assert.assertNotNull(testCtx);
testCtx.registerModelObject(MockFactory.createModule(Scope.MODULE,Scope.SESSION));
testCtx.fireEvent(EventContext.MODULE_START,null);
@@ -98,8 +98,8 @@
RuntimeContext runtime = MockFactory.createJavaRuntime();
Context ctx = runtime.getSystemContext().getContext("tuscany.system.child");
Assert.assertNotNull(ctx);
- runtime.getRootContext().registerModelObject(MockFactory.createAggregateComponent("test"));
- AggregateContext testCtx = (AggregateContext) runtime.getRootContext().getContext("test");
+ runtime.getRootContext().registerModelObject(MockFactory.createCompositeComponent("test"));
+ CompositeContext testCtx = (CompositeContext) runtime.getRootContext().getContext("test");
Assert.assertNotNull(testCtx);
testCtx.registerModelObject(MockFactory.createModule(Scope.MODULE,Scope.REQUEST));
testCtx.fireEvent(EventContext.MODULE_START,null);
@@ -134,8 +134,8 @@
RuntimeContext runtime = MockFactory.createJavaRuntime();
Context ctx = runtime.getSystemContext().getContext("tuscany.system.child");
Assert.assertNotNull(ctx);
- runtime.getRootContext().registerModelObject(MockFactory.createAggregateComponent("test"));
- AggregateContext testCtx = (AggregateContext) runtime.getRootContext().getContext("test");
+ runtime.getRootContext().registerModelObject(MockFactory.createCompositeComponent("test"));
+ CompositeContext testCtx = (CompositeContext) runtime.getRootContext().getContext("test");
Assert.assertNotNull(testCtx);
testCtx.registerModelObject(MockFactory.createModule(Scope.MODULE,Scope.INSTANCE));
testCtx.fireEvent(EventContext.MODULE_START,null);
@@ -168,8 +168,8 @@
RuntimeContext runtime = MockFactory.createJavaRuntime();
Context ctx = runtime.getSystemContext().getContext("tuscany.system.child");
Assert.assertNotNull(ctx);
- runtime.getRootContext().registerModelObject(MockFactory.createAggregateComponent("test"));
- AggregateContext testCtx = (AggregateContext) runtime.getRootContext().getContext("test");
+ runtime.getRootContext().registerModelObject(MockFactory.createCompositeComponent("test"));
+ CompositeContext testCtx = (CompositeContext) runtime.getRootContext().getContext("test");
Assert.assertNotNull(testCtx);
testCtx.registerModelObject(MockFactory.createModule(Scope.SESSION,Scope.SESSION));
testCtx.fireEvent(EventContext.MODULE_START,null);
@@ -214,8 +214,8 @@
RuntimeContext runtime = MockFactory.createJavaRuntime();
Context ctx = runtime.getSystemContext().getContext("tuscany.system.child");
Assert.assertNotNull(ctx);
- runtime.getRootContext().registerModelObject(MockFactory.createAggregateComponent("test"));
- AggregateContext testCtx = (AggregateContext) runtime.getRootContext().getContext("test");
+ runtime.getRootContext().registerModelObject(MockFactory.createCompositeComponent("test"));
+ CompositeContext testCtx = (CompositeContext) runtime.getRootContext().getContext("test");
Assert.assertNotNull(testCtx);
testCtx.registerModelObject(MockFactory.createModule(Scope.SESSION,Scope.MODULE));
testCtx.fireEvent(EventContext.MODULE_START,null);
@@ -260,8 +260,8 @@
RuntimeContext runtime = MockFactory.createJavaRuntime();
Context ctx = runtime.getSystemContext().getContext("tuscany.system.child");
Assert.assertNotNull(ctx);
- runtime.getRootContext().registerModelObject(MockFactory.createAggregateComponent("test"));
- AggregateContext testCtx = (AggregateContext) runtime.getRootContext().getContext("test");
+ runtime.getRootContext().registerModelObject(MockFactory.createCompositeComponent("test"));
+ CompositeContext testCtx = (CompositeContext) runtime.getRootContext().getContext("test");
Assert.assertNotNull(testCtx);
testCtx.registerModelObject(MockFactory.createModule(Scope.SESSION,Scope.REQUEST));
testCtx.fireEvent(EventContext.MODULE_START,null);
@@ -305,8 +305,8 @@
RuntimeContext runtime = MockFactory.createJavaRuntime();
Context ctx = runtime.getSystemContext().getContext("tuscany.system.child");
Assert.assertNotNull(ctx);
- runtime.getRootContext().registerModelObject(MockFactory.createAggregateComponent("test"));
- AggregateContext testCtx = (AggregateContext) runtime.getRootContext().getContext("test");
+ runtime.getRootContext().registerModelObject(MockFactory.createCompositeComponent("test"));
+ CompositeContext testCtx = (CompositeContext) runtime.getRootContext().getContext("test");
Assert.assertNotNull(testCtx);
testCtx.registerModelObject(MockFactory.createModule(Scope.SESSION,Scope.INSTANCE));
testCtx.fireEvent(EventContext.MODULE_START,null);
@@ -349,8 +349,8 @@
RuntimeContext runtime = MockFactory.createJavaRuntime();
Context ctx = runtime.getSystemContext().getContext("tuscany.system.child");
Assert.assertNotNull(ctx);
- runtime.getRootContext().registerModelObject(MockFactory.createAggregateComponent("test"));
- AggregateContext testCtx = (AggregateContext) runtime.getRootContext().getContext("test");
+ runtime.getRootContext().registerModelObject(MockFactory.createCompositeComponent("test"));
+ CompositeContext testCtx = (CompositeContext) runtime.getRootContext().getContext("test");
Assert.assertNotNull(testCtx);
testCtx.registerModelObject(MockFactory.createModule(Scope.REQUEST,Scope.REQUEST));
testCtx.fireEvent(EventContext.MODULE_START,null);
@@ -389,8 +389,8 @@
RuntimeContext runtime = MockFactory.createJavaRuntime();
Context ctx = runtime.getSystemContext().getContext("tuscany.system.child");
Assert.assertNotNull(ctx);
- runtime.getRootContext().registerModelObject(MockFactory.createAggregateComponent("test"));
- AggregateContext testCtx = (AggregateContext) runtime.getRootContext().getContext("test");
+ runtime.getRootContext().registerModelObject(MockFactory.createCompositeComponent("test"));
+ CompositeContext testCtx = (CompositeContext) runtime.getRootContext().getContext("test");
Assert.assertNotNull(testCtx);
testCtx.registerModelObject(MockFactory.createModule(Scope.REQUEST,Scope.MODULE));
testCtx.fireEvent(EventContext.MODULE_START,null);
@@ -430,8 +430,8 @@
RuntimeContext runtime = MockFactory.createJavaRuntime();
Context ctx = runtime.getSystemContext().getContext("tuscany.system.child");
Assert.assertNotNull(ctx);
- runtime.getRootContext().registerModelObject(MockFactory.createAggregateComponent("test"));
- AggregateContext testCtx = (AggregateContext) runtime.getRootContext().getContext("test");
+ runtime.getRootContext().registerModelObject(MockFactory.createCompositeComponent("test"));
+ CompositeContext testCtx = (CompositeContext) runtime.getRootContext().getContext("test");
Assert.assertNotNull(testCtx);
testCtx.registerModelObject(MockFactory.createModule(Scope.REQUEST,Scope.SESSION));
testCtx.fireEvent(EventContext.MODULE_START,null);
@@ -489,8 +489,8 @@
RuntimeContext runtime = MockFactory.createJavaRuntime();
Context ctx = runtime.getSystemContext().getContext("tuscany.system.child");
Assert.assertNotNull(ctx);
- runtime.getRootContext().registerModelObject(MockFactory.createAggregateComponent("test"));
- AggregateContext testCtx = (AggregateContext) runtime.getRootContext().getContext("test");
+ runtime.getRootContext().registerModelObject(MockFactory.createCompositeComponent("test"));
+ CompositeContext testCtx = (CompositeContext) runtime.getRootContext().getContext("test");
Assert.assertNotNull(testCtx);
testCtx.registerModelObject(MockFactory.createModule(Scope.REQUEST,Scope.INSTANCE));
testCtx.fireEvent(EventContext.MODULE_START,null);
@@ -530,8 +530,8 @@
RuntimeContext runtime = MockFactory.createJavaRuntime();
Context ctx = runtime.getSystemContext().getContext("tuscany.system.child");
Assert.assertNotNull(ctx);
- runtime.getRootContext().registerModelObject(MockFactory.createAggregateComponent("test"));
- AggregateContext testCtx = (AggregateContext) runtime.getRootContext().getContext("test");
+ runtime.getRootContext().registerModelObject(MockFactory.createCompositeComponent("test"));
+ CompositeContext testCtx = (CompositeContext) runtime.getRootContext().getContext("test");
Assert.assertNotNull(testCtx);
testCtx.registerModelObject(MockFactory.createModule(Scope.INSTANCE,Scope.INSTANCE));
testCtx.fireEvent(EventContext.MODULE_START,null);
@@ -570,8 +570,8 @@
RuntimeContext runtime = MockFactory.createJavaRuntime();
Context ctx = runtime.getSystemContext().getContext("tuscany.system.child");
Assert.assertNotNull(ctx);
- runtime.getRootContext().registerModelObject(MockFactory.createAggregateComponent("test"));
- AggregateContext testCtx = (AggregateContext) runtime.getRootContext().getContext("test");
+ runtime.getRootContext().registerModelObject(MockFactory.createCompositeComponent("test"));
+ CompositeContext testCtx = (CompositeContext) runtime.getRootContext().getContext("test");
Assert.assertNotNull(testCtx);
testCtx.registerModelObject(MockFactory.createModule(Scope.INSTANCE,Scope.REQUEST));
testCtx.fireEvent(EventContext.MODULE_START,null);
@@ -614,8 +614,8 @@
RuntimeContext runtime = MockFactory.createJavaRuntime();
Context ctx = runtime.getSystemContext().getContext("tuscany.system.child");
Assert.assertNotNull(ctx);
- runtime.getRootContext().registerModelObject(MockFactory.createAggregateComponent("test"));
- AggregateContext testCtx = (AggregateContext) runtime.getRootContext().getContext("test");
+ runtime.getRootContext().registerModelObject(MockFactory.createCompositeComponent("test"));
+ CompositeContext testCtx = (CompositeContext) runtime.getRootContext().getContext("test");
Assert.assertNotNull(testCtx);
testCtx.registerModelObject(MockFactory.createModule(Scope.INSTANCE,Scope.SESSION));
testCtx.fireEvent(EventContext.MODULE_START,null);
@@ -673,8 +673,8 @@
RuntimeContext runtime = MockFactory.createJavaRuntime();
Context ctx = runtime.getSystemContext().getContext("tuscany.system.child");
Assert.assertNotNull(ctx);
- runtime.getRootContext().registerModelObject(MockFactory.createAggregateComponent("test"));
- AggregateContext testCtx = (AggregateContext) runtime.getRootContext().getContext("test");
+ runtime.getRootContext().registerModelObject(MockFactory.createCompositeComponent("test"));
+ CompositeContext testCtx = (CompositeContext) runtime.getRootContext().getContext("test");
Assert.assertNotNull(testCtx);
testCtx.registerModelObject(MockFactory.createModule(Scope.INSTANCE,Scope.MODULE));
testCtx.fireEvent(EventContext.MODULE_START,null);
Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java?rev=392199&r1=392198&r2=392199&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java Thu Apr 6 23:32:29 2006
@@ -50,10 +50,10 @@
import org.apache.tuscany.core.builder.WireBuilder;
import org.apache.tuscany.core.config.ConfigurationException;
import org.apache.tuscany.core.config.JavaIntrospectionHelper;
-import org.apache.tuscany.core.context.AggregateContext;
+import org.apache.tuscany.core.context.CompositeContext;
import org.apache.tuscany.core.context.EventContext;
import org.apache.tuscany.core.context.Context;
-import org.apache.tuscany.core.context.SystemAggregateContext;
+import org.apache.tuscany.core.context.SystemCompositeContext;
import org.apache.tuscany.core.injection.EventInvoker;
import org.apache.tuscany.core.injection.FieldInjector;
import org.apache.tuscany.core.injection.Injector;
@@ -136,13 +136,13 @@
}
/**
- * Creates an aggregate component with the given name
+ * Creates an composite component with the given name
*/
- public static Component createAggregateComponent(String name) {
+ public static Component createCompositeComponent(String name) {
Component sc = sc = systemFactory.createModuleComponent();
Module impl = systemFactory.createModule();
impl.setName(name);
- //impl.setImplementationClass(AggregateContextImpl.class);
+ //impl.setImplementationClass(CompositeContextImpl.class);
sc.setComponentImplementation(impl);
Service s = systemFactory.createService();
JavaServiceContract ji = systemFactory.createJavaServiceContract();
@@ -156,13 +156,13 @@
}
/**
- * Creates a system aggregate component with the given name
+ * Creates a system composite component with the given name
*/
- public static Component createSystemAggregateComponent(String name) {
+ public static Component createSystemCompositeComponent(String name) {
Component sc = sc = systemFactory.createModuleComponent();
Module impl = systemFactory.createSystemModule();
impl.setName(name);
- //impl.setImplementationClass(SystemAggregateContextImpl.class);
+ //impl.setImplementationClass(SystemCompositeContextImpl.class);
sc.setComponentImplementation(impl);
Service s = systemFactory.createService();
JavaServiceContract ji = systemFactory.createJavaServiceContract();
@@ -570,7 +570,7 @@
* Returns a collection of bootstrap configuration builders
*/
public static List<ContextFactoryBuilder> createSystemBuilders() {
- List<ContextFactoryBuilder> builders = new ArrayList();
+ List<ContextFactoryBuilder> builders = new ArrayList<ContextFactoryBuilder>();
builders.add((new SystemContextFactoryBuilder()));
builders.add(new SystemEntryPointBuilder());
builders.add(new SystemExternalServiceBuilder());
@@ -578,17 +578,16 @@
}
/**
- * Creates an aggregate context faxtory
+ * Creates an composite context faxtory
*
* @param name the name of the component
- * @param aggregateContext the containing aggregate context
* @throws BuilderException
* @see ContextFactory
*/
- public static ContextFactory<Context> createAggregateConfiguration(String name,
- AggregateContext aggregateContext) throws BuilderException {
+ public static ContextFactory<Context> createCompositeConfiguration(String name
+ ) throws BuilderException {
- Component sc = createAggregateComponent(name);
+ Component sc = createCompositeComponent(name);
SystemContextFactoryBuilder builder = new SystemContextFactoryBuilder();
builder.build(sc);
return (ContextFactory<Context>) sc.getComponentImplementation().getContextFactory();
@@ -600,16 +599,17 @@
* @param name the name of the context
* @param implType the POJO class
* @param scope the component scope
- * @param moduleComponentContext the containing aggregate context
+ * @param moduleComponentContext the containing composite context
* @throws NoSuchMethodException if the POJO does not have a default noi-args constructor
*/
public static JavaComponentContext createPojoContext(String name, Class implType, Scope scope,
- AggregateContext moduleComponentContext) throws NoSuchMethodException {
+ CompositeContext moduleComponentContext) throws NoSuchMethodException {
SimpleComponent component = createComponent(name, implType, scope);
Set<Field> fields = JavaIntrospectionHelper.getAllFields(implType);
Set<Method> methods = JavaIntrospectionHelper.getAllUniqueMethods(implType);
- List<Injector> injectors = new ArrayList();
+ List<Injector> injectors = new ArrayList<Injector>();
+
EventInvoker initInvoker = null;
boolean eagerInit = false;
EventInvoker destroyInvoker = null;
@@ -663,8 +663,8 @@
public static RuntimeContext createJavaRuntime() throws ConfigurationException {
RuntimeContext runtime = new RuntimeContextImpl(null, MockFactory.createSystemBuilders(), null);
runtime.start();
- runtime.getSystemContext().registerModelObject(createSystemAggregateComponent(SYSTEM_CHILD));
- SystemAggregateContext ctx = (SystemAggregateContext) runtime.getSystemContext().getContext(SYSTEM_CHILD);
+ runtime.getSystemContext().registerModelObject(createSystemCompositeComponent(SYSTEM_CHILD));
+ SystemCompositeContext ctx = (SystemCompositeContext) runtime.getSystemContext().getContext(SYSTEM_CHILD);
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);
@@ -677,9 +677,8 @@
* @throws ConfigurationException
*/
public static RuntimeContext registerFooBinding(RuntimeContext runtime) throws ConfigurationException {
- AggregateContext child = (AggregateContext) runtime.getSystemContext().getContext(MockFactory.SYSTEM_CHILD);
- JavaContextFactoryBuilder javaBuilder = (JavaContextFactoryBuilder) child.getContext(MockFactory.JAVA_BUILDER)
- .getInstance(null);
+ CompositeContext child = (CompositeContext) runtime.getSystemContext().getContext(MockFactory.SYSTEM_CHILD);
+ child.getContext(MockFactory.JAVA_BUILDER).getInstance(null);
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
Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockScopeContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockScopeContext.java?rev=392199&r1=392198&r2=392199&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockScopeContext.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockScopeContext.java Thu Apr 6 23:32:29 2006
@@ -64,7 +64,7 @@
return null;
}
- public SimpleComponentContext getContext(String name) {
+ public AtomicContext getContext(String name) {
return null;
}
@@ -72,7 +72,7 @@
return components.get(name.getPartName());
}
- public SimpleComponentContext getContextByKey(String name, Object key) {
+ public AtomicContext getContextByKey(String name, Object key) {
return null;
}