Replace CallableReference with ServiceReference to avoid compilation errors

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

2 files changed, 7 insertions, 7 deletions

diff --git a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
index bdac56d222..44f57b4316 100644
--- a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
+++ b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
@@ -18,9 +18,9 @@
  */
 package org.apache.tuscany.sca.test;
 
-import org.oasisopen.sca.CallableReference;
 import org.oasisopen.sca.ComponentContext;
 import org.oasisopen.sca.RequestContext;
+import org.oasisopen.sca.ServiceReference;
 import org.oasisopen.sca.annotation.Callback;
 import org.oasisopen.sca.annotation.Context;
 import org.oasisopen.sca.annotation.Service;
@@ -36,7 +36,7 @@ public class CallBackApiServiceImpl implements CallBackApiService {
     private CallBackApiCallBack callback;
 
     @Callback
-    protected CallableReference<CallBackApiCallBack> callbackRef;
+    protected ServiceReference<CallBackApiCallBack> callbackRef;
 
     /**
      * This function get an object of CallBackApiServiceImpl by calling getCallBackInterface function and calls the
diff --git a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
index b40fb7f8e6..bec98a49c9 100644
--- a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
+++ b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
@@ -25,7 +25,7 @@ import java.util.TimerTask;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.ServiceReference;
 import org.oasisopen.sca.annotation.Callback;
 import org.oasisopen.sca.annotation.Destroy;
 import org.oasisopen.sca.annotation.Scope;
@@ -42,12 +42,12 @@ public class EventProcessorServiceImpl implements EventProcessorService {
      * Reference to the call back
      */
     @Callback
-    protected CallableReference<EventProcessorCallBack> clientCallback;
+    protected ServiceReference<EventProcessorCallBack> clientCallback;
 
     /**
      * This map contains the call backs for each of the registered Event names
      */
-    private final Map<String, CallableReference<EventProcessorCallBack>> eventListeners;
+    private final Map<String, ServiceReference<EventProcessorCallBack>> eventListeners;
 
     /**
      * The list of all Event Generators we create
@@ -58,7 +58,7 @@ public class EventProcessorServiceImpl implements EventProcessorService {
      * Constructor. Starts the Event Generators
      */
     public EventProcessorServiceImpl() {
-        eventListeners = new ConcurrentHashMap<String, CallableReference<EventProcessorCallBack>>();
+        eventListeners = new ConcurrentHashMap<String, ServiceReference<EventProcessorCallBack>>();
 
         // We will simulate an Event generator
         allEventGenerators = new EventGenerator[2];
@@ -99,7 +99,7 @@ public class EventProcessorServiceImpl implements EventProcessorService {
      */
     private void receiveEvent(String aEventName, Object aEventData) {
         // Get the listener for the Event
-        final CallableReference<EventProcessorCallBack> callback = eventListeners.get(aEventName);
+        final ServiceReference<EventProcessorCallBack> callback = eventListeners.get(aEventName);
         if (callback == null) {
             //System.out.println("No registered listeners for " + aEventName);
             return;