FELIX-1916 Change bundle 'Location' label to 'Bundle Location' to clarify this is the value of the Bundle.getLocation() method, which is constant over the bundle installed life time.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@886990 13f79535-47bb-0310-9956-ffa450edef68
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 5315a59..84d4c30 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
@@ -332,7 +332,7 @@
super.doPost( req, resp );
}
}
-
+
private String getServicesRoot(HttpServletRequest request)
{
return ( ( String ) request.getAttribute( WebConsoleConstants.ATTR_APP_ROOT ) ) +
@@ -688,7 +688,7 @@
jw.array();
keyVal( jw, "Symbolic Name", bundle.getSymbolicName() );
keyVal( jw, "Version", headers.get( Constants.BUNDLE_VERSION ) );
- keyVal( jw, "Location", bundle.getLocation() );
+ keyVal( jw, "Bundle Location", bundle.getLocation() );
keyVal( jw, "Last Modification", new Date( bundle.getLastModified() ) );
String docUrl = ( String ) headers.get( Constants.BUNDLE_DOCURL );
@@ -955,11 +955,11 @@
}
}
}
-
+
private String getServiceID(ServiceReference ref, final String servicesRoot) {
String id = ref.getProperty( Constants.SERVICE_ID ).toString();
StringBuffer val = new StringBuffer();
-
+
if ( servicesRoot != null ) {
val.append( "<a href='" ).append( servicesRoot ).append( id ).append( "'>" );
val.append( id );
@@ -981,8 +981,8 @@
for ( int i = 0; i < refs.length; i++ )
{
-
-
+
+
String key = "Service ID " + getServiceID( refs[i], servicesRoot );
JSONArray val = new JSONArray();