Author: jbonofre
Date: Mon Aug 29 14:24:41 2011
New Revision: 1162828
URL: http://svn.apache.org/viewvc?rev=1162828&view=rev
Log:
[ACE-166] Fix WebConsole plugin usage of the Vaadin UI
Modified:
incubator/ace/trunk/ace-webconsole-plugin/pom.xml
incubator/ace/trunk/ace-webconsole-plugin/src/main/java/org/apache/ace/webconsole/plugin/WebUIConsoleServlet.java
Modified: incubator/ace/trunk/ace-webconsole-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-webconsole-plugin/pom.xml?rev=1162828&r1=1162827&r2=1162828&view=diff
==============================================================================
--- incubator/ace/trunk/ace-webconsole-plugin/pom.xml (original)
+++ incubator/ace/trunk/ace-webconsole-plugin/pom.xml Mon Aug 29 14:24:41 2011
@@ -49,6 +49,7 @@
!org.apache.ace.webconsole.plugin,
*
</import.package>
+ <bundle.activator>org.apache.ace.webconsole.plugin.Activator</bundle.activator>
</properties>
<dependencies>
Modified: incubator/ace/trunk/ace-webconsole-plugin/src/main/java/org/apache/ace/webconsole/plugin/WebUIConsoleServlet.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-webconsole-plugin/src/main/java/org/apache/ace/webconsole/plugin/WebUIConsoleServlet.java?rev=1162828&r1=1162827&r2=1162828&view=diff
==============================================================================
--- incubator/ace/trunk/ace-webconsole-plugin/src/main/java/org/apache/ace/webconsole/plugin/WebUIConsoleServlet.java
(original)
+++ incubator/ace/trunk/ace-webconsole-plugin/src/main/java/org/apache/ace/webconsole/plugin/WebUIConsoleServlet.java
Mon Aug 29 14:24:41 2011
@@ -35,6 +35,6 @@ public class WebUIConsoleServlet extends
@Override
protected void service(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)
throws ServletException, IOException {
// ACE WebUI is a full ajax UI, so rending this once should be enough:
- httpServletResponse.getWriter().println("<iframe scrolling=\"no\" frameborder=\"0\"
width=\"100%\" height=\"500pt\" src=\"/webui/webui-headless.html\" />");
+ httpServletResponse.getWriter().println("<iframe scrolling=\"no\" frameborder=\"0\"
width=\"100%\" height=\"500pt\" src=\"/ace/webui\" />");
}
}
\ No newline at end of file
|