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

2 files changed, 2 insertions, 4 deletions

diff --git a/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Client.java b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Client.java
index 84c1e09126..3c740d89a4 100644
--- a/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Client.java
+++ b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Client.java
@@ -19,7 +19,6 @@
 
 package org.apache.tuscany.sca.node;
 
-import org.oasisopen.sca.CallableReference;
 import org.oasisopen.sca.ServiceReference;
 
 
@@ -43,7 +42,7 @@ public interface Client {
      * @throws IllegalArgumentException if the supplied instance is not a
      *             reference supplied by the SCA runtime
      */
-    <B, R extends CallableReference<B>> R cast(B target) throws IllegalArgumentException;
+    <B, R extends ServiceReference<B>> R cast(B target) throws IllegalArgumentException;
 
     /**
      * Returns a proxy for a service provided by a component in the SCA domain.
diff --git a/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
index 32fd3a1635..a92dbdb03b 100644
--- a/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
+++ b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
@@ -39,7 +39,6 @@ import java.util.Map.Entry;
 import org.apache.tuscany.sca.node.configuration.DefaultNodeConfigurationFactory;
 import org.apache.tuscany.sca.node.configuration.NodeConfiguration;
 import org.apache.tuscany.sca.node.configuration.NodeConfigurationFactory;
-import org.oasisopen.sca.CallableReference;
 import org.oasisopen.sca.ServiceReference;
 import org.oasisopen.sca.ServiceRuntimeException;
 
@@ -85,7 +84,7 @@ public abstract class NodeFactory extends DefaultNodeConfigurationFactory {
             }
         }
 
-        public <B, R extends CallableReference<B>> R cast(B target) throws IllegalArgumentException {
+        public <B, R extends ServiceReference<B>> R cast(B target) throws IllegalArgumentException {
             try {
                 return (R)node.getClass().getMethod("cast", Object.class).invoke(node, target);
             } catch (Throwable e) {