FELIX-3833 Need also the structured map as an internal request attribute for the AbstractWebConsole to properly render the navigation
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1426555 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/AbstractWebConsolePlugin.java b/webconsole/src/main/java/org/apache/felix/webconsole/AbstractWebConsolePlugin.java
index 21f297d..328c3dd 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/AbstractWebConsolePlugin.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/AbstractWebConsolePlugin.java
@@ -29,6 +29,7 @@
import javax.servlet.http.*;
import org.apache.commons.io.IOUtils;
+import org.apache.felix.webconsole.internal.servlet.OsgiManager;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.service.log.LogService;
@@ -637,8 +638,8 @@
current = current.substring( 1, slash );
String appRoot = ( String ) request.getAttribute( WebConsoleConstants.ATTR_APP_ROOT );
- Map menuMap = ( Map ) request.getAttribute( WebConsoleConstants.ATTR_LABEL_MAP );
+ Map menuMap = ( Map ) request.getAttribute( OsgiManager.ATTR_LABEL_MAP_CATEGORIZED );
this.renderMenu( menuMap, appRoot, pw );
// render lang-box
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
index 51db475..aff9c9c 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
@@ -92,7 +92,7 @@
/**
* Old name of the request attribute providing the mappings from label to
- * page title. This attribute is no deprecated and replaced by
+ * page title. This attribute is now deprecated and replaced by
* {@link WebConsoleConstants#ATTR_LABEL_MAP}.
*
* @deprecated use {@link WebConsoleConstants#ATTR_LABEL_MAP} instead
@@ -101,6 +101,12 @@
+ ".labelMap";
/**
+ * The name of the (internal) request attribute providing the categorized
+ * label map structure.
+ */
+ public static final String ATTR_LABEL_MAP_CATEGORIZED = WebConsoleConstants.ATTR_LABEL_MAP + ".categorized";
+
+ /**
* The name and value of a parameter which will prevent redirection to a
* render after the action has been executed (value is "_noredir_"). This
* may be used by programmatic action submissions.
@@ -484,19 +490,20 @@
AbstractWebConsolePlugin plugin = getConsolePlugin(label);
if (plugin != null)
{
- final Map labelMap = holder.getLocalizedLabelMap( resourceBundleManager, locale );
+ final Map labelMap = holder.getLocalizedLabelMap( resourceBundleManager, locale, "Main" );
final Object flatLabelMap = labelMap.remove( WebConsoleConstants.ATTR_LABEL_MAP );
// the official request attributes
request.setAttribute(WebConsoleConstants.ATTR_LANG_MAP, getLangMap());
request.setAttribute(WebConsoleConstants.ATTR_LABEL_MAP, flatLabelMap);
+ request.setAttribute( ATTR_LABEL_MAP_CATEGORIZED, labelMap );
request.setAttribute(WebConsoleConstants.ATTR_APP_ROOT,
request.getContextPath() + request.getServletPath());
request.setAttribute(WebConsoleConstants.ATTR_PLUGIN_ROOT,
request.getContextPath() + request.getServletPath() + '/' + label);
// deprecated request attributes
- request.setAttribute(ATTR_LABEL_MAP_OLD, labelMap);
+ request.setAttribute(ATTR_LABEL_MAP_OLD, flatLabelMap);
request.setAttribute(ATTR_APP_ROOT_OLD,
request.getContextPath() + request.getServletPath());
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/PluginHolder.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/PluginHolder.java
index 1818d3b..d95d459 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/PluginHolder.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/PluginHolder.java
@@ -236,7 +236,7 @@
*
* @return The localized map of labels to titles
*/
- Map getLocalizedLabelMap( final ResourceBundleManager resourceBundleManager, final Locale locale )
+ Map getLocalizedLabelMap( final ResourceBundleManager resourceBundleManager, final Locale locale, final String defaultCategory )
{
final Map map = new HashMap();
final Map flatMap = new HashMap();
@@ -255,8 +255,8 @@
String category = plugin.getCategory();
if ( category == null || category.trim().length() == 0 )
{
- // TODO: FELIX-3769; decide whether hard code or configurable
- category = "Main";
+ // FELIX-3798 configured default category
+ category = defaultCategory;
}
// TODO: FELIX-3769; translate the Category