RESOLVED - bug 317926: [Discovery][DNS-SD] Localize bundle (NLS)

https://bugs.eclipse.org/bugs/show_bug.cgi?id=317926

14 files changed, 101 insertions, 54 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 f845a3629..c9ebb7eca 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
@@ -15,6 +15,7 @@ Import-Package: org.eclipse.core.runtime;version="3.4.0",
  org.eclipse.ecf.core.util;version="3.0.0",
  org.eclipse.ecf.discovery;version="4.0.0",
  org.eclipse.ecf.discovery.identity;version="3.0.0",
+ org.eclipse.osgi.util;version="1.0.0",
  org.osgi.framework;version="1.5.0",
  org.osgi.service.cm;version="1.2.0";resolution:=optional,
  org.osgi.service.log;version="1.3",
diff --git a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/Activator.java b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/Activator.java
index 224314a68..b60c52fbb 100644
--- a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/Activator.java
+++ b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/Activator.java
@@ -32,11 +32,15 @@ import org.osgi.service.cm.ManagedServiceFactory;
 
 public class Activator implements BundleActivator {
 
-	public static final String PLUGIN_ID = "org.eclipse.ecf.provider.dnssd";
+	public static final String PLUGIN_ID = "org.eclipse.ecf.provider.dnssd"; //$NON-NLS-1$
+	public static final String DISCOVERY_CONTAINER_NAME_VALUE = "ecf.discovery.dnssd"; //$NON-NLS-1$
+	public static final String LOCATOR = ".locator"; //$NON-NLS-1$
+	public static final String ADVERTISER = ".advertiser"; //$NON-NLS-1$
+
+	private static final String DISCOVERY_CONTAINER_NAME_KEY = "org.eclipse.ecf.discovery.containerName"; //$NON-NLS-1$
 	
 	private final Map serviceRegistrations = new HashMap();
 	private volatile BundleContext context;
-	private static final String NAME = "ecf.discovery.dnssd";
 
 	/*
 	 * (non-Javadoc)
@@ -47,23 +51,23 @@ public class Activator implements BundleActivator {
 		
 		// register a managed factory for the locator service
 		final Properties locCmProps = new Properties();
-		locCmProps.put(Constants.SERVICE_PID, NAME + ".locator");
+		locCmProps.put(Constants.SERVICE_PID, DISCOVERY_CONTAINER_NAME_VALUE + LOCATOR);
 		context.registerService(ManagedServiceFactory.class.getName(), new DnsSdManagedServiceFactory(DnsSdDiscoveryLocator.class), locCmProps);
 		
 		// register the locator service
 		final Properties locProps = new Properties();
-		locProps.put("org.eclipse.ecf.discovery.containerName", NAME + ".locator");
+		locProps.put(DISCOVERY_CONTAINER_NAME_KEY, DISCOVERY_CONTAINER_NAME_VALUE + LOCATOR);
 		locProps.put(Constants.SERVICE_RANKING, new Integer(750));
 		serviceRegistrations.put(null, context.registerService(IDiscoveryLocator.class.getName(), new DnsSdServiceFactory(DnsSdDiscoveryLocator.class), locProps));
 
 		// register a managed factory for the advertiser service
 		final Properties advCmProps = new Properties();
-		advCmProps.put(Constants.SERVICE_PID, NAME + ".advertiser");
+		advCmProps.put(Constants.SERVICE_PID, DISCOVERY_CONTAINER_NAME_VALUE + ADVERTISER);
 		context.registerService(ManagedServiceFactory.class.getName(), new DnsSdManagedServiceFactory(DnsSdDiscoveryAdvertiser.class), advCmProps);
 		
 		// register the advertiser service
 		final Properties advProps = new Properties();
-		advProps.put("org.eclipse.ecf.discovery.containerName", NAME + ".advertiser");
+		advProps.put(DISCOVERY_CONTAINER_NAME_KEY, DISCOVERY_CONTAINER_NAME_VALUE + ADVERTISER);
 		advProps.put(Constants.SERVICE_RANKING, new Integer(750));
 		serviceRegistrations.put(null, context.registerService(IDiscoveryAdvertiser.class.getName(), new DnsSdServiceFactory(DnsSdDiscoveryAdvertiser.class), advProps));
 	}
diff --git a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/BnRDnsSdServiceTypeID.java b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/BnRDnsSdServiceTypeID.java
index e9a6de71c..f187660be 100644
--- a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/BnRDnsSdServiceTypeID.java
+++ b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/BnRDnsSdServiceTypeID.java
@@ -31,19 +31,19 @@ public class BnRDnsSdServiceTypeID extends DnsSdServiceTypeID {
   	/**
   	 * A list of domains recommended for browsing
   	 */
-  	static final String BROWSE_DOMAINS = "b._dns-sd";
+  	static final String BROWSE_DOMAINS = "b._dns-sd"; //$NON-NLS-1$
 	/**
 	 * A single recommended default domain for browsing
 	 */
-	static final String DEFAULT_BROWSE_DOMAIN = "db._dns-sd";
+	static final String DEFAULT_BROWSE_DOMAIN = "db._dns-sd"; //$NON-NLS-1$
 	/**
 	 * A list of domains recommended for registering services using Dynamic Update
 	 */
-	static final String REG_DOMAINS = "r._dns-sd";
+	static final String REG_DOMAINS = "r._dns-sd"; //$NON-NLS-1$
 	/**
 	 * A single recommended default domain for registering services.
 	 */
-	static final String DEFAULT_REG_DOMAIN = "dr._dns-sd";
+	static final String DEFAULT_REG_DOMAIN = "dr._dns-sd"; //$NON-NLS-1$
 
 	BnRDnsSdServiceTypeID(IServiceTypeID aServiceType, String aService) {
 		super(aServiceType.getNamespace(), aServiceType);
@@ -58,12 +58,12 @@ public class BnRDnsSdServiceTypeID extends DnsSdServiceTypeID {
 		for (int i = 0; i < scopes.length; i++) {
 			String scope = scopes[i];
 			// remove dangling "."
-			if(scope.endsWith(".")) {
+			if(scope.endsWith(".")) { //$NON-NLS-1$
 				scope = scope.substring(0, scope.length() - 1);
 			}
 			Lookup query;
 			try {
-				query = new Lookup(services[0] + "._udp" + "." + scope + ".",
+				query = new Lookup(services[0] + "._udp" + "." + scope + ".", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 						Type.PTR);
 			} catch (TextParseException e) {
 				continue;
@@ -74,7 +74,7 @@ public class BnRDnsSdServiceTypeID extends DnsSdServiceTypeID {
 	}
 	
 	void setScope(String target) {
-		if(target.endsWith(".")) {
+		if(target.endsWith(".")) { //$NON-NLS-1$
 			target = target.substring(0, target.length() - 1);
 		}
 		scopes = new String[]{target};
@@ -85,7 +85,7 @@ public class BnRDnsSdServiceTypeID extends DnsSdServiceTypeID {
 		final List res = new ArrayList(scopes.length);
 		for (int i = 0; i < scopes.length; i++) {
 			String scope = scopes[i];
-			res.add(scope + ".");
+			res.add(scope + "."); //$NON-NLS-1$
 		}
 		return res;
 	}
diff --git a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/ContainerInstantiator.java b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/ContainerInstantiator.java
index 8aec613b8..bcb32f85c 100644
--- a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/ContainerInstantiator.java
+++ b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/ContainerInstantiator.java
@@ -16,15 +16,18 @@ import org.eclipse.ecf.core.IContainer;
 import org.eclipse.ecf.core.provider.IContainerInstantiator;
 
 public class ContainerInstantiator implements IContainerInstantiator {
-
+	
+	private static final String ADVERTISER = Activator.DISCOVERY_CONTAINER_NAME_VALUE + Activator.ADVERTISER;
+	private static final String LOCATOR = Activator.DISCOVERY_CONTAINER_NAME_VALUE + Activator.LOCATOR;
+	
 	/* (non-Javadoc)
 	 * @see org.eclipse.ecf.core.provider.IContainerInstantiator#createInstance(org.eclipse.ecf.core.ContainerTypeDescription, java.lang.Object[])
 	 */
 	public IContainer createInstance(ContainerTypeDescription description,
 			Object[] parameters) throws ContainerCreateException {
-		if(description != null && "ecf.discovery.dnssd.advertiser".equals(description.getName())) {
+		if(description != null && ADVERTISER.equals(description.getName())) {
 			return new DnsSdDiscoveryAdvertiser();
-		} else if(description != null && "ecf.discovery.dnssd.locator".equals(description.getName())) {
+		} else if(description != null && LOCATOR.equals(description.getName())) {
 			return new DnsSdDiscoveryLocator();
 		}
 		return null;
diff --git a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryAdvertiser.java b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryAdvertiser.java
index d36dfe6ba..81dcab795 100644
--- a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryAdvertiser.java
+++ b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryAdvertiser.java
@@ -98,7 +98,7 @@ public class DnsSdDiscoveryAdvertiser extends DnsSdDiscoveryContainerAdapter {
 
 		// connect can only be called once
 		if (targetID != null || getConfig() == null) {
-			throw new ContainerConnectException("Already connected");
+			throw new ContainerConnectException(Messages.DnsSdDiscoveryAdvertiser_Container_Already_Connected);
 		}
 
 		//TODO convert non DnsSdServiceTypeIDs into DSTIDs
@@ -137,7 +137,7 @@ public class DnsSdDiscoveryAdvertiser extends DnsSdDiscoveryContainerAdapter {
 		
 			for (int i = 0; i < registrationDomains.length; i++) {
 				final Name zone = new Name(registrationDomains[i]);
-				final Name fqdn = new Name(name.toString() + "." + zone.toString());
+				final Name fqdn = new Name(name.toString() + "." + zone.toString()); //$NON-NLS-1$
 				final Update update = new Update(zone);
 
 				//TYPE.SRV
@@ -160,7 +160,7 @@ public class DnsSdDiscoveryAdvertiser extends DnsSdDiscoveryContainerAdapter {
 				// set up a the resolver for the given domain (a scope might use different domains)
 				final Collection dnsServers = getUpdateDomain(zone);
 				if(dnsServers.size() == 0) {
-					throw new DnsSdDiscoveryException("No server for dnsupdate could be found");
+					throw new DnsSdDiscoveryException(Messages.DnsSdDiscoveryAdvertiser_No_DynDns_Servers_Found);
 				}
 				for (final Iterator iterator = dnsServers.iterator(); iterator.hasNext();) {
 					final SRVRecord dnsServer = (SRVRecord) iterator.next();
@@ -262,7 +262,7 @@ public class DnsSdDiscoveryAdvertiser extends DnsSdDiscoveryContainerAdapter {
 		final Collection registrationDomains = getBrowsingOrRegistrationDomains(aServiceTypeId, rrs);
 		final String[] scopes = aServiceTypeId.getScopes();
 		for (int i = 0; i < scopes.length; i++) {
-			scopes[i] = scopes[i].concat(".");
+			scopes[i] = scopes[i].concat("."); //$NON-NLS-1$
 		}
 		return registrationDomains.size() == 0 ? scopes : (String[]) registrationDomains.toArray(new String[registrationDomains.size()]); 
 	}
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 4050a1bda..a7ff7f77a 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
@@ -61,7 +61,7 @@ public abstract class DnsSdDiscoveryContainerAdapter extends
 		// nop, we are just an Advertiser but AbstractDiscoveryContainerAdapter
 		// doesn't support this yet
 		throw new UnsupportedOperationException(
-				"This is not an IDiscoveryLocator");
+				Messages.DnsSdDiscoveryContainerAdapter_No_IDiscovery_Locator);
 	}
 
 	/* (non-Javadoc)
@@ -71,7 +71,7 @@ public abstract class DnsSdDiscoveryContainerAdapter extends
 		// nop, we are just an Advertiser but AbstractDiscoveryContainerAdapter
 		// doesn't support this yet
 		throw new UnsupportedOperationException(
-				"This is not an IDiscoveryLocator");
+				Messages.DnsSdDiscoveryContainerAdapter_No_IDiscovery_Locator);
 	}
 
 	/* (non-Javadoc)
@@ -81,7 +81,7 @@ public abstract class DnsSdDiscoveryContainerAdapter extends
 		// nop, we are just an Advertiser but AbstractDiscoveryContainerAdapter
 		// doesn't support this yet
 		throw new UnsupportedOperationException(
-				"This is not an IDiscoveryLocator");
+				Messages.DnsSdDiscoveryContainerAdapter_No_IDiscovery_Locator);
 	}
 
 	/* (non-Javadoc)
@@ -92,7 +92,7 @@ public abstract class DnsSdDiscoveryContainerAdapter extends
 		// nop, we are just an Advertiser but AbstractDiscoveryContainerAdapter
 		// doesn't support this yet
 		throw new UnsupportedOperationException(
-				"This is not an IDiscoveryLocator");
+				Messages.DnsSdDiscoveryContainerAdapter_No_IDiscovery_Locator);
 	}
 
 	/* (non-Javadoc)
@@ -103,7 +103,7 @@ public abstract class DnsSdDiscoveryContainerAdapter extends
 		// nop, we are just a Locator but AbstractDiscoveryContainerAdapter
 		// doesn't support this yet
 		throw new UnsupportedOperationException(
-				"This is not an IDiscoveryAdvertiser");
+				Messages.DnsSdDiscoveryContainerAdapter_No_IDiscovery_Advertiser);
 	}
 
 	/* (non-Javadoc)
@@ -114,7 +114,7 @@ public abstract class DnsSdDiscoveryContainerAdapter extends
 		// nop, we are just a Locator but AbstractDiscoveryContainerAdapter
 		// doesn't support this yet
 		throw new UnsupportedOperationException(
-				"This is not an IDiscoveryAdvertiser");
+				Messages.DnsSdDiscoveryContainerAdapter_No_IDiscovery_Advertiser);
 	}
 
 	/* (non-Javadoc)
@@ -253,7 +253,7 @@ public abstract class DnsSdDiscoveryContainerAdapter extends
 					return -1;
 				}
 			}
-			throw new UnsupportedOperationException("This appears to be a bug: Comparator can only compare SRVRecords");
+			throw new UnsupportedOperationException(Messages.DnsSdDiscoveryContainerAdapter_Comparator_SRV_Records);
 		}
 		
 	}
diff --git a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryException.java b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryException.java
index 2b5cf3b3e..94fdda16c 100644
--- a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryException.java
+++ b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryException.java
@@ -11,6 +11,7 @@
 package org.eclipse.ecf.provider.dnssd;
 
 import org.eclipse.ecf.core.util.ECFRuntimeException;
+import org.eclipse.osgi.util.NLS;
 import org.xbill.DNS.Rcode;
 
 
@@ -19,11 +20,11 @@ public class DnsSdDiscoveryException extends ECFRuntimeException {
 	public static DnsSdDiscoveryException getException(int rcode) {
 		switch (rcode) {
 		case Rcode.REFUSED:
-			return new DnsSdDiscoveryException("DNS update denied by server (return code: " + rcode + ")");
+			return new DnsSdDiscoveryException(NLS.bind(Messages.DnsSdDiscoveryException_DynDns_Update_Denied, Integer.toString(rcode)));
 		case Rcode.NOTAUTH:
-			return new DnsSdDiscoveryException("TSIG verify failed (BADKEY) (return code: " + rcode + ")");
+			return new DnsSdDiscoveryException(NLS.bind(Messages.DnsSdDiscoveryException_TSIG_Verify_Failed, Integer.toString(rcode)));
 		default:
-			return new DnsSdDiscoveryException("DNS update failed with return code: " + rcode);
+			return new DnsSdDiscoveryException(NLS.bind(Messages.DnsSdDiscoveryException_DynDNS_Updated_Failed, Integer.toString(rcode)));
 		}
 	}
 	
diff --git a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryLocator.java b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryLocator.java
index 627e344f7..1a17a4407 100644
--- a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryLocator.java
+++ b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryLocator.java
@@ -43,8 +43,8 @@ import org.xbill.DNS.Type;
 
 public class DnsSdDiscoveryLocator extends DnsSdDiscoveryContainerAdapter {
 
-	private static final String DNS_SD_PATH = "path";
-	private static final String DNS_SD_PTCL = "dns-sd.ptcl";
+	private static final String DNS_SD_PATH = "path"; //$NON-NLS-1$
+	private static final String DNS_SD_PTCL = "dns-sd.ptcl"; //$NON-NLS-1$
 
 	public DnsSdDiscoveryLocator() {
 		super(DnsSdNamespace.NAME, new DiscoveryContainerConfig(IDFactory
@@ -150,14 +150,14 @@ public class DnsSdDiscoveryLocator extends DnsSdDiscoveryContainerAdapter {
 				List strings = txtResult.getStrings();
 				for (Iterator itr = strings.iterator(); itr.hasNext();) {
 					String str = (String) itr.next();
-					String[] split = str.split("=");
+					String[] split = str.split("="); //$NON-NLS-1$
 					props.put(split[0], split[1]);
 				}
 			}
 			String path = props.getProperty(DNS_SD_PATH);
 			String proto = props.getProperty(DNS_SD_PTCL) == null ? aServiceTypeID.getProtocols()[0] : props.getProperty(DNS_SD_PTCL);
 			
-			URI uri = URI.create(proto + "://" + host + ":" + port + (path == null ? "" : path));
+			URI uri = URI.create(proto + "://" + host + ":" + port + (path == null ? "" : path)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			IServiceInfo info =new ServiceInfo(uri, host, aServiceTypeID, priority, weight, new ServiceProperties(props), ttl);
 			infos.add(info);
 		}
@@ -176,7 +176,7 @@ public class DnsSdDiscoveryLocator extends DnsSdDiscoveryContainerAdapter {
 
 		// connect can only be called once
 		if (targetID != null || getConfig() == null) {
-			throw new ContainerConnectException("Already connected");
+			throw new ContainerConnectException(Messages.DnsSdDiscoveryLocator_Container_Already_Connected);
 		}
 		
 		// fall back to the search path as last resort 
@@ -187,7 +187,7 @@ public class DnsSdDiscoveryLocator extends DnsSdDiscoveryContainerAdapter {
 				targetID = new DnsSdServiceTypeID();
 				targetID.setSearchPath(searchPaths);
 			} else {
-				throw new ContainerConnectException("No target id given and fallbacks failed");
+				throw new ContainerConnectException(Messages.DnsSdDiscoveryLocator_No_Target_ID);
 			}
 		} else {
 			targetID = (DnsSdServiceTypeID) aTargetID;
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 7351e4add..719f97d23 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
@@ -39,7 +39,7 @@ public class DnsSdNamespace extends Namespace {
 			URI uri = (URI) parameters[1];
 			return new DnsSdServiceID(this, new DnsSdServiceTypeID(this, serviceTypeID), uri);
 		} else {
-			throw new IDCreateException("Wrong parameters");
+			throw new IDCreateException(Messages.DnsSdNamespace_Wrong_Parameters);
 		}
 	}
 
diff --git a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdServiceID.java b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdServiceID.java
index bbd1361bf..08f9fc95a 100644
--- a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdServiceID.java
+++ b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdServiceID.java
@@ -37,7 +37,7 @@ public class DnsSdServiceID extends ServiceID {
 
 
 	Name getDnsName() throws TextParseException {
-		return new Name("_" + type.getServices()[0] + "._"
+		return new Name("_" + type.getServices()[0] + "._" //$NON-NLS-1$ //$NON-NLS-2$
 		+ type.getProtocols()[0]);
 	}
 	
@@ -46,12 +46,12 @@ public class DnsSdServiceID extends ServiceID {
 	 * @throws IOException
 	 */
 	Record toSRVRecord() throws IOException {
-		final Name name = new Name(getDnsName().toString(), new Name(type.getScopes()[0] + "."));
+		final Name name = new Name(getDnsName().toString(), new Name(type.getScopes()[0] + ".")); //$NON-NLS-1$
 		final long ttl = serviceInfo.getTTL();
 		final int priority = serviceInfo.getPriority();
 		final int weight = serviceInfo.getWeight();
 		final int port = serviceInfo.getLocation().getPort();
-		final Name target = Name.fromString(serviceInfo.getLocation().getHost() + ".");
+		final Name target = Name.fromString(serviceInfo.getLocation().getHost() + "."); //$NON-NLS-1$
 
 		return new SRVRecord(name, DClass.IN, ttl, priority, weight, port, target);
 	}
@@ -70,7 +70,7 @@ public class DnsSdServiceID extends ServiceID {
 			final String key = property.toString();
 			final String value = (String) properties.getProperty(key).toString();
 			final long ttl = serviceInfo.getTTL();
-			result.add(new TXTRecord(aRecord.getName(), DClass.IN, ttl, key + "=" + value));
+			result.add(new TXTRecord(aRecord.getName(), DClass.IN, ttl, key + "=" + value)); //$NON-NLS-1$
 		}
 		return (Record[]) result.toArray(new Record[result.size()]);
 	}
diff --git a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdServiceTypeID.java b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdServiceTypeID.java
index 1ae3ad1c7..55aab3fac 100644
--- a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdServiceTypeID.java
+++ b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdServiceTypeID.java
@@ -35,7 +35,7 @@ public class DnsSdServiceTypeID extends ServiceTypeID implements IServiceTypeID
 		scopes = DEFAULT_SCOPE;
 		protocols = DEFAULT_PROTO;
 		namingAuthority = DEFAULT_NA;
-		services = new String[]{""};
+		services = new String[]{""}; //$NON-NLS-1$
 	}
 
 	public DnsSdServiceTypeID(Namespace ns, IServiceTypeID id) {
@@ -57,20 +57,20 @@ public class DnsSdServiceTypeID extends ServiceTypeID implements IServiceTypeID
 
 		String service = null;
 		if (services == null || services.length == 0
-				|| (services.length == 1 && services[0].equals(""))) {
+				|| (services.length == 1 && services[0].equals(""))) { //$NON-NLS-1$
 			// if no service is set, create a non service specific query
-			service = "_services._dns-sd._";
+			service = "_services._dns-sd._"; //$NON-NLS-1$
 
 			// and set proto to "udp" irregardless what has been set
-			protos = new String[] { "udp" };
+			protos = new String[] { "udp" }; //$NON-NLS-1$
 
 			// and query for PTR records
 			type = Type.PTR;
 		} else {
-			service = "_";
+			service = "_"; //$NON-NLS-1$
 			for (int i = 0; i < services.length; i++) {
 				service += services[i];
-				service += "._";
+				service += "._"; //$NON-NLS-1$
 			}
 		}
 
@@ -78,13 +78,13 @@ public class DnsSdServiceTypeID extends ServiceTypeID implements IServiceTypeID
 		for (int i = 0; i < scopes.length; i++) {
 			String scope = scopes[i];
 			// remove dangling "."
-			if(scope.endsWith(".")) {
+			if(scope.endsWith(".")) { //$NON-NLS-1$
 				scope = scope.substring(0, scope.length() - 1);
 			}
 			for (int j = 0; j < protos.length; j++) {
 				Lookup query;
 				try {
-					query = new Lookup(service + protos[j] + "." + scope + ".",
+					query = new Lookup(service + protos[j] + "." + scope + ".", //$NON-NLS-1$ //$NON-NLS-2$
 							type);
 				} catch (TextParseException e) {
 					continue;
diff --git a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/IDnsSdDiscoveryConstants.java b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/IDnsSdDiscoveryConstants.java
index 61791db4c..445fe3948 100644
--- a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/IDnsSdDiscoveryConstants.java
+++ b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/IDnsSdDiscoveryConstants.java
@@ -15,16 +15,16 @@ public interface IDnsSdDiscoveryConstants {
 	/**
 	 * Config admin key to define the default search path
 	 */
-	public final String CA_SEARCH_PATH = "searchPath";
+	public final String CA_SEARCH_PATH = "searchPath"; //$NON-NLS-1$
 	/**
 	 * Config admin key to define the default resolver
 	 */
-	public final String CA_RESOLVER = "resolver";
+	public final String CA_RESOLVER = "resolver"; //$NON-NLS-1$
 	
 	/**
 	 * Config admin key to define the TSIG key to be used to sign requests 
 	 */
-	public final String CA_TSIG_KEY = "tsig-key";
-	public final Object CA_TSIG_KEY_NAME = "tsig-key-name";
+	public final String CA_TSIG_KEY = "tsig-key"; //$NON-NLS-1$
+	public final Object CA_TSIG_KEY_NAME = "tsig-key-name"; //$NON-NLS-1$
 
 }
diff --git a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/Messages.java b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/Messages.java
new file mode 100644
index 000000000..9bc75293d
--- /dev/null
+++ b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/Messages.java
@@ -0,0 +1,27 @@
+package org.eclipse.ecf.provider.dnssd;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.ecf.provider.dnssd.messages"; //$NON-NLS-1$
+	public static String DnsSdDiscoveryAdvertiser_Container_Already_Connected;
+	public static String DnsSdDiscoveryAdvertiser_No_DynDns_Servers_Found;
+	public static String DnsSdDiscoveryContainerAdapter_Comparator_SRV_Records;
+	public static String DnsSdDiscoveryContainerAdapter_No_IDiscovery_Advertiser;
+	public static String DnsSdDiscoveryContainerAdapter_No_IDiscovery_Locator;
+	public static String DnsSdDiscoveryException_1;
+	public static String DnsSdDiscoveryException_3;
+	public static String DnsSdDiscoveryException_DynDns_Update_Denied;
+	public static String DnsSdDiscoveryException_DynDNS_Updated_Failed;
+	public static String DnsSdDiscoveryException_TSIG_Verify_Failed;
+	public static String DnsSdDiscoveryLocator_Container_Already_Connected;
+	public static String DnsSdDiscoveryLocator_No_Target_ID;
+	public static String DnsSdNamespace_Wrong_Parameters;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/messages.properties b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/messages.properties
new file mode 100644
index 000000000..39797cb1a
--- /dev/null
+++ b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/messages.properties
@@ -0,0 +1,11 @@
+DnsSdDiscoveryAdvertiser_Container_Already_Connected=Already connected
+DnsSdDiscoveryAdvertiser_No_DynDns_Servers_Found=No server for dnsupdate could be found
+DnsSdDiscoveryContainerAdapter_Comparator_SRV_Records=This appears to be a bug: Comparator can only compare SRVRecords
+DnsSdDiscoveryContainerAdapter_No_IDiscovery_Advertiser=This is not an IDiscoveryAdvertiser
+DnsSdDiscoveryContainerAdapter_No_IDiscovery_Locator=This is not an IDiscoveryLocator
+DnsSdDiscoveryException_DynDns_Update_Denied=DNS update denied by server (return code: {0} ) 
+DnsSdDiscoveryException_DynDNS_Updated_Failed=DNS update failed with return code: {0}
+DnsSdDiscoveryException_TSIG_Verify_Failed=TSIG verify failed (BADKEY) (return code: {0} )
+DnsSdDiscoveryLocator_Container_Already_Connected=Already connected
+DnsSdDiscoveryLocator_No_Target_ID=No target id given and fallbacks failed
+DnsSdNamespace_Wrong_Parameters=Wrong parameters