Code cleanup. git-svn-id: https://svn.apache.org/repos/asf/karaf/cellar/branches/cellar-2.3.x@1476945 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/632aca5a Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/632aca5a Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/632aca5a Branch: refs/heads/cellar-2.3.x Commit: 632aca5ae04fdcdec4b0021d8177019c0da13703 Parents: f635a3d Author: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Authored: Mon Apr 29 09:46:29 2013 +0000 Committer: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Committed: Mon Apr 29 09:46:29 2013 +0000 ---------------------------------------------------------------------- .../cellar/webconsole/ClusterGroupsPlugin.java | 21 ++++---------------- .../OSGI-INF/blueprint/webconsole-cellar.xml | 1 - .../src/main/resources/res/ui/cluster-groups.js | 2 +- 3 files changed, 5 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/632aca5a/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/ClusterGroupsPlugin.java ---------------------------------------------------------------------- diff --git a/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/ClusterGroupsPlugin.java b/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/ClusterGroupsPlugin.java index 8c73df6..0bd1b42 100644 --- a/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/ClusterGroupsPlugin.java +++ b/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/ClusterGroupsPlugin.java @@ -40,11 +40,6 @@ import java.util.Set; public class ClusterGroupsPlugin extends AbstractWebConsolePlugin { - /** - * Pseudo class version ID to keep the IDE quite. - */ - private static final long serialVersionUID = 1L; - private static final transient Logger LOGGER = LoggerFactory.getLogger(ClusterGroupsPlugin.class); public static final String NAME = "cluster.groups"; @@ -61,10 +56,6 @@ public class ClusterGroupsPlugin extends AbstractWebConsolePlugin { private BundleContext bundleContext; - // - // Blueprint lifecycle callback methods - // - public void start() { super.activate(bundleContext); @@ -73,24 +64,22 @@ public class ClusterGroupsPlugin extends AbstractWebConsolePlugin { this.LOGGER.info("{} plugin activated", LABEL); } - public void stop() { this.LOGGER.info("{} plugin deactivated", LABEL); super.deactivate(); } - // - // AbstractWebConsolePlugin interface - // - + @Override public String getLabel() { return NAME; } + @Override public String getTitle() { return LABEL; } + @Override protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { boolean success = false; @@ -148,6 +137,7 @@ public class ClusterGroupsPlugin extends AbstractWebConsolePlugin { } } + @Override protected void renderContent(HttpServletRequest request, HttpServletResponse response) throws IOException { // get request info from request attribute final PrintWriter pw = response.getWriter(); @@ -174,9 +164,6 @@ public class ClusterGroupsPlugin extends AbstractWebConsolePlugin { pw.println("</script>"); } - // - // Additional methods - // protected URL getResource(String path) { path = path.substring(NAME.length() + 1); URL url = this.classLoader.getResource(path); http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/632aca5a/webconsole/src/main/resources/OSGI-INF/blueprint/webconsole-cellar.xml ---------------------------------------------------------------------- diff --git a/webconsole/src/main/resources/OSGI-INF/blueprint/webconsole-cellar.xml b/webconsole/src/main/resources/OSGI-INF/blueprint/webconsole-cellar.xml index 6d0dd99..37637fe 100644 --- a/webconsole/src/main/resources/OSGI-INF/blueprint/webconsole-cellar.xml +++ b/webconsole/src/main/resources/OSGI-INF/blueprint/webconsole-cellar.xml @@ -31,7 +31,6 @@ <property name="clusterManager" ref="clusterManager"/> <property name="executionContext" ref="executionContext"/> </bean> - <service ref="clusterGroupPlugin" interface="javax.servlet.Servlet"> <service-properties> <entry key="felix.webconsole.label" value="cluster.groups"/> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/632aca5a/webconsole/src/main/resources/res/ui/cluster-groups.js ---------------------------------------------------------------------- diff --git a/webconsole/src/main/resources/res/ui/cluster-groups.js b/webconsole/src/main/resources/res/ui/cluster-groups.js index 66f8d50..8c6fe19 100644 --- a/webconsole/src/main/resources/res/ui/cluster-groups.js +++ b/webconsole/src/main/resources/res/ui/cluster-groups.js @@ -105,7 +105,7 @@ function renderGroupTableData(/* array of Objects */ data) { } /** - * Adds under the parent element a group/member/actions row + * Add under the parent element a group/member/actions row * @param parent * @param group */
