Author: jbonofre
Date: Thu May 2 15:16:35 2013
New Revision: 1478407
URL: http://svn.apache.org/r1478407
Log:
[KARAF-2285] Fixed Admin WebConsole plugin with Equinox
Modified:
karaf/branches/karaf-2.x/webconsole/admin/src/main/java/org/apache/karaf/webconsole/admin/AdminPlugin.java
karaf/branches/karaf-2.x/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml
Modified:
karaf/branches/karaf-2.x/webconsole/admin/src/main/java/org/apache/karaf/webconsole/admin/AdminPlugin.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/webconsole/admin/src/main/java/org/apache/karaf/webconsole/admin/AdminPlugin.java?rev=1478407&r1=1478406&r2=1478407&view=diff
==============================================================================
---
karaf/branches/karaf-2.x/webconsole/admin/src/main/java/org/apache/karaf/webconsole/admin/AdminPlugin.java
(original)
+++
karaf/branches/karaf-2.x/webconsole/admin/src/main/java/org/apache/karaf/webconsole/admin/AdminPlugin.java
Thu May 2 15:16:35 2013
@@ -39,7 +39,7 @@ import org.osgi.framework.BundleContext;
import org.slf4j.LoggerFactory;
/**
- * Felix Web Console plugin for interacting with the {@link AdminService}
+ * WebConsole plugin for the {@link AdminService}.
*/
public class AdminPlugin extends AbstractWebConsolePlugin {
@@ -52,9 +52,6 @@ public class AdminPlugin extends Abstrac
private AdminService adminService;
private ClassLoader classLoader;
- /**
- * Blueprint lifecycle callback methods
- */
public void start() {
super.activate(bundleContext);
this.classLoader = this.getClass().getClassLoader();
@@ -133,6 +130,7 @@ public class AdminPlugin extends Abstrac
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
+ // ignore
}
this.renderJSON(res, null);
} else {
@@ -140,16 +138,13 @@ public class AdminPlugin extends Abstrac
}
}
- /*
- * Parse the String value, returning <code>null</code> if the String is
empty
- */
private String parseString(String value) {
if (value != null && value.trim().length() == 0) {
value = null;
}
return value;
}
-
+
private List<String> parseStringList(String value) {
List<String> list = new ArrayList<String>();
if (value != null) {
@@ -159,14 +154,11 @@ public class AdminPlugin extends Abstrac
continue;
}
list.add(trimmed);
- }
+ }
}
return list;
}
- /*
- * Parse the port number for the String given, returning 0 if the String
does not represent an integer
- */
private int parsePortNumber(String port) {
try {
return Integer.parseInt(port);
@@ -177,6 +169,9 @@ public class AdminPlugin extends Abstrac
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;
@@ -198,7 +193,7 @@ public class AdminPlugin extends Abstrac
}
}
}
- }
+ }
return url;
}
@@ -220,9 +215,7 @@ public class AdminPlugin extends Abstrac
jw.key("instances");
jw.array();
for (Instance i : instances) {
-// if (!i.isRoot()) {
- instanceInfo(jw, i);
-// }
+ instanceInfo(jw, i);
}
jw.endArray();
jw.endObject();
@@ -364,17 +357,12 @@ public class AdminPlugin extends Abstrac
return false;
}
- /**
- * @param adminService the adminService to set
- */
public void setAdminService(AdminService adminService) {
this.adminService = adminService;
}
- /**
- * @param bundleContext the bundleContext to set
- */
public void setBundleContext(BundleContext bundleContext) {
this.bundleContext = bundleContext;
}
+
}
Modified:
karaf/branches/karaf-2.x/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml?rev=1478407&r1=1478406&r2=1478407&view=diff
==============================================================================
---
karaf/branches/karaf-2.x/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml
(original)
+++
karaf/branches/karaf-2.x/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml
Thu May 2 15:16:35 2013
@@ -25,7 +25,6 @@
<property name="adminService" ref="adminService" />
<property name="bundleContext" ref="blueprintBundleContext" />
</bean>
-
<service ref="adminPlugin" interface="javax.servlet.Servlet" >
<service-properties>
<entry key="felix.webconsole.label" value="admin"/>
