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 2007/02/17 23:10:34 UTC
svn commit: r508816 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/builder/
core/src/main/java/org/apache/tuscany/core/idl/java/
core/src/main/java/org/apache/tuscany/core/wire/
core/src/main/java/org/apache/tuscany...
Author: jmarino
Date: Sat Feb 17 14:10:33 2007
New Revision: 508816
URL: http://svn.apache.org/viewvc?view=rev&rev=508816
Log:
add support for SCA @Conversational annotation and remove InteractionScope
Removed:
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/InteractionScope.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireServiceExtension.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandler.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConversationalIntrospectionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/WireToScopedJavaTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerSerializationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ServiceContract.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/util/stax/StaxUtil.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/AbstractInvocationHandler.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java?view=diff&rev=508816&r1=508815&r2=508816
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java Sat Feb 17 14:10:33 2007
@@ -45,7 +45,6 @@
import org.apache.tuscany.spi.model.ComponentDefinition;
import org.apache.tuscany.spi.model.ComponentType;
import org.apache.tuscany.spi.model.Implementation;
-import org.apache.tuscany.spi.model.InteractionScope;
import org.apache.tuscany.spi.model.ReferenceDefinition;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -67,7 +66,7 @@
private ComponentManager componentManager;
private final Map<Class<? extends Implementation<?>>, ComponentBuilder<? extends Implementation<?>>>
- componentBuilders =
+ componentBuilders =
new HashMap<Class<? extends Implementation<?>>, ComponentBuilder<? extends Implementation<?>>>();
private final Map<Class<? extends BindingDefinition>, BindingBuilder<? extends BindingDefinition>> bindingBuilders =
new HashMap<Class<? extends BindingDefinition>, BindingBuilder<? extends BindingDefinition>>();
@@ -116,8 +115,8 @@
componentDefinition.getImplementation().getComponentType();
Map<String, ServiceDefinition> services = componentType.getServices();
for (ServiceDefinition serviceDef : services.values()) {
- InteractionScope intScope = serviceDef.getServiceContract().getInteractionScope();
- if (intScope == InteractionScope.CONVERSATIONAL) {
+ ServiceContract<?> contract = serviceDef.getServiceContract();
+ if (contract.isConversational()) {
hasConversationalContract = true;
break;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaLoader.java?view=diff&rev=508816&r1=508815&r2=508816
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaLoader.java Sat Feb 17 14:10:33 2007
@@ -40,9 +40,7 @@
import org.apache.tuscany.spi.loader.LoaderRegistry;
import org.apache.tuscany.spi.loader.LoaderUtil;
import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.InteractionScope;
import org.apache.tuscany.spi.model.ModelObject;
-import org.apache.tuscany.spi.util.stax.StaxUtil;
/**
* Loads a Java interface definition from an XML-based assembly file
@@ -71,7 +69,8 @@
throws XMLStreamException, LoaderException {
assert INTERFACE_JAVA.equals(reader.getName());
- InteractionScope interactionScope = StaxUtil.interactionScope(reader.getAttributeValue(null, "scope"));
+ String conversationalAttr = reader.getAttributeValue(null, "conversational");
+ boolean conversational = Boolean.parseBoolean(conversationalAttr);
String name = reader.getAttributeValue(null, "interface");
if (name == null) {
// allow "class" as well as seems to be a common mistake
@@ -110,8 +109,7 @@
serviceContract.setDataBinding(dataType.getDataBinding());
}
serviceContract.getExtensions().putAll(extensions);
-
- serviceContract.setInteractionScope(interactionScope);
+ serviceContract.setConversational(conversational);
return serviceContract;
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java?view=diff&rev=508816&r1=508815&r2=508816
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java Sat Feb 17 14:10:33 2007
@@ -26,10 +26,10 @@
import java.util.Map;
import org.osoa.sca.annotations.Callback;
+import org.osoa.sca.annotations.Conversational;
import org.osoa.sca.annotations.EndConversation;
import org.osoa.sca.annotations.OneWay;
import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Scope;
import org.apache.tuscany.spi.idl.InvalidConversationalOperationException;
import org.apache.tuscany.spi.idl.InvalidServiceContractException;
@@ -38,7 +38,6 @@
import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.InteractionScope;
import org.apache.tuscany.spi.model.Operation;
import static org.apache.tuscany.spi.model.Operation.CONVERSATION_END;
import static org.apache.tuscany.spi.model.Operation.NO_CONVERSATION;
@@ -86,14 +85,9 @@
contract.setInterfaceClass(type);
boolean remotable = type.isAnnotationPresent(Remotable.class);
contract.setRemotable(remotable);
- Scope interactionScope = type.getAnnotation(Scope.class);
- boolean conversational = false;
- if (interactionScope != null && "CONVERSATION".equalsIgnoreCase(interactionScope.value())) {
- contract.setInteractionScope(InteractionScope.CONVERSATIONAL);
- conversational = true;
- } else {
- contract.setInteractionScope(InteractionScope.NONCONVERSATIONAL);
- }
+ //Scope interactionScope = type.getAnnotation(Scope.class);
+ boolean conversational = type.isAnnotationPresent(Conversational.class);
+ contract.setConversational(conversational);
contract.setOperations(getOperations(type, remotable, conversational));
if (callback != null) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireServiceExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireServiceExtension.java?view=diff&rev=508816&r1=508815&r2=508816
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireServiceExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireServiceExtension.java Sat Feb 17 14:10:33 2007
@@ -55,7 +55,7 @@
return false;
}
}
- if (source.getInteractionScope() != target.getInteractionScope()) {
+ if (source.isConversational() != target.isConversational()) {
if (!silent) {
throw new IncompatibleServiceContractException("Interaction scopes do not match", source, target);
} else {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandler.java?view=diff&rev=508816&r1=508815&r2=508816
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandler.java Sat Feb 17 14:10:33 2007
@@ -35,7 +35,6 @@
import org.apache.tuscany.spi.component.SCAExternalizable;
import org.apache.tuscany.spi.component.TargetInvocationException;
import org.apache.tuscany.spi.component.WorkContext;
-import static org.apache.tuscany.spi.model.InteractionScope.CONVERSATIONAL;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.wire.AbstractInvocationHandler;
@@ -224,7 +223,7 @@
throws NoMethodForOperationException {
ServiceContract contract = wire.getSourceContract();
this.referenceName = wire.getSourceUri().getFragment();
- this.contractIsConversational = CONVERSATIONAL.equals(contract.getInteractionScope());
+ this.contractIsConversational = contract.isConversational();
this.contractIsRemotable = contract.isRemotable();
this.contractHasCallback = contract.getCallbackClass() != null;
// FIXME JFM this should not be dependent on PojoAtomicComponent
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConversationalIntrospectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConversationalIntrospectionTestCase.java?view=diff&rev=508816&r1=508815&r2=508816
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConversationalIntrospectionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConversationalIntrospectionTestCase.java Sat Feb 17 14:10:33 2007
@@ -18,13 +18,11 @@
*/
package org.apache.tuscany.core.idl.java;
+import org.osoa.sca.annotations.Conversational;
import org.osoa.sca.annotations.EndConversation;
-import org.osoa.sca.annotations.Scope;
import org.apache.tuscany.spi.idl.InvalidConversationalOperationException;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
-import static org.apache.tuscany.spi.model.InteractionScope.CONVERSATIONAL;
-import static org.apache.tuscany.spi.model.InteractionScope.NONCONVERSATIONAL;
import org.apache.tuscany.spi.model.Operation;
import junit.framework.TestCase;
@@ -37,7 +35,7 @@
public void testServiceContractConversationalInformationIntrospection() throws Exception {
JavaServiceContract contract = registry.introspect(Foo.class);
- assertEquals(CONVERSATIONAL, contract.getInteractionScope());
+ assertTrue(contract.isConversational());
int seq = contract.getOperations().get("operation").getConversationSequence();
assertEquals(Operation.CONVERSATION_CONTINUE, seq);
seq = contract.getOperations().get("endOperation").getConversationSequence();
@@ -55,12 +53,12 @@
public void testNonConversationalInformationIntrospection() throws Exception {
JavaServiceContract contract = registry.introspect(NonConversationalFoo.class);
- assertEquals(NONCONVERSATIONAL, contract.getInteractionScope());
+ assertFalse(contract.isConversational());
int seq = contract.getOperations().get("operation").getConversationSequence();
assertEquals(Operation.NO_CONVERSATION, seq);
}
- @Scope("CONVERSATION")
+ @Conversational
private interface Foo {
void operation();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java?view=diff&rev=508816&r1=508815&r2=508816
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java Sat Feb 17 14:10:33 2007
@@ -35,7 +35,6 @@
import org.apache.tuscany.spi.implementation.java.JavaMappedService;
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import org.apache.tuscany.spi.model.ComponentDefinition;
-import org.apache.tuscany.spi.model.InteractionScope;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -137,7 +136,7 @@
EasyMock.expect(wire.getInvocationChains()).andReturn(chains).atLeastOnce();
EasyMock.expect(wire.isOptimizable()).andReturn(false);
JavaServiceContract targetContract = new JavaServiceContract(Target.class);
- targetContract.setInteractionScope(InteractionScope.NONCONVERSATIONAL);
+ targetContract.setConversational(false);
EasyMock.expect(wire.getSourceContract()).andReturn(targetContract).atLeastOnce();
EasyMock.replay(wire);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/WireToScopedJavaTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/WireToScopedJavaTestCase.java?view=diff&rev=508816&r1=508815&r2=508816
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/WireToScopedJavaTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/WireToScopedJavaTestCase.java Sat Feb 17 14:10:33 2007
@@ -28,7 +28,6 @@
import org.apache.tuscany.spi.idl.InvalidServiceContractException;
import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
-import org.apache.tuscany.spi.model.InteractionScope;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -188,7 +187,7 @@
throws InvalidServiceContractException {
Wire wire = new WireImpl();
JavaServiceContract contract = new JavaServiceContract(interfaze);
- contract.setInteractionScope(InteractionScope.NONCONVERSATIONAL);
+ contract.setConversational(false);
wire.setSourceContract(contract);
createChains(interfaze, wire);
wire.setTargetUri(URI.create(targetName));
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceTestCase.java?view=diff&rev=508816&r1=508815&r2=508816
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceTestCase.java Sat Feb 17 14:10:33 2007
@@ -24,9 +24,9 @@
import java.util.List;
import org.osoa.sca.annotations.Callback;
+import org.osoa.sca.annotations.Conversational;
import org.osoa.sca.annotations.Property;
import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Scope;
import org.apache.tuscany.spi.databinding.extension.SimpleTypeMapperExtension;
import org.apache.tuscany.spi.implementation.java.ImplementationProcessorService;
@@ -34,7 +34,6 @@
import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
import org.apache.tuscany.spi.implementation.java.JavaMappedService;
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
-import org.apache.tuscany.spi.model.InteractionScope;
import org.apache.tuscany.spi.model.ServiceContract;
import junit.framework.TestCase;
@@ -52,7 +51,7 @@
JavaMappedService service = implService.createService(Foo.class);
assertTrue(Foo.class.equals(service.getServiceContract().getInterfaceClass()));
assertTrue(service.isRemotable());
- assertEquals(InteractionScope.CONVERSATIONAL, service.getServiceContract().getInteractionScope());
+ assertTrue(service.getServiceContract().isConversational());
ServiceContract serviceContract = service.getServiceContract();
assertTrue(Bar.class.equals(serviceContract.getCallbackClass()));
assertTrue("ImplementationProcessorServiceTestCase$Bar".equals(serviceContract.getCallbackName()));
@@ -62,7 +61,7 @@
JavaMappedService service = implService.createService(Baz.class);
assertTrue(Baz.class.equals(service.getServiceContract().getInterfaceClass()));
assertTrue(!service.isRemotable());
- assertEquals(InteractionScope.NONCONVERSATIONAL, service.getServiceContract().getInteractionScope());
+ assertFalse(service.getServiceContract().isConversational());
}
public void testProcessParamProperty() throws Exception {
@@ -73,21 +72,21 @@
List<String> injectionNames = new ArrayList<String>();
String[] names = new String[]{"foo"};
implService.processParam(int.class,
- ctor.getGenericParameterTypes()[0],
- paramAnnotations,
- names,
- 0,
- type,
- injectionNames);
+ ctor.getGenericParameterTypes()[0],
+ paramAnnotations,
+ names,
+ 0,
+ type,
+ injectionNames);
org.apache.tuscany.spi.model.Property<?> property = type.getProperties().get("foo");
assertEquals(int.class, property.getJavaType());
assertEquals(SimpleTypeMapperExtension.XSD_INT, property.getXmlType());
}
+ @Conversational
@Callback(Bar.class)
@Remotable
- @Scope("CONVERSATION")
public interface Foo {
}
@@ -103,7 +102,7 @@
public static class PropertyClass {
private int foo;
- public PropertyClass(@Property(name = "foo") int foo) {
+ public PropertyClass(@Property(name = "foo")int foo) {
this.foo = foo;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java?view=diff&rev=508816&r1=508815&r2=508816
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java Sat Feb 17 14:10:33 2007
@@ -22,8 +22,8 @@
import java.lang.reflect.Method;
import java.net.URI;
+import org.osoa.sca.annotations.Conversational;
import org.osoa.sca.annotations.EndConversation;
-import org.osoa.sca.annotations.Scope;
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.component.AtomicComponent;
@@ -122,7 +122,7 @@
}
}
- @Scope("CONVERSATION")
+ @Conversational
public static interface Foo {
void operation1();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java?view=diff&rev=508816&r1=508815&r2=508816
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java Sat Feb 17 14:10:33 2007
@@ -22,12 +22,12 @@
import java.lang.reflect.Method;
import java.net.URI;
+import org.osoa.sca.annotations.Conversational;
import org.osoa.sca.annotations.EndConversation;
-import org.osoa.sca.annotations.Scope;
import org.apache.tuscany.spi.ObjectCreationException;
-import org.apache.tuscany.spi.component.TargetNotFoundException;
import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.TargetNotFoundException;
import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.Wire;
@@ -127,7 +127,7 @@
}
}
- @Scope("CONVERSATION")
+ @Conversational
public static interface Foo {
void operation1();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java?view=diff&rev=508816&r1=508815&r2=508816
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java Sat Feb 17 14:10:33 2007
@@ -22,14 +22,14 @@
import java.lang.reflect.Method;
import java.net.URI;
+import org.osoa.sca.annotations.Conversational;
import org.osoa.sca.annotations.EndConversation;
-import org.osoa.sca.annotations.Scope;
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.component.AtomicComponent;
import static org.apache.tuscany.spi.model.Scope.CONVERSATION;
-import org.apache.tuscany.spi.wire.Wire;
import org.apache.tuscany.spi.wire.InvocationChain;
+import org.apache.tuscany.spi.wire.Wire;
import org.apache.tuscany.core.implementation.PojoConfiguration;
import org.apache.tuscany.core.implementation.java.JavaAtomicComponent;
@@ -121,7 +121,7 @@
}
}
- @Scope("CONVERSATION")
+ @Conversational
public static interface Foo {
void operation1();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerSerializationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerSerializationTestCase.java?view=diff&rev=508816&r1=508815&r2=508816
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerSerializationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerSerializationTestCase.java Sat Feb 17 14:10:33 2007
@@ -31,7 +31,6 @@
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.model.InteractionScope;
import org.apache.tuscany.spi.model.Operation;
import static org.apache.tuscany.spi.model.Operation.NO_CONVERSATION;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -79,7 +78,7 @@
ServiceContract<Foo> contract = new ServiceContract<Foo>() {
};
contract.setInterfaceClass(Foo.class);
- contract.setInteractionScope(InteractionScope.NONCONVERSATIONAL);
+ contract.setConversational(false);
EasyMock.expect(container.getUri()).andReturn(URI.create("bar")).atLeastOnce();
wire = EasyMock.createMock(Wire.class);
@@ -88,7 +87,7 @@
ServiceContract<Object> opContract = new ServiceContract<Object>() {
};
contract.setInterfaceClass(Foo.class);
- contract.setInteractionScope(InteractionScope.NONCONVERSATIONAL);
+ contract.setConversational(false);
operation.setServiceContract(opContract);
map.put(operation, createChain(operation));
EasyMock.expect(wire.getSourceContract()).andReturn(contract).atLeastOnce();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java?view=diff&rev=508816&r1=508815&r2=508816
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java Sat Feb 17 14:10:33 2007
@@ -30,7 +30,6 @@
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.InteractionScope;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -53,7 +52,7 @@
public void testToString() {
Wire wire = new WireImpl();
ServiceContract contract = new JavaServiceContract(Foo.class);
- contract.setInteractionScope(InteractionScope.NONCONVERSATIONAL);
+ contract.setConversational(false);
wire.setSourceContract(contract);
wire.setSourceUri(URI.create("foo#bar"));
JDKInvocationHandler handler = new JDKInvocationHandler(Foo.class, wire, null);
@@ -64,7 +63,7 @@
public void testHashCode() {
Wire wire = new WireImpl();
ServiceContract contract = new JavaServiceContract(Foo.class);
- contract.setInteractionScope(InteractionScope.NONCONVERSATIONAL);
+ contract.setConversational(false);
wire.setSourceContract(contract);
wire.setSourceUri(URI.create("foo#bar"));
JDKInvocationHandler handler = new JDKInvocationHandler(Foo.class, wire, null);
@@ -81,7 +80,7 @@
DataType<Type> outputType1 = new DataType<Type>(String.class, String.class);
Operation<Type> op1 = new Operation<Type>("test", inputType1, outputType1, null);
ServiceContract<Type> contract = new JavaServiceContract(Foo.class);
- contract.setInteractionScope(InteractionScope.CONVERSATIONAL);
+ contract.setConversational(true);
op1.setServiceContract(contract);
WorkContext wc = new WorkContextImpl();
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ServiceContract.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ServiceContract.java?view=diff&rev=508816&r1=508815&r2=508816
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ServiceContract.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ServiceContract.java Sat Feb 17 14:10:33 2007
@@ -28,7 +28,7 @@
* @version $Rev$ $Date$
*/
public abstract class ServiceContract<T> extends ModelObject implements Cloneable {
- protected InteractionScope interactionScope;
+ protected boolean conversational;
protected boolean remotable;
protected Class<?> interfaceClass;
protected String interfaceName;
@@ -81,17 +81,21 @@
}
/**
- * Returns the service interaction scope
+ * Returns true if the service contract is conversational
+ *
+ * @return true if the service contract is conversational
*/
- public InteractionScope getInteractionScope() {
- return interactionScope;
+ public boolean isConversational() {
+ return conversational;
}
/**
- * Sets the service interaction scope
+ * Sets if the service contract is conversational
+ *
+ * @param conversational the conversational attribute
*/
- public void setInteractionScope(InteractionScope interactionScope) {
- this.interactionScope = interactionScope;
+ public void setConversational(boolean conversational) {
+ this.conversational = conversational;
}
/**
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/util/stax/StaxUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/util/stax/StaxUtil.java?view=diff&rev=508816&r1=508815&r2=508816
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/util/stax/StaxUtil.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/util/stax/StaxUtil.java Sat Feb 17 14:10:33 2007
@@ -35,7 +35,6 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.apache.tuscany.spi.model.InteractionScope;
import org.apache.tuscany.spi.model.Multiplicity;
/**
@@ -72,21 +71,6 @@
*/
public static Multiplicity multiplicity(String multiplicity, Multiplicity def) {
return multiplicity == null ? def : MULTIPLICITY.get(multiplicity);
- }
-
- /**
- * Convert a "scope" attribute to the equivalent enum value. Returns CONVERSATIONAL if the value equals (ignoring
- * case) "conversational", otherwise returns NONCONVERSATIONAL.
- *
- * @param scope the attribute to convert
- * @return the enum equivalent
- */
- public static InteractionScope interactionScope(String scope) {
- if ("conversational".equalsIgnoreCase(scope)) {
- return InteractionScope.CONVERSATIONAL;
- } else {
- return InteractionScope.NONCONVERSATIONAL;
- }
}
public static Document createPropertyValue(XMLStreamReader reader, QName type, DocumentBuilder builder)
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/AbstractInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/AbstractInvocationHandler.java?view=diff&rev=508816&r1=508815&r2=508816
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/AbstractInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/AbstractInvocationHandler.java Sat Feb 17 14:10:33 2007
@@ -22,7 +22,6 @@
import java.net.URI;
import java.util.LinkedList;
-import org.apache.tuscany.spi.model.InteractionScope;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -66,7 +65,7 @@
}
Operation operation = chain.getOperation();
ServiceContract contract = operation.getServiceContract();
- if (InteractionScope.CONVERSATIONAL.equals(contract.getInteractionScope())) {
+ if (contract.isConversational()) {
int sequence = chain.getOperation().getConversationSequence();
if (sequence == Operation.CONVERSATION_END) {
msg.setConversationSequence(TargetInvoker.END);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org