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 2007/02/19 15:42:05 UTC
svn commit: r509214 - in /cocoon/trunk/blocks/cocoon-portal:
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/
cocoon-portal-impl/src/main/java/org...
Author: cziegeler
Date: Mon Feb 19 06:42:03 2007
New Revision: 509214
URL: http://svn.apache.org/viewvc?view=rev&rev=509214
Log:
Continue converting renderers to spring.
Added:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/borderless-window.xml
- copied, changed from r509211, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/borderless-window.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/column.xml
- copied, changed from r509211, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/column.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/decorated-frame.xml
- copied, changed from r509211, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/decorated-frame.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/frame.xml
- copied, changed from r509211, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/frame.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/link.xml
- copied, changed from r509211, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/link.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/linktab.xml
- copied, changed from r509211, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/linktab.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/nowindow.xml
- copied, changed from r509211, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/nowindow.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/rawtab.xml
- copied, changed from r509211, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/rawtab.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/row.xml
- copied, changed from r509211, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/row.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/tab.xml
- copied, changed from r509211, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/tab.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/window.xml
- copied, changed from r509211, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/window.xconf
Removed:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/borderless-window.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/column.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/decorated-frame.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/frame.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/link.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/linktab.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/nowindow.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/rawtab.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/row.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/tab.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/window.xconf
Modified:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/Renderer.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/DefaultLinkRenderer.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/RegistrationBeanPostProcessor.java
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/Renderer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/Renderer.java?view=diff&rev=509214&r1=509213&r2=509214
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/Renderer.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/Renderer.java Mon Feb 19 06:42:03 2007
@@ -29,8 +29,6 @@
*/
public interface Renderer {
- String ROLE = Renderer.class.getName();
-
/**
* Stream out raw layout
*/
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/DefaultLinkRenderer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/DefaultLinkRenderer.java?view=diff&rev=509214&r1=509213&r2=509214
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/DefaultLinkRenderer.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/DefaultLinkRenderer.java Mon Feb 19 06:42:03 2007
@@ -16,7 +16,6 @@
*/
package org.apache.cocoon.portal.layout.renderer.impl;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.layout.renderer.Renderer;
import org.apache.cocoon.portal.om.Layout;
@@ -24,6 +23,7 @@
import org.apache.cocoon.portal.om.LayoutFeatures;
import org.apache.cocoon.portal.om.LayoutInstance;
import org.apache.cocoon.portal.om.LinkLayout;
+import org.apache.cocoon.portal.util.AbstractBean;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -37,7 +37,9 @@
*
* @version $Id$
*/
-public class DefaultLinkRenderer implements Renderer, ThreadSafe {
+public class DefaultLinkRenderer
+ extends AbstractBean
+ implements Renderer {
/**
* @see org.apache.cocoon.portal.layout.renderer.Renderer#toSAX(org.apache.cocoon.portal.om.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/RegistrationBeanPostProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/RegistrationBeanPostProcessor.java?view=diff&rev=509214&r1=509213&r2=509214
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/RegistrationBeanPostProcessor.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/RegistrationBeanPostProcessor.java Mon Feb 19 06:42:03 2007
@@ -36,7 +36,7 @@
protected BeanFactory beanFactory;
- protected static String RENDERER_ROLE_PREFIX = Renderer.ROLE + '/';
+ protected static String RENDERER_ROLE_PREFIX = Renderer.class.getName() + '.';
/**
* @see org.springframework.beans.factory.BeanFactoryAware#setBeanFactory(org.springframework.beans.factory.BeanFactory)
Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/borderless-window.xml (from r509211, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/borderless-window.xconf)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/borderless-window.xml?view=diff&rev=509214&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/borderless-window.xconf&r1=509211&p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/borderless-window.xml&r2=509214
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/borderless-window.xconf (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/borderless-window.xml Mon Feb 19 06:42:03 2007
@@ -19,20 +19,29 @@
|
| @version $Id$
+-->
-<components>
- <renderer name="borderless-window"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
- <aspects>
- <aspect type="xslt">
- <parameter name="style" value="{portal-skin:skin.basepath}/styles/borderless-window.xsl"/>
- </aspect>
- <aspect type="parameter">
- <parameter name="tag-name" value="window"/>
- </aspect>
- <aspect type="window">
- <parameter name="root-tag" value="false"/>
- </aspect>
- <aspect type="coplet-cinclude"/>
- </aspects>
- </renderer>
-</components>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:portal="http://cocoon.apache.org/schema/portal"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.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"
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
+ parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton">
+ <property name="aspectChain">
+ <portal:renderer-aspects>
+ <portal:aspect type="xslt">
+ <portal:property name="style" value="{portal-skin:skin.basepath}/styles/borderless-window.xsl"/>
+ </portal:aspect>
+ <portal:aspect type="parameter">
+ <portal:property name="tag-name" value="window"/>
+ </portal:aspect>
+ <portal:aspect type="window">
+ <portal:property name="root-tag" value="false"/>
+ </portal:aspect>
+ <portal:aspect type="coplet-cinclude"/>
+ </portal:renderer-aspects>
+ </property>
+ </bean>
+</beans>
Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/column.xml (from r509211, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/column.xconf)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/column.xml?view=diff&rev=509214&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/column.xconf&r1=509211&p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/column.xml&r2=509214
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/column.xconf (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/column.xml Mon Feb 19 06:42:03 2007
@@ -19,19 +19,28 @@
|
| @version $Id$
+-->
-<components>
- <renderer name="column"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
- <aspects>
- <aspect type="xslt">
- <parameter name="style" value="{portal-skin:skin.basepath}/styles/column.xsl"/>
- </aspect>
- <aspect type="parameter">
- <parameter name="tag-name" value="column-layout"/>
- </aspect>
- <aspect type="composite-content">
- <parameter name="root-tag" value="false"/>
- </aspect>
- </aspects>
- </renderer>
-</components>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:portal="http://cocoon.apache.org/schema/portal"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.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"
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
+ parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton">
+ <property name="aspectChain">
+ <portal:renderer-aspects>
+ <portal:aspect type="xslt">
+ <portal:property name="style" value="{portal-skin:skin.basepath}/styles/column.xsl"/>
+ </portal:aspect>
+ <portal:aspect type="parameter">
+ <portal:property name="tag-name" value="column-layout"/>
+ </portal:aspect>
+ <portal:aspect type="composite-content">
+ <portal:property name="root-tag" value="false"/>
+ </portal:aspect>
+ </portal:renderer-aspects>
+ </property>
+ </bean>
+</beans>
Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/decorated-frame.xml (from r509211, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/decorated-frame.xconf)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/decorated-frame.xml?view=diff&rev=509214&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/decorated-frame.xconf&r1=509211&p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/decorated-frame.xml&r2=509214
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/decorated-frame.xconf (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/decorated-frame.xml Mon Feb 19 06:42:03 2007
@@ -19,19 +19,28 @@
|
| @version $Id$
+-->
-<components>
- <renderer name="decorated-frame"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
- <aspects>
- <aspect type="xslt">
- <parameter name="style" value="{portal-skin:skin.basepath}/styles/frame.xsl"/>
- </aspect>
- <aspect type="parameter">
- <parameter name="tag-name" value="frame"/>
- </aspect>
- <aspect type="frame">
- <parameter name="store" value="request"/>
- </aspect>
- </aspects>
- </renderer>
-</components>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:portal="http://cocoon.apache.org/schema/portal"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.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"
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
+ parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton">
+ <property name="aspectChain">
+ <portal:renderer-aspects>
+ <portal:aspect type="xslt">
+ <portal:property name="style" value="{portal-skin:skin.basepath}/styles/frame.xsl"/>
+ </portal:aspect>
+ <portal:aspect type="parameter">
+ <portal:property name="tag-name" value="frame"/>
+ </portal:aspect>
+ <portal:aspect type="frame">
+ <portal:property name="store" value="request"/>
+ </portal:aspect>
+ </portal:renderer-aspects>
+ </property>
+ </bean>
+</beans>
Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/frame.xml (from r509211, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/frame.xconf)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/frame.xml?view=diff&rev=509214&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/frame.xconf&r1=509211&p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/frame.xml&r2=509214
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/frame.xconf (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/frame.xml Mon Feb 19 06:42:03 2007
@@ -19,13 +19,22 @@
|
| @version $Id$
+-->
-<components>
- <renderer name="frame"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
- <aspects>
- <aspect type="frame">
- <parameter name="store" value="request"/>
- </aspect>
- </aspects>
- </renderer>
-</components>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:portal="http://cocoon.apache.org/schema/portal"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.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"
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
+ parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton">
+ <property name="aspectChain">
+ <portal:renderer-aspects>
+ <portal:aspect type="frame">
+ <portal:property name="store" value="request"/>
+ </portal:aspect>
+ </portal:renderer-aspects>
+ </property>
+ </bean>
+</beans>
Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/link.xml (from r509211, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/link.xconf)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/link.xml?view=diff&rev=509214&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/link.xconf&r1=509211&p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/link.xml&r2=509214
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/link.xconf (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/link.xml Mon Feb 19 06:42:03 2007
@@ -19,7 +19,16 @@
|
| @version $Id$
+-->
-<components>
- <renderer name="link"
- class="org.apache.cocoon.portal.layout.renderer.impl.DefaultLinkRenderer"/>
-</components>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:portal="http://cocoon.apache.org/schema/portal"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.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"
+ class="org.apache.cocoon.portal.layout.renderer.impl.DefaultLinkRenderer"
+ parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton">
+
+ </bean>
+</beans>
Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/linktab.xml (from r509211, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/linktab.xconf)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/linktab.xml?view=diff&rev=509214&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/linktab.xconf&r1=509211&p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/linktab.xml&r2=509214
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/linktab.xconf (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/linktab.xml Mon Feb 19 06:42:03 2007
@@ -19,20 +19,29 @@
|
| @version $Id$
+-->
-<components>
- <renderer name="linktab"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
- <aspects>
- <aspect type="xslt">
- <parameter name="style" value="{portal-skin:skin.basepath}/styles/linktab.xsl"/>
- </aspect>
- <aspect type="parameter">
- <parameter name="tag-name" value="linktab-layout"/>
- </aspect>
- <aspect type="tab-content">
- <parameter name="root-tag" value="false"/>
- <parameter name="store" value="session"/>
- </aspect>
- </aspects>
- </renderer>
-</components>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:portal="http://cocoon.apache.org/schema/portal"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.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"
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
+ parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton">
+ <property name="aspectChain">
+ <portal:renderer-aspects>
+ <portal:aspect type="xslt">
+ <portal:property name="style" value="{portal-skin:skin.basepath}/styles/linktab.xsl"/>
+ </portal:aspect>
+ <portal:aspect type="parameter">
+ <portal:property name="tag-name" value="linktab-layout"/>
+ </portal:aspect>
+ <portal:aspect type="tab-content">
+ <portal:property name="root-tag" value="false"/>
+ <portal:property name="store" value="session"/>
+ </portal:aspect>
+ </portal:renderer-aspects>
+ </property>
+ </bean>
+</beans>
Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/nowindow.xml (from r509211, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/nowindow.xconf)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/nowindow.xml?view=diff&rev=509214&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/nowindow.xconf&r1=509211&p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/nowindow.xml&r2=509214
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/nowindow.xconf (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/nowindow.xml Mon Feb 19 06:42:03 2007
@@ -19,15 +19,24 @@
|
| @version $Id$
+-->
-<components>
- <renderer name="nowindow"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
- <aspects>
- <aspect type="xslt">
- <parameter name="style" value="{portal-skin:skin.basepath}/styles/nowindow.xsl"/>
- </aspect>
- <aspect type="window"/>
- <aspect type="coplet-cinclude"/>
- </aspects>
- </renderer>
-</components>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:portal="http://cocoon.apache.org/schema/portal"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.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"
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
+ parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton">
+ <property name="aspectChain">
+ <portal:renderer-aspects>
+ <portal:aspect type="xslt">
+ <portal:property name="style" value="{portal-skin:skin.basepath}/styles/nowindow.xsl"/>
+ </portal:aspect>
+ <portal:aspect type="window"/>
+ <portal:aspect type="coplet-cinclude"/>
+ </portal:renderer-aspects>
+ </property>
+ </bean>
+</beans>
Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/rawtab.xml (from r509211, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/rawtab.xconf)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/rawtab.xml?view=diff&rev=509214&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/rawtab.xconf&r1=509211&p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/rawtab.xml&r2=509214
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/rawtab.xconf (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/rawtab.xml Mon Feb 19 06:42:03 2007
@@ -19,17 +19,26 @@
|
| @version $Id$
+-->
-<components>
- <renderer name="rawtab"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
- <aspects>
- <aspect type="parameter">
- <parameter name="tag-name" value="tab-layout"/>
- </aspect>
- <aspect type="tab-content">
- <parameter name="root-tag" value="false"/>
- <parameter name="store" value="session"/>
- </aspect>
- </aspects>
- </renderer>
-</components>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:portal="http://cocoon.apache.org/schema/portal"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.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"
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
+ parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton">
+ <property name="aspectChain">
+ <portal:renderer-aspects>
+ <portal:aspect type="parameter">
+ <portal:property name="tag-name" value="tab-layout"/>
+ </portal:aspect>
+ <portal:aspect type="tab-content">
+ <portal:property name="root-tag" value="false"/>
+ <portal:property name="store" value="session"/>
+ </portal:aspect>
+ </portal:renderer-aspects>
+ </property>
+ </bean>
+</beans>
Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/row.xml (from r509211, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/row.xconf)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/row.xml?view=diff&rev=509214&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/row.xconf&r1=509211&p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/row.xml&r2=509214
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/row.xconf (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/row.xml Mon Feb 19 06:42:03 2007
@@ -19,19 +19,28 @@
|
| @version $Id$
+-->
-<components>
- <renderer name="row"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
- <aspects>
- <aspect type="xslt">
- <parameter name="style" value="{portal-skin:skin.basepath}/styles/row.xsl"/>
- </aspect>
- <aspect type="parameter">
- <parameter name="tag-name" value="row-layout"/>
- </aspect>
- <aspect type="composite-content">
- <parameter name="root-tag" value="false"/>
- </aspect>
- </aspects>
- </renderer>
-</components>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:portal="http://cocoon.apache.org/schema/portal"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.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"
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
+ parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton">
+ <property name="aspectChain">
+ <portal:renderer-aspects>
+ <portal:aspect type="xslt">
+ <portal:property name="style" value="{portal-skin:skin.basepath}/styles/row.xsl"/>
+ </portal:aspect>
+ <portal:aspect type="parameter">
+ <portal:property name="tag-name" value="row-layout"/>
+ </portal:aspect>
+ <portal:aspect type="composite-content">
+ <portal:property name="root-tag" value="false"/>
+ </portal:aspect>
+ </portal:renderer-aspects>
+ </property>
+ </bean>
+</beans>
Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/tab.xml (from r509211, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/tab.xconf)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/tab.xml?view=diff&rev=509214&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/tab.xconf&r1=509211&p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/tab.xml&r2=509214
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/tab.xconf (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/tab.xml Mon Feb 19 06:42:03 2007
@@ -19,20 +19,29 @@
|
| @version $Id$
+-->
-<components>
- <renderer name="tab"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
- <aspects>
- <aspect type="xslt">
- <parameter name="style" value="{portal-skin:skin.basepath}/styles/tab.xsl"/>
- </aspect>
- <aspect type="parameter">
- <parameter name="tag-name" value="tab-layout"/>
- </aspect>
- <aspect type="tab-content">
- <parameter name="root-tag" value="false"/>
- <parameter name="store" value="session"/>
- </aspect>
- </aspects>
- </renderer>
-</components>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:portal="http://cocoon.apache.org/schema/portal"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.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"
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
+ parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton">
+ <property name="aspectChain">
+ <portal:renderer-aspects>
+ <portal:aspect type="xslt">
+ <portal:property name="style" value="{portal-skin:skin.basepath}/styles/tab.xsl"/>
+ </portal:aspect>
+ <portal:aspect type="parameter">
+ <portal:property name="tag-name" value="tab-layout"/>
+ </portal:aspect>
+ <portal:aspect type="tab-content">
+ <portal:property name="root-tag" value="false"/>
+ <portal:property name="store" value="session"/>
+ </portal:aspect>
+ </portal:renderer-aspects>
+ </property>
+ </bean>
+</beans>
Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/window.xml (from r509211, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/window.xconf)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/window.xml?view=diff&rev=509214&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/window.xconf&r1=509211&p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/window.xml&r2=509214
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/window.xconf (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/window.xml Mon Feb 19 06:42:03 2007
@@ -19,20 +19,29 @@
|
| @version $Id$
+-->
-<components>
- <renderer name="window"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
- <aspects>
- <aspect type="xslt">
- <parameter name="style" value="{portal-skin:skin.basepath}/styles/window.xsl"/>
- </aspect>
- <aspect type="parameter">
- <parameter name="tag-name" value="window"/>
- </aspect>
- <aspect type="window">
- <parameter name="root-tag" value="false"/>
- </aspect>
- <aspect type="coplet-cinclude"/>
- </aspects>
- </renderer>
-</components>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:portal="http://cocoon.apache.org/schema/portal"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.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"
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
+ parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton">
+ <property name="aspectChain">
+ <portal:renderer-aspects>
+ <portal:aspect type="xslt">
+ <portal:property name="style" value="{portal-skin:skin.basepath}/styles/window.xsl"/>
+ </portal:aspect>
+ <portal:aspect type="parameter">
+ <portal:property name="tag-name" value="window"/>
+ </portal:aspect>
+ <portal:aspect type="window">
+ <portal:property name="root-tag" value="false"/>
+ </portal:aspect>
+ <portal:aspect type="coplet-cinclude"/>
+ </portal:renderer-aspects>
+ </property>
+ </bean>
+</beans>