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/26 18:44:17 UTC
svn commit: r511921 - in /incubator/tuscany/java/sca/kernel/core/src:
main/java/org/apache/tuscany/core/idl/java/
test/java/org/apache/tuscany/core/idl/java/
test/java/org/apache/tuscany/core/integration/conversation/
Author: jmarino
Date: Mon Feb 26 09:44:13 2007
New Revision: 511921
URL: http://svn.apache.org/viewvc?view=rev&rev=511921
Log:
support end conversation
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.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/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
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=511921&r1=511920&r2=511921
==============================================================================
--- 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 Mon Feb 26 09:44:13 2007
@@ -27,7 +27,7 @@
import org.osoa.sca.annotations.Callback;
import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndConversation;
+import org.osoa.sca.annotations.EndsConversation;
import org.osoa.sca.annotations.OneWay;
import org.osoa.sca.annotations.Remotable;
@@ -117,7 +117,7 @@
Type[] faultTypes = method.getGenericExceptionTypes();
boolean nonBlocking = method.isAnnotationPresent(OneWay.class);
int conversationSequence = NO_CONVERSATION;
- if (method.isAnnotationPresent(EndConversation.class)) {
+ if (method.isAnnotationPresent(EndsConversation.class)) {
if (!conversational) {
throw new InvalidConversationalOperationException(
"Method is marked as end conversation but contract is not conversational",
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=511921&r1=511920&r2=511921
==============================================================================
--- 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 Mon Feb 26 09:44:13 2007
@@ -19,7 +19,7 @@
package org.apache.tuscany.core.idl.java;
import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndConversation;
+import org.osoa.sca.annotations.EndsConversation;
import org.apache.tuscany.spi.idl.InvalidConversationalOperationException;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
@@ -62,14 +62,14 @@
private interface Foo {
void operation();
- @EndConversation
+ @EndsConversation
void endOperation();
}
private interface BadFoo {
void operation();
- @EndConversation
+ @EndsConversation
void endOperation();
}
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=511921&r1=511920&r2=511921
==============================================================================
--- 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 Mon Feb 26 09:44:13 2007
@@ -23,7 +23,7 @@
import java.net.URI;
import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndConversation;
+import org.osoa.sca.annotations.EndsConversation;
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.component.AtomicComponent;
@@ -129,7 +129,7 @@
void operation2();
- @EndConversation
+ @EndsConversation
void end();
}
@@ -142,7 +142,7 @@
public void operation2() {
}
- @EndConversation
+ @EndsConversation
public void end() {
}
}
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=511921&r1=511920&r2=511921
==============================================================================
--- 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 Mon Feb 26 09:44:13 2007
@@ -23,7 +23,7 @@
import java.net.URI;
import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndConversation;
+import org.osoa.sca.annotations.EndsConversation;
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.component.AtomicComponent;
@@ -134,7 +134,7 @@
void operation2();
- @EndConversation
+ @EndsConversation
void end();
}
@@ -147,7 +147,7 @@
public void operation2() {
}
- @EndConversation
+ @EndsConversation
public void end() {
}
}
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=511921&r1=511920&r2=511921
==============================================================================
--- 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 Mon Feb 26 09:44:13 2007
@@ -23,7 +23,7 @@
import java.net.URI;
import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndConversation;
+import org.osoa.sca.annotations.EndsConversation;
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.component.AtomicComponent;
@@ -128,7 +128,7 @@
void operation2();
- @EndConversation
+ @EndsConversation
void end();
}
@@ -141,7 +141,7 @@
public void operation2() {
}
- @EndConversation
+ @EndsConversation
public void end() {
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org