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

2 files changed, 0 insertions, 46 deletions

diff --git a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
index 8e90ddb577..a5513a0c3c 100644
--- a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
+++ b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
@@ -21,7 +21,6 @@ package org.apache.tuscany.sca.implementation.java.invocation;
 import java.lang.annotation.ElementType;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
-import java.lang.reflect.Member;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
@@ -53,8 +52,6 @@ import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
 import org.apache.tuscany.sca.implementation.java.JavaConstructorImpl;
 import org.apache.tuscany.sca.implementation.java.JavaElementImpl;
 import org.apache.tuscany.sca.implementation.java.JavaResourceImpl;
-import org.apache.tuscany.sca.implementation.java.injection.ConversationIDObjectFactory;
-import org.apache.tuscany.sca.implementation.java.injection.InvalidAccessorException;
 import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
 import org.apache.tuscany.sca.implementation.java.introspect.JavaIntrospectionHelper;
 import org.apache.tuscany.sca.interfacedef.Operation;
@@ -64,7 +61,6 @@ import org.apache.tuscany.sca.runtime.RuntimeComponent;
 import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
 import org.apache.tuscany.sca.runtime.RuntimeWire;
 import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.annotation.ConversationID;
 
 /**
  * The runtime instantiation of Java component implementations
@@ -275,24 +271,6 @@ public class JavaComponentContextProvider {
         instanceFactoryProvider.setObjectFactory(resource.getElement(), factory);
     }
 
-    void addConversationIDFactories(List<Member> names) {
-        ObjectFactory<String> factory = new ConversationIDObjectFactory();
-        for (Member name : names) {
-            if (name instanceof Field) {
-                JavaElementImpl element = new JavaElementImpl((Field)name);
-                element.setClassifer(ConversationID.class);
-                instanceFactoryProvider.setObjectFactory(element, factory);
-            } else if (name instanceof Method) {
-                JavaElementImpl element = new JavaElementImpl((Method)name, 0);
-                element.setName(JavaIntrospectionHelper.toPropertyName(name.getName()));
-                element.setClassifer(ConversationID.class);
-                instanceFactoryProvider.setObjectFactory(element, factory);
-            } else {
-                throw new InvalidAccessorException("Member must be a field or method: " + name.getName());
-            }
-        }
-    }
-
     Object createInstance() throws ObjectCreationException {
         return createInstanceWrapper().getInstance();
     }
diff --git a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
index 9f716c8059..55765ef6e4 100644
--- a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
+++ b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
@@ -21,7 +21,6 @@ package org.apache.tuscany.sca.implementation.java.invocation;
 
 import java.lang.reflect.Method;
 
-import org.apache.tuscany.sca.assembly.Service;
 import org.apache.tuscany.sca.context.ComponentContextFactory;
 import org.apache.tuscany.sca.context.PropertyValueFactory;
 import org.apache.tuscany.sca.context.RequestContextFactory;
@@ -78,29 +77,6 @@ public class JavaImplementationProvider implements ScopedImplementationProvider
 
             Scope scope = getScope();
 
-            if (scope == Scope.SYSTEM || scope == Scope.COMPOSITE) {
-                // Nothing
-            } else {
-                // Check for conversational contract if conversational scope
-                if (scope == Scope.CONVERSATION) {
-                    boolean hasConversationalContract = false;
-                    for (Service serviceDef : implementation.getServices()) {
-                        if (serviceDef.getInterfaceContract().getInterface().isConversational()) {
-                            hasConversationalContract = true;
-                            break;
-                        }
-                    }
-                    if (!hasConversationalContract) {
-                        String name = implementation.getJavaClass().getName();
-                        throw new NoConversationalContractException(name);
-                    }
-                }
-            }
-
-            if (implementation.getConversationIDMembers().size() > 0) {
-                componentContextProvider.addConversationIDFactories(implementation.getConversationIDMembers());
-            }
-
             componentContextProvider.configureProperties(component.getProperties());
             handleResources(implementation, proxyService);
         } catch (Exception e) {