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:39:22 UTC
svn commit: r1476942 - in /karaf/cellar/trunk/webconsole/src/main:
java/org/apache/karaf/cellar/webconsole/CellarPlugin.java
resources/OSGI-INF/blueprint/webconsole-cellar.xml resources/res/ui/cellar.js
Author: jbonofre
Date: Mon Apr 29 09:39:22 2013
New Revision: 1476942
URL: http://svn.apache.org/r1476942
Log:
Code cleanup.
Modified:
karaf/cellar/trunk/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/CellarPlugin.java
karaf/cellar/trunk/webconsole/src/main/resources/OSGI-INF/blueprint/webconsole-cellar.xml
karaf/cellar/trunk/webconsole/src/main/resources/res/ui/cellar.js
Modified: karaf/cellar/trunk/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/CellarPlugin.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/CellarPlugin.java?rev=1476942&r1=1476941&r2=1476942&view=diff
==============================================================================
--- karaf/cellar/trunk/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/CellarPlugin.java (original)
+++ karaf/cellar/trunk/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/CellarPlugin.java Mon Apr 29 09:39:22 2013
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.webconsole;
import org.apache.felix.webconsole.AbstractWebConsolePlugin;
@@ -36,11 +35,6 @@ import java.util.Set;
public class CellarPlugin 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(CellarPlugin.class);
public static final String NAME = "cellar";
@@ -56,10 +50,6 @@ public class CellarPlugin extends Abstra
private BundleContext bundleContext;
- //
- // Blueprint lifecycle callback methods
- //
-
public void start() {
super.activate(bundleContext);
@@ -73,18 +63,17 @@ public class CellarPlugin extends Abstra
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;
@@ -117,6 +106,7 @@ public class CellarPlugin extends Abstra
}
}
+ @Override
protected void renderContent(HttpServletRequest request, HttpServletResponse response) throws IOException {
// get request info from request attribute
final PrintWriter pw = response.getWriter();
@@ -143,9 +133,6 @@ public class CellarPlugin extends Abstra
pw.println("</script>");
}
- //
- // Additional methods
- //
protected URL getResource(String path) {
path = path.substring(NAME.length() + 1);
URL url = this.classLoader.getResource(path);
@@ -154,7 +141,7 @@ public class CellarPlugin extends Abstra
try {
ins = url.openStream();
if (ins == null) {
- this.LOGGER.error("Failed to open {}", url);
+ this.LOGGER.error("failed to open {}", url);
url = null;
}
} catch (IOException e) {
Modified: karaf/cellar/trunk/webconsole/src/main/resources/OSGI-INF/blueprint/webconsole-cellar.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/webconsole/src/main/resources/OSGI-INF/blueprint/webconsole-cellar.xml?rev=1476942&r1=1476941&r2=1476942&view=diff
==============================================================================
--- karaf/cellar/trunk/webconsole/src/main/resources/OSGI-INF/blueprint/webconsole-cellar.xml (original)
+++ karaf/cellar/trunk/webconsole/src/main/resources/OSGI-INF/blueprint/webconsole-cellar.xml Mon Apr 29 09:39:22 2013
@@ -29,7 +29,6 @@
<property name="groupManager" ref="groupManager"/>
<property name="clusterManager" ref="clusterManager"/>
</bean>
-
<service ref="cellarPlugin" interface="javax.servlet.Servlet">
<service-properties>
<entry key="felix.webconsole.label" value="cellar"/>
Modified: karaf/cellar/trunk/webconsole/src/main/resources/res/ui/cellar.js
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/webconsole/src/main/resources/res/ui/cellar.js?rev=1476942&r1=1476941&r2=1476942&view=diff
==============================================================================
--- karaf/cellar/trunk/webconsole/src/main/resources/res/ui/cellar.js (original)
+++ karaf/cellar/trunk/webconsole/src/main/resources/res/ui/cellar.js Mon Apr 29 09:39:22 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
*/