diff options
Diffstat (limited to 'providers')
3 files changed, 10 insertions, 6 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.dnssd/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.dnssd/META-INF/MANIFEST.MF index ff2859c59..229719292 100644 --- a/providers/bundles/org.eclipse.ecf.provider.dnssd/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.dnssd/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.ecf.provider.dnssd;singleton:=true -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 1.2.100.qualifier Bundle-Activator: org.eclipse.ecf.provider.dnssd.Activator Bundle-Vendor: %pluginProvider Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryContainerAdapter.java b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryContainerAdapter.java index cc7a1a53b..83ba63430 100644 --- a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryContainerAdapter.java +++ b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryContainerAdapter.java @@ -102,8 +102,8 @@ public abstract class DnsSdDiscoveryContainerAdapter extends Assert.isNotNull(serviceInfo); // nop, we are just a Locator but AbstractDiscoveryContainerAdapter // doesn't support this yet - throw new UnsupportedOperationException( - Messages.DnsSdDiscoveryContainerAdapter_No_IDiscovery_Advertiser); +// throw new UnsupportedOperationException( +// Messages.DnsSdDiscoveryContainerAdapter_No_IDiscovery_Advertiser); } /* (non-Javadoc) @@ -113,8 +113,8 @@ public abstract class DnsSdDiscoveryContainerAdapter extends Assert.isNotNull(serviceInfo); // nop, we are just a Locator but AbstractDiscoveryContainerAdapter // doesn't support this yet - throw new UnsupportedOperationException( - Messages.DnsSdDiscoveryContainerAdapter_No_IDiscovery_Advertiser); +// throw new UnsupportedOperationException( +// Messages.DnsSdDiscoveryContainerAdapter_No_IDiscovery_Advertiser); } /* (non-Javadoc) diff --git a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdNamespace.java b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdNamespace.java index 7c1c2ac41..293622494 100644 --- a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdNamespace.java +++ b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdNamespace.java @@ -50,6 +50,10 @@ public class DnsSdNamespace extends Namespace { IServiceTypeID serviceTypeID = (IServiceTypeID) parameters[0]; URI uri = (URI) parameters[1]; return new DnsSdServiceID(this, new DnsSdServiceTypeID(this, serviceTypeID), uri); + } else if (parameters != null && parameters.length == 2 && parameters[0] instanceof String && parameters[1] instanceof URI){ + String serviceType = (String) parameters[0]; + URI uri = (URI) parameters[1]; + return new DnsSdServiceID(this, new DnsSdServiceTypeID(this, serviceType), uri); } else { throw new IDCreateException(Messages.DnsSdNamespace_Wrong_Parameters); } @@ -66,6 +70,6 @@ public class DnsSdNamespace extends Namespace { * @see org.eclipse.ecf.core.identity.Namespace#getSupportedParameterTypes() */ public Class[][] getSupportedParameterTypes() { - return new Class[][] {{String.class}, {IServiceTypeID.class}, {IServiceTypeID.class, URI.class}}; + return new Class[][] {{String.class}, {IServiceTypeID.class}, {IServiceTypeID.class, URI.class}, {String.class, URI.class}}; } } |