You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/04/29 11:46:29 UTC
svn commit: r1476945 - in
/karaf/cellar/branches/cellar-2.3.x/webconsole/src/main:
java/org/apache/karaf/cellar/webconsole/ClusterGroupsPlugin.java
resources/OSGI-INF/blueprint/webconsole-cellar.xml
resources/res/ui/cluster-groups.js
Author: jbonofre
Date: Mon Apr 29 09:46:29 2013
New Revision: 1476945
URL: http://svn.apache.org/r1476945
Log:
Code cleanup.
Modified:
karaf/cellar/branches/cellar-2.3.x/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/ClusterGroupsPlugin.java
karaf/cellar/branches/cellar-2.3.x/webconsole/src/main/resources/OSGI-INF/blueprint/webconsole-cellar.xml
karaf/cellar/branches/cellar-2.3.x/webconsole/src/main/resources/res/ui/cluster-groups.js
Modified: karaf/cellar/branches/cellar-2.3.x/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/ClusterGroupsPlugin.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/ClusterGroupsPlugin.java?rev=1476945&r1=1476944&r2=1476945&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/ClusterGroupsPlugin.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/ClusterGroupsPlugin.java Mon Apr 29 09:46:29 2013
@@ -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
private BundleContext bundleContext;
- //
- // Blueprint lifecycle callback methods
- //
-
public void start() {
super.activate(bundleContext);
@@ -73,24 +64,22 @@ public class ClusterGroupsPlugin extends
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
}
}
+ @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
pw.println("</script>");
}
- //
- // Additional methods
- //
protected URL getResource(String path) {
path = path.substring(NAME.length() + 1);
URL url = this.classLoader.getResource(path);
Modified: karaf/cellar/branches/cellar-2.3.x/webconsole/src/main/resources/OSGI-INF/blueprint/webconsole-cellar.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/webconsole/src/main/resources/OSGI-INF/blueprint/webconsole-cellar.xml?rev=1476945&r1=1476944&r2=1476945&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/webconsole/src/main/resources/OSGI-INF/blueprint/webconsole-cellar.xml (original)
+++ karaf/cellar/branches/cellar-2.3.x/webconsole/src/main/resources/OSGI-INF/blueprint/webconsole-cellar.xml Mon Apr 29 09:46:29 2013
@@ -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"/>
Modified: karaf/cellar/branches/cellar-2.3.x/webconsole/src/main/resources/res/ui/cluster-groups.js
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/webconsole/src/main/resources/res/ui/cluster-groups.js?rev=1476945&r1=1476944&r2=1476945&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/webconsole/src/main/resources/res/ui/cluster-groups.js (original)
+++ karaf/cellar/branches/cellar-2.3.x/webconsole/src/main/resources/res/ui/cluster-groups.js Mon Apr 29 09:46:29 2013
@@ -105,7 +105,7 @@ function renderGroupTableData(/* array o
}
/**
- * Adds under the parent element a group/member/actions row
+ * Add under the parent element a group/member/actions row
* @param parent
* @param group
*/