Add filter in dependency requirements. (remove Id)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@963393 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/webconsole-plugin/src/main/java/org/apache/felix/ipojo/webconsole/IPOJOPlugin.java b/ipojo/webconsole-plugin/src/main/java/org/apache/felix/ipojo/webconsole/IPOJOPlugin.java
index 44260bd..240e7d0 100644
--- a/ipojo/webconsole-plugin/src/main/java/org/apache/felix/ipojo/webconsole/IPOJOPlugin.java
+++ b/ipojo/webconsole-plugin/src/main/java/org/apache/felix/ipojo/webconsole/IPOJOPlugin.java
@@ -505,7 +505,9 @@
req.put("policy", getDependencyBindingPolicy(dep.getPolicy()));
req.put("optional", dep.isOptional());
req.put("aggregate", dep.isMultiple());
- //TODO Add filter support
+ if (dep.getFilter() != null) {
+ req.put("filter", dep.getFilter());
+ }
if (dep.getServiceReferences() != null && dep.getServiceReferences().size() != 0) {
req.put("matching", getServiceReferenceList(dep.getServiceReferences()));
}
diff --git a/ipojo/webconsole-plugin/src/main/resources/res/instance.html b/ipojo/webconsole-plugin/src/main/resources/res/instance.html
index 1b62a97..9748815 100644
--- a/ipojo/webconsole-plugin/src/main/resources/res/instance.html
+++ b/ipojo/webconsole-plugin/src/main/resources/res/instance.html
@@ -64,8 +64,8 @@
<thead>
<tr>
<th class="col_Name">Specification</th>
- <th class="col_Id">Id</th>
<th class="col_State">State</th>
+ <th class="col_Filter">Filter</th>
<th class="col_Policy">Binding Policy</th>
<th class="col_Optional">Optional</th>
<th class="col_Aggregate">Aggregate</th>
@@ -76,8 +76,8 @@
<tbody>
<tr class="ui-widget-content"><!-- template -->
<td class="ui-widget-content name"> </td>
- <td class="ui-widget-content id"> </td>
<td class="ui-widget-content state"> </td>
+ <td class="ui-widget-content filter"> </td>
<td class="ui-widget-content policy"> </td>
<td class="ui-widget-content optional"> </td>
<td class="ui-widget-content aggregate"> </td>
diff --git a/ipojo/webconsole-plugin/src/main/resources/res/ui/instance_detail.js b/ipojo/webconsole-plugin/src/main/resources/res/ui/instance_detail.js
index dc58708..af4e10e 100644
--- a/ipojo/webconsole-plugin/src/main/resources/res/ui/instance_detail.js
+++ b/ipojo/webconsole-plugin/src/main/resources/res/ui/instance_detail.js
@@ -79,7 +79,12 @@
// For each service clone the template
var entry = reqEntryTemplate.clone().appendTo(tableReqBody).attr('id', 'req-' + service.id);
entry.find('td.name').text(service.specification);
- entry.find('td.id').text(service.id);
+ if (service.filter) {
+ entry.find('td.filter').text(service.filter);
+ } else {
+ entry.find('td.filter').html('<i>no filter</i>');
+ }
+
entry.find('td.state').text(service.state);
entry.find('td.policy').text(service.policy);