svn commit: r328141 - in /cocoon/blocks: portal-sample/trunk/samples/conf/cocoon-portal-sample.xconf portal/trunk/status.xml

[cz...@apache.org]

Author: cziegeler
Date: Mon Oct 24 12:23:10 2005
New Revision: 328141

URL: http://svn.apache.org/viewcvs?rev=328141&view=rev
Log:
Move castor related stuff into own package

Modified:
    cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-sample.xconf
    cocoon/blocks/portal/trunk/status.xml

Modified: cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-sample.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-sample.xconf?rev=328141&r1=328140&r2=328141&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-sample.xconf (original)
+++ cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-sample.xconf Mon Oct 24 12:23:10 2005
@@ -33,13 +33,16 @@
   <!-- Include portal roles -->
   <include src="resource://org/apache/cocoon/portal/portal.roles"/>
   <!-- If you don't need JSR 168 support, you can remove the following include: -->
-  <include src="resource://org/apache/cocoon/portal/pluto/portal.roles"/>
+  <include src="resource://org/apache/cocoon/portal/pluto/portal-pluto.roles"/>
   <!-- If you don't need WSRP support, you can remove the following include: -->
-  <include src="resource://org/apache/cocoon/portal/wsrp/portal.roles"/>
+  <include src="resource://org/apache/cocoon/portal/wsrp/portal-wsrp.roles"/>
 
   <!-- We use CoWarp for authentication. If you don't use CoWarp remove this line: -->
   <include src="auth-cowarp.xconf"/>
   
+  <!-- We use Castor for persisting/mapping the profiles to XML: -->
+  <include src="resource://org/apache/cocoon/portal/persistence/castor/portal-castor.roles"/>
+
   <input-modules>
     <component-instance name="portalpath"
                         class="org.apache.cocoon.components.modules.input.ProjectPathModule">

Modified: cocoon/blocks/portal/trunk/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/status.xml?rev=328141&r1=328140&r2=328141&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/status.xml (original)
+++ cocoon/blocks/portal/trunk/status.xml Mon Oct 24 12:23:10 2005
@@ -65,6 +65,10 @@
  <!-- The following list contains the changes since the latest 2.1.x version. -->
  <changes>
   <release version="@version@" date="@date@">
+    <action dev="CZ" type="update">
+      Move Castor support into own package and support roles files for Castor. This makes
+      including/excluding the Castor support easier.
+    </action>
     <action dev="CZ" type="add">
       Simplify object model by removing Producible. Clean up Castor mapping.
     </action>
@@ -98,6 +102,11 @@
       Add coplet size to coplet instance data. The size can be minimized,
       normal or full-screen. This removed the need for a special full screen
       handling.
+    </action>
+    <action dev="CZ" type="add">
+      Enable per sitemap configuration for portal applications and add several roles files
+      for default configurations. Using per sitemap configurations and including the provided
+      roles files make the configuration of the portal much easier.
     </action>
     <action dev="CZ" type="add">
       Remove aspect datas from coplet datas. Attributes are now used instead.