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/02/22 18:25:37 UTC
svn commit: r379821 [2/2] - in
/incubator/tuscany/java/sca/container.java/src:
main/java/org/apache/tuscany/container/java/builder/
main/java/org/apache/tuscany/container/java/context/
test/java/org/apache/tuscany/container/java/assembly/impl/ test/jav...
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/model/TestContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/model/TestContextFactory.java?rev=379821&r1=379820&r2=379821&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/model/TestContextFactory.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/model/TestContextFactory.java Wed Feb 22 09:25:32 2006
@@ -33,7 +33,7 @@
import org.apache.tuscany.core.injection.MethodInjector;
import org.apache.tuscany.core.injection.PojoObjectFactory;
import org.apache.tuscany.core.injection.SingletonObjectFactory;
-import org.apache.tuscany.model.assembly.ScopeEnum;
+import org.apache.tuscany.model.assembly.Scope;
import org.apache.tuscany.model.assembly.SimpleComponent;
import org.osoa.sca.annotations.ComponentName;
import org.osoa.sca.annotations.Context;
@@ -51,7 +51,7 @@
super();
}
- public static JavaComponentContext createPojoContext(String name, Class implType, ScopeEnum scope,
+ public static JavaComponentContext createPojoContext(String name, Class implType, Scope scope,
AggregateContext moduleComponentContext) throws NoSuchMethodException {
SimpleComponent component = MockAssemblyFactory.createComponent(name, implType, scope);
@@ -98,7 +98,7 @@
}
}
- boolean stateless = (scope.getValue() == ScopeEnum.INSTANCE);
+ boolean stateless = (scope == Scope.INSTANCE);
JavaComponentContext context = new JavaComponentContext("foo", new PojoObjectFactory(JavaIntrospectionHelper
.getDefaultConstructor(implType), null, injectors), eagerInit, initInvoker, destroyInvoker, stateless);
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/AggregateScopeTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/AggregateScopeTestCase.java?rev=379821&r1=379820&r2=379821&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/AggregateScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/AggregateScopeTestCase.java Wed Feb 22 09:25:32 2006
@@ -15,6 +15,7 @@
import java.util.List;
+import junit.framework.Assert;
import junit.framework.TestCase;
import org.apache.tuscany.container.java.mock.MockAggregateAssemblyFactory;
@@ -22,16 +23,15 @@
import org.apache.tuscany.container.java.mock.components.GenericComponent;
import org.apache.tuscany.core.builder.RuntimeConfiguration;
import org.apache.tuscany.core.context.AggregateContext;
+import org.apache.tuscany.core.context.EventContext;
import org.apache.tuscany.core.context.InstanceContext;
import org.apache.tuscany.core.context.QualifiedName;
-import org.apache.tuscany.core.context.EventContext;
-import org.apache.tuscany.core.context.ContextConstants;
import org.apache.tuscany.core.context.impl.AggregateContextImpl;
import org.apache.tuscany.core.context.impl.EventContextImpl;
import org.apache.tuscany.core.context.scope.AggregateScopeContext;
import org.apache.tuscany.model.assembly.Component;
import org.apache.tuscany.model.assembly.Extensible;
-import junit.framework.Assert;
+import org.apache.tuscany.model.assembly.Scope;
/**
* Tests component nesting. This test need to be in the container.java progject since it relies on Java POJOs for scope
@@ -50,7 +50,7 @@
moduleComponentCtx.setName("testMC");
AggregateScopeContext scopeContainer = new AggregateScopeContext(ctx);
Component aggregateComponent = MockSystemAssemblyFactory.createDecoratedComponent("AggregateComponent",
- AggregateContextImpl.class.getName(), ContextConstants.AGGREGATE_SCOPE_ENUM, moduleComponentCtx);
+ AggregateContextImpl.class.getName(), Scope.AGGREGATE, moduleComponentCtx);
scopeContainer.registerConfiguration((RuntimeConfiguration<InstanceContext>) aggregateComponent
.getComponentImplementation().getRuntimeConfiguration());
scopeContainer.start();
@@ -107,7 +107,7 @@
moduleComponentCtx.setName("testMC");
AggregateScopeContext scopeContainer = new AggregateScopeContext(ctx);
Component aggregateComponent = MockSystemAssemblyFactory.createDecoratedComponent("AggregateComponent",
- AggregateContextImpl.class.getName(), ContextConstants.AGGREGATE_SCOPE_ENUM, moduleComponentCtx);
+ AggregateContextImpl.class.getName(), Scope.AGGREGATE, moduleComponentCtx);
scopeContainer.registerConfiguration((RuntimeConfiguration<InstanceContext>) aggregateComponent
.getComponentImplementation().getRuntimeConfiguration());
scopeContainer.start();
@@ -133,7 +133,7 @@
moduleComponentCtx.setName("testMC");
AggregateScopeContext scopeContainer = new AggregateScopeContext(ctx);
Component aggregateComponent = MockSystemAssemblyFactory.createDecoratedComponent("AggregateComponent",
- AggregateContextImpl.class.getName(), ContextConstants.AGGREGATE_SCOPE_ENUM, moduleComponentCtx);
+ AggregateContextImpl.class.getName(), Scope.AGGREGATE, moduleComponentCtx);
scopeContainer.registerConfiguration((RuntimeConfiguration<InstanceContext>) aggregateComponent
.getComponentImplementation().getRuntimeConfiguration());
scopeContainer.start();
@@ -155,7 +155,7 @@
moduleComponentCtx.setName("testMC");
AggregateScopeContext scopeContainer = new AggregateScopeContext(ctx);
Component aggregateComponent = MockSystemAssemblyFactory.createDecoratedComponent("AggregateComponent",
- AggregateContextImpl.class.getName(), ContextConstants.AGGREGATE_SCOPE_ENUM, moduleComponentCtx);
+ AggregateContextImpl.class.getName(), Scope.AGGREGATE, moduleComponentCtx);
scopeContainer.start();
scopeContainer.onEvent(EventContext.MODULE_START, null);
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicHttpSessionScopeTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicHttpSessionScopeTestCase.java?rev=379821&r1=379820&r2=379821&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicHttpSessionScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicHttpSessionScopeTestCase.java Wed Feb 22 09:25:32 2006
@@ -29,11 +29,11 @@
import org.apache.tuscany.container.java.mock.components.SessionScopeInitDestroyComponent;
import org.apache.tuscany.core.builder.BuilderException;
import org.apache.tuscany.core.builder.RuntimeConfiguration;
-import org.apache.tuscany.core.context.InstanceContext;
import org.apache.tuscany.core.context.EventContext;
+import org.apache.tuscany.core.context.InstanceContext;
import org.apache.tuscany.core.context.impl.EventContextImpl;
import org.apache.tuscany.core.context.scope.HttpSessionScopeContext;
-import org.apache.tuscany.model.assembly.ScopeEnum;
+import org.apache.tuscany.model.assembly.Scope;
import org.apache.tuscany.model.assembly.SimpleComponent;
/**
@@ -208,7 +208,7 @@
JavaComponentContextBuilder2 builder = new JavaComponentContextBuilder2();
private List<RuntimeConfiguration<InstanceContext>> createConfigurations() throws NoSuchMethodException, BuilderException {
- SimpleComponent component = MockAssemblyFactory.createComponent("TestService1", SessionScopeComponentImpl.class, ScopeEnum.SESSION_LITERAL);
+ SimpleComponent component = MockAssemblyFactory.createComponent("TestService1", SessionScopeComponentImpl.class, Scope.SESSION);
builder.build(component, null);
List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
configs.add((RuntimeConfiguration<InstanceContext>) component.getComponentImplementation().getRuntimeConfiguration());
@@ -216,7 +216,7 @@
}
private RuntimeConfiguration<InstanceContext> createConfiguration(String name) throws NoSuchMethodException, BuilderException {
- SimpleComponent component = MockAssemblyFactory.createComponent(name, SessionScopeInitDestroyComponent.class, ScopeEnum.SESSION_LITERAL);
+ SimpleComponent component = MockAssemblyFactory.createComponent(name, SessionScopeInitDestroyComponent.class, Scope.SESSION);
builder.build(component, null);
return (RuntimeConfiguration<InstanceContext>) component.getComponentImplementation().getRuntimeConfiguration();
}
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicModuleScopeTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicModuleScopeTestCase.java?rev=379821&r1=379820&r2=379821&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicModuleScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicModuleScopeTestCase.java Wed Feb 22 09:25:32 2006
@@ -28,11 +28,11 @@
import org.apache.tuscany.container.java.mock.components.ModuleScopeInitDestroyComponent;
import org.apache.tuscany.core.builder.BuilderException;
import org.apache.tuscany.core.builder.RuntimeConfiguration;
-import org.apache.tuscany.core.context.InstanceContext;
import org.apache.tuscany.core.context.EventContext;
+import org.apache.tuscany.core.context.InstanceContext;
import org.apache.tuscany.core.context.impl.EventContextImpl;
import org.apache.tuscany.core.context.scope.ModuleScopeContext;
-import org.apache.tuscany.model.assembly.ScopeEnum;
+import org.apache.tuscany.model.assembly.Scope;
import org.apache.tuscany.model.assembly.SimpleComponent;
/**
@@ -109,7 +109,7 @@
JavaComponentContextBuilder2 builder = new JavaComponentContextBuilder2();
private List<RuntimeConfiguration<InstanceContext>> createConfigurations() throws NoSuchMethodException, BuilderException {
- SimpleComponent component = MockAssemblyFactory.createComponent("TestService1", ModuleScopeComponentImpl.class, ScopeEnum.MODULE_LITERAL);
+ SimpleComponent component = MockAssemblyFactory.createComponent("TestService1", ModuleScopeComponentImpl.class, Scope.MODULE);
builder.build(component, null);
List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
configs.add((RuntimeConfiguration<InstanceContext>) component.getComponentImplementation().getRuntimeConfiguration());
@@ -119,7 +119,7 @@
private RuntimeConfiguration<InstanceContext> createConfiguration(String name)
throws NoSuchMethodException, BuilderException {
SimpleComponent component = MockAssemblyFactory.createComponent(name, ModuleScopeInitDestroyComponent.class,
- ScopeEnum.MODULE_LITERAL);
+ Scope.MODULE);
builder.build(component, null);
return (RuntimeConfiguration<InstanceContext>) component.getComponentImplementation().getRuntimeConfiguration();
}
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicRequestScopeTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicRequestScopeTestCase.java?rev=379821&r1=379820&r2=379821&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicRequestScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicRequestScopeTestCase.java Wed Feb 22 09:25:32 2006
@@ -28,11 +28,11 @@
import org.apache.tuscany.container.java.mock.components.RequestScopeComponentImpl;
import org.apache.tuscany.core.builder.BuilderException;
import org.apache.tuscany.core.builder.RuntimeConfiguration;
-import org.apache.tuscany.core.context.InstanceContext;
import org.apache.tuscany.core.context.EventContext;
+import org.apache.tuscany.core.context.InstanceContext;
import org.apache.tuscany.core.context.impl.EventContextImpl;
import org.apache.tuscany.core.context.scope.RequestScopeContext;
-import org.apache.tuscany.model.assembly.ScopeEnum;
+import org.apache.tuscany.model.assembly.Scope;
import org.apache.tuscany.model.assembly.SimpleComponent;
/**
@@ -130,7 +130,7 @@
private List<RuntimeConfiguration<InstanceContext>> createConfigurations() throws NoSuchMethodException, BuilderException {
SimpleComponent component = MockAssemblyFactory.createComponent("TestService1", RequestScopeComponentImpl.class,
- ScopeEnum.REQUEST_LITERAL);
+ Scope.REQUEST);
builder.build(component, null);
List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
configs.add((RuntimeConfiguration<InstanceContext>) component.getComponentImplementation().getRuntimeConfiguration());
@@ -140,7 +140,7 @@
private RuntimeConfiguration<InstanceContext> createConfiguration(String name) throws NoSuchMethodException,
BuilderException {
SimpleComponent component = MockAssemblyFactory.createComponent(name, RequestScopeComponentImpl.class,
- ScopeEnum.REQUEST_LITERAL);
+ Scope.REQUEST);
builder.build(component, null);
return (RuntimeConfiguration<InstanceContext>) component.getComponentImplementation().getRuntimeConfiguration();
}
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicStatelessScopeTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicStatelessScopeTestCase.java?rev=379821&r1=379820&r2=379821&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicStatelessScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicStatelessScopeTestCase.java Wed Feb 22 09:25:32 2006
@@ -28,11 +28,11 @@
import org.apache.tuscany.container.java.mock.components.StatelessComponentImpl;
import org.apache.tuscany.core.builder.BuilderException;
import org.apache.tuscany.core.builder.RuntimeConfiguration;
-import org.apache.tuscany.core.context.InstanceContext;
import org.apache.tuscany.core.context.EventContext;
+import org.apache.tuscany.core.context.InstanceContext;
import org.apache.tuscany.core.context.impl.EventContextImpl;
import org.apache.tuscany.core.context.scope.StatelessScopeContext;
-import org.apache.tuscany.model.assembly.ScopeEnum;
+import org.apache.tuscany.model.assembly.Scope;
import org.apache.tuscany.model.assembly.SimpleComponent;
/**
@@ -107,7 +107,7 @@
private List<RuntimeConfiguration<InstanceContext>> createConfigurations()
throws NoSuchMethodException, BuilderException {
SimpleComponent component = MockAssemblyFactory.createComponent("TestService1", StatelessComponentImpl.class,
- ScopeEnum.INSTANCE_LITERAL);
+ Scope.INSTANCE);
builder.build(component, null);
List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
configs.add((RuntimeConfiguration<InstanceContext>) component.getComponentImplementation().getRuntimeConfiguration());
@@ -117,7 +117,7 @@
private RuntimeConfiguration<InstanceContext> createConfiguration(String name)
throws NoSuchMethodException, BuilderException {
SimpleComponent component = MockAssemblyFactory.createComponent(name, StatelessComponentImpl.class,
- ScopeEnum.INSTANCE_LITERAL);
+ Scope.INSTANCE);
builder.build(component, null);
return (RuntimeConfiguration<InstanceContext>) component.getComponentImplementation().getRuntimeConfiguration();
}
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/HttpSessionScopeLifecycleTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/HttpSessionScopeLifecycleTestCase.java?rev=379821&r1=379820&r2=379821&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/HttpSessionScopeLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/HttpSessionScopeLifecycleTestCase.java Wed Feb 22 09:25:32 2006
@@ -29,11 +29,11 @@
import org.apache.tuscany.container.java.mock.components.SessionScopeInitOnlyComponent;
import org.apache.tuscany.core.builder.BuilderException;
import org.apache.tuscany.core.builder.RuntimeConfiguration;
-import org.apache.tuscany.core.context.InstanceContext;
import org.apache.tuscany.core.context.EventContext;
+import org.apache.tuscany.core.context.InstanceContext;
import org.apache.tuscany.core.context.impl.EventContextImpl;
import org.apache.tuscany.core.context.scope.HttpSessionScopeContext;
-import org.apache.tuscany.model.assembly.ScopeEnum;
+import org.apache.tuscany.model.assembly.Scope;
import org.apache.tuscany.model.assembly.SimpleComponent;
/**
@@ -126,16 +126,14 @@
private List<RuntimeConfiguration<InstanceContext>> createComponents() throws NoSuchMethodException, BuilderException {
SimpleComponent[] ca = new SimpleComponent[3];
ca[0] = MockAssemblyFactory.createComponent("TestServiceInitDestroy", SessionScopeInitDestroyComponent.class,
- ScopeEnum.SESSION_LITERAL);
- ca[1] = MockAssemblyFactory.createComponent("TestServiceInitOnly", SessionScopeInitOnlyComponent.class,
- ScopeEnum.SESSION_LITERAL);
+ Scope.SESSION);
+ ca[1] = MockAssemblyFactory.createComponent("TestServiceInitOnly", SessionScopeInitOnlyComponent.class, Scope.SESSION);
ca[2] = MockAssemblyFactory.createComponent("TestServiceDestroyOnly", SessionScopeDestroyOnlyComponent.class,
- ScopeEnum.SESSION_LITERAL);
+ Scope.SESSION);
List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
for (int i = 0; i < ca.length; i++) {
builder.build(ca[i], null);
- configs.add((RuntimeConfiguration<InstanceContext>) ca[i].getComponentImplementation()
- .getRuntimeConfiguration());
+ configs.add((RuntimeConfiguration<InstanceContext>) ca[i].getComponentImplementation().getRuntimeConfiguration());
}
return configs;
@@ -144,14 +142,13 @@
private List<RuntimeConfiguration<InstanceContext>> createOrderedInitComponents() throws NoSuchMethodException,
BuilderException {
SimpleComponent[] ca = new SimpleComponent[3];
- ca[0] = MockAssemblyFactory.createComponent("one", OrderedInitPojo.class, ScopeEnum.SESSION_LITERAL);
- ca[1] = MockAssemblyFactory.createComponent("two", OrderedInitPojo.class, ScopeEnum.SESSION_LITERAL);
- ca[2] = MockAssemblyFactory.createComponent("three", OrderedInitPojo.class, ScopeEnum.SESSION_LITERAL);
+ ca[0] = MockAssemblyFactory.createComponent("one", OrderedInitPojo.class, Scope.SESSION);
+ ca[1] = MockAssemblyFactory.createComponent("two", OrderedInitPojo.class, Scope.SESSION);
+ ca[2] = MockAssemblyFactory.createComponent("three", OrderedInitPojo.class, Scope.SESSION);
List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
for (int i = 0; i < ca.length; i++) {
builder.build(ca[i], null);
- configs.add((RuntimeConfiguration<InstanceContext>) ca[i].getComponentImplementation()
- .getRuntimeConfiguration());
+ configs.add((RuntimeConfiguration<InstanceContext>) ca[i].getComponentImplementation().getRuntimeConfiguration());
}
return configs;
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java?rev=379821&r1=379820&r2=379821&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java Wed Feb 22 09:25:32 2006
@@ -31,11 +31,11 @@
import org.apache.tuscany.container.java.mock.components.ModuleScopeInitOnlyComponent;
import org.apache.tuscany.core.builder.BuilderException;
import org.apache.tuscany.core.builder.RuntimeConfiguration;
-import org.apache.tuscany.core.context.InstanceContext;
import org.apache.tuscany.core.context.EventContext;
+import org.apache.tuscany.core.context.InstanceContext;
import org.apache.tuscany.core.context.impl.EventContextImpl;
import org.apache.tuscany.core.context.scope.ModuleScopeContext;
-import org.apache.tuscany.model.assembly.ScopeEnum;
+import org.apache.tuscany.model.assembly.Scope;
import org.apache.tuscany.model.assembly.SimpleComponent;
/**
@@ -158,11 +158,11 @@
private List<RuntimeConfiguration<InstanceContext>> createComponents() throws NoSuchMethodException, BuilderException {
SimpleComponent[] ca = new SimpleComponent[3];
ca[0] = MockAssemblyFactory.createComponent("TestServiceInitDestroy", ModuleScopeInitDestroyComponent.class,
- ScopeEnum.MODULE_LITERAL);
+ Scope.MODULE);
ca[1] = MockAssemblyFactory.createComponent("TestServiceInitOnly", ModuleScopeInitOnlyComponent.class,
- ScopeEnum.MODULE_LITERAL);
+ Scope.MODULE);
ca[2] = MockAssemblyFactory.createComponent("TestServiceDestroyOnly", ModuleScopeDestroyOnlyComponent.class,
- ScopeEnum.MODULE_LITERAL);
+ Scope.MODULE);
List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
for (int i = 0; i < ca.length; i++) {
builder.build(ca[i], null);
@@ -177,9 +177,9 @@
BuilderException {
SimpleComponent[] ca = new SimpleComponent[2];
ca[0] = MockAssemblyFactory.createComponent("TestServiceEagerInitDestroy", ModuleScopeEagerInitDestroyComponent.class,
- ScopeEnum.MODULE_LITERAL);
+ Scope.MODULE);
ca[1] = MockAssemblyFactory.createComponent("TestServiceEagerInit", ModuleScopeEagerInitComponent.class,
- ScopeEnum.MODULE_LITERAL);
+ Scope.MODULE);
List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
for (int i = 0; i < ca.length; i++) {
builder.build(ca[i], null);
@@ -193,9 +193,9 @@
private List<RuntimeConfiguration<InstanceContext>> createOrderedInitComponents() throws NoSuchMethodException,
BuilderException {
SimpleComponent[] ca = new SimpleComponent[3];
- ca[0] = MockAssemblyFactory.createComponent("one", OrderedInitPojo.class, ScopeEnum.MODULE_LITERAL);
- ca[1] = MockAssemblyFactory.createComponent("two", OrderedInitPojo.class, ScopeEnum.MODULE_LITERAL);
- ca[2] = MockAssemblyFactory.createComponent("three", OrderedInitPojo.class, ScopeEnum.MODULE_LITERAL);
+ ca[0] = MockAssemblyFactory.createComponent("one", OrderedInitPojo.class, Scope.MODULE);
+ ca[1] = MockAssemblyFactory.createComponent("two", OrderedInitPojo.class, Scope.MODULE);
+ ca[2] = MockAssemblyFactory.createComponent("three", OrderedInitPojo.class, Scope.MODULE);
List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
for (int i = 0; i < ca.length; i++) {
builder.build(ca[i], null);
@@ -209,9 +209,9 @@
private List<RuntimeConfiguration<InstanceContext>> createOrderedEagerInitComponents() throws NoSuchMethodException,
BuilderException {
SimpleComponent[] ca = new SimpleComponent[3];
- ca[0] = MockAssemblyFactory.createComponent("one", OrderedEagerInitPojo.class, ScopeEnum.MODULE_LITERAL);
- ca[1] = MockAssemblyFactory.createComponent("two", OrderedEagerInitPojo.class, ScopeEnum.MODULE_LITERAL);
- ca[2] = MockAssemblyFactory.createComponent("three", OrderedEagerInitPojo.class, ScopeEnum.MODULE_LITERAL);
+ ca[0] = MockAssemblyFactory.createComponent("one", OrderedEagerInitPojo.class, Scope.MODULE);
+ ca[1] = MockAssemblyFactory.createComponent("two", OrderedEagerInitPojo.class, Scope.MODULE);
+ ca[2] = MockAssemblyFactory.createComponent("three", OrderedEagerInitPojo.class, Scope.MODULE);
List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
for (int i = 0; i < ca.length; i++) {
builder.build(ca[i], null);
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java?rev=379821&r1=379820&r2=379821&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java Wed Feb 22 09:25:32 2006
@@ -29,11 +29,11 @@
import org.apache.tuscany.container.java.mock.components.SessionScopeInitOnlyComponent;
import org.apache.tuscany.core.builder.BuilderException;
import org.apache.tuscany.core.builder.RuntimeConfiguration;
-import org.apache.tuscany.core.context.InstanceContext;
import org.apache.tuscany.core.context.EventContext;
+import org.apache.tuscany.core.context.InstanceContext;
import org.apache.tuscany.core.context.impl.EventContextImpl;
import org.apache.tuscany.core.context.scope.RequestScopeContext;
-import org.apache.tuscany.model.assembly.ScopeEnum;
+import org.apache.tuscany.model.assembly.Scope;
import org.apache.tuscany.model.assembly.SimpleComponent;
/**
@@ -43,14 +43,9 @@
*/
public class RequestScopeLifecycleTestCase extends TestCase {
- // static public junit.framework.Test suite(){
- // return new JUnit4TestAdapter(HttpSessionScopeLifecycleTestCase.class);
- // }
-
/**
* Tests instance identity is properly maintained
*/
- // @Test
public void testInitDestroy() throws Exception {
EventContext ctx = new EventContextImpl();
RequestScopeContext scope = new RequestScopeContext(ctx);
@@ -119,11 +114,11 @@
private List<RuntimeConfiguration<InstanceContext>> createComponents() throws NoSuchMethodException, BuilderException {
SimpleComponent[] ca = new SimpleComponent[3];
ca[0] = MockAssemblyFactory.createComponent("TestServiceInitDestroy", SessionScopeInitDestroyComponent.class,
- ScopeEnum.REQUEST_LITERAL);
+ Scope.REQUEST);
ca[1] = MockAssemblyFactory.createComponent("TestServiceInitOnly", SessionScopeInitOnlyComponent.class,
- ScopeEnum.REQUEST_LITERAL);
+ Scope.REQUEST);
ca[2] = MockAssemblyFactory.createComponent("TestServiceDestroyOnly", SessionScopeDestroyOnlyComponent.class,
- ScopeEnum.REQUEST_LITERAL);
+ Scope.REQUEST);
List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
for (int i = 0; i < ca.length; i++) {
builder.build(ca[i], null);
@@ -136,9 +131,9 @@
private List<RuntimeConfiguration<InstanceContext>> createOrderedInitComponents() throws NoSuchMethodException,
BuilderException {
SimpleComponent[] ca = new SimpleComponent[3];
- ca[0] = MockAssemblyFactory.createComponent("one", OrderedInitPojo.class, ScopeEnum.REQUEST_LITERAL);
- ca[1] = MockAssemblyFactory.createComponent("two", OrderedInitPojo.class, ScopeEnum.REQUEST_LITERAL);
- ca[2] = MockAssemblyFactory.createComponent("three", OrderedInitPojo.class, ScopeEnum.REQUEST_LITERAL);
+ ca[0] = MockAssemblyFactory.createComponent("one", OrderedInitPojo.class, Scope.REQUEST);
+ ca[1] = MockAssemblyFactory.createComponent("two", OrderedInitPojo.class, Scope.REQUEST);
+ ca[2] = MockAssemblyFactory.createComponent("three", OrderedInitPojo.class, Scope.REQUEST);
List<RuntimeConfiguration<InstanceContext>> configs = new ArrayList();
for (int i = 0; i < ca.length; i++) {
builder.build(ca[i], null);