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/12/20 04:17:55 UTC
svn commit: r488899 - in /incubator/tuscany/java/sca:
kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/
kernel/core/src/main/java/org/apache/tuscany/core/component/scope/
kernel/core/src/main/java/org/apache/tuscany/core/deployer/ kernel/cor...
Author: jmarino
Date: Tue Dec 19 19:17:54 2006
New Revision: 488899
URL: http://svn.apache.org/viewvc?view=rev&rev=488899
Log:
rename ModuleScopeContainer to CompositeScopeContainer and its associated factory
Added:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java (contents, props changed)
- copied, changed from r488890, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactory.java (contents, props changed)
- copied, changed from r488890, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java
Removed:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicModuleScopeTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/DependencyLifecycleTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInitDestroyErrorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInstanceLifecycleTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactoryTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeRestartTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderWireTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/scope/ScopeReferenceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/ReferenceInjectionTestCase.java
incubator/tuscany/java/sca/runtime/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl
incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/PropertyTestCase.java
incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/ScriptInvokeTestCase.java
incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/WireTestCase.java
incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/WireTestCase.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java
incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/system.scdl
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java?view=diff&rev=488899&r1=488898&r2=488899
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java Tue Dec 19 19:17:54 2006
@@ -40,7 +40,7 @@
import org.apache.tuscany.core.builder.BuilderRegistryImpl;
import org.apache.tuscany.core.builder.ConnectorImpl;
import org.apache.tuscany.core.component.WorkContextImpl;
-import org.apache.tuscany.core.component.scope.ModuleScopeObjectFactory;
+import org.apache.tuscany.core.component.scope.CompositeScopeObjectFactory;
import org.apache.tuscany.core.component.scope.ScopeRegistryImpl;
import org.apache.tuscany.core.deployer.DeployerImpl;
import org.apache.tuscany.core.idl.java.InterfaceJavaLoader;
@@ -149,7 +149,7 @@
*/
public ScopeRegistry createScopeRegistry(WorkContext workContext) {
ScopeRegistry scopeRegistry = new ScopeRegistryImpl();
- new ModuleScopeObjectFactory(scopeRegistry, monitorFactory.getMonitor(ScopeContainerMonitor.class));
+ new CompositeScopeObjectFactory(scopeRegistry, monitorFactory.getMonitor(ScopeContainerMonitor.class));
return scopeRegistry;
}
Copied: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java (from r488890, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java?view=diff&rev=488899&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java&r1=488890&p2=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java&r2=488899
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java Tue Dec 19 19:17:54 2006
@@ -39,11 +39,11 @@
import org.apache.tuscany.core.component.event.CompositeStop;
/**
- * A scope context which manages atomic component instances keyed by module
+ * A scope context which manages atomic component instances keyed by composite
*
* @version $Rev$ $Date$
*/
-public class ModuleScopeContainer extends AbstractScopeContainer {
+public class CompositeScopeContainer extends AbstractScopeContainer {
private static final InstanceWrapper EMPTY = new EmptyWrapper();
private static final ComponentInitComparator COMPARATOR = new ComponentInitComparator();
@@ -51,7 +51,7 @@
// the queue of instanceWrappers to destroy, in the order that their instances were created
private final List<InstanceWrapper> destroyQueue;
- public ModuleScopeContainer(ScopeContainerMonitor monitor) {
+ public CompositeScopeContainer(ScopeContainerMonitor monitor) {
super(null, monitor);
instanceWrappers = new ConcurrentHashMap<AtomicComponent, InstanceWrapper>();
destroyQueue = new ArrayList<InstanceWrapper>();
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactory.java (from r488890, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactory.java?view=diff&rev=488899&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java&r1=488890&p2=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactory.java&r2=488899
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactory.java Tue Dec 19 19:17:54 2006
@@ -34,11 +34,11 @@
*
* @version $$Rev$$ $$Date$$
*/
-public class ModuleScopeObjectFactory implements ObjectFactory<ModuleScopeContainer> {
+public class CompositeScopeObjectFactory implements ObjectFactory<CompositeScopeContainer> {
private ScopeContainerMonitor monitor;
- public ModuleScopeObjectFactory(@Autowire ScopeRegistry registry,
- @Monitor ScopeContainerMonitor monitor) {
+ public CompositeScopeObjectFactory(@Autowire ScopeRegistry registry,
+ @Monitor ScopeContainerMonitor monitor) {
registry.registerFactory(Scope.COMPOSITE, this);
this.monitor = monitor;
}
@@ -47,7 +47,7 @@
public void init() {
}
- public ModuleScopeContainer getInstance() throws ObjectCreationException {
- return new ModuleScopeContainer(monitor);
+ public CompositeScopeContainer getInstance() throws ObjectCreationException {
+ return new CompositeScopeContainer(monitor);
}
}
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java?view=diff&rev=488899&r1=488898&r2=488899
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java Tue Dec 19 19:17:54 2006
@@ -40,7 +40,7 @@
import org.apache.tuscany.spi.model.Implementation;
import org.apache.tuscany.spi.builder.BuilderInstantiationException;
-import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
+import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
import org.apache.tuscany.api.annotation.Monitor;
/**
@@ -82,7 +82,7 @@
public <I extends Implementation<?>> Component deploy(CompositeComponent parent,
ComponentDefinition<I> componentDefinition)
throws LoaderException, BuilderException, PrepareException {
- ScopeContainer moduleScope = new ModuleScopeContainer(monitor);
+ ScopeContainer moduleScope = new CompositeScopeContainer(monitor);
DeploymentContext deploymentContext = new RootDeploymentContext(null, xmlFactory, moduleScope, null);
try {
load(parent, componentDefinition, deploymentContext);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicModuleScopeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicModuleScopeTestCase.java?view=diff&rev=488899&r1=488898&r2=488899
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicModuleScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicModuleScopeTestCase.java Tue Dec 19 19:17:54 2006
@@ -44,7 +44,7 @@
public void testLifecycleManagement() throws Exception {
WorkContext workContext = new WorkContextImpl();
- ModuleScopeContainer scopeContext = new ModuleScopeContainer(null);
+ CompositeScopeContainer scopeContext = new CompositeScopeContainer(null);
scopeContext.start();
SystemAtomicComponent component = createComponent(scopeContext);
// start the request
@@ -63,7 +63,7 @@
public void testGetAssociatedInstance() throws Exception {
WorkContext workContext = new WorkContextImpl();
- ModuleScopeContainer scopeContext = new ModuleScopeContainer(null);
+ CompositeScopeContainer scopeContext = new CompositeScopeContainer(null);
scopeContext.start();
SystemAtomicComponent component = createComponent(scopeContext);
// start the request
@@ -73,7 +73,7 @@
public void testGetAssociatedInstanceNonExistent() throws Exception {
WorkContext workContext = new WorkContextImpl();
- ModuleScopeContainer scopeContext = new ModuleScopeContainer(null);
+ CompositeScopeContainer scopeContext = new CompositeScopeContainer(null);
scopeContext.start();
SystemAtomicComponent component = createComponent(scopeContext);
// start the request
@@ -87,7 +87,7 @@
public void testModuleIsolation() throws Exception {
WorkContext workContext = new WorkContextImpl();
- ModuleScopeContainer scopeContext = new ModuleScopeContainer(null);
+ CompositeScopeContainer scopeContext = new CompositeScopeContainer(null);
scopeContext.start();
SystemAtomicComponent component = createComponent(scopeContext);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/DependencyLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/DependencyLifecycleTestCase.java?view=diff&rev=488899&r1=488898&r2=488899
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/DependencyLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/DependencyLifecycleTestCase.java Tue Dec 19 19:17:54 2006
@@ -45,7 +45,7 @@
public void testInitDestroyOrderModuleScope() throws Exception {
WorkContext ctx = new WorkContextImpl();
- ModuleScopeContainer scopeCtx = new ModuleScopeContainer(null);
+ CompositeScopeContainer scopeCtx = new CompositeScopeContainer(null);
scopeCtx.start();
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source",
OrderedDependentPojoImpl.class,
@@ -73,7 +73,7 @@
public void testInitDestroyOrderAfterStartModuleScope() throws Exception {
WorkContext ctx = new WorkContextImpl();
- ModuleScopeContainer scopeCtx = new ModuleScopeContainer(null);
+ CompositeScopeContainer scopeCtx = new CompositeScopeContainer(null);
scopeCtx.start();
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source",
OrderedDependentPojoImpl.class,
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInitDestroyErrorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInitDestroyErrorTestCase.java?view=diff&rev=488899&r1=488898&r2=488899
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInitDestroyErrorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInitDestroyErrorTestCase.java Tue Dec 19 19:17:54 2006
@@ -41,7 +41,7 @@
monitor = EasyMock.createMock(ScopeContainerMonitor.class);
monitor.eagerInitializationError(EasyMock.isA(ObjectCreationException.class));
EasyMock.replay(monitor);
- ModuleScopeContainer scope = new ModuleScopeContainer(monitor);
+ CompositeScopeContainer scope = new CompositeScopeContainer(monitor);
scope.start();
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(component.getName()).andReturn("foo").atLeastOnce();
@@ -61,7 +61,7 @@
monitor = EasyMock.createMock(ScopeContainerMonitor.class);
monitor.destructionError(EasyMock.isA(TargetDestructionException.class));
EasyMock.replay(monitor);
- ModuleScopeContainer scope = new ModuleScopeContainer(monitor);
+ CompositeScopeContainer scope = new CompositeScopeContainer(monitor);
scope.start();
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(component.getName()).andReturn("foo").atLeastOnce();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInstanceLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInstanceLifecycleTestCase.java?view=diff&rev=488899&r1=488898&r2=488899
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInstanceLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInstanceLifecycleTestCase.java Tue Dec 19 19:17:54 2006
@@ -46,7 +46,7 @@
*/
public void testInitDestroy() throws Exception {
WorkContext ctx = new WorkContextImpl();
- ModuleScopeContainer scope = new ModuleScopeContainer(null);
+ CompositeScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
Foo comp = new Foo();
SystemAtomicComponent component = EasyMock.createMock(SystemAtomicComponent.class);
@@ -71,7 +71,7 @@
*/
public void testEagerInitDestroy() throws Exception {
WorkContext ctx = new WorkContextImpl();
- ModuleScopeContainer scope = new ModuleScopeContainer(null);
+ CompositeScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
Foo comp = new Foo();
SystemAtomicComponent initDestroyComponent = EasyMock.createMock(SystemAtomicComponent.class);
@@ -91,7 +91,7 @@
public void testDestroyOrder() throws Exception {
WorkContext ctx = new WorkContextImpl();
- ModuleScopeContainer scope = new ModuleScopeContainer(null);
+ CompositeScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
SystemAtomicComponent oneComponent = createComponent(0);
@@ -128,7 +128,7 @@
public void testEagerInitDestroyOrder() throws Exception {
WorkContext ctx = new WorkContextImpl();
- ModuleScopeContainer scope = new ModuleScopeContainer(null);
+ CompositeScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
SystemAtomicComponent oneComponent = createComponent(1);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactoryTestCase.java?view=diff&rev=488899&r1=488898&r2=488899
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactoryTestCase.java Tue Dec 19 19:17:54 2006
@@ -31,8 +31,8 @@
public void testCreation() {
ScopeRegistry registry = EasyMock.createMock(ScopeRegistry.class);
- registry.registerFactory(EasyMock.isA(Scope.class), EasyMock.isA(ModuleScopeObjectFactory.class));
+ registry.registerFactory(EasyMock.isA(Scope.class), EasyMock.isA(CompositeScopeObjectFactory.class));
- assertNotNull(new ModuleScopeObjectFactory(registry, null).getInstance());
+ assertNotNull(new CompositeScopeObjectFactory(registry, null).getInstance());
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeRestartTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeRestartTestCase.java?view=diff&rev=488899&r1=488898&r2=488899
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeRestartTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeRestartTestCase.java Tue Dec 19 19:17:54 2006
@@ -41,7 +41,7 @@
public void testRestart() throws Exception {
WorkContext ctx = new WorkContextImpl();
- ModuleScopeContainer scope = new ModuleScopeContainer(null);
+ CompositeScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
MethodEventInvoker<Object> initInvoker =
new MethodEventInvoker<Object>(InitDestroyOnce.class.getMethod("init"));
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java?view=diff&rev=488899&r1=488898&r2=488899
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java Tue Dec 19 19:17:54 2006
@@ -47,7 +47,7 @@
import junit.framework.TestCase;
import org.apache.tuscany.core.builder.ConnectorImpl;
import org.apache.tuscany.core.component.WorkContextImpl;
-import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
+import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
import org.apache.tuscany.core.implementation.java.JavaAtomicComponent;
import org.apache.tuscany.core.implementation.java.JavaComponentBuilder;
@@ -356,7 +356,7 @@
protected void setUp() throws Exception {
super.setUp();
wireService = new JDKWireService();
- container = new ModuleScopeContainer(null);
+ container = new CompositeScopeContainer(null);
container.start();
context = createMock(DeploymentContext.class);
context.getCompositeScope();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java?view=diff&rev=488899&r1=488898&r2=488899
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java Tue Dec 19 19:17:54 2006
@@ -51,7 +51,7 @@
import org.apache.tuscany.core.component.event.RequestEnd;
import org.apache.tuscany.core.component.event.RequestStart;
import org.apache.tuscany.core.component.scope.HttpSessionScopeContainer;
-import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
+import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
import org.apache.tuscany.core.component.scope.RequestScopeContainer;
import org.apache.tuscany.core.component.scope.StatelessScopeContainer;
import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
@@ -161,7 +161,7 @@
}
public void testToModuleScope() throws Exception {
- ModuleScopeContainer scope = new ModuleScopeContainer(null);
+ CompositeScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
scope.onEvent(new CompositeStart(this, null));
final OutboundWire wire = getWire(scope);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java?view=diff&rev=488899&r1=488898&r2=488899
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java Tue Dec 19 19:17:54 2006
@@ -41,7 +41,7 @@
import junit.framework.TestCase;
import org.apache.tuscany.core.component.event.CompositeStart;
import org.apache.tuscany.core.component.event.CompositeStop;
-import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
+import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
import org.apache.tuscany.core.implementation.system.model.SystemImplementation;
import org.apache.tuscany.core.implementation.system.wire.SystemInboundWire;
import org.apache.tuscany.core.injection.SingletonObjectFactory;
@@ -55,7 +55,7 @@
CompositeComponent parent;
DeploymentContext deploymentContext;
SystemComponentBuilder builder = new SystemComponentBuilder();
- ModuleScopeContainer container;
+ CompositeScopeContainer container;
/**
* Verifies lifecycle callbacks are made
@@ -233,7 +233,7 @@
protected void setUp() throws Exception {
super.setUp();
parent = EasyMock.createNiceMock(CompositeComponent.class);
- container = new ModuleScopeContainer(null);
+ container = new CompositeScopeContainer(null);
container.start();
deploymentContext = EasyMock.createMock(DeploymentContext.class);
EasyMock.expect(deploymentContext.getCompositeScope()).andReturn(container).atLeastOnce();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java?view=diff&rev=488899&r1=488898&r2=488899
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java Tue Dec 19 19:17:54 2006
@@ -23,7 +23,7 @@
import org.apache.tuscany.spi.wire.OutboundWire;
import junit.framework.TestCase;
-import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
+import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
import org.apache.tuscany.core.implementation.PojoConfiguration;
import org.apache.tuscany.core.implementation.system.wire.SystemInboundWire;
import org.apache.tuscany.core.implementation.system.wire.SystemOutboundWireImpl;
@@ -42,7 +42,7 @@
public class SystemAtomicComponentWireInvocationTestCase extends TestCase {
public void testWireResolution() throws Exception {
- ModuleScopeContainer scope = new ModuleScopeContainer(null);
+ CompositeScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
Target target = new TargetImpl();
SystemInboundWire inboundWire = EasyMock.createMock(SystemInboundWire.class);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderWireTestCase.java?view=diff&rev=488899&r1=488898&r2=488899
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderWireTestCase.java Tue Dec 19 19:17:54 2006
@@ -35,7 +35,7 @@
import org.apache.tuscany.core.component.WorkContextImpl;
import org.apache.tuscany.core.component.event.CompositeStart;
import org.apache.tuscany.core.component.event.CompositeStop;
-import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
+import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
import org.apache.tuscany.core.deployer.RootDeploymentContext;
import org.apache.tuscany.core.implementation.composite.CompositeComponentImpl;
import org.apache.tuscany.core.implementation.system.builder.SystemBindingBuilder;
@@ -58,7 +58,7 @@
*/
public void testAtomicWireBuild() throws Exception {
WorkContext work = new WorkContextImpl();
- ScopeContainer scope = new ModuleScopeContainer(null);
+ ScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
Connector connector = new ConnectorImpl();
@@ -93,7 +93,7 @@
*/
public void testAtomicToReferenceWireBuild() throws Exception {
WorkContext work = new WorkContextImpl();
- ScopeContainer scope = new ModuleScopeContainer(null);
+ ScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
Connector connector = new ConnectorImpl();
@@ -138,7 +138,7 @@
*/
public void testServiceToAtomicWireBuild() throws Exception {
WorkContext work = new WorkContextImpl();
- ScopeContainer scope = new ModuleScopeContainer(null);
+ ScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
ConnectorImpl connector = new ConnectorImpl();
@@ -174,9 +174,9 @@
protected void setUp() throws Exception {
super.setUp();
- ModuleScopeContainer moduleScope = new ModuleScopeContainer(null);
- moduleScope.start();
- deploymentContext = new RootDeploymentContext(null, null, moduleScope, null);
+ CompositeScopeContainer compositeScope = new CompositeScopeContainer(null);
+ compositeScope.start();
+ deploymentContext = new RootDeploymentContext(null, null, compositeScope, null);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/scope/ScopeReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/scope/ScopeReferenceTestCase.java?view=diff&rev=488899&r1=488898&r2=488899
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/scope/ScopeReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/scope/ScopeReferenceTestCase.java Tue Dec 19 19:17:54 2006
@@ -42,7 +42,7 @@
import org.apache.tuscany.core.component.event.RequestEnd;
import org.apache.tuscany.core.component.event.RequestStart;
import org.apache.tuscany.core.component.scope.HttpSessionScopeContainer;
-import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
+import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
import org.apache.tuscany.core.component.scope.RequestScopeContainer;
import org.apache.tuscany.core.component.scope.StatelessScopeContainer;
import org.apache.tuscany.core.integration.mock.MockFactory;
@@ -65,7 +65,7 @@
* Tests a module-to-module scoped wire
*/
public void testModuleToModule() throws Exception {
- ScopeContainer scope = new ModuleScopeContainer(null);
+ ScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source", SourceImpl.class,
@@ -89,7 +89,7 @@
*/
public void testModuleToSession() throws Exception {
WorkContext ctx = new WorkContextImpl();
- ScopeContainer moduleScope = new ModuleScopeContainer(null);
+ ScopeContainer moduleScope = new CompositeScopeContainer(null);
moduleScope.start();
ScopeContainer sessionScope = new HttpSessionScopeContainer(ctx, null);
sessionScope.start();
@@ -137,7 +137,7 @@
*/
public void testModuleToRequest() throws Exception {
WorkContext ctx = new WorkContextImpl();
- ScopeContainer moduleScope = new ModuleScopeContainer(null);
+ ScopeContainer moduleScope = new CompositeScopeContainer(null);
moduleScope.start();
final ScopeContainer requestScope = new RequestScopeContainer(ctx, null);
requestScope.start();
@@ -190,7 +190,7 @@
*/
public void testModuleToStateless() throws Exception {
WorkContext ctx = new WorkContextImpl();
- ScopeContainer moduleScope = new ModuleScopeContainer(null);
+ ScopeContainer moduleScope = new CompositeScopeContainer(null);
moduleScope.start();
ScopeContainer statelessScope = new StatelessScopeContainer(ctx, null);
statelessScope.start();
@@ -269,7 +269,7 @@
*/
public void testSessionToModule() throws Exception {
WorkContext ctx = new WorkContextImpl();
- ScopeContainer moduleScope = new ModuleScopeContainer(null);
+ ScopeContainer moduleScope = new CompositeScopeContainer(null);
moduleScope.start();
ScopeContainer sessionScope = new HttpSessionScopeContainer(ctx, null);
sessionScope.start();
@@ -459,7 +459,7 @@
public void testRequestToModule() throws Exception {
WorkContext ctx = new WorkContextImpl();
final ScopeContainer requestScope = new RequestScopeContainer(ctx, null);
- final ScopeContainer moduleScope = new ModuleScopeContainer(null);
+ final ScopeContainer moduleScope = new CompositeScopeContainer(null);
requestScope.start();
moduleScope.start();
moduleScope.onEvent(new CompositeStart(this, null));
@@ -731,7 +731,7 @@
WorkContext ctx = new WorkContextImpl();
ScopeContainer statelessScope = new StatelessScopeContainer(ctx, null);
statelessScope.start();
- ScopeContainer moduleScope = new ModuleScopeContainer(null);
+ ScopeContainer moduleScope = new CompositeScopeContainer(null);
moduleScope.start();
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source", SourceImpl.class,
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/ReferenceInjectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/ReferenceInjectionTestCase.java?view=diff&rev=488899&r1=488898&r2=488899
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/ReferenceInjectionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/ReferenceInjectionTestCase.java Tue Dec 19 19:17:54 2006
@@ -28,7 +28,7 @@
import org.apache.tuscany.spi.component.ScopeContainer;
import junit.framework.TestCase;
-import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
+import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
import org.apache.tuscany.core.integration.mock.MockFactory;
import org.apache.tuscany.core.mock.component.Source;
import org.apache.tuscany.core.mock.component.SourceImpl;
@@ -43,7 +43,7 @@
private Map<String, Member> members;
public void testProxiedReferenceInjection() throws Exception {
- ScopeContainer scope = new ModuleScopeContainer(null);
+ ScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
Map<String, AtomicComponent> components =
MockFactory.createWiredComponents("source", SourceImpl.class, scope,
Modified: incubator/tuscany/java/sca/runtime/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl?view=diff&rev=488899&r1=488898&r2=488899
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl (original)
+++ incubator/tuscany/java/sca/runtime/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl Tue Dec 19 19:17:54 2006
@@ -82,7 +82,7 @@
<!-- Default scopes -->
<component name="scope.module">
- <system:implementation.system class="org.apache.tuscany.core.component.scope.ModuleScopeObjectFactory"/>
+ <system:implementation.system class="org.apache.tuscany.core.component.scope.CompositeScopeObjectFactory"/>
</component>
<component name="scope.stateless">
Modified: incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/PropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/PropertyTestCase.java?view=diff&rev=488899&r1=488898&r2=488899
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/PropertyTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/PropertyTestCase.java Tue Dec 19 19:17:54 2006
@@ -18,18 +18,9 @@
*/
package org.apache.tuscany.container.javascript;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import junit.framework.TestCase;
-import org.apache.tuscany.container.javascript.mock.Greeting;
import org.apache.tuscany.container.javascript.rhino.RhinoScript;
-import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
-import org.apache.tuscany.spi.wire.WireService;
-import org.apache.tuscany.test.ArtifactFactory;
/**
* Tests for component properties
@@ -44,7 +35,7 @@
* Tests injecting a simple property type on a Javascript implementation instance
*/
public void testPropertyInjection() throws Exception {
- /*ModuleScopeContainer scope = new ModuleScopeContainer(null);
+ /*CompositeScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
List<Class<?>> services = new ArrayList<Class<?>>();
services.add(Greeting.class);
Modified: incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/ScriptInvokeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/ScriptInvokeTestCase.java?view=diff&rev=488899&r1=488898&r2=488899
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/ScriptInvokeTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/ScriptInvokeTestCase.java Tue Dec 19 19:17:54 2006
@@ -18,16 +18,9 @@
*/
package org.apache.tuscany.container.javascript;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
import junit.framework.TestCase;
-import org.apache.tuscany.container.javascript.mock.Greeting;
import org.apache.tuscany.container.javascript.rhino.RhinoScript;
-import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
-import org.apache.tuscany.test.ArtifactFactory;
/**
* Tests for invoker JavaScriptComponents
@@ -42,7 +35,7 @@
* Tests the invocation of a Groovy "script" as opposed to a class
*/
public void testBasicScriptInvocation() throws Exception {
-// ModuleScopeContainer scope = new ModuleScopeContainer(null);
+// CompositeScopeContainer scope = new CompositeScopeContainer(null);
// scope.start();
// List<Class<?>> services = new ArrayList<Class<?>>();
// services.add(Greeting.class);
Modified: incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/WireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/WireTestCase.java?view=diff&rev=488899&r1=488898&r2=488899
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/WireTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/WireTestCase.java Tue Dec 19 19:17:54 2006
@@ -31,7 +31,7 @@
import org.apache.tuscany.container.javascript.mock.Greeting;
import org.apache.tuscany.container.javascript.rhino.RhinoScript;
-import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
+import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.wire.InboundInvocationChain;
import org.apache.tuscany.spi.wire.InboundWire;
@@ -66,7 +66,7 @@
* Tests a basic invocation down a source wire
*/
public void testReferenceWireInvocation() throws Exception {
-// ModuleScopeContainer scope = new ModuleScopeContainer(null);
+// CompositeScopeContainer scope = new CompositeScopeContainer(null);
// scope.start();
//
// List<Class<?>> services = new ArrayList<Class<?>>();
@@ -117,7 +117,7 @@
* Tests a basic invocation to a target
*/
public void testTargetInvocation() throws Exception {
- ModuleScopeContainer scope = new ModuleScopeContainer(null);
+ CompositeScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
List<Class<?>> services = new ArrayList<Class<?>>();
services.add(Greeting.class);
@@ -135,7 +135,7 @@
* Tests a basic invocation down a target wire
*/
public void testTargetWireInvocation() throws Exception {
- ModuleScopeContainer scope = new ModuleScopeContainer(null);
+ CompositeScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
List<Class<?>> services = new ArrayList<Class<?>>();
services.add(Greeting.class);
Modified: incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/WireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/WireTestCase.java?view=diff&rev=488899&r1=488898&r2=488899
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/WireTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/WireTestCase.java Tue Dec 19 19:17:54 2006
@@ -29,7 +29,8 @@
import org.apache.tuscany.container.ruby.mock.Greeting;
import org.apache.tuscany.container.ruby.rubyscript.RubyScript;
-import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
+import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
+
import org.apache.tuscany.spi.model.DataType;
import org.apache.tuscany.spi.wire.InboundInvocationChain;
import org.apache.tuscany.spi.wire.InboundWire;
@@ -108,7 +109,7 @@
* Tests a basic invocation to a target
*/
public void testTargetInvocation() throws Exception {
- ModuleScopeContainer scope = new ModuleScopeContainer(null);
+ CompositeScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
List<Class<?>> services = new ArrayList<Class<?>>();
services.add(Greeting.class);
@@ -145,7 +146,7 @@
* Tests a basic invocation down a target wire
*/
public void testTargetWireInvocation() throws Exception {
- ModuleScopeContainer scope = new ModuleScopeContainer(null);
+ CompositeScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
List<Class<?>> services = new ArrayList<Class<?>>();
services.add(Greeting.class);
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java?view=diff&rev=488899&r1=488898&r2=488899
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java Tue Dec 19 19:17:54 2006
@@ -29,7 +29,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
+import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
import org.apache.tuscany.core.deployer.RootDeploymentContext;
import org.apache.tuscany.spi.deployer.DeploymentContext;
@@ -59,7 +59,7 @@
event = reader.nextTag();
}
DataObjectLoader loader = new DataObjectLoader(name);
- DeploymentContext context = new RootDeploymentContext(getClass().getClassLoader(), inputFactory, new ModuleScopeContainer(null), null);
+ DeploymentContext context = new RootDeploymentContext(getClass().getClassLoader(), inputFactory, new CompositeScopeContainer(null), null);
ModelDataObject modelObject = (ModelDataObject) loader.load(null, null, reader, context);
Assert.assertNotNull(modelObject.getDataObject());
Assert.assertTrue(modelObject.getDataObject().getString("myAttr").equals("helloworld.HelloWorldImpl"));
Modified: incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/system.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/system.scdl?view=diff&rev=488899&r1=488898&r2=488899
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/system.scdl (original)
+++ incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/system.scdl Tue Dec 19 19:17:54 2006
@@ -82,7 +82,7 @@
<!-- Default scopes -->
<component name="scope.module">
- <system:implementation.system class="org.apache.tuscany.core.component.scope.ModuleScopeObjectFactory"/>
+ <system:implementation.system class="org.apache.tuscany.core.component.scope.CompositeScopeObjectFactory"/>
</component>
<component name="scope.stateless">
<system:implementation.system class="org.apache.tuscany.core.component.scope.StatelessScopeObjectFactory"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org