This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch http-4.x
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/http-4.x by this push:
new 02abdf3f09 FELIX-6658 : URLs for status printers changed
02abdf3f09 is described below
commit 02abdf3f09ae78489435fb50728b7cec1b3d00c4
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Wed Oct 4 08:09:56 2023 +0200
FELIX-6658 : URLs for status printers changed
---
webconsole/README.md | 7 +++++++
.../webconsole/internal/AbstractConfigurationPrinter.java | 10 +---------
.../apache/felix/webconsole/internal/core/BundlesServlet.java | 3 ++-
.../webconsole/internal/misc/SystemPropertiesPrinter.java | 7 -------
.../apache/felix/webconsole/internal/misc/ThreadPrinter.java | 7 -------
5 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/webconsole/README.md b/webconsole/README.md
index 96d308a34c..214e872f93 100644
--- a/webconsole/README.md
+++ b/webconsole/README.md
@@ -9,6 +9,13 @@ For documentation have a look at [The Apache Felix
Website](https://felix.apache
## Release Notes
+### Changes in 4.9.6
+
+####
+
+- [FELIX-6658](https://issues.apache.org/jira/browse/FELIX-6658) : URLs for
status printers changed
+
+
### Changes in 4.9.4 (11/Sep/23)
#### Improvement
diff --git
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/AbstractConfigurationPrinter.java
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/AbstractConfigurationPrinter.java
index 62cc6fd345..06ef445134 100644
---
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/AbstractConfigurationPrinter.java
+++
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/AbstractConfigurationPrinter.java
@@ -41,7 +41,7 @@ public abstract class AbstractConfigurationPrinter implements
InventoryPrinter,
this.bundleContext = bundleContext;
final Dictionary<String, Object> props = new Hashtable<>();
props.put(InventoryPrinter.TITLE, this.getTitle());
- props.put(InventoryPrinter.NAME, this.getLabel());
+ props.put(InventoryPrinter.NAME, this.getTitle());
this.registration = bundleContext.registerService(
InventoryPrinter.class, this, props );
}
@@ -78,12 +78,4 @@ public abstract class AbstractConfigurationPrinter
implements InventoryPrinter,
* @return The title
*/
protected abstract String getTitle();
-
- /**
- * Get the label
- * @return The label
- */
- protected String getLabel() {
- return this.getTitle();
- }
}
diff --git
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
index 814f60600f..67b4bd1e1f 100644
---
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
+++
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
@@ -96,6 +96,7 @@ public class BundlesServlet extends SimpleWebConsolePlugin
implements OsgiManage
/** the label of the bundles plugin - used by other plugins to reference
to plugin details */
public static final String NAME = "bundles";
+ public static final String PRINTER_NAME = "Bundles";
private static final String TITLE = "%bundles.pluginTitle";
private static final String CSS[] = { "/res/ui/bundles.css" };
@@ -192,7 +193,7 @@ public class BundlesServlet extends SimpleWebConsolePlugin
implements OsgiManage
Hashtable<String, Object> props = new Hashtable<>();
props.put(InventoryPrinter.TITLE, this.getTitle());
- props.put(InventoryPrinter.NAME, this.getLabel());
+ props.put(InventoryPrinter.NAME, PRINTER_NAME);
configurationPrinter = bundleContext.registerService(
InventoryPrinter.class, this, props );
bipCapabilitiesProvided = bundleContext.registerService(
BundleInfoProvider.class, new CapabilitiesProvidedInfoProvider(
bundleContext.getBundle() ), null );
bipCapabilitiesRequired = bundleContext.registerService(
BundleInfoProvider.class, new CapabilitiesRequiredInfoProvider(
bundleContext.getBundle() ), null );
diff --git
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/SystemPropertiesPrinter.java
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/SystemPropertiesPrinter.java
index bcbfbb9b28..6e6c267819 100644
---
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/SystemPropertiesPrinter.java
+++
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/SystemPropertiesPrinter.java
@@ -33,18 +33,11 @@ public class SystemPropertiesPrinter extends
AbstractConfigurationPrinter {
private static final String TITLE = "System Properties";
- private static final String LABEL = "_systemproperties";
-
@Override
protected String getTitle() {
return TITLE;
}
- @Override
- protected String getLabel() {
- return LABEL;
- }
-
@Override
public void print(final PrintWriter pw, final Format format, final boolean
isZip) {
Properties props = System.getProperties();
diff --git
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/ThreadPrinter.java
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/ThreadPrinter.java
index 99ecc2a93b..1df22b7966 100644
---
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/ThreadPrinter.java
+++
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/ThreadPrinter.java
@@ -30,8 +30,6 @@ public class ThreadPrinter extends
AbstractConfigurationPrinter {
private static final String TITLE = "Threads";
- private static final String LABEL = "_threads";
-
private final ThreadDumper dumper = new ThreadDumper();
@Override
@@ -39,11 +37,6 @@ public class ThreadPrinter extends
AbstractConfigurationPrinter {
return TITLE;
}
- @Override
- protected String getLabel() {
- return LABEL;
- }
-
@Override
public void print(final PrintWriter pw, final Format format, final boolean
isZip) {
dumper.printThreads(pw, isZip);
