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 2008/01/08 22:02:24 UTC

svn commit: r610153 - in /cocoon/trunk/blocks/cocoon-portal: cocoon-portal-converter-castor/ cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/ cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converte...

Author: cziegeler
Date: Tue Jan  8 13:02:21 2008
New Revision: 610153

URL: http://svn.apache.org/viewvc?rev=610153&view=rev
Log:
Moving castor support into own module to make the core cleaner and have less dependencies.
Castor converter now uses static mapping.

Added:
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/
      - copied from r610147, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/persistence/castor/
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/copletdefinition.xml   (with props)
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/copletinstance.xml   (with props)
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/layout.xml   (with props)
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/pluto.xml   (with props)
Removed:
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/persistence/castor/
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletdefinition.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletinstance.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/layout.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/pluto.xml
Modified:
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/   (props changed)
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/AttributesFieldHandler.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/CastorSourceConverter.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/CollectionWrapper.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/ParametersFieldHandler.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/ReferenceFieldHandler.java

Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jan  8 13:02:21 2008
@@ -0,0 +1 @@
+target

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/AttributesFieldHandler.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/AttributesFieldHandler.java?rev=610153&r1=610147&r2=610153&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/AttributesFieldHandler.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/AttributesFieldHandler.java Tue Jan  8 13:02:21 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.portal.persistence.castor;
+package org.apache.cocoon.portal.converter.castor;
 
 import java.util.HashMap;
 import java.util.Iterator;

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/CastorSourceConverter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/CastorSourceConverter.java?rev=610153&r1=610147&r2=610153&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/CastorSourceConverter.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/CastorSourceConverter.java Tue Jan  8 13:02:21 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.portal.persistence.castor;
+package org.apache.cocoon.portal.converter.castor;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -162,7 +162,7 @@
         }
 
         // default configuration
