FELIX-1049 : Display version and symbolic name in bundles list.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@769154 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/Util.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/Util.java
index ed2fefa..371ccdd 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/Util.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/Util.java
@@ -124,7 +124,19 @@
return name;
}
-
+ /**
+ * Returns the value of the header or the empty string if the header
+ * is not available.
+ */
+ public static String getHeaderValue( Bundle bundle, String headerName )
+ {
+ Object value = bundle.getHeaders().get(headerName);
+ if ( value != null )
+ {
+ return value.toString();
+ }
+ return "";
+ }
/**
* Orders the bundles according to their name as returned by
* {@link #getName(Bundle)}, with the exception that the system bundle is
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 d620ae3..49c12a8 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
@@ -410,6 +410,10 @@
jw.value( Util.getName( bundle ) );
jw.key( "state" );
jw.value( toStateString( bundle ) );
+ jw.key( "version" );
+ jw.value( Util.getHeaderValue(bundle, Constants.BUNDLE_VERSION) );
+ jw.key( "symbolicName" );
+ jw.value( Util.getHeaderValue(bundle, Constants.BUNDLE_SYMBOLICNAME) );
jw.key( "actions" );
jw.array();
diff --git a/webconsole/src/main/resources/res/ui/bundles.js b/webconsole/src/main/resources/res/ui/bundles.js
index 30d11dc..c4e7298 100644
--- a/webconsole/src/main/resources/res/ui/bundles.js
+++ b/webconsole/src/main/resources/res/ui/bundles.js
@@ -105,6 +105,8 @@
parent.appendChild( td( null, null, [ text( id ) ] ) );
parent.appendChild( td( null, null, [ inputElement, text(" "), titleElement ] ) );
+ parent.appendChild( td( null, null, [ text( dataEntry.version ) ] ) );
+ parent.appendChild( td( null, null, [ text( dataEntry.symbolicName ) ] ) );
parent.appendChild( td( null, null, [ text( state ) ] ) );
var actionsTd = td( null, null );
var div = createElement("div", null, {
@@ -210,7 +212,7 @@
function renderBundles(data) {
$(document).ready(function(){
- renderView( ["Id", "Name", "Status", "Actions"],
+ renderView( ["Id", "Name", "Version", "Symbolic Name", "Status", "Actions"],
"<input type='hidden' name='action' value='install'/>" +
"<input class='fileinput' type='file' name='bundlefile' style='margin-left:10px'/>" +
" - Start <input class='checkradio' type='checkbox' name='bundlestart' value='start' style='vertical-align:middle;'/>" +
@@ -231,7 +233,7 @@
$("#plugin_table").tablesorter({
headers: {
0: { sorter:"digit"},
- 3: { sorter: false }
+ 5: { sorter: false }
},
sortList: [[1,0]],
textExtraction:extractMethod