Rename ServicePublication, service constants, and service endpoint description

8 files changed, 28 insertions, 37 deletions

diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/.classpath b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/.classpath
index 2fbb7a23e..64c5e31b7 100644
--- a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/.classpath
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/.settings/org.eclipse.jdt.core.prefs b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/.settings/org.eclipse.jdt.core.prefs
index dc4a2fa96..fb32a05dd 100644
--- a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
-#Fri Mar 13 09:53:05 CET 2009
+#Thu Apr 09 21:01:23 PDT 2009
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/META-INF/MANIFEST.MF b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/META-INF/MANIFEST.MF
index 9fd8dab34..d2240658c 100644
--- a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/META-INF/MANIFEST.MF
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/META-INF/MANIFEST.MF
@@ -5,22 +5,20 @@ Bundle-SymbolicName: org.eclipse.ecf.tests.osgi.services.distribution
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.ecf.tests.internal.osgi.services.distribution.Activator
 Bundle-Vendor: %plugin.provider
-Bundle-RequiredExecutionEnvironment: J2SE-1.4,
- J2SE-1.5
-Import-Package: org.osgi.framework;version="1.3.0",
- org.osgi.service.discovery;version="1.0.0",
- org.osgi.service.distribution;version="1.0.0",
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Import-Package: org.eclipse.core.runtime;version="3.4.0",
+ org.osgi.framework,
  org.osgi.util.tracker;version="1.4.2"
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ecf.tests;bundle-version="2.0.0",
+Require-Bundle: org.eclipse.ecf.tests,
  org.eclipse.ecf.osgi.services.distribution;bundle-version="1.0.0",
  org.eclipse.ecf.remoteservice;bundle-version="3.0.0",
  org.eclipse.ecf;bundle-version="3.0.0",
  org.eclipse.ecf.tests.remoteservice;bundle-version="2.0.0",
  org.eclipse.ecf.osgi.services.discovery;bundle-version="1.0.0",
- org.junit;bundle-version="3.8.2",
- org.eclipse.equinox.common;bundle-version="3.5.0"
+ org.eclipse.ecf.osgi.services;bundle-version="4.2.0",
+ org.junit
 Export-Package: org.eclipse.ecf.tests.internal.osgi.services.distribution;x-internal:=true,
  org.eclipse.ecf.tests.osgi.services.distribution,
  org.eclipse.ecf.tests.osgi.services.distribution.generic,
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractDistributionTest.java b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractDistributionTest.java
index ff327124a..cb60e35de 100644
--- a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractDistributionTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractDistributionTest.java
@@ -14,8 +14,8 @@ import java.util.Enumeration;
 import java.util.Properties;
 
 import org.eclipse.ecf.core.identity.ID;
-import org.eclipse.ecf.osgi.services.discovery.ECFServicePublication;
-import org.eclipse.ecf.osgi.services.distribution.ECFServiceConstants;
+import org.eclipse.ecf.osgi.services.discovery.IServicePublication;
+import org.eclipse.ecf.osgi.services.distribution.IServiceConstants;
 import org.eclipse.ecf.remoteservice.IRemoteService;
 import org.eclipse.ecf.remoteservice.IRemoteServiceContainerAdapter;
 import org.eclipse.ecf.remoteservice.IRemoteServiceListener;
@@ -27,10 +27,11 @@ import org.eclipse.ecf.tests.internal.osgi.services.distribution.Activator;
 import org.eclipse.ecf.tests.remoteservice.IConcatService;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
 
 public abstract class AbstractDistributionTest extends
-		ContainerAbstractTestCase implements ECFServiceConstants, ECFServicePublication {
+		ContainerAbstractTestCase implements IServiceConstants, IServicePublication {
 
 	protected IRemoteServiceContainerAdapter[] adapters = null;
 
@@ -161,6 +162,8 @@ public abstract class AbstractDistributionTest extends
 		return registerService(getDefaultServiceClasses(), getDefaultService(), props);
 	}
 	
-
+	public ServiceReference getReference() {
+		return null;
+	}
 
 }
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 29cb9e2b4..94dd05249 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
@@ -13,11 +13,12 @@ import java.util.Collection;
 import java.util.Dictionary;
 import java.util.Hashtable;
 
+import junit.framework.TestCase;
+
 import org.eclipse.ecf.core.IContainer;
 import org.eclipse.ecf.core.IContainerManager;
-import org.eclipse.ecf.osgi.services.discovery.ECFServicePublication;
-import org.eclipse.ecf.osgi.services.distribution.ECFServiceConstants;
-import org.eclipse.ecf.tests.ECFAbstractTestCase;
+import org.eclipse.ecf.osgi.services.discovery.IServicePublication;
+import org.eclipse.ecf.osgi.services.distribution.IServiceConstants;
 import org.eclipse.ecf.tests.internal.osgi.services.distribution.Activator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