-        final String prefix = "resource://org/apache/cocoon/portal/persistence/castor/";
+        final String prefix = "resource://org/apache/cocoon/portal/converter/castor/";
         final Map mappingSources = new HashMap();
         mappingSources.put(ProfileStore.PROFILETYPE_LAYOUT, prefix + ProfileStore.PROFILETYPE_LAYOUT +".xml");
         mappingSources.put(ProfileStore.PROFILETYPE_COPLETDEFINITION, prefix + ProfileStore.PROFILETYPE_COPLETDEFINITION + ".xml");

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/CollectionWrapper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/CollectionWrapper.java?rev=610153&r1=610147&r2=610153&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/CollectionWrapper.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/CollectionWrapper.java Tue Jan  8 13:02:21 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.portal.persistence.castor;
+package org.apache.cocoon.portal.converter.castor;
 
 import java.util.ArrayList;
 import java.util.Collection;

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/ParametersFieldHandler.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/ParametersFieldHandler.java?rev=610153&r1=610147&r2=610153&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/ParametersFieldHandler.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/ParametersFieldHandler.java Tue Jan  8 13:02:21 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.portal.persistence.castor;
+package org.apache.cocoon.portal.converter.castor;
 
 import java.util.HashMap;
 import java.util.Iterator;

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/ReferenceFieldHandler.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/ReferenceFieldHandler.java?rev=610153&r1=610147&r2=610153&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/ReferenceFieldHandler.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/ReferenceFieldHandler.java Tue Jan  8 13:02:21 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.portal.persistence.castor;
+package org.apache.cocoon.portal.converter.castor;
 
 import java.util.Iterator;
 import java.util.Map;

Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/copletdefinition.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/copletdefinition.xml?rev=610153&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/copletdefinition.xml (added)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/copletdefinition.xml Tue Jan  8 13:02:21 2008
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- @version $Id$ -->
+<mapping>
+  <description>Coplet definition mapping file</description>
+
+  <class name="org.apache.cocoon.portal.persistence.castor.CollectionWrapper">
+    <map-to xml="coplets" />
+
+    <field name="objects"
+           type="org.apache.cocoon.portal.om.CopletDefinition"
+           collection="collection">
+      <bind-xml matches="coplet-definition"/>
+    </field>
+  </class>
+
+  <class name="org.apache.cocoon.portal.om.CopletDefinition" verify-constructable="false">
+    <map-to xml="coplet-definition" />
+    
+    <field name="id" type="java.lang.String" set-method="%1" get-method="getId">
+      <bind-xml name="id" node="attribute" />
+    </field>
+    
+    <field name="title" type="java.lang.String">
+      <bind-xml name="title"/>
+    </field>
+
+    <field name="allowedRoles" type="java.lang.String">
+      <bind-xml name="roles"/>
+    </field>
+
+    <field name="attributes"
+           type="org.exolab.castor.mapping.MapItem"
+           collection="map"
+           handler="org.apache.cocoon.portal.persistence.castor.AttributesFieldHandler">
+      <bind-xml name="attribute"/>
+    </field>
+
+    <field name="copletType"
+           type="java.lang.String"
+           handler="org.apache.cocoon.portal.persistence.castor.ReferenceFieldHandler">
+      <bind-xml name="coplet-type"/>
+    </field>
+  </class>
+   
+  <class name="org.exolab.castor.mapping.MapItem">
+    <field name="key" type="java.lang.String">
+      <bind-xml name="name"/>
+    </field>
+
+    <field name="value">
+      <bind-xml name="value"/>
+    </field>
+  </class>
+</mapping>
+

Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/copletdefinition.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/copletdefinition.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/copletinstance.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/copletinstance.xml?rev=610153&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/copletinstance.xml (added)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/copletinstance.xml Tue Jan  8 13:02:21 2008
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- @version $Id$ -->
+<mapping>
+  <description>Coplet instance mapping file</description>
+
+  <class name="org.apache.cocoon.portal.persistence.castor.CollectionWrapper">
+    <map-to xml="coplets" />
+
+    <field name="objects"
+           type="org.apache.cocoon.portal.om.CopletInstance"
+           collection="collection">
+      <bind-xml matches="coplet-instance"/>
+    </field>
+  </class>
+
+  <class name="org.apache.cocoon.portal.om.CopletInstance" verify-constructable="false">
+    <map-to xml="coplet-instance"/>
+
+    <field name="id" type="java.lang.String" set-method="%1" get-method="getId">
+      <bind-xml name="id" node="attribute" />
+    </field>
+
+    <field name="copletDefinition"
+           type="java.lang.String"
+           handler="org.apache.cocoon.portal.persistence.castor.ReferenceFieldHandler">
+      <bind-xml name="coplet-definition"/>
+    </field>
+
+    <field name="attributes"
+           type="org.exolab.castor.mapping.MapItem"
+           collection="map"
+           handler="org.apache.cocoon.portal.persistence.castor.AttributesFieldHandler">
+      <bind-xml name="attribute"/>
+    </field>
+
+    <field name="title" type="java.lang.String" get-method="getInstanceTitle" set-method="setTitle">
+      <bind-xml name="title"/>
+    </field>
+
+    <field name="size">
+      <bind-xml name="size"/>
+    </field>
+  </class>
+
+  <class name="org.exolab.castor.mapping.MapItem">
+    <field name="key" type="java.lang.String">
+      <bind-xml name="name"/>
+    </field>
+    <field name="value">
+      <bind-xml name="value"/>
+    </field>
+  </class>
+
+</mapping>

Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/copletinstance.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/copletinstance.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/layout.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/layout.xml?rev=610153&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/layout.xml (added)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/layout.xml Tue Jan  8 13:02:21 2008
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- @version $Id$ -->
+<mapping>
+  <description>Portalprofile mapping file</description>
+
+  <class name="org.apache.cocoon.portal.om.AbstractParameters">
+    <field name="parameters"
+           type="org.exolab.castor.mapping.MapItem"
+           collection="map"
+           handler="org.apache.cocoon.portal.persistence.castor.ParametersFieldHandler">
+      <bind-xml name="parameter" node="element"/>
+    </field>
+  </class>
+
+  <class name="org.apache.cocoon.portal.om.Layout"
+         extends="org.apache.cocoon.portal.om.AbstractParameters"
+         verify-constructable="false">
+
+    <field name="rendererName" type="java.lang.String"
+           handler="org.apache.cocoon.portal.persistence.castor.ReferenceFieldHandler">
+      <bind-xml name="renderer" node="attribute"/>
+    </field>
+
+    <field name="static" type="java.lang.Boolean" set-method="setIsStatic" get-method="isStatic">
+      <bind-xml name="static" node="attribute"/>
+    </field>
+
+    <field name="layoutType"
+           type="java.lang.String"
+           handler="org.apache.cocoon.portal.persistence.castor.ReferenceFieldHandler">
+      <bind-xml name="type" node="attribute"/>
+    </field>
+  </class>
+
+  <class name="org.apache.cocoon.portal.om.LinkLayout"
+         extends="org.apache.cocoon.portal.om.Layout"
+         verify-constructable="false">
+    <map-to xml="link-layout"/>
+
+    <field name="id" type="java.lang.String" set-method="%1" get-method="getId">
+      <bind-xml name="id" node="attribute" />
+    </field>
+
+    <field name="profileName" type="java.lang.String">
+      <bind-xml name="profile-name" node="attribute"/>
+    </field>
+    <field name="layoutId" type="java.lang.String">
+      <bind-xml name="layout-id" node="attribute"/>
+    </field>
+  </class>
+
+  <class name="org.apache.cocoon.portal.om.CompositeLayout"
+         extends="org.apache.cocoon.portal.om.Layout"
+         verify-constructable="false">
+    <map-to xml="composite-layout"/>
+
+    <field name="id" type="java.lang.String" set-method="%1" get-method="getId">
+      <bind-xml name="id" node="attribute" />
+    </field>
+
+    <field name="items" type="org.apache.cocoon.portal.om.Item"
+           collection="collection" set-method="addItem" get-method="getItems">
+      <bind-xml matches="named-item item"/>
+    </field>
+  </class>
+
+  <class name="org.apache.cocoon.portal.om.CopletLayout"
+         auto-complete="false"
+         extends="org.apache.cocoon.portal.om.Layout"
+         verify-constructable="false">
+    <map-to xml="coplet-layout"/>
+
+    <field name="id" type="java.lang.String" set-method="%1" get-method="getId">
+      <bind-xml name="id" node="attribute" />
+    </field>
+
+    <field name="copletInstanceId"
+           type="java.lang.String">
+      <bind-xml name="coplet-instance"/>
+    </field>
+  </class>
+
+  <class name="org.apache.cocoon.portal.om.FrameLayout"
+         extends="org.apache.cocoon.portal.om.Layout"
+         verify-constructable="false">
+    <map-to xml="frame-layout"/>
+
+    <field name="id" type="java.lang.String" set-method="%1" get-method="getId">
+      <bind-xml name="id" node="attribute" />
+    </field>
+
+    <field name="source" type="java.lang.String"/>
+  </class>
+
+  <class name="org.apache.cocoon.portal.om.Item"
+         extends="org.apache.cocoon.portal.om.AbstractParameters">
+    <field name="layout" type="org.apache.cocoon.portal.om.Layout">
+      <bind-xml matches="frame-layout link-layout composite-layout coplet-layout"/>
+    </field>
+  </class>
+
+  <class name="org.apache.cocoon.portal.om.NamedItem"
+         extends="org.apache.cocoon.portal.om.Item">
+    <map-to xml="named-item"/>
+    <field name="name" type="java.lang.String">
+      <bind-xml name="name" node="attribute"/>
+    </field>
+  </class>
+
+  <class name="org.exolab.castor.mapping.MapItem">
+    <field name="key" type="java.lang.String">
+      <bind-xml name="name" node="attribute"/>
+    </field>
+
+    <field name="value" type="java.lang.String">
+      <bind-xml name="value" node="attribute"/>
+    </field>
+  </class>
+
+</mapping>
\ No newline at end of file

Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/layout.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/layout.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/pluto.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/pluto.xml?rev=610153&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/pluto.xml (added)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/pluto.xml Tue Jan  8 13:02:21 2008
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- @version $Id$ -->
+<mapping>
+  <description>Mapping for Pluto related information like preferences</description>
+
+  <class name="org.apache.cocoon.portal.pluto.om.common.PreferenceImpl">
+    <field name="name" type="java.lang.String" required="true">
+      <bind-xml name="name" node="element"/>
+    </field>
+    <field name="castorValues" type="java.lang.String"
+           collection="collection" required="true">
+      <bind-xml name="value" node="element"/>
+    </field>
+  </class>
+
+  <class name="org.apache.cocoon.portal.pluto.om.common.PreferenceSetImpl">
+    <field name="preferences"
+           type="org.apache.cocoon.portal.pluto.om.common.PreferenceImpl"
+           collection="set">
+      <bind-xml name="preference" node="element"/>
+    </field>
+  </class>
+
+</mapping>
+

Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/pluto.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/resources/org/apache/cocoon/portal/converter/castor/pluto.xml
------------------------------------------------------------------------------
    svn:keywords = Id