Author: jbonofre
Date: Fri May 3 06:54:51 2013
New Revision: 1478657
URL: http://svn.apache.org/r1478657
Log:
[KARAF-2277] Fix Cellar WebConsole plugin with Equinox
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
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=1478657&r1=1478656&r2=1478657&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
Fri May 3 06:54:51 2013
@@ -38,29 +38,26 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
+/**
+ * WebConsole plugin for Cellar cluster groups.
+ */
public class ClusterGroupsPlugin extends AbstractWebConsolePlugin {
private static final transient Logger LOGGER =
LoggerFactory.getLogger(ClusterGroupsPlugin.class);
public static final String NAME = "cluster.groups";
-
public static final String LABEL = "Cluster Groups";
-
private ClassLoader classLoader;
-
private String clusterGroupsJs =
"/cluster.groups/res/ui/cluster-groups.js";
private ClusterManager clusterManager;
private ExecutionContext executionContext;
private GroupManager groupManager;
-
private BundleContext bundleContext;
public void start() {
super.activate(bundleContext);
-
this.classLoader = this.getClass().getClassLoader();
-
this.LOGGER.info("{} plugin activated", LABEL);
}
@@ -129,7 +126,7 @@ public class ClusterGroupsPlugin extends
try {
Thread.sleep(800);
} catch (InterruptedException e) {
- // we ignore this
+ // ignore
}
this.renderJSON(resp, null);
} else {
@@ -166,13 +163,16 @@ public class ClusterGroupsPlugin extends
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;
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/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=1478657&r1=1478656&r2=1478657&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
Fri May 3 06:54:51 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"/>
