You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ld...@apache.org on 2012/09/06 00:09:02 UTC
svn commit: r1381416 - in /karaf/webconsole/trunk/camel/src/main:
java/org/apache/karaf/webconsole/camel/internal/widget/
resources/OSGI-INF/blueprint/
resources/org/apache/karaf/webconsole/camel/internal/widget/
Author: ldywicki
Date: Wed Sep 5 22:09:02 2012
New Revision: 1381416
URL: http://svn.apache.org/viewvc?rev=1381416&view=rev
Log:
KARAF-1795 Fix camel widget and provide additional information about delpoyed contexts
Signed-off-by: Lukasz Dywicki <lu...@code-house.org>
Modified:
karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.java
karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/widget/CamelWidgetProvider.java
karaf/webconsole/trunk/camel/src/main/resources/OSGI-INF/blueprint/camel.xml
karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.html
Modified: karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.java?rev=1381416&r1=1381415&r2=1381416&view=diff
==============================================================================
--- karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.java (original)
+++ karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.java Wed Sep 5 22:09:02 2012
@@ -25,6 +25,7 @@ import org.apache.wicket.markup.html.lin
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Panel;
+import org.ops4j.pax.wicket.api.PaxWicketBean;
/**
* Widget with list of camel contexts.
@@ -33,21 +34,22 @@ public class CamelWidget extends Panel {
private static final long serialVersionUID = 1L;
+ @PaxWicketBean(name = "contexts")
+ private List<CamelContext> contexts;
+
@SuppressWarnings("serial")
- public CamelWidget(String id, List<CamelContext> contexts) {
+ public CamelWidget(String id) {
super(id);
-// List<CamelContext> subList = new ArrayList<CamelContext>(contexts);
-// if (subList.size() > 4) {
-// subList = subList.subList(0, 4);
-// }
add(new Label("count", "" + contexts.size()));
- add(new ListView<CamelContext>("contexts"/*, subList*/) {
+ add(new ListView<CamelContext>("contexts", contexts) {
@Override
protected void populateItem(ListItem<CamelContext> item) {
CamelContext model = item.getModelObject();
- add(new Label("name", model.getName()));
+ item.add(new Label("name", model.getName()));
+ item.add(new Label("uptime", model.getUptime()));
+ item.add(new Label("routeCount", ""+ model.getRouteDefinitions().size()));
}
});
Modified: karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/widget/CamelWidgetProvider.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/widget/CamelWidgetProvider.java?rev=1381416&r1=1381415&r2=1381416&view=diff
==============================================================================
--- karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/widget/CamelWidgetProvider.java (original)
+++ karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/widget/CamelWidgetProvider.java Wed Sep 5 22:09:02 2012
@@ -16,22 +16,13 @@
*/
package org.apache.karaf.webconsole.camel.internal.widget;
-import java.util.List;
-
-import org.apache.camel.CamelContext;
import org.apache.karaf.webconsole.core.widget.WidgetProvider;
import org.apache.wicket.markup.html.panel.Panel;
public class CamelWidgetProvider implements WidgetProvider {
- private final List<CamelContext> contexts;
-
- public CamelWidgetProvider(List<CamelContext> contexts) {
- this.contexts = contexts;
- }
-
public Panel createPanel(String id) {
- return new CamelWidget(id, contexts);
+ return new CamelWidget(id);
}
}
Modified: karaf/webconsole/trunk/camel/src/main/resources/OSGI-INF/blueprint/camel.xml
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/camel/src/main/resources/OSGI-INF/blueprint/camel.xml?rev=1381416&r1=1381415&r2=1381416&view=diff
==============================================================================
--- karaf/webconsole/trunk/camel/src/main/resources/OSGI-INF/blueprint/camel.xml (original)
+++ karaf/webconsole/trunk/camel/src/main/resources/OSGI-INF/blueprint/camel.xml Wed Sep 5 22:09:02 2012
@@ -23,17 +23,15 @@
<bean id="tracer" class="org.apache.karaf.webconsole.camel.internal.tracking.DefaultTracerContainer" />
- <reference-list id="contexts" interface="org.apache.camel.CamelContext"/>
+ <reference-list id="contexts" interface="org.apache.camel.CamelContext" availability="optional" />
- <service ref="widgetProvider" interface="org.apache.karaf.webconsole.core.widget.WidgetProvider">
+ <service interface="org.apache.karaf.webconsole.core.widget.WidgetProvider">
<service-properties>
<entry key="intention" value="dashboard" />
</service-properties>
+ <bean class="org.apache.karaf.webconsole.camel.internal.widget.CamelWidgetProvider" />
</service>
- <bean id="widgetProvider" class="org.apache.karaf.webconsole.camel.internal.widget.CamelWidgetProvider">
- <argument ref="contexts" />
- </bean>
<service auto-export="interfaces">
<bean class="org.apache.karaf.webconsole.camel.internal.tracking.TraceInterceptStrategy">
Modified: karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.html?rev=1381416&r1=1381415&r2=1381416&view=diff
==============================================================================
--- karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.html (original)
+++ karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.html Wed Sep 5 22:09:02 2012
@@ -16,17 +16,21 @@
limitations under the License.
-->
<wicket:panel xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
- <div class="grid_6 widget">
+ <div class="span6 widget">
<h1>Deployed camel contexts</h1>
- <p>You have <span wicket:id="count">13</span> camel contexts deployed. First four are:</p>
+ <p>You have <span wicket:id="count">13</span> camel contexts deployed.</p>
<table class="table table-striped table-condensed">
<tr>
<th>Name</th>
+ <th>Uptime</th>
+ <th title="Number of all routes">Routes</th>
</tr>
<tr wicket:id="contexts">
- <td><span wicket:id="name">.test-context</span></td>
+ <td><span wicket:id="name"></span></td>
+ <td><span wicket:id="uptime"></span></td>
+ <td><span wicket:id="routeCount"></span></td>
</tr>
</table>