You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2009/12/22 10:51:42 UTC
svn commit: r893125 - in /cocoon/trunk/blocks/cocoon-portal:
cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/
cocoon-portal-sample/src/main/resources/COB-INF/config/spring/
Author: cziegeler
Date: Tue Dec 22 09:51:41 2009
New Revision: 893125
URL: http://svn.apache.org/viewvc?rev=893125&view=rev
Log:
COCOON-2275 : Fix for portal block and samples. Applied patch from Klaus Bertram.
Modified:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/cocoon-portal-components.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/cocoon-portal-sample-components.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-borderless-window.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-column.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-decorated-frame.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-frame.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-link.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-linktab.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-nowindow.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-rawtab.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-row.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-tab.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-window.xml
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/cocoon-portal-components.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/cocoon-portal-components.xml?rev=893125&r1=893124&r2=893125&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/cocoon-portal-components.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/cocoon-portal-components.xml Tue Dec 22 09:51:41 2009
@@ -277,8 +277,8 @@
| Renderer map
|
+-->
- <configurator:bean-map id="org.apache.cocoon.portal.layout.renderer.RendererMap"
- type="org.apache.cocoon.portal.layout.renderer.Renderer"/>
+ <configurator:bean-map id="org.apache.cocoon.portal.om.RendererMap"
+ type="org.apache.cocoon.portal.om.Renderer"/>
<!--+
| Coplet Adapter map
@@ -301,4 +301,4 @@
<configurator:bean-map id="org.apache.cocoon.portal.om.LayoutTypeMap"
type="org.apache.cocoon.portal.om.LayoutType"/>
-</beans>
\ No newline at end of file
+</beans>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/cocoon-portal-sample-components.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/cocoon-portal-sample-components.xml?rev=893125&r1=893124&r2=893125&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/cocoon-portal-sample-components.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/cocoon-portal-sample-components.xml Tue Dec 22 09:51:41 2009
@@ -98,20 +98,19 @@
<property name="defaultPort" value="8888"/>
<property name="defaultSecurePort" value="443"/>
</bean>
-
- <!--+
- | This is the profile manager using pipelines to load the various parts.
+ <!--+
+ | This is the service profile manager using pipelines to load the various parts.
|
+-->
- <bean name="org.apache.cocoon.portal.profile.ProfileManager"
- class="org.apache.cocoon.portal.profile.impl.GroupBasedProfileManager"
- parent="org.apache.cocoon.portal.util.AbstractBean"
- scope="singleton">
- <property name="aspectChain" ref="org.apache.cocoon.portal.profile.ProfileManager.aspects"/>
- <property name="profileStore" ref="org.apache.cocoon.portal.profile.ProfileStore"/>
- <property name="copletTypesMap" ref="org.apache.cocoon.portal.om.CopletTypeMap"/>
- <property name="rendererMap" ref="org.apache.cocoon.portal.layout.renderer.RendererMap"/>
- </bean>
+ <bean name="org.apache.cocoon.portal.services.ProfileManager"
+ class="org.apache.cocoon.portal.profile.impl.GroupBasedProfileManager"
+ parent="org.apache.cocoon.portal.util.AbstractBean"
+ scope="singleton">
+ <property name="aspectChain" ref="org.apache.cocoon.portal.profile.ProfileManager.aspects"/>
+ <property name="profileStore" ref="org.apache.cocoon.portal.profile.ProfileStore"/>
+ <property name="copletTypesMap" ref="org.apache.cocoon.portal.om.CopletTypeMap"/>
+ <property name="rendererMap" ref="org.apache.cocoon.portal.om.RendererMap"/>
+ </bean>
<!--+
| This is the map based profile store.
@@ -183,4 +182,4 @@
<property name="runnableManager" ref="org.apache.cocoon.thread.RunnableManager"/>
</bean>
-</beans>
\ No newline at end of file
+</beans>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-borderless-window.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-borderless-window.xml?rev=893125&r1=893124&r2=893125&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-borderless-window.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-borderless-window.xml Tue Dec 22 09:51:41 2009
@@ -26,7 +26,7 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
http://cocoon.apache.org/schema/portal http://cocoon.apache.org/schema/portal/cocoon-portal-1.0.xsd">
- <bean id="org.apache.cocoon.portal.layout.renderer.Renderer.borderless-window"
+ <bean id="org.apache.cocoon.portal.om.Renderer.borderless-window"
class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton">
<property name="aspectChain">
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-column.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-column.xml?rev=893125&r1=893124&r2=893125&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-column.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-column.xml Tue Dec 22 09:51:41 2009
@@ -26,7 +26,7 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
http://cocoon.apache.org/schema/portal http://cocoon.apache.org/schema/portal/cocoon-portal-1.0.xsd">
- <bean id="org.apache.cocoon.portal.layout.renderer.Renderer.column"
+ <bean id="org.apache.cocoon.portal.om.Renderer.column"
class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton">
<property name="aspectChain">
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-decorated-frame.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-decorated-frame.xml?rev=893125&r1=893124&r2=893125&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-decorated-frame.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-decorated-frame.xml Tue Dec 22 09:51:41 2009
@@ -26,7 +26,7 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
http://cocoon.apache.org/schema/portal http://cocoon.apache.org/schema/portal/cocoon-portal-1.0.xsd">
- <bean id="org.apache.cocoon.portal.layout.renderer.Renderer.decorated-frame"
+ <bean id="org.apache.cocoon.portal.om.Renderer.decorated-frame"
class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton">
<property name="aspectChain">
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-frame.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-frame.xml?rev=893125&r1=893124&r2=893125&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-frame.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-frame.xml Tue Dec 22 09:51:41 2009
@@ -26,7 +26,7 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
http://cocoon.apache.org/schema/portal http://cocoon.apache.org/schema/portal/cocoon-portal-1.0.xsd">
- <bean id="org.apache.cocoon.portal.layout.renderer.Renderer.frame"
+ <bean id="org.apache.cocoon.portal.om.Renderer.frame"
class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton">
<property name="aspectChain">
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-link.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-link.xml?rev=893125&r1=893124&r2=893125&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-link.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-link.xml Tue Dec 22 09:51:41 2009
@@ -26,7 +26,7 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
http://cocoon.apache.org/schema/portal http://cocoon.apache.org/schema/portal/cocoon-portal-1.0.xsd">
- <bean id="org.apache.cocoon.portal.layout.renderer.Renderer.link"
+ <bean id="org.apache.cocoon.portal.om.Renderer.link"
class="org.apache.cocoon.portal.layout.renderer.impl.DefaultLinkRenderer"
parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton">
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-linktab.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-linktab.xml?rev=893125&r1=893124&r2=893125&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-linktab.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-linktab.xml Tue Dec 22 09:51:41 2009
@@ -26,7 +26,7 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
http://cocoon.apache.org/schema/portal http://cocoon.apache.org/schema/portal/cocoon-portal-1.0.xsd">
- <bean id="org.apache.cocoon.portal.layout.renderer.Renderer.linktab"
+ <bean id="org.apache.cocoon.portal.om.Renderer.linktab"
class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton">
<property name="aspectChain">
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-nowindow.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-nowindow.xml?rev=893125&r1=893124&r2=893125&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-nowindow.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-nowindow.xml Tue Dec 22 09:51:41 2009
@@ -26,7 +26,7 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
http://cocoon.apache.org/schema/portal http://cocoon.apache.org/schema/portal/cocoon-portal-1.0.xsd">
- <bean id="org.apache.cocoon.portal.layout.renderer.Renderer.nowindow"
+ <bean id="org.apache.cocoon.portal.om.Renderer.nowindow"
class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton">
<property name="aspectChain">
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-rawtab.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-rawtab.xml?rev=893125&r1=893124&r2=893125&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-rawtab.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-rawtab.xml Tue Dec 22 09:51:41 2009
@@ -26,7 +26,7 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
http://cocoon.apache.org/schema/portal http://cocoon.apache.org/schema/portal/cocoon-portal-1.0.xsd">
- <bean id="org.apache.cocoon.portal.layout.renderer.Renderer.rawtab"
+ <bean id="org.apache.cocoon.portal.om.Renderer.rawtab"
class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton">
<property name="aspectChain">
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-row.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-row.xml?rev=893125&r1=893124&r2=893125&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-row.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-row.xml Tue Dec 22 09:51:41 2009
@@ -26,7 +26,7 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
http://cocoon.apache.org/schema/portal http://cocoon.apache.org/schema/portal/cocoon-portal-1.0.xsd">
- <bean id="org.apache.cocoon.portal.layout.renderer.Renderer.row"
+ <bean id="org.apache.cocoon.portal.om.Renderer.row"
class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton">
<property name="aspectChain">
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-tab.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-tab.xml?rev=893125&r1=893124&r2=893125&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-tab.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-tab.xml Tue Dec 22 09:51:41 2009
@@ -26,7 +26,7 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
http://cocoon.apache.org/schema/portal http://cocoon.apache.org/schema/portal/cocoon-portal-1.0.xsd">
- <bean id="org.apache.cocoon.portal.layout.renderer.Renderer.tab"
+ <bean id="org.apache.cocoon.portal.om.Renderer.tab"
class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton">
<property name="aspectChain">
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-window.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-window.xml?rev=893125&r1=893124&r2=893125&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-window.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderer-window.xml Tue Dec 22 09:51:41 2009
@@ -26,7 +26,7 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
http://cocoon.apache.org/schema/portal http://cocoon.apache.org/schema/portal/cocoon-portal-1.0.xsd">
- <bean id="org.apache.cocoon.portal.layout.renderer.Renderer.window"
+ <bean id="org.apache.cocoon.portal.om.Renderer.window"
class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton">
<property name="aspectChain">