You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2006/03/28 21:10:49 UTC
svn commit: r389583 - in
/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly: jetspeed-spring.xml
pipelines.xml
Author: taylor
Date: Tue Mar 28 11:10:48 2006
New Revision: 389583
URL: http://svn.apache.org/viewcvs?rev=389583&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-514
Special handling for desktop actions: do not redirect
Modified:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-spring.xml
portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/pipelines.xml
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-spring.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-spring.xml?rev=389583&r1=389582&r2=389583&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-spring.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-spring.xml Tue Mar 28 11:10:48 2006
@@ -112,6 +112,9 @@
<!-- Pluto Portlet Container -->
<bean id="Pluto" class="org.apache.pluto.PortletContainerImpl" />
+ <!-- Desktop Pluto Portlet Container -->
+ <bean id="DesktopPluto" class="org.apache.jetspeed.container.DesktopPortletContainerImpl" />
+
<!-- Jetspeed 2's wrapper around Pluto -->
<!-- settings for this bean will start the underlying pluto portlet container -->
<bean id="org.apache.pluto.PortletContainer" class="org.apache.jetspeed.container.JetspeedPortletContainerWrapper" init-method="start"
@@ -136,7 +139,30 @@
</property>
</bean>
-
+ <!-- Jetspeed 2's wrapper around Desktop Pluto container -->
+ <!-- settings for this bean will start the underlying pluto portlet container -->
+ <bean id="org.apache.pluto.DesktopPortletContainer" class="org.apache.jetspeed.container.JetspeedPortletContainerWrapper" init-method="start"
+ destroy-method="shutdown">
+ <constructor-arg>
+ <ref bean="DesktopPluto" />
+ </constructor-arg>
+ <constructor-arg>
+ <value>${portal.name}Desktop</value>
+ </constructor-arg>
+ <constructor-arg>
+ <ref bean="ServletConfig" />
+ </constructor-arg>
+ <constructor-arg>
+ <ref bean="Engine" />
+ </constructor-arg>
+ <property name="requestFactory">
+ <ref bean="ServletRequestFactory" />
+ </property>
+ <property name="responseFactory">
+ <ref bean="ServletResponseFactory" />
+ </property>
+ </bean>
+
<!-- Adds jetspeed.properties as our configuration object to support ${...} vars -->
<!-- ${applicationRoot} is acutally set as a system property via the SpringEngine -->
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/pipelines.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/pipelines.xml?rev=389583&r1=389582&r2=389583&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/pipelines.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/pipelines.xml Tue Mar 28 11:10:48 2006
@@ -117,7 +117,19 @@
<ref bean="PortletWindowAccessor" />
</constructor-arg>
</bean>
-
+
+ <bean id="desktopActionValve"
+ class="org.apache.jetspeed.pipeline.valve.impl.ActionValveImpl"
+ init-method="initialize"
+ >
+ <constructor-arg>
+ <ref bean="org.apache.pluto.DesktopPortletContainer" />
+ </constructor-arg>
+ <constructor-arg>
+ <ref bean="PortletWindowAccessor" />
+ </constructor-arg>
+ </bean>
+
<bean id="portletValve"
class="org.apache.jetspeed.aggregator.PortletValve"
init-method="initialize"
@@ -263,7 +275,7 @@
<ref bean="portalURLValve"/>
<ref bean="profilerValve"/>
<ref bean="containerValve"/>
- <ref bean="actionValve"/>
+ <ref bean="desktopActionValve"/>
</list>
</constructor-arg>
</bean>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org