Remove all conversational related code from SCA API and code that uses it as per the public review spec's

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@787158 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 0 insertions, 239 deletions

diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/CallableReference.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/CallableReference.java
index cdfaded693..ac36dec8f1 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/CallableReference.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/CallableReference.java
@@ -31,21 +31,6 @@ public interface CallableReference<B> {
     Class<B> getBusinessInterface();
 
     /**
-     * Returns true if this reference is conversational.
-     *
-     * @return true if this reference is conversational
-     */
-    boolean isConversational();
-
-    /**
-     * Returns the conversation associated with this reference.
-     * Returns null if no conversation is currently active.
-     *
-     * @return the conversation associated with this reference; may be null
-     */
-    Conversation getConversation();
-
-    /**
      * Returns the callback ID.
      *
      * @return the callback ID
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Conversation.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Conversation.java
deleted file mode 100644
index d4e4034eed..0000000000
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Conversation.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.oasisopen.sca;
-
-/**
- * Interface representing a Conversation providing access to the conversation id and and a mechanism
- * to terminate the conversation.
- * 
- * @version $Rev$ $Date$
- */
-public interface Conversation {
-    /**
-     * Returns the identifier for this conversation.
-     * If a user-defined identity had been supplied for this reference then its value will be returned;
-     * otherwise the identity generated by the system when the conversation was initiated will be returned.
-     *
-     * @return the identifier for this conversation
-     */
-    Object getConversationID();
-
-    /**
-     * End this conversation.
-     */
-    void end();
-}
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ConversationEndedException.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ConversationEndedException.java
deleted file mode 100644
index 72944d6dfc..0000000000
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ConversationEndedException.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.oasisopen.sca;
-
-/**
- * Exception thrown to indicate the conversation being used for a stateful interaction has been ended.
- *
- * @version $Rev$ $Date$
- */
-public class ConversationEndedException extends ServiceRuntimeException {
-    private static final long serialVersionUID = 3734864942222558406L;
-
-    /**
-     * Override constructor from ServiceRuntimeException.
-     *
-     * @see ServiceRuntimeException
-     */
-    public ConversationEndedException() {
-    }
-
-    /**
-     * Override constructor from ServiceRuntimeException.
-     *
-     * @param message passed to ServiceRuntimeException
-     * @see ServiceRuntimeException
-     */
-    public ConversationEndedException(String message) {
-        super(message);
-    }
-
-    /**
-     * Override constructor from ServiceRuntimeException.
-     *
-     * @param message passed to ServiceRuntimeException
-     * @param cause   passed to ServiceRuntimeException
-     * @see ServiceRuntimeException
-     */
-    public ConversationEndedException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * Override constructor from ServiceRuntimeException.
-     *
-     * @param cause passed to ServiceRuntimeException
-     * @see ServiceRuntimeException
-     */
-    public ConversationEndedException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceReference.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceReference.java
index 55d875a5f3..c8392edf36 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceReference.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceReference.java
@@ -16,22 +16,6 @@ package org.oasisopen.sca;
  */
 public interface ServiceReference<B> extends CallableReference<B> {
     /**
-     * Returns the id supplied by the user that will be associated with conversations initiated through this reference.
-     *
-     * @return the id to associated with any conversation initiated through this reference
-     */
-    Object getConversationID();
-
-    /**
-     * Set the id to associate with any conversation started through this reference.
-     * If the value supplied is null then the id will be generated by the implementation.
-     *
-     * @param conversationId the user-defined id to associated with a conversation
-     * @throws IllegalStateException if a conversation is currently associated with this reference
-     */
-    void setConversationID(Object conversationId) throws IllegalStateException;
-
-    /**
      * Sets the callback ID.
      *
      * @param callbackID the callback ID
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ConversationAttributes.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ConversationAttributes.java
deleted file mode 100644
index 498cc3eea3..0000000000
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ConversationAttributes.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.oasisopen.sca.annotation;
-
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate the characteristics of a conversation.
- *
- * @version $Rev$ $Date$
- */
-@Target(ElementType.TYPE)
-@Retention(RUNTIME)
-public @interface ConversationAttributes {
-    /**
-     * The maximum time that can pass between operations in a single conversation. If this time is exceeded the
-     * container may end the conversation.
-     *
-     * @return the maximum time that can pass between operations in a single conversation
-     */
-    String maxIdleTime() default "";
-
-    /**
-     * The maximum time that a conversation may remain active. If this time is exceeded the container may end the
-     * conversation.
-     *
-     * @return the maximum time that a conversation may remain active
-     */
-    String maxAge() default "";
-
-    /**
-     * If true, indicates that only the user that initiated the conversation has the authority to continue it.
-     *
-     * @return true if only the user that initiated the conversation has the authority to continue it
-     */
-    boolean singlePrincipal() default false;
-}
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ConversationID.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ConversationID.java
deleted file mode 100644
index 2cc62afdbf..0000000000
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ConversationID.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.oasisopen.sca.annotation;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate a field or method that is used to inject the conversation ID.
- *
- * @version $Rev$ $Date$
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface ConversationID {
-}
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Conversational.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Conversational.java
deleted file mode 100644
index 6a406f2acc..0000000000
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Conversational.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.oasisopen.sca.annotation;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Used on a Java interface to denote a conversational service contract.
- * <p/>
- * The draft spec erroneously defines the targets for this as {TYPE, METHOD, FIELD}
- * but this annotation is only applicable to interfaces.
- *
- * @version $Rev$ $Date$
- */
-@Target({TYPE})
-@Retention(RUNTIME)
-public @interface Conversational {
-}
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EndsConversation.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EndsConversation.java
deleted file mode 100644
index 4f58c50802..0000000000
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EndsConversation.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.oasisopen.sca.annotation;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate a method ends a conversation.
- *
- * @version $Rev$ $Date$
- */
-@Target({METHOD})
-@Retention(RUNTIME)
-public @interface EndsConversation {
-}