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 2003/05/27 11:17:33 UTC

cvs commit: cocoon-2.1/src/blocks/portal/samples/profiles/mapping layout.xml copletdata.xml copletbasedata.xml copletinstancedata.xml

cziegeler    2003/05/27 02:17:33

  Modified:    src/blocks/portal/samples/profiles/mapping layout.xml
                        copletdata.xml copletbasedata.xml
                        copletinstancedata.xml
  Log:
  Correcting mapping
  
  Revision  Changes    Path
  1.11      +5 -5      cocoon-2.1/src/blocks/portal/samples/profiles/mapping/layout.xml
  
  Index: layout.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/samples/profiles/mapping/layout.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- layout.xml	26 May 2003 13:18:20 -0000	1.10
  +++ layout.xml	27 May 2003 09:17:33 -0000	1.11
  @@ -4,7 +4,7 @@
   
   
   	<class name="org.apache.cocoon.portal.aspect.impl.AbstractAspectalizable">
  -        <field name="persistentAspectData" type="org.apache.cocoon.portal.aspect.impl.MapItem" collection="map" handler="org.apache.cocoon.portal.aspect.impl.AspectDataFieldHandler">
  +        <field name="persistentAspectData" type="org.apache.cocoon.portal.util.MapItem" collection="map" handler="org.apache.cocoon.portal.util.AspectDataFieldHandler">
               <bind-xml name="aspect"/>
           </field>
       </class>
  @@ -20,7 +20,7 @@
       </class>
   
   	<class name="org.apache.cocoon.portal.layout.AbstractParameters">
  -        <field name="parameters" type="org.exolab.castor.mapping.MapItem" collection="map" handler="org.apache.cocoon.portal.layout.impl.ParameterFieldHandler">
  +        <field name="parameters" type="org.exolab.castor.mapping.MapItem" collection="map" handler="org.apache.cocoon.portal.util.ParameterFieldHandler">
               <bind-xml name="parameter" />
           </field>
       </class>
  @@ -30,7 +30,7 @@
           <field name="layoutRendererName" type="java.lang.String">
               <bind-xml name="layout-renderer-name" node="attribute" />
           </field>
  -        <field name="parameters" type="org.exolab.castor.mapping.MapItem" collection="map" handler="org.apache.cocoon.portal.layout.impl.ParameterFieldHandler">
  +        <field name="parameters" type="org.exolab.castor.mapping.MapItem" collection="map" handler="org.apache.cocoon.portal.util.ParameterFieldHandler">
               <bind-xml name="parameter" />
           </field>
           <field name="static" type="boolean">
  @@ -85,7 +85,7 @@
   		</field>
   	</class>
   
  -	<class name="org.apache.cocoon.portal.aspect.impl.MapItem">
  +	<class name="org.apache.cocoon.portal.util.MapItem">
   		<field name="key" type="java.lang.String">
   			<bind-xml name="name"/>
   		</field>
  @@ -99,7 +99,7 @@
              extends="org.apache.cocoon.portal.layout.AbstractLayout">
           <map-to xml="coplet-layout" />
   
  -		<field name="copletInstanceData" type="java.lang.String" handler="org.apache.cocoon.portal.profile.impl.CopletInstanceDataReferenceFieldHandler"/>
  +		<field name="copletInstanceData" type="java.lang.String" handler="org.apache.cocoon.portal.util.CopletInstanceDataReferenceFieldHandler"/>
       </class>
   
   </mapping>
  
  
  
  1.5       +3 -3      cocoon-2.1/src/blocks/portal/samples/profiles/mapping/copletdata.xml
  
  Index: copletdata.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/samples/profiles/mapping/copletdata.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- copletdata.xml	22 May 2003 12:32:47 -0000	1.4
  +++ copletdata.xml	27 May 2003 09:17:33 -0000	1.5
  @@ -18,7 +18,7 @@
   	<class name="org.apache.cocoon.portal.profile.impl.CopletDataManager">
   		<map-to xml="coplets" />
   
  -		<field name="copletData" type="org.apache.cocoon.portal.coplet.CopletData" collection="vector" handler="org.apache.cocoon.portal.profile.impl.CopletDataFieldHandler">
  +		<field name="copletData" type="org.apache.cocoon.portal.coplet.CopletData" collection="vector" handler="org.apache.cocoon.portal.util.CopletDataFieldHandler">
   			<bind-xml auto-naming="deriveByClass"/>
   		</field>
   	</class>
  @@ -35,11 +35,11 @@
   			<bind-xml name="maxpageable" />
   		</field>
   
  -		<field name="attributes" type="org.exolab.castor.mapping.MapItem" collection="map" handler="org.apache.cocoon.portal.profile.impl.AttributesFieldHandler">
  +		<field name="attributes" type="org.exolab.castor.mapping.MapItem" collection="map" handler="org.apache.cocoon.portal.util.AttributesFieldHandler">
   			<bind-xml name="attribute"/>
   		</field>
   
  -		<field name="copletBaseData" type="java.lang.String" handler="org.apache.cocoon.portal.profile.impl.CopletBaseDataReferenceFieldHandler"/>
  +		<field name="copletBaseData" type="java.lang.String" handler="org.apache.cocoon.portal.util.CopletBaseDataReferenceFieldHandler"/>
   	</class>
      
   	<class name="org.exolab.castor.mapping.MapItem">
  
  
  
  1.5       +2 -2      cocoon-2.1/src/blocks/portal/samples/profiles/mapping/copletbasedata.xml
  
  Index: copletbasedata.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/samples/profiles/mapping/copletbasedata.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- copletbasedata.xml	26 May 2003 09:52:59 -0000	1.4
  +++ copletbasedata.xml	27 May 2003 09:17:33 -0000	1.5
  @@ -5,7 +5,7 @@
   	<class name="org.apache.cocoon.portal.profile.impl.CopletBaseDataManager">
   		<map-to xml="coplets" />
   
  -		<field name="copletBaseData" type="org.apache.cocoon.portal.coplet.CopletBaseData" collection="vector" handler="org.apache.cocoon.portal.profile.impl.CopletBaseDataFieldHandler">
  +		<field name="copletBaseData" type="org.apache.cocoon.portal.coplet.CopletBaseData" collection="vector" handler="org.apache.cocoon.portal.util.CopletBaseDataFieldHandler">
   			<bind-xml auto-naming="deriveByClass" />
   		</field>
   	</class>
  @@ -21,7 +21,7 @@
   			<bind-xml name="coplet-adapter" />
   		</field>
   
  -		<field name="copletConfig" type="org.exolab.castor.mapping.MapItem" collection="map" handler="org.apache.cocoon.portal.profile.impl.ConfigurationFieldHandler">
  +		<field name="copletConfig" type="org.exolab.castor.mapping.MapItem" collection="map" handler="org.apache.cocoon.portal.util.ConfigurationFieldHandler">
   			<bind-xml name="configuration"/>
   		</field>
   	</class>
  
  
  
  1.6       +4 -4      cocoon-2.1/src/blocks/portal/samples/profiles/mapping/copletinstancedata.xml
  
  Index: copletinstancedata.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/samples/profiles/mapping/copletinstancedata.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- copletinstancedata.xml	22 May 2003 15:19:38 -0000	1.5
  +++ copletinstancedata.xml	27 May 2003 09:17:33 -0000	1.6
  @@ -3,7 +3,7 @@
   	<description>Coplet instance data mapping file</description>
   
   	<class name="org.apache.cocoon.portal.aspect.impl.AbstractAspectalizable">
  -        <field name="persistentAspectDatas" type="org.apache.cocoon.portal.aspect.impl.MapItem" collection="map" handler="org.apache.cocoon.portal.aspect.impl.AspectDataFieldHandler">
  +        <field name="persistentAspectDatas" type="org.apache.cocoon.portal.util.MapItem" collection="map" handler="org.apache.cocoon.portal.util.AspectDataFieldHandler">
               <bind-xml name="aspect"/>
           </field>
       </class>
  @@ -21,7 +21,7 @@
   	<class name="org.apache.cocoon.portal.profile.impl.CopletInstanceDataManager">
   		<map-to xml="coplets" />
   
  -		<field name="copletInstanceData" type="org.apache.cocoon.portal.coplet.CopletInstanceData" collection="vector" handler="org.apache.cocoon.portal.profile.impl.CopletInstanceDataFieldHandler">
  +		<field name="copletInstanceData" type="org.apache.cocoon.portal.coplet.CopletInstanceData" collection="vector" handler="org.apache.cocoon.portal.util.CopletInstanceDataFieldHandler">
   			<bind-xml auto-naming="deriveByClass"/>
   		</field>
   	</class>
  @@ -34,10 +34,10 @@
   			<bind-xml name="status"/>
   		</field>
   
  -		<field name="copletData" type="java.lang.String" handler="org.apache.cocoon.portal.profile.impl.CopletDataReferenceFieldHandler"/>
  +		<field name="copletData" type="java.lang.String" handler="org.apache.cocoon.portal.util.CopletDataReferenceFieldHandler"/>
   	</class>
   
  -	<class name="org.apache.cocoon.portal.aspect.impl.MapItem">
  +	<class name="org.apache.cocoon.portal.util.MapItem">
   		<field name="key" type="java.lang.String">
   			<bind-xml name="name"/>
   		</field>