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/05/14 20:01:50 UTC
svn commit: r406390 - in /incubator/tuscany/sandbox/jboynes/sca:
containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/
containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/
container...
Author: jmarino
Date: Sun May 14 11:01:48 2006
New Revision: 406390
URL: http://svn.apache.org/viewcvs?rev=406390&view=rev
Log:
builder work; remove unused composite context
Removed:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/CompositeScopeContext.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/CompositeScopeTestCase.java
Modified:
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentBuilder.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/EntryPointToJavaTestCase.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/ScopeRegistryImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/StatelessScopeContext.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/model/PojoComponentType.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentBuilder.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicHttpSessionScopeTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicModuleScopeTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicRequestScopeTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/MockFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemAtomicContextTestCase.java
incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/Scope.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ScopeRegistry.java
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentBuilder.java?rev=406390&r1=406389&r2=406390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentBuilder.java Sun May 14 11:01:48 2006
@@ -4,6 +4,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.tuscany.common.ObjectFactory;
import org.apache.tuscany.container.java.context.JavaAtomicContext;
import org.apache.tuscany.container.java.model.JavaImplementation;
import org.apache.tuscany.core.injection.ContextInjector;
@@ -27,16 +28,24 @@
public class JavaComponentBuilder implements ComponentBuilder<JavaImplementation> {
public Context build(CompositeContext parent, Component<JavaImplementation> component) throws BuilderConfigException {
- String name = component.getName();
PojoComponentType componentType = component.getImplementation().getComponentType();
- Class<?> clazz = component.getImplementation().getImplementationClass();
- Constructor<?> ctr;
+ List<Class<?>> serviceInterfaces = new ArrayList<Class<?>>();
+ for (Service service : componentType.getServices().values()) {
+ serviceInterfaces.add(((JavaServiceContract) service.getServiceContract()).getInterfaceClass());
+ }
+ Constructor<?> constr;
try {
- ctr = clazz.getConstructor((Class[]) null);
+ constr = JavaIntrospectionHelper.getDefaultConstructor(
+ component.getImplementation().getImplementationClass());
} catch (NoSuchMethodException e) {
- throw new BuilderConfigException(e);
+ BuilderConfigException bce = new BuilderConfigException("Error building component", e);
+ bce.setIdentifier(component.getName());
+ bce.addContextName(parent.getName());
+ throw bce;
}
- List<Injector> injectors = componentType.getInjectors();
+ ObjectFactory<?> factory = new PojoObjectFactory(constr);
+ List<Injector> injectors = new ArrayList<Injector>();
+ injectors.addAll(componentType.getInjectors());
for (Injector injector : injectors) {
if (injector instanceof ContextInjector) {
// a context injector is found; iterate and determine if the parent context
@@ -51,15 +60,9 @@
}
}
}
- List<Class<?>> serviceInterfaces = new ArrayList<Class<?>>();
- for (Service service : componentType.getServices().values()) {
- serviceInterfaces.add(((JavaServiceContract) service.getServiceContract()).getInterfaceClass());
- }
- PojoObjectFactory<?> factory = new PojoObjectFactory(ctr, null, componentType.getInjectors());
- return null;
- //TODO finish
-// return new JavaAtomicContext(name, serviceInterfaces, factory, componentType.isEagerInit(), componentType.getInitInvoker(),
-// componentType.getDestroyInvoker(), injectors, componentType.getMembers());
+ return new JavaAtomicContext(component.getName(), serviceInterfaces, factory,
+ componentType.isEagerInit(), componentType.getInitInvoker(), componentType.getDestroyInvoker(),
+ injectors, componentType.getReferenceMembers());
}
}
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/EntryPointToJavaTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/EntryPointToJavaTestCase.java?rev=406390&r1=406389&r2=406390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/EntryPointToJavaTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/EntryPointToJavaTestCase.java Sun May 14 11:01:48 2006
@@ -13,16 +13,8 @@
*/
package org.apache.tuscany.container.java.integration.binding;
-import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.container.java.invocation.mock.MockSyncInterceptor;
-import org.apache.tuscany.core.context.event.HttpSessionEnd;
-import org.apache.tuscany.core.context.event.ModuleStart;
-import org.apache.tuscany.core.context.event.ModuleStop;
-import org.apache.tuscany.core.context.event.RequestEnd;
-import org.apache.tuscany.core.context.event.RequestStart;
-import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
/**
@@ -170,7 +162,7 @@
// registry.registerTargetBuilder(interceptorBuilder);
// runtime.getRootContext().registerModelObject(MockFactory.createCompositeComponent("test.module"));
// CompositeContext child = (CompositeContext) runtime.getRootContext().getContext("test.module");
-// child.registerModelObject(MockFactory.createModuleWithEntryPoint(Scope.INSTANCE));
+// child.registerModelObject(MockFactory.createModuleWithEntryPoint(Scope.STATELESS));
// child.publish(new ModuleStart(this));
// Object id = new Object();
// child.publish(new RequestStart(this, id));
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java?rev=406390&r1=406389&r2=406390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java Sun May 14 11:01:48 2006
@@ -47,7 +47,7 @@
EventInvoker<Object> destroyInvoker, List<Injector> injectors, Map<String, Member> members) throws NoSuchMethodException {
List<Class<?>> serviceInterfaces = new ArrayList<Class<?>>();
serviceInterfaces.add(clazz);
- return new JavaAtomicContext(name, serviceInterfaces, createObjectFactory(clazz, null), eagerInit, initInvoker, destroyInvoker, injectors, members);
+ return new JavaAtomicContext(name, serviceInterfaces, createObjectFactory(clazz), eagerInit, initInvoker, destroyInvoker, injectors, members);
}
/**
@@ -298,10 +298,9 @@
}
- private static <T> ObjectFactory<T> createObjectFactory
- (Class<T> clazz, List<Injector> injectors) throws NoSuchMethodException {
+ private static <T> ObjectFactory<T> createObjectFactory(Class<T> clazz) throws NoSuchMethodException {
Constructor<T> ctr = clazz.getConstructor((Class<T>[]) null);
- return new PojoObjectFactory<T>(ctr, null, injectors);
+ return new PojoObjectFactory<T>(ctr);
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/ScopeRegistryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/ScopeRegistryImpl.java?rev=406390&r1=406389&r2=406390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/ScopeRegistryImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/ScopeRegistryImpl.java Sun May 14 11:01:48 2006
@@ -9,6 +9,7 @@
import org.apache.tuscany.spi.context.ScopeContext;
import org.apache.tuscany.spi.context.ScopeNotFoundException;
import org.apache.tuscany.spi.context.ScopeRegistry;
+import org.apache.tuscany.spi.context.WorkContext;
/**
* @version $$Rev$$ $$Date$$
@@ -17,15 +18,20 @@
private final Map<CompositeContext, ScopeContext> moduleScopeCache;
private final Map<Scope, ObjectFactory<ScopeContext>> factoryCache;
+ private final WorkContext workContext;
- public ScopeRegistryImpl() {
+ public ScopeRegistryImpl(WorkContext workContext) {
+ assert(workContext != null);
moduleScopeCache = new ConcurrentHashMap<CompositeContext, ScopeContext>();
factoryCache = new ConcurrentHashMap<Scope, ObjectFactory<ScopeContext>>();
+ this.workContext = workContext;
}
- public ScopeContext getScopeContext(Scope scope, CompositeContext remotableContext) {
+ public ScopeContext getScopeContext(Scope scope) {
+ CompositeContext remoteContext = workContext.getRemoteContext();
+ assert(remoteContext != null): "Remote composite context next set";
if (Scope.MODULE == scope) {
- ScopeContext moduleScope = moduleScopeCache.get(remotableContext);
+ ScopeContext moduleScope = moduleScopeCache.get(remoteContext);
if (moduleScope == null) {
ObjectFactory<ScopeContext> factory = factoryCache.get(scope);
if (factory == null) {
@@ -34,7 +40,7 @@
throw e;
}
moduleScope = factory.getInstance();
- moduleScopeCache.put(remotableContext, moduleScope);
+ moduleScopeCache.put(remoteContext, moduleScope);
}
return moduleScope;
}
@@ -42,17 +48,14 @@
if (factory == null) {
ScopeNotFoundException e = new ScopeNotFoundException("Scope object factor not registered for scope");
switch (scope) {
- case AGGREGATE:
- e.setIdentifier("AGGREGATE");
- break;
case SESSION:
e.setIdentifier("SESSION");
break;
case REQUEST:
e.setIdentifier("REQUEST");
break;
- case INSTANCE:
- e.setIdentifier("INSTANCE");
+ case STATELESS:
+ e.setIdentifier("STATELESS");
break;
default:
e.setIdentifier("UNKNOWN");
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/StatelessScopeContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/StatelessScopeContext.java?rev=406390&r1=406389&r2=406390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/StatelessScopeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/StatelessScopeContext.java Sun May 14 11:01:48 2006
@@ -33,7 +33,7 @@
}
public Scope getScope() {
- return Scope.INSTANCE;
+ return Scope.STATELESS;
}
public synchronized void start() {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java?rev=406390&r1=406389&r2=406390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java Sun May 14 11:01:48 2006
@@ -13,13 +13,12 @@
*/
package org.apache.tuscany.core.injection;
-import java.util.List;
-import java.util.Collections;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
+import java.util.List;
-import org.apache.tuscany.common.ObjectFactory;
import org.apache.tuscany.common.ObjectCreationException;
+import org.apache.tuscany.common.ObjectFactory;
/**
* Creates new instances of a Java class, calling a given set of injectors to configure the instance
@@ -31,26 +30,20 @@
private static final ObjectFactory[] NO_INIT_PARAM = {};
- private static final List<Injector> NO_SETTER_PARAM = Collections.emptyList();
-
private final Constructor<T> ctr;
-
private final ObjectFactory<?>[] initParamsArray;
- private final List<Injector> setters;
-
public PojoObjectFactory(Constructor<T> ctr) {
- this(ctr,null,null);
+ this(ctr, null);
}
- public PojoObjectFactory(Constructor<T> ctr, List<ObjectFactory> initParams, List<Injector> setters) {
+ public PojoObjectFactory(Constructor<T> ctr, List<ObjectFactory> initParams) {
this.ctr = ctr;
if (initParams != null && initParams.size() > 0) {
initParamsArray = initParams.toArray(new ObjectFactory[initParams.size()]);
} else {
initParamsArray = NO_INIT_PARAM;
}
- this.setters = setters != null ? setters : NO_SETTER_PARAM;
}
public T getInstance() throws ObjectCreationException {
@@ -61,12 +54,7 @@
initargs[i] = objectFactory.getInstance();
}
try {
- T instance = ctr.newInstance(initargs);
- // interate through the injectors and inject the instance
- for (Injector<T> setter : setters) {
- setter.inject(instance);
- }
- return instance;
+ return ctr.newInstance(initargs);
} catch (InstantiationException e) {
throw new AssertionError("Class is not instantiable [" + ctr.getDeclaringClass().getName() + "]");
} catch (IllegalAccessException e) {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/model/PojoComponentType.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/model/PojoComponentType.java?rev=406390&r1=406389&r2=406390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/model/PojoComponentType.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/model/PojoComponentType.java Sun May 14 11:01:48 2006
@@ -9,16 +9,26 @@
import org.apache.tuscany.core.injection.EventInvoker;
import org.apache.tuscany.core.injection.Injector;
import org.apache.tuscany.model.ComponentType;
+import org.apache.tuscany.model.Scope;
/**
* @version $$Rev$$ $$Date$$
*/
public class PojoComponentType extends ComponentType {
+ private Scope lifecycleScope = Scope.UNDEFINED;
private EventInvoker<Object> initInvoker;
private EventInvoker<Object> destroyInvoker;
private final List<Injector> injectors = new ArrayList<Injector>();
private final Map<String,Member> members = new HashMap<String,Member>();
+
+ public Scope getLifecycleScope() {
+ return lifecycleScope;
+ }
+
+ public void setLifecycleScope(Scope lifecycleScope) {
+ this.lifecycleScope = lifecycleScope;
+ }
public EventInvoker<Object> getInitInvoker() {
return initInvoker;
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentBuilder.java?rev=406390&r1=406389&r2=406390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentBuilder.java Sun May 14 11:01:48 2006
@@ -8,6 +8,7 @@
import java.util.List;
import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.core.injection.ContextInjector;
import org.apache.tuscany.core.injection.FieldInjector;
import org.apache.tuscany.core.injection.Injector;
import org.apache.tuscany.core.injection.LazyIntraCompositeResolver;
@@ -29,8 +30,9 @@
/**
* @version $$Rev$$ $$Date$$
*/
-@SuppressWarnings("unchecked")
+//@SuppressWarnings("unchecked")
public class SystemComponentBuilder implements ComponentBuilder<SystemImplementation> {
+
public Context build(CompositeContext parent, Component<SystemImplementation> component) throws BuilderConfigException {
PojoComponentType componentType = component.getImplementation().getComponentType();
List<Class<?>> serviceInterfaces = new ArrayList<Class<?>>();
@@ -50,6 +52,20 @@
ObjectFactory<?> factory = new PojoObjectFactory(constr);
List<Injector> injectors = new ArrayList<Injector>();
injectors.addAll(componentType.getInjectors());
+ for (Injector injector : injectors) {
+ if (injector instanceof ContextInjector) {
+ // a context injector is found; iterate and determine if the parent context
+ // implements the interface
+ Class contextType = JavaIntrospectionHelper.introspectGeneric(injector.getClass(), 0);
+ if (contextType.isAssignableFrom(parent.getClass())) {
+ ((ContextInjector) injector).setContext(parent);
+ } else {
+ BuilderConfigException e = new BuilderConfigException("Context not found for type");
+ e.setIdentifier(contextType.getName());
+ throw e;
+ }
+ }
+ }
for (ReferenceTarget target : component.getReferenceTargets().values()) {
LazyIntraCompositeResolver resolver = new LazyIntraCompositeResolver(parent, new QualifiedName(target.getTarget().getPath()));
Member member = componentType.getReferenceMember(target.getReferenceName());
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicHttpSessionScopeTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicHttpSessionScopeTestCase.java?rev=406390&r1=406389&r2=406390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicHttpSessionScopeTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicHttpSessionScopeTestCase.java Sun May 14 11:01:48 2006
@@ -74,7 +74,7 @@
protected void setUp() throws Exception {
super.setUp();
- factory = new PojoObjectFactory<SessionScopeInitDestroyComponent>(SessionScopeInitDestroyComponent.class.getConstructor((Class[]) null), null, null);
+ factory = new PojoObjectFactory<SessionScopeInitDestroyComponent>(SessionScopeInitDestroyComponent.class.getConstructor((Class[]) null), null);
initInvoker = new MethodEventInvoker<Object>(SessionScopeInitDestroyComponent.class.getMethod("init", (Class[]) null));
destroyInvoker = new MethodEventInvoker<Object>(SessionScopeInitDestroyComponent.class.getMethod("destroy", (Class[]) null));
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicModuleScopeTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicModuleScopeTestCase.java?rev=406390&r1=406389&r2=406390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicModuleScopeTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicModuleScopeTestCase.java Sun May 14 11:01:48 2006
@@ -67,7 +67,7 @@
protected void setUp() throws Exception {
super.setUp();
- factory = new PojoObjectFactory<ModuleScopeInitDestroyComponent>(ModuleScopeInitDestroyComponent.class.getConstructor((Class[]) null), null, null);
+ factory = new PojoObjectFactory<ModuleScopeInitDestroyComponent>(ModuleScopeInitDestroyComponent.class.getConstructor((Class[]) null), null);
initInvoker = new MethodEventInvoker<Object>(ModuleScopeInitDestroyComponent.class.getMethod("init", (Class[]) null));
destroyInvoker = new MethodEventInvoker<Object>(ModuleScopeInitDestroyComponent.class.getMethod("destroy", (Class[]) null));
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicRequestScopeTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicRequestScopeTestCase.java?rev=406390&r1=406389&r2=406390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicRequestScopeTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicRequestScopeTestCase.java Sun May 14 11:01:48 2006
@@ -66,7 +66,7 @@
protected void setUp() throws Exception {
super.setUp();
- factory = new PojoObjectFactory<RequestScopeInitDestroyComponent>(RequestScopeInitDestroyComponent.class.getConstructor((Class[]) null), null, null);
+ factory = new PojoObjectFactory<RequestScopeInitDestroyComponent>(RequestScopeInitDestroyComponent.class.getConstructor((Class[]) null), null);
initInvoker = new MethodEventInvoker<Object>(RequestScopeInitDestroyComponent.class.getMethod("init", (Class[]) null));
destroyInvoker = new MethodEventInvoker<Object>(RequestScopeInitDestroyComponent.class.getMethod("destroy", (Class[]) null));
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/MockFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/MockFactory.java?rev=406390&r1=406389&r2=406390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/MockFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/MockFactory.java Sun May 14 11:01:48 2006
@@ -118,12 +118,12 @@
* @param eagerInit if the component eager initializes
* @param initInvoker the invoker for {@link org.osoa.sca.annotations.Init}
* @param destroyInvoker the invoker for {@link org.osoa.sca.annotations.Destroy}
- * @param injectors the injectors responsible for injecting on an instance
+ * @param injectors
* @throws NoSuchMethodException
*/
public static SystemAtomicContextImpl createSystemAtomicContext(String name, List<Class<?>> serviceInterfaces, Class<?> clazz, boolean eagerInit, EventInvoker<Object> initInvoker,
EventInvoker<Object> destroyInvoker, List<Injector> injectors) throws NoSuchMethodException {
- return new SystemAtomicContextImpl(name, serviceInterfaces, createObjectFactory(clazz, injectors), eagerInit, initInvoker, destroyInvoker, null);
+ return new SystemAtomicContextImpl(name, serviceInterfaces, createObjectFactory(clazz), eagerInit, initInvoker, destroyInvoker, injectors);
}
public static <T> TargetWire<T> createTargetWireFactory(String serviceName, Class<T> interfaze) throws WireFactoryInitException {
@@ -148,9 +148,9 @@
}
- private static <T> ObjectFactory<T> createObjectFactory(Class<T> clazz, List<Injector> injectors) throws NoSuchMethodException {
+ private static <T> ObjectFactory<T> createObjectFactory(Class<T> clazz) throws NoSuchMethodException {
Constructor<T> ctr = clazz.getConstructor((Class<T>[]) null);
- return new PojoObjectFactory<T>(ctr, null, injectors);
+ return new PojoObjectFactory<T>(ctr);
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemAtomicContextTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemAtomicContextTestCase.java?rev=406390&r1=406389&r2=406390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemAtomicContextTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemAtomicContextTestCase.java Sun May 14 11:01:48 2006
@@ -17,7 +17,7 @@
EventInvoker<Object> initInvoker;
public void testContextCreationAndInit() throws Exception {
- ObjectFactory<Foo> factory = new PojoObjectFactory<Foo>(Foo.class.getConstructor((Class[]) null), null, null);
+ ObjectFactory<Foo> factory = new PojoObjectFactory<Foo>(Foo.class.getConstructor((Class[]) null), null);
ScopeContext<AtomicContext> scopeContext = new MockScopeContext();
SystemAtomicContext context = new SystemAtomicContextImpl("foo",Foo.class,factory,false,initInvoker,null, null);
context.setScopeContext(scopeContext);
Modified: incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/Scope.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/Scope.java?rev=406390&r1=406389&r2=406390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/Scope.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/Scope.java Sun May 14 11:01:48 2006
@@ -1,15 +1,13 @@
package org.apache.tuscany.model;
/**
- * The types of scope supported by assemblies.
+ * The default scopes supported by assemblies.
*/
public enum Scope {
- // todo define what these are
- INSTANCE,
+ STATELESS,
REQUEST,
SESSION,
MODULE,
- AGGREGATE,
UNDEFINED
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ScopeRegistry.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ScopeRegistry.java?rev=406390&r1=406389&r2=406390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ScopeRegistry.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ScopeRegistry.java Sun May 14 11:01:48 2006
@@ -13,8 +13,6 @@
*/
package org.apache.tuscany.spi.context;
-import java.util.List;
-
import org.apache.tuscany.common.ObjectFactory;
import org.apache.tuscany.model.Scope;
@@ -23,7 +21,7 @@
*/
public interface ScopeRegistry {
- ScopeContext getScopeContext(Scope scope,CompositeContext remotableContext) throws ScopeNotFoundException;
+ ScopeContext getScopeContext(Scope scope) throws ScopeNotFoundException;
void registerFactory(Scope scope, ObjectFactory<ScopeContext> factory);