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:27:41 UTC
svn commit: r508820 - in /incubator/tuscany/java/sca/kernel/core/src:
main/java/org/apache/tuscany/core/implementation/processor/ConversationProcessor.java
test/java/org/apache/tuscany/core/implementation/processor/ConversationProcessorTestCase.java
Author: jmarino
Date: Sat Feb 17 14:27:40 2007
New Revision: 508820
URL: http://svn.apache.org/viewvc?view=rev&rev=508820
Log:
change to support @ConversationAttributes
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConversationProcessor.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConversationProcessorTestCase.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConversationProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConversationProcessor.java?view=diff&rev=508820&r1=508819&r2=508820
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConversationProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConversationProcessor.java Sat Feb 17 14:27:40 2007
@@ -21,7 +21,7 @@
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import org.osoa.sca.annotations.Conversation;
+import org.osoa.sca.annotations.ConversationAttributes;
import org.osoa.sca.annotations.ConversationID;
import org.osoa.sca.annotations.Scope;
@@ -49,7 +49,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
- Conversation conversation = clazz.getAnnotation(Conversation.class);
+ ConversationAttributes conversation = clazz.getAnnotation(ConversationAttributes.class);
if (conversation == null) {
return;
}
@@ -59,7 +59,7 @@
type.setImplementationScope(org.apache.tuscany.spi.model.Scope.CONVERSATION);
} else if (scope != null && !"CONVERSATION".equals(scope.value().toUpperCase())) {
throw new InvalidConversationalImplementation(
- "Service is marked with @Conversation but the scope is not @Scope(\"CONVERSATION\")", clazz.getName());
+ "Service is marked with @ConversationAttributes but the scope is not @Scope(\"CONVERSATION\")", clazz.getName());
} else if (conversation != null) {
long maxAge;
long maxIdleTime;
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConversationProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConversationProcessorTestCase.java?view=diff&rev=508820&r1=508819&r2=508820
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConversationProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConversationProcessorTestCase.java Sat Feb 17 14:27:40 2007
@@ -21,7 +21,7 @@
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import org.osoa.sca.annotations.Conversation;
+import org.osoa.sca.annotations.ConversationAttributes;
import org.osoa.sca.annotations.ConversationID;
import org.osoa.sca.annotations.Scope;
@@ -92,7 +92,7 @@
assertEquals(-1, type.getMaxAge());
assertEquals(-1, type.getMaxIdleTime());
}
-
+
public void testSetConversationIDField() throws Exception {
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
@@ -112,30 +112,30 @@
}
@Scope("CONVERSATION")
- @Conversation(maxIdleTime = "10 seconds")
+ @ConversationAttributes(maxIdleTime = "10 seconds")
private class FooMaxIdle {
}
@Scope("CONVERSATION")
- @Conversation(maxAge = "10 seconds")
+ @ConversationAttributes(maxAge = "10 seconds")
private class FooMaxAge {
}
@Scope("CONVERSATION")
- @Conversation(maxAge = "10 seconds", maxIdleTime = "10 seconds")
+ @ConversationAttributes(maxAge = "10 seconds", maxIdleTime = "10 seconds")
private class BadFooBoth {
}
- @Conversation(maxAge = "10 seconds")
+ @ConversationAttributes(maxAge = "10 seconds")
private class ImplicitFooScope {
}
@Scope("STATELESS")
- @Conversation(maxAge = "10 seconds")
+ @ConversationAttributes(maxAge = "10 seconds")
private class BadFooScope {
}
- @Conversation
+ @ConversationAttributes
private class FooJustConversation {
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org