diff options
| author | Markus Alexander Kuppe | 2010-06-18 06:56:00 +0000 |
|---|---|---|
| committer | Markus Alexander Kuppe | 2010-06-18 06:56:00 +0000 |
| commit | ca43804a27eecfb7ba363dd17e6b511447b4c370 (patch) | |
| tree | 535e3fafbcedeedf1099c7e8471d7d05ede633c3 | |
| parent | e2e195c2ed4c0e84c5bc6692b63ef501678e27c5 (diff) | |
| download | org.eclipse.ecf-ca43804a27eecfb7ba363dd17e6b511447b4c370.tar.gz org.eclipse.ecf-ca43804a27eecfb7ba363dd17e6b511447b4c370.tar.xz org.eclipse.ecf-ca43804a27eecfb7ba363dd17e6b511447b4c370.zip | |
WIP - bug 314998: [Discovery][DNS-SD] Make provider configurable with Configuration Admin https://bugs.eclipse.org/bugs/show_bug.cgi?id=314998
| -rw-r--r-- | tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/Activator.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/Activator.java b/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/Activator.java index 4db332780..7b4a6009c 100644 --- a/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/Activator.java +++ b/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/Activator.java @@ -15,6 +15,7 @@ import java.util.Hashtable; import org.eclipse.ecf.discovery.IDiscoveryLocator; import org.eclipse.ecf.provider.dnssd.IDnsSdDiscoveryConstants; +import org.omg.CORBA.SystemException; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; @@ -58,7 +59,10 @@ public class Activator implements BundleActivator { properties.put(IDnsSdDiscoveryConstants.CA_RESOLVER, "8.8.8.8"); config.update(properties); - filter = context.createFilter("(" + Constants.SERVICE_PID + "=" + config.getPid() + ")").toString(); + filter = "(" + Constants.SERVICE_PID + "=" + config.getPid() + ")"; + } else { + System.err.println("You don't have config admin deployed. Some tests will fail that require configuration!"); + filter = "(" + Constants.OBJECTCLASS + "=" + IDiscoveryLocator.class.getName() + ")"; } // add the service listener |