Create container explicitly for 119

2 files changed, 25 insertions, 2 deletions

diff --git a/tests/bundles/org.eclipse.ecf.tests.discovery.remote-extender/META-INF/MANIFEST.MF b/tests/bundles/org.eclipse.ecf.tests.discovery.remote-extender/META-INF/MANIFEST.MF
index 04d9010ed..26d32e5c5 100644
--- a/tests/bundles/org.eclipse.ecf.tests.discovery.remote-extender/META-INF/MANIFEST.MF
+++ b/tests/bundles/org.eclipse.ecf.tests.discovery.remote-extender/META-INF/MANIFEST.MF
@@ -4,7 +4,10 @@ Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.ecf.tests.discovery.remote_extender
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.ecf.tests.discovery.remote_extender.Activator
-Import-Package: org.eclipse.ecf.discovery;version="3.0.0",
+Import-Package: org.eclipse.core.runtime;version="3.4.0",
+ org.eclipse.ecf.core;version="3.0.0",
+ org.eclipse.ecf.core.identity;version="3.0.0",
+ org.eclipse.ecf.discovery;version="3.0.0",
  org.osgi.framework;version="1.3.0",
  org.osgi.framework.hooks.service;version="1.0.0"
 Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
diff --git a/tests/bundles/org.eclipse.ecf.tests.discovery.remote-extender/src/org/eclipse/ecf/tests/discovery/remote_extender/Activator.java b/tests/bundles/org.eclipse.ecf.tests.discovery.remote-extender/src/org/eclipse/ecf/tests/discovery/remote_extender/Activator.java
index 33bc8727a..876af13d7 100644
--- a/tests/bundles/org.eclipse.ecf.tests.discovery.remote-extender/src/org/eclipse/ecf/tests/discovery/remote_extender/Activator.java
+++ b/tests/bundles/org.eclipse.ecf.tests.discovery.remote-extender/src/org/eclipse/ecf/tests/discovery/remote_extender/Activator.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Markus Alexander Kuppe.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Markus Alexander Kuppe (ecf-dev_eclipse.org <at> lemmster <dot> de) - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.ecf.tests.discovery.remote_extender;
 
 import java.util.Collection;
@@ -5,6 +15,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
+import org.eclipse.ecf.core.ContainerFactory;
+import org.eclipse.ecf.core.identity.IDFactory;
 import org.eclipse.ecf.discovery.IDiscoveryAdvertiser;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
@@ -34,6 +46,14 @@ public class Activator implements BundleActivator, EventHook {
 				"(" + Constants.OBJECTCLASS + "=" + SERVICE + ")" +
 				"(!(osgi.remote.interfaces=" + SERVICE + "))" +
 						")");
+		
+		// for the moment we have to manually create a container
+		//TODO move into ecf specific configuration
+		ContainerFactory.getDefault().createContainer("ecf.r_osgi.peer",
+				new Object[] { IDFactory.getDefault().createStringID(
+				"r-osgi://localhost:9278") });
+
+		
 		context.registerService(EventHook.class.getName(), this, null);
 		
 		ServiceReference[] serviceReferences = context.getAllServiceReferences(SERVICE, null);
@@ -88,7 +108,7 @@ public class Activator implements BundleActivator, EventHook {
 				props.put(key, aServiceReference.getProperty(key));
 			}
 		}
-		props.put("osgi.remote.interfaces", SERVICE);
+		props.put("osgi.remote.interfaces", new String[]{SERVICE});
 		Object service = this.context.getService(aServiceReference);
 		// keep in mind that this removes all other interfaces the service was originally registered for
 		ServiceRegistration serviceRegistration = context.registerService(SERVICE, service, props);