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 22:20:09 UTC
svn commit: r537506 - in /incubator/tuscany/java/sca/modules:
binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/
core-spi/src/main/java/org/apache/tuscany/sca/core/
core-spi/src/main/java/org/apache/tuscany/sca/invocation/ core-spi/sr...
Author: rfeng
Date: Sat May 12 13:20:08 2007
New Revision: 537506
URL: http://svn.apache.org/viewvc?view=rev&rev=537506
Log:
Merge the ConversationSequence with the Operation.ConversationSequence
Removed:
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/ConversationSequence.java
Modified:
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2BindingInvoker.java
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceCallback.java
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceCallbackTargetInvoker.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/RuntimeWire.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/PersistenceException.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AbstractInvocationHandler.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaTargetInvoker.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/TargetInvoker.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/MockStaticInvoker.java
incubator/tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/ExtensibleJavaInterfaceIntrospector.java
incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperation.java
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2BindingInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2BindingInvoker.java?view=diff&rev=537506&r1=537505&r2=537506
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2BindingInvoker.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2BindingInvoker.java Sat May 12 13:20:08 2007
@@ -36,7 +36,7 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.tuscany.sca.invocation.ConversationSequence;
+import org.apache.tuscany.sca.interfacedef.ConversationSequence;
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.invocation.Message;
import org.osoa.sca.Constants;
Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceCallback.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceCallback.java?view=diff&rev=537506&r1=537505&r2=537506
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceCallback.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceCallback.java Sat May 12 13:20:08 2007
@@ -24,7 +24,6 @@
import org.apache.axis2.client.async.AsyncResult;
import org.apache.axis2.client.async.Callback;
import org.apache.axis2.context.MessageContext;
-import org.apache.tuscany.sca.invocation.ConversationSequence;
public class Axis2ReferenceCallback extends Callback {
Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceCallbackTargetInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceCallbackTargetInvoker.java?view=diff&rev=537506&r1=537505&r2=537506
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceCallbackTargetInvoker.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceCallbackTargetInvoker.java Sat May 12 13:20:08 2007
@@ -22,8 +22,8 @@
import java.util.concurrent.CountDownLatch;
import org.apache.tuscany.sca.core.RuntimeWire;
+import org.apache.tuscany.sca.interfacedef.ConversationSequence;
import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.ConversationSequence;
import org.apache.tuscany.sca.invocation.Message;
public class Axis2ReferenceCallbackTargetInvoker {
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/RuntimeWire.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/RuntimeWire.java?view=diff&rev=537506&r1=537505&r2=537506
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/RuntimeWire.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/RuntimeWire.java Sat May 12 13:20:08 2007
@@ -34,33 +34,15 @@
public interface RuntimeWire {
/**
- * The source metadata for a runtime wire
+ * Get the source of the wire
+ * @return
*/
- public interface Source {
- RuntimeComponent getComponent();
-
- RuntimeComponentReference getComponentReference();
-
- Binding getBinding();
-
- InterfaceContract getInterfaceContract();
- }
+ Source getSource();
/**
- * The target metadata for a runtime wire
+ * Get the target of the wire
+ * @return
*/
- public interface Target {
- RuntimeComponent getComponent();
-
- RuntimeComponentService getComponentService();
-
- Binding getBinding();
-
- InterfaceContract getInterfaceContract();
- }
-
- Source getSource();
-
Target getTarget();
/**
@@ -80,5 +62,63 @@
* with the wire
*/
List<InvocationChain> getCallbackInvocationChains();
+
+ /**
+ * The source of a runtime wire
+ */
+ public interface Source {
+ /**
+ * Get the source component
+ * @return The source component, null of the source is external
+ */
+ RuntimeComponent getComponent();
+
+ /**
+ * Get the source component reference
+ * @return The source component reference, null if the source is external
+ */
+ RuntimeComponentReference getComponentReference();
+
+ /**
+ * Get the source binding
+ * @return The source binding
+ */
+ Binding getBinding();
+
+ /**
+ * Get the source interface contract
+ * @return The source interface contract
+ */
+ InterfaceContract getInterfaceContract();
+ }
+
+ /**
+ * The target of a runtime wire
+ */
+ public interface Target {
+ /**
+ * Get the target component
+ * @return The target component, null if the target is an external service
+ */
+ RuntimeComponent getComponent();
+
+ /**
+ * Get the target component service
+ * @return The target component service, null if the target is an external service
+ */
+ RuntimeComponentService getComponentService();
+
+ /**
+ * Get the target binding
+ * @return The target binding
+ */
+ Binding getBinding();
+
+ /**
+ * Get the target interface contract
+ * @return The target interface contract
+ */
+ InterfaceContract getInterfaceContract();
+ }
}
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java?view=diff&rev=537506&r1=537505&r2=537506
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java Sat May 12 13:20:08 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.sca.invocation;
import org.apache.tuscany.sca.core.RuntimeWire;
+import org.apache.tuscany.sca.interfacedef.ConversationSequence;
/**
* Represents a request, response, or exception flowing through a wire
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/PersistenceException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/PersistenceException.java?view=diff&rev=537506&r1=537505&r2=537506
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/PersistenceException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/PersistenceException.java Sat May 12 13:20:08 2007
@@ -24,6 +24,8 @@
* @version $Rev$ $Date$
*/
public class PersistenceException extends Exception {
+ private static final long serialVersionUID = -908468170919651248L;
+
public PersistenceException() {
}
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AbstractInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AbstractInvocationHandler.java?view=diff&rev=537506&r1=537505&r2=537506
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AbstractInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AbstractInvocationHandler.java Sat May 12 13:20:08 2007
@@ -20,10 +20,10 @@
import java.util.UUID;
+import org.apache.tuscany.sca.core.RuntimeWire;
+import org.apache.tuscany.sca.interfacedef.ConversationSequence;
import org.apache.tuscany.sca.interfacedef.Interface;
import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.core.RuntimeWire;
-import org.apache.tuscany.sca.invocation.ConversationSequence;
import org.apache.tuscany.sca.invocation.InvocationChain;
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.invocation.Message;
@@ -62,11 +62,11 @@
Operation operation = chain.getTargetOperation();
Interface contract = operation.getInterface();
if (contract != null && contract.isConversational()) {
- Operation.ConversationSequence sequence = chain.getTargetOperation().getConversationSequence();
- if (sequence == Operation.ConversationSequence.CONVERSATION_END) {
+ ConversationSequence sequence = chain.getTargetOperation().getConversationSequence();
+ if (sequence == ConversationSequence.CONVERSATION_END) {
msg.setConversationSequence(ConversationSequence.CONVERSATION_END);
conversationStarted = false;
- } else if (sequence == Operation.ConversationSequence.CONVERSATION_CONTINUE) {
+ } else if (sequence == ConversationSequence.CONVERSATION_CONTINUE) {
if (conversationStarted) {
msg.setConversationSequence(ConversationSequence.CONVERSATION_CONTINUE);
} else {
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java?view=diff&rev=537506&r1=537505&r2=537506
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java Sat May 12 13:20:08 2007
@@ -19,7 +19,7 @@
package org.apache.tuscany.sca.core.invocation;
import org.apache.tuscany.sca.core.RuntimeWire;
-import org.apache.tuscany.sca.invocation.ConversationSequence;
+import org.apache.tuscany.sca.interfacedef.ConversationSequence;
import org.apache.tuscany.sca.invocation.Message;
/**
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java?view=diff&rev=537506&r1=537505&r2=537506
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java Sat May 12 13:20:08 2007
@@ -21,7 +21,7 @@
import java.util.LinkedList;
import org.apache.tuscany.sca.core.RuntimeWire;
-import org.apache.tuscany.sca.invocation.ConversationSequence;
+import org.apache.tuscany.sca.interfacedef.ConversationSequence;
import org.apache.tuscany.sca.invocation.Interceptor;
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.invocation.Message;
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=537506&r1=537505&r2=537506
==============================================================================
--- 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 13:20:08 2007
@@ -24,11 +24,10 @@
import org.apache.tuscany.sca.core.RuntimeComponent;
import org.apache.tuscany.sca.core.invocation.ThreadMessageContext;
+import org.apache.tuscany.sca.interfacedef.ConversationSequence;
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.CoreRuntimeException;
import org.apache.tuscany.sca.scope.InstanceWrapper;
import org.apache.tuscany.sca.scope.Scope;
import org.apache.tuscany.sca.scope.ScopeContainer;
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=537506&r1=537505&r2=537506
==============================================================================
--- 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 13:20:08 2007
@@ -20,7 +20,7 @@
import java.lang.reflect.InvocationTargetException;
-import org.apache.tuscany.sca.invocation.ConversationSequence;
+import org.apache.tuscany.sca.interfacedef.ConversationSequence;
import org.apache.tuscany.sca.invocation.Message;
/**
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=537506&r1=537505&r2=537506
==============================================================================
--- 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 13:20:08 2007
@@ -22,7 +22,7 @@
import java.lang.reflect.Method;
import org.apache.tuscany.sca.implementation.java.invocation.TargetInvoker;
-import org.apache.tuscany.sca.invocation.ConversationSequence;
+import org.apache.tuscany.sca.interfacedef.ConversationSequence;
import org.apache.tuscany.sca.invocation.Interceptor;
import org.apache.tuscany.sca.invocation.Message;
import org.osoa.sca.ServiceRuntimeException;
Modified: incubator/tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/ExtensibleJavaInterfaceIntrospector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/ExtensibleJavaInterfaceIntrospector.java?view=diff&rev=537506&r1=537505&r2=537506
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/ExtensibleJavaInterfaceIntrospector.java (original)
+++ incubator/tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/ExtensibleJavaInterfaceIntrospector.java Sat May 12 13:20:08 2007
@@ -24,6 +24,7 @@
import java.util.List;
import java.util.Set;
+import org.apache.tuscany.sca.interfacedef.ConversationSequence;
import org.apache.tuscany.sca.interfacedef.DataType;
import org.apache.tuscany.sca.interfacedef.InvalidCallbackException;
import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
@@ -102,16 +103,16 @@
Class[] paramTypes = method.getParameterTypes();
Class[] faultTypes = method.getExceptionTypes();
boolean nonBlocking = method.isAnnotationPresent(OneWay.class);
- Operation.ConversationSequence conversationSequence = Operation.ConversationSequence.NO_CONVERSATION;
+ ConversationSequence conversationSequence = ConversationSequence.CONVERSATION_NONE;
if (method.isAnnotationPresent(EndsConversation.class)) {
if (!conversational) {
throw new InvalidOperationException(
"Method is marked as end conversation but contract is not conversational",
method);
}
- conversationSequence = Operation.ConversationSequence.CONVERSATION_END;
+ conversationSequence = ConversationSequence.CONVERSATION_END;
} else if (conversational) {
- conversationSequence = Operation.ConversationSequence.CONVERSATION_CONTINUE;
+ conversationSequence = ConversationSequence.CONVERSATION_CONTINUE;
}
// Set outputType to null for void
Modified: incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java?view=diff&rev=537506&r1=537505&r2=537506
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java Sat May 12 13:20:08 2007
@@ -20,6 +20,7 @@
import junit.framework.TestCase;
+import org.apache.tuscany.sca.interfacedef.ConversationSequence;
import org.apache.tuscany.sca.interfacedef.Interface;
import org.apache.tuscany.sca.interfacedef.InvalidOperationException;
import org.apache.tuscany.sca.interfacedef.Operation;
@@ -57,10 +58,10 @@
Interface i = introspector.introspect(Foo.class);
assertNotNull(i);
assertTrue(i.isConversational());
- Operation.ConversationSequence seq = getOperation(i, "operation").getConversationSequence();
- assertEquals(Operation.ConversationSequence.CONVERSATION_CONTINUE, seq);
+ ConversationSequence seq = getOperation(i, "operation").getConversationSequence();
+ assertEquals(ConversationSequence.CONVERSATION_CONTINUE, seq);
seq = getOperation(i, "endOperation").getConversationSequence();
- assertEquals(Operation.ConversationSequence.CONVERSATION_END, seq);
+ assertEquals(ConversationSequence.CONVERSATION_END, seq);
}
public void testBadServiceContract() throws Exception {
@@ -75,9 +76,9 @@
public void testNonConversationalInformationIntrospection() throws Exception {
Interface i = introspector.introspect(NonConversationalFoo.class);
assertFalse(i.isConversational());
- Operation.ConversationSequence seq = getOperation(i, "operation")
+ ConversationSequence seq = getOperation(i, "operation")
.getConversationSequence();
- assertEquals(Operation.ConversationSequence.NO_CONVERSATION, seq);
+ assertEquals(ConversationSequence.CONVERSATION_NONE, seq);
}
@Conversational
Modified: incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperation.java?view=diff&rev=537506&r1=537505&r2=537506
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperation.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperation.java Sat May 12 13:20:08 2007
@@ -32,6 +32,7 @@
import javax.xml.namespace.QName;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.interfacedef.ConversationSequence;
import org.apache.tuscany.sca.interfacedef.DataType;
import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
import org.apache.tuscany.sca.interfacedef.Operation;
@@ -202,7 +203,7 @@
operationModel.setName(operation.getName());
operationModel.setFaultTypes(getFaultTypes());
operationModel.setNonBlocking(oneway);
- operationModel.setConversationSequence(Operation.ConversationSequence.NO_CONVERSATION);
+ operationModel.setConversationSequence(ConversationSequence.CONVERSATION_NONE);
operationModel.setInputType(getInputType());
operationModel.setOutputType(getOutputType());
Modified: incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java?view=diff&rev=537506&r1=537505&r2=537506
==============================================================================
--- incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java (original)
+++ incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java Sat May 12 13:20:08 2007
@@ -26,10 +26,6 @@
* Represents an operation on a service interface.
*/
public interface Operation {
- enum ConversationSequence {
- NO_CONVERSATION, CONVERSATION_CONTINUE, CONVERSATION_END
- };
-
/**
* Returns the name of the operation.
*
Modified: incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java?view=diff&rev=537506&r1=537505&r2=537506
==============================================================================
--- incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java (original)
+++ incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java Sat May 12 13:20:08 2007
@@ -21,6 +21,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.tuscany.sca.interfacedef.ConversationSequence;
import org.apache.tuscany.sca.interfacedef.DataType;
import org.apache.tuscany.sca.interfacedef.Interface;
import org.apache.tuscany.sca.interfacedef.Operation;
@@ -39,7 +40,7 @@
private DataType<List<DataType>> inputType;
private List<DataType> faultTypes;
private Interface interfaze;
- private ConversationSequence conversationSequence = ConversationSequence.NO_CONVERSATION;
+ private ConversationSequence conversationSequence = ConversationSequence.CONVERSATION_NONE;
private boolean nonBlocking;
private boolean wrapperStyle;
private WrapperInfo wrapper;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org