Merge "Remove archive directory"

9 files changed, 0 insertions, 858 deletions

diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/AllTests.java b/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/AllTests.java
deleted file mode 100644
index 98d77368a..000000000
--- a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/AllTests.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.eclipse.ecf.tests.provider.discovery;
-
-import org.eclipse.ecf.tests.discovery.RndStatsTestCase;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests extends RndStatsTestCase {
-
-	private static final boolean IS_ON = Boolean
-			.getBoolean("org.eclipse.ecf.tests.provider.discovery.AllTests.isOn");
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite(AllTests.class.getName());
-
-		if (!IS_ON) {
-			return suite;
-		}
-		
-		//$JUnit-BEGIN$
-		//suite.addTestSuite(CompositeDiscoveryContainerTest.class);
-		//suite.addTestSuite(CompositeDiscoveryContainerWithoutRegTest.class);
-		//suite.addTestSuite(CompositeDiscoveryServiceContainerTest.class);
-		//suite.addTestSuite(WithoutJMDNSCompositeDiscoveryServiceContainerTest.class);
-		//suite.addTestSuite(WithoutJSLPCompositeDiscoveryServiceContainerTest.class);
-		//$JUnit-END$
-		
-		// Since using randomized tests, turn on proper cleanup
-		SingleCompositeDiscoveryServiceContainerTest.SETUP_OSGI_HOOKS_PER_TEST = true;
-		
-		return RndStatsTestCase.suite(suite);
-	}
-}
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/CompositeDiscoveryContainerTest.java b/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/CompositeDiscoveryContainerTest.java
deleted file mode 100644
index f9fd8405f..000000000
--- a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/CompositeDiscoveryContainerTest.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2009 Markus Alexander Kuppe.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * Contributors:
- *     Markus Alexander Kuppe (ecf-dev_eclipse.org <at> lemmster <dot> de) - initial API and implementation
- *
- * SPDX-License-Identifier: EPL-2.0
- *****************************************************************************/
-package org.eclipse.ecf.tests.provider.discovery;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.ecf.core.ContainerConnectException;
-import org.eclipse.ecf.core.IContainer;
-import org.eclipse.ecf.core.events.IContainerEvent;
-import org.eclipse.ecf.core.identity.ID;
-import org.eclipse.ecf.core.util.ECFRuntimeException;
-import org.eclipse.ecf.discovery.IServiceEvent;
-import org.eclipse.ecf.discovery.IServiceInfo;
-import org.eclipse.ecf.discovery.identity.IServiceTypeID;
-import org.eclipse.ecf.provider.discovery.CompositeDiscoveryContainer;
-import org.eclipse.ecf.provider.discovery.CompositeServiceContainerEvent;
-import org.eclipse.ecf.tests.discovery.DiscoveryContainerTest;
-import org.eclipse.ecf.tests.discovery.listener.TestServiceListener;
-
-public class CompositeDiscoveryContainerTest extends DiscoveryContainerTest {
-
-	private TestDiscoveryContainer testDiscoveryContainer;
-
-	public CompositeDiscoveryContainerTest() {
-		super(CompositeDiscoveryContainer.NAME);
-		setComparator(new CompositeServiceInfoComporator());
-		//TODO  jSLP currently has the longer rediscovery interval
-		setWaitTimeForProvider(Long.parseLong(System.getProperty("net.slp.rediscover", new Long(60L * 1000L).toString()))); //$NON-NLS-1$);
-		//TODO-mkuppe https://bugs.eclipse.org/bugs/show_bug.cgi?id=218308
-		setScope(IServiceTypeID.DEFAULT_SCOPE[0]);
-		setHostname(System.getProperty("net.mdns.interface", "127.0.0.1"));
-	}
-	
-//	/* (non-Javadoc)
-//	 * @see org.eclipse.ecf.tests.discovery.DiscoveryTest#setUp()
-//	 */
-//	protected void setUp() throws Exception {
-//		super.setUp();
-//		eventsToExpect = ((CompositeDiscoveryContainer) discoveryLocator).getDiscoveryContainers().size();
-//	}
-//
-//	/**
-//	 * Check if 
-//	 * @throws ContainerConnectException 
-//	 */
-//	public void testAddContainerWithRegisteredServices() throws ContainerConnectException {
-//		try {
-//			try {
-//				discoveryAdvertiser.registerService(serviceInfo);
-//			} catch (ECFRuntimeException e) {
-//				fail("Registering a service failed on a new IDCA");
-//			}
-//			CompositeDiscoveryContainer cdc = (CompositeDiscoveryContainer) discoveryLocator;
-//			testDiscoveryContainer = new TestDiscoveryContainer();
-//			assertTrue(cdc.addContainer(testDiscoveryContainer));
-//			List registeredServices = testDiscoveryContainer.getRegisteredServices();
-//			assertEquals("registerService(aService) wasn't called on TestDiscoveryContainer", serviceInfo, registeredServices.get(0));
-//		} finally {
-//			CompositeDiscoveryContainer cdc = (CompositeDiscoveryContainer) discoveryLocator;
-//			cdc.removeContainer(testDiscoveryContainer);
-//		}
-//	}
-//
-//	public void testAddContainerWithoutRegisteredServices() throws ContainerConnectException {
-//		try {
-//			try {
-//				discoveryAdvertiser.registerService(serviceInfo);
-//				discoveryAdvertiser.unregisterService(serviceInfo);
-//			} catch (ECFRuntimeException e) {
-//				fail("Re-/Unregistering a service failed on a new IDCA");
-//			}
-//			CompositeDiscoveryContainer cdc = (CompositeDiscoveryContainer) discoveryLocator;
-//			testDiscoveryContainer = new TestDiscoveryContainer();
-//			assertTrue(cdc.addContainer(testDiscoveryContainer));
-//			List registeredServices = testDiscoveryContainer.getRegisteredServices();
-//			assertTrue(registeredServices.isEmpty());
-//		} finally {
-//			CompositeDiscoveryContainer cdc = (CompositeDiscoveryContainer) discoveryLocator;
-//			cdc.removeContainer(testDiscoveryContainer);
-//		}
-//	}
-//
-//	protected void addServiceListener(TestServiceListener serviceListener) {
-//		discoveryLocator.addServiceListener(serviceListener);
-//		addListenerRegisterAndWait(serviceListener, serviceInfo);
-//		discoveryLocator.removeServiceListener(serviceListener);
-//
-//		// make sure we use a live container;
-//		final IContainer ic = (IContainer) serviceListener.getLocator();
-//		assertTrue(ic.getConnectedID() != null);
-//		
-//		// check if we received correct amount of events
-//		final IContainerEvent[] events = serviceListener.getEvent();
-//		assertNotNull("Test listener didn't receive any discovery events.", events);
-//		assertEquals("Test listener received unexpected amount of discovery events: \n\t" + Arrays.asList(events), eventsToExpect, events.length);
-//		
-//		final List origContainers = new ArrayList();
-//		for (int i = 0; i < events.length; i++) {
-//			final CompositeServiceContainerEvent event = (CompositeServiceContainerEvent) events[i];
-//
-//			// check if the local container is hidden correctly
-//			final ID localContainerId = event.getLocalContainerID();
-//			final ID connectedId = container.getConnectedID();
-//			assertEquals(localContainerId, connectedId);
-//			
-//			// check the IServiceInfo for correct fields/properties
-//			final IServiceInfo serviceInfo2 = ((IServiceEvent) event).getServiceInfo();
-//			assertTrue("IServiceInfo should match, expected:\n\t" + serviceInfo + " but was \n\t" + serviceInfo2, comparator.compare(serviceInfo2, serviceInfo) == 0);
-//			
-//			// add the underlying discovery container the the result set
-//			origContainers.add(event.getOriginalLocalContainerID());
-//		}
-//		// check that all underlying containers fired an event
-//		assertEquals("A nested container didn't send an event, but another multiple.", eventsToExpect, origContainers.size());
-//	}
-	
-}
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/CompositeDiscoveryContainerWithoutRegTest.java b/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/CompositeDiscoveryContainerWithoutRegTest.java
deleted file mode 100644
index 150129db2..000000000
--- a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/CompositeDiscoveryContainerWithoutRegTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2009 Markus Alexander Kuppe.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * Contributors:
- *     Markus Alexander Kuppe (ecf-dev_eclipse.org <at> lemmster <dot> de) - initial API and implementation
- *
- * SPDX-License-Identifier: EPL-2.0
- *****************************************************************************/
-package org.eclipse.ecf.tests.provider.discovery;
-
-import org.eclipse.ecf.provider.discovery.CompositeDiscoveryContainer;
-import org.eclipse.ecf.tests.discovery.DiscoveryTestsWithoutRegister;
-
-public class CompositeDiscoveryContainerWithoutRegTest extends
-		DiscoveryTestsWithoutRegister {
-
-//	public CompositeDiscoveryContainerWithoutRegTest() {
-//		super(CompositeDiscoveryContainer.NAME);
-//	}
-
-}
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/CompositeDiscoveryServiceContainerTest.java b/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/CompositeDiscoveryServiceContainerTest.java
deleted file mode 100644
index e324eefb4..000000000
--- a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/CompositeDiscoveryServiceContainerTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2009 Markus Alexander Kuppe.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * Contributors:
- *     Markus Alexander Kuppe (ecf-dev_eclipse.org <at> lemmster <dot> de) - initial API and implementation
- *
- * SPDX-License-Identifier: EPL-2.0
- *****************************************************************************/
-package org.eclipse.ecf.tests.provider.discovery;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.ecf.core.IContainer;
-import org.eclipse.ecf.core.events.IContainerEvent;
-import org.eclipse.ecf.core.identity.ID;
-import org.eclipse.ecf.discovery.IDiscoveryLocator;
-import org.eclipse.ecf.discovery.IServiceEvent;
-import org.eclipse.ecf.discovery.IServiceInfo;
-import org.eclipse.ecf.discovery.identity.IServiceTypeID;
-import org.eclipse.ecf.provider.discovery.CompositeDiscoveryContainer;
-import org.eclipse.ecf.provider.discovery.CompositeServiceContainerEvent;
-import org.eclipse.ecf.tests.discovery.DiscoveryServiceTest;
-import org.eclipse.ecf.tests.discovery.listener.TestServiceListener;
-
-public class CompositeDiscoveryServiceContainerTest extends
-		DiscoveryServiceTest {
-
-//	private IContainer container;
-//
-//	public CompositeDiscoveryServiceContainerTest() {
-//		super("ecf.discovery.composite");
-//		setComparator(new CompositeServiceInfoComporator());
-//		//TODO  jSLP currently has the longer rediscovery interval
-//		setWaitTimeForProvider(Long.parseLong(System.getProperty("net.slp.rediscover", new Long(60L * 1000L).toString()))); //$NON-NLS-1$);
-//		//TODO-mkuppe https://bugs.eclipse.org/bugs/show_bug.cgi?id=218308
-//		setScope(IServiceTypeID.DEFAULT_SCOPE[0]);
-//		setHostname(System.getProperty("net.mdns.interface", "127.0.0.1"));
-//	}
-//
-//	/* (non-Javadoc)
-//	 * @see org.eclipse.ecf.tests.discovery.DiscoveryServiceTest#setUp()
-//	 */
-//	protected void setUp() throws Exception {
-//		super.setUp();
-//		container = (IContainer) discoveryLocator;  
-//		
-//		final Collection discoveryContainers = ((CompositeDiscoveryContainer) discoveryLocator)
-//				.getDiscoveryContainers();
-//		final Set s = new HashSet();
-//		for (final Iterator itr = discoveryContainers.iterator(); itr.hasNext();) {
-//			final IDiscoveryLocator object = (IDiscoveryLocator) itr.next();
-//			final IContainer adapter = (IContainer) object
-//					.getAdapter(IContainer.class);
-//			s.add(adapter.getID());
-//		}
-//		// make sure it's never (accidentally) modified by a test
-//		idsToExpect = Collections.unmodifiableSet(s);
-//		
-//		eventsToExpect = discoveryContainers.size();
-//		
-//		assertTrue("zero events make no sense", eventsToExpect > 0);
-//	}
-//
-//	protected void addServiceListener(TestServiceListener serviceListener) {
-//		discoveryLocator.addServiceListener(serviceListener);
-//		addListenerRegisterAndWait(serviceListener, serviceInfo);
-//		discoveryLocator.removeServiceListener(serviceListener);
-//
-//		// make sure we use a live container;
-//		final IContainer ic = (IContainer) serviceListener.getLocator();
-//		assertTrue(ic.getConnectedID() != null);
-//		
-//		// check if we received correct amount of events
-//		final IContainerEvent[] events = serviceListener.getEvent();
-//		assertNotNull("Test listener didn't receive any discovery events.", events);
-//		assertEquals("Test listener received unexpected amount of discovery events: \n\t" + Arrays.asList(events), eventsToExpect, events.length);
-//		
-//		final List origContainers = new ArrayList();
-//		for (int i = 0; i < events.length; i++) {
-//			final CompositeServiceContainerEvent event = (CompositeServiceContainerEvent) events[i];
-//
-//			// check if the local container is hidden correctly
-//			final ID localContainerId = event.getLocalContainerID();
-//			final ID connectedId = container.getConnectedID();
-//			assertEquals(localContainerId, connectedId);
-//			
-//			// check the IServiceInfo for correct fields/properties
-//			final IServiceInfo serviceInfo2 = ((IServiceEvent) event).getServiceInfo();
-//			assertTrue("IServiceInfo should match, expected:\n\t" + serviceInfo + " but was \n\t" + serviceInfo2, comparator.compare(serviceInfo2, serviceInfo) == 0);
-//			
-//			// add the underlying discovery container the the result set
-//			origContainers.add(event.getOriginalLocalContainerID());
-//		}
-//		// check that all underlying containers fired an event
-//		assertEquals("A nested container didn't send an event, but another multiple.", eventsToExpect, origContainers.size());
-//	}
-//	
-//	protected Collection getContainerIds(IContainerEvent[] events) {
-//		final Collection originalIds = new ArrayList();
-//		for (int i = 0; i < events.length; i++) {
-//			final IContainerEvent iContainerEvent = events[i];
-//			if (iContainerEvent instanceof CompositeServiceContainerEvent) {
-//				final CompositeServiceContainerEvent csce = (CompositeServiceContainerEvent) iContainerEvent;
-//				originalIds.add(csce.getOriginalLocalContainerID());
-//			} else {
-//				System.err.println("WARNING: Skipping non CompositeServiceContainerEvent in CompositeDiscoveryServiceContainerTest#getContainerIds(IContainerEvent[])");
-//				//originalIds.add(iContainerEvent.getLocalContainerID());
-//			}
-//		}
-//		return originalIds;
-//	}
-}
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/CompositeServiceInfoComporator.java b/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/CompositeServiceInfoComporator.java
deleted file mode 100644
index 35908b9e7..000000000
--- a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/CompositeServiceInfoComporator.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2008 Versant Corp.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * Contributors:
- *     Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation
- *
- * SPDX-License-Identifier: EPL-2.0
- *****************************************************************************/
-package org.eclipse.ecf.tests.provider.discovery;
-
-import java.net.URI;
-
-import org.eclipse.ecf.discovery.IServiceInfo;
-import org.eclipse.ecf.discovery.identity.IServiceID;
-import org.eclipse.ecf.tests.discovery.ServiceInfoComparator;
-
-public class CompositeServiceInfoComporator extends ServiceInfoComparator {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.tests.discovery.ServiceInfoComparator#compare(java.lang.Object, java.lang.Object)
-	 */
-	public int compare(Object arg0, Object arg1) {
-		if (arg0 instanceof IServiceInfo && arg1 instanceof IServiceInfo) {
-			final IServiceInfo first = (IServiceInfo) arg0;
-			final IServiceInfo second = (IServiceInfo) arg1;
-			boolean priority = first.getPriority() == second.getPriority();
-			boolean weight = first.getWeight() == second.getWeight();
-
-			final URI uri1 = first.getLocation();
-			final URI uri2 = second.getLocation();
-			boolean port = uri1.getPort() == uri2.getPort();
-			boolean host = uri1.getHost().equals(uri2.getHost());
-
-			final IServiceID firstID = first.getServiceID();
-			final IServiceID secondID = second.getServiceID();
-			boolean serviceType = firstID.getServiceTypeID().equals(secondID.getServiceTypeID());
-			boolean serviceName = firstID.getServiceName().equals(secondID.getServiceName());
-
-			String firstName = firstID.getName();
-			String secondName = secondID.getName();
-			boolean name = firstName.equals(secondName);
-			
-			boolean serviceProperties = compareServiceProperties(first.getServiceProperties(), second.getServiceProperties());
-			
-			final boolean result = name && serviceType && serviceName && host && port && priority && weight && serviceProperties;
-			if (result == true) {
-				return 0;
-			}
-		}
-		return -1;
-	}
-}
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/SingleCompositeDiscoveryServiceContainerTest.java b/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/SingleCompositeDiscoveryServiceContainerTest.java
deleted file mode 100644
index cb81c3f0b..000000000
--- a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/SingleCompositeDiscoveryServiceContainerTest.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2009, 2010 Markus Alexander Kuppe.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * Contributors:
- *     Markus Alexander Kuppe (ecf-dev_eclipse.org <at> lemmster <dot> de) - initial API and implementation
- *
- * SPDX-License-Identifier: EPL-2.0
- *****************************************************************************/
-package org.eclipse.ecf.tests.provider.discovery;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.ecf.discovery.IDiscoveryAdvertiser;
-import org.eclipse.ecf.discovery.IDiscoveryLocator;
-import org.eclipse.ecf.provider.discovery.CompositeDiscoveryContainer;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.framework.hooks.service.EventHook;
-import org.osgi.framework.hooks.service.FindHook;
-
-public abstract class SingleCompositeDiscoveryServiceContainerTest extends
-		CompositeDiscoveryServiceContainerTest {
-
-	// Whether the OSGi hooks should be de-/registered after and before each
-	// individual test and not just after/before the test class. 
-	// E.g. when tests are executed in random order and thus are interleaved
-	// with other tests, setUp/tearDown has to run after each test. Otherwise
-	// expect test failures.
-//	public static boolean SETUP_OSGI_HOOKS_PER_TEST = false;
-//
-//	private static int testMethods;
-//	private static int testMethodsLeft;
-//	private static ServiceRegistration findHook;
-//	
-//	// count all test methods
-//	static {
-//		Method[] methods = SingleCompositeDiscoveryServiceContainerTest.class.getMethods();
-//		for (int i = 0; i < methods.length; i++) {
-//			Method method = methods[i];
-//			if (method.getName().startsWith("test") && method.getModifiers() == Modifier.PUBLIC) {
-//				testMethods++;
-//			}
-//		}
-//		testMethodsLeft = testMethods;
-//	}
-//
-//	private final String ecfDiscoveryContainerName;
-//	private final String className;
-//
-//	public SingleCompositeDiscoveryServiceContainerTest(String anECFDiscoveryContainerName, String aClassName) {
-//		ecfDiscoveryContainerName = anECFDiscoveryContainerName;
-//		className = aClassName;
-//	}
-//	
-//	private boolean doSetUp() {
-//		return SETUP_OSGI_HOOKS_PER_TEST || testMethodsLeft == testMethods;
-//	}
-//
-//	private boolean doTearDown() {
-//		return SETUP_OSGI_HOOKS_PER_TEST || --testMethodsLeft == 0;
-//	}
-//	
-//	/* (non-Javadoc)
-//	 * @see org.eclipse.ecf.tests.provider.discovery.CompositeDiscoveryServiceContainerTest#setUp()
-//	 */
-//	protected void setUp() throws Exception {
-//		// HACK: @BeforeClass JUnit4 functionality
-//		if(doSetUp()) {
-//			// HACK: forcefully start the (nested) discovery container if it hasn't been started yet
-//			// assuming the bundle declares a lazy start buddy policy
-//			Class.forName(className);
-//			
-//			// initially close the existing CDC to get rid of other test left overs
-//			Activator.getDefault().closeServiceTracker(containerUnderTest);
-//			
-//			final BundleContext context = Activator.getDefault().getContext();
-//			final String[] clazzes = new String[]{FindHook.class.getName(), EventHook.class.getName()};
-//			findHook = context.registerService(clazzes, new DiscoveryContainerFilterHook(ecfDiscoveryContainerName), null);
-//		}
-//		super.setUp();
-//	}
-//	
-//	/* (non-Javadoc)
-//	 * @see org.eclipse.ecf.tests.discovery.DiscoveryTest#tearDown()
-//	 */
-//	protected void tearDown() throws Exception {
-//		super.tearDown();
-//		// HACK: @BeforeClass JUnit4 functionality
-//		if(doTearDown()) {
-//			if(findHook != null) {
-//				findHook.unregister();
-//				findHook = null;
-//			}
-//			// close tracker to force creation of a new CDC instance
-//			Activator.getDefault().closeServiceTracker(containerUnderTest);
-//
-//			// reset so other instances can reuse
-//			testMethodsLeft = testMethods;
-//		}
-//	}
-//	
-//	/* (non-Javadoc)
-//	 * @see org.eclipse.ecf.tests.discovery.DiscoveryServiceTest#getDiscoveryLocator()
-//	 */
-//	protected IDiscoveryLocator getDiscoveryLocator() {
-//		final IDiscoveryLocator idl = super.getDiscoveryLocator();
-//		checkCompositeDiscoveryContainer(className, (CompositeDiscoveryContainer)idl);
-//		return idl;
-//	}
-//
-//
-//	/* (non-Javadoc)
-//	 * @see org.eclipse.ecf.tests.discovery.DiscoveryServiceTest#getDiscoveryAdvertiser()
-//	 */
-//	protected IDiscoveryAdvertiser getDiscoveryAdvertiser() {
-//		final IDiscoveryAdvertiser ida = super.getDiscoveryAdvertiser();
-//		checkCompositeDiscoveryContainer(className, (CompositeDiscoveryContainer)ida);
-//		return ida;
-//	}
-//	
-//	// make sure the CDC has only a single IDC registered with the correct type
-//	private static void checkCompositeDiscoveryContainer(final String aClassName, final CompositeDiscoveryContainer cdc) {
-//		final Collection discoveryContainers = cdc.getDiscoveryContainers();
-//		assertTrue("One IDiscoveryContainer must be registered with the CDC at this point: " + discoveryContainers, discoveryContainers.size() == 1);
-//		for (final Iterator iterator = discoveryContainers.iterator(); iterator.hasNext();) {
-//			final IDiscoveryLocator dl = (IDiscoveryLocator) iterator.next();
-//			assertEquals(aClassName, dl.getClass().getName());
-//		}
-//	}
-//
-//	// Filters the corresponding IDC from the result set that is _not_ supposed to be part of the test
-//	// we need an EventHook too because due to ECF's namespaces the "other" bundle is started asynchronously
-//	// and consequently registered with the CDC 
-//	private class DiscoveryContainerFilterHook implements FindHook, EventHook {
-//
-//		private static final String BUNDLE_UNDER_TEST = "org.eclipse.ecf.provider.discovery"; // rename if bundle name change
-//		private final String containerName;
-//
-//		public DiscoveryContainerFilterHook(String anECFDiscoveryContainerName) {
-//			containerName = anECFDiscoveryContainerName;
-//		}
-//
-//		/* (non-Javadoc)
-//		 * @see org.osgi.framework.hooks.service.FindHook#find(org.osgi.framework.BundleContext, java.lang.String, java.lang.String, boolean, java.util.Collection)
-//		 */
-//		public void find(BundleContext context, String name, String filter, boolean allServices, Collection references) {
-//			
-//			// is it the composite discovery bundle who tries to find the service?
-//			final String symbolicName = context.getBundle().getSymbolicName();
-//			final Collection removees = new ArrayList();
-//			if(BUNDLE_UNDER_TEST.equals(symbolicName)) {
-//				for (final Iterator iterator = references.iterator(); iterator.hasNext();) {
-//					// filter the corresponding container 
-//					final ServiceReference serviceReference = (ServiceReference) iterator.next();
-//					final String property = (String) serviceReference.getProperty(IDiscoveryLocator.CONTAINER_NAME);
-//					if(property != null && property.equals(containerName)) {
-//						removees.add(serviceReference);
-//						System.out.println("Removed reference: " + property);
-//						break;
-//					}
-//				}
-//				references.removeAll(removees);
-//			}
-//		}
-//
-//		/* (non-Javadoc)
-//		 * @see org.osgi.framework.hooks.service.EventHook#event(org.osgi.framework.ServiceEvent, java.util.Collection)
-//		 */
-//		public void event(ServiceEvent aServiceEvent, Collection aCollection) {
-//			if (aServiceEvent.getType() == ServiceEvent.REGISTERED) {
-//				final ServiceReference serviceReference = aServiceEvent.getServiceReference();
-//				final String property = (String) serviceReference.getProperty(IDiscoveryLocator.CONTAINER_NAME);
-//				if(property != null && property.equals(containerName)) {
-//					final Collection removees = new ArrayList();
-//					for (Iterator iterator = aCollection.iterator(); iterator.hasNext();) {
-//						final BundleContext bundleContext = (BundleContext) iterator.next();
-//						final String symbolicName = bundleContext.getBundle().getSymbolicName();
-//						if(BUNDLE_UNDER_TEST.equals(symbolicName)) {
-//							removees.add(bundleContext);
-//							System.out.println("Filtered reference: " + property);
-//							break;
-//						}
-//					}
-//					aCollection.removeAll(removees);
-//				}
-//			}
-//		}
-//	}
-}
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/TestDiscoveryContainer.java b/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/TestDiscoveryContainer.java
deleted file mode 100644
index 61848f397..000000000
--- a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/TestDiscoveryContainer.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2008 Versant Corp.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * Contributors:
- *     Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation
- *
- * SPDX-License-Identifier: EPL-2.0
- *****************************************************************************/
-
-package org.eclipse.ecf.tests.provider.discovery;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.ecf.core.ContainerConnectException;
-import org.eclipse.ecf.core.IContainer;
-import org.eclipse.ecf.core.IContainerListener;
-import org.eclipse.ecf.core.identity.ID;
-import org.eclipse.ecf.core.identity.IDFactory;
-import org.eclipse.ecf.core.identity.Namespace;
-import org.eclipse.ecf.core.security.IConnectContext;
-import org.eclipse.ecf.discovery.IDiscoveryAdvertiser;
-import org.eclipse.ecf.discovery.IDiscoveryLocator;
-import org.eclipse.ecf.discovery.IServiceInfo;
-import org.eclipse.ecf.discovery.IServiceListener;
-import org.eclipse.ecf.discovery.IServiceTypeListener;
-import org.eclipse.ecf.discovery.identity.IServiceID;
-import org.eclipse.ecf.discovery.identity.IServiceTypeID;
-import org.eclipse.equinox.concurrent.future.IFuture;
-
-public class TestDiscoveryContainer implements IDiscoveryLocator, IDiscoveryAdvertiser, IContainer {
-
-	private List services = new ArrayList();
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#addServiceListener(org.eclipse.ecf.discovery.IServiceListener)
-	 */
-	public void addServiceListener(IServiceListener listener) {
-		// nop
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#addServiceListener(org.eclipse.ecf.discovery.identity.IServiceTypeID, org.eclipse.ecf.discovery.IServiceListener)
-	 */
-	public void addServiceListener(IServiceTypeID type,
-			IServiceListener listener) {
-		// nop
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#addServiceTypeListener(org.eclipse.ecf.discovery.IServiceTypeListener)
-	 */
-	public void addServiceTypeListener(IServiceTypeListener listener) {
-		// nop
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#getServiceInfo(org.eclipse.ecf.discovery.identity.IServiceID)
-	 */
-	public IServiceInfo getServiceInfo(IServiceID service) {
-		throw new UnsupportedOperationException();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#getServiceTypes()
-	 */
-	public IServiceTypeID[] getServiceTypes() {
-		throw new UnsupportedOperationException();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#getServices()
-	 */
-	public IServiceInfo[] getServices() {
-		throw new UnsupportedOperationException();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#getServices(org.eclipse.ecf.discovery.identity.IServiceTypeID)
-	 */
-	public IServiceInfo[] getServices(IServiceTypeID type) {
-		throw new UnsupportedOperationException();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#getServicesNamespace()
-	 */
-	public Namespace getServicesNamespace() {
-		throw new UnsupportedOperationException();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#registerService(org.eclipse.ecf.discovery.IServiceInfo)
-	 */
-	public void registerService(IServiceInfo serviceInfo) {
-		this.services.add(serviceInfo);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#removeServiceListener(org.eclipse.ecf.discovery.IServiceListener)
-	 */
-	public void removeServiceListener(IServiceListener listener) {
-		// nop
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#removeServiceListener(org.eclipse.ecf.discovery.identity.IServiceTypeID, org.eclipse.ecf.discovery.IServiceListener)
-	 */
-	public void removeServiceListener(IServiceTypeID type,
-			IServiceListener listener) {
-		throw new UnsupportedOperationException();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#removeServiceTypeListener(org.eclipse.ecf.discovery.IServiceTypeListener)
-	 */
-	public void removeServiceTypeListener(IServiceTypeListener listener) {
-		// nop
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#unregisterService(org.eclipse.ecf.discovery.IServiceInfo)
-	 */
-	public void unregisterService(IServiceInfo serviceInfo) {
-		this.services.remove(serviceInfo);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		throw new UnsupportedOperationException();
-	}
-	
-	public List getRegisteredServices() {
-		return services;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.discovery.IDiscoveryLocator#purgeCache()
-	 */
-	public IServiceInfo[] purgeCache() {
-		throw new UnsupportedOperationException();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.discovery.IDiscoveryAsyncLocator#getAsyncServiceInfo(org.eclipse.ecf.discovery.identity.IServiceID)
-	 */
-	public IFuture getAsyncServiceInfo(IServiceID aServiceId) {
-		throw new UnsupportedOperationException();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.discovery.IDiscoveryAsyncLocator#getAsyncServiceTypes()
-	 */
-	public IFuture getAsyncServiceTypes() {
-		throw new UnsupportedOperationException();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.discovery.IDiscoveryAsyncLocator#getAsyncServices()
-	 */
-	public IFuture getAsyncServices() {
-		throw new UnsupportedOperationException();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.discovery.IDiscoveryAsyncLocator#getAsyncServices(org.eclipse.ecf.discovery.identity.IServiceTypeID)
-	 */
-	public IFuture getAsyncServices(IServiceTypeID aServiceTypeId) {
-		throw new UnsupportedOperationException();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.discovery.IDiscoveryAdvertiser#unregisterAllServices()
-	 */
-	public void unregisterAllServices() {
-		throw new UnsupportedOperationException();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.core.IContainer#addListener(org.eclipse.ecf.core.IContainerListener)
-	 */
-	public void addListener(IContainerListener listener) {
-		throw new UnsupportedOperationException();
-	}
-
-	public void connect(ID targetId, IConnectContext connectContext)
-			throws ContainerConnectException {
-		// nop
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.core.IContainer#disconnect()
-	 */
-	public void disconnect() {
-		throw new UnsupportedOperationException();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.core.IContainer#dispose()
-	 */
-	public void dispose() {
-		throw new UnsupportedOperationException();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.core.IContainer#getConnectNamespace()
-	 */
-	public Namespace getConnectNamespace() {
-		throw new UnsupportedOperationException();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.core.IContainer#getConnectedID()
-	 */
-	public ID getConnectedID() {
-		return IDFactory.getDefault().createStringID(getClass().getName());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.core.IContainer#removeListener(org.eclipse.ecf.core.IContainerListener)
-	 */
-	public void removeListener(IContainerListener listener) {
-		throw new UnsupportedOperationException();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.core.identity.IIdentifiable#getID()
-	 */
-	public ID getID() {
-		throw new UnsupportedOperationException();
-	}
-}
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/WithoutJMDNSCompositeDiscoveryServiceContainerTest.java b/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/WithoutJMDNSCompositeDiscoveryServiceContainerTest.java
deleted file mode 100644
index 63d13dd46..000000000
--- a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/WithoutJMDNSCompositeDiscoveryServiceContainerTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2009, 2010 Markus Alexander Kuppe.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * Contributors:
- *     Markus Alexander Kuppe (ecf-dev_eclipse.org <at> lemmster <dot> de) - initial API and implementation
- *
- * SPDX-License-Identifier: EPL-2.0
- *****************************************************************************/
-package org.eclipse.ecf.tests.provider.discovery;
-
-import org.eclipse.ecf.core.util.StringUtils;
-
-public class WithoutJMDNSCompositeDiscoveryServiceContainerTest extends
-	SingleCompositeDiscoveryServiceContainerTest {
-
-	public WithoutJMDNSCompositeDiscoveryServiceContainerTest() {
-		super("ecf.discovery.jmdns", "org.eclipse.ecf.provider.jslp.container.JSLPDiscoveryContainer");
-		String[] ips;
-		// tests need root privileges to bind to slp port 427 in SA mode
-		try {
-			String str = System.getProperty("net.slp.interfaces", "127.0.0.1");
-			ips = StringUtils.split(str, ",");
-		} catch (Exception e) {
-			ips = new String[]{"127.0.0.1"};
-		}
-		setHostname(ips[0]);
-	}
-}
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/WithoutJSLPCompositeDiscoveryServiceContainerTest.java b/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/WithoutJSLPCompositeDiscoveryServiceContainerTest.java
deleted file mode 100644
index 5be65840d..000000000
--- a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/WithoutJSLPCompositeDiscoveryServiceContainerTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2009, 2010 Markus Alexander Kuppe.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * Contributors:
- *     Markus Alexander Kuppe (ecf-dev_eclipse.org <at> lemmster <dot> de) - initial API and implementation
- *
- * SPDX-License-Identifier: EPL-2.0
- *****************************************************************************/
-package org.eclipse.ecf.tests.provider.discovery;
-
-
-public class WithoutJSLPCompositeDiscoveryServiceContainerTest extends
-	SingleCompositeDiscoveryServiceContainerTest {
-
-	public WithoutJSLPCompositeDiscoveryServiceContainerTest() {
-		super("ecf.discovery.jslp", "org.eclipse.ecf.provider.jmdns.container.JMDNSDiscoveryContainer");
-		setHostname(System.getProperty("net.mdns.interface", "127.0.0.1"));
-	}
-}