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/20 06:26:29 UTC
svn commit: r407953 [2/2] - in /incubator/tuscany/sandbox/jboynes/sca:
containers/container.java/src/test/java/org/apache/tuscany/container/java/builder/
containers/container.java/src/test/java/org/apache/tuscany/container/java/context/
containers/cont...
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/context/MockCompositeContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/context/MockCompositeContext.java?rev=407953&r1=407952&r2=407953&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/context/MockCompositeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/context/MockCompositeContext.java Fri May 19 21:26:25 2006
@@ -17,11 +17,16 @@
import org.apache.tuscany.spi.wire.SourceWire;
import org.apache.tuscany.spi.wire.TargetInvoker;
import org.apache.tuscany.spi.wire.TargetWire;
+import org.apache.tuscany.model.Scope;
/**
* @version $$Rev$$ $$Date$$
*/
public class MockCompositeContext<T> extends AbstractContext<T> implements CompositeContext<T> {
+
+ public Scope getScope() {
+ return Scope.COMPOSITE;
+ }
public Object getInstance(QualifiedName qName) throws TargetException {
throw new UnsupportedOperationException();
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/context/MockReferenceContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/context/MockReferenceContext.java?rev=407953&r1=407952&r2=407953&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/context/MockReferenceContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/context/MockReferenceContext.java Fri May 19 21:26:25 2006
@@ -9,6 +9,7 @@
import org.apache.tuscany.spi.context.TargetException;
import org.apache.tuscany.spi.wire.TargetInvoker;
import org.apache.tuscany.spi.wire.TargetWire;
+import org.apache.tuscany.model.Scope;
/**
* A mock reference context which returns a singleton
@@ -29,6 +30,10 @@
public TargetInvoker createTargetInvoker(String serviceName, Method operation) {
throw new UnsupportedOperationException();
+ }
+
+ public Scope getScope() {
+ return Scope.COMPOSITE;
}
public T getService() throws TargetException {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/context/scope/MockScopeContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/context/scope/MockScopeContext.java?rev=407953&r1=407952&r2=407953&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/context/scope/MockScopeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/context/scope/MockScopeContext.java Fri May 19 21:26:25 2006
@@ -15,7 +15,7 @@
/**
* @version $$Rev$$ $$Date$$
*/
-public class MockScopeContext extends AbstractScopeContext<AtomicContext> {
+public class MockScopeContext extends AbstractScopeContext {
private Map<Context, InstanceWrapper> instanceContexts;
private Scope scope;
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/AutowireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/AutowireTestCase.java?rev=407953&r1=407952&r2=407953&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/AutowireTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/AutowireTestCase.java Fri May 19 21:26:25 2006
@@ -9,8 +9,13 @@
import org.apache.tuscany.core.context.scope.ModuleScopeContext;
import org.apache.tuscany.core.mock.MockContextFactory;
import org.apache.tuscany.core.mock.context.MockReferenceContext;
+import org.apache.tuscany.core.system.wire.SystemSourceWire;
+import org.apache.tuscany.core.system.wire.SystemTargetWire;
+import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.context.ReferenceContext;
import org.apache.tuscany.spi.context.WorkContext;
+import org.apache.tuscany.spi.wire.SourceWire;
+import org.apache.tuscany.spi.wire.TargetWire;
/**
* @version $$Rev$$ $$Date$$
@@ -26,8 +31,7 @@
List<Class<?>> interfaces = new ArrayList<Class<?>>();
interfaces.add(Source.class);
interfaces.add(Source2.class);
- SystemAtomicContext context = MockContextFactory.createSystemAtomicContext("source", interfaces,
- SourceImpl.class, false, null, null, null,null);
+ SystemAtomicContext context = MockContextFactory.createSystemAtomicContext("source", interfaces, SourceImpl.class);
scopeContext.register(context);
context.setScopeContext(scopeContext);
parent.registerContext(context);
@@ -48,11 +52,15 @@
List<Class<?>> interfaces = new ArrayList<Class<?>>();
interfaces.add(Source.class);
interfaces.add(Source2.class);
- SystemAtomicContext context = MockContextFactory.createSystemAtomicContext("source", interfaces,
- SourceImpl.class, false, null, null, null,null);
+ SystemAtomicContext context = MockContextFactory.createSystemAtomicContext("source", interfaces, SourceImpl.class);
scopeContext.register(context);
context.setScopeContext(scopeContext);
- SystemServiceContext<Source> serviceContext = new SystemServiceContextImpl<Source>("sourceService", Source.class, "source", parent);
+
+ TargetWire<Source> targetWire = new SystemTargetWire<Source>(Source.class, context);
+ SourceWire<Source> wire = new SystemSourceWire<Source>("sourceService", new QualifiedName("source"), Source.class); //String referenceName, QualifiedName targetName, Class<T> businessInterface
+ wire.setTargetWire(targetWire);
+
+ SystemServiceContext<Source> serviceContext = new SystemServiceContextImpl<Source>("sourceService", Source.class, wire, parent);
parent.registerContext(serviceContext);
parent.registerContext(context);
scopeContext.publish(new ModuleStart(this, parent));
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemAtomicContextTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemAtomicContextTestCase.java?rev=407953&r1=407952&r2=407953&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 Fri May 19 21:26:25 2006
@@ -18,7 +18,7 @@
public void testContextCreationAndInit() throws Exception {
ObjectFactory<Foo> factory = new PojoObjectFactory<Foo>(Foo.class.getConstructor((Class[]) null), null);
- ScopeContext<AtomicContext> scopeContext = new MockScopeContext();
+ ScopeContext scopeContext = new MockScopeContext();
SystemAtomicContext context = new SystemAtomicContextImpl("foo",Foo.class,factory,false,initInvoker,null, null,null);
context.setScopeContext(scopeContext);
Foo instance = (Foo) context.getService(null);
Modified: incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/Scope.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/Scope.java?rev=407953&r1=407952&r2=407953&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 Fri May 19 21:26:25 2006
@@ -8,7 +8,7 @@
REQUEST,
SESSION,
MODULE,
- APPLICATION,
+ COMPOSITE,
UNDEFINED
}
Modified: incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/ServiceContract.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/ServiceContract.java?rev=407953&r1=407952&r2=407953&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/ServiceContract.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/ServiceContract.java Fri May 19 21:26:25 2006
@@ -21,14 +21,14 @@
*/
public abstract class ServiceContract extends ModelObject {
private InteractionScope interactionScope;
- private Class<?> intefaze;
+ private Class<?> interfaze;
- public Class<?> getInteface() {
- return intefaze;
+ public Class<?> getInterface() {
+ return interfaze;
}
- public void setIntefaze(Class<?> intefaze) {
- this.intefaze = intefaze;
+ public void setInterfaze(Class<?> interfaze) {
+ this.interfaze = interfaze;
}
public InteractionScope getInteractionScope() {
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/AtomicContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/AtomicContext.java?rev=407953&r1=407952&r2=407953&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/AtomicContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/AtomicContext.java Fri May 19 21:26:25 2006
@@ -17,7 +17,6 @@
package org.apache.tuscany.spi.context;
import org.apache.tuscany.common.ObjectCreationException;
-import org.apache.tuscany.model.Scope;
/**
* A runtime entity that manages an atomic (i.e. leaf-type) artifact.
@@ -27,14 +26,9 @@
public interface AtomicContext<T> extends ComponentContext<T> {
/**
- * Returns the context implementation scope
- */
- Scope getScope();
-
- /**
* Sets the scope context used by this atomic context for instance management
*/
- void setScopeContext(ScopeContext<AtomicContext> context);
+ void setScopeContext(ScopeContext context);
/**
* Returns whether the context should be eagerly initialized
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/Context.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/Context.java?rev=407953&r1=407952&r2=407953&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/Context.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/Context.java Fri May 19 21:26:25 2006
@@ -21,6 +21,7 @@
import org.apache.tuscany.spi.Lifecycle;
import org.apache.tuscany.spi.event.EventPublisher;
import org.apache.tuscany.spi.wire.TargetInvoker;
+import org.apache.tuscany.model.Scope;
/**
* Provides an execution context for application artifacts derived from an assembly
@@ -53,6 +54,8 @@
*/
void setParent(CompositeContext parent);
+ Scope getScope();
+
/**
* Returns an instance associated with the default service for the context
*
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ScopeContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ScopeContext.java?rev=407953&r1=407952&r2=407953&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ScopeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ScopeContext.java Fri May 19 21:26:25 2006
@@ -27,7 +27,7 @@
* @version $Rev: 399161 $ $Date: 2006-05-02 23:09:37 -0700 (Tue, 02 May 2006) $
* @see Context
*/
-public interface ScopeContext<T extends Context> extends Lifecycle, RuntimeEventListener {
+public interface ScopeContext extends Lifecycle, RuntimeEventListener {
/**
* Returns the scope value representing the scope context
@@ -42,14 +42,14 @@
/**
* Registers a context with the scope context
*/
- void register(T context);
+ void register(AtomicContext context);
/**
* Returns an instance associated with the current context
*
* @throws TargetException
*/
- Object getInstance(T context) throws TargetException;
+ Object getInstance(AtomicContext context) throws TargetException;
/**
@@ -57,7 +57,7 @@
*
* @throws TargetException
*/
- InstanceWrapper getInstanceContext(T context) throws TargetException;
+ InstanceWrapper getInstanceContext(AtomicContext context) throws TargetException;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicContextExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicContextExtension.java?rev=407953&r1=407952&r2=407953&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicContextExtension.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicContextExtension.java Fri May 19 21:26:25 2006
@@ -10,14 +10,17 @@
*/
public abstract class AtomicContextExtension<T> extends ComponentContextExtension<T> implements AtomicContext<T> {
- protected ScopeContext<AtomicContext> scopeContext;
+ protected ScopeContext scopeContext;
protected Scope scope;
+ protected AtomicContextExtension() {
+ }
+
public Scope getScope() {
return scope;
}
- public void setScopeContext(ScopeContext<AtomicContext> context) {
+ public void setScopeContext(ScopeContext context) {
scopeContext = context;
context.register(this);
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentContextExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentContextExtension.java?rev=407953&r1=407952&r2=407953&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentContextExtension.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentContextExtension.java Fri May 19 21:26:25 2006
@@ -19,6 +19,9 @@
protected Map<String, TargetWire> targetWires = new HashMap<String, TargetWire>();
protected List<SourceWire> sourceWires = new ArrayList<SourceWire>();
+ protected ComponentContextExtension() {
+ }
+
public void addTargetWire(TargetWire wire) {
targetWires.put(wire.getServiceName(), wire);
onTargetWire(wire);
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeContextExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeContextExtension.java?rev=407953&r1=407952&r2=407953&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeContextExtension.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeContextExtension.java Fri May 19 21:26:25 2006
@@ -16,6 +16,7 @@
import org.apache.tuscany.spi.context.TargetException;
import org.apache.tuscany.spi.context.TargetNotFoundException;
import org.apache.tuscany.spi.event.Event;
+import org.apache.tuscany.model.Scope;
/**
* @version $$Rev$$ $$Date$$
@@ -36,6 +37,10 @@
e.addContextName(getName());
throw e;
}
+ }
+
+ public Scope getScope() {
+ return Scope.COMPOSITE;
}
public Context getContext(String name) {
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceContextExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceContextExtension.java?rev=407953&r1=407952&r2=407953&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceContextExtension.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceContextExtension.java Fri May 19 21:26:25 2006
@@ -25,6 +25,7 @@
import org.apache.tuscany.spi.wire.TargetInvocationChain;
import org.apache.tuscany.spi.wire.TargetWire;
import org.apache.tuscany.spi.wire.WireInvocationHandler;
+import org.apache.tuscany.model.Scope;
/**
* The default implementation of an external service context
@@ -41,6 +42,10 @@
* Creates a reference context
*/
public ReferenceContextExtension() {
+ }
+
+ public Scope getScope() {
+ return Scope.COMPOSITE;
}
public void setTargetWire(TargetWire<T> targetWire) {
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceContextExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceContextExtension.java?rev=407953&r1=407952&r2=407953&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceContextExtension.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceContextExtension.java Fri May 19 21:26:25 2006
@@ -11,6 +11,7 @@
import org.apache.tuscany.spi.wire.SourceInvocationChain;
import org.apache.tuscany.spi.wire.SourceWire;
import org.apache.tuscany.spi.wire.WireInvocationHandler;
+import org.apache.tuscany.model.Scope;
/**
* The default implementation of an service context
@@ -28,6 +29,10 @@
* Creates a new service context
*/
public ServiceContextExtension() throws CoreRuntimeException {
+ }
+
+ public Scope getScope() {
+ return Scope.COMPOSITE;
}
public SourceWire<T> getSourceWire() {
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/SourceWire.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/SourceWire.java?rev=407953&r1=407952&r2=407953&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/SourceWire.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/SourceWire.java Fri May 19 21:26:25 2006
@@ -81,4 +81,8 @@
void addInvocationChain(Method method, SourceInvocationChain chains);
+ /**
+ * Set when a wire can be optimized; that is when no handlers or interceptors exist on either end
+ */
+ void setTargetWire(TargetWire<T> wire);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org