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/05/03 08:58:29 UTC
svn commit: r1478659 - in /karaf/cellar/trunk/webconsole/src/main:
java/org/apache/karaf/cellar/webconsole/CellarPlugin.java
resources/OSGI-INF/blueprint/webconsole-cellar.xml
Author: jbonofre
Date: Fri May 3 06:58:28 2013
New Revision: 1478659
URL: http://svn.apache.org/r1478659
Log:
[KARAF-2277] Fix Cellar WebConsole plugin with Equinox
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
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=1478659&r1=1478658&r2=1478659&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 Fri May 3 06:58:28 2013
@@ -33,28 +33,25 @@ import java.io.PrintWriter;
import java.net.URL;
import java.util.Set;
+/**
+ * WebConsole plugin for Cellar cluster groups.
+ */
public class CellarPlugin extends AbstractWebConsolePlugin {
private static final transient Logger LOGGER = LoggerFactory.getLogger(CellarPlugin.class);
public static final String NAME = "cellar";
-
public static final String LABEL = "Cellar";
-
private ClassLoader classLoader;
-
private String cellarJs = "/cellar/res/ui/cellar.js";
private ClusterManager clusterManager;
private GroupManager groupManager;
-
private BundleContext bundleContext;
public void start() {
super.activate(bundleContext);
-
this.classLoader = this.getClass().getClassLoader();
-
this.LOGGER.info("{} plugin activated", LABEL);
}
@@ -98,7 +95,7 @@ public class CellarPlugin extends Abstra
try {
Thread.sleep(800);
} catch (InterruptedException e) {
- // we ignore this
+ // ignore
}
this.renderJSON(resp, null);
} else {
@@ -135,6 +132,9 @@ public class CellarPlugin extends Abstra
protected URL getResource(String path) {
path = path.substring(NAME.length() + 1);
+ if (path == null || path.isEmpty()) {
+ return null;
+ }
URL url = this.classLoader.getResource(path);
if (url != null) {
InputStream ins = null;
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=1478659&r1=1478658&r2=1478659&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 Fri May 3 06:58:28 2013
@@ -17,8 +17,7 @@
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
<reference id="groupManager" interface="org.apache.karaf.cellar.core.GroupManager"/>
<reference id="clusterManager" interface="org.apache.karaf.cellar.core.ClusterManager"/>