You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2012/04/12 18:02:52 UTC
svn commit: r1325339 - in /karaf/trunk/webconsole:
features/src/main/java/org/apache/karaf/webconsole/features/
gogo/src/main/java/org/apache/karaf/webconsole/gogo/
http/src/main/java/org/apache/karaf/webconsole/http/
instance/src/main/java/org/apache/...
Author: cschneider
Date: Thu Apr 12 16:02:52 2012
New Revision: 1325339
URL: http://svn.apache.org/viewvc?rev=1325339&view=rev
Log:
KARAF-1362 Changed appRoot attribute and return false in isHtmlRequest
Modified:
karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java
karaf/trunk/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java
karaf/trunk/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/HttpPlugin.java
karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java
Modified: karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java?rev=1325339&r1=1325338&r2=1325339&view=diff
==============================================================================
--- karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java (original)
+++ karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java Thu Apr 12 16:02:52 2012
@@ -35,6 +35,7 @@ import org.apache.karaf.features.Feature
import org.apache.karaf.features.FeaturesService;
import org.apache.karaf.features.Repository;
import org.apache.felix.webconsole.AbstractWebConsolePlugin;
+import org.apache.felix.webconsole.WebConsoleConstants;
import org.json.JSONException;
import org.json.JSONWriter;
import org.osgi.framework.BundleContext;
@@ -70,6 +71,12 @@ public class FeaturesPlugin extends Abst
// Blueprint lifecycle callback methods
//
+ @Override
+ protected boolean isHtmlRequest(HttpServletRequest request) {
+ return false;
+ }
+
+
public void start()
{
super.activate( bundleContext );
@@ -157,15 +164,14 @@ public class FeaturesPlugin extends Abst
}
}
-
+ @Override
protected void renderContent( HttpServletRequest request, HttpServletResponse response ) throws IOException
{
// get request info from request attribute
final PrintWriter pw = response.getWriter();
- String appRoot = ( String ) request
- .getAttribute( "org.apache.felix.webconsole.wrapper.servlet.OsgiManager.appRoot" );
+ String appRoot = ( String ) request.getAttribute(WebConsoleConstants.ATTR_APP_ROOT);
final String featuresScriptTag = "<script src='" + appRoot + this.featuresJs
+ "' language='JavaScript'></script>";
pw.println( featuresScriptTag );
@@ -176,7 +182,7 @@ public class FeaturesPlugin extends Abst
pw.println( "// ]]>" );
pw.println( "</script>" );
- pw.println( "<div id='plugin_content'/>" );
+ pw.println( "<div id='plugin_content'>" );
pw.println( "<script type='text/javascript'>" );
pw.println( "// <![CDATA[" );
Modified: karaf/trunk/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java?rev=1325339&r1=1325338&r2=1325339&view=diff
==============================================================================
--- karaf/trunk/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java (original)
+++ karaf/trunk/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java Thu Apr 12 16:02:52 2012
@@ -68,6 +68,13 @@ public class GogoPlugin extends Abstract
private BundleContext bundleContext;
private CommandProcessor commandProcessor;
+
+
+
+ @Override
+ protected boolean isHtmlRequest(HttpServletRequest request) {
+ return false;
+ }
public void setBundleContext(BundleContext bundleContext)
{
Modified: karaf/trunk/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/HttpPlugin.java
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/HttpPlugin.java?rev=1325339&r1=1325338&r2=1325339&view=diff
==============================================================================
--- karaf/trunk/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/HttpPlugin.java (original)
+++ karaf/trunk/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/HttpPlugin.java Thu Apr 12 16:02:52 2012
@@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.felix.webconsole.AbstractWebConsolePlugin;
+import org.apache.felix.webconsole.WebConsoleConstants;
import org.json.JSONException;
import org.json.JSONWriter;
import org.ops4j.pax.web.service.spi.ServletEvent;
@@ -73,6 +74,12 @@ public class HttpPlugin extends Abstract
// Blueprint lifecycle callback methods
//
+ @Override
+ protected boolean isHtmlRequest(HttpServletRequest request) {
+ return false;
+ }
+
+
public void start()
{
super.activate( bundleContext );
@@ -111,8 +118,7 @@ public class HttpPlugin extends Abstract
// get request info from request attribute
final PrintWriter pw = response.getWriter();
- String appRoot = ( String ) request
- .getAttribute( "org.apache.felix.webconsole.wrapper.servlet.OsgiManager.appRoot" );
+ String appRoot = (String) request.getAttribute(WebConsoleConstants.ATTR_APP_ROOT);
final String featuresScriptTag = "<script src='" + appRoot + this.featuresJs
+ "' language='JavaScript'></script>";
pw.println( featuresScriptTag );
Modified: karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java?rev=1325339&r1=1325338&r2=1325339&view=diff
==============================================================================
--- karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java (original)
+++ karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java Thu Apr 12 16:02:52 2012
@@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.felix.webconsole.AbstractWebConsolePlugin;
+import org.apache.felix.webconsole.WebConsoleConstants;
import org.apache.karaf.instance.core.Instance;
import org.apache.karaf.instance.core.InstanceService;
import org.apache.karaf.instance.core.InstanceSettings;
@@ -51,6 +52,13 @@ public class InstancePlugin extends Abst
private BundleContext bundleContext;
private InstanceService instanceService;
private ClassLoader classLoader;
+
+
+
+ @Override
+ protected boolean isHtmlRequest(HttpServletRequest request) {
+ return false;
+ }
/**
* Blueprint lifecycle callback methods
@@ -80,7 +88,7 @@ public class InstancePlugin extends Abst
protected void renderContent(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
final PrintWriter pw = res.getWriter();
- String appRoot = (String) req.getAttribute("org.apache.felix.webconsole.wrapper.servlet.OsgiManager.appRoot");
+ String appRoot = (String) req.getAttribute(WebConsoleConstants.ATTR_APP_ROOT);
final String instanceScriptTag = "<script src='" + appRoot + this.instanceJs + "' language='JavaScript'></script>";
pw.println(instanceScriptTag);