Changes for support of progress on bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=290446

2 files changed, 7 insertions, 7 deletions

diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractServicePublicationTest.java b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractServicePublicationTest.java
index d17847a04..955b5f247 100644
--- a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractServicePublicationTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractServicePublicationTest.java
@@ -102,7 +102,7 @@ public abstract class AbstractServicePublicationTest extends TestCase implements
 	
 		// register a service with the marker property set
 		final Dictionary props = new Hashtable();
-		props.put(IDistributionConstants.REMOTE_INTERFACES, getInterfaces());
+		props.put(IDistributionConstants.SERVICE_EXPORTED_INTERFACES, getInterfaces());
 		// prepare a service tracker
 		final ServiceTracker tracker = new ServiceTracker(context,
 				TestServiceInterface1.class.getName(), null);
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractServiceRegisterTest.java b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractServiceRegisterTest.java
index e71a3a99c..8790a6053 100644
--- a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractServiceRegisterTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractServiceRegisterTest.java
@@ -39,7 +39,7 @@ public abstract class AbstractServiceRegisterTest extends
 		props.put(Constants.SERVICE_CONTAINER_ID, serverContainer.getID());
 		
 		// Set OSGI property that identifies this service as a service to be remoted
-		props.put(REMOTE_INTERFACES, new String[] {REMOTE_INTERFACES_WILDCARD});
+		props.put(SERVICE_EXPORTED_INTERFACES, new String[] {SERVICE_EXPORTED_INTERFACES_WILDCARD});
 		// Actually register with default service (IConcatService)
 		ServiceRegistration registration = registerDefaultService(props);
 		// Wait a while
@@ -50,7 +50,7 @@ public abstract class AbstractServiceRegisterTest extends
 	}
 
 	protected ServiceTracker createProxyServiceTracker(String clazz) throws InvalidSyntaxException {
-		ServiceTracker st = new ServiceTracker(getContext(),getContext().createFilter("(&("+org.osgi.framework.Constants.OBJECTCLASS+"=" + clazz +")(" + REMOTE + "=*))"),new ServiceTrackerCustomizer() {
+		ServiceTracker st = new ServiceTracker(getContext(),getContext().createFilter("(&("+org.osgi.framework.Constants.OBJECTCLASS+"=" + clazz +")(" + SERVICE_IMPORTED + "=*))"),new ServiceTrackerCustomizer() {
 
 			public Object addingService(ServiceReference reference) {
 				Trace.trace(Activator.PLUGIN_ID, "addingService="+reference);
@@ -83,7 +83,7 @@ public abstract class AbstractServiceRegisterTest extends
 		IContainer serverContainer = getServer();
 		props.put(Constants.SERVICE_CONTAINER_ID, serverContainer.getID());
 		// Set required OSGI property that identifies this service as a service to be remoted
-		props.put(REMOTE_INTERFACES, new String[] {REMOTE_INTERFACES_WILDCARD});
+		props.put(SERVICE_EXPORTED_INTERFACES, new String[] {SERVICE_EXPORTED_INTERFACES_WILDCARD});
 		// Put property foo with value bar into published properties
 		String testPropKey = "foo";
 		String testPropVal = "bar";
@@ -126,7 +126,7 @@ public abstract class AbstractServiceRegisterTest extends
 		IContainer serverContainer = getServer();
 		props.put(Constants.SERVICE_CONTAINER_ID, serverContainer.getID());
 		// Set required OSGI property that identifies this service as a service to be remoted
-		props.put(REMOTE_INTERFACES, new String[] {REMOTE_INTERFACES_WILDCARD});
+		props.put(SERVICE_EXPORTED_INTERFACES, new String[] {SERVICE_EXPORTED_INTERFACES_WILDCARD});
 		// Actually register and wait a while
 		ServiceRegistration registration = registerService(classname, new TestService1(),props);
 		Thread.sleep(REGISTER_WAIT);
@@ -165,7 +165,7 @@ public abstract class AbstractServiceRegisterTest extends
 		IContainer serverContainer = getServer();
 		props.put(Constants.SERVICE_CONTAINER_ID, serverContainer.getID());
 		// Set required OSGI property that identifies this service as a service to be remoted
-		props.put(REMOTE_INTERFACES, new String[] {REMOTE_INTERFACES_WILDCARD});
+		props.put(SERVICE_EXPORTED_INTERFACES, new String[] {SERVICE_EXPORTED_INTERFACES_WILDCARD});
 		// Actually register and wait a while
 		ServiceRegistration registration = registerService(classname, new TestService1(),props);
 		Thread.sleep(REGISTER_WAIT);
@@ -176,7 +176,7 @@ public abstract class AbstractServiceRegisterTest extends
 		assertTrue(remoteReferences.length > 0);
 		
 		for(int i=0; i < remoteReferences.length; i++) {
-			Object o = remoteReferences[i].getProperty(REMOTE);
+			Object o = remoteReferences[i].getProperty(SERVICE_IMPORTED);
 			assertNotNull(o);
 			assertTrue(o instanceof IRemoteService);
 			IRemoteService rs = (IRemoteService) o;