Change the name of OSGi remote service related properties

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

2 files changed, 5 insertions, 5 deletions

diff --git a/java/sca/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java b/java/sca/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
index 8bfa6772da..e484dc3e0b 100644
--- a/java/sca/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
+++ b/java/sca/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
@@ -59,9 +59,9 @@ public class CalculatorActivator implements BundleActivator {
         Dictionary<String, Object> props = new Hashtable<String, Object>();

         props.put("sca.service", "CalculatorComponent#service-name(Calculator)");

         props.put("calculator", "Calculator");

-        props.put("osgi.remote.configuration.type", "sca");

-        props.put("osgi.remote.configuration.sca.bindings", new String[] {"OSGI-INF/sca/calculator-service.bindings"});

-        props.put("osgi.remote.interfaces", new String[] {"*"});

+        props.put("service.exported.configs", new String[] {"sca"});

+        props.put("sca.bindings", new String[] {"OSGI-INF/sca/calculator-service.bindings"});

+        props.put("service.exported.interfaces", new String[] {"*"});

         logger.info("Registering " + CalculatorService.class.getName());

         CalculatorService calculator = new CalculatorServiceImpl(context);

         context.registerService(CalculatorService.class.getName(), calculator, props);

diff --git a/java/sca/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/java/sca/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
index 046e8cf565..276bcdc76f 100644
--- a/java/sca/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
+++ b/java/sca/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
@@ -47,9 +47,9 @@ public class CalculatorServiceImpl implements CalculatorService {
         Filter remoteFilter = null, localFilter = null;

         try {

             remoteFilter =

-                context.createFilter("(&(" + OBJECTCLASS + "=calculator.dosgi.operations.*) (sca.reference=*))");

+                context.createFilter("(&(" + OBJECTCLASS + "=calculator.dosgi.operations.*) (service.imported=*))");

             localFilter =

-                context.createFilter("(&(" + OBJECTCLASS + "=calculator.dosgi.operations.*) (!(sca.reference=*)))");

+                context.createFilter("(&(" + OBJECTCLASS + "=calculator.dosgi.operations.*) (!(service.imported=*)))");

         } catch (InvalidSyntaxException e) {

             e.printStackTrace();

         }