@@ -25,7 +26,7 @@ import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.discovery.ServicePublication;
 import org.osgi.util.tracker.ServiceTracker;
 
-public abstract class AbstractServicePublicationTest extends ECFAbstractTestCase implements ECFServiceConstants, ECFServicePublication {
+public abstract class AbstractServicePublicationTest extends TestCase implements IServiceConstants, IServicePublication {
 
 	protected static void assertStringsEqual(final String[] s1, final String[] s2) {
 		assertEquals(s1.length, s2.length);
@@ -42,7 +43,7 @@ public abstract class AbstractServicePublicationTest extends ECFAbstractTestCase
 	protected abstract IContainer createContainer() throws Exception;
 	protected abstract String[] createInterfaces() throws Exception;
 
-	private ServiceReference reference;
+	protected ServiceReference reference;
 	
 	public ServiceReference getReference() {
 		return reference;
@@ -101,7 +102,7 @@ public abstract class AbstractServicePublicationTest extends ECFAbstractTestCase
 	
 		// register a service with the marker property set
 		final Dictionary props = new Hashtable();
-		props.put(ECFServiceConstants.OSGI_REMOTE_INTERFACES, getInterfaces());
+		props.put(IServiceConstants.OSGI_REMOTE_INTERFACES, getInterfaces());
 		// prepare a service tracker
 		final ServiceTracker tracker = new ServiceTracker(context,
 				TestServiceInterface1.class.getName(), null);
@@ -112,7 +113,7 @@ public abstract class AbstractServicePublicationTest extends ECFAbstractTestCase
 				new TestService1(), props);
 	
 		// wait for service to become registered
-		tracker.waitForService(1000);
+		tracker.waitForService(10000);
 	
 		// expected behavior: an endpoint is published
 		final ServiceReference ref = context
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/DistributionProviderTest.java b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/DistributionProviderTest.java
index 83df61d53..c2c854d74 100644
--- a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/DistributionProviderTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/DistributionProviderTest.java
@@ -10,13 +10,14 @@
  *****************************************************************************/
 package org.eclipse.ecf.tests.osgi.services.distribution;
 
+import org.eclipse.ecf.osgi.services.distribution.IServiceConstants;
 import org.eclipse.ecf.tests.ECFAbstractTestCase;
 import org.eclipse.ecf.tests.internal.osgi.services.distribution.Activator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.distribution.DistributionProvider;
 
-public class DistributionProviderTest extends ECFAbstractTestCase {
+public class DistributionProviderTest extends ECFAbstractTestCase implements IServiceConstants {
 
 	public void testDistributionProvider() throws Exception {
 		final BundleContext context = Activator.getDefault().getContext();
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/generic/GenericServicePublicationTest.java b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/generic/GenericServicePublicationTest.java
index d7382894d..8ecf234df 100644
--- a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/generic/GenericServicePublicationTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/generic/GenericServicePublicationTest.java
@@ -15,7 +15,6 @@ import org.eclipse.ecf.core.ContainerFactory;
 import org.eclipse.ecf.core.IContainer;
 import org.eclipse.ecf.tests.osgi.services.distribution.AbstractServicePublicationTest;
 import org.eclipse.ecf.tests.osgi.services.distribution.TestServiceInterface1;
-import org.osgi.framework.ServiceReference;
 
 public class GenericServicePublicationTest extends AbstractServicePublicationTest {
 
@@ -27,9 +26,4 @@ public class GenericServicePublicationTest extends AbstractServicePublicationTes
 		return new String[] { TestServiceInterface1.class.getName() };
 	}
 
-	public ServiceReference getReference() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
 }
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/generic/GenericServiceRegisterTest.java b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/generic/GenericServiceRegisterTest.java
index 146f82e06..771b38397 100644
--- a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/generic/GenericServiceRegisterTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/generic/GenericServiceRegisterTest.java
@@ -11,7 +11,6 @@ package org.eclipse.ecf.tests.osgi.services.distribution.generic;
 
 
 import org.eclipse.ecf.tests.osgi.services.distribution.AbstractServiceRegisterTest;
-import org.osgi.framework.ServiceReference;
 
 
 public class GenericServiceRegisterTest extends AbstractServiceRegisterTest {
@@ -40,10 +39,5 @@ public class GenericServiceRegisterTest extends AbstractServiceRegisterTest {
 	}
 
 
-	public ServiceReference getReference() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
 
 }