[portal-commits] JBoss Portal SVN: r13677 - in jbossexo/modules/web/trunk/web/src/main: java/org/jboss/portal/web/impl/tomcat and 2 other directories.
Author: mwringe
Date: 2009-08-05 11:46:33 -0400 (Wed, 05 Aug 2009)
New Revision: 13677
Added:
jbossexo/modules/web/trunk/web/src/main/resources/conf/portal/
jbossexo/modules/web/trunk/web/src/main/resources/conf/portal/configuration.xml
Modified:
jbossexo/modules/web/trunk/web/src/main/java/org/jboss/portal/web/command/CommandServlet.java
jbossexo/modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tomcat/TC6WebAppContext.java
Log:
Use /PortletWrapper (eXo) for the command servlet instead of /jbossportlet. We can't
have both due to issues with response.getWriter and response.getOutputStream.
Add configuration.xml file.
Modified:
jbossexo/modules/web/trunk/web/src/main/java/org/jboss/portal/web/command/CommandServlet.java
===================================================================
---
jbossexo/modules/web/trunk/web/src/main/java/org/jboss/portal/web/command/CommandServlet.java 2009-08-05
12:51:41 UTC (rev 13676)
+++
jbossexo/modules/web/trunk/web/src/main/java/org/jboss/portal/web/command/CommandServlet.java 2009-08-05
15:46:33 UTC (rev 13677)
@@ -75,9 +75,14 @@
try
{
localCmd.set(callback);
- RequestDispatcher switcher =
targetContext.getRequestDispatcher("/jbossportlet");
+
+ //NOTE: we need to use /PortletWrapper for compatibility with eXoPortal and we
+ // can't check for both since this will fail on Tomcat due to
response.getWriter and
+ // response.getOutputStream compatibility issues.
+ //RequestDispatcher switcher =
targetContext.getRequestDispatcher("/jbossportlet");
+ RequestDispatcher switcher =
targetContext.getRequestDispatcher("/PortletWrapper");
switcher.include(request, response);
-
+
//
Throwable throwable = (Throwable)localThrowable.get();
Modified:
jbossexo/modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tomcat/TC6WebAppContext.java
===================================================================
---
jbossexo/modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tomcat/TC6WebAppContext.java 2009-08-05
12:51:41 UTC (rev 13676)
+++
jbossexo/modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tomcat/TC6WebAppContext.java 2009-08-05
15:46:33 UTC (rev 13677)
@@ -79,7 +79,13 @@
commandServlet.setLoadOnStartup(0);
commandServlet.setServletClass(CommandServlet.class.getName());
context.addChild(commandServlet);
- context.addServletMapping("/jbossportlet", "JBossServlet");
+
+ //NOTE: we have to use /PortletWrapper instead of /jbossportlet
+ // since we can't use both (causes problems with repsonse.getWriter and
+ // response.getOutputStream). We need to use /PortletWrapper since its already
+ // being used in eXo portal.
+ //context.addServletMapping("/jbossportlet",
"JBossServlet");
+ context.addServletMapping("/PortletWrapper",
"JBossServlet");
}
catch (Exception e)
{
Added: jbossexo/modules/web/trunk/web/src/main/resources/conf/portal/configuration.xml
===================================================================
--- jbossexo/modules/web/trunk/web/src/main/resources/conf/portal/configuration.xml
(rev 0)
+++
jbossexo/modules/web/trunk/web/src/main/resources/conf/portal/configuration.xml 2009-08-05
15:46:33 UTC (rev 13677)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<configuration
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd
http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+
+ <component>
+ <key>org.jboss.portal.web.ServletContainer</key>
+
<type>org.jboss.portal.web.impl.generic.DefaultServletContainerWrapper</type>
+ </component>
+
+ <component>
+ <key>org.jboss.portal.web.spi.ServletContainerContext</key>
+
<type>org.jboss.portal.web.impl.generic.GenericServletContainerContext</type>
+ </component>
+
+</configuration>