| commit | 75e95df38a71618a6fd57ce8a72f4ff559766d07 | [log] [tgz] |
|---|---|---|
| author | Felix Meschberger <fmeschbe@apache.org> | Mon Nov 26 06:40:02 2012 +0000 |
| committer | Felix Meschberger <fmeschbe@apache.org> | Mon Nov 26 06:40:02 2012 +0000 |
| tree | d8b0afaccf2de3bfebdde5ff87d641c789ef8783 | |
| parent | 1ac6f91358859de8a4c92934d5c1cec3a504c3e2 [diff] |
FELIX-3783 use static strings for service names to prevent ClassNotFoundError's when the API is not available git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1413487 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManagerBase.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManagerBase.java index 195ed1e..8af2928 100644 --- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManagerBase.java +++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManagerBase.java
@@ -50,9 +50,9 @@ private static final long serialVersionUID = -6691093960031418130L; - private static final String CONFIGURATION_ADMIN_NAME = ConfigurationAdmin.class.getName(); + static final String CONFIGURATION_ADMIN_NAME = "org.osgi.service.cm.ConfigurationAdmin"; - private static final String META_TYPE_NAME = MetaTypeService.class.getName(); + static final String META_TYPE_NAME = "org.osgi.service.metatype.MetaTypeService"; protected ConfigurationAdmin getConfigurationAdmin()
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigurationAdminConfigurationPrinter.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigurationAdminConfigurationPrinter.java index 72220c3..8d2abb1 100644 --- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigurationAdminConfigurationPrinter.java +++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigurationAdminConfigurationPrinter.java
@@ -55,8 +55,7 @@ */ public void printConfiguration(PrintWriter pw) { - ServiceReference sr = getBundleContext().getServiceReference( - ConfigurationAdmin.class.getName()); + ServiceReference sr = getBundleContext().getServiceReference( ConfigManagerBase.CONFIGURATION_ADMIN_NAME ); if (sr == null) { pw.println("Status: Configuration Admin Service not available");