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/11/30 00:25:41 UTC
svn commit: r599628 - in /cocoon/trunk/blocks/cocoon-portal:
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/
cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/
cocoon-portal-sample/src/main/resources/COB-INF/config...
Author: cziegeler
Date: Thu Nov 29 15:25:36 2007
New Revision: 599628
URL: http://svn.apache.org/viewvc?rev=599628&view=rev
Log:
Put new dynamic spring based layout factory in place: layout types are now usual spring beans instead of xml configuration contained in some avalon files.
Added:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultLayoutFactory.java
- copied, changed from r599623, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/NewDefaultLayoutFactory.java
Removed:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/NewDefaultLayoutFactory.java
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-impl/src/main/resources/org/apache/cocoon/portal/portal.roles
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/cocoon-portal-sample.xconf
Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultLayoutFactory.java (from r599623, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/NewDefaultLayoutFactory.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultLayoutFactory.java?p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultLayoutFactory.java&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/NewDefaultLayoutFactory.java&r1=599623&r2=599628&rev=599628&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/NewDefaultLayoutFactory.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultLayoutFactory.java Thu Nov 29 15:25:36 2007
@@ -45,7 +45,7 @@
*
* @version $Id$
*/
-public class NewDefaultLayoutFactory
+public class DefaultLayoutFactory
extends AbstractBean
implements LayoutFactory, Receiver {
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=599628&r1=599627&r2=599628&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 Thu Nov 29 15:25:36 2007
@@ -213,6 +213,17 @@
scope="singleton"/>
<!--+
+ | Layout Factory.
+ |
+ +-->
+ <bean name="org.apache.cocoon.portal.services.LayoutFactory"
+ class="org.apache.cocoon.portal.services.impl.DefaultLayoutFactory"
+ parent="org.apache.cocoon.portal.util.AbstractBean"
+ scope="singleton">
+ <property name="layoutTypesMap" ref="org.apache.cocoon.portal.om.LayoutTypeMap"/>
+ </bean>
+
+ <!--+
| User Service.
|
+-->
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/portal.roles
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/portal.roles?rev=599628&r1=599627&r2=599628&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/portal.roles (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/portal.roles Thu Nov 29 15:25:36 2007
@@ -52,14 +52,6 @@
shorthand="portal-service"/>
<!--+
- | Layout Factory.
- |
- +-->
- <role name="org.apache.cocoon.portal.services.LayoutFactory"
- default-class="org.apache.cocoon.portal.services.impl.DefaultLayoutFactory"
- shorthand="portal-layout-factory"/>
-
- <!--+
| Deployment Manager
|
+-->
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/cocoon-portal-sample.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/cocoon-portal-sample.xconf?rev=599628&r1=599627&r2=599628&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/cocoon-portal-sample.xconf (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/cocoon-portal-sample.xconf Thu Nov 29 15:25:36 2007
@@ -65,67 +65,4 @@
<hot-deployment>true</hot-deployment>
</portal-deployment-manager>
- <!-- Layout factory configuration -->
- <portal-layout-factory>
- <layouts>
- <layout type="column"
- class="org.apache.cocoon.portal.om.CompositeLayout">
- <renderers default="column">
- <renderer name="column"/>
- </renderers>
- </layout>
- <layout type="row"
- class="org.apache.cocoon.portal.om.CompositeLayout">
- <renderers default="row">
- <renderer name="row"/>
- </renderers>
- </layout>
- <layout type="tab"
- class="org.apache.cocoon.portal.om.CompositeLayout"
- item-class="org.apache.cocoon.portal.om.NamedItem"
- default-is-static="true">
- <renderers default="tab">
- <renderer name="tab"/>
- </renderers>
- </layout>
- <layout type="rawtab"
- class="org.apache.cocoon.portal.om.CompositeLayout"
- item-class="org.apache.cocoon.portal.om.NamedItem">
- <renderers default="rawtab">
- <renderer name="rawtab"/>
- </renderers>
- </layout>
- <layout type="linktab"
- class="org.apache.cocoon.portal.om.CompositeLayout"
- item-class="org.apache.cocoon.portal.om.NamedItem"
- default-is-static="true">
- <renderers default="linktab">
- <renderer name="linktab"/>
- </renderers>
- </layout>
- <layout type="frame"
- class="org.apache.cocoon.portal.om.FrameLayout"
- create-id="true">
- <renderers default="frame">
- <renderer name="frame"/>
- </renderers>
- </layout>
- <layout type="coplet"
- class="org.apache.cocoon.portal.om.CopletLayout">
- <renderers default="window">
- <renderer name="window"/>
- <renderer name="nowindow"/>
- <renderer name="borderless-window"/>
- </renderers>
- </layout>
- <layout type="link"
- class="org.apache.cocoon.portal.om.LinkLayout"
- create-id="true">
- <renderers default="link">
- <renderer name="link"/>
- </renderers>
- </layout>
- </layouts>
- </portal-layout-factory>
-
</components>