426603 - Adds support for the admin console in the new deliverable Virgo Nano RAP (Jetty as OSGi HttpService only)
diff --git a/org.eclipse.virgo.management.console/src/main/java/org/eclipse/virgo/management/console/ContentServlet.java b/org.eclipse.virgo.management.console/src/main/java/org/eclipse/virgo/management/console/ContentServlet.java
index 204ef0e..04d4526 100644
--- a/org.eclipse.virgo.management.console/src/main/java/org/eclipse/virgo/management/console/ContentServlet.java
+++ b/org.eclipse.virgo.management.console/src/main/java/org/eclipse/virgo/management/console/ContentServlet.java
@@ -197,8 +197,14 @@
ServletContext servletContext = getServletContext();
try {
- pageContext.put("contextPath", servletContext.getContextPath());
- pageContext.put("servletContextName", servletContext.getServletContextName());
+ if (servletContext.getContextPath().isEmpty()) {
+ // running with plain Jetty HttpService
+ pageContext.put("contextPath", Activator.contextPath);
+ pageContext.put("servletContextName", Activator.APPLICATION_NAME);
+ } else {
+ pageContext.put("contextPath", servletContext.getContextPath());
+ pageContext.put("servletContextName", servletContext.getServletContextName());
+ }
} catch(UnsupportedOperationException e){
pageContext.put("contextPath", Activator.contextPath);
pageContext.put("servletContextName", Activator.APPLICATION_NAME);
