Externalized string in ECF RSA impl
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/.settings/org.eclipse.jdt.core.prefs b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/.settings/org.eclipse.jdt.core.prefs
index 542b8df..77378cc 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/.settings/org.eclipse.jdt.core.prefs
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,12 @@
-#Sat Jan 22 17:14:11 PST 2011
+#Fri May 13 11:36:47 PDT 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -35,7 +39,7 @@
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
org.eclipse.jdt.core.compiler.problem.nullReference=warning
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
@@ -44,12 +48,15 @@
org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractContainerSelector.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractContainerSelector.java
index 1b24898..a395f39 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractContainerSelector.java
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractContainerSelector.java
@@ -151,7 +151,7 @@
return containerFactory.createContainer(containerTypeDescription);
} catch (ContainerCreateException e) {
throw new SelectContainerException(
- "Exception creating or configuring container", e,
+ "Exception creating or configuring container", e, //$NON-NLS-1$
containerTypeDescription);
}
}
@@ -171,7 +171,7 @@
// <containerTypeDescription.name>.
Map<String, Object> results = new HashMap<String, Object>();
for (String origKey : properties.keySet()) {
- if (origKey.startsWith(exportedConfig + ".")) {
+ if (origKey.startsWith(exportedConfig + ".")) { //$NON-NLS-1$
String key = origKey.substring(exportedConfig.length() + 1);
if (key != null)
results.put(key, properties.get(origKey));
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionLocator.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionLocator.java
index 9e2fe27..59443c1 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionLocator.java
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionLocator.java
@@ -389,7 +389,7 @@
String matchingFilters, boolean discovered) {
if (eventQueue == null)
return;
- trace("queueEndpointDescription", "endpointDescription="
+ trace("queueEndpointDescription", "endpointDescription=" //$NON-NLS-1$ //$NON-NLS-2$
+ endpointDescription);
synchronized (eventQueue) {
eventQueue
@@ -618,7 +618,7 @@
if (description.matches(filter))
return filter;
} catch (IllegalArgumentException e) {
- logError("isMatch", "invalid endpoint listener filter="
+ logError("isMatch", "invalid endpoint listener filter=" //$NON-NLS-1$ //$NON-NLS-2$
+ filters, e);
}
}
@@ -825,8 +825,8 @@
}
void handleService(IServiceInfo serviceInfo, boolean discovered) {
- logInfo("handleService", "serviceInfo=" + serviceInfo
- + ",discovered=" + discovered);
+ logInfo("handleService", "serviceInfo=" + serviceInfo //$NON-NLS-1$ //$NON-NLS-2$
+ + ",discovered=" + discovered); //$NON-NLS-1$
IServiceID serviceID = serviceInfo.getServiceID();
if (matchServiceID(serviceID))
handleOSGiServiceEndpoint(serviceID, serviceInfo, discovered);
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionReader.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionReader.java
index 54f6c05..1197f12 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionReader.java
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionReader.java
@@ -46,7 +46,7 @@
DebugOptions.ENDPOINT_DESCRIPTION_READER,
this.getClass(),
"Exception parsing endpoint description properties", e); //$NON-NLS-1$
- throw new IOException("Error creating endpoint description: "
+ throw new IOException("Error creating endpoint description: " //$NON-NLS-1$
+ e.getMessage());
}
}
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteConstants.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteConstants.java
index 444a5d2..86a73b5 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteConstants.java
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteConstants.java
@@ -171,7 +171,7 @@
* It allows those accessing the remote service proxy to get information
* about the endpoint id.
*/
- public static final String SERVICE_IMPORTED_ENDPOINT_ID = "ecf.service.imported.endpoint.id";
+ public static final String SERVICE_IMPORTED_ENDPOINT_ID = "ecf.service.imported.endpoint.id"; //$NON-NLS-1$
/**
* This property is set on the remote service proxy during
@@ -182,5 +182,5 @@
* . It allows those accessing the remote service proxy to get information
* about the endpoint remote service id.
*/
- public static final String SERVICE_IMPORTED_ENDPOINT_SERVICE_ID = "ecf.service.imported.endpoint.service.id";
+ public static final String SERVICE_IMPORTED_ENDPOINT_SERVICE_ID = "ecf.service.imported.endpoint.service.id"; //$NON-NLS-1$
}
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteReferenceNotFoundException.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteReferenceNotFoundException.java
index 619b6e2..e8a68f4 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteReferenceNotFoundException.java
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteReferenceNotFoundException.java
@@ -60,9 +60,9 @@
}
public String toString() {
- return "RemoteReferenceNotFoundException[targetID=" + targetID
- + ", idFilter=" + Arrays.toString(idFilter) + ", interfaces="
- + interfaces + ", rsFilter=" + rsFilter + "]";
+ return "RemoteReferenceNotFoundException[targetID=" + targetID //$NON-NLS-1$
+ + ", idFilter=" + Arrays.toString(idFilter) + ", interfaces=" //$NON-NLS-1$ //$NON-NLS-2$
+ + interfaces + ", rsFilter=" + rsFilter + "]"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java
index 96eacbd..8d99cca 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java
@@ -113,8 +113,8 @@
public RemoteServiceAdmin(Bundle clientBundle) {
this.clientBundle = clientBundle;
Assert.isNotNull(this.clientBundle);
- trace("RemoteServiceAdmin<init>",
- "clientBundle=" + clientBundle.getSymbolicName());
+ trace("RemoteServiceAdmin<init>", //$NON-NLS-1$
+ "clientBundle=" + clientBundle.getSymbolicName()); //$NON-NLS-1$
// Only setup defaults if it hasn't already been done by some other
// Remote Service Admin instance
Properties props = new Properties();
@@ -222,8 +222,8 @@
} catch (SelectContainerException e) {
ExportRegistration errorRegistration = createErrorExportRegistration(
serviceReference, overridingProperties,
- "Error selecting or creating host container for serviceReference="
- + serviceReference + " properties="
+ "Error selecting or creating host container for serviceReference=" //$NON-NLS-1$
+ + serviceReference + " properties=" //$NON-NLS-1$
+ overridingProperties, e);
Collection<org.osgi.service.remoteserviceadmin.ExportRegistration> result = new ArrayList<org.osgi.service.remoteserviceadmin.ExportRegistration>();
result.add(errorRegistration);
@@ -234,7 +234,7 @@
if (rsContainers == null || rsContainers.length == 0) {
String errorMessage = "No containers found for serviceReference=" //$NON-NLS-1$
+ serviceReference
- + " properties=" + overridingProperties + ". Remote service NOT EXPORTED";//$NON-NLS-2$
+ + " properties=" + overridingProperties + ". Remote service NOT EXPORTED"; //$NON-NLS-1$//$NON-NLS-2$
logWarning("exportService", errorMessage); //$NON-NLS-1$
return Collections.EMPTY_LIST;
}
@@ -297,10 +297,10 @@
ContainerTypeDescription ctd = exception.getContainerTypeDescription();
overridingProperties
.put(org.osgi.service.remoteserviceadmin.RemoteConstants.ENDPOINT_ID,
- "noendpoint");
+ "noendpoint"); //$NON-NLS-1$
overridingProperties
.put(org.osgi.service.remoteserviceadmin.RemoteConstants.SERVICE_IMPORTED_CONFIGS,
- (ctd == null) ? "noconfig" : ctd.getName());
+ (ctd == null) ? "noconfig" : ctd.getName()); //$NON-NLS-1$
return new ExportRegistration(exception, new EndpointDescription(
serviceReference, overridingProperties));
}
@@ -425,8 +425,8 @@
private void addImportRegistration(ImportRegistration importRegistration) {
synchronized (importedRegistrations) {
importedRegistrations.add(importRegistration);
- trace("addImportRegistration", "importRegistration="
- + importRegistration + " importedRegistrations="
+ trace("addImportRegistration", "importRegistration=" //$NON-NLS-1$ //$NON-NLS-2$
+ + importRegistration + " importedRegistrations=" //$NON-NLS-1$
+ importedRegistrations);
}
}
@@ -434,8 +434,8 @@
private void addExportRegistration(ExportRegistration exportRegistration) {
synchronized (exportedRegistrations) {
exportedRegistrations.add(exportRegistration);
- trace("addExportRegistration", "exportRegistration="
- + exportRegistration + " exportedRegistrations="
+ trace("addExportRegistration", "exportRegistration=" //$NON-NLS-1$ //$NON-NLS-2$
+ + exportRegistration + " exportedRegistrations=" //$NON-NLS-1$
+ exportedRegistrations);
}
}
@@ -1486,7 +1486,7 @@
BundleContext proxyServiceFactoryContext = getProxyServiceFactoryContext(endpointDescription);
if (proxyServiceFactoryContext == null)
throw new NullPointerException(
- "getProxyServiceFactoryContext returned null. Cannot register proxy service factory");
+ "getProxyServiceFactoryContext returned null. Cannot register proxy service factory"); //$NON-NLS-1$
IRemoteServiceContainerAdapter containerAdapter = rsContainer
.getContainerAdapter();
@@ -1525,39 +1525,39 @@
Activator a = Activator.getDefault();
if (a == null)
throw new NullPointerException(
- "ECF RemoteServiceAdmin Activator cannot be null.");
+ "ECF RemoteServiceAdmin Activator cannot be null."); //$NON-NLS-1$
if (a.isOldEquinox()) {
PackageAdmin packageAdmin = getPackageAdmin();
if (packageAdmin == null)
throw new NullPointerException(
- "PackageAdmin cannot be accessed by ECF RemoteServiceAdmin");
+ "PackageAdmin cannot be accessed by ECF RemoteServiceAdmin"); //$NON-NLS-1$
// In this case, we get the Bundle that exposes the first service
// interface class
BundleContext rsaContext = Activator.getContext();
if (rsaContext == null)
throw new NullPointerException(
- "RSA BundleContext cannot be null");
+ "RSA BundleContext cannot be null"); //$NON-NLS-1$
List<String> interfaces = endpointDescription.getInterfaces();
Collection<Class> serviceInterfaceClasses = loadServiceInterfacesViaBundle(
rsaContext.getBundle(),
interfaces.toArray(new String[interfaces.size()]));
if (serviceInterfaceClasses.size() == 0)
throw new NullPointerException(
- "No interface classes loadable for endpointDescription="
+ "No interface classes loadable for endpointDescription=" //$NON-NLS-1$
+ endpointDescription);
// Get the bundle responsible for the first service interface class
Class serviceInterfaceClass = serviceInterfaceClasses.iterator()
.next();
Bundle bundle = packageAdmin.getBundle(serviceInterfaceClass);
if (bundle == null)
- throw new BundleException("Bundle for service interface class="
- + serviceInterfaceClass.getName() + " cannot be found");
+ throw new BundleException("Bundle for service interface class=" //$NON-NLS-1$
+ + serviceInterfaceClass.getName() + " cannot be found"); //$NON-NLS-1$
int bundleState = bundle.getState();
BundleContext bundleContext = bundle.getBundleContext();
if (bundleContext == null)
- throw new BundleException("Bundle=" + bundle.getSymbolicName()
- + " in wrong state (" + bundleState
- + ") for using BundleContext proxy service factory");
+ throw new BundleException("Bundle=" + bundle.getSymbolicName() //$NON-NLS-1$
+ + " in wrong state (" + bundleState //$NON-NLS-1$
+ + ") for using BundleContext proxy service factory"); //$NON-NLS-1$
return bundleContext;
}
return a.getProxyServiceFactoryBundleContext();
@@ -1798,11 +1798,11 @@
Version remoteVersion = interfaceVersions.get(className);
Version localVersion = exportedPackage.getVersion();
if (comparePackageVersions(packageName, remoteVersion, localVersion)) {
- logError("verifyServiceInterfaceVersionsForProxy",
- "Failed version check for proxy creation. clientBundle="
- + clientBundle + " interfaceType=" + className
- + " remoteVersion=" + remoteVersion
- + " localVersion=" + localVersion);
+ logError("verifyServiceInterfaceVersionsForProxy", //$NON-NLS-1$
+ "Failed version check for proxy creation. clientBundle=" //$NON-NLS-1$
+ + clientBundle + " interfaceType=" + className //$NON-NLS-1$
+ + " remoteVersion=" + remoteVersion //$NON-NLS-1$
+ + " localVersion=" + localVersion); //$NON-NLS-1$
result = false;
}
}
@@ -1988,11 +1988,11 @@
endpointDescription, rsContainer, selectedRsReference));
} catch (Exception e) {
logError(
- "importService", "selectRemoteServiceReference returned null for rsRefs=" //$NON-NLS-1$
+ "importService", "selectRemoteServiceReference returned null for rsRefs=" //$NON-NLS-1$ //$NON-NLS-2$
+ rsRefs + ",targetID=" + targetID //$NON-NLS-1$
+ ",idFilter=" + idFilter + ",interfaces=" //$NON-NLS-1$ //$NON-NLS-2$
+ interfaces + ",rsFilter=" + rsFilter //$NON-NLS-1$
- + ",rsContainerID=" + rsContainerID, e);
+ + ",rsContainerID=" + rsContainerID, e); //$NON-NLS-1$
return new ImportRegistration(endpointDescription, e);
}
}
