Author: smilek
Date: Wed Feb 21 13:20:04 2007
New Revision: 510226
URL: http://svn.apache.org/viewvc?view=rev&rev=510226
Log:
added DecorationFactory argument to both HeaderAggregatorImpl beans
Modified:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/aggregation.xml
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/aggregation.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/aggregation.xml?view=diff&rev=510226&r1=510225&r2=510226
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/aggregation.xml
(original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/aggregation.xml Wed
Feb 21 13:20:04 2007
@@ -15,24 +15,24 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<beans>
-
- <bean id="org.apache.jetspeed.aggregator.PortletTrackingManager"
class="org.apache.jetspeed.aggregator.impl.PortletTrackingManagerImpl">
- <constructor-arg index='0'>
- <ref bean="PortletWindowAccessor"/>
- </constructor-arg>
- <!-- Default portlet timeout in milliseconds:
- Zero means no portlet timeout option by default.
- -->
- <constructor-arg index='1'>
- <value>0</value>
- </constructor-arg>
- <!-- Out of service limit, if a portlet entity times out past its
limit (or default limit) n consecutive times, it is taken out of service -->
- <constructor-arg index="2">
- <value>3</value>
- </constructor-arg>
- </bean>
-
+<beans>
+
+ <bean id="org.apache.jetspeed.aggregator.PortletTrackingManager"
class="org.apache.jetspeed.aggregator.impl.PortletTrackingManagerImpl">
+ <constructor-arg index='0'>
+ <ref bean="PortletWindowAccessor"/>
+ </constructor-arg>
+ <!-- Default portlet timeout in milliseconds:
+ Zero means no portlet timeout option by default.
+ -->
+ <constructor-arg index='1'>
+ <value>0</value>
+ </constructor-arg>
+ <!-- Out of service limit, if a portlet entity times out past its
limit (or default limit) n consecutive times, it is taken out of service -->
+ <constructor-arg index="2">
+ <value>3</value>
+ </constructor-arg>
+ </bean>
+
<!-- Aggregation: Portlet -->
<bean id="org.apache.jetspeed.aggregator.PortletAggregator"
class="org.apache.jetspeed.aggregator.impl.PortletAggregatorImpl">
@@ -62,12 +62,12 @@
<constructor-arg>
<ref bean="PortalStatistics" />
</constructor-arg>
- <constructor-arg>
- <ref bean="org.apache.pluto.services.title.DynamicTitleService" />
- </constructor-arg>
- <constructor-arg>
- <ref bean="org.apache.jetspeed.aggregator.PortletTrackingManager"
/>
- </constructor-arg>
+ <constructor-arg>
+ <ref bean="org.apache.pluto.services.title.DynamicTitleService" />
+ </constructor-arg>
+ <constructor-arg>
+ <ref bean="org.apache.jetspeed.aggregator.PortletTrackingManager"
/>
+ </constructor-arg>
<!-- flag indicating whether to check jetspeed-portlet.xml security
constraints
before rendering a portlet. If security check fails, do not
display portlet content
-->
@@ -76,10 +76,10 @@
</constructor-arg>
<constructor-arg>
<ref bean="org.apache.jetspeed.security.SecurityAccessController"
/>
- </constructor-arg>
- <constructor-arg>
- <ref bean="portletContentCache"/>
- </constructor-arg>
+ </constructor-arg>
+ <constructor-arg>
+ <ref bean="portletContentCache"/>
+ </constructor-arg>
</bean>
<!-- Portlet Renderer w/title in http response header -->
@@ -100,24 +100,24 @@
<constructor-arg>
<ref bean="org.apache.pluto.services.title.DynamicTitleService" />
</constructor-arg>
- <constructor-arg>
- <ref bean="org.apache.jetspeed.aggregator.PortletTrackingManager"
/>
- </constructor-arg>
- <!-- flag indicating whether to check jetspeed-portlet.xml security
constraints
- before rendering a portlet. If security check fails, do not
display portlet content
- -->
- <constructor-arg type="boolean">
- <value>true</value>
- </constructor-arg>
- <constructor-arg>
- <ref bean="org.apache.jetspeed.security.SecurityAccessController"
/>
- </constructor-arg>
- <constructor-arg>
- <ref bean="portletContentCache"/>
- </constructor-arg>
- <constructor-arg type="boolean">
- <value>true</value>
- </constructor-arg>
+ <constructor-arg>
+ <ref bean="org.apache.jetspeed.aggregator.PortletTrackingManager"
/>
+ </constructor-arg>
+ <!-- flag indicating whether to check jetspeed-portlet.xml security
constraints
+ before rendering a portlet. If security check fails, do not
display portlet content
+ -->
+ <constructor-arg type="boolean">
+ <value>true</value>
+ </constructor-arg>
+ <constructor-arg>
+ <ref bean="org.apache.jetspeed.security.SecurityAccessController"
/>
+ </constructor-arg>
+ <constructor-arg>
+ <ref bean="portletContentCache"/>
+ </constructor-arg>
+ <constructor-arg type="boolean">
+ <value>true</value>
+ </constructor-arg>
</bean>
<bean id="org.apache.jetspeed.aggregator.PageAggregator"
class="org.apache.jetspeed.aggregator.impl.PageAggregatorImpl">
@@ -175,6 +175,12 @@
<constructor-arg index="5">
<ref bean="HeaderResourceRegistry"/>
</constructor-arg>
+ <constructor-arg index="6">
+ <ref bean="DecorationFactory"/>
+ </constructor-arg>
+
+ <!-- Uncomment this to HARD CODE your portal URL -->
+ <!-- <constructor-arg><ref bean="BasePortalURL"/></constructor-arg>
-->
</bean>
<bean id="HeaderAggregatorDesktop"
class="org.apache.jetspeed.aggregator.impl.HeaderAggregatorImpl">
@@ -196,5 +202,11 @@
<constructor-arg index="5">
<ref bean="HeaderResourceRegistry"/>
</constructor-arg>
+ <constructor-arg index="6">
+ <ref bean="DecorationFactory"/>
+ </constructor-arg>
+
+ <!-- Uncomment this to HARD CODE your portal URL -->
+ <!-- <constructor-arg><ref bean="BasePortalURL"/></constructor-arg>
-->
</bean>
</beans>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
