TUSCANY-3138: Start of the changes to use the latest spec APIs with the removal of CallableReference. BUild works cleanly for me with this but callbacks don't work yet so all callback tests are commented out or @Ignored with a reference to TUSCANY-3138. Commiting it now so Simon can start helping to finish the code

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

3 files changed, 6 insertions, 6 deletions

diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java
index 31a92f35bc..ce4a0ef928 100644
--- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java
+++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java
@@ -41,7 +41,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.logging.Logger;
 
-import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.ServiceReference;
 
 /**
  * Implements various reflection-related operations
@@ -372,7 +372,7 @@ public final class JavaIntrospectionHelper {
     }
 
     public static Class<?> getBusinessInterface(Class<?> cls, Type callableReferenceType) {
-        if (CallableReference.class.isAssignableFrom(cls) && callableReferenceType instanceof ParameterizedType) {
+        if (ServiceReference.class.isAssignableFrom(cls) && callableReferenceType instanceof ParameterizedType) {
             // Collection<BaseType>
             ParameterizedType parameterizedType = (ParameterizedType)callableReferenceType;
             Type baseType = parameterizedType.getActualTypeArguments()[0];
diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
index 2374b6ba7c..57d014fd99 100644
--- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
+++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
@@ -41,7 +41,7 @@ import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.ServiceReference;
 import org.oasisopen.sca.annotation.Reference;
 
 /**
@@ -191,7 +191,7 @@ public class ReferenceProcessor extends BaseJavaClassVisitor {
         }
         Type genericType = element.getGenericType();
         Class<?> baseType = getBaseType(rawType, genericType);
-        if (CallableReference.class.isAssignableFrom(baseType)) {
+        if (ServiceReference.class.isAssignableFrom(baseType)) {
             if (Collection.class.isAssignableFrom(rawType)) {
                 genericType = JavaIntrospectionHelper.getParameterType(genericType);
             }
diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
index 68f90a5be5..71a711261f 100644
--- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
+++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
@@ -41,7 +41,7 @@ import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.ServiceReference;
 import org.oasisopen.sca.annotation.Callback;
 import org.oasisopen.sca.annotation.Remotable;
 
@@ -168,7 +168,7 @@ public class ServiceProcessor extends BaseJavaClassVisitor {
         Class<?> callbackClass = element.getType();
         Type genericType = element.getGenericType();
         Class<?> baseType = callbackClass;
-        if(CallableReference.class.isAssignableFrom(baseType)) {
+        if(ServiceReference.class.isAssignableFrom(baseType)) {
             // @Callback protected CallableReference<MyCallback> callback;
             // The base type will be MyCallback
             baseType = JavaIntrospectionHelper.getBusinessInterface(baseType, genericType);