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/22 04:59:00 UTC
svn commit: r408554 - in /incubator/tuscany/sandbox/jboynes/sca:
core2/src/main/java/org/apache/tuscany/core/policy/
core2/src/main/java/org/apache/tuscany/core/policy/async/
core2/src/test/java/org/apache/tuscany/core/builder/
core2/src/test/java/org/...
Author: jmarino
Date: Sun May 21 19:58:59 2006
New Revision: 408554
URL: http://svn.apache.org/viewvc?rev=408554&view=rev
Log:
testcase refactors
Added:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/AsyncInterceptor.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/AsyncPolicyBuilder.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java
- copied, changed from r408545, incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/MockComponentFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockContextFactory.java
- copied, changed from r408545, incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/MockContextFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockWireFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/policy/
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/policy/async/
Removed:
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/MockComponentFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/MockContextFactory.java
Modified:
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/builder/ConnectorTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicStatelessScopeTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/DependencyLifecycleTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/HttpSessionScopeInstanceLifecycleTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/HttpSessionScopeRestartTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/ModuleScopeInstanceLifecycleTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/ModuleScopeRestartTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/RequestScopeInstanceLifecycleTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/RequestScopeRestartTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/AutowireBuilderTestcase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/SystemBuildersTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/context/AtomicContextToReferenceContextTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/context/ServiceContextToAtomicContextTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/AutowireTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/CompositePropagationTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/DuplicateRegistrationTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeContextResolutionTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeLifecycleTestCase.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/TargetPolicyBuilder.java
Added: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/AsyncInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/AsyncInterceptor.java?rev=408554&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/AsyncInterceptor.java (added)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/AsyncInterceptor.java Sun May 21 19:58:59 2006
@@ -0,0 +1,106 @@
+package org.apache.tuscany.core.policy.async;
+
+import javax.resource.spi.work.Work;
+import javax.resource.spi.work.WorkException;
+import javax.resource.spi.work.WorkManager;
+
+import org.apache.tuscany.spi.wire.Interceptor;
+import org.apache.tuscany.spi.wire.Message;
+import org.apache.tuscany.spi.wire.MessageChannel;
+import org.apache.tuscany.spi.wire.TargetInvoker;
+import org.osoa.sca.CurrentModuleContext;
+import org.osoa.sca.ModuleContext;
+import org.osoa.sca.SCA;
+import org.osoa.sca.ServiceRuntimeException;
+
+/**
+ * A wire interceptor that uses a WorkManager to schedule asynchronous execution of invocations in Work
+ * instances.
+ */
+public class AsyncInterceptor implements Interceptor {
+
+ private static final ContextBinder BINDER = new ContextBinder();
+ private static final Message RESPONSE = new ImmutableMessage();
+
+ private WorkManager workManager;
+ private Interceptor next;
+
+ public AsyncInterceptor(WorkManager workManager) {
+ this.workManager = workManager;
+ }
+
+ public Message invoke(final Message message) {
+ final ModuleContext currentModuleContext = CurrentModuleContext.getContext();
+ // Schedule the invocation of the next interceptor in a new Work instance
+ try {
+ workManager.scheduleWork(new Work() {
+ public void run() {
+ ModuleContext oldModuleContext = CurrentModuleContext.getContext();
+ try {
+ AsyncInterceptor.BINDER.setContext(currentModuleContext);
+ next.invoke(message); // Invoke the next interceptor
+ } catch (Exception e) {
+ //FIXME How do we report exceptions?
+ e.printStackTrace();
+ } finally {
+ AsyncInterceptor.BINDER.setContext(oldModuleContext);
+ }
+ }
+
+ public void release() {
+ }
+
+ });
+ } catch (WorkException e) {
+ //FIXME Which exception should we throw here?
+ throw new ServiceRuntimeException(e);
+ }
+ return RESPONSE; // No return on a OneWay invocation.
+ }
+
+ public void setNext(Interceptor next) {
+ this.next = next;
+ }
+
+ private static class ContextBinder extends SCA {
+ public void setContext(ModuleContext context) {
+ setModuleContext(context);
+ }
+
+ public void start() {
+ throw new AssertionError();
+ }
+
+ public void stop() {
+ throw new AssertionError();
+ }
+ }
+
+ private static class ImmutableMessage implements Message {
+
+ public Object getBody() {
+ return null;
+ }
+
+ public void setBody(Object body) {
+ throw new UnsupportedOperationException();
+ }
+
+ public void setTargetInvoker(TargetInvoker invoker) {
+ throw new UnsupportedOperationException();
+ }
+
+ public TargetInvoker getTargetInvoker() {
+ return null;
+ }
+
+ public MessageChannel getCallbackChannel() {
+ return null;
+ }
+
+ public Message getRelatedCallbackMessage() {
+ return null;
+ }
+ }
+
+}
Added: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/AsyncPolicyBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/AsyncPolicyBuilder.java?rev=408554&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/AsyncPolicyBuilder.java (added)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/AsyncPolicyBuilder.java Sun May 21 19:58:59 2006
@@ -0,0 +1,49 @@
+package org.apache.tuscany.core.policy.async;
+
+import javax.resource.spi.work.WorkManager;
+
+import org.apache.tuscany.model.Service;
+import org.apache.tuscany.spi.annotation.Autowire;
+import org.apache.tuscany.spi.builder.BuilderException;
+import org.apache.tuscany.spi.policy.PolicyBuilderRegistry;
+import org.apache.tuscany.spi.policy.TargetPolicyBuilder;
+import org.apache.tuscany.spi.wire.TargetInvocationChain;
+import org.apache.tuscany.spi.wire.TargetWire;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.OneWay;
+
+/**
+ * @version $Rev: 368822 $ $Date: 2006-01-13 10:54:38 -0800 (Fri, 13 Jan 2006) $
+ */
+@org.osoa.sca.annotations.Scope("MODULE")
+public class AsyncPolicyBuilder implements TargetPolicyBuilder {
+
+ private PolicyBuilderRegistry builderRegistry;
+ private WorkManager workManager;
+
+ public AsyncPolicyBuilder() {
+ }
+
+ @Init(eager = true)
+ public void init() {
+ builderRegistry.registerTargetBuilder(this);
+ }
+
+ @Autowire
+ public void setBuilderRegistry(PolicyBuilderRegistry builderRegistry) {
+ this.builderRegistry = builderRegistry;
+ }
+
+ @Autowire
+ public void setWorkManager(WorkManager workManager) {
+ this.workManager = workManager;
+ }
+
+ public void build(Service service, TargetWire<?> wire) throws BuilderException {
+ for (TargetInvocationChain chain : wire.getInvocationChains().values()) {
+ if (chain.getMethod().getAnnotation(OneWay.class) != null) {
+ chain.addInterceptor(new AsyncInterceptor(workManager));
+ }
+ }
+ }
+}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/builder/ConnectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/builder/ConnectorTestCase.java?rev=408554&r1=408553&r2=408554&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/builder/ConnectorTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/builder/ConnectorTestCase.java Sun May 21 19:58:59 2006
@@ -1,37 +1,22 @@
package org.apache.tuscany.core.builder;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Member;
-import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import junit.framework.TestCase;
import org.apache.tuscany.core.context.WorkContextImpl;
import org.apache.tuscany.core.context.event.ModuleStart;
import org.apache.tuscany.core.context.event.ModuleStop;
import org.apache.tuscany.core.context.scope.ModuleScopeContext;
-import org.apache.tuscany.core.injection.PojoObjectFactory;
import org.apache.tuscany.core.mock.component.SimpleSource;
-import org.apache.tuscany.core.mock.component.SimpleSourceImpl;
import org.apache.tuscany.core.mock.component.SimpleTarget;
-import org.apache.tuscany.core.mock.component.SimpleTargetImpl;
import org.apache.tuscany.core.mock.context.MockAtomicContext;
import org.apache.tuscany.core.mock.wire.MockHandler;
import org.apache.tuscany.core.mock.wire.MockSyncInterceptor;
-import org.apache.tuscany.core.wire.InvokerInterceptor;
-import org.apache.tuscany.core.wire.SourceInvocationChainImpl;
-import org.apache.tuscany.core.wire.TargetInvocationChainImpl;
-import org.apache.tuscany.core.wire.jdk.JDKSourceWire;
-import org.apache.tuscany.core.wire.jdk.JDKTargetWire;
-import org.apache.tuscany.spi.QualifiedName;
-import org.apache.tuscany.spi.context.ScopeContext;
+import org.apache.tuscany.core.mock.factories.MockWireFactory;
import org.apache.tuscany.spi.context.WorkContext;
import org.apache.tuscany.spi.wire.Interceptor;
import org.apache.tuscany.spi.wire.MessageHandler;
-import org.apache.tuscany.spi.wire.SourceInvocationChain;
import org.apache.tuscany.spi.wire.SourceWire;
import org.apache.tuscany.spi.wire.TargetWire;
@@ -47,8 +32,8 @@
ModuleScopeContext scopeContext = new ModuleScopeContext(workContext);
scopeContext.start();
- MockAtomicContext<SimpleSource> sourceContext = setupSource(scopeContext, null, null, null);
- MockAtomicContext<SimpleTarget> targetContext = setupTarget(scopeContext, null, null, null);
+ MockAtomicContext<SimpleSource> sourceContext = MockWireFactory.setupSource(scopeContext, null, null, null);
+ MockAtomicContext<SimpleTarget> targetContext = MockWireFactory.setupTarget(scopeContext, null, null, null);
for (SourceWire<?> sourceWire : sourceContext.getSourceWires()) {
TargetWire<SimpleTarget> targetWire = targetContext.getTargetWire(sourceWire.getTargetName().getPortName());
connector.connect((SourceWire<SimpleTarget>) sourceWire, targetWire, targetContext, false);
@@ -75,8 +60,8 @@
MockSyncInterceptor interceptor = new MockSyncInterceptor();
List<Interceptor> interceptors = new ArrayList<Interceptor>();
interceptors.add(interceptor);
- MockAtomicContext<SimpleSource> sourceContext = setupSource(scopeContext, interceptors, null, null);
- MockAtomicContext<SimpleTarget> targetContext = setupTarget(scopeContext, null, null, null);
+ MockAtomicContext<SimpleSource> sourceContext = MockWireFactory.setupSource(scopeContext, interceptors, null, null);
+ MockAtomicContext<SimpleTarget> targetContext = MockWireFactory.setupTarget(scopeContext, null, null, null);
for (SourceWire<?> sourceWire : sourceContext.getSourceWires()) {
TargetWire<SimpleTarget> targetWire = targetContext.getTargetWire(sourceWire.getTargetName().getPortName());
connector.connect((SourceWire<SimpleTarget>) sourceWire, targetWire, targetContext, false);
@@ -104,8 +89,8 @@
MockSyncInterceptor interceptor = new MockSyncInterceptor();
List<Interceptor> interceptors = new ArrayList<Interceptor>();
interceptors.add(interceptor);
- MockAtomicContext<SimpleSource> sourceContext = setupSource(scopeContext, null, null, null);
- MockAtomicContext<SimpleTarget> targetContext = setupTarget(scopeContext, interceptors, null, null);
+ MockAtomicContext<SimpleSource> sourceContext = MockWireFactory.setupSource(scopeContext, null, null, null);
+ MockAtomicContext<SimpleTarget> targetContext = MockWireFactory.setupTarget(scopeContext, interceptors, null, null);
for (SourceWire<?> sourceWire : sourceContext.getSourceWires()) {
TargetWire<SimpleTarget> targetWire = targetContext.getTargetWire(sourceWire.getTargetName().getPortName());
connector.connect((SourceWire<SimpleTarget>) sourceWire, targetWire, targetContext, false);
@@ -136,8 +121,8 @@
MockSyncInterceptor targetInterceptor = new MockSyncInterceptor();
List<Interceptor> targetInterceptors = new ArrayList<Interceptor>();
targetInterceptors.add(targetInterceptor);
- MockAtomicContext<SimpleSource> sourceContext = setupSource(scopeContext, sourceInterceptors, null, null);
- MockAtomicContext<SimpleTarget> targetContext = setupTarget(scopeContext, targetInterceptors, null, null);
+ MockAtomicContext<SimpleSource> sourceContext = MockWireFactory.setupSource(scopeContext, sourceInterceptors, null, null);
+ MockAtomicContext<SimpleTarget> targetContext = MockWireFactory.setupTarget(scopeContext, targetInterceptors, null, null);
for (SourceWire<?> sourceWire : sourceContext.getSourceWires()) {
TargetWire<SimpleTarget> targetWire = targetContext.getTargetWire(sourceWire.getTargetName().getPortName());
connector.connect((SourceWire<SimpleTarget>) sourceWire, targetWire, targetContext, false);
@@ -170,8 +155,8 @@
MockHandler handler = new MockHandler();
List<MessageHandler> handlers = new ArrayList<MessageHandler>();
handlers.add(handler);
- MockAtomicContext<SimpleSource> sourceContext = setupSource(scopeContext, interceptors, handlers, null);
- MockAtomicContext<SimpleTarget> targetContext = setupTarget(scopeContext, null, null, null);
+ MockAtomicContext<SimpleSource> sourceContext = MockWireFactory.setupSource(scopeContext, interceptors, handlers, null);
+ MockAtomicContext<SimpleTarget> targetContext = MockWireFactory.setupTarget(scopeContext, null, null, null);
for (SourceWire<?> sourceWire : sourceContext.getSourceWires()) {
TargetWire<SimpleTarget> targetWire = targetContext.getTargetWire(sourceWire.getTargetName().getPortName());
connector.connect((SourceWire<SimpleTarget>) sourceWire, targetWire, targetContext, false);
@@ -204,8 +189,8 @@
MockHandler handler = new MockHandler();
List<MessageHandler> handlers = new ArrayList<MessageHandler>();
handlers.add(handler);
- MockAtomicContext<SimpleSource> sourceContext = setupSource(scopeContext, null,null, null);
- MockAtomicContext<SimpleTarget> targetContext = setupTarget(scopeContext, interceptors, handlers, null);
+ MockAtomicContext<SimpleSource> sourceContext = MockWireFactory.setupSource(scopeContext, null,null, null);
+ MockAtomicContext<SimpleTarget> targetContext = MockWireFactory.setupTarget(scopeContext, interceptors, handlers, null);
for (SourceWire<?> sourceWire : sourceContext.getSourceWires()) {
TargetWire<SimpleTarget> targetWire = targetContext.getTargetWire(sourceWire.getTargetName().getPortName());
connector.connect((SourceWire<SimpleTarget>) sourceWire, targetWire, targetContext, false);
@@ -240,8 +225,8 @@
MockHandler handler = new MockHandler();
List<MessageHandler> handlers = new ArrayList<MessageHandler>();
handlers.add(handler);
- MockAtomicContext<SimpleSource> sourceContext = setupSource(scopeContext, interceptors, null, handlers);
- MockAtomicContext<SimpleTarget> targetContext = setupTarget(scopeContext, null, null, null);
+ MockAtomicContext<SimpleSource> sourceContext = MockWireFactory.setupSource(scopeContext, interceptors, null, handlers);
+ MockAtomicContext<SimpleTarget> targetContext = MockWireFactory.setupTarget(scopeContext, null, null, null);
for (SourceWire<?> sourceWire : sourceContext.getSourceWires()) {
TargetWire<SimpleTarget> targetWire = targetContext.getTargetWire(sourceWire.getTargetName().getPortName());
connector.connect((SourceWire<SimpleTarget>) sourceWire, targetWire, targetContext, false);
@@ -274,8 +259,8 @@
MockHandler handler = new MockHandler();
List<MessageHandler> handlers = new ArrayList<MessageHandler>();
handlers.add(handler);
- MockAtomicContext<SimpleSource> sourceContext = setupSource(scopeContext, null, null, null);
- MockAtomicContext<SimpleTarget> targetContext = setupTarget(scopeContext, interceptors, null, handlers);
+ MockAtomicContext<SimpleSource> sourceContext = MockWireFactory.setupSource(scopeContext, null, null, null);
+ MockAtomicContext<SimpleTarget> targetContext = MockWireFactory.setupTarget(scopeContext, interceptors, null, handlers);
for (SourceWire<?> sourceWire : sourceContext.getSourceWires()) {
TargetWire<SimpleTarget> targetWire = targetContext.getTargetWire(sourceWire.getTargetName().getPortName());
connector.connect((SourceWire<SimpleTarget>) sourceWire, targetWire, targetContext, false);
@@ -308,8 +293,8 @@
MockHandler handler = new MockHandler();
List<MessageHandler> handlers = new ArrayList<MessageHandler>();
handlers.add(handler);
- MockAtomicContext<SimpleSource> sourceContext = setupSource(scopeContext, interceptors, handlers, handlers);
- MockAtomicContext<SimpleTarget> targetContext = setupTarget(scopeContext, null, null, null);
+ MockAtomicContext<SimpleSource> sourceContext = MockWireFactory.setupSource(scopeContext, interceptors, handlers, handlers);
+ MockAtomicContext<SimpleTarget> targetContext = MockWireFactory.setupTarget(scopeContext, null, null, null);
for (SourceWire<?> sourceWire : sourceContext.getSourceWires()) {
TargetWire<SimpleTarget> targetWire = targetContext.getTargetWire(sourceWire.getTargetName().getPortName());
connector.connect((SourceWire<SimpleTarget>) sourceWire, targetWire, targetContext, false);
@@ -342,8 +327,8 @@
MockHandler handler = new MockHandler();
List<MessageHandler> handlers = new ArrayList<MessageHandler>();
handlers.add(handler);
- MockAtomicContext<SimpleSource> sourceContext = setupSource(scopeContext, null, null, handlers);
- MockAtomicContext<SimpleTarget> targetContext = setupTarget(scopeContext, interceptors, handlers, null);
+ MockAtomicContext<SimpleSource> sourceContext = MockWireFactory.setupSource(scopeContext, null, null, handlers);
+ MockAtomicContext<SimpleTarget> targetContext = MockWireFactory.setupTarget(scopeContext, interceptors, handlers, null);
for (SourceWire<?> sourceWire : sourceContext.getSourceWires()) {
TargetWire<SimpleTarget> targetWire = targetContext.getTargetWire(sourceWire.getTargetName().getPortName());
connector.connect((SourceWire<SimpleTarget>) sourceWire, targetWire, targetContext, false);
@@ -373,8 +358,8 @@
MockHandler handler = new MockHandler();
List<MessageHandler> handlers = new ArrayList<MessageHandler>();
handlers.add(handler);
- MockAtomicContext<SimpleSource> sourceContext = setupSource(scopeContext, null, handlers, handlers);
- MockAtomicContext<SimpleTarget> targetContext = setupTarget(scopeContext, null, null, null);
+ MockAtomicContext<SimpleSource> sourceContext = MockWireFactory.setupSource(scopeContext, null, handlers, handlers);
+ MockAtomicContext<SimpleTarget> targetContext = MockWireFactory.setupTarget(scopeContext, null, null, null);
for (SourceWire<?> sourceWire : sourceContext.getSourceWires()) {
TargetWire<SimpleTarget> targetWire = targetContext.getTargetWire(sourceWire.getTargetName().getPortName());
connector.connect((SourceWire<SimpleTarget>) sourceWire, targetWire, targetContext, false);
@@ -402,8 +387,8 @@
MockHandler handler = new MockHandler();
List<MessageHandler> handlers = new ArrayList<MessageHandler>();
handlers.add(handler);
- MockAtomicContext<SimpleSource> sourceContext = setupSource(scopeContext, null, null,null);
- MockAtomicContext<SimpleTarget> targetContext = setupTarget(scopeContext, null, handlers, handlers);
+ MockAtomicContext<SimpleSource> sourceContext = MockWireFactory.setupSource(scopeContext, null, null,null);
+ MockAtomicContext<SimpleTarget> targetContext = MockWireFactory.setupTarget(scopeContext, null, handlers, handlers);
for (SourceWire<?> sourceWire : sourceContext.getSourceWires()) {
TargetWire<SimpleTarget> targetWire = targetContext.getTargetWire(sourceWire.getTargetName().getPortName());
connector.connect((SourceWire<SimpleTarget>) sourceWire, targetWire, targetContext, false);
@@ -431,8 +416,8 @@
MockHandler handler = new MockHandler();
List<MessageHandler> handlers = new ArrayList<MessageHandler>();
handlers.add(handler);
- MockAtomicContext<SimpleSource> sourceContext = setupSource(scopeContext, null, handlers, null);
- MockAtomicContext<SimpleTarget> targetContext = setupTarget(scopeContext, null, null, null);
+ MockAtomicContext<SimpleSource> sourceContext = MockWireFactory.setupSource(scopeContext, null, handlers, null);
+ MockAtomicContext<SimpleTarget> targetContext = MockWireFactory.setupTarget(scopeContext, null, null, null);
for (SourceWire<?> sourceWire : sourceContext.getSourceWires()) {
TargetWire<SimpleTarget> targetWire = targetContext.getTargetWire(sourceWire.getTargetName().getPortName());
connector.connect((SourceWire<SimpleTarget>) sourceWire, targetWire, targetContext, false);
@@ -460,8 +445,8 @@
MockHandler handler = new MockHandler();
List<MessageHandler> handlers = new ArrayList<MessageHandler>();
handlers.add(handler);
- MockAtomicContext<SimpleSource> sourceContext = setupSource(scopeContext, null, null, null);
- MockAtomicContext<SimpleTarget> targetContext = setupTarget(scopeContext, null, handlers, null);
+ MockAtomicContext<SimpleSource> sourceContext = MockWireFactory.setupSource(scopeContext, null, null, null);
+ MockAtomicContext<SimpleTarget> targetContext = MockWireFactory.setupTarget(scopeContext, null, handlers, null);
for (SourceWire<?> sourceWire : sourceContext.getSourceWires()) {
TargetWire<SimpleTarget> targetWire = targetContext.getTargetWire(sourceWire.getTargetName().getPortName());
connector.connect((SourceWire<SimpleTarget>) sourceWire, targetWire, targetContext, false);
@@ -489,8 +474,8 @@
MockHandler handler = new MockHandler();
List<MessageHandler> handlers = new ArrayList<MessageHandler>();
handlers.add(handler);
- MockAtomicContext<SimpleSource> sourceContext = setupSource(scopeContext, null,null, handlers);
- MockAtomicContext<SimpleTarget> targetContext = setupTarget(scopeContext, null, null, null);
+ MockAtomicContext<SimpleSource> sourceContext = MockWireFactory.setupSource(scopeContext, null,null, handlers);
+ MockAtomicContext<SimpleTarget> targetContext = MockWireFactory.setupTarget(scopeContext, null, null, null);
for (SourceWire<?> sourceWire : sourceContext.getSourceWires()) {
TargetWire<SimpleTarget> targetWire = targetContext.getTargetWire(sourceWire.getTargetName().getPortName());
connector.connect((SourceWire<SimpleTarget>) sourceWire, targetWire, targetContext, false);
@@ -518,8 +503,8 @@
MockHandler handler = new MockHandler();
List<MessageHandler> handlers = new ArrayList<MessageHandler>();
handlers.add(handler);
- MockAtomicContext<SimpleSource> sourceContext = setupSource(scopeContext, null,null, null);
- MockAtomicContext<SimpleTarget> targetContext = setupTarget(scopeContext, null, null, handlers);
+ MockAtomicContext<SimpleSource> sourceContext = MockWireFactory.setupSource(scopeContext, null,null, null);
+ MockAtomicContext<SimpleTarget> targetContext = MockWireFactory.setupTarget(scopeContext, null, null, handlers);
for (SourceWire<?> sourceWire : sourceContext.getSourceWires()) {
TargetWire<SimpleTarget> targetWire = targetContext.getTargetWire(sourceWire.getTargetName().getPortName());
connector.connect((SourceWire<SimpleTarget>) sourceWire, targetWire, targetContext, false);
@@ -534,77 +519,4 @@
scopeContext.stop();
}
- private MockAtomicContext<SimpleSource> setupSource(ScopeContext scopeContext, List<Interceptor> interceptors,
- List<MessageHandler> requestHandlers,
- List<MessageHandler> responseHandlers) throws NoSuchMethodException {
- Method echo = SimpleTarget.class.getMethod("echo", String.class);
-
- List<Class<?>> sourceInterfaces = new ArrayList<Class<?>>();
- sourceInterfaces.add(SimpleSource.class);
- Constructor<SimpleSourceImpl> sourceCtr = SimpleSourceImpl.class.getConstructor();
- Map<String, Member> members = new HashMap<String, Member>();
- members.put("target", SimpleSourceImpl.class.getMethod("setTarget", SimpleTarget.class));
- MockAtomicContext<SimpleSource> source = new MockAtomicContext<SimpleSource>("source", sourceInterfaces, new PojoObjectFactory<SimpleSourceImpl>(sourceCtr),
- scopeContext.getScope(), members);
- SourceWire<SimpleTarget> sourceWire = new JDKSourceWire<SimpleTarget>();
- sourceWire.setBusinessInterface(SimpleTarget.class);
- sourceWire.setReferenceName("target");
- sourceWire.setTargetName(new QualifiedName("target/Target"));
- SourceInvocationChain chain = new SourceInvocationChainImpl(echo);
- if (interceptors != null) {
- for (Interceptor interceptor : interceptors) {
- chain.addInterceptor(interceptor);
- }
- }
- if (requestHandlers != null) {
- for (MessageHandler handler : requestHandlers) {
- chain.addRequestHandler(handler);
- }
- }
- if (responseHandlers != null) {
- for (MessageHandler handler : responseHandlers) {
- chain.addResponseHandler(handler);
- }
- }
- sourceWire.addInvocationChain(echo, chain);
- source.addSourceWire(sourceWire);
- source.setScopeContext(scopeContext);
- return source;
- }
-
- private MockAtomicContext<SimpleTarget> setupTarget(ScopeContext scopeContext, List<Interceptor> interceptors,
- List<MessageHandler> requestHandlers,
- List<MessageHandler> responseHandlers) throws NoSuchMethodException {
- Method echo = SimpleTarget.class.getMethod("echo", String.class);
-
- List<Class<?>> targetInterfaces = new ArrayList<Class<?>>();
- targetInterfaces.add(SimpleTarget.class);
- Constructor<SimpleTargetImpl> targetCtr = SimpleTargetImpl.class.getConstructor();
- MockAtomicContext<SimpleTarget> target = new MockAtomicContext<SimpleTarget>("target", targetInterfaces, new PojoObjectFactory<SimpleTargetImpl>(targetCtr),
- scopeContext.getScope(), null);
- TargetWire<SimpleTarget> targetWire = new JDKTargetWire<SimpleTarget>();
- targetWire.setBusinessInterface(SimpleTarget.class);
- targetWire.setServiceName("Target");
- TargetInvocationChainImpl chain = new TargetInvocationChainImpl(echo);
- if (interceptors != null) {
- for (Interceptor interceptor : interceptors) {
- chain.addInterceptor(interceptor);
- }
- }
- if (requestHandlers != null) {
- for (MessageHandler handler : requestHandlers) {
- chain.addRequestHandler(handler);
- }
- }
- if (responseHandlers != null) {
- for (MessageHandler handler : responseHandlers) {
- chain.addResponseHandler(handler);
- }
- }
- chain.addInterceptor(new InvokerInterceptor()); // add tail interceptor
- targetWire.addInvocationChain(echo, chain);
- target.addTargetWire(targetWire);
- target.setScopeContext(scopeContext);
- return target;
- }
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicStatelessScopeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicStatelessScopeTestCase.java?rev=408554&r1=408553&r2=408554&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicStatelessScopeTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicStatelessScopeTestCase.java Sun May 21 19:58:59 2006
@@ -3,7 +3,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
import org.apache.tuscany.core.context.WorkContextImpl;
-import org.apache.tuscany.core.mock.MockContextFactory;
+import org.apache.tuscany.core.mock.factories.MockContextFactory;
import org.apache.tuscany.core.mock.component.StatelessComponent;
import org.apache.tuscany.core.mock.component.StatelessComponentImpl;
import org.apache.tuscany.core.system.context.SystemAtomicContext;
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/DependencyLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/DependencyLifecycleTestCase.java?rev=408554&r1=408553&r2=408554&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/DependencyLifecycleTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/DependencyLifecycleTestCase.java Sun May 21 19:58:59 2006
@@ -9,7 +9,7 @@
import org.apache.tuscany.core.context.event.ModuleStop;
import org.apache.tuscany.core.context.event.RequestStart;
import org.apache.tuscany.core.context.event.RequestEnd;
-import org.apache.tuscany.core.mock.MockContextFactory;
+import org.apache.tuscany.core.mock.factories.MockContextFactory;
import org.apache.tuscany.core.mock.component.OrderedDependentPojo;
import org.apache.tuscany.core.mock.component.OrderedDependentPojoImpl;
import org.apache.tuscany.core.mock.component.OrderedInitPojo;
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/HttpSessionScopeInstanceLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/HttpSessionScopeInstanceLifecycleTestCase.java?rev=408554&r1=408553&r2=408554&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/HttpSessionScopeInstanceLifecycleTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/HttpSessionScopeInstanceLifecycleTestCase.java Sun May 21 19:58:59 2006
@@ -5,7 +5,7 @@
import org.apache.tuscany.core.context.WorkContextImpl;
import org.apache.tuscany.core.context.event.HttpSessionEnd;
import org.apache.tuscany.core.context.event.HttpSessionStart;
-import org.apache.tuscany.core.mock.MockContextFactory;
+import org.apache.tuscany.core.mock.factories.MockContextFactory;
import org.apache.tuscany.core.mock.component.OrderedEagerInitPojo;
import org.apache.tuscany.core.mock.component.OrderedInitPojo;
import org.apache.tuscany.core.mock.component.OrderedInitPojoImpl;
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/HttpSessionScopeRestartTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/HttpSessionScopeRestartTestCase.java?rev=408554&r1=408553&r2=408554&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/HttpSessionScopeRestartTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/HttpSessionScopeRestartTestCase.java Sun May 21 19:58:59 2006
@@ -10,7 +10,7 @@
import org.apache.tuscany.core.context.event.HttpSessionEnd;
import org.apache.tuscany.core.injection.MethodEventInvoker;
import org.apache.tuscany.core.system.context.SystemAtomicContext;
-import org.apache.tuscany.core.mock.MockContextFactory;
+import org.apache.tuscany.core.mock.factories.MockContextFactory;
/**
* @version $$Rev$$ $$Date$$
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/ModuleScopeInstanceLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/ModuleScopeInstanceLifecycleTestCase.java?rev=408554&r1=408553&r2=408554&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/ModuleScopeInstanceLifecycleTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/ModuleScopeInstanceLifecycleTestCase.java Sun May 21 19:58:59 2006
@@ -6,7 +6,7 @@
import org.apache.tuscany.core.context.WorkContextImpl;
import org.apache.tuscany.core.context.event.ModuleStart;
import org.apache.tuscany.core.context.event.ModuleStop;
-import org.apache.tuscany.core.mock.MockContextFactory;
+import org.apache.tuscany.core.mock.factories.MockContextFactory;
import org.apache.tuscany.core.mock.component.ModuleScopeDestroyOnlyComponent;
import org.apache.tuscany.core.mock.component.ModuleScopeInitDestroyComponent;
import org.apache.tuscany.core.mock.component.ModuleScopeInitOnlyComponent;
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/ModuleScopeRestartTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/ModuleScopeRestartTestCase.java?rev=408554&r1=408553&r2=408554&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/ModuleScopeRestartTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/ModuleScopeRestartTestCase.java Sun May 21 19:58:59 2006
@@ -8,7 +8,7 @@
import org.apache.tuscany.core.context.event.ModuleStart;
import org.apache.tuscany.core.context.event.ModuleStop;
import org.apache.tuscany.core.injection.MethodEventInvoker;
-import org.apache.tuscany.core.mock.MockContextFactory;
+import org.apache.tuscany.core.mock.factories.MockContextFactory;
import org.apache.tuscany.core.system.context.SystemAtomicContext;
import org.apache.tuscany.spi.context.WorkContext;
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/RequestScopeInstanceLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/RequestScopeInstanceLifecycleTestCase.java?rev=408554&r1=408553&r2=408554&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/RequestScopeInstanceLifecycleTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/RequestScopeInstanceLifecycleTestCase.java Sun May 21 19:58:59 2006
@@ -5,7 +5,7 @@
import org.apache.tuscany.core.context.WorkContextImpl;
import org.apache.tuscany.core.context.event.RequestEnd;
import org.apache.tuscany.core.context.event.RequestStart;
-import org.apache.tuscany.core.mock.MockContextFactory;
+import org.apache.tuscany.core.mock.factories.MockContextFactory;
import org.apache.tuscany.core.mock.component.OrderedEagerInitPojo;
import org.apache.tuscany.core.mock.component.OrderedInitPojo;
import org.apache.tuscany.core.mock.component.OrderedInitPojoImpl;
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/RequestScopeRestartTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/RequestScopeRestartTestCase.java?rev=408554&r1=408553&r2=408554&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/RequestScopeRestartTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/RequestScopeRestartTestCase.java Sun May 21 19:58:59 2006
@@ -9,7 +9,7 @@
import org.apache.tuscany.core.context.event.RequestEnd;
import org.apache.tuscany.core.injection.MethodEventInvoker;
import org.apache.tuscany.core.system.context.SystemAtomicContext;
-import org.apache.tuscany.core.mock.MockContextFactory;
+import org.apache.tuscany.core.mock.factories.MockContextFactory;
/**
* @version $$Rev$$ $$Date$$
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/AutowireBuilderTestcase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/AutowireBuilderTestcase.java?rev=408554&r1=408553&r2=408554&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/AutowireBuilderTestcase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/AutowireBuilderTestcase.java Sun May 21 19:58:59 2006
@@ -7,7 +7,7 @@
import org.apache.tuscany.core.context.event.ModuleStart;
import org.apache.tuscany.core.context.event.ModuleStop;
import org.apache.tuscany.core.context.scope.ModuleScopeContext;
-import org.apache.tuscany.core.mock.MockComponentFactory;
+import org.apache.tuscany.core.mock.factories.MockComponentFactory;
import org.apache.tuscany.core.mock.component.Source;
import org.apache.tuscany.core.mock.component.Target;
import org.apache.tuscany.core.system.builder.SystemBindingBuilder;
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/SystemBuildersTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/SystemBuildersTestCase.java?rev=408554&r1=408553&r2=408554&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/SystemBuildersTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/SystemBuildersTestCase.java Sun May 21 19:58:59 2006
@@ -7,7 +7,7 @@
import org.apache.tuscany.core.context.event.ModuleStart;
import org.apache.tuscany.core.context.event.ModuleStop;
import org.apache.tuscany.core.context.scope.ModuleScopeContext;
-import org.apache.tuscany.core.mock.MockComponentFactory;
+import org.apache.tuscany.core.mock.factories.MockComponentFactory;
import org.apache.tuscany.core.mock.component.Source;
import org.apache.tuscany.core.mock.component.Target;
import org.apache.tuscany.core.system.builder.SystemBindingBuilder;
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/context/AtomicContextToReferenceContextTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/context/AtomicContextToReferenceContextTestCase.java?rev=408554&r1=408553&r2=408554&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/context/AtomicContextToReferenceContextTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/context/AtomicContextToReferenceContextTestCase.java Sun May 21 19:58:59 2006
@@ -9,7 +9,7 @@
import junit.framework.TestCase;
import org.apache.tuscany.core.context.WorkContextImpl;
import org.apache.tuscany.core.context.scope.ModuleScopeContext;
-import org.apache.tuscany.core.mock.MockContextFactory;
+import org.apache.tuscany.core.mock.factories.MockContextFactory;
import org.apache.tuscany.core.mock.component.Source;
import org.apache.tuscany.core.mock.component.SourceImpl;
import org.apache.tuscany.core.mock.component.Target;
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/context/ServiceContextToAtomicContextTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/context/ServiceContextToAtomicContextTestCase.java?rev=408554&r1=408553&r2=408554&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/context/ServiceContextToAtomicContextTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/context/ServiceContextToAtomicContextTestCase.java Sun May 21 19:58:59 2006
@@ -3,7 +3,7 @@
import junit.framework.TestCase;
import org.apache.tuscany.core.context.WorkContextImpl;
import org.apache.tuscany.core.context.scope.ModuleScopeContext;
-import org.apache.tuscany.core.mock.MockContextFactory;
+import org.apache.tuscany.core.mock.factories.MockContextFactory;
import org.apache.tuscany.core.mock.component.Target;
import org.apache.tuscany.core.mock.component.TargetImpl;
import org.apache.tuscany.core.system.context.SystemAtomicContext;
Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java (from r408545, incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/MockComponentFactory.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/MockComponentFactory.java&r1=408545&r2=408554&rev=408554&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/MockComponentFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java Sun May 21 19:58:59 2006
@@ -1,4 +1,4 @@
-package org.apache.tuscany.core.mock;
+package org.apache.tuscany.core.mock.factories;
import java.net.URI;
import java.net.URISyntaxException;
Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockContextFactory.java (from r408545, incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/MockContextFactory.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockContextFactory.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockContextFactory.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/MockContextFactory.java&r1=408545&r2=408554&rev=408554&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/MockContextFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockContextFactory.java Sun May 21 19:58:59 2006
@@ -1,4 +1,4 @@
-package org.apache.tuscany.core.mock;
+package org.apache.tuscany.core.mock.factories;
import java.lang.reflect.Constructor;
import java.lang.reflect.Member;
Added: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockWireFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockWireFactory.java?rev=408554&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockWireFactory.java (added)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockWireFactory.java Sun May 21 19:58:59 2006
@@ -0,0 +1,114 @@
+package org.apache.tuscany.core.mock.factories;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.lang.reflect.Method;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Member;
+
+import org.apache.tuscany.core.mock.component.SimpleSource;
+import org.apache.tuscany.core.mock.component.SimpleTarget;
+import org.apache.tuscany.core.mock.component.SimpleSourceImpl;
+import org.apache.tuscany.core.mock.component.SimpleTargetImpl;
+import org.apache.tuscany.core.mock.context.MockAtomicContext;
+import org.apache.tuscany.core.injection.PojoObjectFactory;
+import org.apache.tuscany.core.wire.jdk.JDKSourceWire;
+import org.apache.tuscany.core.wire.jdk.JDKTargetWire;
+import org.apache.tuscany.core.wire.SourceInvocationChainImpl;
+import org.apache.tuscany.core.wire.TargetInvocationChainImpl;
+import org.apache.tuscany.core.wire.InvokerInterceptor;
+import org.apache.tuscany.spi.context.ScopeContext;
+import org.apache.tuscany.spi.wire.Interceptor;
+import org.apache.tuscany.spi.wire.MessageHandler;
+import org.apache.tuscany.spi.wire.SourceWire;
+import org.apache.tuscany.spi.wire.SourceInvocationChain;
+import org.apache.tuscany.spi.wire.TargetWire;
+import org.apache.tuscany.spi.QualifiedName;
+
+/**
+ * A factory for constructing a wire between a {@link org.apache.tuscany.core.mock.component.SimpleSource} and
+ * {@link org.apache.tuscany.core.mock.component.SimpleTarget}
+ *
+ * @version $$Rev$$ $$Date$$
+ */
+public class MockWireFactory {
+
+ private MockWireFactory() {
+ }
+
+ public static MockAtomicContext<SimpleSource> setupSource(ScopeContext scopeContext, List<Interceptor> interceptors,
+ List<MessageHandler> requestHandlers,
+ List<MessageHandler> responseHandlers) throws NoSuchMethodException {
+ Method echo = SimpleTarget.class.getMethod("echo", String.class);
+
+ List<Class<?>> sourceInterfaces = new ArrayList<Class<?>>();
+ sourceInterfaces.add(SimpleSource.class);
+ Constructor<SimpleSourceImpl> sourceCtr = SimpleSourceImpl.class.getConstructor();
+ Map<String, Member> members = new HashMap<String, Member>();
+ members.put("target", SimpleSourceImpl.class.getMethod("setTarget", SimpleTarget.class));
+ MockAtomicContext<SimpleSource> source = new MockAtomicContext<SimpleSource>("source", sourceInterfaces, new PojoObjectFactory<SimpleSourceImpl>(sourceCtr),
+ scopeContext.getScope(), members);
+ SourceWire<SimpleTarget> sourceWire = new JDKSourceWire<SimpleTarget>();
+ sourceWire.setBusinessInterface(SimpleTarget.class);
+ sourceWire.setReferenceName("target");
+ sourceWire.setTargetName(new QualifiedName("target/Target"));
+ SourceInvocationChain chain = new SourceInvocationChainImpl(echo);
+ if (interceptors != null) {
+ for (Interceptor interceptor : interceptors) {
+ chain.addInterceptor(interceptor);
+ }
+ }
+ if (requestHandlers != null) {
+ for (MessageHandler handler : requestHandlers) {
+ chain.addRequestHandler(handler);
+ }
+ }
+ if (responseHandlers != null) {
+ for (MessageHandler handler : responseHandlers) {
+ chain.addResponseHandler(handler);
+ }
+ }
+ sourceWire.addInvocationChain(echo, chain);
+ source.addSourceWire(sourceWire);
+ source.setScopeContext(scopeContext);
+ return source;
+ }
+
+ public static MockAtomicContext<SimpleTarget> setupTarget(ScopeContext scopeContext, List<Interceptor> interceptors,
+ List<MessageHandler> requestHandlers,
+ List<MessageHandler> responseHandlers) throws NoSuchMethodException {
+ Method echo = SimpleTarget.class.getMethod("echo", String.class);
+
+ List<Class<?>> targetInterfaces = new ArrayList<Class<?>>();
+ targetInterfaces.add(SimpleTarget.class);
+ Constructor<SimpleTargetImpl> targetCtr = SimpleTargetImpl.class.getConstructor();
+ MockAtomicContext<SimpleTarget> target = new MockAtomicContext<SimpleTarget>("target", targetInterfaces, new PojoObjectFactory<SimpleTargetImpl>(targetCtr),
+ scopeContext.getScope(), null);
+ TargetWire<SimpleTarget> targetWire = new JDKTargetWire<SimpleTarget>();
+ targetWire.setBusinessInterface(SimpleTarget.class);
+ targetWire.setServiceName("Target");
+ TargetInvocationChainImpl chain = new TargetInvocationChainImpl(echo);
+ if (interceptors != null) {
+ for (Interceptor interceptor : interceptors) {
+ chain.addInterceptor(interceptor);
+ }
+ }
+ if (requestHandlers != null) {
+ for (MessageHandler handler : requestHandlers) {
+ chain.addRequestHandler(handler);
+ }
+ }
+ if (responseHandlers != null) {
+ for (MessageHandler handler : responseHandlers) {
+ chain.addResponseHandler(handler);
+ }
+ }
+ chain.addInterceptor(new InvokerInterceptor()); // add tail interceptor
+ targetWire.addInvocationChain(echo, chain);
+ target.addTargetWire(targetWire);
+ target.setScopeContext(scopeContext);
+ return target;
+ }
+}
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=408554&r1=408553&r2=408554&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 Sun May 21 19:58:59 2006
@@ -7,7 +7,7 @@
import org.apache.tuscany.core.context.WorkContextImpl;
import org.apache.tuscany.core.context.event.ModuleStart;
import org.apache.tuscany.core.context.scope.ModuleScopeContext;
-import org.apache.tuscany.core.mock.MockContextFactory;
+import org.apache.tuscany.core.mock.factories.MockContextFactory;
import org.apache.tuscany.core.mock.context.MockReferenceContext;
import org.apache.tuscany.core.mock.context.MockTargetWire;
import org.apache.tuscany.core.system.wire.SystemSourceWire;
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/CompositePropagationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/CompositePropagationTestCase.java?rev=408554&r1=408553&r2=408554&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/CompositePropagationTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/CompositePropagationTestCase.java Sun May 21 19:58:59 2006
@@ -10,7 +10,7 @@
import org.apache.tuscany.core.context.scope.ModuleScopeContext;
import org.apache.tuscany.core.injection.EventInvoker;
import org.apache.tuscany.core.injection.MethodEventInvoker;
-import org.apache.tuscany.core.mock.MockContextFactory;
+import org.apache.tuscany.core.mock.factories.MockContextFactory;
import org.apache.tuscany.core.mock.component.ModuleScopeInitDestroyComponent;
import org.apache.tuscany.core.mock.component.Source;
import org.apache.tuscany.core.mock.component.SourceImpl;
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/DuplicateRegistrationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/DuplicateRegistrationTestCase.java?rev=408554&r1=408553&r2=408554&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/DuplicateRegistrationTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/DuplicateRegistrationTestCase.java Sun May 21 19:58:59 2006
@@ -4,7 +4,7 @@
import org.apache.tuscany.core.context.DuplicateNameException;
import org.apache.tuscany.core.context.event.ModuleStart;
import org.apache.tuscany.core.context.event.ModuleStop;
-import org.apache.tuscany.core.mock.MockContextFactory;
+import org.apache.tuscany.core.mock.factories.MockContextFactory;
/**
* @version $Rev$ $Date$
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeContextResolutionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeContextResolutionTestCase.java?rev=408554&r1=408553&r2=408554&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeContextResolutionTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeContextResolutionTestCase.java Sun May 21 19:58:59 2006
@@ -5,7 +5,7 @@
import org.apache.tuscany.core.context.event.ModuleStart;
import org.apache.tuscany.core.context.event.ModuleStop;
import org.apache.tuscany.core.context.scope.ModuleScopeContext;
-import org.apache.tuscany.core.mock.MockContextFactory;
+import org.apache.tuscany.core.mock.factories.MockContextFactory;
import org.apache.tuscany.core.mock.component.Source;
import org.apache.tuscany.core.mock.component.SourceImpl;
import org.apache.tuscany.spi.context.AtomicContext;
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeLifecycleTestCase.java?rev=408554&r1=408553&r2=408554&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeLifecycleTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeLifecycleTestCase.java Sun May 21 19:58:59 2006
@@ -7,7 +7,7 @@
import org.apache.tuscany.core.context.event.ModuleStart;
import org.apache.tuscany.core.context.event.ModuleStop;
import org.apache.tuscany.core.context.scope.ModuleScopeContext;
-import org.apache.tuscany.core.mock.MockContextFactory;
+import org.apache.tuscany.core.mock.factories.MockContextFactory;
import org.apache.tuscany.core.mock.component.SourceImpl;
import org.apache.tuscany.core.mock.component.Source;
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/TargetPolicyBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/TargetPolicyBuilder.java?rev=408554&r1=408553&r2=408554&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/TargetPolicyBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/TargetPolicyBuilder.java Sun May 21 19:58:59 2006
@@ -12,6 +12,6 @@
*/
public interface TargetPolicyBuilder{
- public void build(Service service, TargetWire wire) throws BuilderException;
+ public void build(Service service, TargetWire<?> wire) throws BuilderException;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org