Author: fmeschbe
Date: Thu Dec 3 23:41:44 2009
New Revision: 886990
URL: http://svn.apache.org/viewvc?rev=886990&view=rev
Log:
FELIX-1758 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.
Modified:
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
Modified:
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
URL:
http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java?rev=886990&r1=886989&r2=886990&view=diff
==============================================================================
---
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
(original)
+++
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
Thu Dec 3 23:41:44 2009
@@ -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();