You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/05/12 18:57:03 UTC
svn commit: r537483 [2/2] - in /incubator/tuscany/java/sca:
modules/binding-rmi/
modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/
modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/
modules/core-spi/src/mai...
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java?view=diff&rev=537483&r1=537482&r2=537483
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java Sat May 12 09:57:00 2007
@@ -21,7 +21,6 @@
import org.apache.tuscany.sca.core.component.RequestContextImpl;
import org.apache.tuscany.sca.spi.ObjectCreationException;
import org.apache.tuscany.sca.spi.ObjectFactory;
-import org.apache.tuscany.sca.spi.component.WorkContext;
import org.osoa.sca.RequestContext;
/**
@@ -31,14 +30,11 @@
* @version $Rev$ $Date$
*/
public class RequestContextObjectFactory implements ObjectFactory<RequestContext> {
- private WorkContext workContext;
- public RequestContextObjectFactory(WorkContext workContext) {
- assert workContext != null;
- this.workContext = workContext;
+ public RequestContextObjectFactory() {
}
public RequestContext getInstance() throws ObjectCreationException {
- return new RequestContextImpl(workContext);
+ return new RequestContextImpl();
}
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java?view=diff&rev=537483&r1=537482&r2=537483
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java Sat May 12 09:57:00 2007
@@ -45,10 +45,10 @@
import org.apache.tuscany.sca.core.invocation.ProxyFactory;
import org.apache.tuscany.sca.core.invocation.WireObjectFactory;
import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
import org.apache.tuscany.sca.implementation.java.context.JavaPropertyValueObjectFactory;
import org.apache.tuscany.sca.implementation.java.context.TargetMethodNotFoundException;
import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;
+import org.apache.tuscany.sca.implementation.java.impl.JavaResourceImpl;
import org.apache.tuscany.sca.implementation.java.injection.ArrayMultiplicityObjectFactory;
import org.apache.tuscany.sca.implementation.java.injection.ConversationIDObjectFactory;
import org.apache.tuscany.sca.implementation.java.injection.FieldInjector;
@@ -60,10 +60,8 @@
import org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceUtil;
-import org.apache.tuscany.sca.provider.ScopedImplementationProvider;
import org.apache.tuscany.sca.scope.InstanceWrapper;
import org.apache.tuscany.sca.scope.Scope;
-import org.apache.tuscany.sca.scope.ScopeContainer;
import org.apache.tuscany.sca.spi.CoreRuntimeException;
import org.apache.tuscany.sca.spi.ObjectCreationException;
import org.apache.tuscany.sca.spi.ObjectFactory;
@@ -71,7 +69,6 @@
import org.apache.tuscany.sca.spi.component.TargetDestructionException;
import org.apache.tuscany.sca.spi.component.TargetInvokerCreationException;
import org.apache.tuscany.sca.spi.component.TargetResolutionException;
-import org.apache.tuscany.sca.spi.component.WorkContext;
import org.osoa.sca.CallableReference;
import org.osoa.sca.ComponentContext;
import org.osoa.sca.ServiceReference;
@@ -90,7 +87,6 @@
protected PojoConfiguration<?> configuration;
protected Scope scope;
protected ProxyFactory proxyService;
- protected WorkContext workContext;
protected URI groupId;
private final ComponentContext componentContext;
@@ -221,7 +217,7 @@
}
public void addResourceFactory(String name, ObjectFactory<?> factory) {
- org.apache.tuscany.sca.implementation.java.impl.JavaResourceImpl resource = configuration.getDefinition()
+ JavaResourceImpl resource = configuration.getDefinition()
.getResources().get(name);
if (resource != null && !(resource.getElement().getAnchor() instanceof Constructor)) {
@@ -232,7 +228,7 @@
}
public void addConversationIDFactory(Member member) {
- ObjectFactory<String> factory = new ConversationIDObjectFactory(workContext);
+ ObjectFactory<String> factory = new ConversationIDObjectFactory();
if (member instanceof Field) {
JavaElementImpl element = new JavaElementImpl((Field)member);
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java?view=diff&rev=537483&r1=537482&r2=537483
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java Sat May 12 09:57:00 2007
@@ -39,7 +39,6 @@
import org.apache.tuscany.sca.scope.Scope;
import org.apache.tuscany.sca.spi.ObjectFactory;
import org.apache.tuscany.sca.spi.component.TargetInvokerCreationException;
-import org.apache.tuscany.sca.spi.component.WorkContext;
import org.osoa.sca.ComponentContext;
/**
@@ -53,7 +52,6 @@
RuntimeComponent component,
JavaImplementation implementation,
ProxyFactory proxyService,
- WorkContext workContext,
DataBindingExtensionPoint dataBindingRegistry,
JavaPropertyValueObjectFactory propertyValueObjectFactory) {
super();
@@ -62,7 +60,6 @@
try {
PojoConfiguration configuration = new PojoConfiguration(implementation);
configuration.setProxyFactory(proxyService);
- configuration.setWorkContext(workContext);
// FIXME: Group id to be removed
configuration.setGroupId(URI.create("/"));
atomicComponent = new JavaComponentInfo(component, configuration, dataBindingRegistry,
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java?view=diff&rev=537483&r1=537482&r2=537483
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java Sat May 12 09:57:00 2007
@@ -26,7 +26,6 @@
import org.apache.tuscany.sca.implementation.java.context.JavaPropertyValueObjectFactory;
import org.apache.tuscany.sca.provider.ImplementationProvider;
import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
-import org.apache.tuscany.sca.spi.component.WorkContext;
/**
* @version $Rev$ $Date$
@@ -35,24 +34,22 @@
private JavaPropertyValueObjectFactory propertyValueObjectFactory;
private DataBindingExtensionPoint dataBindingRegistry;
private ProxyFactory proxyService;
- private WorkContext workContext;
- public JavaImplementationProviderFactory(
- ProxyFactory proxyService,
- WorkContext workContext,
- DataBindingExtensionPoint dataBindingRegistry,
- JavaPropertyValueObjectFactory propertyValueObjectFactory) {
+ public JavaImplementationProviderFactory(ProxyFactory proxyService,
+ DataBindingExtensionPoint dataBindingRegistry,
+ JavaPropertyValueObjectFactory propertyValueObjectFactory) {
super();
this.proxyService = proxyService;
- this.workContext = workContext;
this.dataBindingRegistry = dataBindingRegistry;
this.propertyValueObjectFactory = propertyValueObjectFactory;
}
- public ImplementationProvider createImplementationProvider(RuntimeComponent component, JavaImplementation implementation) {
- return new JavaImplementationProvider(component, implementation, proxyService, workContext, dataBindingRegistry, propertyValueObjectFactory);
+ public ImplementationProvider createImplementationProvider(RuntimeComponent component,
+ JavaImplementation implementation) {
+ return new JavaImplementationProvider(component, implementation, proxyService, dataBindingRegistry,
+ propertyValueObjectFactory);
}
-
+
public Class<JavaImplementation> getModelType() {
return JavaImplementation.class;
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaTargetInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaTargetInvoker.java?view=diff&rev=537483&r1=537482&r2=537483
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaTargetInvoker.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaTargetInvoker.java Sat May 12 09:57:00 2007
@@ -20,16 +20,20 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.util.List;
import org.apache.tuscany.sca.core.RuntimeComponent;
+import org.apache.tuscany.sca.core.invocation.ThreadMessageContext;
+import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.invocation.ConversationSequence;
+import org.apache.tuscany.sca.invocation.InvocationChain;
+import org.apache.tuscany.sca.invocation.Message;
import org.apache.tuscany.sca.scope.InstanceWrapper;
import org.apache.tuscany.sca.scope.Scope;
import org.apache.tuscany.sca.scope.ScopeContainer;
import org.apache.tuscany.sca.spi.component.ComponentException;
import org.apache.tuscany.sca.spi.component.InvalidConversationSequenceException;
import org.apache.tuscany.sca.spi.component.TargetException;
-import org.apache.tuscany.sca.spi.component.WorkContext;
/**
* Responsible for synchronously dispatching an invocation to a Java component
@@ -37,10 +41,12 @@
*
* @version $Rev$ $Date$
*/
-public class JavaTargetInvoker extends TargetInvokerExtension {
+public class JavaTargetInvoker implements TargetInvoker {
protected Method operation;
protected boolean stateless;
protected InstanceWrapper target;
+ protected boolean cacheable;
+
private final RuntimeComponent component;
private final ScopeContainer scopeContainer;
@@ -92,9 +98,11 @@
}
}
- public Object invokeTarget(final Object payload, final ConversationSequence sequence, WorkContext workContext)
+ public Object invokeTarget(final Object payload, final ConversationSequence sequence)
throws InvocationTargetException {
- Object contextId = workContext.getIdentifier(scopeContainer.getScope());
+
+ // FIXME: How to deal with other scopes
+ Object contextId = ThreadMessageContext.getMessageContext().getConversationID();
try {
InstanceWrapper wrapper = getInstance(sequence, contextId);
Object instance = wrapper.getInstance();
@@ -117,4 +125,36 @@
}
}
+ public Message invoke(Message msg) {
+ try {
+ Object messageId = msg.getMessageID();
+ Message workContext = ThreadMessageContext.getMessageContext();
+ if (messageId != null) {
+ workContext.setCorrelationID(messageId);
+ }
+ Object resp = invokeTarget(msg.getBody(), msg.getConversationSequence());
+ msg.setBody(resp);
+ } catch (InvocationTargetException e) {
+ msg.setFaultBody(e.getCause());
+ }
+ return msg;
+ }
+
+ public boolean isCacheable() {
+ return cacheable;
+ }
+
+ public void setCacheable(boolean cacheable) {
+ this.cacheable = cacheable;
+ }
+
+ protected InvocationChain getInvocationChain(List<InvocationChain> chains, Operation targetOperation) {
+ for (InvocationChain chain : chains) {
+ if (chain.getTargetOperation().equals(targetOperation)) {
+ return chain;
+ }
+ }
+ return null;
+ }
+
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PojoConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PojoConfiguration.java?view=diff&rev=537483&r1=537482&r2=537483
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PojoConfiguration.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PojoConfiguration.java Sat May 12 09:57:00 2007
@@ -46,7 +46,6 @@
import org.apache.tuscany.sca.implementation.java.injection.MethodInjector;
import org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper;
import org.apache.tuscany.sca.spi.ObjectFactory;
-import org.apache.tuscany.sca.spi.component.WorkContext;
/**
* Encapsulates confuration for a Java-based atomic component
@@ -56,7 +55,6 @@
public class PojoConfiguration<T> implements InstanceFactoryProvider<T> {
private JavaImplementation definition;
private ProxyFactory proxyService;
- private WorkContext workContext;
private URI groupId;
private URI name;
@@ -104,14 +102,6 @@
public void setProxyFactory(ProxyFactory proxyService) {
this.proxyService = proxyService;
- }
-
- public WorkContext getWorkContext() {
- return workContext;
- }
-
- public void setWorkContext(WorkContext workContext) {
- this.workContext = workContext;
}
/**
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/TargetInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/TargetInvoker.java?view=diff&rev=537483&r1=537482&r2=537483
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/TargetInvoker.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/TargetInvoker.java Sat May 12 09:57:00 2007
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.invocation.ConversationSequence;
import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.spi.component.WorkContext;
/**
* Implementations are responsible for resolving a target and performing the actual invocation on it, for example, a
@@ -41,12 +40,10 @@
* @param sequence if the invocation is part of a conversation, the sequence. Valid values are {@link #NONE} for
* non-conversational, {@link #START} to begin a conversation, {@link #CONTINUE} to continue a
* conversation, or {@link #END} to end a conversation
- * @param workContext work context associated with this invocation
* @return the result of the invocation
* @throws InvocationTargetException if there was a problem invoking the target
*/
- Object invokeTarget(final Object payload, final ConversationSequence sequence, WorkContext workContext)
- throws InvocationTargetException;
+ Object invokeTarget(final Object payload, final ConversationSequence sequence) throws InvocationTargetException;
/**
* Invokes an operation on a target with the given message
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java?view=diff&rev=537483&r1=537482&r2=537483
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java Sat May 12 09:57:00 2007
@@ -65,7 +65,6 @@
import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
import org.apache.tuscany.sca.policy.PolicyFactory;
import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
-import org.apache.tuscany.sca.spi.component.WorkContext;
/**
* @version $Rev$ $Date$
@@ -124,15 +123,13 @@
StAXArtifactProcessorExtensionPoint processors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
- WorkContext workContext = registry.getExtensionPoint(WorkContext.class);
JavaImplementationFactory javaImplementationFactory = new DefaultJavaImplementationFactory();
JavaImplementationProcessor javaImplementationProcessor =
new JavaImplementationProcessor(assemblyFactory, policyFactory, javaImplementationFactory, classIntrospector);
processors.addArtifactProcessor(javaImplementationProcessor);
JavaImplementationProviderFactory javaImplementationProviderFactory =
- new JavaImplementationProviderFactory(proxyFactory,
- workContext, dataBindings, factory);
+ new JavaImplementationProviderFactory(proxyFactory, dataBindings, factory);
ProviderFactoryExtensionPoint providerFactories = registry.getExtensionPoint(ProviderFactoryExtensionPoint.class);
providerFactories.addProviderFactory(javaImplementationProviderFactory);
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java?view=diff&rev=537483&r1=537482&r2=537483
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java Sat May 12 09:57:00 2007
@@ -18,11 +18,7 @@
*/
package org.apache.tuscany.sca.implementation.java.injection;
-import org.apache.tuscany.sca.implementation.java.injection.RequestContextObjectFactory;
-import org.apache.tuscany.sca.spi.component.WorkContext;
-
import junit.framework.TestCase;
-import org.easymock.EasyMock;
/**
* @version $Rev$ $Date$
@@ -30,8 +26,7 @@
public class RequestContextObjectFactoryTestCase extends TestCase {
public void testInstanceCreate() {
- WorkContext workContext = EasyMock.createNiceMock(WorkContext.class);
- RequestContextObjectFactory factory = new RequestContextObjectFactory(workContext);
+ RequestContextObjectFactory factory = new RequestContextObjectFactory();
assertNotNull(factory.getInstance());
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/integration/AbstractConversationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/integration/AbstractConversationTestCase.java?view=diff&rev=537483&r1=537482&r2=537483
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/integration/AbstractConversationTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/integration/AbstractConversationTestCase.java Sat May 12 09:57:00 2007
@@ -24,8 +24,6 @@
import org.apache.tuscany.sca.core.scope.ConversationalScopeContainer;
import org.apache.tuscany.sca.core.store.MemoryStore;
import org.apache.tuscany.sca.scope.ScopeContainer;
-import org.apache.tuscany.sca.spi.component.WorkContext;
-import org.apache.tuscany.sca.spi.component.WorkContextImpl;
import org.apache.tuscany.sca.store.StoreMonitor;
import org.easymock.EasyMock;
@@ -37,14 +35,12 @@
public abstract class AbstractConversationTestCase extends TestCase {
protected ScopeContainer container;
protected MemoryStore store;
- protected WorkContext workContext;
protected RuntimeComponent component;
protected void createRuntime() {
- workContext = new WorkContextImpl();
store = new MemoryStore(EasyMock.createNiceMock(StoreMonitor.class));
component = EasyMock.createMock(RuntimeComponent.class);
- container = new ConversationalScopeContainer(store, workContext, component);
+ container = new ConversationalScopeContainer(store, component);
}
protected void initializeRuntime() {
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/MockStaticInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/MockStaticInvoker.java?view=diff&rev=537483&r1=537482&r2=537483
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/MockStaticInvoker.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/MockStaticInvoker.java Sat May 12 09:57:00 2007
@@ -25,7 +25,6 @@
import org.apache.tuscany.sca.invocation.ConversationSequence;
import org.apache.tuscany.sca.invocation.Interceptor;
import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.spi.component.WorkContext;
import org.osoa.sca.ServiceRuntimeException;
/**
@@ -54,7 +53,7 @@
this.cacheable = cacheable;
}
- public Object invokeTarget(final Object payload, final ConversationSequence sequence, WorkContext workContext) throws InvocationTargetException {
+ public Object invokeTarget(final Object payload, final ConversationSequence sequence) throws InvocationTargetException {
try {
if (payload != null && !payload.getClass().isArray()) {
return operation.invoke(instance, payload);
@@ -68,7 +67,7 @@
public Message invoke(Message msg) {
try {
- Object resp = invokeTarget(msg.getBody(), null, null);
+ Object resp = invokeTarget(msg.getBody(), null);
msg.setBody(resp);
} catch (InvocationTargetException e) {
msg.setFaultBody(e.getCause());
Modified: incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/server/EchoService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/server/EchoService.java?view=diff&rev=537483&r1=537482&r2=537483
==============================================================================
--- incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/server/EchoService.java (original)
+++ incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/server/EchoService.java Sat May 12 09:57:00 2007
@@ -23,8 +23,6 @@
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.invocation.Message;
import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.spi.component.WorkContext;
-import org.apache.tuscany.sca.spi.component.WorkContextTunnel;
/**
* @version $Rev$ $Date$
@@ -43,12 +41,8 @@
Message request = messageFactory.createMessage();
request.setBody(new Object[] {input});
- WorkContext workContext = WorkContextTunnel.getThreadWorkContext();
- request.setWorkContext(workContext);
- Message response;
-
// dispatch and get the response
- response = invoker.invoke(request);
+ Message response = invoker.invoke(request);
Object body = response.getBody();
if (response.isFault()) {
throw new InvocationTargetException((Throwable)body);
Modified: incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/CalculatorClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/CalculatorClient.java?view=diff&rev=537483&r1=537482&r2=537483
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/CalculatorClient.java (original)
+++ incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/CalculatorClient.java Sat May 12 09:57:00 2007
@@ -39,6 +39,7 @@
System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
System.out.println("3 / 2=" + calculatorService.divide(3, 2));
+ Thread.currentThread().sleep(50000);
domain.close();
}
Modified: incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java?view=diff&rev=537483&r1=537482&r2=537483
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java (original)
+++ incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java Sat May 12 09:57:00 2007
@@ -18,12 +18,17 @@
*/
package calculator;
+import org.osoa.sca.annotations.EagerInit;
+import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Scope;
/**
* An implementation of the Calculator service.
*/
+@Scope("COMPOSITE")
+@EagerInit
public class CalculatorServiceImpl implements CalculatorService {
private AddService addService;
@@ -31,6 +36,11 @@
private MultiplyService multiplyService;
private DivideService divideService;
+ @Init
+ public void init() {
+ int i =0 ;
+ }
+
@Reference
public void setAddService(AddService addService) {
this.addService = addService;
Modified: incubator/tuscany/java/sca/samples/databinding-echo/src/main/java/echo/server/EchoService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/databinding-echo/src/main/java/echo/server/EchoService.java?view=diff&rev=537483&r1=537482&r2=537483
==============================================================================
--- incubator/tuscany/java/sca/samples/databinding-echo/src/main/java/echo/server/EchoService.java (original)
+++ incubator/tuscany/java/sca/samples/databinding-echo/src/main/java/echo/server/EchoService.java Sat May 12 09:57:00 2007
@@ -20,11 +20,10 @@
import java.lang.reflect.InvocationTargetException;
+import org.apache.tuscany.sca.core.invocation.MessageImpl;
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.invocation.Message;
import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.spi.component.WorkContext;
-import org.apache.tuscany.sca.spi.component.WorkContextTunnel;
/**
* @version $Rev$ $Date$
@@ -41,14 +40,14 @@
public String sendReceive(String input) throws InvocationTargetException {
+ Message msg = new MessageImpl();
+ msg.setBody(new Object[] {input});
+
Message request = messageFactory.createMessage();
request.setBody(new Object[] {input});
- WorkContext workContext = WorkContextTunnel.getThreadWorkContext();
- request.setWorkContext(workContext);
- Message response;
// dispatch and get the response
- response = invoker.invoke(request);
+ Message response = invoker.invoke(request);
Object body = response.getBody();
if (response.isFault()) {
throw new InvocationTargetException((Throwable)body);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org